Compare commits
72
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b218910476 | ||
|
|
cf0e469465 | ||
|
|
8e7fa782b3 | ||
|
|
97652802f0 | ||
|
|
1706289124 | ||
|
|
dd23de7aaa | ||
|
|
f1602f67d4 | ||
|
|
c03cd97d3a | ||
|
|
a8e9a074d3 | ||
|
|
1e9d3e0656 | ||
|
|
01e0f3612d | ||
|
|
0015a6d88d | ||
|
|
77dc317da2 | ||
|
|
6aeda3faaf | ||
|
|
ca358d9f8b | ||
|
|
03e0683892 | ||
|
|
6ac4c6a7b9 | ||
|
|
a0e0bf65ff | ||
|
|
bc018e1fe0 | ||
|
|
5e39c8813a | ||
|
|
06719cdef0 | ||
|
|
5144e14da4 | ||
|
|
8528d5068b | ||
|
|
c6c4428f7d | ||
|
|
7e4cb0201b | ||
|
|
7887ce12c0 | ||
|
|
2d450239ac | ||
|
|
bf4ccd8cb3 | ||
|
|
c473e80243 | ||
|
|
bf55bcce92 | ||
|
|
49248cedaf | ||
|
|
a0034b2cfc | ||
|
|
4a297180fd | ||
|
|
5fa3a3313a | ||
|
|
29ee87c4aa | ||
|
|
94a247e24a | ||
|
|
6d37710fec | ||
|
|
c016beb2e5 | ||
|
|
f9e1b85c6a | ||
|
|
38ba19e665 | ||
|
|
f55c99d2d6 | ||
|
|
c5e8b83d8a | ||
|
|
d52d9cfed2 | ||
|
|
93325642aa | ||
|
|
165e94abbc | ||
|
|
2e3127e766 | ||
|
|
d37326d905 | ||
|
|
e51e39ff38 | ||
|
|
6c075b6d74 | ||
|
|
b2f63c6e0f | ||
|
|
8c2d73e8af | ||
|
|
1c0ff8930e | ||
|
|
e2b8355639 | ||
|
|
ba7718bde5 | ||
|
|
06f1877ae1 | ||
|
|
1d9e8aabf3 | ||
|
|
b111e5285b | ||
|
|
f4c491b570 | ||
|
|
29bd4fd70b | ||
|
|
269dadee8d | ||
|
|
03f68a0421 | ||
|
|
807e5eb2a9 | ||
|
|
8e8c29979f | ||
|
|
7d859c1af0 | ||
|
|
e9543dc30d | ||
|
|
9f313440ac | ||
|
|
c2508dffea | ||
|
|
d44bc06a93 | ||
|
|
c56b91570b | ||
|
|
d53c4e6513 | ||
|
|
0426d600cc | ||
|
|
34bd574354 |
No files matched your search
@@ -6,7 +6,14 @@ npm-debug.log
|
|||||||
README.md
|
README.md
|
||||||
.next
|
.next
|
||||||
.turbo
|
.turbo
|
||||||
|
.pnpm-store
|
||||||
|
**/.pnpm-store
|
||||||
|
coverage
|
||||||
|
**/coverage
|
||||||
|
**/.docusaurus
|
||||||
|
**/build
|
||||||
.git
|
.git
|
||||||
|
.github
|
||||||
dev
|
dev
|
||||||
.build
|
.build
|
||||||
e2e
|
e2e
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
.secrets
|
||||||
|
!.secrets.example
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
TURBO_API=
|
||||||
|
TURBO_TEAM=
|
||||||
|
TURBO_TOKEN=
|
||||||
|
TURBO_REMOTE_CACHE_SIGNATURE_KEY=
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# Running CI locally
|
||||||
|
|
||||||
|
Install [Act](https://nektosact.com/installation/index.html) and ensure Docker is running, then use:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pnpm ci:act:fast
|
||||||
|
pnpm ci:act:docker
|
||||||
|
pnpm ci:act:all
|
||||||
|
pnpm ci:act:cleanup
|
||||||
|
```
|
||||||
|
|
||||||
|
`fast` runs the quality gate. `docker` and `all` run the gate followed by the single container build, E2E suite, and memory regression test. `cleanup` validates the manual cleanup path without calling GitHub. The wrapper supports regular clones and Git worktrees, including non-default Docker contexts. Linux dependencies are kept in Docker volumes instead of overwriting host `node_modules`. The first run downloads the Act runner and Playwright browser dependencies.
|
||||||
|
|
||||||
|
Remote caching is optional locally. Copy `.github/act/.secrets.example` to `.github/act/.secrets`, populate it with rotated credentials, and run with:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ACT_SECRET_FILE=.github/act/.secrets pnpm ci:act:all
|
||||||
|
```
|
||||||
|
|
||||||
|
Act never publishes or deletes GHCR images. The secret file is ignored by Git.
|
||||||
|
|
||||||
|
## PR preview images
|
||||||
|
|
||||||
|
Successful non-draft pull requests from this repository publish an amd64 image:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker pull ghcr.io/homarr-labs/homarr-test:pr-<number>
|
||||||
|
```
|
||||||
|
|
||||||
|
The tag is replaced when the pull request is updated and deleted when it closes. Production Homarr images remain the supported multi-architecture releases. The `homarr-test` package must be configured as public in GHCR for unauthenticated testers.
|
||||||
|
|
||||||
|
## Dokploy preview cache
|
||||||
|
|
||||||
|
Keep `needs-demo` as the Dokploy preview label. Under the application's **Preview Build-time Secrets**, configure `TURBO_API`, `TURBO_TEAM`, `TURBO_TOKEN`, and `TURBO_REMOTE_CACHE_SIGNATURE_KEY`. Dokploy passes these to the Dockerfile as BuildKit secrets. Do not configure the token or signature key as Docker build arguments.
|
||||||
|
|
||||||
|
Rotate any credentials that have appeared in chat, logs, or committed configuration before enabling the cache.
|
||||||
@@ -11,3 +11,11 @@
|
|||||||
- [ ] Commits follow the [conventional commits guideline](https://www.conventionalcommits.org/en/v1.0.0/)
|
- [ ] Commits follow the [conventional commits guideline](https://www.conventionalcommits.org/en/v1.0.0/)
|
||||||
- [ ] No shorthand variable names are used (eg. `x`, `y`, `i` or any abbrevation)
|
- [ ] No shorthand variable names are used (eg. `x`, `y`, `i` or any abbrevation)
|
||||||
- [ ] Documentation is up to date. Create a pull request [here](https://github.com/homarr-labs/documentation/).
|
- [ ] Documentation is up to date. Create a pull request [here](https://github.com/homarr-labs/documentation/).
|
||||||
|
- [ ] When using AI; No temp files are checked in, the code style follows the rest of the project
|
||||||
|
|
||||||
|
**When contributing a new integration or widget:**
|
||||||
|
|
||||||
|
- [ ] I confirmed manually that the integration or widget is working with a real system and performed basic smoke
|
||||||
|
tests (e.g. what happens if it is offline)
|
||||||
|
- [ ] Optional but recommended: I confirm that I am willing to be added to the `CODEOWNERS` of this feature and will
|
||||||
|
provide support and maintain the integration (e.g. in case of breaking or failure)
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
name: Auto-fix lint and format
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [opened, synchronize, reopened]
|
||||||
|
branches: ["*"]
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
autofix:
|
||||||
|
name: Auto-fix
|
||||||
|
if: github.event.pull_request.head.repo.id == github.repository_id
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
ref: ${{ github.head_ref }}
|
||||||
|
|
||||||
|
- name: Setup
|
||||||
|
uses: ./tooling/github/setup
|
||||||
|
|
||||||
|
- name: Get changed files
|
||||||
|
id: changed
|
||||||
|
env:
|
||||||
|
BASE_REF: ${{ github.base_ref }}
|
||||||
|
run: |
|
||||||
|
git diff --name-only --diff-filter=ACMR "origin/${BASE_REF}...HEAD" -- '*.ts' '*.tsx' '*.js' '*.jsx' > /tmp/changed-files
|
||||||
|
echo "count=$(wc -l < /tmp/changed-files | tr -d '[:space:]')" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Auto-fix lint + format
|
||||||
|
if: steps.changed.outputs.count != '0'
|
||||||
|
run: |
|
||||||
|
xargs -r -a /tmp/changed-files pnpm exec oxlint --fix || true
|
||||||
|
xargs -r -a /tmp/changed-files pnpm exec oxfmt --write
|
||||||
|
|
||||||
|
- name: Commit fixes
|
||||||
|
uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
|
with:
|
||||||
|
commit_message: "style: auto-fix lint and format"
|
||||||
@@ -0,0 +1,264 @@
|
|||||||
|
name: CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
|
branches: ["*"]
|
||||||
|
pull_request_target:
|
||||||
|
types: [closed]
|
||||||
|
branches: ["*"]
|
||||||
|
push:
|
||||||
|
branches: [main, dev, beta, next]
|
||||||
|
merge_group:
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
operation:
|
||||||
|
description: Operation to run
|
||||||
|
required: true
|
||||||
|
default: validate
|
||||||
|
type: choice
|
||||||
|
options:
|
||||||
|
- validate
|
||||||
|
- publish
|
||||||
|
- cleanup
|
||||||
|
pr_number:
|
||||||
|
description: PR number for publish or cleanup
|
||||||
|
required: false
|
||||||
|
type: number
|
||||||
|
ref:
|
||||||
|
description: Git ref to validate or publish
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || inputs.pr_number || github.ref }}
|
||||||
|
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
||||||
|
|
||||||
|
env:
|
||||||
|
FORCE_COLOR: 3
|
||||||
|
SKIP_ENV_VALIDATION: true
|
||||||
|
TURBO_TELEMETRY_DISABLED: 1
|
||||||
|
REGISTRY: ghcr.io
|
||||||
|
PREVIEW_IMAGE: ghcr.io/homarr-labs/homarr-test
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
fast-gate:
|
||||||
|
name: Fast gate
|
||||||
|
if: github.event_name != 'pull_request_target' && (github.event_name != 'workflow_dispatch' || inputs.operation != 'cleanup')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 15
|
||||||
|
env:
|
||||||
|
TURBO_API: ${{ secrets.TURBO_API }}
|
||||||
|
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
|
||||||
|
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
|
||||||
|
TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
|
||||||
|
TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha || github.event.before || 'HEAD~1' }}
|
||||||
|
TURBO_SCM_HEAD: ${{ github.sha }}
|
||||||
|
TURBO_PLATFORM: linux/amd64
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
if: "!env.ACT"
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
persist-credentials: false
|
||||||
|
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.ref || '' }}
|
||||||
|
|
||||||
|
- name: Validate manual inputs
|
||||||
|
if: github.event_name == 'workflow_dispatch' && inputs.operation == 'publish'
|
||||||
|
env:
|
||||||
|
PR_NUMBER: ${{ inputs.pr_number }}
|
||||||
|
BUILD_REF: ${{ inputs.ref }}
|
||||||
|
run: |
|
||||||
|
test -n "$PR_NUMBER" || { echo "pr_number is required for publish"; exit 1; }
|
||||||
|
test -n "$BUILD_REF" || { echo "ref is required for publish"; exit 1; }
|
||||||
|
|
||||||
|
- name: Setup
|
||||||
|
uses: ./tooling/github/setup
|
||||||
|
|
||||||
|
- name: Copy environment defaults
|
||||||
|
run: cp .env.example .env
|
||||||
|
|
||||||
|
- name: Lint, typecheck, and build affected workspaces
|
||||||
|
run: pnpm turbo run lint typecheck build --affected --continue=dependencies-successful
|
||||||
|
|
||||||
|
- name: Validate workspace configuration
|
||||||
|
run: pnpm lint:ws
|
||||||
|
|
||||||
|
- name: Run unit tests
|
||||||
|
run: pnpm test
|
||||||
|
|
||||||
|
container:
|
||||||
|
name: Container and E2E
|
||||||
|
needs: fast-gate
|
||||||
|
if: |
|
||||||
|
github.event_name == 'merge_group' ||
|
||||||
|
(github.event_name == 'pull_request' && github.event.pull_request.draft == false) ||
|
||||||
|
(github.event_name == 'workflow_dispatch' && (inputs.operation == 'validate' || inputs.operation == 'publish'))
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 30
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
if: "!env.ACT"
|
||||||
|
with:
|
||||||
|
persist-credentials: false
|
||||||
|
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.ref || '' }}
|
||||||
|
|
||||||
|
- name: Setup
|
||||||
|
uses: ./tooling/github/setup
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
if: "!env.ACT"
|
||||||
|
uses: docker/setup-buildx-action@v4
|
||||||
|
|
||||||
|
- name: Build container once
|
||||||
|
if: "!env.ACT"
|
||||||
|
uses: docker/build-push-action@v7
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
network: host
|
||||||
|
platforms: linux/amd64
|
||||||
|
load: true
|
||||||
|
push: false
|
||||||
|
tags: |
|
||||||
|
homarr-ci
|
||||||
|
homarr-e2e
|
||||||
|
labels: |
|
||||||
|
org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
|
||||||
|
org.opencontainers.image.revision=${{ github.sha }}
|
||||||
|
org.opencontainers.image.ref.name=pr-${{ github.event.pull_request.number || inputs.pr_number || 'none' }}
|
||||||
|
cache-from: type=gha,scope=homarr-linux-amd64
|
||||||
|
cache-to: type=gha,scope=homarr-linux-amd64,mode=max
|
||||||
|
secrets: |
|
||||||
|
TURBO_API=${{ secrets.TURBO_API }}
|
||||||
|
TURBO_TEAM=${{ secrets.TURBO_TEAM }}
|
||||||
|
TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
|
||||||
|
TURBO_REMOTE_CACHE_SIGNATURE_KEY=${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
|
||||||
|
|
||||||
|
- name: Build container once with Act
|
||||||
|
if: env.ACT
|
||||||
|
env:
|
||||||
|
TURBO_API: ${{ secrets.TURBO_API }}
|
||||||
|
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
|
||||||
|
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
|
||||||
|
TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
|
||||||
|
run: |
|
||||||
|
secret_args=()
|
||||||
|
for secret in TURBO_API TURBO_TEAM TURBO_TOKEN TURBO_REMOTE_CACHE_SIGNATURE_KEY; do
|
||||||
|
if [ -n "${!secret:-}" ]; then
|
||||||
|
secret_args+=(--secret "id=${secret},env=${secret}")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
DOCKER_BUILDKIT=1 docker build --platform linux/amd64 \
|
||||||
|
--tag homarr-ci --tag homarr-e2e "${secret_args[@]}" .
|
||||||
|
|
||||||
|
- name: Cache Playwright browsers
|
||||||
|
if: "!env.ACT"
|
||||||
|
id: playwright-cache
|
||||||
|
uses: actions/cache@v6
|
||||||
|
with:
|
||||||
|
path: ~/.cache/ms-playwright
|
||||||
|
key: playwright-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||||
|
|
||||||
|
- name: Install Playwright Chromium
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit != 'true' || env.ACT
|
||||||
|
run: pnpm exec playwright install --with-deps chromium
|
||||||
|
|
||||||
|
- name: Install Playwright system deps
|
||||||
|
if: steps.playwright-cache.outputs.cache-hit == 'true'
|
||||||
|
run: pnpm exec playwright install-deps chromium
|
||||||
|
|
||||||
|
- name: Run E2E tests
|
||||||
|
run: pnpm test:e2e
|
||||||
|
|
||||||
|
- name: Upload E2E artifacts
|
||||||
|
if: failure() && !env.ACT
|
||||||
|
uses: actions/upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: playwright-report
|
||||||
|
path: e2e/test-results/
|
||||||
|
retention-days: 7
|
||||||
|
|
||||||
|
- name: Determine preview tag
|
||||||
|
id: preview
|
||||||
|
if: |
|
||||||
|
!env.ACT &&
|
||||||
|
(
|
||||||
|
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) ||
|
||||||
|
(github.event_name == 'workflow_dispatch' && inputs.operation == 'publish')
|
||||||
|
)
|
||||||
|
env:
|
||||||
|
PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr_number }}
|
||||||
|
run: echo "tag=pr-${PR_NUMBER}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Log in to GHCR
|
||||||
|
if: steps.preview.outputs.tag != ''
|
||||||
|
uses: docker/login-action@v4
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Push preview image
|
||||||
|
if: steps.preview.outputs.tag != ''
|
||||||
|
env:
|
||||||
|
PREVIEW_TAG: ${{ steps.preview.outputs.tag }}
|
||||||
|
run: |
|
||||||
|
docker tag homarr-ci "${PREVIEW_IMAGE}:${PREVIEW_TAG}"
|
||||||
|
docker push "${PREVIEW_IMAGE}:${PREVIEW_TAG}"
|
||||||
|
|
||||||
|
- name: Show Act publication result
|
||||||
|
if: env.ACT
|
||||||
|
run: echo "Act validated the publication path; external GHCR writes are disabled locally."
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
name: Clean up preview image
|
||||||
|
if: github.event_name == 'pull_request_target' || (github.event_name == 'workflow_dispatch' && inputs.operation == 'cleanup')
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
timeout-minutes: 5
|
||||||
|
permissions:
|
||||||
|
packages: write
|
||||||
|
env:
|
||||||
|
IMAGE_TAG: pr-${{ github.event.pull_request.number || inputs.pr_number }}
|
||||||
|
steps:
|
||||||
|
- name: Validate cleanup input
|
||||||
|
if: github.event_name == 'workflow_dispatch'
|
||||||
|
env:
|
||||||
|
PR_NUMBER: ${{ inputs.pr_number }}
|
||||||
|
run: test -n "$PR_NUMBER" || { echo "pr_number is required for cleanup"; exit 1; }
|
||||||
|
|
||||||
|
- name: Delete GHCR package version
|
||||||
|
if: "!env.ACT"
|
||||||
|
uses: actions/github-script@v8
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const packageName = "homarr-test";
|
||||||
|
const org = context.repo.owner;
|
||||||
|
const tag = process.env.IMAGE_TAG;
|
||||||
|
const versions = await github.paginate(
|
||||||
|
github.rest.packages.getAllPackageVersionsForPackageOwnedByOrg,
|
||||||
|
{ package_type: "container", package_name: packageName, org, per_page: 100 },
|
||||||
|
);
|
||||||
|
const target = versions.find((version) =>
|
||||||
|
version.metadata?.container?.tags?.includes(tag),
|
||||||
|
);
|
||||||
|
if (!target) {
|
||||||
|
core.info(`No package version found with tag "${tag}"`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await github.rest.packages.deletePackageVersionForOrg({
|
||||||
|
package_type: "container",
|
||||||
|
package_name: packageName,
|
||||||
|
org,
|
||||||
|
package_version_id: target.id,
|
||||||
|
});
|
||||||
|
core.info(`Deleted package version ${target.id} (${tag})`);
|
||||||
|
|
||||||
|
- name: Show Act cleanup result
|
||||||
|
if: env.ACT
|
||||||
|
run: echo "Act validated cleanup for ${IMAGE_TAG}; external GHCR writes are disabled locally."
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
name: "[Quality] Code Analysis"
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches: ["*"]
|
|
||||||
push:
|
|
||||||
branches: ["main"]
|
|
||||||
merge_group:
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: "${{ github.workflow }}-${{ github.ref }}"
|
|
||||||
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
|
||||||
|
|
||||||
env:
|
|
||||||
FORCE_COLOR: 3
|
|
||||||
SKIP_ENV_VALIDATION: true
|
|
||||||
TURBO_API: ${{ secrets.TURBO_API }}
|
|
||||||
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
|
|
||||||
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
|
|
||||||
TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
|
|
||||||
TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha || github.event.before || 'HEAD~1' }}
|
|
||||||
TURBO_SCM_HEAD: ${{ github.sha }}
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
lint-format-autofix:
|
|
||||||
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.id == github.repository_id
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 5
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
ref: ${{ github.head_ref }}
|
|
||||||
|
|
||||||
- name: Setup
|
|
||||||
uses: ./tooling/github/setup
|
|
||||||
|
|
||||||
- name: Get changed files
|
|
||||||
id: changed
|
|
||||||
run: |
|
|
||||||
git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' > /tmp/changed-files
|
|
||||||
echo "count=$(wc -l < /tmp/changed-files | tr -d '[:space:]')" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Auto-fix lint + format
|
|
||||||
if: steps.changed.outputs.count != '0'
|
|
||||||
run: |
|
|
||||||
xargs -r -a /tmp/changed-files pnpm exec oxlint --fix || true
|
|
||||||
xargs -r -a /tmp/changed-files pnpm exec oxfmt --write
|
|
||||||
|
|
||||||
- name: Commit fixes
|
|
||||||
uses: stefanzweifel/git-auto-commit-action@v7
|
|
||||||
with:
|
|
||||||
commit_message: "style: auto-fix lint and format"
|
|
||||||
|
|
||||||
lint:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 10
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Setup
|
|
||||||
uses: ./tooling/github/setup
|
|
||||||
|
|
||||||
- name: Copy env
|
|
||||||
shell: bash
|
|
||||||
run: cp .env.example .env
|
|
||||||
|
|
||||||
- name: Lint
|
|
||||||
run: pnpm turbo lint --affected && pnpm lint:ws
|
|
||||||
|
|
||||||
format:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 10
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Setup
|
|
||||||
uses: ./tooling/github/setup
|
|
||||||
|
|
||||||
- name: Format
|
|
||||||
run: pnpm turbo format --affected --continue
|
|
||||||
|
|
||||||
typecheck:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 10
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Setup
|
|
||||||
uses: ./tooling/github/setup
|
|
||||||
|
|
||||||
- name: Typecheck
|
|
||||||
run: pnpm turbo typecheck --affected
|
|
||||||
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 10
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
|
|
||||||
- name: Setup
|
|
||||||
uses: ./tooling/github/setup
|
|
||||||
|
|
||||||
- name: Test
|
|
||||||
run: pnpm test
|
|
||||||
|
|
||||||
- name: "Report Coverage"
|
|
||||||
# Set if: always() to also generate the report if tests are failing
|
|
||||||
# Only works if you set `reportOnFailure: true` in your vite config as specified above
|
|
||||||
if: always()
|
|
||||||
uses: davelosert/vitest-coverage-report-action@v2
|
|
||||||
|
|
||||||
e2e:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 15
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
- name: Setup
|
|
||||||
uses: ./tooling/github/setup
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v4
|
|
||||||
- name: Build docker image
|
|
||||||
id: build-docker-image
|
|
||||||
uses: docker/build-push-action@v7
|
|
||||||
with:
|
|
||||||
platforms: linux/amd64
|
|
||||||
context: .
|
|
||||||
push: false
|
|
||||||
load: true
|
|
||||||
tags: homarr-e2e
|
|
||||||
network: host
|
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
||||||
env:
|
|
||||||
SKIP_ENV_VALIDATION: true
|
|
||||||
- name: Install playwright browsers
|
|
||||||
run: pnpm exec playwright install chromium
|
|
||||||
- name: Run E2E Tests
|
|
||||||
shell: bash
|
|
||||||
run: pnpm test:e2e
|
|
||||||
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 10
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v7
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
- name: Setup
|
|
||||||
uses: ./tooling/github/setup
|
|
||||||
- name: Copy env
|
|
||||||
shell: bash
|
|
||||||
run: cp .env.example .env
|
|
||||||
- name: Build
|
|
||||||
run: pnpm turbo build --affected
|
|
||||||
@@ -148,6 +148,11 @@ jobs:
|
|||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
|
outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
|
||||||
|
secrets: |
|
||||||
|
TURBO_API=${{ secrets.TURBO_API }}
|
||||||
|
TURBO_TEAM=${{ secrets.TURBO_TEAM }}
|
||||||
|
TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
|
||||||
|
TURBO_REMOTE_CACHE_SIGNATURE_KEY=${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
|
||||||
env:
|
env:
|
||||||
SKIP_ENV_VALIDATION: true
|
SKIP_ENV_VALIDATION: true
|
||||||
build-arm64:
|
build-arm64:
|
||||||
@@ -187,6 +192,11 @@ jobs:
|
|||||||
platforms: linux/arm64
|
platforms: linux/arm64
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
|
outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
|
||||||
|
secrets: |
|
||||||
|
TURBO_API=${{ secrets.TURBO_API }}
|
||||||
|
TURBO_TEAM=${{ secrets.TURBO_TEAM }}
|
||||||
|
TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
|
||||||
|
TURBO_REMOTE_CACHE_SIGNATURE_KEY=${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
|
||||||
env:
|
env:
|
||||||
SKIP_ENV_VALIDATION: true
|
SKIP_ENV_VALIDATION: true
|
||||||
extract-asset-amd64:
|
extract-asset-amd64:
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
## [1.71.0](https://github.com/homarr-labs/homarr/compare/v1.70.0...v1.71.0) (2026-07-17)
|
||||||
|
|
||||||
## [1.70.0](https://github.com/homarr-labs/homarr/compare/v1.69.2...v1.70.0) (2026-07-10)
|
## [1.70.0](https://github.com/homarr-labs/homarr/compare/v1.69.2...v1.70.0) (2026-07-10)
|
||||||
|
|
||||||
## [1.69.2](https://github.com/homarr-labs/homarr/compare/v1.69.1...v1.69.2) (2026-07-06)
|
## [1.69.2](https://github.com/homarr-labs/homarr/compare/v1.69.1...v1.69.2) (2026-07-06)
|
||||||
|
|||||||
+30
-11
@@ -1,24 +1,43 @@
|
|||||||
|
# syntax=docker/dockerfile:1.25
|
||||||
|
|
||||||
FROM node:24.18.0-alpine AS base
|
FROM node:24.18.0-alpine AS base
|
||||||
|
|
||||||
FROM base AS builder
|
FROM base AS builder
|
||||||
RUN apk add --no-cache libc6-compat
|
|
||||||
RUN apk update
|
|
||||||
|
|
||||||
# Set working directory
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
RUN apk add --no-cache libc6-compat curl bash
|
RUN apk add --no-cache libc6-compat curl bash && apk update
|
||||||
RUN apk update
|
|
||||||
|
RUN corepack enable pnpm
|
||||||
|
COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./
|
||||||
|
COPY patches ./patches
|
||||||
|
# Workaround for pnpm/pnpm#5268: pnpm fetch crashes when patchedDependencies
|
||||||
|
# are configured with nodeLinker: hoisted. The applyPatchToDir function tries
|
||||||
|
# to chdir into node_modules/<pkg> which doesn't exist during fetch (only the
|
||||||
|
# content-addressable store is populated). By temporarily switching to the
|
||||||
|
# isolated linker, patches apply inside the virtual store (node_modules/.pnpm/...)
|
||||||
|
# which IS created by pnpm fetch. The original hoisted linker is restored
|
||||||
|
# before the install step so the final node_modules layout stays flat.
|
||||||
|
RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
|
||||||
|
pnpm config set store-dir /pnpm/store && \
|
||||||
|
sed -i 's/nodeLinker: hoisted/nodeLinker: isolated/' pnpm-workspace.yaml && \
|
||||||
|
pnpm fetch && \
|
||||||
|
sed -i 's/nodeLinker: isolated/nodeLinker: hoisted/' pnpm-workspace.yaml
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
# Follow the pnpm fetch pattern from https://pnpm.io/cli/fetch
|
||||||
|
# --frozen-lockfile is omitted as recommended by the pnpm fetch docs
|
||||||
|
RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
|
||||||
|
pnpm install --recursive
|
||||||
|
|
||||||
RUN corepack enable pnpm && pnpm install --recursive --frozen-lockfile
|
|
||||||
|
|
||||||
# Copy static data as it is not part of the build
|
|
||||||
COPY static-data ./static-data
|
|
||||||
ARG SKIP_ENV_VALIDATION='true'
|
ARG SKIP_ENV_VALIDATION='true'
|
||||||
ARG CI='true'
|
ARG CI='true'
|
||||||
ARG DISABLE_REDIS_LOGS='true'
|
ARG DISABLE_REDIS_LOGS='true'
|
||||||
|
ARG TARGETPLATFORM
|
||||||
|
|
||||||
RUN corepack enable pnpm && pnpm build
|
RUN --mount=type=secret,id=TURBO_API,env=TURBO_API \
|
||||||
|
--mount=type=secret,id=TURBO_TEAM,env=TURBO_TEAM \
|
||||||
|
--mount=type=secret,id=TURBO_TOKEN,env=TURBO_TOKEN \
|
||||||
|
--mount=type=secret,id=TURBO_REMOTE_CACHE_SIGNATURE_KEY,env=TURBO_REMOTE_CACHE_SIGNATURE_KEY \
|
||||||
|
TURBO_PLATFORM="${TARGETPLATFORM:-linux/amd64}" pnpm build
|
||||||
|
|
||||||
FROM base AS runner
|
FROM base AS runner
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|||||||
@@ -23,9 +23,6 @@
|
|||||||
"react-hooks/exhaustive-deps": "warn",
|
"react-hooks/exhaustive-deps": "warn",
|
||||||
"eslint/no-unused-expressions": "warn"
|
"eslint/no-unused-expressions": "warn"
|
||||||
},
|
},
|
||||||
"options": {
|
|
||||||
"reportUnusedDisableDirectives": "off"
|
|
||||||
},
|
|
||||||
"ignorePatterns": ["**/*.config.js", "**/*.config.mjs", "**/*.cjs", ".docusaurus/**", "build/**"],
|
"ignorePatterns": ["**/*.config.js", "**/*.config.mjs", "**/*.cjs", ".docusaurus/**", "build/**"],
|
||||||
"settings": {
|
"settings": {
|
||||||
"react": { "version": "19" }
|
"react": { "version": "19" }
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
<img src="https://raw.githubusercontent.com/homarr-labs/charts/refs/heads/main/charts/homarr/icon.svg" align="right" width="92" alt="homarr logo">
|
<img src="https://raw.githubusercontent.com/homarr-labs/charts/refs/heads/main/charts/homarr/icon.svg" align="right" width="92" alt="homarr logo">
|
||||||
|
|
||||||

|

|
||||||

|

|
||||||

|

|
||||||
|
|
||||||
A Helm chart to deploy homarr for Kubernetes
|
A Helm chart to deploy homarr for Kubernetes
|
||||||
|
|
||||||
@@ -429,7 +429,7 @@ All available values are listed on the [artifacthub](https://artifacthub.io/pack
|
|||||||
| httproute.rules[0].matches[0].path.value | string | `"/"` | Path value to match |
|
| httproute.rules[0].matches[0].path.value | string | `"/"` | Path value to match |
|
||||||
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
|
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
|
||||||
| image.repository | string | `"ghcr.io/homarr-labs/homarr"` | Image repository |
|
| image.repository | string | `"ghcr.io/homarr-labs/homarr"` | Image repository |
|
||||||
| image.tag | string | `"v1.69.2"` | Overrides the image tag whose default is the chart appVersion |
|
| image.tag | string | `"v1.70.0"` | Overrides the image tag whose default is the chart appVersion |
|
||||||
| imagePullSecrets | list | `[]` | Secrets for Docker registry |
|
| imagePullSecrets | list | `[]` | Secrets for Docker registry |
|
||||||
| ingress.annotations | object | `{}` | Ingress annotations |
|
| ingress.annotations | object | `{}` | Ingress annotations |
|
||||||
| ingress.enabled | bool | `false` | Enable ingress |
|
| ingress.enabled | bool | `false` | Enable ingress |
|
||||||
|
|||||||
@@ -50,12 +50,11 @@ import { immichServerStatsWidget } from '../../widgets/immich-server-stats';
|
|||||||
<code>user.read</code>,{" "}
|
<code>user.read</code>,{" "}
|
||||||
<code>user.update</code>,{" "}
|
<code>user.update</code>,{" "}
|
||||||
<code>asset.read</code>,{" "}
|
<code>asset.read</code>,{" "}
|
||||||
|
<code>asset.view</code>,{" "}
|
||||||
<code>asset.download</code>,{" "}
|
<code>asset.download</code>,{" "}
|
||||||
<code>asset.statistics</code>,{" "}
|
<code>asset.statistics</code>,{" "}
|
||||||
<code>server.statistics</code>,{" "}
|
<code>server.statistics</code>,{" "}
|
||||||
<code>server.about</code>.
|
<code>server.about</code>.
|
||||||
<br />
|
|
||||||
Additional permissions may be required depending on your Immich version. If you encounter authorization errors, grant any missing permissions requested by the server.
|
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
---
|
|
||||||
title: "Open WebUI"
|
|
||||||
description: "Self-hosted AI chat interface for local and remote LLM providers"
|
|
||||||
hide_title: true
|
|
||||||
---
|
|
||||||
|
|
||||||
import { IntegrationHeader } from "@site/src/components/integrations/header";
|
|
||||||
import { IntegrationCapabilites } from "@site/src/components/integrations/widgets";
|
|
||||||
import { AddingIntegration } from "@site/src/components/integrations/adding";
|
|
||||||
import { IntegrationSecrets } from "@site/src/components/integrations/secrets";
|
|
||||||
import { openWebUiIntegration } from ".";
|
|
||||||
import { openWebUiWidget } from "../../widgets/open-webui";
|
|
||||||
|
|
||||||
<IntegrationHeader integration={openWebUiIntegration} categories={["AI", "Chat"]} />
|
|
||||||
|
|
||||||
[Open WebUI](https://openwebui.com/) is a self-hosted AI chat interface that aggregates multiple LLM providers (Ollama, OpenAI-compatible APIs, and more) behind a single API. Homarr connects to it so you can chat with your models directly from your dashboard.
|
|
||||||
|
|
||||||
### Widgets & Capabilities
|
|
||||||
|
|
||||||
<IntegrationCapabilites items={[{ widget: openWebUiWidget }]} />
|
|
||||||
|
|
||||||
### Adding the integration
|
|
||||||
|
|
||||||
<AddingIntegration />
|
|
||||||
|
|
||||||
:::info URL configuration
|
|
||||||
Use the root URL of your Open WebUI instance, for example `http://localhost:8080` (Open WebUI's default port). Homarr calls the Open WebUI API under `/api` automatically.
|
|
||||||
:::
|
|
||||||
|
|
||||||
### Secrets
|
|
||||||
|
|
||||||
<IntegrationSecrets
|
|
||||||
secrets={[
|
|
||||||
{
|
|
||||||
credentials: ["apiKey"],
|
|
||||||
steps: [],
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import { IntegrationDefinition } from "@site/src/types";
|
|
||||||
|
|
||||||
export const openWebUiIntegration: IntegrationDefinition = {
|
|
||||||
name: "Open WebUI",
|
|
||||||
description: "Self-hosted AI chat interface for local and remote LLM providers",
|
|
||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/open-webui.svg",
|
|
||||||
path: "../../integrations/open-webui",
|
|
||||||
};
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
title: 'Immich Album Carousel'
|
title: 'Immich Album Carousel'
|
||||||
description: 'Shows a slideshow of your album pictures from Immich'
|
description: 'Shows a slideshow of pictures from an Immich album or your full library'
|
||||||
hide_title: true
|
hide_title: true
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -37,4 +37,3 @@ import screen from './img/screen.png';
|
|||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
<WidgetConfig configuration={immichAlbumCarouselWidget.configuration} />
|
<WidgetConfig configuration={immichAlbumCarouselWidget.configuration} />
|
||||||
|
|
||||||
@@ -4,15 +4,16 @@ import { IconPhoto } from "@tabler/icons-react";
|
|||||||
export const immichAlbumCarouselWidget: WidgetDefinition = {
|
export const immichAlbumCarouselWidget: WidgetDefinition = {
|
||||||
icon: IconPhoto,
|
icon: IconPhoto,
|
||||||
name: "Immich Album",
|
name: "Immich Album",
|
||||||
description: "Shows a slideshow of your album pictures from Immich",
|
description: "Shows a slideshow of pictures from an Immich album or your full library",
|
||||||
path: "../../widgets/immich-album-carousel",
|
path: "../../widgets/immich-album-carousel",
|
||||||
configuration: {
|
configuration: {
|
||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
name: "Album",
|
name: "Album",
|
||||||
description: "Select the Immich album to show in the slideshow.",
|
description:
|
||||||
|
"Select an Immich album or All photos. An empty selection also shows random photos from your full library.",
|
||||||
values: { type: "string" },
|
values: { type: "string" },
|
||||||
defaultValue: "",
|
defaultValue: "All photos",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Interval in seconds",
|
name: "Interval in seconds",
|
||||||
|
|||||||
@@ -1,41 +1,44 @@
|
|||||||
---
|
---
|
||||||
title: 'Media Request List'
|
title: "Media Request List"
|
||||||
description: 'See a list of all media requests from your integration'
|
description: "See a list of all media requests from your integration"
|
||||||
hide_title: true
|
hide_title: true
|
||||||
---
|
---
|
||||||
|
|
||||||
import { WidgetHeader } from '@site/src/components/widgets/header';
|
import { WidgetHeader } from "@site/src/components/widgets/header";
|
||||||
import { AddingWidget } from '@site/src/components/widgets/adding';
|
import { AddingWidget } from "@site/src/components/widgets/adding";
|
||||||
import { WidgetConfig } from '@site/src/components/widgets/configuration';
|
import { WidgetConfig } from "@site/src/components/widgets/configuration";
|
||||||
import { WidgetIntegrations } from '@site/src/components/widgets/integrations';
|
import { WidgetIntegrations } from "@site/src/components/widgets/integrations";
|
||||||
import { IconAd } from "@tabler/icons-react";
|
import { IconAd } from "@tabler/icons-react";
|
||||||
import Tabs from '@theme/Tabs';
|
import Tabs from "@theme/Tabs";
|
||||||
import TabItem from '@theme/TabItem';
|
import TabItem from "@theme/TabItem";
|
||||||
import { mediaRequestListWidget } from '.';
|
import { mediaRequestListWidget } from ".";
|
||||||
import { jellyseerrIntegration } from '@site/docs/integrations/jellyseerr';
|
import { jellyseerrIntegration } from "@site/docs/integrations/jellyseerr";
|
||||||
import { overseerrIntegration } from '@site/docs/integrations/overseerr';
|
import { overseerrIntegration } from "@site/docs/integrations/overseerr";
|
||||||
|
|
||||||
|
<WidgetHeader widget={mediaRequestListWidget} categories={["Media requests"]} />
|
||||||
<WidgetHeader
|
|
||||||
widget={mediaRequestListWidget}
|
|
||||||
categories={['Media requests']}
|
|
||||||
/>
|
|
||||||
|
|
||||||
Provides a list of all open and recently closed requests. It also provides the functionality to approve or reject requests.
|
Provides a list of all open and recently closed requests. It also provides the functionality to approve or reject requests.
|
||||||
|
|
||||||
|
You can limit the list to specific request statuses (for example, only show `pending`) and restrict it to requests created within the last N days.
|
||||||
|
|
||||||
### Screenshots
|
### Screenshots
|
||||||
|
|
||||||
import mediaRequestList from './img/list.png';
|
import mediaRequestList from "./img/list.png";
|
||||||
|
|
||||||
<img src={mediaRequestList} alt="media-request-list" width={256} height={256} />
|
<img src={mediaRequestList} alt="media-request-list" width={256} height={256} />
|
||||||
|
|
||||||
### Supported Integrations
|
### Supported Integrations
|
||||||
|
|
||||||
<WidgetIntegrations items={[{
|
<WidgetIntegrations
|
||||||
integration: jellyseerrIntegration,
|
items={[
|
||||||
}, {
|
{
|
||||||
integration: overseerrIntegration,
|
integration: jellyseerrIntegration,
|
||||||
}]} />
|
},
|
||||||
|
{
|
||||||
|
integration: overseerrIntegration,
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
|
||||||
### Interactions
|
### Interactions
|
||||||
|
|
||||||
@@ -47,4 +50,5 @@ import mediaRequestList from './img/list.png';
|
|||||||
<AddingWidget />
|
<AddingWidget />
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
<WidgetConfig configuration={mediaRequestListWidget.configuration} />
|
<WidgetConfig configuration={mediaRequestListWidget.configuration} />
|
||||||
@@ -14,6 +14,18 @@ export const mediaRequestListWidget: WidgetDefinition = {
|
|||||||
values: { type: "boolean" },
|
values: { type: "boolean" },
|
||||||
defaultValue: "yes",
|
defaultValue: "yes",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Statuses to show",
|
||||||
|
description: "Only requests with these statuses will be shown. Defaults to all statuses.",
|
||||||
|
values: "List of: 'pending', 'approved', 'declined', 'failed', 'completed'",
|
||||||
|
defaultValue: "All statuses",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Show only recent requests",
|
||||||
|
description: "Limit to requests created within this many days. Set to 0 to disable the time filter.",
|
||||||
|
values: "0-365",
|
||||||
|
defaultValue: "0",
|
||||||
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -1,29 +1,25 @@
|
|||||||
---
|
---
|
||||||
title: 'Notebook'
|
title: "Notebook"
|
||||||
description: 'A simple notebook widget that supports markdown.'
|
description: "A simple notebook widget that supports markdown."
|
||||||
hide_title: true
|
hide_title: true
|
||||||
---
|
---
|
||||||
|
|
||||||
import { AddingWidget } from '@site/src/components/widgets/adding';
|
import { AddingWidget } from "@site/src/components/widgets/adding";
|
||||||
import { WidgetConfig } from '@site/src/components/widgets/configuration';
|
import { WidgetConfig } from "@site/src/components/widgets/configuration";
|
||||||
import { WidgetHeader } from '@site/src/components/widgets/header';
|
import { WidgetHeader } from "@site/src/components/widgets/header";
|
||||||
import { notebookWidget } from '.';
|
import { notebookWidget } from ".";
|
||||||
|
|
||||||
|
<WidgetHeader widget={notebookWidget} categories={["Notes"]} />
|
||||||
<WidgetHeader
|
|
||||||
widget={notebookWidget}
|
|
||||||
categories={['Notes']}
|
|
||||||
/>
|
|
||||||
|
|
||||||
The notebook widget focuses on usability and is designed to be as simple as possible to bring a familiar editing experience to regular users.
|
The notebook widget focuses on usability and is designed to be as simple as possible to bring a familiar editing experience to regular users.
|
||||||
It is based on Tiptap.dev and supports most of its features.
|
It is based on Tiptap.dev and supports most of its features.
|
||||||
|
|
||||||
### Screenshots
|
### Screenshots
|
||||||
|
|
||||||
import editOff from './img/normal.png';
|
import editOff from "./img/normal.png";
|
||||||
import editOn from './img/edit.png';
|
import editOn from "./img/edit.png";
|
||||||
|
|
||||||
<div className='flex gap-1'>
|
<div className="flex gap-1">
|
||||||
<img src={editOff} alt="notebook edit-off" width={128 * 3} />
|
<img src={editOff} alt="notebook edit-off" width={128 * 3} />
|
||||||
<img src={editOn} alt="notebook edit-on" width={128 * 3} />
|
<img src={editOn} alt="notebook edit-on" width={128 * 3} />
|
||||||
</div>
|
</div>
|
||||||
@@ -33,24 +29,27 @@ import editOn from './img/edit.png';
|
|||||||
<AddingWidget />
|
<AddingWidget />
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
<WidgetConfig configuration={notebookWidget.configuration} />
|
<WidgetConfig configuration={notebookWidget.configuration} />
|
||||||
|
|
||||||
### Editing
|
### Editing
|
||||||
|
|
||||||
When the permissions of the user allows it, you can enter the editing of the text by clicking the following button in the top right.
|
When the permissions of the user allows it, you can enter the editing of the text by clicking the following button in the top right.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
You can then decide to save your changes or cancel them to exit editing, using the buttons placed in the same location.
|
You can then decide to save your changes or cancel them to exit editing, using the buttons placed in the same location.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Notebook toolbar functions
|
### Notebook toolbar functions
|
||||||
The notebook offers a variaty of functions to edit the text and more.
|
|
||||||
|
The notebook offers a variety of functions to edit the text and more.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
#### Common text formatting
|
#### Common text formatting
|
||||||
|
|
||||||
| Function | Description |
|
| Function | Description |
|
||||||
| ---------------------- | ------------------------------------------------------------------- |
|
| ---------------------- | ------------------------------------------------------------------- |
|
||||||
| Bold | Makes the selected text bold |
|
| Bold | Makes the selected text bold |
|
||||||
@@ -62,35 +61,51 @@ The notebook offers a variaty of functions to edit the text and more.
|
|||||||
| Clear formatting | Erases any of the preceding function's effects on the selected text |
|
| Clear formatting | Erases any of the preceding function's effects on the selected text |
|
||||||
|
|
||||||
#### Heading
|
#### Heading
|
||||||
|
|
||||||
Choose a heading size for the line, making the text bigger. Working like titles and sub-titles.
|
Choose a heading size for the line, making the text bigger. Working like titles and sub-titles.
|
||||||
|
|
||||||
#### Text Alignement
|
#### Text Alignment
|
||||||
Select the alignement on the line. Left, center or right.
|
|
||||||
|
Select the alignment on the line. Left, center or right.
|
||||||
|
|
||||||
|
#### Text direction
|
||||||
|
|
||||||
|
Set the current paragraph or heading to left-to-right or right-to-left. This is useful when writing right-to-left text while Homarr is using a left-to-right language, or vice versa.
|
||||||
|
|
||||||
#### Misc functions
|
#### Misc functions
|
||||||
|
|
||||||
##### Blockquote
|
##### Blockquote
|
||||||
|
|
||||||
Puts the current line in a quoting block.
|
Puts the current line in a quoting block.
|
||||||
|
|
||||||
##### Horizontal line
|
##### Horizontal line
|
||||||
|
|
||||||
Adds a line that goes from the far right to the far left as a separator.
|
Adds a line that goes from the far right to the far left as a separator.
|
||||||
|
|
||||||
#### Lists
|
#### Lists
|
||||||
|
|
||||||
##### Bullet lists
|
##### Bullet lists
|
||||||
|
|
||||||
Simple list with a dot preceding each element.
|
Simple list with a dot preceding each element.
|
||||||
|
|
||||||
##### Ordered lists
|
##### Ordered lists
|
||||||
|
|
||||||
List with numbers preceding each element.
|
List with numbers preceding each element.
|
||||||
|
|
||||||
##### Check lists
|
##### Check lists
|
||||||
|
|
||||||
List with a checkbox on each element.
|
List with a checkbox on each element.
|
||||||
|
|
||||||
##### Indentation changes
|
##### Indentation changes
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
When you are currently in a list of any sort, the last 2 buttons will appear and will allow you to change the indentation of the current list item.
|
When you are currently in a list of any sort, the last 2 buttons will appear and will allow you to change the indentation of the current list item.
|
||||||
|
|
||||||
#### Insert functions
|
#### Insert functions
|
||||||
|
|
||||||
##### Link controls
|
##### Link controls
|
||||||
|
|
||||||
The first buttons is to insert a link, or edit an existing link. The link will be applied on the selected text.
|
The first buttons is to insert a link, or edit an existing link. The link will be applied on the selected text.
|
||||||
|
|
||||||
Pasting a link directly into the text will automatically put the link anchor on it too.
|
Pasting a link directly into the text will automatically put the link anchor on it too.
|
||||||
@@ -102,16 +117,20 @@ The second button will remove the link while leaving the text intact.
|
|||||||
This is the modal for the link, The little button in the textbox can be clicked to make the link open in a new tab.
|
This is the modal for the link, The little button in the textbox can be clicked to make the link open in a new tab.
|
||||||
|
|
||||||
##### Image controls
|
##### Image controls
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
##### Source
|
##### Source
|
||||||
|
|
||||||
You can use a normal link to an image or you can also use locally stored images.
|
You can use a normal link to an image or you can also use locally stored images.
|
||||||
|
|
||||||
##### Width
|
##### Width
|
||||||
|
|
||||||
The aspect ratio will always be respected, so only the width field is necessary.
|
The aspect ratio will always be respected, so only the width field is necessary.
|
||||||
You can provide a value in a plain number or you can also use percents to have your image size dynamically change on different screens.
|
You can provide a value in a plain number or you can also use percents to have your image size dynamically change on different screens.
|
||||||
|
|
||||||
#### Table
|
#### Table
|
||||||
|
|
||||||
This last control allows you to add a table, for which you can determine the number of columns and row before inserting it.
|
This last control allows you to add a table, for which you can determine the number of columns and row before inserting it.
|
||||||
|
|
||||||

|

|
||||||
@@ -119,6 +138,7 @@ This last control allows you to add a table, for which you can determine the num
|
|||||||
Clicking that button while in a table will delete it.
|
Clicking that button while in a table will delete it.
|
||||||
|
|
||||||
##### Table controls
|
##### Table controls
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
While in a table, further controls will appear to help edit the table.
|
While in a table, further controls will appear to help edit the table.
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
---
|
|
||||||
title: "AI Chat"
|
|
||||||
description: "Chat with AI models through Open WebUI, with model picking and history."
|
|
||||||
hide_title: true
|
|
||||||
---
|
|
||||||
|
|
||||||
import { WidgetHeader } from "@site/src/components/widgets/header";
|
|
||||||
import { AddingWidget } from "@site/src/components/widgets/adding";
|
|
||||||
import { WidgetConfig } from "@site/src/components/widgets/configuration";
|
|
||||||
import { WidgetIntegrations } from "@site/src/components/widgets/integrations";
|
|
||||||
import { openWebUiWidget } from ".";
|
|
||||||
import { openWebUiIntegration } from "@site/docs/integrations/open-webui";
|
|
||||||
|
|
||||||
<WidgetHeader widget={openWebUiWidget} categories={["AI", "Chat"]} />
|
|
||||||
|
|
||||||
The AI Chat widget lets you chat with AI models served by Open WebUI directly from your dashboard. Responses stream in token-by-token, you can pick any model your Open WebUI instance exposes (Ollama, OpenAI, and other configured providers), and you can browse and reopen your Open WebUI chat history. A full attachment menu lets you ground a conversation on images, uploaded or stored files, web pages, knowledge bases, notes, and previous chats.
|
|
||||||
|
|
||||||
### Supported Integrations
|
|
||||||
|
|
||||||
<WidgetIntegrations
|
|
||||||
items={[
|
|
||||||
{
|
|
||||||
integration: openWebUiIntegration,
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
|
|
||||||
### Adding the widget
|
|
||||||
|
|
||||||
<AddingWidget />
|
|
||||||
|
|
||||||
### Configuration
|
|
||||||
|
|
||||||
<WidgetConfig configuration={openWebUiWidget.configuration} />
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
| Feature | Description |
|
|
||||||
| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
|
|
||||||
| **Model picker** | Lists every model exposed by Open WebUI's `/api/models` endpoint, selectable from the chat input. The first model is selected by default. |
|
|
||||||
| **Streaming responses** | Assistant replies stream in live as they are generated. |
|
|
||||||
| **Chat history** | Browse and reopen previous chats. New conversations are saved back to Open WebUI. |
|
|
||||||
| **Image attachments** | Attach or capture images for vision-capable models (sent inline as multimodal content). A hint warns when the model has no vision support. |
|
|
||||||
| **File attachments** | Upload new documents or attach files already stored in Open WebUI; their content is retrieved as context. |
|
|
||||||
| **Web pages** | Attach a URL; Open WebUI ingests the page and the relevant parts are retrieved as context. |
|
|
||||||
| **Knowledge bases** | Ground replies on any RAG knowledge collection your account owns, with an expandable picker to inspect a base's files. |
|
|
||||||
| **Notes** | Attach the contents of your Open WebUI notes. |
|
|
||||||
| **Reference chats** | Bring a previous conversation in as context for the current one. |
|
|
||||||
| **Voice messages** | Record from your microphone and have Open WebUI transcribe it into the message box (requires STT configured in Open WebUI). |
|
|
||||||
|
|
||||||
### Notes
|
|
||||||
|
|
||||||
- The widget uses a single Open WebUI integration.
|
|
||||||
- Conversations are stored in Open WebUI itself, under the account that owns the API key, so they also appear in the Open WebUI app.
|
|
||||||
- Knowledge bases and attached web pages stay active for the whole conversation until you remove them; images apply only to the message you attach them to.
|
|
||||||
- Conversation text is saved to Open WebUI history, but attached image data is not persisted.
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import { WidgetDefinition } from "@site/src/types";
|
|
||||||
import { IconRobot } from "@tabler/icons-react";
|
|
||||||
|
|
||||||
export const openWebUiWidget: WidgetDefinition = {
|
|
||||||
icon: IconRobot,
|
|
||||||
name: "AI Chat",
|
|
||||||
description: "Chat with AI models through Open WebUI, with model picking and history.",
|
|
||||||
path: "../../widgets/open-webui",
|
|
||||||
configuration: {
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
name: "System prompt",
|
|
||||||
description: "Optional instruction prepended to every conversation.",
|
|
||||||
values: { type: "string" },
|
|
||||||
defaultValue: "empty",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Show chat history",
|
|
||||||
description: "Show a button to browse and reopen previous Open WebUI chats.",
|
|
||||||
values: { type: "boolean" },
|
|
||||||
defaultValue: "yes",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
"random-word-slugs": "^0.1.7",
|
"random-word-slugs": "^0.1.7",
|
||||||
"react": "catalog:",
|
"react": "catalog:",
|
||||||
"react-dom": "catalog:",
|
"react-dom": "catalog:",
|
||||||
"swiper": "^14.0.1",
|
"swiper": "^14.0.5",
|
||||||
"tailwindcss": "^4.3.2"
|
"tailwindcss": "^4.3.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import dynamic from "next/dynamic";
|
|
||||||
|
|
||||||
const OpenWebUiChat = dynamic(() => import("~/components/open-webui-chat").then((mod) => mod.OpenWebUiChat), {
|
|
||||||
ssr: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
export const OpenWebUiChatProvider = () => {
|
|
||||||
return <OpenWebUiChat />;
|
|
||||||
};
|
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import type { PropsWithChildren } from "react";
|
import type { PropsWithChildren } from "react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
import type { QueryKey } from "@tanstack/react-query";
|
||||||
import { QueryClient } from "@tanstack/react-query";
|
import { QueryClient } from "@tanstack/react-query";
|
||||||
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
|
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
|
||||||
import { ReactQueryStreamedHydration } from "@tanstack/react-query-next-experimental";
|
import { ReactQueryStreamedHydration } from "@tanstack/react-query-next-experimental";
|
||||||
@@ -33,6 +34,7 @@ import {
|
|||||||
import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
|
import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
|
||||||
import { env } from "@homarr/common/env";
|
import { env } from "@homarr/common/env";
|
||||||
import { showWarningNotification } from "@homarr/notifications";
|
import { showWarningNotification } from "@homarr/notifications";
|
||||||
|
import { widgetImports } from "@homarr/widgets";
|
||||||
|
|
||||||
import { createWidgetQueryPersister } from "./query-cache-persister";
|
import { createWidgetQueryPersister } from "./query-cache-persister";
|
||||||
|
|
||||||
@@ -90,6 +92,13 @@ export function TRPCReactProvider(props: PropsWithChildren) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
client.setQueryDefaults([["widget"]], { refetchInterval: queryCacheDefaultRefetchIntervalMs });
|
client.setQueryDefaults([["widget"]], { refetchInterval: queryCacheDefaultRefetchIntervalMs });
|
||||||
|
for (const { definition } of Object.values(widgetImports)) {
|
||||||
|
const def = definition as { refetchInterval?: number | null; queryKey?: QueryKey; kind: string };
|
||||||
|
if (def.refetchInterval === undefined) continue;
|
||||||
|
const key = def.queryKey ?? [["widget", def.kind]];
|
||||||
|
const interval = def.refetchInterval === null ? false : def.refetchInterval * 1000;
|
||||||
|
client.setQueryDefaults(key, { refetchInterval: interval });
|
||||||
|
}
|
||||||
return client;
|
return client;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { ActionIcon, Button, Group, Text } from "@mantine/core";
|
|||||||
import type { FileWithPath } from "@mantine/dropzone";
|
import type { FileWithPath } from "@mantine/dropzone";
|
||||||
import { IconPencil } from "@tabler/icons-react";
|
import { IconPencil } from "@tabler/icons-react";
|
||||||
|
|
||||||
import { humanFileSize } from "@homarr/common";
|
import { formatBytes } from "@homarr/common";
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
import { InitStepCard } from "../../_components/init-step-card";
|
import { InitStepCard } from "../../_components/init-step-card";
|
||||||
@@ -22,7 +22,7 @@ export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
|
|||||||
{file.name}
|
{file.name}
|
||||||
</Text>
|
</Text>
|
||||||
<Text visibleFrom="md" c="gray.6" size="sm">
|
<Text visibleFrom="md" c="gray.6" size="sm">
|
||||||
{humanFileSize(file.size)}
|
{formatBytes(file.size)}
|
||||||
</Text>
|
</Text>
|
||||||
</Group>
|
</Group>
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ import { SearchEngineOptimization } from "~/components/layout/search-engine-opti
|
|||||||
import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
|
import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
|
||||||
import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
|
import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
|
||||||
import { DayJsLoader } from "./_client-providers/dayjs-loader";
|
import { DayJsLoader } from "./_client-providers/dayjs-loader";
|
||||||
import { OpenWebUiChatProvider } from "./_client-providers/open-webui-chat";
|
|
||||||
import { JotaiProvider } from "./_client-providers/jotai";
|
import { JotaiProvider } from "./_client-providers/jotai";
|
||||||
import { CustomMantineProvider } from "./_client-providers/mantine";
|
import { CustomMantineProvider } from "./_client-providers/mantine";
|
||||||
import { AuthProvider } from "./_client-providers/session";
|
import { AuthProvider } from "./_client-providers/session";
|
||||||
@@ -148,7 +147,6 @@ export default async function Layout(props: {
|
|||||||
<StackedProvider>
|
<StackedProvider>
|
||||||
<Notifications pauseResetOnHover="notification" />
|
<Notifications pauseResetOnHover="notification" />
|
||||||
<ServiceWorkerRegistration />
|
<ServiceWorkerRegistration />
|
||||||
<OpenWebUiChatProvider />
|
|
||||||
{props.children}
|
{props.children}
|
||||||
</StackedProvider>
|
</StackedProvider>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -16,7 +16,10 @@ export default async function AppEditPage(props: AppEditPageProps) {
|
|||||||
const params = await props.params;
|
const params = await props.params;
|
||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
|
||||||
if (!session?.user.permissions.includes("app-modify-all")) {
|
if (
|
||||||
|
!session?.user.permissions.includes("board-modify-all") ||
|
||||||
|
!session?.user.permissions.includes("app-modify-all")
|
||||||
|
) {
|
||||||
notFound();
|
notFound();
|
||||||
}
|
}
|
||||||
const app = await api.app.byId({ id: params.id });
|
const app = await api.app.byId({ id: params.id });
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
|
|||||||
export default async function AppNewPage() {
|
export default async function AppNewPage() {
|
||||||
const session = await auth();
|
const session = await auth();
|
||||||
|
|
||||||
if (!session?.user.permissions.includes("app-create")) {
|
if (!session?.user.permissions.includes("board-modify-all") || !session?.user.permissions.includes("app-create")) {
|
||||||
notFound();
|
notFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Fragment } from "react";
|
import { Fragment } from "react";
|
||||||
import { redirect } from "next/navigation";
|
import { notFound, redirect } from "next/navigation";
|
||||||
import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
|
import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
|
||||||
import { IconBox, IconPencil } from "@tabler/icons-react";
|
import { IconBox, IconPencil } from "@tabler/icons-react";
|
||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
@@ -33,6 +33,9 @@ export default async function AppsPage(props: AppsPageProps) {
|
|||||||
if (!session) {
|
if (!session) {
|
||||||
redirect("/auth/login");
|
redirect("/auth/login");
|
||||||
}
|
}
|
||||||
|
if (!session.user.permissions.includes("board-modify-all")) {
|
||||||
|
notFound();
|
||||||
|
}
|
||||||
|
|
||||||
const searchParams = searchParamsSchema.parse(await props.searchParams);
|
const searchParams = searchParamsSchema.parse(await props.searchParams);
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
|
|||||||
icon: IconBox,
|
icon: IconBox,
|
||||||
href: "/manage/apps",
|
href: "/manage/apps",
|
||||||
label: t("items.apps"),
|
label: t("items.apps"),
|
||||||
hidden: !session,
|
hidden: !session?.user.permissions.includes("board-modify-all"),
|
||||||
iconProps: {
|
iconProps: {
|
||||||
strokeWidth: 2.5,
|
strokeWidth: 2.5,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import { z } from "zod/v4";
|
|||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { api } from "@homarr/api/server";
|
import { api } from "@homarr/api/server";
|
||||||
import { auth } from "@homarr/auth/next";
|
import { auth } from "@homarr/auth/next";
|
||||||
import { humanFileSize } from "@homarr/common";
|
import { formatBytes } from "@homarr/common";
|
||||||
import type { inferSearchParamsFromSchema } from "@homarr/common/types";
|
import type { inferSearchParamsFromSchema } from "@homarr/common/types";
|
||||||
import { createLocalImageUrl } from "@homarr/icons/local";
|
import { createLocalImageUrl } from "@homarr/icons/local";
|
||||||
import { getI18n } from "@homarr/translation/server";
|
import { getI18n } from "@homarr/translation/server";
|
||||||
@@ -125,7 +125,7 @@ const Row = async ({ media }: RowProps) => {
|
|||||||
/>
|
/>
|
||||||
</TableTd>
|
</TableTd>
|
||||||
<TableTd>{media.name}</TableTd>
|
<TableTd>{media.name}</TableTd>
|
||||||
<TableTd>{humanFileSize(media.size)}</TableTd>
|
<TableTd>{formatBytes(media.size)}</TableTd>
|
||||||
<TableTd>
|
<TableTd>
|
||||||
{media.creator ? (
|
{media.creator ? (
|
||||||
<Group gap="sm">
|
<Group gap="sm">
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import { MantineReactTable } from "mantine-react-table";
|
|||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { humanFileSize, useTimeAgo } from "@homarr/common";
|
import { formatBytes, useTimeAgo } from "@homarr/common";
|
||||||
import type { ContainerState } from "@homarr/docker";
|
import type { ContainerState } from "@homarr/docker";
|
||||||
import { containerStateColorMap, cpuUsageColor, memoryUsageColor, safeValue } from "@homarr/docker/shared";
|
import { containerStateColorMap, cpuUsageColor, memoryUsageColor, safeValue } from "@homarr/docker/shared";
|
||||||
import { useModalAction } from "@homarr/modals";
|
import { useModalAction } from "@homarr/modals";
|
||||||
@@ -143,7 +143,7 @@ const createColumns = (t: TranslationFunction): MRT_ColumnDef<DockerContainer>[]
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Text size="sm" c={memoryUsageColor(bytesUsage, row.original.state)}>
|
<Text size="sm" c={memoryUsageColor(bytesUsage, row.original.state)}>
|
||||||
{humanFileSize(bytesUsage)}
|
{formatBytes(bytesUsage)}
|
||||||
</Text>
|
</Text>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -193,6 +193,10 @@ export function DockerTable({ initialData }: DockerTableProps) {
|
|||||||
positionToolbarAlertBanner: "top",
|
positionToolbarAlertBanner: "top",
|
||||||
enableTableFooter: false,
|
enableTableFooter: false,
|
||||||
enableBottomToolbar: false,
|
enableBottomToolbar: false,
|
||||||
|
// MRT's built-in full-screen mode does not stretch the table to fill the
|
||||||
|
// viewport, so with few containers it renders as a thin strip (#6230). Disable
|
||||||
|
// it, matching the other management tables (users, invites).
|
||||||
|
enableFullScreenToggle: false,
|
||||||
positionGlobalFilter: "right",
|
positionGlobalFilter: "right",
|
||||||
mantineSearchTextInputProps: {
|
mantineSearchTextInputProps: {
|
||||||
placeholder: tDocker("table.search", { count: String(containers.length) }),
|
placeholder: tDocker("table.search", { count: String(containers.length) }),
|
||||||
|
|||||||
+18
@@ -31,6 +31,7 @@ import {
|
|||||||
userChangeHomeBoardsSchema,
|
userChangeHomeBoardsSchema,
|
||||||
userChangeSearchPreferencesSchema,
|
userChangeSearchPreferencesSchema,
|
||||||
userEditProfileSchema,
|
userEditProfileSchema,
|
||||||
|
userEnableRightClickOnWidgetsSchema,
|
||||||
userFirstDayOfWeekSchema,
|
userFirstDayOfWeekSchema,
|
||||||
userPingIconsEnabledSchema,
|
userPingIconsEnabledSchema,
|
||||||
} from "@homarr/validation/user";
|
} from "@homarr/validation/user";
|
||||||
@@ -51,6 +52,7 @@ const userGeneralSettingsSchema = z.object({
|
|||||||
ddgBangsEnabled: userChangeSearchPreferencesSchema.shape.ddgBangsEnabled,
|
ddgBangsEnabled: userChangeSearchPreferencesSchema.shape.ddgBangsEnabled,
|
||||||
firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
|
firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
|
||||||
pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
|
pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
|
||||||
|
enableRightClickOnWidgets: userEnableRightClickOnWidgetsSchema.shape.enableRightClickOnWidgets,
|
||||||
});
|
});
|
||||||
|
|
||||||
type FormValues = z.infer<typeof userGeneralSettingsSchema>;
|
type FormValues = z.infer<typeof userGeneralSettingsSchema>;
|
||||||
@@ -78,6 +80,7 @@ const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues
|
|||||||
ddgBangsEnabled: user.ddgBangs,
|
ddgBangsEnabled: user.ddgBangs,
|
||||||
firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
|
firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
|
||||||
pingIconsEnabled: user.pingIconsEnabled,
|
pingIconsEnabled: user.pingIconsEnabled,
|
||||||
|
enableRightClickOnWidgets: user.enableRightClickOnWidgets,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const UserGeneralSettingsForm = ({
|
export const UserGeneralSettingsForm = ({
|
||||||
@@ -95,6 +98,7 @@ export const UserGeneralSettingsForm = ({
|
|||||||
const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
|
const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
|
||||||
const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
|
const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
|
||||||
const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
|
const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
|
||||||
|
const changeEnableRightClickOnWidgetsMutation = clientApi.user.changeEnableRightClickOnWidgets.useMutation();
|
||||||
|
|
||||||
const initialValues = buildInitialValues(user);
|
const initialValues = buildInitialValues(user);
|
||||||
const initialValuesRef = useRef(initialValues);
|
const initialValuesRef = useRef(initialValues);
|
||||||
@@ -114,6 +118,7 @@ export const UserGeneralSettingsForm = ({
|
|||||||
changeSearchPreferencesMutation,
|
changeSearchPreferencesMutation,
|
||||||
changeFirstDayOfWeekMutation,
|
changeFirstDayOfWeekMutation,
|
||||||
changePingIconsEnabledMutation,
|
changePingIconsEnabledMutation,
|
||||||
|
changeEnableRightClickOnWidgetsMutation,
|
||||||
];
|
];
|
||||||
const isPending = mutations.some((m) => m.isPending);
|
const isPending = mutations.some((m) => m.isPending);
|
||||||
|
|
||||||
@@ -169,6 +174,14 @@ export const UserGeneralSettingsForm = ({
|
|||||||
action: () =>
|
action: () =>
|
||||||
changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
|
changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
when: changed("enableRightClickOnWidgets"),
|
||||||
|
action: () =>
|
||||||
|
changeEnableRightClickOnWidgetsMutation.mutateAsync({
|
||||||
|
id: user.id,
|
||||||
|
enableRightClickOnWidgets: parsed.data.enableRightClickOnWidgets,
|
||||||
|
}),
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const promises = saveActions.filter((s) => s.when).map((s) => s.action());
|
const promises = saveActions.filter((s) => s.when).map((s) => s.action());
|
||||||
@@ -305,6 +318,11 @@ export const UserGeneralSettingsForm = ({
|
|||||||
label={t("user.field.pingIconsEnabled.label")}
|
label={t("user.field.pingIconsEnabled.label")}
|
||||||
{...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
|
{...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
|
||||||
/>
|
/>
|
||||||
|
<Switch
|
||||||
|
label={t("user.field.enableRightClickOnWidgets.label")}
|
||||||
|
description={t("user.field.enableRightClickOnWidgets.description")}
|
||||||
|
{...form.getInputProps("enableRightClickOnWidgets", { type: "checkbox" })}
|
||||||
|
/>
|
||||||
</Stack>
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
</SimpleGrid>
|
</SimpleGrid>
|
||||||
|
|||||||
@@ -1,19 +1,25 @@
|
|||||||
import { notFound } from "next/navigation";
|
|
||||||
|
|
||||||
import { ImageProxy } from "@homarr/image-proxy";
|
import { ImageProxy } from "@homarr/image-proxy";
|
||||||
|
|
||||||
export const GET = async (_request: Request, props: { params: Promise<{ id: string }> }) => {
|
export const GET = async (_request: Request, props: { params: Promise<{ id: string }> }) => {
|
||||||
const { id } = await props.params;
|
const { id } = await props.params;
|
||||||
|
|
||||||
const imageProxy = new ImageProxy();
|
const imageProxy = new ImageProxy();
|
||||||
const image = await imageProxy.forwardImageAsync(id);
|
const result = await imageProxy.forwardImageAsync(id);
|
||||||
if (!image) {
|
|
||||||
notFound();
|
if ("error" in result) {
|
||||||
|
const status = result.error === "upstream-error" ? result.statusCode : result.error === "fetch-error" ? 502 : 404;
|
||||||
|
return new Response(null, {
|
||||||
|
status,
|
||||||
|
headers: {
|
||||||
|
"X-Homarr-Image-Proxy-Error": result.error,
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Response(image, {
|
return new Response(result.image, {
|
||||||
headers: {
|
headers: {
|
||||||
"Cache-Control": "public, max-age=3600, immutable", // Cache for 1 hour
|
"Cache-Control": "public, max-age=3600, immutable", // Cache for 1 hour
|
||||||
|
...(result.contentType ? { "Content-Type": result.contentType } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -1,9 +1,17 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import type { MutableRefObject, ReactNode } from "react";
|
import type { MutableRefObject, ReactNode } from "react";
|
||||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
import { useCallback, useMemo } from "react";
|
||||||
import { Group, Loader, Menu, Switch, Text } from "@mantine/core";
|
import { Group, Loader, Menu, Switch, Text, Tooltip } from "@mantine/core";
|
||||||
import { IconCopy, IconLayoutKanban, IconRefresh, IconSettings, IconTrash } from "@tabler/icons-react";
|
import {
|
||||||
|
IconAlertTriangle,
|
||||||
|
IconCircleCheck,
|
||||||
|
IconCopy,
|
||||||
|
IconLayoutKanban,
|
||||||
|
IconRefresh,
|
||||||
|
IconSettings,
|
||||||
|
IconTrash,
|
||||||
|
} from "@tabler/icons-react";
|
||||||
import type { QueryClient, QueryKey } from "@tanstack/react-query";
|
import type { QueryClient, QueryKey } from "@tanstack/react-query";
|
||||||
import { useIsFetching, useQueryClient } from "@tanstack/react-query";
|
import { useIsFetching, useQueryClient } from "@tanstack/react-query";
|
||||||
|
|
||||||
@@ -11,10 +19,12 @@ import { clientApi } from "@homarr/api/client";
|
|||||||
import { useSession } from "@homarr/auth/client";
|
import { useSession } from "@homarr/auth/client";
|
||||||
import { useRequiredBoard } from "@homarr/boards/context";
|
import { useRequiredBoard } from "@homarr/boards/context";
|
||||||
import { useEditMode } from "@homarr/boards/edit-mode";
|
import { useEditMode } from "@homarr/boards/edit-mode";
|
||||||
|
import { useTimeAgo } from "@homarr/common";
|
||||||
import { useConfirmModal, useModalAction } from "@homarr/modals";
|
import { useConfirmModal, useModalAction } from "@homarr/modals";
|
||||||
import { useSettings } from "@homarr/settings";
|
import { useSettings } from "@homarr/settings";
|
||||||
import { translateIfNecessary } from "@homarr/translation";
|
import { translateIfNecessary } from "@homarr/translation";
|
||||||
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
import { useI18n, useScopedI18n } from "@homarr/translation/client";
|
||||||
|
import type { TranslationFunction } from "@homarr/translation";
|
||||||
import type { WidgetContextMenuAction } from "@homarr/widgets";
|
import type { WidgetContextMenuAction } from "@homarr/widgets";
|
||||||
import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
|
import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
|
||||||
import { WidgetEditModal } from "@homarr/widgets/modals";
|
import { WidgetEditModal } from "@homarr/widgets/modals";
|
||||||
@@ -38,6 +48,7 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
|
|||||||
const tMenu = useScopedI18n("item.menu.label");
|
const tMenu = useScopedI18n("item.menu.label");
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const settings = useSettings();
|
const settings = useSettings();
|
||||||
|
const isRightClickEnabled = settings.enableRightClickOnWidgets;
|
||||||
const { openModal } = useModalAction(WidgetEditModal);
|
const { openModal } = useModalAction(WidgetEditModal);
|
||||||
const { openModal: openMoveModal } = useModalAction(ItemMoveModal);
|
const { openModal: openMoveModal } = useModalAction(ItemMoveModal);
|
||||||
const { openConfirmModal } = useConfirmModal();
|
const { openConfirmModal } = useConfirmModal();
|
||||||
@@ -158,6 +169,7 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!session) return <>{children}</>;
|
if (!session) return <>{children}</>;
|
||||||
|
if (!isRightClickEnabled) return <>{children}</>;
|
||||||
|
|
||||||
const visibleWidgetActions = widgetContextActions.filter((a) => !a.hidden);
|
const visibleWidgetActions = widgetContextActions.filter((a) => !a.hidden);
|
||||||
|
|
||||||
@@ -232,11 +244,14 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
|
|||||||
onClick={handleRefetch}
|
onClick={handleRefetch}
|
||||||
disabled={isWidgetFetching}
|
disabled={isWidgetFetching}
|
||||||
>
|
>
|
||||||
<Group justify="space-between" wrap="nowrap">
|
<Group justify="space-between" wrap="nowrap" gap="sm">
|
||||||
{tMenu("refresh")}
|
{tMenu("refresh")}
|
||||||
<Text size="xs" c="dimmed">
|
<WidgetQueryStatus
|
||||||
<WidgetCacheAge queryClient={queryClient} queryKey={widgetQueryKey} isFetching={isWidgetFetching} />
|
queryClient={queryClient}
|
||||||
</Text>
|
queryKey={widgetQueryKey}
|
||||||
|
isFetching={isWidgetFetching}
|
||||||
|
t={t}
|
||||||
|
/>
|
||||||
</Group>
|
</Group>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item
|
<Menu.Item
|
||||||
@@ -273,34 +288,65 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const WidgetCacheAge = ({
|
interface WidgetQueryStatusProps {
|
||||||
queryClient,
|
|
||||||
queryKey,
|
|
||||||
isFetching,
|
|
||||||
}: {
|
|
||||||
queryClient: QueryClient;
|
queryClient: QueryClient;
|
||||||
queryKey: QueryKey;
|
queryKey: QueryKey;
|
||||||
isFetching: boolean;
|
isFetching: boolean;
|
||||||
}) => {
|
t: TranslationFunction;
|
||||||
// 1s tick for "just now" → "1s ago" label transition; isFetching prop handles refetch reactivity
|
}
|
||||||
const [, setTick] = useState(0);
|
|
||||||
useEffect(() => {
|
|
||||||
const id = setInterval(() => setTick((n) => n + 1), 1000);
|
|
||||||
return () => clearInterval(id);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
if (isFetching) return <Loader size={12} />;
|
const WidgetQueryStatus = ({ queryClient, queryKey, isFetching, t }: WidgetQueryStatusProps) => {
|
||||||
|
const queries = queryClient.getQueryCache().findAll({ queryKey });
|
||||||
|
const timestamps = queries.map((query) => query.state.dataUpdatedAt).filter(Boolean);
|
||||||
|
const latest = timestamps.length > 0 ? Math.max(...timestamps) : 0;
|
||||||
|
const ageLabel = useTimeAgo(new Date(latest));
|
||||||
|
|
||||||
const timestamps = queryClient
|
if (isFetching) {
|
||||||
.getQueryCache()
|
return (
|
||||||
.findAll({ queryKey })
|
<Group gap={4} wrap="nowrap">
|
||||||
.map((q) => q.state.dataUpdatedAt)
|
<Loader size={12} />
|
||||||
.filter(Boolean);
|
<Text size="xs" c="dimmed">
|
||||||
if (timestamps.length === 0) return null;
|
{t("item.menu.status.loading")}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const latest = Math.max(...timestamps);
|
if (queries.length === 0) {
|
||||||
const seconds = Math.floor((Date.now() - latest) / 1000);
|
return (
|
||||||
if (seconds < 5) return "just now";
|
<Text size="xs" c="dimmed">
|
||||||
if (seconds < 60) return `${seconds}s ago`;
|
{t("item.menu.status.idle")}
|
||||||
return `${Math.floor(seconds / 60)}m ago`;
|
</Text>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasError = queries.some((q) => q.state.status === "error");
|
||||||
|
|
||||||
|
if (hasError) {
|
||||||
|
const errorQuery = queries.find((q) => q.state.status === "error");
|
||||||
|
const errorMessage =
|
||||||
|
errorQuery?.state.error instanceof Error
|
||||||
|
? errorQuery.state.error.message
|
||||||
|
: String(errorQuery?.state.error ?? "Unknown error");
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Tooltip label={errorMessage} multiline position="left" w={250}>
|
||||||
|
<Group gap={4} wrap="nowrap">
|
||||||
|
<IconAlertTriangle size={12} color="var(--mantine-color-red-6)" />
|
||||||
|
<Text size="xs" c="red.6">
|
||||||
|
{t("item.menu.status.error")} · {ageLabel}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Group gap={4} wrap="nowrap">
|
||||||
|
<IconCircleCheck size={12} color="var(--mantine-color-green-6)" />
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
{t("item.menu.status.success")} · {ageLabel}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
||||||
import { Box, Drawer } from "@mantine/core";
|
|
||||||
import { useHotkeys, useMediaQuery } from "@mantine/hooks";
|
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { useSession } from "@homarr/auth/client";
|
|
||||||
import { hotkeys } from "@homarr/definitions";
|
|
||||||
import { openWebUiChatEvent } from "@homarr/spotlight";
|
|
||||||
import { useI18n } from "@homarr/translation/client";
|
|
||||||
import { Chat } from "@homarr/widgets/_open-webui/chat";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* App-wide launcher for the Open WebUI chat. Renders a right-side panel that can
|
|
||||||
* be opened from the header user menu, the {@link hotkeys.toggleAiChat} keybind,
|
|
||||||
* or the spotlight "ask AI" mode (via the {@link openWebUiChatEvent} window
|
|
||||||
* event). Renders nothing unless the signed-in user owns an Open WebUI
|
|
||||||
* integration.
|
|
||||||
*/
|
|
||||||
export const OpenWebUiChat = () => {
|
|
||||||
const t = useI18n();
|
|
||||||
const { data: session } = useSession();
|
|
||||||
const isMobile = useMediaQuery("(max-width: 767px)");
|
|
||||||
|
|
||||||
const [opened, setOpened] = useState(false);
|
|
||||||
const [initialQuery, setInitialQuery] = useState<string | undefined>(undefined);
|
|
||||||
// Bumped on every open so the chat remounts and a fresh initial query is sent.
|
|
||||||
const [openNonce, setOpenNonce] = useState(0);
|
|
||||||
|
|
||||||
const { data: integrations = [] } = clientApi.integration.all.useQuery(undefined, {
|
|
||||||
enabled: Boolean(session?.user?.id),
|
|
||||||
refetchOnWindowFocus: false,
|
|
||||||
staleTime: 5 * 60 * 1000,
|
|
||||||
});
|
|
||||||
|
|
||||||
const myOpenWebUiIntegration = useMemo(() => {
|
|
||||||
if (!session?.user?.id) return null;
|
|
||||||
return integrations.find(
|
|
||||||
(integration) => integration.kind === "openWebUi" && integration.creatorId === session.user.id,
|
|
||||||
);
|
|
||||||
}, [integrations, session?.user?.id]);
|
|
||||||
|
|
||||||
const open = useCallback((query?: string) => {
|
|
||||||
setInitialQuery(query?.trim() ? query.trim() : undefined);
|
|
||||||
setOpenNonce((nonce) => nonce + 1);
|
|
||||||
setOpened(true);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const toggle = useCallback(() => {
|
|
||||||
setOpened((previous) => {
|
|
||||||
if (previous) return false;
|
|
||||||
setInitialQuery(undefined);
|
|
||||||
setOpenNonce((nonce) => nonce + 1);
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Open (with an optional query) when the spotlight "ask AI" mode dispatches.
|
|
||||||
useEffect(() => {
|
|
||||||
const handler = (event: Event) => {
|
|
||||||
if (!myOpenWebUiIntegration) return;
|
|
||||||
open((event as CustomEvent<{ query?: string }>).detail?.query);
|
|
||||||
};
|
|
||||||
window.addEventListener(openWebUiChatEvent, handler);
|
|
||||||
return () => window.removeEventListener(openWebUiChatEvent, handler);
|
|
||||||
}, [open, myOpenWebUiIntegration]);
|
|
||||||
|
|
||||||
useHotkeys([[hotkeys.toggleAiChat, () => myOpenWebUiIntegration && toggle()]]);
|
|
||||||
|
|
||||||
if (!myOpenWebUiIntegration) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Drawer
|
|
||||||
opened={opened}
|
|
||||||
onClose={() => setOpened(false)}
|
|
||||||
position="right"
|
|
||||||
size={isMobile ? "100%" : 480}
|
|
||||||
title={t("widget.openWebUi.name")}
|
|
||||||
keepMounted={false}
|
|
||||||
styles={{
|
|
||||||
body: {
|
|
||||||
height: "calc(100dvh - 60px)",
|
|
||||||
display: "flex",
|
|
||||||
flexDirection: "column",
|
|
||||||
padding: 0,
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Box style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0 }}>
|
|
||||||
<Chat
|
|
||||||
key={openNonce}
|
|
||||||
options={{ systemPrompt: "", showHistory: true }}
|
|
||||||
integrationIds={[myOpenWebUiIntegration.id]}
|
|
||||||
itemId={undefined}
|
|
||||||
boardId={undefined}
|
|
||||||
isEditMode={false}
|
|
||||||
setOptions={() => {
|
|
||||||
// No-op: options are fixed for the launcher chat.
|
|
||||||
}}
|
|
||||||
width={480}
|
|
||||||
height={600}
|
|
||||||
initialQuery={initialQuery}
|
|
||||||
/>
|
|
||||||
</Box>
|
|
||||||
</Drawer>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@@ -11,17 +11,14 @@ import {
|
|||||||
IconHome,
|
IconHome,
|
||||||
IconLogin,
|
IconLogin,
|
||||||
IconLogout,
|
IconLogout,
|
||||||
IconRobot,
|
|
||||||
IconSettings,
|
IconSettings,
|
||||||
IconTool,
|
IconTool,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
|
|
||||||
import type { RouterOutputs } from "@homarr/api";
|
import type { RouterOutputs } from "@homarr/api";
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import { signOut, useSession } from "@homarr/auth/client";
|
import { signOut, useSession } from "@homarr/auth/client";
|
||||||
import { hotkeys } from "@homarr/definitions";
|
import { hotkeys } from "@homarr/definitions";
|
||||||
import { createModal, useModalAction } from "@homarr/modals";
|
import { createModal, useModalAction } from "@homarr/modals";
|
||||||
import { openOpenWebUiChat } from "@homarr/spotlight";
|
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
import { Link } from "@homarr/ui";
|
import { Link } from "@homarr/ui";
|
||||||
|
|
||||||
@@ -49,15 +46,6 @@ export const UserAvatarMenu = ({ children, availableUpdatesPromise, isDockerEnab
|
|||||||
const { openModal } = useModalAction(LogoutModal);
|
const { openModal } = useModalAction(LogoutModal);
|
||||||
const { openModal: openDockerModal } = useModalAction(DockerQuickAccessModal);
|
const { openModal: openDockerModal } = useModalAction(DockerQuickAccessModal);
|
||||||
|
|
||||||
const { data: integrations = [] } = clientApi.integration.all.useQuery(undefined, {
|
|
||||||
enabled: Boolean(session.data?.user?.id),
|
|
||||||
refetchOnWindowFocus: false,
|
|
||||||
staleTime: 5 * 60 * 1000,
|
|
||||||
});
|
|
||||||
const hasOpenWebUiIntegration = integrations.some(
|
|
||||||
(integration) => integration.kind === "openWebUi" && integration.creatorId === session.data?.user?.id,
|
|
||||||
);
|
|
||||||
|
|
||||||
const handleSignout = useCallback(async () => {
|
const handleSignout = useCallback(async () => {
|
||||||
await signOut({
|
await signOut({
|
||||||
redirect: false,
|
redirect: false,
|
||||||
@@ -108,11 +96,6 @@ export const UserAvatarMenu = ({ children, availableUpdatesPromise, isDockerEnab
|
|||||||
{t("docker")}
|
{t("docker")}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
)}
|
)}
|
||||||
{hasOpenWebUiIntegration && (
|
|
||||||
<Menu.Item leftSection={<IconRobot size="1rem" />} onClick={() => openOpenWebUiChat()}>
|
|
||||||
{t("aiChat")}
|
|
||||||
</Menu.Item>
|
|
||||||
)}
|
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
<Menu.Divider />
|
<Menu.Divider />
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24.18.0",
|
"node": ">=24.18.0",
|
||||||
"pnpm": ">=11.10.0"
|
"pnpm": ">=11.13.1"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@11.10.0"
|
"packageManager": "pnpm@11.13.1"
|
||||||
}
|
}
|
||||||
+10
-6
@@ -1,11 +1,15 @@
|
|||||||
{
|
{
|
||||||
"name": "homarr",
|
"name": "homarr",
|
||||||
"version": "1.70.0",
|
"version": "1.71.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "cross-env CI=true turbo build",
|
"build": "cross-env CI=true turbo build",
|
||||||
"clean": "git clean -xdf node_modules",
|
"clean": "git clean -xdf node_modules",
|
||||||
"clean:workspaces": "turbo clean",
|
"clean:workspaces": "turbo clean",
|
||||||
|
"ci:act:all": "bash scripts/ci/act.sh all",
|
||||||
|
"ci:act:cleanup": "bash scripts/ci/act.sh cleanup",
|
||||||
|
"ci:act:docker": "bash scripts/ci/act.sh docker",
|
||||||
|
"ci:act:fast": "bash scripts/ci/act.sh fast",
|
||||||
"cli": "pnpm with-env tsx packages/cli/index.ts",
|
"cli": "pnpm with-env tsx packages/cli/index.ts",
|
||||||
"db:migration:mysql:generate": "pnpm -F db migration:mysql:generate",
|
"db:migration:mysql:generate": "pnpm -F db migration:mysql:generate",
|
||||||
"db:migration:mysql:run": "pnpm -F db migration:mysql:run",
|
"db:migration:mysql:run": "pnpm -F db migration:mysql:run",
|
||||||
@@ -33,6 +37,9 @@
|
|||||||
"typecheck": "turbo typecheck",
|
"typecheck": "turbo typecheck",
|
||||||
"with-env": "dotenv -e .env --"
|
"with-env": "dotenv -e .env --"
|
||||||
},
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"jsonpath-plus": "catalog:"
|
||||||
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@playwright/test": "catalog:",
|
"@playwright/test": "catalog:",
|
||||||
"@semantic-release/changelog": "catalog:",
|
"@semantic-release/changelog": "catalog:",
|
||||||
@@ -62,10 +69,7 @@
|
|||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=24.18.0",
|
"node": ">=24.18.0",
|
||||||
"pnpm": ">=11.10.0"
|
"pnpm": ">=11.13.1"
|
||||||
},
|
},
|
||||||
"packageManager": "pnpm@11.10.0",
|
"packageManager": "pnpm@11.13.1"
|
||||||
"dependencies": {
|
|
||||||
"jsonpath-plus": "catalog:"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,8 @@ import { AppAccessControl } from "./app/app-access-control";
|
|||||||
const defaultIcon = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/homarr.svg";
|
const defaultIcon = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/homarr.svg";
|
||||||
|
|
||||||
export const appRouter = createTRPCRouter({
|
export const appRouter = createTRPCRouter({
|
||||||
getPaginated: protectedProcedure
|
getPaginated: permissionRequiredProcedure
|
||||||
|
.requiresPermission("board-modify-all")
|
||||||
.input(paginatedSchema)
|
.input(paginatedSchema)
|
||||||
.output(z.object({ items: z.array(selectAppSchema), totalCount: z.number() }))
|
.output(z.object({ items: z.array(selectAppSchema), totalCount: z.number() }))
|
||||||
.meta({
|
.meta({
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ export const homeRouter = createTRPCRouter({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctx.session?.user) {
|
if (ctx.session?.user.permissions.includes("board-modify-all")) {
|
||||||
statistics.push({
|
statistics.push({
|
||||||
titleKey: "app",
|
titleKey: "app",
|
||||||
subtitleKey: "resources",
|
subtitleKey: "resources",
|
||||||
|
|||||||
@@ -99,7 +99,6 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
name: integration.name,
|
name: integration.name,
|
||||||
kind: integration.kind,
|
kind: integration.kind,
|
||||||
url: integration.url,
|
url: integration.url,
|
||||||
creatorId: integration.creatorId,
|
|
||||||
permissions: {
|
permissions: {
|
||||||
hasUseAccess:
|
hasUseAccess:
|
||||||
permissions.includes("use") || permissions.includes("interact") || permissions.includes("full"),
|
permissions.includes("use") || permissions.includes("interact") || permissions.includes("full"),
|
||||||
@@ -345,67 +344,24 @@ export const integrationRouter = createTRPCRouter({
|
|||||||
const appId = await createAppIfNecessaryAsync(ctx.db, input.app);
|
const appId = await createAppIfNecessaryAsync(ctx.db, input.app);
|
||||||
|
|
||||||
const integrationId = createId();
|
const integrationId = createId();
|
||||||
const userId = ctx.session.user.id;
|
await ctx.db.insert(integrations).values({
|
||||||
const secretValues = input.secrets.map((secret) => ({
|
id: integrationId,
|
||||||
kind: secret.kind,
|
name: input.name,
|
||||||
value: encryptSecret(secret.value),
|
url: input.url,
|
||||||
integrationId,
|
kind: input.kind,
|
||||||
}));
|
appId,
|
||||||
|
|
||||||
// Create the integration, its creator permission and secrets atomically so
|
|
||||||
// a failure part-way through can't leave a committed integration the
|
|
||||||
// creator can neither use nor manage.
|
|
||||||
await handleTransactionsAsync(ctx.db, {
|
|
||||||
handleAsync: async (db, schema) => {
|
|
||||||
await db.transaction(async (transaction) => {
|
|
||||||
await transaction.insert(schema.integrations).values({
|
|
||||||
id: integrationId,
|
|
||||||
name: input.name,
|
|
||||||
url: input.url,
|
|
||||||
kind: input.kind,
|
|
||||||
appId,
|
|
||||||
creatorId: userId,
|
|
||||||
});
|
|
||||||
// Auto-grant the creator "full" permission so they can immediately
|
|
||||||
// use and manage the integration they just created.
|
|
||||||
await transaction.insert(schema.integrationUserPermissions).values({
|
|
||||||
integrationId,
|
|
||||||
userId,
|
|
||||||
permission: "full",
|
|
||||||
});
|
|
||||||
if (secretValues.length >= 1) {
|
|
||||||
await transaction.insert(schema.integrationSecrets).values(secretValues);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
|
||||||
handleSync: (db) => {
|
|
||||||
db.transaction((transaction) => {
|
|
||||||
transaction
|
|
||||||
.insert(integrations)
|
|
||||||
.values({
|
|
||||||
id: integrationId,
|
|
||||||
name: input.name,
|
|
||||||
url: input.url,
|
|
||||||
kind: input.kind,
|
|
||||||
appId,
|
|
||||||
creatorId: userId,
|
|
||||||
})
|
|
||||||
.run();
|
|
||||||
transaction
|
|
||||||
.insert(integrationUserPermissions)
|
|
||||||
.values({
|
|
||||||
integrationId,
|
|
||||||
userId,
|
|
||||||
permission: "full",
|
|
||||||
})
|
|
||||||
.run();
|
|
||||||
if (secretValues.length >= 1) {
|
|
||||||
transaction.insert(integrationSecrets).values(secretValues).run();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (input.secrets.length >= 1) {
|
||||||
|
await ctx.db.insert(integrationSecrets).values(
|
||||||
|
input.secrets.map((secret) => ({
|
||||||
|
kind: secret.kind,
|
||||||
|
value: encryptSecret(secret.value),
|
||||||
|
integrationId,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
logger.info("Created integration", {
|
logger.info("Created integration", {
|
||||||
id: integrationId,
|
id: integrationId,
|
||||||
name: input.name,
|
name: input.name,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { z } from "zod/v4";
|
|||||||
|
|
||||||
import { createId } from "@homarr/common";
|
import { createId } from "@homarr/common";
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { asc, eq, like } from "@homarr/db";
|
import { and, asc, eq, like } from "@homarr/db";
|
||||||
import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries";
|
import { getServerSettingByKeyAsync, updateServerSettingByKeyAsync } from "@homarr/db/queries";
|
||||||
import { searchEngines, users } from "@homarr/db/schema";
|
import { searchEngines, users } from "@homarr/db/schema";
|
||||||
import { byIdSchema, paginatedSchema, searchSchema } from "@homarr/validation/common";
|
import { byIdSchema, paginatedSchema, searchSchema } from "@homarr/validation/common";
|
||||||
@@ -130,9 +130,15 @@ export const searchEngineRouter = createTRPCRouter({
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}),
|
}),
|
||||||
search: protectedProcedure.input(searchSchema).query(async ({ ctx, input }) => {
|
search: publicProcedure.input(searchSchema).query(async ({ ctx, input }) => {
|
||||||
return await ctx.db.query.searchEngines.findMany({
|
return await ctx.db.query.searchEngines.findMany({
|
||||||
where: like(searchEngines.short, `${input.query.toLowerCase().trim()}%`),
|
// Public dashboards have no session: restrict anonymous users to generic
|
||||||
|
// (non-integration) engines so custom search engines work there too (#4132),
|
||||||
|
// while integration-backed engines stay available only when signed in.
|
||||||
|
where: and(
|
||||||
|
like(searchEngines.short, `${input.query.toLowerCase().trim()}%`),
|
||||||
|
ctx.session?.user ? undefined : eq(searchEngines.type, "generic"),
|
||||||
|
),
|
||||||
with: {
|
with: {
|
||||||
integration: {
|
integration: {
|
||||||
columns: {
|
columns: {
|
||||||
|
|||||||
@@ -76,6 +76,33 @@ describe("all should return all apps", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("getPaginated should require board modification access", () => {
|
||||||
|
test("should throw FORBIDDEN without board-modify-all", async () => {
|
||||||
|
const caller = appRouter.createCaller({
|
||||||
|
db: createDb(),
|
||||||
|
deviceType: undefined,
|
||||||
|
session: createDefaultSession(),
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(caller.getPaginated({ page: 1, pageSize: 10 })).rejects.toThrow("Permission denied");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("should return apps with board-modify-all", async () => {
|
||||||
|
const db = createDb();
|
||||||
|
const caller = appRouter.createCaller({
|
||||||
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
|
session: createDefaultSession(["board-modify-all"]),
|
||||||
|
});
|
||||||
|
await db.insert(apps).values({ id: "1", name: "Homarr", iconUrl: "https://homarr.dev/icon.svg" });
|
||||||
|
|
||||||
|
await expect(caller.getPaginated({ page: 1, pageSize: 10 })).resolves.toMatchObject({
|
||||||
|
totalCount: 1,
|
||||||
|
items: [{ id: "1" }],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("byId should return an app by id", () => {
|
describe("byId should return an app by id", () => {
|
||||||
test("should return an app by id when canUserSeeAppAsync returns true", async () => {
|
test("should return an app by id when canUserSeeAppAsync returns true", async () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { describe, expect, test, vi } from "vitest";
|
|||||||
import type { Session } from "@homarr/auth";
|
import type { Session } from "@homarr/auth";
|
||||||
import { createId } from "@homarr/common";
|
import { createId } from "@homarr/common";
|
||||||
import { encryptSecret } from "@homarr/common/server";
|
import { encryptSecret } from "@homarr/common/server";
|
||||||
import { and, eq } from "@homarr/db";
|
|
||||||
import { apps, integrations, integrationSecrets, integrationUserPermissions, users } from "@homarr/db/schema";
|
import { apps, integrations, integrationSecrets, integrationUserPermissions, users } from "@homarr/db/schema";
|
||||||
import { createDb } from "@homarr/db/test";
|
import { createDb } from "@homarr/db/test";
|
||||||
import type { GroupPermissionKey } from "@homarr/definitions";
|
import type { GroupPermissionKey } from "@homarr/definitions";
|
||||||
@@ -302,10 +301,6 @@ describe("create should create a new integration", () => {
|
|||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-create"]),
|
session: defaultSessionWithPermissions(["integration-create"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
// The creator must exist in the DB for the creatorId foreign key
|
|
||||||
await db.insert(users).values({ id: defaultUserId });
|
|
||||||
|
|
||||||
const input = {
|
const input = {
|
||||||
name: "Jellyfin",
|
name: "Jellyfin",
|
||||||
kind: "jellyfin" as const,
|
kind: "jellyfin" as const,
|
||||||
@@ -322,23 +317,10 @@ describe("create should create a new integration", () => {
|
|||||||
|
|
||||||
const dbIntegration = await db.query.integrations.findFirst();
|
const dbIntegration = await db.query.integrations.findFirst();
|
||||||
const dbSecret = await db.query.integrationSecrets.findFirst();
|
const dbSecret = await db.query.integrationSecrets.findFirst();
|
||||||
const dbPermission = await db.query.integrationUserPermissions.findFirst({
|
|
||||||
where: and(
|
|
||||||
eq(integrationUserPermissions.integrationId, dbIntegration!.id),
|
|
||||||
eq(integrationUserPermissions.userId, defaultUserId),
|
|
||||||
),
|
|
||||||
});
|
|
||||||
expect(dbIntegration).toBeDefined();
|
expect(dbIntegration).toBeDefined();
|
||||||
expect(dbIntegration!.name).toBe(input.name);
|
expect(dbIntegration!.name).toBe(input.name);
|
||||||
expect(dbIntegration!.kind).toBe(input.kind);
|
expect(dbIntegration!.kind).toBe(input.kind);
|
||||||
expect(dbIntegration!.url).toBe(input.url);
|
expect(dbIntegration!.url).toBe(input.url);
|
||||||
expect(dbIntegration!.creatorId).toBe(defaultUserId);
|
|
||||||
|
|
||||||
// Creator should be auto-granted "full" permission
|
|
||||||
expect(dbPermission).toBeDefined();
|
|
||||||
expect(dbPermission!.integrationId).toBe(dbIntegration!.id);
|
|
||||||
expect(dbPermission!.userId).toBe(defaultUserId);
|
|
||||||
expect(dbPermission!.permission).toBe("full");
|
|
||||||
|
|
||||||
expect(dbSecret!.integrationId).toBe(dbIntegration!.id);
|
expect(dbSecret!.integrationId).toBe(dbIntegration!.id);
|
||||||
expect(dbSecret).toBeDefined();
|
expect(dbSecret).toBeDefined();
|
||||||
@@ -354,10 +336,6 @@ describe("create should create a new integration", () => {
|
|||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-create"]),
|
session: defaultSessionWithPermissions(["integration-create"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
// The creator must exist in the DB for the creatorId foreign key
|
|
||||||
await db.insert(users).values({ id: defaultUserId });
|
|
||||||
|
|
||||||
const input = {
|
const input = {
|
||||||
name: "Jellyseerr",
|
name: "Jellyseerr",
|
||||||
kind: "jellyseerr" as const,
|
kind: "jellyseerr" as const,
|
||||||
@@ -379,7 +357,6 @@ describe("create should create a new integration", () => {
|
|||||||
expect(dbIntegration!.name).toBe(input.name);
|
expect(dbIntegration!.name).toBe(input.name);
|
||||||
expect(dbIntegration!.kind).toBe(input.kind);
|
expect(dbIntegration!.kind).toBe(input.kind);
|
||||||
expect(dbIntegration!.url).toBe(input.url);
|
expect(dbIntegration!.url).toBe(input.url);
|
||||||
expect(dbIntegration!.creatorId).toBe(defaultUserId);
|
|
||||||
|
|
||||||
expect(dbSecret!.integrationId).toBe(dbIntegration!.id);
|
expect(dbSecret!.integrationId).toBe(dbIntegration!.id);
|
||||||
expect(dbSecret).toBeDefined();
|
expect(dbSecret).toBeDefined();
|
||||||
@@ -397,10 +374,6 @@ describe("create should create a new integration", () => {
|
|||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-create", "app-create"]),
|
session: defaultSessionWithPermissions(["integration-create", "app-create"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
// The creator must exist in the DB for the creatorId foreign key
|
|
||||||
await db.insert(users).values({ id: defaultUserId });
|
|
||||||
|
|
||||||
const input = {
|
const input = {
|
||||||
name: "Jellyfin",
|
name: "Jellyfin",
|
||||||
kind: "jellyfin" as const,
|
kind: "jellyfin" as const,
|
||||||
@@ -432,7 +405,6 @@ describe("create should create a new integration", () => {
|
|||||||
expect(dbIntegration!.name).toBe(input.name);
|
expect(dbIntegration!.name).toBe(input.name);
|
||||||
expect(dbIntegration!.kind).toBe(input.kind);
|
expect(dbIntegration!.kind).toBe(input.kind);
|
||||||
expect(dbIntegration!.url).toBe(input.url);
|
expect(dbIntegration!.url).toBe(input.url);
|
||||||
expect(dbIntegration!.creatorId).toBe(defaultUserId);
|
|
||||||
expect(dbIntegration!.app!.name).toBe(input.app.name);
|
expect(dbIntegration!.app!.name).toBe(input.app.name);
|
||||||
expect(dbIntegration!.app!.pingUrl).toBe(input.app.pingUrl);
|
expect(dbIntegration!.app!.pingUrl).toBe(input.app.pingUrl);
|
||||||
expect(dbIntegration!.app!.href).toBe(input.app.href);
|
expect(dbIntegration!.app!.href).toBe(input.app.href);
|
||||||
@@ -459,10 +431,6 @@ describe("create should create a new integration", () => {
|
|||||||
deviceType: undefined,
|
deviceType: undefined,
|
||||||
session: defaultSessionWithPermissions(["integration-create"]),
|
session: defaultSessionWithPermissions(["integration-create"]),
|
||||||
});
|
});
|
||||||
|
|
||||||
// The creator must exist in the DB for the creatorId foreign key
|
|
||||||
await db.insert(users).values({ id: defaultUserId });
|
|
||||||
|
|
||||||
const input = {
|
const input = {
|
||||||
name: "Jellyfin",
|
name: "Jellyfin",
|
||||||
kind: "jellyfin" as const,
|
kind: "jellyfin" as const,
|
||||||
@@ -487,7 +455,6 @@ describe("create should create a new integration", () => {
|
|||||||
expect(dbIntegration!.kind).toBe(input.kind);
|
expect(dbIntegration!.kind).toBe(input.kind);
|
||||||
expect(dbIntegration!.url).toBe(input.url);
|
expect(dbIntegration!.url).toBe(input.url);
|
||||||
expect(dbIntegration!.appId).toBe(appId);
|
expect(dbIntegration!.appId).toBe(appId);
|
||||||
expect(dbIntegration!.creatorId).toBe(defaultUserId);
|
|
||||||
|
|
||||||
expect(dbSecret!.integrationId).toBe(dbIntegration!.id);
|
expect(dbSecret!.integrationId).toBe(dbIntegration!.id);
|
||||||
expect(dbSecret).toBeDefined();
|
expect(dbSecret).toBeDefined();
|
||||||
|
|||||||
@@ -357,6 +357,83 @@ describe("delete should delete user", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("changeEnableRightClickOnWidgets should toggle the right-click preference", () => {
|
||||||
|
test("non-admin can toggle their own preference", async () => {
|
||||||
|
const db = createDb();
|
||||||
|
const caller = userRouter.createCaller({
|
||||||
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
|
session: defaultSession,
|
||||||
|
});
|
||||||
|
|
||||||
|
await db.insert(users).values({
|
||||||
|
id: defaultOwnerId,
|
||||||
|
name: "owner",
|
||||||
|
});
|
||||||
|
|
||||||
|
await caller.changeEnableRightClickOnWidgets({ id: defaultOwnerId, enableRightClickOnWidgets: false });
|
||||||
|
|
||||||
|
const updated = await db.query.users.findFirst({
|
||||||
|
where: eq(users.id, defaultOwnerId),
|
||||||
|
columns: { enableRightClickOnWidgets: true },
|
||||||
|
});
|
||||||
|
expect(updated?.enableRightClickOnWidgets).toBe(false);
|
||||||
|
|
||||||
|
await caller.changeEnableRightClickOnWidgets({ id: defaultOwnerId, enableRightClickOnWidgets: true });
|
||||||
|
|
||||||
|
const restored = await db.query.users.findFirst({
|
||||||
|
where: eq(users.id, defaultOwnerId),
|
||||||
|
columns: { enableRightClickOnWidgets: true },
|
||||||
|
});
|
||||||
|
expect(restored?.enableRightClickOnWidgets).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("non-admin cannot toggle another user's preference", async () => {
|
||||||
|
const db = createDb();
|
||||||
|
const caller = userRouter.createCaller({
|
||||||
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
|
session: defaultSession,
|
||||||
|
});
|
||||||
|
|
||||||
|
const otherUserId = createId();
|
||||||
|
await db.insert(users).values({ id: defaultOwnerId });
|
||||||
|
await db.insert(users).values({ id: otherUserId, name: "other" });
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
caller.changeEnableRightClickOnWidgets({ id: otherUserId, enableRightClickOnWidgets: false }),
|
||||||
|
).rejects.toThrow("User not found");
|
||||||
|
|
||||||
|
const other = await db.query.users.findFirst({
|
||||||
|
where: eq(users.id, otherUserId),
|
||||||
|
columns: { enableRightClickOnWidgets: true },
|
||||||
|
});
|
||||||
|
expect(other?.enableRightClickOnWidgets).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("admin can toggle another user's preference", async () => {
|
||||||
|
const db = createDb();
|
||||||
|
const adminSession = createSession(["admin"]);
|
||||||
|
const caller = userRouter.createCaller({
|
||||||
|
db,
|
||||||
|
deviceType: undefined,
|
||||||
|
session: adminSession,
|
||||||
|
});
|
||||||
|
|
||||||
|
const targetUserId = createId();
|
||||||
|
await db.insert(users).values({ id: defaultOwnerId });
|
||||||
|
await db.insert(users).values({ id: targetUserId, name: "target" });
|
||||||
|
|
||||||
|
await caller.changeEnableRightClickOnWidgets({ id: targetUserId, enableRightClickOnWidgets: false });
|
||||||
|
|
||||||
|
const target = await db.query.users.findFirst({
|
||||||
|
where: eq(users.id, targetUserId),
|
||||||
|
columns: { enableRightClickOnWidgets: true },
|
||||||
|
});
|
||||||
|
expect(target?.enableRightClickOnWidgets).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
const createOnboardingStepAsync = async (db: Database, step: OnboardingStep) => {
|
const createOnboardingStepAsync = async (db: Database, step: OnboardingStep) => {
|
||||||
await db.insert(onboarding).values({
|
await db.insert(onboarding).values({
|
||||||
id: createId(),
|
id: createId(),
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import {
|
|||||||
userCreateSchema,
|
userCreateSchema,
|
||||||
userDdgBangsSchema,
|
userDdgBangsSchema,
|
||||||
userEditProfileSchema,
|
userEditProfileSchema,
|
||||||
|
userEnableRightClickOnWidgetsSchema,
|
||||||
userFirstDayOfWeekSchema,
|
userFirstDayOfWeekSchema,
|
||||||
userInitSchema,
|
userInitSchema,
|
||||||
userPingIconsEnabledSchema,
|
userPingIconsEnabledSchema,
|
||||||
@@ -345,6 +346,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
mobileHomeBoardId: true,
|
mobileHomeBoardId: true,
|
||||||
firstDayOfWeek: true,
|
firstDayOfWeek: true,
|
||||||
pingIconsEnabled: true,
|
pingIconsEnabled: true,
|
||||||
|
enableRightClickOnWidgets: true,
|
||||||
defaultSearchEngineId: true,
|
defaultSearchEngineId: true,
|
||||||
openSearchInNewTab: true,
|
openSearchInNewTab: true,
|
||||||
ddgBangs: true,
|
ddgBangs: true,
|
||||||
@@ -381,6 +383,7 @@ export const userRouter = createTRPCRouter({
|
|||||||
mobileHomeBoardId: true,
|
mobileHomeBoardId: true,
|
||||||
firstDayOfWeek: true,
|
firstDayOfWeek: true,
|
||||||
pingIconsEnabled: true,
|
pingIconsEnabled: true,
|
||||||
|
enableRightClickOnWidgets: true,
|
||||||
defaultSearchEngineId: true,
|
defaultSearchEngineId: true,
|
||||||
openSearchInNewTab: true,
|
openSearchInNewTab: true,
|
||||||
ddgBangs: true,
|
ddgBangs: true,
|
||||||
@@ -651,6 +654,32 @@ export const userRouter = createTRPCRouter({
|
|||||||
})
|
})
|
||||||
.where(eq(users.id, ctx.session.user.id));
|
.where(eq(users.id, ctx.session.user.id));
|
||||||
}),
|
}),
|
||||||
|
changeEnableRightClickOnWidgets: protectedProcedure
|
||||||
|
.meta({
|
||||||
|
openapi: {
|
||||||
|
method: "PATCH",
|
||||||
|
path: "/api/users/right-click-widgets",
|
||||||
|
tags: ["users"],
|
||||||
|
protect: true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.input(convertIntersectionToZodObject(userEnableRightClickOnWidgetsSchema.and(byIdSchema)))
|
||||||
|
.output(z.void())
|
||||||
|
.mutation(async ({ input, ctx }) => {
|
||||||
|
if (!ctx.session.user.permissions.includes("admin") && ctx.session.user.id !== input.id) {
|
||||||
|
throw new TRPCError({
|
||||||
|
code: "NOT_FOUND",
|
||||||
|
message: "User not found",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
await ctx.db
|
||||||
|
.update(users)
|
||||||
|
.set({
|
||||||
|
enableRightClickOnWidgets: input.enableRightClickOnWidgets,
|
||||||
|
})
|
||||||
|
.where(eq(users.id, input.id));
|
||||||
|
}),
|
||||||
changePingIconsEnabled: protectedProcedure
|
changePingIconsEnabled: protectedProcedure
|
||||||
.input(userPingIconsEnabledSchema.and(byIdSchema))
|
.input(userPingIconsEnabledSchema.and(byIdSchema))
|
||||||
.mutation(async ({ input, ctx }) => {
|
.mutation(async ({ input, ctx }) => {
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export const immichRouter = createTRPCRouter({
|
|||||||
.concat(createImmichIntegrationMiddleware("query"))
|
.concat(createImmichIntegrationMiddleware("query"))
|
||||||
.input(
|
.input(
|
||||||
z.object({
|
z.object({
|
||||||
albumId: z.string(),
|
albumId: z.string().optional(),
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.query(async ({ ctx, input }) => {
|
.query(async ({ ctx, input }) => {
|
||||||
|
|||||||
@@ -43,6 +43,5 @@ export const widgetRouter = createTRPCRouter({
|
|||||||
ups: lazy(() => import("./ups").then((mod) => mod.upsRouter)),
|
ups: lazy(() => import("./ups").then((mod) => mod.upsRouter)),
|
||||||
traefik: lazy(() => import("./traefik").then((mod) => mod.traefikRouter)),
|
traefik: lazy(() => import("./traefik").then((mod) => mod.traefikRouter)),
|
||||||
customApi: lazy(() => import("./custom-api").then((mod) => mod.customApiRouter)),
|
customApi: lazy(() => import("./custom-api").then((mod) => mod.customApiRouter)),
|
||||||
openWebUi: lazy(() => import("./open-webui").then((mod) => mod.openWebUiRouter)),
|
|
||||||
secrets: lazy(() => import("./widget-secrets").then((mod) => mod.widgetSecretsRouter)),
|
secrets: lazy(() => import("./widget-secrets").then((mod) => mod.widgetSecretsRouter)),
|
||||||
});
|
});
|
||||||
@@ -3,7 +3,10 @@ import { z } from "zod/v4";
|
|||||||
import { getIntegrationKindsByCategory } from "@homarr/definitions";
|
import { getIntegrationKindsByCategory } from "@homarr/definitions";
|
||||||
import { createIntegrationAsync } from "@homarr/integrations";
|
import { createIntegrationAsync } from "@homarr/integrations";
|
||||||
import { mediaRequestStatusConfiguration } from "@homarr/integrations/types";
|
import { mediaRequestStatusConfiguration } from "@homarr/integrations/types";
|
||||||
import { mediaRequestListRequestHandler } from "@homarr/request-handler/media-request-list";
|
import {
|
||||||
|
mediaRequestListInputSchema,
|
||||||
|
mediaRequestListRequestHandler,
|
||||||
|
} from "@homarr/request-handler/media-request-list";
|
||||||
import { mediaRequestStatsRequestHandler } from "@homarr/request-handler/media-request-stats";
|
import { mediaRequestStatsRequestHandler } from "@homarr/request-handler/media-request-stats";
|
||||||
|
|
||||||
import { createManyIntegrationMiddleware, createOneIntegrationMiddleware } from "../../middlewares/integration";
|
import { createManyIntegrationMiddleware, createOneIntegrationMiddleware } from "../../middlewares/integration";
|
||||||
@@ -16,13 +19,14 @@ export const mediaRequestsRouter = createTRPCRouter({
|
|||||||
mcp: {
|
mcp: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
description:
|
description:
|
||||||
"Get latest media requests from Overseerr/Jellyseerr with their status (pending, approved, declined, available). REQUIRED: integrationIds (array of Overseerr/Jellyseerr integration IDs from integration_all)",
|
"Get latest media requests from Overseerr/Jellyseerr with their status (pending, approved, declined, failed, completed). REQUIRED: integrationIds (array of Overseerr/Jellyseerr integration IDs from integration_all). OPTIONAL: statuses (array of statuses to include, must be non-empty) and recentDays (number 0-365; 0 disables the time filter).",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("mediaRequest")))
|
.concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("mediaRequest")))
|
||||||
.query(async ({ ctx }) => {
|
.input(mediaRequestListInputSchema)
|
||||||
|
.query(async ({ ctx, input }) => {
|
||||||
const results = await settleIntegrationQueries(ctx.integrations, async (integration) => {
|
const results = await settleIntegrationQueries(ctx.integrations, async (integration) => {
|
||||||
const { data } = await mediaRequestListRequestHandler.handler(integration, {}).getDataAsync();
|
const { data } = await mediaRequestListRequestHandler.handler(integration, input).getDataAsync();
|
||||||
return { integration: { id: integration.id, name: integration.name, kind: integration.kind }, data };
|
return { integration: { id: integration.id, name: integration.name, kind: integration.kind }, data };
|
||||||
});
|
});
|
||||||
return results
|
return results
|
||||||
|
|||||||
@@ -1,379 +0,0 @@
|
|||||||
import { observable } from "@trpc/server/observable";
|
|
||||||
import { TRPCError } from "@trpc/server";
|
|
||||||
import { z } from "zod/v4";
|
|
||||||
|
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
|
||||||
import { createIntegrationAsync } from "@homarr/integrations";
|
|
||||||
import {
|
|
||||||
openWebUiChatRequestHandler,
|
|
||||||
openWebUiChatsRequestHandler,
|
|
||||||
openWebUiFilesRequestHandler,
|
|
||||||
openWebUiKnowledgeFilesRequestHandler,
|
|
||||||
openWebUiKnowledgeRequestHandler,
|
|
||||||
openWebUiModelsRequestHandler,
|
|
||||||
openWebUiNoteRequestHandler,
|
|
||||||
openWebUiNotesRequestHandler,
|
|
||||||
} from "@homarr/request-handler/open-webui";
|
|
||||||
|
|
||||||
import { createOneIntegrationMiddleware } from "../../middlewares/integration";
|
|
||||||
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../../trpc";
|
|
||||||
|
|
||||||
const logger = createLogger({ module: "openWebUiRouter" });
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open WebUI integrations hold a personal API key that grants access to a
|
|
||||||
* single user's data (chat history, files, notes, knowledge bases). To prevent
|
|
||||||
* other Homarr users from reading that data, every procedure that touches the
|
|
||||||
* integration verifies that the caller is the integration's creator.
|
|
||||||
*
|
|
||||||
* The check is intentionally placed **after** the integration middleware (which
|
|
||||||
* already validates the caller's permission level) so the error message does
|
|
||||||
* not leak whether the integration exists.
|
|
||||||
*/
|
|
||||||
const throwIfNotCreator = (integration: { creatorId?: string | null }, userId: string | undefined) => {
|
|
||||||
// Existing integrations that predate the creatorId column have a null
|
|
||||||
// creatorId; we skip the check for backward compatibility.
|
|
||||||
if (integration.creatorId && integration.creatorId !== userId) {
|
|
||||||
throw new TRPCError({ code: "FORBIDDEN", message: "Only the integration creator can access this data" });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Hosts that should never be fetched server-side. processWeb is already
|
|
||||||
// creator-gated, but we still refuse loopback and the cloud metadata endpoint so
|
|
||||||
// a stray URL can't turn Open WebUI's fetcher into an SSRF vector. Private LAN
|
|
||||||
// ranges stay allowed on purpose (self-hosters routinely ingest internal wikis).
|
|
||||||
const isBlockedWebHost = (hostname: string): boolean => {
|
|
||||||
const host = hostname.toLowerCase().replace(/^\[|\]$/g, "");
|
|
||||||
return (
|
|
||||||
host === "localhost" ||
|
|
||||||
host.endsWith(".localhost") ||
|
|
||||||
host === "0.0.0.0" ||
|
|
||||||
host === "::" ||
|
|
||||||
host === "::1" ||
|
|
||||||
host.startsWith("127.") ||
|
|
||||||
host === "169.254.169.254" || // AWS/GCP/Azure instance metadata
|
|
||||||
host === "metadata.google.internal"
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
// A user-provided URL for web-page ingestion: must be http(s) and not target a
|
|
||||||
// loopback/metadata host.
|
|
||||||
const webUrlSchema = z
|
|
||||||
.string()
|
|
||||||
.url()
|
|
||||||
.refine((value) => {
|
|
||||||
let parsed: URL;
|
|
||||||
try {
|
|
||||||
parsed = new URL(value);
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return (parsed.protocol === "http:" || parsed.protocol === "https:") && !isBlockedWebHost(parsed.hostname);
|
|
||||||
}, "URL must be an http(s) address and must not point at a loopback or metadata host");
|
|
||||||
|
|
||||||
// Roughly 18 MB of raw bytes once base64-decoded (base64 inflates by ~4/3).
|
|
||||||
// Bounds the upload/transcription payloads so a huge request can't pressure
|
|
||||||
// memory here or upstream before we even start decoding.
|
|
||||||
const MAX_BASE64_LENGTH = 25_000_000;
|
|
||||||
const boundedBase64Schema = z.string().min(1).max(MAX_BASE64_LENGTH);
|
|
||||||
const uploadFilenameSchema = z.string().min(1).max(255);
|
|
||||||
const contentTypeSchema = z.string().min(1).max(255);
|
|
||||||
|
|
||||||
// Tag persisted conversations with the owning Homarr user so they can be found
|
|
||||||
// back in Open WebUI even when an integration/account is shared between users.
|
|
||||||
const homarrUserTag = (userId: string) => `homarr-user:${userId}`;
|
|
||||||
|
|
||||||
const messageSchema = z.object({
|
|
||||||
role: z.enum(["system", "user", "assistant"]),
|
|
||||||
content: z.string(),
|
|
||||||
});
|
|
||||||
|
|
||||||
// Outbound completion messages may carry multimodal parts (text + images),
|
|
||||||
// so users can attach images to a message.
|
|
||||||
const contentPartSchema = z.discriminatedUnion("type", [
|
|
||||||
z.object({ type: z.literal("text"), text: z.string() }),
|
|
||||||
z.object({ type: z.literal("image_url"), image_url: z.object({ url: z.string() }) }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const completionMessageSchema = z.object({
|
|
||||||
role: z.enum(["system", "user", "assistant"]),
|
|
||||||
content: z.union([z.string(), z.array(contentPartSchema)]),
|
|
||||||
});
|
|
||||||
|
|
||||||
const chatPayloadSchema = z.object({
|
|
||||||
title: z.string(),
|
|
||||||
models: z.array(z.string()),
|
|
||||||
messages: z.array(messageSchema),
|
|
||||||
});
|
|
||||||
|
|
||||||
type StreamEvent = { type: "delta"; content: string } | { type: "done" } | { type: "error"; message: string };
|
|
||||||
|
|
||||||
type CompletionMessage = z.infer<typeof completionMessageSchema>;
|
|
||||||
|
|
||||||
// Extract the plain text of a message, flattening multimodal content parts.
|
|
||||||
const messageText = (message: CompletionMessage): string =>
|
|
||||||
typeof message.content === "string"
|
|
||||||
? message.content
|
|
||||||
: message.content
|
|
||||||
.filter((part): part is { type: "text"; text: string } => part.type === "text")
|
|
||||||
.map((part) => part.text)
|
|
||||||
.join(" ");
|
|
||||||
|
|
||||||
// Number of chunks to retrieve per collection when grounding a reply.
|
|
||||||
const RETRIEVAL_K = 4;
|
|
||||||
|
|
||||||
// Instruction prepended to the retrieved context so the model knows how to use
|
|
||||||
// it. Model-facing, so intentionally not localized.
|
|
||||||
const RETRIEVAL_INSTRUCTION =
|
|
||||||
"Use the following context from the user's attached sources (web pages, knowledge bases, " +
|
|
||||||
"files, notes and chats) to answer. If the answer is not in the context, say so.";
|
|
||||||
|
|
||||||
// Retrieve relevant chunks from the attached collections and prepend them as a
|
|
||||||
// system context message so the model can ground its reply on them.
|
|
||||||
const groundMessagesAsync = async (
|
|
||||||
client: { queryCollectionsAsync: (names: string[], query: string, k?: number) => Promise<string[]> },
|
|
||||||
messages: CompletionMessage[],
|
|
||||||
collections: string[],
|
|
||||||
contextTexts: string[],
|
|
||||||
): Promise<CompletionMessage[]> => {
|
|
||||||
if (collections.length === 0 && contextTexts.length === 0) return messages;
|
|
||||||
|
|
||||||
// Use the most recent user message that has text. The latest turn can be
|
|
||||||
// image-only (no text), in which case we fall back to the prior question so
|
|
||||||
// attached collections still get a meaningful retrieval query.
|
|
||||||
const query =
|
|
||||||
messages
|
|
||||||
.filter((message) => message.role === "user")
|
|
||||||
.map(messageText)
|
|
||||||
.findLast((text) => text.trim() !== "") ?? "";
|
|
||||||
|
|
||||||
let documents: string[] = [];
|
|
||||||
if (collections.length > 0) {
|
|
||||||
try {
|
|
||||||
documents = await client.queryCollectionsAsync(collections, query, RETRIEVAL_K);
|
|
||||||
} catch (error) {
|
|
||||||
logger.warn("Open WebUI context retrieval failed; continuing without it", { error });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const blocks = [...documents, ...contextTexts].filter((block) => block.trim() !== "");
|
|
||||||
if (blocks.length === 0) return messages;
|
|
||||||
|
|
||||||
const contextMessage: CompletionMessage = {
|
|
||||||
role: "system",
|
|
||||||
content: `${RETRIEVAL_INSTRUCTION}\n\n${blocks.join("\n\n")}`,
|
|
||||||
};
|
|
||||||
return [contextMessage, ...messages];
|
|
||||||
};
|
|
||||||
|
|
||||||
export const openWebUiRouter = createTRPCRouter({
|
|
||||||
getModels: publicProcedure.concat(createOneIntegrationMiddleware("query", "openWebUi")).query(async ({ ctx }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session?.user.id);
|
|
||||||
const handler = openWebUiModelsRequestHandler.handler(ctx.integration, {});
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Chat history exposes private user data, so we require "interact" access
|
|
||||||
// (not just "query") and verify the caller is the integration's creator.
|
|
||||||
getChats: protectedProcedure
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.query(async ({ ctx }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const handler = openWebUiChatsRequestHandler.handler(ctx.integration, {});
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Knowledge bases, files and notes expose private source content/metadata, so
|
|
||||||
// gate them like the interactive chat paths (protected + "interact" access,
|
|
||||||
// creator-only) instead of leaving them reachable by anonymous board viewers.
|
|
||||||
getKnowledge: protectedProcedure
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.query(async ({ ctx }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const handler = openWebUiKnowledgeRequestHandler.handler(ctx.integration, {});
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
getFiles: protectedProcedure
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.query(async ({ ctx }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const handler = openWebUiFilesRequestHandler.handler(ctx.integration, {});
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
getNotes: protectedProcedure
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.query(async ({ ctx }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const handler = openWebUiNotesRequestHandler.handler(ctx.integration, {});
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
getNote: protectedProcedure
|
|
||||||
.input(z.object({ noteId: z.string() }))
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.query(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const handler = openWebUiNoteRequestHandler.handler(ctx.integration, { noteId: input.noteId });
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
getKnowledgeFiles: protectedProcedure
|
|
||||||
.input(z.object({ knowledgeId: z.string() }))
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.query(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const handler = openWebUiKnowledgeFilesRequestHandler.handler(ctx.integration, {
|
|
||||||
knowledgeId: input.knowledgeId,
|
|
||||||
});
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Ingest a web page so its content can ground later messages. Returns the
|
|
||||||
// collection to retrieve from plus a display title.
|
|
||||||
processWeb: protectedProcedure
|
|
||||||
.input(z.object({ url: webUrlSchema }))
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.mutation(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const client = await createIntegrationAsync(ctx.integration);
|
|
||||||
return await client.processWebAsync(input.url);
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Upload a file (e.g. a document) so it can be retrieved from later. Returns
|
|
||||||
// the file id; its vector collection is `file-{id}`.
|
|
||||||
uploadFile: protectedProcedure
|
|
||||||
.input(
|
|
||||||
z.object({ filename: uploadFilenameSchema, contentBase64: boundedBase64Schema, contentType: contentTypeSchema }),
|
|
||||||
)
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.mutation(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const client = await createIntegrationAsync(ctx.integration);
|
|
||||||
return await client.uploadFileAsync(input.filename, input.contentBase64, input.contentType);
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Transcribe recorded audio to text for voice messages.
|
|
||||||
transcribe: protectedProcedure
|
|
||||||
.input(
|
|
||||||
z.object({ filename: uploadFilenameSchema, contentBase64: boundedBase64Schema, contentType: contentTypeSchema }),
|
|
||||||
)
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.mutation(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const client = await createIntegrationAsync(ctx.integration);
|
|
||||||
const text = await client.transcribeAudioAsync(input.filename, input.contentBase64, input.contentType);
|
|
||||||
return { text };
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Full chat messages contain private user data; restrict to the creator.
|
|
||||||
getChat: protectedProcedure
|
|
||||||
.input(z.object({ chatId: z.string() }))
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.query(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const handler = openWebUiChatRequestHandler.handler(ctx.integration, { chatId: input.chatId });
|
|
||||||
const { data } = await handler.getDataAsync();
|
|
||||||
return data;
|
|
||||||
}),
|
|
||||||
|
|
||||||
createChat: protectedProcedure
|
|
||||||
.input(chatPayloadSchema)
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.mutation(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const client = await createIntegrationAsync(ctx.integration);
|
|
||||||
const chat = await client.createChatAsync({
|
|
||||||
title: input.title,
|
|
||||||
models: input.models,
|
|
||||||
messages: input.messages,
|
|
||||||
meta: { tags: [homarrUserTag(ctx.session.user.id)] },
|
|
||||||
});
|
|
||||||
openWebUiChatsRequestHandler.invalidateCache();
|
|
||||||
return chat;
|
|
||||||
}),
|
|
||||||
|
|
||||||
updateChat: protectedProcedure
|
|
||||||
.input(z.object({ chatId: z.string(), chat: chatPayloadSchema }))
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.mutation(async ({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session.user.id);
|
|
||||||
const client = await createIntegrationAsync(ctx.integration);
|
|
||||||
const chat = await client.updateChatAsync(input.chatId, {
|
|
||||||
...input.chat,
|
|
||||||
meta: { tags: [homarrUserTag(ctx.session.user.id)] },
|
|
||||||
});
|
|
||||||
openWebUiChatsRequestHandler.invalidateCache();
|
|
||||||
openWebUiChatRequestHandler.invalidateCache();
|
|
||||||
return chat;
|
|
||||||
}),
|
|
||||||
|
|
||||||
// Streaming chat completion. Delivered over the WebSocket subscription link so
|
|
||||||
// tokens can be emitted as they arrive. A completion spends the owner's upstream
|
|
||||||
// LLM credits, so it must not be reachable by anonymous viewers of a public
|
|
||||||
// board: protectedProcedure requires a session (the WS context resolves it from
|
|
||||||
// the session-token cookie) and the "interact" middleware checks integration
|
|
||||||
// access, matching processWeb/uploadFile/transcribe above.
|
|
||||||
sendMessage: protectedProcedure
|
|
||||||
.input(
|
|
||||||
z.object({
|
|
||||||
model: z.string(),
|
|
||||||
messages: z.array(completionMessageSchema),
|
|
||||||
// Collections to ground the reply on (web pages, knowledge bases, files).
|
|
||||||
// We retrieve relevant chunks and inject them before streaming.
|
|
||||||
collections: z.array(z.string()).optional(),
|
|
||||||
// Verbatim context blocks (notes, referenced chats) injected as-is.
|
|
||||||
contextTexts: z.array(z.string()).optional(),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.concat(createOneIntegrationMiddleware("interact", "openWebUi"))
|
|
||||||
.subscription(({ ctx, input }) => {
|
|
||||||
throwIfNotCreator(ctx.integration, ctx.session?.user.id);
|
|
||||||
return observable<StreamEvent>((emit) => {
|
|
||||||
const controller = new AbortController();
|
|
||||||
|
|
||||||
void (async () => {
|
|
||||||
try {
|
|
||||||
const client = await createIntegrationAsync(ctx.integration);
|
|
||||||
const messages = await groundMessagesAsync(
|
|
||||||
client,
|
|
||||||
input.messages,
|
|
||||||
input.collections ?? [],
|
|
||||||
input.contextTexts ?? [],
|
|
||||||
);
|
|
||||||
await client.streamChatCompletionAsync(
|
|
||||||
{ model: input.model, messages },
|
|
||||||
(delta) => emit.next({ type: "delta", content: delta }),
|
|
||||||
controller.signal,
|
|
||||||
);
|
|
||||||
emit.next({ type: "done" });
|
|
||||||
emit.complete();
|
|
||||||
} catch (error) {
|
|
||||||
if (!controller.signal.aborted) {
|
|
||||||
logger.error("Open WebUI chat completion failed", {
|
|
||||||
integrationId: ctx.integration.id,
|
|
||||||
error,
|
|
||||||
});
|
|
||||||
emit.next({
|
|
||||||
type: "error",
|
|
||||||
message: error instanceof Error ? error.message : "Failed to stream chat completion",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
emit.complete();
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
controller.abort();
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
@@ -3,6 +3,7 @@ import { escapeForRegEx } from "@tiptap/react";
|
|||||||
import { z } from "zod/v4";
|
import { z } from "zod/v4";
|
||||||
|
|
||||||
import { decryptSecret } from "@homarr/common/server";
|
import { decryptSecret } from "@homarr/common/server";
|
||||||
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
import { eq } from "@homarr/db";
|
import { eq } from "@homarr/db";
|
||||||
import { boards, items, widgetSecrets } from "@homarr/db/schema";
|
import { boards, items, widgetSecrets } from "@homarr/db/schema";
|
||||||
import { releaseProviderKinds } from "@homarr/definitions";
|
import { releaseProviderKinds } from "@homarr/definitions";
|
||||||
@@ -11,6 +12,8 @@ import { releasesRequestHandler } from "@homarr/request-handler/releases";
|
|||||||
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
import { createTRPCRouter, publicProcedure } from "../../trpc";
|
||||||
import { throwIfActionForbiddenAsync } from "../board/board-access";
|
import { throwIfActionForbiddenAsync } from "../board/board-access";
|
||||||
|
|
||||||
|
const logger = createLogger({ module: "releasesRouter" });
|
||||||
|
|
||||||
const formatVersionFilterRegex = (versionFilter: z.infer<typeof releaseVersionFilterSchema> | undefined) => {
|
const formatVersionFilterRegex = (versionFilter: z.infer<typeof releaseVersionFilterSchema> | undefined) => {
|
||||||
if (!versionFilter) return undefined;
|
if (!versionFilter) return undefined;
|
||||||
|
|
||||||
@@ -71,13 +74,13 @@ export const releasesRouter = createTRPCRouter({
|
|||||||
for (const secret of secrets) {
|
for (const secret of secrets) {
|
||||||
try {
|
try {
|
||||||
tokensByProvider.set(secret.kind, decryptSecret(secret.value));
|
tokensByProvider.set(secret.kind, decryptSecret(secret.value));
|
||||||
} catch {
|
} catch (error) {
|
||||||
// Skip corrupt secrets
|
logger.warn("Failed to decrypt widget secret", { itemId: input.itemId, kind: secret.kind, error });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch {
|
} catch (error) {
|
||||||
// Access denied or table not yet migrated -- proceed without tokens
|
logger.warn("Failed to load release widget tokens", { itemId: input.itemId, error });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ interface IntegrationContextProps {
|
|||||||
name: string;
|
name: string;
|
||||||
url: string;
|
url: string;
|
||||||
kind: IntegrationKind;
|
kind: IntegrationKind;
|
||||||
creatorId: string | null;
|
|
||||||
permissions: {
|
permissions: {
|
||||||
hasFullAccess: boolean;
|
hasFullAccess: boolean;
|
||||||
hasInteractAccess: boolean;
|
hasInteractAccess: boolean;
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ export const getIntegrationsWithPermissionsAsync = async (session: Session | nul
|
|||||||
name: true,
|
name: true,
|
||||||
url: true,
|
url: true,
|
||||||
kind: true,
|
kind: true,
|
||||||
creatorId: true,
|
|
||||||
},
|
},
|
||||||
with: {
|
with: {
|
||||||
userPermissions: {
|
userPermissions: {
|
||||||
|
|||||||
@@ -21,11 +21,17 @@ export const randomInt = (min: number, max: number) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Number of bytes to si format. (Division by 1024)
|
* Number of bytes to a human-readable string using binary (KiB) suffixes.
|
||||||
* Does not accept floats, size in bytes should be an integer.
|
* Does not accept floats; size in bytes should be an integer.
|
||||||
* Will return "NaI" and logs a warning if a float is passed.
|
* Will return "NaI" and log a warning if a float is passed.
|
||||||
* Concat as parameters so it is not added if the returned value is "NaI" or "∞".
|
* `concat` is appended after the unit so it is omitted when the returned
|
||||||
* Returns "∞" if the size is too large to be represented in the current format.
|
* value is "NaI" or "∞". Returns "∞" if the size is too large to be
|
||||||
|
* represented in the current format.
|
||||||
|
*
|
||||||
|
* @deprecated Use `formatBytes` for single values, `formatBytesPair` for
|
||||||
|
* paired "used / total" displays, and `formatByteRate` for byte-per-second
|
||||||
|
* rates. This function is kept for backwards compatibility but should not
|
||||||
|
* be used in new code.
|
||||||
*/
|
*/
|
||||||
export const humanFileSize = (size: number, concat = ""): string => {
|
export const humanFileSize = (size: number, concat = ""): string => {
|
||||||
//64bit limit for Number stops at EiB
|
//64bit limit for Number stops at EiB
|
||||||
@@ -48,6 +54,99 @@ export const humanFileSize = (size: number, concat = ""): string => {
|
|||||||
return "∞";
|
return "∞";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const BINARY_UNITS = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"] as const;
|
||||||
|
const DECIMAL_UNITS = ["B", "KB", "MB", "GB", "TB", "PB", "EB"] as const;
|
||||||
|
|
||||||
|
export type ByteUnitSystem = "binary" | "decimal";
|
||||||
|
|
||||||
|
export interface FormatBytesOptions {
|
||||||
|
/**
|
||||||
|
* Unit system to use. "binary" uses 1024 as the base and KiB/MiB/GiB/TiB suffixes,
|
||||||
|
* "decimal" uses 1000 as the base and KB/MB/GB/TB suffixes. Defaults to "binary".
|
||||||
|
*/
|
||||||
|
unit?: ByteUnitSystem;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pickUnitIndex = (bytes: number, base: number, lastIndex: number): number => {
|
||||||
|
if (!Number.isFinite(bytes) || bytes <= 0) return 0;
|
||||||
|
let index = 0;
|
||||||
|
let value = bytes;
|
||||||
|
while (value >= base && index < lastIndex) {
|
||||||
|
value /= base;
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
return index;
|
||||||
|
};
|
||||||
|
|
||||||
|
const sanitizeBytes = (bytes: number): number => (Number.isFinite(bytes) && bytes > 0 ? bytes : 0);
|
||||||
|
|
||||||
|
const resolveUnitConfig = (options: FormatBytesOptions) => {
|
||||||
|
const { unit = "binary" } = options;
|
||||||
|
return {
|
||||||
|
units: unit === "binary" ? BINARY_UNITS : DECIMAL_UNITS,
|
||||||
|
base: unit === "binary" ? 1024 : 1000,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format a byte value as a human-readable string with a unit suffix.
|
||||||
|
*
|
||||||
|
* Picks the largest unit that keeps the scaled value below the base. Use
|
||||||
|
* `formatBytesPair` when two related values (e.g. used and available) should
|
||||||
|
* share a common unit.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* formatBytes(0); // "0.0 B"
|
||||||
|
* formatBytes(1024); // "1.0 KiB"
|
||||||
|
* formatBytes(985828802560); // "918.1 GiB"
|
||||||
|
* formatBytes(985828802560, { unit: "decimal" }); // "985.8 GB"
|
||||||
|
*/
|
||||||
|
export const formatBytes = (bytes: number, options: FormatBytesOptions = {}): string => {
|
||||||
|
const { units, base } = resolveUnitConfig(options);
|
||||||
|
const safe = sanitizeBytes(bytes);
|
||||||
|
const index = pickUnitIndex(safe, base, units.length - 1);
|
||||||
|
const scaled = safe / base ** index;
|
||||||
|
return `${scaled.toFixed(1)} ${units[index]}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format two related byte values (typically `used` and `available`) with a
|
||||||
|
* shared unit. The unit is picked from the sum of the two values so the
|
||||||
|
* combined display stays consistent.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* formatBytesPair(985828802560, 2858736793190);
|
||||||
|
* // { used: "0.9 TiB", available: "2.6 TiB" }
|
||||||
|
*/
|
||||||
|
export const formatBytesPair = (
|
||||||
|
used: number,
|
||||||
|
available: number,
|
||||||
|
options: FormatBytesOptions = {},
|
||||||
|
): { used: string; available: string } => {
|
||||||
|
const { units, base } = resolveUnitConfig(options);
|
||||||
|
const safeUsed = sanitizeBytes(used);
|
||||||
|
const safeAvailable = sanitizeBytes(available);
|
||||||
|
const index = pickUnitIndex(safeUsed + safeAvailable, base, units.length - 1);
|
||||||
|
const suffix = units[index];
|
||||||
|
return {
|
||||||
|
used: `${(safeUsed / base ** index).toFixed(1)} ${suffix}`,
|
||||||
|
available: `${(safeAvailable / base ** index).toFixed(1)} ${suffix}`,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format a byte-per-second rate (e.g. network throughput) as a human-readable
|
||||||
|
* string with a `/s` suffix. The value is formatted with the same rules as
|
||||||
|
* `formatBytes` and a trailing `/s` is appended.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* formatByteRate(0); // "0.0 B/s"
|
||||||
|
* formatByteRate(1024); // "1.0 KiB/s"
|
||||||
|
* formatByteRate(985828802560, { unit: "decimal" }); // "985.8 GB/s"
|
||||||
|
*/
|
||||||
|
export const formatByteRate = (bytes: number, options: FormatBytesOptions = {}): string =>
|
||||||
|
`${formatBytes(bytes, options)}/s`;
|
||||||
|
|
||||||
const IMPERIAL_MULTIPLIER = 1.609344;
|
const IMPERIAL_MULTIPLIER = 1.609344;
|
||||||
|
|
||||||
export const metricToImperial = (metricValue: number) => metricValue / IMPERIAL_MULTIPLIER;
|
export const metricToImperial = (metricValue: number) => metricValue / IMPERIAL_MULTIPLIER;
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { formatByteRate, formatBytes, formatBytesPair } from "../number";
|
||||||
|
|
||||||
|
describe("formatBytes", () => {
|
||||||
|
it("returns bytes for small values", () => {
|
||||||
|
expect(formatBytes(0)).toBe("0.0 B");
|
||||||
|
expect(formatBytes(1)).toBe("1.0 B");
|
||||||
|
expect(formatBytes(1023)).toBe("1023.0 B");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("scales binary units correctly", () => {
|
||||||
|
expect(formatBytes(1024)).toBe("1.0 KiB");
|
||||||
|
expect(formatBytes(1024 ** 2)).toBe("1.0 MiB");
|
||||||
|
expect(formatBytes(1024 ** 3)).toBe("1.0 GiB");
|
||||||
|
expect(formatBytes(1024 ** 4)).toBe("1.0 TiB");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("scales decimal units when requested", () => {
|
||||||
|
expect(formatBytes(1000, { unit: "decimal" })).toBe("1.0 KB");
|
||||||
|
expect(formatBytes(1000 ** 2, { unit: "decimal" })).toBe("1.0 MB");
|
||||||
|
expect(formatBytes(1000 ** 3, { unit: "decimal" })).toBe("1.0 GB");
|
||||||
|
expect(formatBytes(1000 ** 4, { unit: "decimal" })).toBe("1.0 TB");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("formats a typical storage value with one decimal", () => {
|
||||||
|
expect(formatBytes(985828802560)).toBe("918.1 GiB");
|
||||||
|
expect(formatBytes(985828802560, { unit: "decimal" })).toBe("985.8 GB");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("caps at the largest unit to avoid overflow", () => {
|
||||||
|
expect(formatBytes(Number.MAX_SAFE_INTEGER)).toMatch(/PiB$/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns the zero value for negative or non-finite input", () => {
|
||||||
|
expect(formatBytes(-1)).toBe("0.0 B");
|
||||||
|
expect(formatBytes(Number.NaN)).toBe("0.0 B");
|
||||||
|
expect(formatBytes(Number.POSITIVE_INFINITY)).toBe("0.0 B");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("formatBytesPair", () => {
|
||||||
|
it("picks the unit of the larger total and applies it to both values", () => {
|
||||||
|
const { used, available } = formatBytesPair(985828802560, 2858736793190);
|
||||||
|
expect(used).toBe("0.9 TiB");
|
||||||
|
expect(available).toBe("2.6 TiB");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses a smaller unit when both values fit in it", () => {
|
||||||
|
const { used, available } = formatBytesPair(1024 * 1024 * 100, 1024 * 1024 * 200);
|
||||||
|
expect(used).toBe("100.0 MiB");
|
||||||
|
expect(available).toBe("200.0 MiB");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("falls back to zero when both inputs are invalid", () => {
|
||||||
|
const { used, available } = formatBytesPair(Number.NaN, -1);
|
||||||
|
expect(used).toBe("0.0 B");
|
||||||
|
expect(available).toBe("0.0 B");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses the same unit across both values when one is invalid", () => {
|
||||||
|
const { used, available } = formatBytesPair(Number.NaN, 1024 ** 4);
|
||||||
|
expect(used).toBe("0.0 TiB");
|
||||||
|
expect(available).toBe("1.0 TiB");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("honours the decimal unit option", () => {
|
||||||
|
const { used, available } = formatBytesPair(500_000_000_000, 1_500_000_000_000, { unit: "decimal" });
|
||||||
|
expect(used).toBe("0.5 TB");
|
||||||
|
expect(available).toBe("1.5 TB");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("formatByteRate", () => {
|
||||||
|
it("appends a /s suffix to the formatted value", () => {
|
||||||
|
expect(formatByteRate(0)).toBe("0.0 B/s");
|
||||||
|
expect(formatByteRate(1024)).toBe("1.0 KiB/s");
|
||||||
|
expect(formatByteRate(1024 ** 3)).toBe("1.0 GiB/s");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("honours the decimal unit option", () => {
|
||||||
|
expect(formatByteRate(1000, { unit: "decimal" })).toBe("1.0 KB/s");
|
||||||
|
expect(formatByteRate(1000 ** 2, { unit: "decimal" })).toBe("1.0 MB/s");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns zero for invalid input", () => {
|
||||||
|
expect(formatByteRate(-1)).toBe("0.0 B/s");
|
||||||
|
expect(formatByteRate(Number.NaN)).toBe("0.0 B/s");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE `integration` ADD `creator_id` varchar(64);--> statement-breakpoint
|
|
||||||
ALTER TABLE `integration` ADD CONSTRAINT `integration_creator_id_user_id_fk` FOREIGN KEY (`creator_id`) REFERENCES `user`(`id`) ON DELETE set null ON UPDATE no action;
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE `user` ADD `enable_right_click_on_widgets` boolean DEFAULT true NOT NULL;
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -306,8 +306,8 @@
|
|||||||
{
|
{
|
||||||
"idx": 43,
|
"idx": 43,
|
||||||
"version": "5",
|
"version": "5",
|
||||||
"when": 1783786572320,
|
"when": 1783852800000,
|
||||||
"tag": "0043_add_integration_creator_id",
|
"tag": "0043_add_right_click_preference",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
ALTER TABLE "integration" ADD COLUMN "creator_id" varchar(64);--> statement-breakpoint
|
|
||||||
ALTER TABLE "integration" ADD CONSTRAINT "integration_creator_id_user_id_fk" FOREIGN KEY ("creator_id") REFERENCES "public"."user"("id") ON DELETE set null ON UPDATE no action;
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "user" ADD COLUMN "enable_right_click_on_widgets" boolean DEFAULT true NOT NULL;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"id": "b426483e-2bc9-4d6a-a031-e18abd0ab81c",
|
"id": "97bda61f-0a71-4e41-8e60-874aafe17115",
|
||||||
"prevId": "39cf38d0-0503-4c79-b7f4-632fa062fa2a",
|
"prevId": "39cf38d0-0503-4c79-b7f4-632fa062fa2a",
|
||||||
"version": "7",
|
"version": "7",
|
||||||
"dialect": "postgresql",
|
"dialect": "postgresql",
|
||||||
@@ -97,12 +97,8 @@
|
|||||||
"name": "account_user_id_user_id_fk",
|
"name": "account_user_id_user_id_fk",
|
||||||
"tableFrom": "account",
|
"tableFrom": "account",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -110,10 +106,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"account_provider_provider_account_id_pk": {
|
"account_provider_provider_account_id_pk": {
|
||||||
"name": "account_provider_provider_account_id_pk",
|
"name": "account_provider_provider_account_id_pk",
|
||||||
"columns": [
|
"columns": ["provider", "provider_account_id"]
|
||||||
"provider",
|
|
||||||
"provider_account_id"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -150,12 +143,8 @@
|
|||||||
"name": "apiKey_user_id_user_id_fk",
|
"name": "apiKey_user_id_user_id_fk",
|
||||||
"tableFrom": "apiKey",
|
"tableFrom": "apiKey",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -244,12 +233,8 @@
|
|||||||
"name": "boardGroupPermission_board_id_board_id_fk",
|
"name": "boardGroupPermission_board_id_board_id_fk",
|
||||||
"tableFrom": "boardGroupPermission",
|
"tableFrom": "boardGroupPermission",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -257,12 +242,8 @@
|
|||||||
"name": "boardGroupPermission_group_id_group_id_fk",
|
"name": "boardGroupPermission_group_id_group_id_fk",
|
||||||
"tableFrom": "boardGroupPermission",
|
"tableFrom": "boardGroupPermission",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -270,11 +251,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"boardGroupPermission_board_id_group_id_permission_pk": {
|
"boardGroupPermission_board_id_group_id_permission_pk": {
|
||||||
"name": "boardGroupPermission_board_id_group_id_permission_pk",
|
"name": "boardGroupPermission_board_id_group_id_permission_pk",
|
||||||
"columns": [
|
"columns": ["board_id", "group_id", "permission"]
|
||||||
"board_id",
|
|
||||||
"group_id",
|
|
||||||
"permission"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -311,12 +288,8 @@
|
|||||||
"name": "boardUserPermission_board_id_board_id_fk",
|
"name": "boardUserPermission_board_id_board_id_fk",
|
||||||
"tableFrom": "boardUserPermission",
|
"tableFrom": "boardUserPermission",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -324,12 +297,8 @@
|
|||||||
"name": "boardUserPermission_user_id_user_id_fk",
|
"name": "boardUserPermission_user_id_user_id_fk",
|
||||||
"tableFrom": "boardUserPermission",
|
"tableFrom": "boardUserPermission",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -337,11 +306,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"boardUserPermission_board_id_user_id_permission_pk": {
|
"boardUserPermission_board_id_user_id_permission_pk": {
|
||||||
"name": "boardUserPermission_board_id_user_id_permission_pk",
|
"name": "boardUserPermission_board_id_user_id_permission_pk",
|
||||||
"columns": [
|
"columns": ["board_id", "user_id", "permission"]
|
||||||
"board_id",
|
|
||||||
"user_id",
|
|
||||||
"permission"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -483,12 +448,8 @@
|
|||||||
"name": "board_creator_id_user_id_fk",
|
"name": "board_creator_id_user_id_fk",
|
||||||
"tableFrom": "board",
|
"tableFrom": "board",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -498,9 +459,7 @@
|
|||||||
"board_name_unique": {
|
"board_name_unique": {
|
||||||
"name": "board_name_unique",
|
"name": "board_name_unique",
|
||||||
"nullsNotDistinct": false,
|
"nullsNotDistinct": false,
|
||||||
"columns": [
|
"columns": ["name"]
|
||||||
"name"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"policies": {},
|
"policies": {},
|
||||||
@@ -647,12 +606,8 @@
|
|||||||
"name": "custom_widget_definition_creator_id_user_id_fk",
|
"name": "custom_widget_definition_creator_id_user_id_fk",
|
||||||
"tableFrom": "custom_widget_definition",
|
"tableFrom": "custom_widget_definition",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -698,12 +653,8 @@
|
|||||||
"name": "custom_widget_secret_definition_id_custom_widget_definition_id_fk",
|
"name": "custom_widget_secret_definition_id_custom_widget_definition_id_fk",
|
||||||
"tableFrom": "custom_widget_secret",
|
"tableFrom": "custom_widget_secret",
|
||||||
"tableTo": "custom_widget_definition",
|
"tableTo": "custom_widget_definition",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["definition_id"],
|
||||||
"definition_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -711,10 +662,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"custom_widget_secret_definition_id_kind_pk": {
|
"custom_widget_secret_definition_id_kind_pk": {
|
||||||
"name": "custom_widget_secret_definition_id_kind_pk",
|
"name": "custom_widget_secret_definition_id_kind_pk",
|
||||||
"columns": [
|
"columns": ["definition_id", "kind"]
|
||||||
"definition_id",
|
|
||||||
"kind"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -745,12 +693,8 @@
|
|||||||
"name": "groupMember_group_id_group_id_fk",
|
"name": "groupMember_group_id_group_id_fk",
|
||||||
"tableFrom": "groupMember",
|
"tableFrom": "groupMember",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -758,12 +702,8 @@
|
|||||||
"name": "groupMember_user_id_user_id_fk",
|
"name": "groupMember_user_id_user_id_fk",
|
||||||
"tableFrom": "groupMember",
|
"tableFrom": "groupMember",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -771,10 +711,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"groupMember_group_id_user_id_pk": {
|
"groupMember_group_id_user_id_pk": {
|
||||||
"name": "groupMember_group_id_user_id_pk",
|
"name": "groupMember_group_id_user_id_pk",
|
||||||
"columns": [
|
"columns": ["group_id", "user_id"]
|
||||||
"group_id",
|
|
||||||
"user_id"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -805,12 +742,8 @@
|
|||||||
"name": "groupPermission_group_id_group_id_fk",
|
"name": "groupPermission_group_id_group_id_fk",
|
||||||
"tableFrom": "groupPermission",
|
"tableFrom": "groupPermission",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -868,12 +801,8 @@
|
|||||||
"name": "group_owner_id_user_id_fk",
|
"name": "group_owner_id_user_id_fk",
|
||||||
"tableFrom": "group",
|
"tableFrom": "group",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["owner_id"],
|
||||||
"owner_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -881,12 +810,8 @@
|
|||||||
"name": "group_home_board_id_board_id_fk",
|
"name": "group_home_board_id_board_id_fk",
|
||||||
"tableFrom": "group",
|
"tableFrom": "group",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["home_board_id"],
|
||||||
"home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -894,12 +819,8 @@
|
|||||||
"name": "group_mobile_home_board_id_board_id_fk",
|
"name": "group_mobile_home_board_id_board_id_fk",
|
||||||
"tableFrom": "group",
|
"tableFrom": "group",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["mobile_home_board_id"],
|
||||||
"mobile_home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -909,9 +830,7 @@
|
|||||||
"group_name_unique": {
|
"group_name_unique": {
|
||||||
"name": "group_name_unique",
|
"name": "group_name_unique",
|
||||||
"nullsNotDistinct": false,
|
"nullsNotDistinct": false,
|
||||||
"columns": [
|
"columns": ["name"]
|
||||||
"name"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"policies": {},
|
"policies": {},
|
||||||
@@ -984,12 +903,8 @@
|
|||||||
"name": "icon_icon_repository_id_iconRepository_id_fk",
|
"name": "icon_icon_repository_id_iconRepository_id_fk",
|
||||||
"tableFrom": "icon",
|
"tableFrom": "icon",
|
||||||
"tableTo": "iconRepository",
|
"tableTo": "iconRepository",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["icon_repository_id"],
|
||||||
"icon_repository_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1029,12 +944,8 @@
|
|||||||
"name": "integrationGroupPermissions_integration_id_integration_id_fk",
|
"name": "integrationGroupPermissions_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integrationGroupPermissions",
|
"tableFrom": "integrationGroupPermissions",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1042,12 +953,8 @@
|
|||||||
"name": "integrationGroupPermissions_group_id_group_id_fk",
|
"name": "integrationGroupPermissions_group_id_group_id_fk",
|
||||||
"tableFrom": "integrationGroupPermissions",
|
"tableFrom": "integrationGroupPermissions",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1055,11 +962,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integration_group_permission__pk": {
|
"integration_group_permission__pk": {
|
||||||
"name": "integration_group_permission__pk",
|
"name": "integration_group_permission__pk",
|
||||||
"columns": [
|
"columns": ["integration_id", "group_id", "permission"]
|
||||||
"integration_id",
|
|
||||||
"group_id",
|
|
||||||
"permission"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -1090,12 +993,8 @@
|
|||||||
"name": "integration_item_item_id_item_id_fk",
|
"name": "integration_item_item_id_item_id_fk",
|
||||||
"tableFrom": "integration_item",
|
"tableFrom": "integration_item",
|
||||||
"tableTo": "item",
|
"tableTo": "item",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["item_id"],
|
||||||
"item_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1103,12 +1002,8 @@
|
|||||||
"name": "integration_item_integration_id_integration_id_fk",
|
"name": "integration_item_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integration_item",
|
"tableFrom": "integration_item",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1116,10 +1011,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integration_item_item_id_integration_id_pk": {
|
"integration_item_item_id_integration_id_pk": {
|
||||||
"name": "integration_item_item_id_integration_id_pk",
|
"name": "integration_item_item_id_integration_id_pk",
|
||||||
"columns": [
|
"columns": ["item_id", "integration_id"]
|
||||||
"item_id",
|
|
||||||
"integration_id"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -1193,12 +1085,8 @@
|
|||||||
"name": "integrationSecret_integration_id_integration_id_fk",
|
"name": "integrationSecret_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integrationSecret",
|
"tableFrom": "integrationSecret",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1206,10 +1094,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integrationSecret_integration_id_kind_pk": {
|
"integrationSecret_integration_id_kind_pk": {
|
||||||
"name": "integrationSecret_integration_id_kind_pk",
|
"name": "integrationSecret_integration_id_kind_pk",
|
||||||
"columns": [
|
"columns": ["integration_id", "kind"]
|
||||||
"integration_id",
|
|
||||||
"kind"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -1246,12 +1131,8 @@
|
|||||||
"name": "integrationUserPermission_integration_id_integration_id_fk",
|
"name": "integrationUserPermission_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integrationUserPermission",
|
"tableFrom": "integrationUserPermission",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1259,12 +1140,8 @@
|
|||||||
"name": "integrationUserPermission_user_id_user_id_fk",
|
"name": "integrationUserPermission_user_id_user_id_fk",
|
||||||
"tableFrom": "integrationUserPermission",
|
"tableFrom": "integrationUserPermission",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1272,11 +1149,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integrationUserPermission_integration_id_user_id_permission_pk": {
|
"integrationUserPermission_integration_id_user_id_permission_pk": {
|
||||||
"name": "integrationUserPermission_integration_id_user_id_permission_pk",
|
"name": "integrationUserPermission_integration_id_user_id_permission_pk",
|
||||||
"columns": [
|
"columns": ["integration_id", "user_id", "permission"]
|
||||||
"integration_id",
|
|
||||||
"user_id",
|
|
||||||
"permission"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -1317,12 +1190,6 @@
|
|||||||
"type": "varchar(128)",
|
"type": "varchar(128)",
|
||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": false
|
"notNull": false
|
||||||
},
|
|
||||||
"creator_id": {
|
|
||||||
"name": "creator_id",
|
|
||||||
"type": "varchar(64)",
|
|
||||||
"primaryKey": false,
|
|
||||||
"notNull": false
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"indexes": {
|
"indexes": {
|
||||||
@@ -1347,25 +1214,8 @@
|
|||||||
"name": "integration_app_id_app_id_fk",
|
"name": "integration_app_id_app_id_fk",
|
||||||
"tableFrom": "integration",
|
"tableFrom": "integration",
|
||||||
"tableTo": "app",
|
"tableTo": "app",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["app_id"],
|
||||||
"app_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
|
||||||
"onUpdate": "no action"
|
|
||||||
},
|
|
||||||
"integration_creator_id_user_id_fk": {
|
|
||||||
"name": "integration_creator_id_user_id_fk",
|
|
||||||
"tableFrom": "integration",
|
|
||||||
"tableTo": "user",
|
|
||||||
"columnsFrom": [
|
|
||||||
"creator_id"
|
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1411,12 +1261,8 @@
|
|||||||
"name": "invite_creator_id_user_id_fk",
|
"name": "invite_creator_id_user_id_fk",
|
||||||
"tableFrom": "invite",
|
"tableFrom": "invite",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1426,9 +1272,7 @@
|
|||||||
"invite_token_unique": {
|
"invite_token_unique": {
|
||||||
"name": "invite_token_unique",
|
"name": "invite_token_unique",
|
||||||
"nullsNotDistinct": false,
|
"nullsNotDistinct": false,
|
||||||
"columns": [
|
"columns": ["token"]
|
||||||
"token"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"policies": {},
|
"policies": {},
|
||||||
@@ -1488,12 +1332,8 @@
|
|||||||
"name": "item_layout_item_id_item_id_fk",
|
"name": "item_layout_item_id_item_id_fk",
|
||||||
"tableFrom": "item_layout",
|
"tableFrom": "item_layout",
|
||||||
"tableTo": "item",
|
"tableTo": "item",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["item_id"],
|
||||||
"item_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1501,12 +1341,8 @@
|
|||||||
"name": "item_layout_section_id_section_id_fk",
|
"name": "item_layout_section_id_section_id_fk",
|
||||||
"tableFrom": "item_layout",
|
"tableFrom": "item_layout",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["section_id"],
|
||||||
"section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1514,12 +1350,8 @@
|
|||||||
"name": "item_layout_layout_id_layout_id_fk",
|
"name": "item_layout_layout_id_layout_id_fk",
|
||||||
"tableFrom": "item_layout",
|
"tableFrom": "item_layout",
|
||||||
"tableTo": "layout",
|
"tableTo": "layout",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["layout_id"],
|
||||||
"layout_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1527,11 +1359,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"item_layout_item_id_section_id_layout_id_pk": {
|
"item_layout_item_id_section_id_layout_id_pk": {
|
||||||
"name": "item_layout_item_id_section_id_layout_id_pk",
|
"name": "item_layout_item_id_section_id_layout_id_pk",
|
||||||
"columns": [
|
"columns": ["item_id", "section_id", "layout_id"]
|
||||||
"item_id",
|
|
||||||
"section_id",
|
|
||||||
"layout_id"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -1582,12 +1410,8 @@
|
|||||||
"name": "item_board_id_board_id_fk",
|
"name": "item_board_id_board_id_fk",
|
||||||
"tableFrom": "item",
|
"tableFrom": "item",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1640,12 +1464,8 @@
|
|||||||
"name": "layout_board_id_board_id_fk",
|
"name": "layout_board_id_board_id_fk",
|
||||||
"tableFrom": "layout",
|
"tableFrom": "layout",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1710,12 +1530,8 @@
|
|||||||
"name": "media_creator_id_user_id_fk",
|
"name": "media_creator_id_user_id_fk",
|
||||||
"tableFrom": "media",
|
"tableFrom": "media",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1817,12 +1633,8 @@
|
|||||||
"name": "search_engine_integration_id_integration_id_fk",
|
"name": "search_engine_integration_id_integration_id_fk",
|
||||||
"tableFrom": "search_engine",
|
"tableFrom": "search_engine",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1832,9 +1644,7 @@
|
|||||||
"search_engine_short_unique": {
|
"search_engine_short_unique": {
|
||||||
"name": "search_engine_short_unique",
|
"name": "search_engine_short_unique",
|
||||||
"nullsNotDistinct": false,
|
"nullsNotDistinct": false,
|
||||||
"columns": [
|
"columns": ["short"]
|
||||||
"short"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"policies": {},
|
"policies": {},
|
||||||
@@ -1871,12 +1681,8 @@
|
|||||||
"name": "section_collapse_state_user_id_user_id_fk",
|
"name": "section_collapse_state_user_id_user_id_fk",
|
||||||
"tableFrom": "section_collapse_state",
|
"tableFrom": "section_collapse_state",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1884,12 +1690,8 @@
|
|||||||
"name": "section_collapse_state_section_id_section_id_fk",
|
"name": "section_collapse_state_section_id_section_id_fk",
|
||||||
"tableFrom": "section_collapse_state",
|
"tableFrom": "section_collapse_state",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["section_id"],
|
||||||
"section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1897,10 +1699,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"section_collapse_state_user_id_section_id_pk": {
|
"section_collapse_state_user_id_section_id_pk": {
|
||||||
"name": "section_collapse_state_user_id_section_id_pk",
|
"name": "section_collapse_state_user_id_section_id_pk",
|
||||||
"columns": [
|
"columns": ["user_id", "section_id"]
|
||||||
"user_id",
|
|
||||||
"section_id"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -1961,12 +1760,8 @@
|
|||||||
"name": "section_layout_section_id_section_id_fk",
|
"name": "section_layout_section_id_section_id_fk",
|
||||||
"tableFrom": "section_layout",
|
"tableFrom": "section_layout",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["section_id"],
|
||||||
"section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1974,12 +1769,8 @@
|
|||||||
"name": "section_layout_layout_id_layout_id_fk",
|
"name": "section_layout_layout_id_layout_id_fk",
|
||||||
"tableFrom": "section_layout",
|
"tableFrom": "section_layout",
|
||||||
"tableTo": "layout",
|
"tableTo": "layout",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["layout_id"],
|
||||||
"layout_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1987,12 +1778,8 @@
|
|||||||
"name": "section_layout_parent_section_id_section_id_fk",
|
"name": "section_layout_parent_section_id_section_id_fk",
|
||||||
"tableFrom": "section_layout",
|
"tableFrom": "section_layout",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["parent_section_id"],
|
||||||
"parent_section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2000,10 +1787,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"section_layout_section_id_layout_id_pk": {
|
"section_layout_section_id_layout_id_pk": {
|
||||||
"name": "section_layout_section_id_layout_id_pk",
|
"name": "section_layout_section_id_layout_id_pk",
|
||||||
"columns": [
|
"columns": ["section_id", "layout_id"]
|
||||||
"section_id",
|
|
||||||
"layout_id"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -2065,12 +1849,8 @@
|
|||||||
"name": "section_board_id_board_id_fk",
|
"name": "section_board_id_board_id_fk",
|
||||||
"tableFrom": "section",
|
"tableFrom": "section",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2106,9 +1886,7 @@
|
|||||||
"serverSetting_settingKey_unique": {
|
"serverSetting_settingKey_unique": {
|
||||||
"name": "serverSetting_settingKey_unique",
|
"name": "serverSetting_settingKey_unique",
|
||||||
"nullsNotDistinct": false,
|
"nullsNotDistinct": false,
|
||||||
"columns": [
|
"columns": ["setting_key"]
|
||||||
"setting_key"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"policies": {},
|
"policies": {},
|
||||||
@@ -2160,12 +1938,8 @@
|
|||||||
"name": "session_user_id_user_id_fk",
|
"name": "session_user_id_user_id_fk",
|
||||||
"tableFrom": "session",
|
"tableFrom": "session",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2176,45 +1950,6 @@
|
|||||||
"checkConstraints": {},
|
"checkConstraints": {},
|
||||||
"isRLSEnabled": false
|
"isRLSEnabled": false
|
||||||
},
|
},
|
||||||
"public.trusted_certificate_hostname": {
|
|
||||||
"name": "trusted_certificate_hostname",
|
|
||||||
"schema": "",
|
|
||||||
"columns": {
|
|
||||||
"hostname": {
|
|
||||||
"name": "hostname",
|
|
||||||
"type": "varchar(256)",
|
|
||||||
"primaryKey": false,
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
"thumbprint": {
|
|
||||||
"name": "thumbprint",
|
|
||||||
"type": "varchar(128)",
|
|
||||||
"primaryKey": false,
|
|
||||||
"notNull": true
|
|
||||||
},
|
|
||||||
"certificate": {
|
|
||||||
"name": "certificate",
|
|
||||||
"type": "text",
|
|
||||||
"primaryKey": false,
|
|
||||||
"notNull": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"indexes": {},
|
|
||||||
"foreignKeys": {},
|
|
||||||
"compositePrimaryKeys": {
|
|
||||||
"trusted_certificate_hostname_hostname_thumbprint_pk": {
|
|
||||||
"name": "trusted_certificate_hostname_hostname_thumbprint_pk",
|
|
||||||
"columns": [
|
|
||||||
"hostname",
|
|
||||||
"thumbprint"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"uniqueConstraints": {},
|
|
||||||
"policies": {},
|
|
||||||
"checkConstraints": {},
|
|
||||||
"isRLSEnabled": false
|
|
||||||
},
|
|
||||||
"public.user": {
|
"public.user": {
|
||||||
"name": "user",
|
"name": "user",
|
||||||
"schema": "",
|
"schema": "",
|
||||||
@@ -2315,6 +2050,13 @@
|
|||||||
"notNull": true,
|
"notNull": true,
|
||||||
"default": false
|
"default": false
|
||||||
},
|
},
|
||||||
|
"enable_right_click_on_widgets": {
|
||||||
|
"name": "enable_right_click_on_widgets",
|
||||||
|
"type": "boolean",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": true
|
||||||
|
},
|
||||||
"completed_manage_tour": {
|
"completed_manage_tour": {
|
||||||
"name": "completed_manage_tour",
|
"name": "completed_manage_tour",
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
@@ -2336,12 +2078,8 @@
|
|||||||
"name": "user_home_board_id_board_id_fk",
|
"name": "user_home_board_id_board_id_fk",
|
||||||
"tableFrom": "user",
|
"tableFrom": "user",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["home_board_id"],
|
||||||
"home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -2349,12 +2087,8 @@
|
|||||||
"name": "user_mobile_home_board_id_board_id_fk",
|
"name": "user_mobile_home_board_id_board_id_fk",
|
||||||
"tableFrom": "user",
|
"tableFrom": "user",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["mobile_home_board_id"],
|
||||||
"mobile_home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -2362,12 +2096,8 @@
|
|||||||
"name": "user_default_search_engine_id_search_engine_id_fk",
|
"name": "user_default_search_engine_id_search_engine_id_fk",
|
||||||
"tableFrom": "user",
|
"tableFrom": "user",
|
||||||
"tableTo": "search_engine",
|
"tableTo": "search_engine",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["default_search_engine_id"],
|
||||||
"default_search_engine_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2406,10 +2136,7 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"verificationToken_identifier_token_pk": {
|
"verificationToken_identifier_token_pk": {
|
||||||
"name": "verificationToken_identifier_token_pk",
|
"name": "verificationToken_identifier_token_pk",
|
||||||
"columns": [
|
"columns": ["identifier", "token"]
|
||||||
"identifier",
|
|
||||||
"token"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
@@ -2452,12 +2179,8 @@
|
|||||||
"name": "widget_secret_item_id_item_id_fk",
|
"name": "widget_secret_item_id_item_id_fk",
|
||||||
"tableFrom": "widget_secret",
|
"tableFrom": "widget_secret",
|
||||||
"tableTo": "item",
|
"tableTo": "item",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["item_id"],
|
||||||
"item_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2465,10 +2188,43 @@
|
|||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"widget_secret_item_id_kind_pk": {
|
"widget_secret_item_id_kind_pk": {
|
||||||
"name": "widget_secret_item_id_kind_pk",
|
"name": "widget_secret_item_id_kind_pk",
|
||||||
"columns": [
|
"columns": ["item_id", "kind"]
|
||||||
"item_id",
|
}
|
||||||
"kind"
|
},
|
||||||
]
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.trusted_certificate_hostname": {
|
||||||
|
"name": "trusted_certificate_hostname",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"hostname": {
|
||||||
|
"name": "hostname",
|
||||||
|
"type": "varchar(256)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"thumbprint": {
|
||||||
|
"name": "thumbprint",
|
||||||
|
"type": "varchar(128)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"certificate": {
|
||||||
|
"name": "certificate",
|
||||||
|
"type": "text",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"compositePrimaryKeys": {
|
||||||
|
"trusted_certificate_hostname_hostname_thumbprint_pk": {
|
||||||
|
"name": "trusted_certificate_hostname_hostname_thumbprint_pk",
|
||||||
|
"columns": ["hostname", "thumbprint"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"uniqueConstraints": {},
|
"uniqueConstraints": {},
|
||||||
|
|||||||
@@ -68,8 +68,8 @@
|
|||||||
{
|
{
|
||||||
"idx": 9,
|
"idx": 9,
|
||||||
"version": "7",
|
"version": "7",
|
||||||
"when": 1783786378808,
|
"when": 1783786677702,
|
||||||
"tag": "0009_add_integration_creator_id",
|
"tag": "0009_add_right_click_preference",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
ALTER TABLE `integration` ADD `creator_id` text REFERENCES user(id) ON DELETE SET NULL;
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE `user` ADD `enable_right_click_on_widgets` integer DEFAULT true NOT NULL;
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": "6",
|
"version": "6",
|
||||||
"dialect": "sqlite",
|
"dialect": "sqlite",
|
||||||
"id": "8e6041c6-1cca-4eb2-b935-2e8ceb1b036d",
|
"id": "852e049b-72cc-4d7f-8be9-931c042fe019",
|
||||||
"prevId": "d76abdce-ba49-450b-81f0-621bcf581b90",
|
"prevId": "d76abdce-ba49-450b-81f0-621bcf581b90",
|
||||||
"tables": {
|
"tables": {
|
||||||
"account": {
|
"account": {
|
||||||
@@ -88,9 +88,7 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"userId_idx": {
|
"userId_idx": {
|
||||||
"name": "userId_idx",
|
"name": "userId_idx",
|
||||||
"columns": [
|
"columns": ["user_id"],
|
||||||
"user_id"
|
|
||||||
],
|
|
||||||
"isUnique": false
|
"isUnique": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -99,22 +97,15 @@
|
|||||||
"name": "account_user_id_user_id_fk",
|
"name": "account_user_id_user_id_fk",
|
||||||
"tableFrom": "account",
|
"tableFrom": "account",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"account_provider_provider_account_id_pk": {
|
"account_provider_provider_account_id_pk": {
|
||||||
"columns": [
|
"columns": ["provider", "provider_account_id"],
|
||||||
"provider",
|
|
||||||
"provider_account_id"
|
|
||||||
],
|
|
||||||
"name": "account_provider_provider_account_id_pk"
|
"name": "account_provider_provider_account_id_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -152,12 +143,8 @@
|
|||||||
"name": "apiKey_user_id_user_id_fk",
|
"name": "apiKey_user_id_user_id_fk",
|
||||||
"tableFrom": "apiKey",
|
"tableFrom": "apiKey",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -249,12 +236,8 @@
|
|||||||
"name": "boardGroupPermission_board_id_board_id_fk",
|
"name": "boardGroupPermission_board_id_board_id_fk",
|
||||||
"tableFrom": "boardGroupPermission",
|
"tableFrom": "boardGroupPermission",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -262,23 +245,15 @@
|
|||||||
"name": "boardGroupPermission_group_id_group_id_fk",
|
"name": "boardGroupPermission_group_id_group_id_fk",
|
||||||
"tableFrom": "boardGroupPermission",
|
"tableFrom": "boardGroupPermission",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"boardGroupPermission_board_id_group_id_permission_pk": {
|
"boardGroupPermission_board_id_group_id_permission_pk": {
|
||||||
"columns": [
|
"columns": ["board_id", "group_id", "permission"],
|
||||||
"board_id",
|
|
||||||
"group_id",
|
|
||||||
"permission"
|
|
||||||
],
|
|
||||||
"name": "boardGroupPermission_board_id_group_id_permission_pk"
|
"name": "boardGroupPermission_board_id_group_id_permission_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -316,12 +291,8 @@
|
|||||||
"name": "boardUserPermission_board_id_board_id_fk",
|
"name": "boardUserPermission_board_id_board_id_fk",
|
||||||
"tableFrom": "boardUserPermission",
|
"tableFrom": "boardUserPermission",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -329,23 +300,15 @@
|
|||||||
"name": "boardUserPermission_user_id_user_id_fk",
|
"name": "boardUserPermission_user_id_user_id_fk",
|
||||||
"tableFrom": "boardUserPermission",
|
"tableFrom": "boardUserPermission",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"boardUserPermission_board_id_user_id_permission_pk": {
|
"boardUserPermission_board_id_user_id_permission_pk": {
|
||||||
"columns": [
|
"columns": ["board_id", "user_id", "permission"],
|
||||||
"board_id",
|
|
||||||
"user_id",
|
|
||||||
"permission"
|
|
||||||
],
|
|
||||||
"name": "boardUserPermission_board_id_user_id_permission_pk"
|
"name": "boardUserPermission_board_id_user_id_permission_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -501,9 +464,7 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"board_name_unique": {
|
"board_name_unique": {
|
||||||
"name": "board_name_unique",
|
"name": "board_name_unique",
|
||||||
"columns": [
|
"columns": ["name"],
|
||||||
"name"
|
|
||||||
],
|
|
||||||
"isUnique": true
|
"isUnique": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -512,12 +473,8 @@
|
|||||||
"name": "board_creator_id_user_id_fk",
|
"name": "board_creator_id_user_id_fk",
|
||||||
"tableFrom": "board",
|
"tableFrom": "board",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -680,12 +637,8 @@
|
|||||||
"name": "custom_widget_definition_creator_id_user_id_fk",
|
"name": "custom_widget_definition_creator_id_user_id_fk",
|
||||||
"tableFrom": "custom_widget_definition",
|
"tableFrom": "custom_widget_definition",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -732,22 +685,15 @@
|
|||||||
"name": "custom_widget_secret_definition_id_custom_widget_definition_id_fk",
|
"name": "custom_widget_secret_definition_id_custom_widget_definition_id_fk",
|
||||||
"tableFrom": "custom_widget_secret",
|
"tableFrom": "custom_widget_secret",
|
||||||
"tableTo": "custom_widget_definition",
|
"tableTo": "custom_widget_definition",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["definition_id"],
|
||||||
"definition_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"custom_widget_secret_definition_id_kind_pk": {
|
"custom_widget_secret_definition_id_kind_pk": {
|
||||||
"columns": [
|
"columns": ["definition_id", "kind"],
|
||||||
"definition_id",
|
|
||||||
"kind"
|
|
||||||
],
|
|
||||||
"name": "custom_widget_secret_definition_id_kind_pk"
|
"name": "custom_widget_secret_definition_id_kind_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -778,12 +724,8 @@
|
|||||||
"name": "groupMember_group_id_group_id_fk",
|
"name": "groupMember_group_id_group_id_fk",
|
||||||
"tableFrom": "groupMember",
|
"tableFrom": "groupMember",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -791,22 +733,15 @@
|
|||||||
"name": "groupMember_user_id_user_id_fk",
|
"name": "groupMember_user_id_user_id_fk",
|
||||||
"tableFrom": "groupMember",
|
"tableFrom": "groupMember",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"groupMember_group_id_user_id_pk": {
|
"groupMember_group_id_user_id_pk": {
|
||||||
"columns": [
|
"columns": ["group_id", "user_id"],
|
||||||
"group_id",
|
|
||||||
"user_id"
|
|
||||||
],
|
|
||||||
"name": "groupMember_group_id_user_id_pk"
|
"name": "groupMember_group_id_user_id_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -837,12 +772,8 @@
|
|||||||
"name": "groupPermission_group_id_group_id_fk",
|
"name": "groupPermission_group_id_group_id_fk",
|
||||||
"tableFrom": "groupPermission",
|
"tableFrom": "groupPermission",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -900,9 +831,7 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"group_name_unique": {
|
"group_name_unique": {
|
||||||
"name": "group_name_unique",
|
"name": "group_name_unique",
|
||||||
"columns": [
|
"columns": ["name"],
|
||||||
"name"
|
|
||||||
],
|
|
||||||
"isUnique": true
|
"isUnique": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -911,12 +840,8 @@
|
|||||||
"name": "group_owner_id_user_id_fk",
|
"name": "group_owner_id_user_id_fk",
|
||||||
"tableFrom": "group",
|
"tableFrom": "group",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["owner_id"],
|
||||||
"owner_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -924,12 +849,8 @@
|
|||||||
"name": "group_home_board_id_board_id_fk",
|
"name": "group_home_board_id_board_id_fk",
|
||||||
"tableFrom": "group",
|
"tableFrom": "group",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["home_board_id"],
|
||||||
"home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -937,12 +858,8 @@
|
|||||||
"name": "group_mobile_home_board_id_board_id_fk",
|
"name": "group_mobile_home_board_id_board_id_fk",
|
||||||
"tableFrom": "group",
|
"tableFrom": "group",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["mobile_home_board_id"],
|
||||||
"mobile_home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1020,12 +937,8 @@
|
|||||||
"name": "icon_icon_repository_id_iconRepository_id_fk",
|
"name": "icon_icon_repository_id_iconRepository_id_fk",
|
||||||
"tableFrom": "icon",
|
"tableFrom": "icon",
|
||||||
"tableTo": "iconRepository",
|
"tableTo": "iconRepository",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["icon_repository_id"],
|
||||||
"icon_repository_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1065,12 +978,8 @@
|
|||||||
"name": "integrationGroupPermissions_integration_id_integration_id_fk",
|
"name": "integrationGroupPermissions_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integrationGroupPermissions",
|
"tableFrom": "integrationGroupPermissions",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1078,23 +987,15 @@
|
|||||||
"name": "integrationGroupPermissions_group_id_group_id_fk",
|
"name": "integrationGroupPermissions_group_id_group_id_fk",
|
||||||
"tableFrom": "integrationGroupPermissions",
|
"tableFrom": "integrationGroupPermissions",
|
||||||
"tableTo": "group",
|
"tableTo": "group",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["group_id"],
|
||||||
"group_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integrationGroupPermissions_integration_id_group_id_permission_pk": {
|
"integrationGroupPermissions_integration_id_group_id_permission_pk": {
|
||||||
"columns": [
|
"columns": ["integration_id", "group_id", "permission"],
|
||||||
"integration_id",
|
|
||||||
"group_id",
|
|
||||||
"permission"
|
|
||||||
],
|
|
||||||
"name": "integrationGroupPermissions_integration_id_group_id_permission_pk"
|
"name": "integrationGroupPermissions_integration_id_group_id_permission_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1125,12 +1026,8 @@
|
|||||||
"name": "integration_item_item_id_item_id_fk",
|
"name": "integration_item_item_id_item_id_fk",
|
||||||
"tableFrom": "integration_item",
|
"tableFrom": "integration_item",
|
||||||
"tableTo": "item",
|
"tableTo": "item",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["item_id"],
|
||||||
"item_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1138,22 +1035,15 @@
|
|||||||
"name": "integration_item_integration_id_integration_id_fk",
|
"name": "integration_item_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integration_item",
|
"tableFrom": "integration_item",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integration_item_item_id_integration_id_pk": {
|
"integration_item_item_id_integration_id_pk": {
|
||||||
"columns": [
|
"columns": ["item_id", "integration_id"],
|
||||||
"item_id",
|
|
||||||
"integration_id"
|
|
||||||
],
|
|
||||||
"name": "integration_item_item_id_integration_id_pk"
|
"name": "integration_item_item_id_integration_id_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1195,16 +1085,12 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"integration_secret__kind_idx": {
|
"integration_secret__kind_idx": {
|
||||||
"name": "integration_secret__kind_idx",
|
"name": "integration_secret__kind_idx",
|
||||||
"columns": [
|
"columns": ["kind"],
|
||||||
"kind"
|
|
||||||
],
|
|
||||||
"isUnique": false
|
"isUnique": false
|
||||||
},
|
},
|
||||||
"integration_secret__updated_at_idx": {
|
"integration_secret__updated_at_idx": {
|
||||||
"name": "integration_secret__updated_at_idx",
|
"name": "integration_secret__updated_at_idx",
|
||||||
"columns": [
|
"columns": ["updated_at"],
|
||||||
"updated_at"
|
|
||||||
],
|
|
||||||
"isUnique": false
|
"isUnique": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1213,22 +1099,15 @@
|
|||||||
"name": "integrationSecret_integration_id_integration_id_fk",
|
"name": "integrationSecret_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integrationSecret",
|
"tableFrom": "integrationSecret",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integrationSecret_integration_id_kind_pk": {
|
"integrationSecret_integration_id_kind_pk": {
|
||||||
"columns": [
|
"columns": ["integration_id", "kind"],
|
||||||
"integration_id",
|
|
||||||
"kind"
|
|
||||||
],
|
|
||||||
"name": "integrationSecret_integration_id_kind_pk"
|
"name": "integrationSecret_integration_id_kind_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1266,12 +1145,8 @@
|
|||||||
"name": "integrationUserPermission_integration_id_integration_id_fk",
|
"name": "integrationUserPermission_integration_id_integration_id_fk",
|
||||||
"tableFrom": "integrationUserPermission",
|
"tableFrom": "integrationUserPermission",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1279,23 +1154,15 @@
|
|||||||
"name": "integrationUserPermission_user_id_user_id_fk",
|
"name": "integrationUserPermission_user_id_user_id_fk",
|
||||||
"tableFrom": "integrationUserPermission",
|
"tableFrom": "integrationUserPermission",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"integrationUserPermission_integration_id_user_id_permission_pk": {
|
"integrationUserPermission_integration_id_user_id_permission_pk": {
|
||||||
"columns": [
|
"columns": ["integration_id", "user_id", "permission"],
|
||||||
"integration_id",
|
|
||||||
"user_id",
|
|
||||||
"permission"
|
|
||||||
],
|
|
||||||
"name": "integrationUserPermission_integration_id_user_id_permission_pk"
|
"name": "integrationUserPermission_integration_id_user_id_permission_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1339,21 +1206,12 @@
|
|||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": false,
|
"notNull": false,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
},
|
|
||||||
"creator_id": {
|
|
||||||
"name": "creator_id",
|
|
||||||
"type": "text",
|
|
||||||
"primaryKey": false,
|
|
||||||
"notNull": false,
|
|
||||||
"autoincrement": false
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"indexes": {
|
"indexes": {
|
||||||
"integration__kind_idx": {
|
"integration__kind_idx": {
|
||||||
"name": "integration__kind_idx",
|
"name": "integration__kind_idx",
|
||||||
"columns": [
|
"columns": ["kind"],
|
||||||
"kind"
|
|
||||||
],
|
|
||||||
"isUnique": false
|
"isUnique": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1362,25 +1220,8 @@
|
|||||||
"name": "integration_app_id_app_id_fk",
|
"name": "integration_app_id_app_id_fk",
|
||||||
"tableFrom": "integration",
|
"tableFrom": "integration",
|
||||||
"tableTo": "app",
|
"tableTo": "app",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["app_id"],
|
||||||
"app_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
|
||||||
"onUpdate": "no action"
|
|
||||||
},
|
|
||||||
"integration_creator_id_user_id_fk": {
|
|
||||||
"name": "integration_creator_id_user_id_fk",
|
|
||||||
"tableFrom": "integration",
|
|
||||||
"tableTo": "user",
|
|
||||||
"columnsFrom": [
|
|
||||||
"creator_id"
|
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1424,9 +1265,7 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"invite_token_unique": {
|
"invite_token_unique": {
|
||||||
"name": "invite_token_unique",
|
"name": "invite_token_unique",
|
||||||
"columns": [
|
"columns": ["token"],
|
||||||
"token"
|
|
||||||
],
|
|
||||||
"isUnique": true
|
"isUnique": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1435,12 +1274,8 @@
|
|||||||
"name": "invite_creator_id_user_id_fk",
|
"name": "invite_creator_id_user_id_fk",
|
||||||
"tableFrom": "invite",
|
"tableFrom": "invite",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1508,12 +1343,8 @@
|
|||||||
"name": "item_layout_item_id_item_id_fk",
|
"name": "item_layout_item_id_item_id_fk",
|
||||||
"tableFrom": "item_layout",
|
"tableFrom": "item_layout",
|
||||||
"tableTo": "item",
|
"tableTo": "item",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["item_id"],
|
||||||
"item_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1521,12 +1352,8 @@
|
|||||||
"name": "item_layout_section_id_section_id_fk",
|
"name": "item_layout_section_id_section_id_fk",
|
||||||
"tableFrom": "item_layout",
|
"tableFrom": "item_layout",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["section_id"],
|
||||||
"section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1534,23 +1361,15 @@
|
|||||||
"name": "item_layout_layout_id_layout_id_fk",
|
"name": "item_layout_layout_id_layout_id_fk",
|
||||||
"tableFrom": "item_layout",
|
"tableFrom": "item_layout",
|
||||||
"tableTo": "layout",
|
"tableTo": "layout",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["layout_id"],
|
||||||
"layout_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"item_layout_item_id_section_id_layout_id_pk": {
|
"item_layout_item_id_section_id_layout_id_pk": {
|
||||||
"columns": [
|
"columns": ["item_id", "section_id", "layout_id"],
|
||||||
"item_id",
|
|
||||||
"section_id",
|
|
||||||
"layout_id"
|
|
||||||
],
|
|
||||||
"name": "item_layout_item_id_section_id_layout_id_pk"
|
"name": "item_layout_item_id_section_id_layout_id_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1604,12 +1423,8 @@
|
|||||||
"name": "item_board_id_board_id_fk",
|
"name": "item_board_id_board_id_fk",
|
||||||
"tableFrom": "item",
|
"tableFrom": "item",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1664,12 +1479,8 @@
|
|||||||
"name": "layout_board_id_board_id_fk",
|
"name": "layout_board_id_board_id_fk",
|
||||||
"tableFrom": "layout",
|
"tableFrom": "layout",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1738,12 +1549,8 @@
|
|||||||
"name": "media_creator_id_user_id_fk",
|
"name": "media_creator_id_user_id_fk",
|
||||||
"tableFrom": "media",
|
"tableFrom": "media",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["creator_id"],
|
||||||
"creator_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1847,9 +1654,7 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"search_engine_short_unique": {
|
"search_engine_short_unique": {
|
||||||
"name": "search_engine_short_unique",
|
"name": "search_engine_short_unique",
|
||||||
"columns": [
|
"columns": ["short"],
|
||||||
"short"
|
|
||||||
],
|
|
||||||
"isUnique": true
|
"isUnique": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1858,12 +1663,8 @@
|
|||||||
"name": "search_engine_integration_id_integration_id_fk",
|
"name": "search_engine_integration_id_integration_id_fk",
|
||||||
"tableFrom": "search_engine",
|
"tableFrom": "search_engine",
|
||||||
"tableTo": "integration",
|
"tableTo": "integration",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["integration_id"],
|
||||||
"integration_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -1904,12 +1705,8 @@
|
|||||||
"name": "section_collapse_state_user_id_user_id_fk",
|
"name": "section_collapse_state_user_id_user_id_fk",
|
||||||
"tableFrom": "section_collapse_state",
|
"tableFrom": "section_collapse_state",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -1917,22 +1714,15 @@
|
|||||||
"name": "section_collapse_state_section_id_section_id_fk",
|
"name": "section_collapse_state_section_id_section_id_fk",
|
||||||
"tableFrom": "section_collapse_state",
|
"tableFrom": "section_collapse_state",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["section_id"],
|
||||||
"section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"section_collapse_state_user_id_section_id_pk": {
|
"section_collapse_state_user_id_section_id_pk": {
|
||||||
"columns": [
|
"columns": ["user_id", "section_id"],
|
||||||
"user_id",
|
|
||||||
"section_id"
|
|
||||||
],
|
|
||||||
"name": "section_collapse_state_user_id_section_id_pk"
|
"name": "section_collapse_state_user_id_section_id_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1998,12 +1788,8 @@
|
|||||||
"name": "section_layout_section_id_section_id_fk",
|
"name": "section_layout_section_id_section_id_fk",
|
||||||
"tableFrom": "section_layout",
|
"tableFrom": "section_layout",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["section_id"],
|
||||||
"section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -2011,12 +1797,8 @@
|
|||||||
"name": "section_layout_layout_id_layout_id_fk",
|
"name": "section_layout_layout_id_layout_id_fk",
|
||||||
"tableFrom": "section_layout",
|
"tableFrom": "section_layout",
|
||||||
"tableTo": "layout",
|
"tableTo": "layout",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["layout_id"],
|
||||||
"layout_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -2024,22 +1806,15 @@
|
|||||||
"name": "section_layout_parent_section_id_section_id_fk",
|
"name": "section_layout_parent_section_id_section_id_fk",
|
||||||
"tableFrom": "section_layout",
|
"tableFrom": "section_layout",
|
||||||
"tableTo": "section",
|
"tableTo": "section",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["parent_section_id"],
|
||||||
"parent_section_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"section_layout_section_id_layout_id_pk": {
|
"section_layout_section_id_layout_id_pk": {
|
||||||
"columns": [
|
"columns": ["section_id", "layout_id"],
|
||||||
"section_id",
|
|
||||||
"layout_id"
|
|
||||||
],
|
|
||||||
"name": "section_layout_section_id_layout_id_pk"
|
"name": "section_layout_section_id_layout_id_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2106,12 +1881,8 @@
|
|||||||
"name": "section_board_id_board_id_fk",
|
"name": "section_board_id_board_id_fk",
|
||||||
"tableFrom": "section",
|
"tableFrom": "section",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["board_id"],
|
||||||
"board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2142,9 +1913,7 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"serverSetting_settingKey_unique": {
|
"serverSetting_settingKey_unique": {
|
||||||
"name": "serverSetting_settingKey_unique",
|
"name": "serverSetting_settingKey_unique",
|
||||||
"columns": [
|
"columns": ["setting_key"],
|
||||||
"setting_key"
|
|
||||||
],
|
|
||||||
"isUnique": true
|
"isUnique": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2181,9 +1950,7 @@
|
|||||||
"indexes": {
|
"indexes": {
|
||||||
"user_id_idx": {
|
"user_id_idx": {
|
||||||
"name": "user_id_idx",
|
"name": "user_id_idx",
|
||||||
"columns": [
|
"columns": ["user_id"],
|
||||||
"user_id"
|
|
||||||
],
|
|
||||||
"isUnique": false
|
"isUnique": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2192,12 +1959,8 @@
|
|||||||
"name": "session_user_id_user_id_fk",
|
"name": "session_user_id_user_id_fk",
|
||||||
"tableFrom": "session",
|
"tableFrom": "session",
|
||||||
"tableTo": "user",
|
"tableTo": "user",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["user_id"],
|
||||||
"user_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2235,10 +1998,7 @@
|
|||||||
"foreignKeys": {},
|
"foreignKeys": {},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"trusted_certificate_hostname_hostname_thumbprint_pk": {
|
"trusted_certificate_hostname_hostname_thumbprint_pk": {
|
||||||
"columns": [
|
"columns": ["hostname", "thumbprint"],
|
||||||
"hostname",
|
|
||||||
"thumbprint"
|
|
||||||
],
|
|
||||||
"name": "trusted_certificate_hostname_hostname_thumbprint_pk"
|
"name": "trusted_certificate_hostname_hostname_thumbprint_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2359,6 +2119,14 @@
|
|||||||
"autoincrement": false,
|
"autoincrement": false,
|
||||||
"default": false
|
"default": false
|
||||||
},
|
},
|
||||||
|
"enable_right_click_on_widgets": {
|
||||||
|
"name": "enable_right_click_on_widgets",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"autoincrement": false,
|
||||||
|
"default": true
|
||||||
|
},
|
||||||
"completed_manage_tour": {
|
"completed_manage_tour": {
|
||||||
"name": "completed_manage_tour",
|
"name": "completed_manage_tour",
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
@@ -2382,12 +2150,8 @@
|
|||||||
"name": "user_home_board_id_board_id_fk",
|
"name": "user_home_board_id_board_id_fk",
|
||||||
"tableFrom": "user",
|
"tableFrom": "user",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["home_board_id"],
|
||||||
"home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -2395,12 +2159,8 @@
|
|||||||
"name": "user_mobile_home_board_id_board_id_fk",
|
"name": "user_mobile_home_board_id_board_id_fk",
|
||||||
"tableFrom": "user",
|
"tableFrom": "user",
|
||||||
"tableTo": "board",
|
"tableTo": "board",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["mobile_home_board_id"],
|
||||||
"mobile_home_board_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
},
|
},
|
||||||
@@ -2408,12 +2168,8 @@
|
|||||||
"name": "user_default_search_engine_id_search_engine_id_fk",
|
"name": "user_default_search_engine_id_search_engine_id_fk",
|
||||||
"tableFrom": "user",
|
"tableFrom": "user",
|
||||||
"tableTo": "search_engine",
|
"tableTo": "search_engine",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["default_search_engine_id"],
|
||||||
"default_search_engine_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "set null",
|
"onDelete": "set null",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
@@ -2451,10 +2207,7 @@
|
|||||||
"foreignKeys": {},
|
"foreignKeys": {},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"verificationToken_identifier_token_pk": {
|
"verificationToken_identifier_token_pk": {
|
||||||
"columns": [
|
"columns": ["identifier", "token"],
|
||||||
"identifier",
|
|
||||||
"token"
|
|
||||||
],
|
|
||||||
"name": "verificationToken_identifier_token_pk"
|
"name": "verificationToken_identifier_token_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2499,22 +2252,15 @@
|
|||||||
"name": "widget_secret_item_id_item_id_fk",
|
"name": "widget_secret_item_id_item_id_fk",
|
||||||
"tableFrom": "widget_secret",
|
"tableFrom": "widget_secret",
|
||||||
"tableTo": "item",
|
"tableTo": "item",
|
||||||
"columnsFrom": [
|
"columnsFrom": ["item_id"],
|
||||||
"item_id"
|
"columnsTo": ["id"],
|
||||||
],
|
|
||||||
"columnsTo": [
|
|
||||||
"id"
|
|
||||||
],
|
|
||||||
"onDelete": "cascade",
|
"onDelete": "cascade",
|
||||||
"onUpdate": "no action"
|
"onUpdate": "no action"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"compositePrimaryKeys": {
|
"compositePrimaryKeys": {
|
||||||
"widget_secret_item_id_kind_pk": {
|
"widget_secret_item_id_kind_pk": {
|
||||||
"columns": [
|
"columns": ["item_id", "kind"],
|
||||||
"item_id",
|
|
||||||
"kind"
|
|
||||||
],
|
|
||||||
"name": "widget_secret_item_id_kind_pk"
|
"name": "widget_secret_item_id_kind_pk"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -292,8 +292,8 @@
|
|||||||
{
|
{
|
||||||
"idx": 41,
|
"idx": 41,
|
||||||
"version": "6",
|
"version": "6",
|
||||||
"when": 1783786326756,
|
"when": 1783786658943,
|
||||||
"tag": "0041_add_integration_creator_id",
|
"tag": "0041_add_right_click_preference",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ export const users = mysqlTable("user", {
|
|||||||
colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
|
colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
|
||||||
firstDayOfWeek: tinyint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
|
firstDayOfWeek: tinyint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
|
||||||
pingIconsEnabled: boolean().default(false).notNull(),
|
pingIconsEnabled: boolean().default(false).notNull(),
|
||||||
|
enableRightClickOnWidgets: boolean().default(true).notNull(),
|
||||||
completedManageTour: boolean().default(false).notNull(),
|
completedManageTour: boolean().default(false).notNull(),
|
||||||
completedBoardTour: boolean().default(false).notNull(),
|
completedBoardTour: boolean().default(false).notNull(),
|
||||||
});
|
});
|
||||||
@@ -209,7 +210,6 @@ export const integrations = mysqlTable(
|
|||||||
url: text().notNull(),
|
url: text().notNull(),
|
||||||
kind: varchar({ length: 128 }).$type<IntegrationKind>().notNull(),
|
kind: varchar({ length: 128 }).$type<IntegrationKind>().notNull(),
|
||||||
appId: varchar({ length: 128 }).references(() => apps.id, { onDelete: "set null" }),
|
appId: varchar({ length: 128 }).references(() => apps.id, { onDelete: "set null" }),
|
||||||
creatorId: varchar({ length: 64 }).references(() => users.id, { onDelete: "set null" }),
|
|
||||||
},
|
},
|
||||||
(integrations) => ({
|
(integrations) => ({
|
||||||
kindIdx: index("integration__kind_idx").on(integrations.kind),
|
kindIdx: index("integration__kind_idx").on(integrations.kind),
|
||||||
@@ -689,10 +689,6 @@ export const integrationRelations = relations(integrations, ({ one, many }) => (
|
|||||||
fields: [integrations.appId],
|
fields: [integrations.appId],
|
||||||
references: [apps.id],
|
references: [apps.id],
|
||||||
}),
|
}),
|
||||||
creator: one(users, {
|
|
||||||
fields: [integrations.creatorId],
|
|
||||||
references: [users.id],
|
|
||||||
}),
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export const integrationUserPermissionRelations = relations(integrationUserPermissions, ({ one }) => ({
|
export const integrationUserPermissionRelations = relations(integrationUserPermissions, ({ one }) => ({
|
||||||
|
|||||||
@@ -85,6 +85,7 @@ export const users = pgTable("user", {
|
|||||||
colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
|
colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
|
||||||
firstDayOfWeek: smallint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
|
firstDayOfWeek: smallint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
|
||||||
pingIconsEnabled: boolean().default(false).notNull(),
|
pingIconsEnabled: boolean().default(false).notNull(),
|
||||||
|
enableRightClickOnWidgets: boolean().default(true).notNull(),
|
||||||
completedManageTour: boolean().default(false).notNull(),
|
completedManageTour: boolean().default(false).notNull(),
|
||||||
completedBoardTour: boolean().default(false).notNull(),
|
completedBoardTour: boolean().default(false).notNull(),
|
||||||
});
|
});
|
||||||
@@ -208,7 +209,6 @@ export const integrations = pgTable(
|
|||||||
url: text().notNull(),
|
url: text().notNull(),
|
||||||
kind: varchar({ length: 128 }).$type<IntegrationKind>().notNull(),
|
kind: varchar({ length: 128 }).$type<IntegrationKind>().notNull(),
|
||||||
appId: varchar({ length: 128 }).references(() => apps.id, { onDelete: "set null" }),
|
appId: varchar({ length: 128 }).references(() => apps.id, { onDelete: "set null" }),
|
||||||
creatorId: varchar({ length: 64 }).references(() => users.id, { onDelete: "set null" }),
|
|
||||||
},
|
},
|
||||||
(integrations) => ({
|
(integrations) => ({
|
||||||
kindIdx: index("integration__kind_idx").on(integrations.kind),
|
kindIdx: index("integration__kind_idx").on(integrations.kind),
|
||||||
@@ -688,10 +688,6 @@ export const integrationRelations = relations(integrations, ({ one, many }) => (
|
|||||||
fields: [integrations.appId],
|
fields: [integrations.appId],
|
||||||
references: [apps.id],
|
references: [apps.id],
|
||||||
}),
|
}),
|
||||||
creator: one(users, {
|
|
||||||
fields: [integrations.creatorId],
|
|
||||||
references: [users.id],
|
|
||||||
}),
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export const integrationUserPermissionRelations = relations(integrationUserPermissions, ({ one }) => ({
|
export const integrationUserPermissionRelations = relations(integrationUserPermissions, ({ one }) => ({
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ export const users = sqliteTable("user", {
|
|||||||
colorScheme: text().$type<ColorScheme>().default("dark").notNull(),
|
colorScheme: text().$type<ColorScheme>().default("dark").notNull(),
|
||||||
firstDayOfWeek: int().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
|
firstDayOfWeek: int().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
|
||||||
pingIconsEnabled: int({ mode: "boolean" }).default(false).notNull(),
|
pingIconsEnabled: int({ mode: "boolean" }).default(false).notNull(),
|
||||||
|
enableRightClickOnWidgets: int({ mode: "boolean" }).default(true).notNull(),
|
||||||
completedManageTour: int({ mode: "boolean" }).default(false).notNull(),
|
completedManageTour: int({ mode: "boolean" }).default(false).notNull(),
|
||||||
completedBoardTour: int({ mode: "boolean" }).default(false).notNull(),
|
completedBoardTour: int({ mode: "boolean" }).default(false).notNull(),
|
||||||
});
|
});
|
||||||
@@ -195,7 +196,6 @@ export const integrations = sqliteTable(
|
|||||||
url: text().notNull(),
|
url: text().notNull(),
|
||||||
kind: text().$type<IntegrationKind>().notNull(),
|
kind: text().$type<IntegrationKind>().notNull(),
|
||||||
appId: text().references(() => apps.id, { onDelete: "set null" }),
|
appId: text().references(() => apps.id, { onDelete: "set null" }),
|
||||||
creatorId: text().references(() => users.id, { onDelete: "set null" }),
|
|
||||||
},
|
},
|
||||||
(integrations) => ({
|
(integrations) => ({
|
||||||
kindIdx: index("integration__kind_idx").on(integrations.kind),
|
kindIdx: index("integration__kind_idx").on(integrations.kind),
|
||||||
@@ -678,10 +678,6 @@ export const integrationRelations = relations(integrations, ({ one, many }) => (
|
|||||||
fields: [integrations.appId],
|
fields: [integrations.appId],
|
||||||
references: [apps.id],
|
references: [apps.id],
|
||||||
}),
|
}),
|
||||||
creator: one(users, {
|
|
||||||
fields: [integrations.creatorId],
|
|
||||||
references: [users.id],
|
|
||||||
}),
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export const integrationUserPermissionRelations = relations(integrationUserPermissions, ({ one }) => ({
|
export const integrationUserPermissionRelations = relations(integrationUserPermissions, ({ one }) => ({
|
||||||
|
|||||||
@@ -37,5 +37,5 @@ describe("Mysql Migration", () => {
|
|||||||
|
|
||||||
connection.end();
|
connection.end();
|
||||||
await mysqlContainer.stop();
|
await mysqlContainer.stop();
|
||||||
}, 40_000);
|
}, 120_000);
|
||||||
});
|
});
|
||||||
@@ -329,7 +329,6 @@ export type HomarrDocumentationPath =
|
|||||||
| "/docs/integrations/peanut"
|
| "/docs/integrations/peanut"
|
||||||
| "/docs/integrations/beszel"
|
| "/docs/integrations/beszel"
|
||||||
| "/docs/integrations/traefik"
|
| "/docs/integrations/traefik"
|
||||||
| "/docs/integrations/open-webui"
|
|
||||||
| "/docs/widgets/clock"
|
| "/docs/widgets/clock"
|
||||||
| "/docs/widgets/weather"
|
| "/docs/widgets/weather"
|
||||||
| "/docs/widgets/app"
|
| "/docs/widgets/app"
|
||||||
@@ -382,5 +381,4 @@ export type HomarrDocumentationPath =
|
|||||||
| "/docs/widgets/beszel-alerts"
|
| "/docs/widgets/beszel-alerts"
|
||||||
| "/docs/widgets/beszel-system-stats"
|
| "/docs/widgets/beszel-system-stats"
|
||||||
| "/docs/widgets/traefik"
|
| "/docs/widgets/traefik"
|
||||||
| "/docs/widgets/custom-api"
|
| "/docs/widgets/custom-api";
|
||||||
| "/docs/widgets/open-webui";
|
|
||||||
@@ -54,6 +54,5 @@ export const integrationDocSlugs: Record<IntegrationKind, string | null> = {
|
|||||||
beszel: "beszel",
|
beszel: "beszel",
|
||||||
traefik: "traefik",
|
traefik: "traefik",
|
||||||
archiveTeamWarrior: null,
|
archiveTeamWarrior: null,
|
||||||
openWebUi: "open-webui",
|
|
||||||
mock: null,
|
mock: null,
|
||||||
};
|
};
|
||||||
@@ -55,5 +55,4 @@ export const widgetDocSlugs: Record<WidgetKind, string | null> = {
|
|||||||
beszelSystemStats: "beszel-system-stats",
|
beszelSystemStats: "beszel-system-stats",
|
||||||
traefik: "traefik",
|
traefik: "traefik",
|
||||||
customApi: "custom-api",
|
customApi: "custom-api",
|
||||||
openWebUi: "open-webui",
|
|
||||||
};
|
};
|
||||||
@@ -3,5 +3,4 @@ export const hotkeys = {
|
|||||||
toggleColorScheme: "mod+j",
|
toggleColorScheme: "mod+j",
|
||||||
saveNotebook: "mod+s",
|
saveNotebook: "mod+s",
|
||||||
openSpotlight: "mod+k",
|
openSpotlight: "mod+k",
|
||||||
toggleAiChat: "mod+shift+a",
|
|
||||||
};
|
};
|
||||||
@@ -379,7 +379,7 @@ export const integrationDefs = {
|
|||||||
category: ["healthMonitoring"],
|
category: ["healthMonitoring"],
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/patchmon"),
|
documentationUrl: createDocumentationLink("/docs/integrations/patchmon"),
|
||||||
defaultPort: 3413,
|
defaultPort: 3413,
|
||||||
apiKeySettingsPath: "/settings/api-keys",
|
apiKeySettingsPath: "/settings/integrations",
|
||||||
},
|
},
|
||||||
tracearr: {
|
tracearr: {
|
||||||
name: "Tracearr",
|
name: "Tracearr",
|
||||||
@@ -467,16 +467,6 @@ export const integrationDefs = {
|
|||||||
iconUrl: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/archiveteam-warrior.png",
|
iconUrl: "https://cdn.jsdelivr.net/gh/selfhst/icons/png/archiveteam-warrior.png",
|
||||||
category: ["archiving"],
|
category: ["archiving"],
|
||||||
documentationUrl: null,
|
documentationUrl: null,
|
||||||
defaultUrl: "http://localhost:8001",
|
|
||||||
},
|
|
||||||
openWebUi: {
|
|
||||||
name: "Open WebUI",
|
|
||||||
secretKinds: [["apiKey"]],
|
|
||||||
iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/open-webui.svg",
|
|
||||||
category: ["ai"],
|
|
||||||
documentationUrl: createDocumentationLink("/docs/integrations/open-webui"),
|
|
||||||
defaultPort: 8080,
|
|
||||||
apiKeySettingsPath: "/?settings=open#account",
|
|
||||||
},
|
},
|
||||||
// This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
|
// This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
|
||||||
mock: {
|
mock: {
|
||||||
@@ -592,7 +582,6 @@ export const integrationCategories = [
|
|||||||
"documents",
|
"documents",
|
||||||
"mediaLibrary",
|
"mediaLibrary",
|
||||||
"uptimeMonitoring",
|
"uptimeMonitoring",
|
||||||
"ai",
|
|
||||||
"subtitleManager",
|
"subtitleManager",
|
||||||
"reverseProxy",
|
"reverseProxy",
|
||||||
] as const;
|
] as const;
|
||||||
|
|||||||
@@ -15,6 +15,12 @@ describe("getIntegrationApiKeyUrl", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("builds URL for patchmon", () => {
|
||||||
|
expect(getIntegrationApiKeyUrl("http://patchmon.local:3413", "patchmon")).toBe(
|
||||||
|
"http://patchmon.local:3413/settings/integrations",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it("returns null for integrations without apiKeySettingsPath", () => {
|
it("returns null for integrations without apiKeySettingsPath", () => {
|
||||||
expect(getIntegrationApiKeyUrl("http://localhost", "plex")).toBeNull();
|
expect(getIntegrationApiKeyUrl("http://localhost", "plex")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ export const widgetIntegrationSupport: Partial<Record<WidgetKind, readonly Integ
|
|||||||
vpn: getIntegrationKindsByCategory("vpn"),
|
vpn: getIntegrationKindsByCategory("vpn"),
|
||||||
archiveTeamWarrior: ["archiveTeamWarrior"],
|
archiveTeamWarrior: ["archiveTeamWarrior"],
|
||||||
anchorNote: ["anchor"],
|
anchorNote: ["anchor"],
|
||||||
openWebUi: ["openWebUi"],
|
|
||||||
traefik: ["traefik"],
|
traefik: ["traefik"],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ export const widgetKinds = [
|
|||||||
"beszelSystemStats",
|
"beszelSystemStats",
|
||||||
"traefik",
|
"traefik",
|
||||||
"customApi",
|
"customApi",
|
||||||
"openWebUi",
|
|
||||||
] as const;
|
] as const;
|
||||||
export type WidgetKind = (typeof widgetKinds)[number];
|
export type WidgetKind = (typeof widgetKinds)[number];
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,12 @@ const createUrlByIdChannel = (id: string) =>
|
|||||||
headers: `${string}.${string}`;
|
headers: `${string}.${string}`;
|
||||||
}>(`image-proxy:url:${id}`);
|
}>(`image-proxy:url:${id}`);
|
||||||
|
|
||||||
|
export type ForwardImageResult =
|
||||||
|
| { image: ArrayBuffer; contentType: string | null }
|
||||||
|
| { error: "not-found" }
|
||||||
|
| { error: "upstream-error"; statusCode: number }
|
||||||
|
| { error: "fetch-error" };
|
||||||
|
|
||||||
export class ImageProxy {
|
export class ImageProxy {
|
||||||
private static hmacKey: Buffer<ArrayBuffer> | null = null;
|
private static hmacKey: Buffer<ArrayBuffer> | null = null;
|
||||||
|
|
||||||
@@ -47,17 +53,34 @@ export class ImageProxy {
|
|||||||
return this.createImageUrl(id);
|
return this.createImageUrl(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async forwardImageAsync(id: string): Promise<ArrayBuffer | null> {
|
public async forwardImageAsync(id: string): Promise<ForwardImageResult> {
|
||||||
const urlAndHeaders = await this.getImageUrlAndHeadersAsync(id);
|
const urlAndHeaders = await this.getImageUrlAndHeadersAsync(id);
|
||||||
if (!urlAndHeaders) {
|
if (!urlAndHeaders) {
|
||||||
return null;
|
return { error: "not-found" };
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await fetchWithTrustedCertificatesAsync(urlAndHeaders.url, {
|
|
||||||
headers: urlAndHeaders.headers ?? {},
|
|
||||||
});
|
|
||||||
|
|
||||||
const proxyUrl = this.createImageUrl(id);
|
const proxyUrl = this.createImageUrl(id);
|
||||||
|
let response: Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>;
|
||||||
|
try {
|
||||||
|
response = await fetchWithTrustedCertificatesAsync(urlAndHeaders.url, {
|
||||||
|
headers: urlAndHeaders.headers ?? {},
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(
|
||||||
|
new ErrorWithMetadata(
|
||||||
|
"Failed to connect to image source",
|
||||||
|
{
|
||||||
|
id,
|
||||||
|
url: this.redactUrl(urlAndHeaders.url),
|
||||||
|
headers: this.redactHeaders(urlAndHeaders.headers),
|
||||||
|
proxyUrl,
|
||||||
|
},
|
||||||
|
{ cause: error },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
return { error: "fetch-error" };
|
||||||
|
}
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
logger.error(
|
logger.error(
|
||||||
new ErrorWithMetadata("Failed to fetch image", {
|
new ErrorWithMetadata("Failed to fetch image", {
|
||||||
@@ -68,7 +91,7 @@ export class ImageProxy {
|
|||||||
statusCode: response.status,
|
statusCode: response.status,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
return null;
|
return { error: "upstream-error", statusCode: response.status };
|
||||||
}
|
}
|
||||||
|
|
||||||
const arrayBuffer = await response.arrayBuffer();
|
const arrayBuffer = await response.arrayBuffer();
|
||||||
@@ -80,7 +103,7 @@ export class ImageProxy {
|
|||||||
size: `${(arrayBuffer.byteLength / 1024).toFixed(1)}KB`,
|
size: `${(arrayBuffer.byteLength / 1024).toFixed(1)}KB`,
|
||||||
});
|
});
|
||||||
|
|
||||||
return arrayBuffer;
|
return { image: arrayBuffer, contentType: response.headers.get("content-type") };
|
||||||
}
|
}
|
||||||
|
|
||||||
private createImageUrl(id: string): string {
|
private createImageUrl(id: string): string {
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ import { MockIntegration } from "../mock/mock-integration";
|
|||||||
import { NavidromeIntegration } from "../navidrome/navidrome-integration";
|
import { NavidromeIntegration } from "../navidrome/navidrome-integration";
|
||||||
import { NextcloudIntegration } from "../nextcloud/nextcloud.integration";
|
import { NextcloudIntegration } from "../nextcloud/nextcloud.integration";
|
||||||
import { GotifyIntegration } from "../gotify/gotify-integration";
|
import { GotifyIntegration } from "../gotify/gotify-integration";
|
||||||
import { OpenWebUiIntegration } from "../open-webui/open-webui-integration";
|
|
||||||
import { NTFYIntegration } from "../ntfy/ntfy-integration";
|
import { NTFYIntegration } from "../ntfy/ntfy-integration";
|
||||||
import { OpenMediaVaultIntegration } from "../openmediavault/openmediavault-integration";
|
import { OpenMediaVaultIntegration } from "../openmediavault/openmediavault-integration";
|
||||||
import { OPNsenseIntegration } from "../opnsense/opnsense-integration";
|
import { OPNsenseIntegration } from "../opnsense/opnsense-integration";
|
||||||
@@ -132,7 +131,6 @@ export const integrationCreators = {
|
|||||||
uptimeKuma: UptimeKumaIntegration,
|
uptimeKuma: UptimeKumaIntegration,
|
||||||
peaNut: PeaNutIntegration,
|
peaNut: PeaNutIntegration,
|
||||||
beszel: BeszelIntegration,
|
beszel: BeszelIntegration,
|
||||||
openWebUi: OpenWebUiIntegration,
|
|
||||||
bazarr: BazarrIntegration,
|
bazarr: BazarrIntegration,
|
||||||
traefik: TraefikIntegration,
|
traefik: TraefikIntegration,
|
||||||
} satisfies Record<IntegrationKind, IntegrationInstance | [(input: IntegrationInput) => Promise<Integration>]>;
|
} satisfies Record<IntegrationKind, IntegrationInstance | [(input: IntegrationInput) => Promise<Integration>]>;
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import { humanFileSize } from "@homarr/common";
|
|
||||||
|
|
||||||
import "@homarr/redis";
|
import "@homarr/redis";
|
||||||
|
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
@@ -48,7 +46,7 @@ export class DashDotIntegration extends Integration implements ISystemHealthMoni
|
|||||||
.map((storage, index) => ({
|
.map((storage, index) => ({
|
||||||
deviceName: `Storage ${index + 1}: (${storage.disks.map((disk) => disk.device).join(", ")})`,
|
deviceName: `Storage ${index + 1}: (${storage.disks.map((disk) => disk.device).join(", ")})`,
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
||||||
used: humanFileSize(storageLoad[index]!),
|
used: `${storageLoad[index]!}`,
|
||||||
available: storageLoad[index] ? `${storage.size - storageLoad[index]}` : `${storage.size}`,
|
available: storageLoad[index] ? `${storage.size - storageLoad[index]}` : `${storage.size}`,
|
||||||
percentage: storageLoad[index] ? (storageLoad[index] / storage.size) * 100 : 0,
|
percentage: storageLoad[index] ? (storageLoad[index] / storage.size) * 100 : 0,
|
||||||
})),
|
})),
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ export class QBitTorrentIntegration extends Integration implements IDownloadClie
|
|||||||
public async getClientJobsAndStatusAsync(input: { limit: number }): Promise<DownloadClientJobsAndStatus> {
|
public async getClientJobsAndStatusAsync(input: { limit: number }): Promise<DownloadClientJobsAndStatus> {
|
||||||
const type = "torrent";
|
const type = "torrent";
|
||||||
const client = await this.getClientAsync();
|
const client = await this.getClientAsync();
|
||||||
const torrents = await client.listTorrents({ limit: input.limit });
|
const torrents = await client.listTorrents({ limit: input.limit, sort: "progress", reverse: false });
|
||||||
const rates = torrents.reduce(
|
const rates = torrents.reduce(
|
||||||
({ down, up }, { dlspeed, upspeed }) => ({ down: down + dlspeed, up: up + upspeed }),
|
({ down, up }, { dlspeed, upspeed }) => ({ down: down + dlspeed, up: up + upspeed }),
|
||||||
{ down: 0, up: 0 },
|
{ down: 0, up: 0 },
|
||||||
|
|||||||
@@ -117,6 +117,12 @@ export class EmbyIntegration extends Integration implements IMediaServerIntegrat
|
|||||||
episodeName: sessionInfo.NowPlayingItem.EpisodeTitle,
|
episodeName: sessionInfo.NowPlayingItem.EpisodeTitle,
|
||||||
albumName: sessionInfo.NowPlayingItem.Album ?? "",
|
albumName: sessionInfo.NowPlayingItem.Album ?? "",
|
||||||
episodeCount: sessionInfo.NowPlayingItem.EpisodeCount,
|
episodeCount: sessionInfo.NowPlayingItem.EpisodeCount,
|
||||||
|
playback: {
|
||||||
|
state: null,
|
||||||
|
positionMs: null,
|
||||||
|
durationMs: null,
|
||||||
|
},
|
||||||
|
location: null,
|
||||||
metadata: null,
|
metadata: null,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
import {
|
import {
|
||||||
|
AssetMediaSize,
|
||||||
|
AssetTypeEnum,
|
||||||
|
AssetVisibility,
|
||||||
getAlbumInfo,
|
getAlbumInfo,
|
||||||
getAllAlbums,
|
getAllAlbums,
|
||||||
getMyUser,
|
getMyUser,
|
||||||
getServerStatistics,
|
getServerStatistics,
|
||||||
init,
|
init,
|
||||||
searchAssets,
|
searchAssets,
|
||||||
|
searchRandom,
|
||||||
searchUsers,
|
searchUsers,
|
||||||
} from "@immich/sdk";
|
} from "@immich/sdk";
|
||||||
import type { AssetResponseDto, MetadataSearchDto } from "@immich/sdk";
|
import type { AssetResponseDto, MetadataSearchDto } from "@immich/sdk";
|
||||||
@@ -42,6 +46,7 @@ export interface ImmichAsset {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const logger = createLogger({ module: "immich-integration" });
|
const logger = createLogger({ module: "immich-integration" });
|
||||||
|
const randomPhotoCount = 50;
|
||||||
|
|
||||||
export class ImmichIntegration extends Integration {
|
export class ImmichIntegration extends Integration {
|
||||||
constructor(integration: IntegrationInput) {
|
constructor(integration: IntegrationInput) {
|
||||||
@@ -62,36 +67,36 @@ export class ImmichIntegration extends Integration {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getAlbumAsync(albumId: string): Promise<ImmichAlbum> {
|
public async getAlbumAsync(albumId?: string): Promise<ImmichAlbum> {
|
||||||
this.initClient();
|
this.initClient();
|
||||||
const requestOptions = this.getRequestOptions();
|
const requestOptions = this.getRequestOptions();
|
||||||
|
|
||||||
|
if (!albumId) {
|
||||||
|
const assets = await searchRandom(
|
||||||
|
{
|
||||||
|
randomSearchDto: {
|
||||||
|
size: randomPhotoCount,
|
||||||
|
type: AssetTypeEnum.Image,
|
||||||
|
visibility: AssetVisibility.Timeline,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
requestOptions,
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: "",
|
||||||
|
albumName: "",
|
||||||
|
assets: await this.createAssetsAsync(assets),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
const [album, albumAssets] = await Promise.all([
|
const [album, albumAssets] = await Promise.all([
|
||||||
getAlbumInfo({ id: albumId }, requestOptions),
|
getAlbumInfo({ id: albumId }, requestOptions),
|
||||||
this.searchAlbumAssetsAsync(albumId),
|
this.searchAlbumAssetsAsync(albumId),
|
||||||
]);
|
]);
|
||||||
const imageProxy = new ImageProxy();
|
|
||||||
return {
|
return {
|
||||||
albumName: album.albumName,
|
albumName: album.albumName,
|
||||||
assets: await Promise.all(
|
assets: await this.createAssetsAsync(albumAssets),
|
||||||
albumAssets.map(async (asset) => {
|
|
||||||
const publicLink = await imageProxy.createImageAsync(
|
|
||||||
this.url(`/api/assets/${asset.id}/original`).toString(),
|
|
||||||
{
|
|
||||||
"x-api-key": this.getSecretValue("apiKey"),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
return {
|
|
||||||
id: asset.id,
|
|
||||||
type: asset.type,
|
|
||||||
thumbhash: asset.thumbhash,
|
|
||||||
fileCreatedAt: asset.fileCreatedAt,
|
|
||||||
fileModifiedAt: asset.fileModifiedAt,
|
|
||||||
originalPath: asset.originalPath,
|
|
||||||
updatedAt: asset.updatedAt,
|
|
||||||
publicLink,
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
id: album.id,
|
id: album.id,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -133,6 +138,32 @@ export class ImmichIntegration extends Integration {
|
|||||||
return assets;
|
return assets;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async createAssetsAsync(assets: AssetResponseDto[]): Promise<ImmichAsset[]> {
|
||||||
|
const imageProxy = new ImageProxy();
|
||||||
|
return await Promise.all(
|
||||||
|
assets.map(async (asset) => {
|
||||||
|
const publicLink = await imageProxy.createImageAsync(
|
||||||
|
// This is the URL generated by the SDK's viewAsset call. Preview images are
|
||||||
|
// browser-compatible while avoiding the large original asset download.
|
||||||
|
this.url(`/api/assets/${asset.id}/thumbnail`, { size: AssetMediaSize.Preview }).toString(),
|
||||||
|
{
|
||||||
|
"x-api-key": this.getSecretValue("apiKey"),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
id: asset.id,
|
||||||
|
type: asset.type,
|
||||||
|
thumbhash: asset.thumbhash,
|
||||||
|
fileCreatedAt: asset.fileCreatedAt,
|
||||||
|
fileModifiedAt: asset.fileModifiedAt,
|
||||||
|
originalPath: asset.originalPath,
|
||||||
|
updatedAt: asset.updatedAt,
|
||||||
|
publicLink,
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private getRequestOptions(fetchAsync = fetchWithTrustedCertificatesAsync) {
|
private getRequestOptions(fetchAsync = fetchWithTrustedCertificatesAsync) {
|
||||||
return {
|
return {
|
||||||
// Undici and node types are not the same
|
// Undici and node types are not the same
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ export { NavidromeIntegration } from "./navidrome/navidrome-integration";
|
|||||||
export { UptimeKumaIntegration } from "./uptime-kuma/uptime-kuma-integration";
|
export { UptimeKumaIntegration } from "./uptime-kuma/uptime-kuma-integration";
|
||||||
export { UmamiIntegration } from "./umami/umami-integration";
|
export { UmamiIntegration } from "./umami/umami-integration";
|
||||||
export { PeaNutIntegration } from "./peanut/peanut-integration";
|
export { PeaNutIntegration } from "./peanut/peanut-integration";
|
||||||
export { OpenWebUiIntegration } from "./open-webui/open-webui-integration";
|
|
||||||
export { BazarrIntegration } from "./bazarr/bazarr-integration";
|
export { BazarrIntegration } from "./bazarr/bazarr-integration";
|
||||||
export { TraefikIntegration } from "./traefik/traefik-integration";
|
export { TraefikIntegration } from "./traefik/traefik-integration";
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,12 @@ export interface StreamSession {
|
|||||||
episodeName?: string | null;
|
episodeName?: string | null;
|
||||||
albumName?: string | null;
|
albumName?: string | null;
|
||||||
episodeCount?: number | null;
|
episodeCount?: number | null;
|
||||||
|
playback: {
|
||||||
|
state: "playing" | "paused" | "buffering" | null;
|
||||||
|
positionMs: number | null;
|
||||||
|
durationMs: number | null;
|
||||||
|
};
|
||||||
|
location: "lan" | "wan" | null;
|
||||||
metadata: {
|
metadata: {
|
||||||
video: {
|
video: {
|
||||||
resolution: {
|
resolution: {
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ import type { IMediaServerIntegration } from "../interfaces/media-server/media-s
|
|||||||
import type { CurrentSessionsInput, StreamSession } from "../interfaces/media-server/media-server-types";
|
import type { CurrentSessionsInput, StreamSession } from "../interfaces/media-server/media-server-types";
|
||||||
import type { IMediaReleasesIntegration, MediaRelease, MediaType } from "../types";
|
import type { IMediaReleasesIntegration, MediaRelease, MediaType } from "../types";
|
||||||
|
|
||||||
|
function ticksToMs(ticks: number | null | undefined): number | null {
|
||||||
|
return ticks ? Math.round(ticks / 10_000) : null;
|
||||||
|
}
|
||||||
|
|
||||||
@HandleIntegrationErrors([integrationAxiosHttpErrorHandler])
|
@HandleIntegrationErrors([integrationAxiosHttpErrorHandler])
|
||||||
export class JellyfinIntegration extends Integration implements IMediaServerIntegration, IMediaReleasesIntegration {
|
export class JellyfinIntegration extends Integration implements IMediaServerIntegration, IMediaReleasesIntegration {
|
||||||
private readonly jellyfin: Jellyfin = new Jellyfin({
|
private readonly jellyfin: Jellyfin = new Jellyfin({
|
||||||
@@ -50,6 +54,9 @@ export class JellyfinIntegration extends Integration implements IMediaServerInte
|
|||||||
let currentlyPlaying: StreamSession["currentlyPlaying"] | null = null;
|
let currentlyPlaying: StreamSession["currentlyPlaying"] | null = null;
|
||||||
|
|
||||||
if (sessionInfo.NowPlayingItem) {
|
if (sessionInfo.NowPlayingItem) {
|
||||||
|
const positionMs = ticksToMs(sessionInfo.PlayState?.PositionTicks);
|
||||||
|
const durationMs = ticksToMs(sessionInfo.NowPlayingItem.RunTimeTicks);
|
||||||
|
|
||||||
currentlyPlaying = {
|
currentlyPlaying = {
|
||||||
type: convertJellyfinType(sessionInfo.NowPlayingItem.Type),
|
type: convertJellyfinType(sessionInfo.NowPlayingItem.Type),
|
||||||
name: sessionInfo.NowPlayingItem.SeriesName ?? sessionInfo.NowPlayingItem.Name ?? "",
|
name: sessionInfo.NowPlayingItem.SeriesName ?? sessionInfo.NowPlayingItem.Name ?? "",
|
||||||
@@ -57,6 +64,12 @@ export class JellyfinIntegration extends Integration implements IMediaServerInte
|
|||||||
episodeName: sessionInfo.NowPlayingItem.EpisodeTitle,
|
episodeName: sessionInfo.NowPlayingItem.EpisodeTitle,
|
||||||
albumName: sessionInfo.NowPlayingItem.Album ?? "",
|
albumName: sessionInfo.NowPlayingItem.Album ?? "",
|
||||||
episodeCount: sessionInfo.NowPlayingItem.EpisodeCount,
|
episodeCount: sessionInfo.NowPlayingItem.EpisodeCount,
|
||||||
|
playback: {
|
||||||
|
state: sessionInfo.PlayState?.IsPaused ? "paused" : "playing",
|
||||||
|
positionMs,
|
||||||
|
durationMs,
|
||||||
|
},
|
||||||
|
location: null,
|
||||||
metadata: {
|
metadata: {
|
||||||
video: {
|
video: {
|
||||||
resolution:
|
resolution:
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ const sessions: StreamSession[] = [
|
|||||||
episodeName: null,
|
episodeName: null,
|
||||||
albumName: null,
|
albumName: null,
|
||||||
episodeCount: null,
|
episodeCount: null,
|
||||||
|
playback: { state: null, positionMs: null, durationMs: null },
|
||||||
|
location: null,
|
||||||
metadata: null,
|
metadata: null,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -27,6 +29,8 @@ const sessions: StreamSession[] = [
|
|||||||
episodeName: "Ozymandias",
|
episodeName: "Ozymandias",
|
||||||
albumName: null,
|
albumName: null,
|
||||||
episodeCount: null,
|
episodeCount: null,
|
||||||
|
playback: { state: null, positionMs: null, durationMs: null },
|
||||||
|
location: null,
|
||||||
metadata: null,
|
metadata: null,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -41,6 +45,8 @@ const sessions: StreamSession[] = [
|
|||||||
episodeName: null,
|
episodeName: null,
|
||||||
albumName: null,
|
albumName: null,
|
||||||
episodeCount: null,
|
episodeCount: null,
|
||||||
|
playback: { state: null, positionMs: null, durationMs: null },
|
||||||
|
location: null,
|
||||||
metadata: null,
|
metadata: null,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -55,6 +61,8 @@ const sessions: StreamSession[] = [
|
|||||||
episodeName: "The We We Are",
|
episodeName: "The We We Are",
|
||||||
albumName: null,
|
albumName: null,
|
||||||
episodeCount: null,
|
episodeCount: null,
|
||||||
|
playback: { state: null, positionMs: null, durationMs: null },
|
||||||
|
location: null,
|
||||||
metadata: null,
|
metadata: null,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -69,6 +77,8 @@ const sessions: StreamSession[] = [
|
|||||||
episodeName: null,
|
episodeName: null,
|
||||||
albumName: "Random Access Memories",
|
albumName: "Random Access Memories",
|
||||||
episodeCount: null,
|
episodeCount: null,
|
||||||
|
playback: { state: null, positionMs: null, durationMs: null },
|
||||||
|
location: null,
|
||||||
metadata: null,
|
metadata: null,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -83,6 +93,8 @@ const sessions: StreamSession[] = [
|
|||||||
episodeName: null,
|
episodeName: null,
|
||||||
albumName: null,
|
albumName: null,
|
||||||
episodeCount: null,
|
episodeCount: null,
|
||||||
|
playback: { state: null, positionMs: null, durationMs: null },
|
||||||
|
location: null,
|
||||||
metadata: null,
|
metadata: null,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,372 +0,0 @@
|
|||||||
import { FormData } from "undici";
|
|
||||||
|
|
||||||
import { ResponseError } from "@homarr/common/server";
|
|
||||||
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
|
||||||
|
|
||||||
import type { IntegrationTestingInput } from "../base/integration";
|
|
||||||
import { Integration } from "../base/integration";
|
|
||||||
import type { TestingResult } from "../base/test-connection/test-connection-service";
|
|
||||||
import type {
|
|
||||||
OpenWebUiChat,
|
|
||||||
OpenWebUiChatListItem,
|
|
||||||
OpenWebUiChatPayload,
|
|
||||||
OpenWebUiCompletionMessage,
|
|
||||||
OpenWebUiFileSummary,
|
|
||||||
OpenWebUiKnowledge,
|
|
||||||
OpenWebUiModel,
|
|
||||||
OpenWebUiNote,
|
|
||||||
OpenWebUiWebDocument,
|
|
||||||
} from "./open-webui-types";
|
|
||||||
import {
|
|
||||||
openWebUiChatListItemSchema,
|
|
||||||
openWebUiChatSchema,
|
|
||||||
openWebUiCollectionQueryResponseSchema,
|
|
||||||
openWebUiCompletionChunkSchema,
|
|
||||||
openWebUiFileListSchema,
|
|
||||||
openWebUiKnowledgeListSchema,
|
|
||||||
openWebUiModelsResponseSchema,
|
|
||||||
openWebUiNoteListSchema,
|
|
||||||
openWebUiNoteSchema,
|
|
||||||
openWebUiProcessWebResponseSchema,
|
|
||||||
openWebUiTranscriptionSchema,
|
|
||||||
openWebUiUploadedFileSchema,
|
|
||||||
} from "./open-webui-types";
|
|
||||||
|
|
||||||
const logger = createLogger({ module: "open-webui-integration" });
|
|
||||||
|
|
||||||
// Default per-request timeout so a stalled upstream can't hang model/file/note/
|
|
||||||
// chat calls indefinitely. Streaming completions opt out (they are long-lived).
|
|
||||||
const DEFAULT_REQUEST_TIMEOUT_MS = 10_000;
|
|
||||||
|
|
||||||
// The (undici) request options accepted by the shared fetch helper. Derived so
|
|
||||||
// the request helpers stay in sync with the underlying fetch types.
|
|
||||||
type RequestOptions = NonNullable<Parameters<typeof fetchWithTrustedCertificatesAsync>[1]>;
|
|
||||||
|
|
||||||
export class OpenWebUiIntegration extends Integration {
|
|
||||||
protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
|
|
||||||
const response = await input.fetchAsync(this.url("/api/models"), {
|
|
||||||
headers: this.getAuthHeaders(),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new ResponseError(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
return { success: true };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List the models served by Open WebUI (aggregates all configured providers).
|
|
||||||
*/
|
|
||||||
public async getModelsAsync(): Promise<OpenWebUiModel[]> {
|
|
||||||
const parsed = await this.getJsonAsync("/api/models", openWebUiModelsResponseSchema);
|
|
||||||
return parsed.data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List the knowledge bases (RAG collections) the user can ground chats on.
|
|
||||||
*/
|
|
||||||
public async getKnowledgeAsync(): Promise<OpenWebUiKnowledge[]> {
|
|
||||||
const parsed = await this.getJsonAsync("/api/v1/knowledge/", openWebUiKnowledgeListSchema);
|
|
||||||
return Array.isArray(parsed) ? parsed : parsed.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List the user's uploaded files (for the "Attach Files" picker).
|
|
||||||
*/
|
|
||||||
public async listFilesAsync(): Promise<OpenWebUiFileSummary[]> {
|
|
||||||
const files = await this.fetchFilesAsync();
|
|
||||||
return files.map((file) => ({ id: file.id, name: file.meta?.name ?? file.filename ?? file.id }));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List the files contained in a knowledge base (for the expandable picker).
|
|
||||||
* The knowledge detail endpoint returns `files: null` on recent versions, so
|
|
||||||
* we read the files list and filter by the base's collection id instead.
|
|
||||||
*/
|
|
||||||
public async getKnowledgeFilesAsync(knowledgeId: string): Promise<OpenWebUiFileSummary[]> {
|
|
||||||
const files = await this.fetchFilesAsync();
|
|
||||||
return files
|
|
||||||
.filter((file) => file.meta?.collection_name === knowledgeId)
|
|
||||||
.map((file) => ({ id: file.id, name: file.meta?.name ?? file.filename ?? file.id }));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Fetch the raw file list, normalizing the paginated and bare-array shapes. */
|
|
||||||
private async fetchFilesAsync() {
|
|
||||||
const parsed = await this.getJsonAsync("/api/v1/files/", openWebUiFileListSchema);
|
|
||||||
return Array.isArray(parsed) ? parsed : parsed.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List the user's notes (for the "Attach Notes" picker).
|
|
||||||
*/
|
|
||||||
public async listNotesAsync(): Promise<OpenWebUiNote[]> {
|
|
||||||
const parsed = await this.getJsonAsync("/api/v1/notes/", openWebUiNoteListSchema);
|
|
||||||
const notes = Array.isArray(parsed) ? parsed : parsed.items;
|
|
||||||
return notes.map((note) => ({
|
|
||||||
id: note.id,
|
|
||||||
title: note.title ?? "Untitled note",
|
|
||||||
content: note.data?.content?.md ?? "",
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a single note including its full markdown content. The list endpoint
|
|
||||||
* truncates the body, so we fetch the note directly when attaching it.
|
|
||||||
*/
|
|
||||||
public async getNoteAsync(noteId: string): Promise<OpenWebUiNote> {
|
|
||||||
const parsed = await this.getJsonAsync(`/api/v1/notes/${encodeURIComponent(noteId)}`, openWebUiNoteSchema);
|
|
||||||
return { id: parsed.id, title: parsed.title ?? "Untitled note", content: parsed.data?.content?.md ?? "" };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Transcribe recorded audio to text (speech-to-text) for voice messages.
|
|
||||||
*/
|
|
||||||
public async transcribeAudioAsync(filename: string, base64Content: string, contentType: string): Promise<string> {
|
|
||||||
const form = new FormData();
|
|
||||||
form.append("file", new Blob([Buffer.from(base64Content, "base64")], { type: contentType }), filename);
|
|
||||||
|
|
||||||
const parsed = await this.postFormAsync("/api/v1/audio/transcriptions", form, openWebUiTranscriptionSchema);
|
|
||||||
return parsed.text;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Upload a file to Open WebUI so it can be retrieved from later. Returns the
|
|
||||||
* new file id (its vector collection is `file-{id}`).
|
|
||||||
*/
|
|
||||||
public async uploadFileAsync(
|
|
||||||
filename: string,
|
|
||||||
base64Content: string,
|
|
||||||
contentType: string,
|
|
||||||
): Promise<OpenWebUiFileSummary> {
|
|
||||||
const form = new FormData();
|
|
||||||
form.append("file", new Blob([Buffer.from(base64Content, "base64")], { type: contentType }), filename);
|
|
||||||
|
|
||||||
const parsed = await this.postFormAsync("/api/v1/files/", form, openWebUiUploadedFileSchema);
|
|
||||||
return { id: parsed.id, name: parsed.meta?.name ?? parsed.filename ?? filename };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Ingest a web page into a temporary vector collection and return a handle to
|
|
||||||
* retrieve from it. Open WebUI does not crawl URLs at completion time, so we
|
|
||||||
* embed the page here and inject retrieved chunks ourselves at send time.
|
|
||||||
*/
|
|
||||||
public async processWebAsync(url: string): Promise<OpenWebUiWebDocument> {
|
|
||||||
const parsed = await this.postJsonAsync(
|
|
||||||
"/api/v1/retrieval/process/web",
|
|
||||||
{ url, collection_name: "" },
|
|
||||||
openWebUiProcessWebResponseSchema,
|
|
||||||
);
|
|
||||||
return { collectionName: parsed.collection_name, title: parsed.file?.meta?.name ?? url };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieve the most relevant chunks for a query across the given collections
|
|
||||||
* (web pages and/or knowledge bases). Returns the chunk texts, best-effort.
|
|
||||||
*/
|
|
||||||
public async queryCollectionsAsync(collectionNames: string[], query: string, k = 4): Promise<string[]> {
|
|
||||||
if (collectionNames.length === 0 || query.trim() === "") {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
const parsed = await this.postJsonAsync(
|
|
||||||
"/api/v1/retrieval/query/collection",
|
|
||||||
{ collection_names: collectionNames, query, k },
|
|
||||||
openWebUiCollectionQueryResponseSchema,
|
|
||||||
);
|
|
||||||
return (parsed.documents ?? []).flat();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* List the user's chats (native Open WebUI history).
|
|
||||||
*/
|
|
||||||
public async listChatsAsync(): Promise<OpenWebUiChatListItem[]> {
|
|
||||||
return await this.getJsonAsync("/api/v1/chats/", openWebUiChatListItemSchema.array());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a single chat including its messages.
|
|
||||||
*/
|
|
||||||
public async getChatAsync(chatId: string): Promise<OpenWebUiChat> {
|
|
||||||
return await this.getJsonAsync(`/api/v1/chats/${encodeURIComponent(chatId)}`, openWebUiChatSchema);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new chat in the native history.
|
|
||||||
*/
|
|
||||||
public async createChatAsync(payload: OpenWebUiChatPayload): Promise<OpenWebUiChat> {
|
|
||||||
return await this.postJsonAsync("/api/v1/chats/new", { chat: payload }, openWebUiChatSchema);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update an existing chat in the native history.
|
|
||||||
*/
|
|
||||||
public async updateChatAsync(chatId: string, payload: OpenWebUiChatPayload): Promise<OpenWebUiChat> {
|
|
||||||
return await this.postJsonAsync(
|
|
||||||
`/api/v1/chats/${encodeURIComponent(chatId)}`,
|
|
||||||
{ chat: payload },
|
|
||||||
openWebUiChatSchema,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stream an assistant completion token-by-token.
|
|
||||||
* Reads the OpenAI-compatible SSE response and invokes `onDelta` for each
|
|
||||||
* content delta. Resolves when the stream completes ([DONE]) or is aborted.
|
|
||||||
*/
|
|
||||||
public async streamChatCompletionAsync(
|
|
||||||
params: { model: string; messages: OpenWebUiCompletionMessage[] },
|
|
||||||
onDelta: (delta: string) => void,
|
|
||||||
signal: AbortSignal,
|
|
||||||
): Promise<void> {
|
|
||||||
const response = await this.requestAsync("/api/chat/completions", {
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify({ model: params.model, messages: params.messages, stream: true }),
|
|
||||||
// Long-lived stream: opt out of the default request timeout and rely on the
|
|
||||||
// caller's abort signal instead (the timeout path would also replace this
|
|
||||||
// signal, breaking cancellation).
|
|
||||||
timeout: undefined,
|
|
||||||
signal,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.body) {
|
|
||||||
throw new ResponseError(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
const reader = response.body.getReader();
|
|
||||||
const decoder = new TextDecoder();
|
|
||||||
let buffer = "";
|
|
||||||
|
|
||||||
const processLine = (line: string): boolean => {
|
|
||||||
const trimmed = line.trim();
|
|
||||||
if (!trimmed.startsWith("data:")) return false;
|
|
||||||
|
|
||||||
const payload = trimmed.slice(5).trim();
|
|
||||||
if (payload === "") return false;
|
|
||||||
if (payload === "[DONE]") return true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const parsed = openWebUiCompletionChunkSchema.parse(JSON.parse(payload));
|
|
||||||
const choice = parsed.choices?.[0];
|
|
||||||
if (choice?.delta?.content) {
|
|
||||||
onDelta(choice.delta.content);
|
|
||||||
}
|
|
||||||
// Some providers end the stream with a finish_reason chunk and no
|
|
||||||
// explicit [DONE] sentinel; treat that as a clean completion too.
|
|
||||||
if (choice?.finish_reason) return true;
|
|
||||||
} catch (error) {
|
|
||||||
// The chunk can contain model output or grounded user data, so log only
|
|
||||||
// safe metadata rather than the raw payload.
|
|
||||||
logger.debug("Failed to parse Open WebUI completion chunk", {
|
|
||||||
error: error instanceof Error ? error.message : "unknown",
|
|
||||||
payloadLength: payload.length,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
let completed = false;
|
|
||||||
try {
|
|
||||||
while (!signal.aborted) {
|
|
||||||
const { done, value } = await reader.read();
|
|
||||||
if (done) {
|
|
||||||
// The server may close after the final data: event without a trailing
|
|
||||||
// newline; parse whatever is left so a valid completion isn't treated
|
|
||||||
// as a truncated stream.
|
|
||||||
if (buffer.trim() !== "" && processLine(buffer)) {
|
|
||||||
completed = true;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer += decoder.decode(value, { stream: true });
|
|
||||||
const lines = buffer.split("\n");
|
|
||||||
buffer = lines.pop() ?? "";
|
|
||||||
for (const line of lines) {
|
|
||||||
if (processLine(line)) {
|
|
||||||
completed = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (completed) break;
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
reader.cancel().catch(() => {
|
|
||||||
// ignore cancellation errors during teardown
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// The reader ended without a [DONE]/finish_reason marker: the upstream
|
|
||||||
// connection was cut mid-stream. Surface it instead of presenting the
|
|
||||||
// partial reply as a complete answer.
|
|
||||||
if (!signal.aborted && !completed) {
|
|
||||||
throw new Error("Open WebUI stream ended before completion");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private getAuthHeaders(): Record<string, string> {
|
|
||||||
return {
|
|
||||||
Authorization: `Bearer ${this.getSecretValue("apiKey")}`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Issue an authenticated request against the Open WebUI API and throw a
|
|
||||||
* {@link ResponseError} on a non-2xx status. Centralizes the auth header,
|
|
||||||
* trusted-certificate fetch and error handling shared by every endpoint.
|
|
||||||
*/
|
|
||||||
private async requestAsync(
|
|
||||||
path: `/${string}`,
|
|
||||||
init?: Omit<RequestOptions, "headers"> & { headers?: Record<string, string> },
|
|
||||||
) {
|
|
||||||
const response = await fetchWithTrustedCertificatesAsync(this.url(path), {
|
|
||||||
// Apply a default timeout unless the caller opts out (e.g. streaming
|
|
||||||
// completions pass `timeout: undefined` to stay open indefinitely). A
|
|
||||||
// spread after this key lets an explicit caller value win.
|
|
||||||
timeout: DEFAULT_REQUEST_TIMEOUT_MS,
|
|
||||||
...init,
|
|
||||||
headers: { ...this.getAuthHeaders(), ...init?.headers },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new ResponseError(response);
|
|
||||||
}
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** GET an endpoint and validate the JSON body against `schema`. */
|
|
||||||
private async getJsonAsync<TOutput>(
|
|
||||||
path: `/${string}`,
|
|
||||||
schema: { parse: (data: unknown) => TOutput },
|
|
||||||
): Promise<TOutput> {
|
|
||||||
const response = await this.requestAsync(path);
|
|
||||||
return schema.parse(await response.json());
|
|
||||||
}
|
|
||||||
|
|
||||||
/** POST a JSON body and validate the JSON response against `schema`. */
|
|
||||||
private async postJsonAsync<TOutput>(
|
|
||||||
path: `/${string}`,
|
|
||||||
body: unknown,
|
|
||||||
schema: { parse: (data: unknown) => TOutput },
|
|
||||||
): Promise<TOutput> {
|
|
||||||
const response = await this.requestAsync(path, {
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: JSON.stringify(body),
|
|
||||||
});
|
|
||||||
return schema.parse(await response.json());
|
|
||||||
}
|
|
||||||
|
|
||||||
/** POST a multipart form (file upload) and validate the JSON response. */
|
|
||||||
private async postFormAsync<TOutput>(
|
|
||||||
path: `/${string}`,
|
|
||||||
form: FormData,
|
|
||||||
schema: { parse: (data: unknown) => TOutput },
|
|
||||||
): Promise<TOutput> {
|
|
||||||
const response = await this.requestAsync(path, { method: "POST", body: form });
|
|
||||||
return schema.parse(await response.json());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,238 +0,0 @@
|
|||||||
// Open WebUI API types and schemas.
|
|
||||||
// Open WebUI exposes an OpenAI-compatible API plus its own native chat-history API.
|
|
||||||
// Schemas are intentionally defensive (`.nullish()`) because the native chat
|
|
||||||
// endpoints are undocumented and vary between Open WebUI versions.
|
|
||||||
import { z } from "zod/v4";
|
|
||||||
|
|
||||||
// GET /api/models — OpenAI-compatible. Open WebUI returns `{ data: [...] }`.
|
|
||||||
export const openWebUiModelSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
name: z.string().nullish(),
|
|
||||||
object: z.string().nullish(),
|
|
||||||
owned_by: z.string().nullish(),
|
|
||||||
// Open WebUI exposes per-model capabilities here when configured; `vision`
|
|
||||||
// tells us whether the model can accept image attachments.
|
|
||||||
info: z
|
|
||||||
.object({
|
|
||||||
meta: z
|
|
||||||
.object({
|
|
||||||
capabilities: z.object({ vision: z.boolean().nullish() }).nullish(),
|
|
||||||
})
|
|
||||||
.nullish(),
|
|
||||||
})
|
|
||||||
.nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const openWebUiModelsResponseSchema = z.object({
|
|
||||||
data: z.array(openWebUiModelSchema),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiModel = z.infer<typeof openWebUiModelSchema>;
|
|
||||||
|
|
||||||
// POST /api/chat/completions (stream: true) — OpenAI-compatible SSE delta chunk.
|
|
||||||
export const openWebUiCompletionChunkSchema = z.object({
|
|
||||||
id: z.string().nullish(),
|
|
||||||
choices: z
|
|
||||||
.array(
|
|
||||||
z.object({
|
|
||||||
delta: z
|
|
||||||
.object({
|
|
||||||
role: z.string().nullish(),
|
|
||||||
content: z.string().nullish(),
|
|
||||||
})
|
|
||||||
.nullish(),
|
|
||||||
finish_reason: z.string().nullish(),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
// Multimodal content part (OpenAI vision format). Lets a message carry text
|
|
||||||
// and/or images.
|
|
||||||
export const openWebUiContentPartSchema = z.discriminatedUnion("type", [
|
|
||||||
z.object({ type: z.literal("text"), text: z.string() }),
|
|
||||||
z.object({ type: z.literal("image_url"), image_url: z.object({ url: z.string() }) }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Message content is either plain text or multimodal parts. Both the completion
|
|
||||||
// and the native chat/history contracts use this so an attachment-backed message
|
|
||||||
// round-trips through create/update/get without parse failures or lossy drops.
|
|
||||||
export const openWebUiMessageContentSchema = z.union([z.string(), z.array(openWebUiContentPartSchema)]);
|
|
||||||
|
|
||||||
// A single chat message exchanged with the model / persisted in a chat.
|
|
||||||
export const openWebUiChatMessageSchema = z.object({
|
|
||||||
role: z.enum(["system", "user", "assistant"]),
|
|
||||||
content: openWebUiMessageContentSchema,
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiChatMessage = z.infer<typeof openWebUiChatMessageSchema>;
|
|
||||||
|
|
||||||
// A completion message can carry plain text or multimodal parts (text + images).
|
|
||||||
export const openWebUiCompletionMessageSchema = z.object({
|
|
||||||
role: z.enum(["system", "user", "assistant"]),
|
|
||||||
content: openWebUiMessageContentSchema,
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiCompletionMessage = z.infer<typeof openWebUiCompletionMessageSchema>;
|
|
||||||
|
|
||||||
// GET /api/v1/knowledge/ — knowledge bases (RAG collections owned by the user).
|
|
||||||
// Newer Open WebUI versions paginate the list as `{ items, total }`; older ones
|
|
||||||
// return a bare array. Accept both and normalise in the integration.
|
|
||||||
export const openWebUiKnowledgeSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
name: z.string().nullish(),
|
|
||||||
description: z.string().nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiKnowledge = z.infer<typeof openWebUiKnowledgeSchema>;
|
|
||||||
|
|
||||||
export const openWebUiKnowledgeListSchema = z.union([
|
|
||||||
z.array(openWebUiKnowledgeSchema),
|
|
||||||
z.object({ items: z.array(openWebUiKnowledgeSchema) }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// A file stored in Open WebUI (uploaded directly or part of a knowledge base).
|
|
||||||
// `meta.collection_name` is the knowledge base id when the file belongs to one.
|
|
||||||
export const openWebUiFileSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
filename: z.string().nullish(),
|
|
||||||
meta: z
|
|
||||||
.object({
|
|
||||||
name: z.string().nullish(),
|
|
||||||
content_type: z.string().nullish(),
|
|
||||||
collection_name: z.string().nullish(),
|
|
||||||
})
|
|
||||||
.nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiFile = z.infer<typeof openWebUiFileSchema>;
|
|
||||||
|
|
||||||
export const openWebUiFileListSchema = z.union([
|
|
||||||
z.array(openWebUiFileSchema),
|
|
||||||
z.object({ items: z.array(openWebUiFileSchema) }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// POST /api/v1/files/ — upload response (we only need the new file id + name).
|
|
||||||
export const openWebUiUploadedFileSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
filename: z.string().nullish(),
|
|
||||||
meta: z.object({ name: z.string().nullish() }).nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
// GET /api/v1/knowledge/{id} — knowledge base with its files.
|
|
||||||
export const openWebUiKnowledgeDetailSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
name: z.string().nullish(),
|
|
||||||
files: z.array(openWebUiFileSchema).nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiKnowledgeDetail = z.infer<typeof openWebUiKnowledgeDetailSchema>;
|
|
||||||
|
|
||||||
// GET /api/v1/notes/ — user notes (markdown content under data.content.md).
|
|
||||||
export const openWebUiNoteSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
title: z.string().nullish(),
|
|
||||||
data: z.object({ content: z.object({ md: z.string().nullish() }).nullish() }).nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const openWebUiNoteListSchema = z.union([
|
|
||||||
z.array(openWebUiNoteSchema),
|
|
||||||
z.object({ items: z.array(openWebUiNoteSchema) }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// A note flattened for the widget: id, title and its markdown body.
|
|
||||||
export interface OpenWebUiNote {
|
|
||||||
id: string;
|
|
||||||
title: string;
|
|
||||||
content: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
// POST /api/v1/audio/transcriptions — speech-to-text result.
|
|
||||||
export const openWebUiTranscriptionSchema = z.object({ text: z.string() });
|
|
||||||
|
|
||||||
// A file flattened for the widget: id and a display name.
|
|
||||||
export interface OpenWebUiFileSummary {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
// POST /api/v1/retrieval/process/web — ingests a URL into a temporary vector
|
|
||||||
// collection. We retrieve from that collection at send time and inject the
|
|
||||||
// results as context (Open WebUI does not fetch URLs at completion time).
|
|
||||||
export const openWebUiProcessWebResponseSchema = z.object({
|
|
||||||
collection_name: z.string(),
|
|
||||||
filename: z.string().nullish(),
|
|
||||||
file: z.object({ meta: z.object({ name: z.string().nullish() }).nullish() }).nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
// POST /api/v1/retrieval/query/collection — top-k chunks per collection.
|
|
||||||
export const openWebUiCollectionQueryResponseSchema = z.object({
|
|
||||||
documents: z.array(z.array(z.string())).nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
// A web page ingested for grounding: the collection to retrieve from + a label.
|
|
||||||
export interface OpenWebUiWebDocument {
|
|
||||||
collectionName: string;
|
|
||||||
title: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET /api/v1/chats/ — list of the user's chats (native Open WebUI shape).
|
|
||||||
export const openWebUiChatListItemSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
title: z.string().nullish(),
|
|
||||||
updated_at: z.number().nullish(),
|
|
||||||
created_at: z.number().nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiChatListItem = z.infer<typeof openWebUiChatListItemSchema>;
|
|
||||||
|
|
||||||
// GET /api/v1/chats/{id} — full chat.
|
|
||||||
// Two message representations exist: a flat `chat.messages` list (used by chats
|
|
||||||
// we create) and a `chat.history` tree keyed by message id with a `currentId`
|
|
||||||
// leaf (used by chats created in the Open WebUI UI). The history tree is
|
|
||||||
// authoritative when present, since `chat.messages` can be stale/partial.
|
|
||||||
export const openWebUiHistoryMessageSchema = z.object({
|
|
||||||
id: z.string().nullish(),
|
|
||||||
parentId: z.string().nullish(),
|
|
||||||
role: z.string().nullish(),
|
|
||||||
content: openWebUiMessageContentSchema.nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const openWebUiChatSchema = z.object({
|
|
||||||
id: z.string(),
|
|
||||||
title: z.string().nullish(),
|
|
||||||
updated_at: z.number().nullish(),
|
|
||||||
created_at: z.number().nullish(),
|
|
||||||
chat: z
|
|
||||||
.object({
|
|
||||||
title: z.string().nullish(),
|
|
||||||
models: z.array(z.string()).nullish(),
|
|
||||||
messages: z
|
|
||||||
.array(
|
|
||||||
z.object({
|
|
||||||
role: z.string().nullish(),
|
|
||||||
content: openWebUiMessageContentSchema.nullish(),
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.nullish(),
|
|
||||||
history: z
|
|
||||||
.object({
|
|
||||||
currentId: z.string().nullish(),
|
|
||||||
messages: z.record(z.string(), openWebUiHistoryMessageSchema).nullish(),
|
|
||||||
})
|
|
||||||
.nullish(),
|
|
||||||
})
|
|
||||||
.nullish(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type OpenWebUiChat = z.infer<typeof openWebUiChatSchema>;
|
|
||||||
|
|
||||||
// Body used when creating/updating a chat through the native API. `meta.tags`
|
|
||||||
// lets Homarr tag a conversation (e.g. with the owning Homarr user id) so it can
|
|
||||||
// be found back in Open WebUI even when an integration/account is shared.
|
|
||||||
export interface OpenWebUiChatPayload {
|
|
||||||
title: string;
|
|
||||||
models: string[];
|
|
||||||
messages: OpenWebUiChatMessage[];
|
|
||||||
meta?: { tags?: string[] };
|
|
||||||
}
|
|
||||||
@@ -1,230 +0,0 @@
|
|||||||
import { Request, Response } from "undici";
|
|
||||||
import { beforeEach, describe, expect, test, vi } from "vitest";
|
|
||||||
|
|
||||||
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
|
||||||
|
|
||||||
import { OpenWebUiIntegration } from "../open-webui-integration";
|
|
||||||
|
|
||||||
vi.mock("@homarr/core/infrastructure/http", () => ({
|
|
||||||
fetchWithTrustedCertificatesAsync: vi.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
const TEST_API_KEY = "test-api-key-12345";
|
|
||||||
const TEST_URL = "https://openwebui.example.com";
|
|
||||||
|
|
||||||
const mockFetch = vi.mocked(fetchWithTrustedCertificatesAsync);
|
|
||||||
|
|
||||||
const asFetchResult = (response: Response) =>
|
|
||||||
response as unknown as Awaited<ReturnType<typeof fetchWithTrustedCertificatesAsync>>;
|
|
||||||
|
|
||||||
const setupMockFetch = (responses: Record<string, Record<string, unknown> | unknown[]>) => {
|
|
||||||
mockFetch.mockImplementation((url) => {
|
|
||||||
const urlString = typeof url === "string" ? url : url instanceof Request ? url.url : url.toString();
|
|
||||||
const path = new URL(urlString).pathname;
|
|
||||||
|
|
||||||
if (path in responses) {
|
|
||||||
return Promise.resolve(
|
|
||||||
asFetchResult(
|
|
||||||
new Response(JSON.stringify(responses[path]), {
|
|
||||||
status: 200,
|
|
||||||
headers: { "content-type": "application/json" },
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Promise.resolve(asFetchResult(new Response(JSON.stringify({ error: "Not Found" }), { status: 404 })));
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const streamFrom = (chunks: string[]) =>
|
|
||||||
new ReadableStream<Uint8Array>({
|
|
||||||
start(controller) {
|
|
||||||
const encoder = new TextEncoder();
|
|
||||||
for (const chunk of chunks) {
|
|
||||||
controller.enqueue(encoder.encode(chunk));
|
|
||||||
}
|
|
||||||
controller.close();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const createIntegration = () =>
|
|
||||||
new OpenWebUiIntegration({
|
|
||||||
id: "test-open-webui",
|
|
||||||
name: "Test Open WebUI",
|
|
||||||
url: TEST_URL,
|
|
||||||
externalUrl: null,
|
|
||||||
decryptedSecrets: [{ kind: "apiKey", value: TEST_API_KEY }],
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("OpenWebUiIntegration", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("getModelsAsync", () => {
|
|
||||||
test("parses the OpenAI-compatible model list", async () => {
|
|
||||||
setupMockFetch({
|
|
||||||
"/api/models": { data: [{ id: "llama3" }, { id: "gpt-4o", name: "GPT-4o" }] },
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await createIntegration().getModelsAsync();
|
|
||||||
|
|
||||||
expect(result).toEqual([{ id: "llama3" }, { id: "gpt-4o", name: "GPT-4o" }]);
|
|
||||||
expect(mockFetch).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("sends the bearer token", async () => {
|
|
||||||
setupMockFetch({ "/api/models": { data: [] } });
|
|
||||||
|
|
||||||
await createIntegration().getModelsAsync();
|
|
||||||
|
|
||||||
const headers = mockFetch.mock.calls.at(0)?.[1]?.headers as Record<string, string> | undefined;
|
|
||||||
expect(headers?.Authorization).toBe(`Bearer ${TEST_API_KEY}`);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("throws when the API returns an error", async () => {
|
|
||||||
mockFetch.mockResolvedValue(asFetchResult(new Response("Unauthorized", { status: 401 })));
|
|
||||||
|
|
||||||
await expect(createIntegration().getModelsAsync()).rejects.toThrow();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("streamChatCompletionAsync", () => {
|
|
||||||
test("emits each content delta and resolves on [DONE]", async () => {
|
|
||||||
mockFetch.mockResolvedValue(
|
|
||||||
asFetchResult(
|
|
||||||
new Response(
|
|
||||||
streamFrom([
|
|
||||||
`data: ${JSON.stringify({ choices: [{ delta: { content: "Hel" } }] })}\n`,
|
|
||||||
`data: ${JSON.stringify({ choices: [{ delta: { content: "lo" } }] })}\n`,
|
|
||||||
"data: [DONE]\n",
|
|
||||||
]),
|
|
||||||
{ status: 200, headers: { "content-type": "text/event-stream" } },
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
const deltas: string[] = [];
|
|
||||||
await createIntegration().streamChatCompletionAsync(
|
|
||||||
{ model: "llama3", messages: [{ role: "user", content: "Hi" }] },
|
|
||||||
(delta) => deltas.push(delta),
|
|
||||||
new AbortController().signal,
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(deltas).toEqual(["Hel", "lo"]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("handles a delta split across stream chunks", async () => {
|
|
||||||
const payload = JSON.stringify({ choices: [{ delta: { content: "world" } }] });
|
|
||||||
const half = Math.floor(payload.length / 2);
|
|
||||||
mockFetch.mockResolvedValue(
|
|
||||||
asFetchResult(
|
|
||||||
new Response(streamFrom([`data: ${payload.slice(0, half)}`, `${payload.slice(half)}\n`, "data: [DONE]\n"]), {
|
|
||||||
status: 200,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
const deltas: string[] = [];
|
|
||||||
await createIntegration().streamChatCompletionAsync(
|
|
||||||
{ model: "llama3", messages: [{ role: "user", content: "Hi" }] },
|
|
||||||
(delta) => deltas.push(delta),
|
|
||||||
new AbortController().signal,
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(deltas.join("")).toBe("world");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("throws when the completion endpoint errors", async () => {
|
|
||||||
mockFetch.mockResolvedValue(asFetchResult(new Response("Bad Gateway", { status: 502 })));
|
|
||||||
|
|
||||||
await expect(
|
|
||||||
createIntegration().streamChatCompletionAsync(
|
|
||||||
{ model: "llama3", messages: [{ role: "user", content: "Hi" }] },
|
|
||||||
() => undefined,
|
|
||||||
new AbortController().signal,
|
|
||||||
),
|
|
||||||
).rejects.toThrow();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("flushes the final SSE frame when it has no trailing newline", async () => {
|
|
||||||
mockFetch.mockResolvedValue(
|
|
||||||
asFetchResult(
|
|
||||||
new Response(
|
|
||||||
streamFrom([
|
|
||||||
`data: ${JSON.stringify({ choices: [{ delta: { content: "done" } }] })}\n`,
|
|
||||||
// Final event: no trailing newline and ends via finish_reason (no [DONE]).
|
|
||||||
`data: ${JSON.stringify({ choices: [{ delta: {}, finish_reason: "stop" }] })}`,
|
|
||||||
]),
|
|
||||||
{ status: 200 },
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
const deltas: string[] = [];
|
|
||||||
await expect(
|
|
||||||
createIntegration().streamChatCompletionAsync(
|
|
||||||
{ model: "llama3", messages: [{ role: "user", content: "Hi" }] },
|
|
||||||
(delta) => deltas.push(delta),
|
|
||||||
new AbortController().signal,
|
|
||||||
),
|
|
||||||
).resolves.toBeUndefined();
|
|
||||||
|
|
||||||
expect(deltas.join("")).toBe("done");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("requestAsync timeouts", () => {
|
|
||||||
test("applies a default timeout to non-streaming requests", async () => {
|
|
||||||
setupMockFetch({ "/api/models": { data: [] } });
|
|
||||||
|
|
||||||
await createIntegration().getModelsAsync();
|
|
||||||
|
|
||||||
const options = mockFetch.mock.calls.at(0)?.[1] as { timeout?: number } | undefined;
|
|
||||||
expect(options?.timeout).toBeGreaterThan(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("does not time out the long-lived streaming completion", async () => {
|
|
||||||
mockFetch.mockResolvedValue(asFetchResult(new Response(streamFrom(["data: [DONE]\n"]), { status: 200 })));
|
|
||||||
|
|
||||||
await createIntegration().streamChatCompletionAsync(
|
|
||||||
{ model: "llama3", messages: [{ role: "user", content: "Hi" }] },
|
|
||||||
() => undefined,
|
|
||||||
new AbortController().signal,
|
|
||||||
);
|
|
||||||
|
|
||||||
const options = mockFetch.mock.calls.at(0)?.[1] as { timeout?: number } | undefined;
|
|
||||||
expect(options?.timeout).toBeUndefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("getChatAsync", () => {
|
|
||||||
test("parses a chat whose message content is multimodal (text + image parts)", async () => {
|
|
||||||
setupMockFetch({
|
|
||||||
"/api/v1/chats/abc": {
|
|
||||||
id: "abc",
|
|
||||||
chat: {
|
|
||||||
title: "Vision",
|
|
||||||
models: ["llava"],
|
|
||||||
messages: [
|
|
||||||
{
|
|
||||||
role: "user",
|
|
||||||
content: [
|
|
||||||
{ type: "text", text: "What is this?" },
|
|
||||||
{ type: "image_url", image_url: { url: "data:image/png;base64,AAAA" } },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{ role: "assistant", content: "A cat." },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const chat = await createIntegration().getChatAsync("abc");
|
|
||||||
|
|
||||||
expect(chat.id).toBe("abc");
|
|
||||||
expect(chat.chat?.messages?.[0]?.content).toBeDefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -153,9 +153,9 @@ export class OverseerrIntegration
|
|||||||
);
|
);
|
||||||
} else if (pendingResults.length > 0) requests = pendingResults;
|
} else if (pendingResults.length > 0) requests = pendingResults;
|
||||||
else if (allResults.length > 0) requests = allResults;
|
else if (allResults.length > 0) requests = allResults;
|
||||||
else return Promise.all([]);
|
else return [];
|
||||||
|
|
||||||
return await Promise.all(
|
const settled = await Promise.allSettled(
|
||||||
requests.map(async (request): Promise<MediaRequest> => {
|
requests.map(async (request): Promise<MediaRequest> => {
|
||||||
const information = await this.getItemInformationAsync(request.media.tmdbId, request.type);
|
const information = await this.getItemInformationAsync(request.media.tmdbId, request.type);
|
||||||
|
|
||||||
@@ -184,6 +184,10 @@ export class OverseerrIntegration
|
|||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
return settled
|
||||||
|
.filter((result): result is PromiseFulfilledResult<MediaRequest> => result.status === "fulfilled")
|
||||||
|
.map((result) => result.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected mapRequestStatus(status: UpstreamMediaRequestStatus): MediaRequestStatus {
|
protected mapRequestStatus(status: UpstreamMediaRequestStatus): MediaRequestStatus {
|
||||||
@@ -301,6 +305,10 @@ export class OverseerrIntegration
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch ${type} information for id ${id}: ${response.status} ${response.statusText}`);
|
||||||
|
}
|
||||||
|
|
||||||
if (type === "tv") {
|
if (type === "tv") {
|
||||||
const series = (await response.json()) as TvInformation;
|
const series = (await response.json()) as TvInformation;
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -3,6 +3,54 @@ interface MediaContainer {
|
|||||||
Track?: Session[];
|
Track?: Session[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface Stream {
|
||||||
|
$: {
|
||||||
|
streamType: string;
|
||||||
|
codec?: string;
|
||||||
|
language?: string;
|
||||||
|
selected?: string;
|
||||||
|
width?: string;
|
||||||
|
height?: string;
|
||||||
|
frameRate?: string;
|
||||||
|
channels?: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Part {
|
||||||
|
Stream?: Stream[];
|
||||||
|
$: {
|
||||||
|
container?: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Media {
|
||||||
|
Part?: Part[];
|
||||||
|
$: {
|
||||||
|
videoResolution?: string;
|
||||||
|
videoCodec?: string;
|
||||||
|
audioCodec?: string;
|
||||||
|
bitrate?: string;
|
||||||
|
container?: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TranscodeSession {
|
||||||
|
$: {
|
||||||
|
throttled?: string;
|
||||||
|
progress?: string;
|
||||||
|
speed?: string;
|
||||||
|
videoDecision?: string;
|
||||||
|
audioDecision?: string;
|
||||||
|
sourceVideoCodec?: string;
|
||||||
|
sourceAudioCodec?: string;
|
||||||
|
videoCodec?: string;
|
||||||
|
audioCodec?: string;
|
||||||
|
container?: string;
|
||||||
|
width?: string;
|
||||||
|
height?: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
interface Session {
|
interface Session {
|
||||||
User?: {
|
User?: {
|
||||||
$: {
|
$: {
|
||||||
@@ -15,13 +63,20 @@ interface Session {
|
|||||||
$: {
|
$: {
|
||||||
product: string;
|
product: string;
|
||||||
title: string;
|
title: string;
|
||||||
|
address?: string;
|
||||||
|
state?: string;
|
||||||
|
local?: string;
|
||||||
};
|
};
|
||||||
}[];
|
}[];
|
||||||
Session?: {
|
Session?: {
|
||||||
$: {
|
$: {
|
||||||
id: string;
|
id: string;
|
||||||
|
bandwidth?: string;
|
||||||
|
location?: string;
|
||||||
};
|
};
|
||||||
}[];
|
}[];
|
||||||
|
TranscodeSession?: TranscodeSession[];
|
||||||
|
Media?: Media[];
|
||||||
$: {
|
$: {
|
||||||
grandparentTitle?: string;
|
grandparentTitle?: string;
|
||||||
parentTitle?: string;
|
parentTitle?: string;
|
||||||
@@ -29,6 +84,8 @@ interface Session {
|
|||||||
index?: number;
|
index?: number;
|
||||||
type: string;
|
type: string;
|
||||||
live?: string;
|
live?: string;
|
||||||
|
viewOffset?: string;
|
||||||
|
duration?: string;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,32 @@ import type { PlexResponse } from "./interface";
|
|||||||
|
|
||||||
const logger = createLogger({ module: "plexIntegration" });
|
const logger = createLogger({ module: "plexIntegration" });
|
||||||
|
|
||||||
|
function parseOptionalNumber(value: string | undefined): number | null {
|
||||||
|
if (!value) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const parsed = Number(value);
|
||||||
|
return Number.isNaN(parsed) ? null : parsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseLocation(value: string | undefined): "lan" | "wan" | null {
|
||||||
|
return value === "lan" || value === "wan" ? value : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parsePlaybackState(value: string | undefined): "playing" | "paused" | "buffering" | null {
|
||||||
|
return value === "playing" || value === "paused" || value === "buffering" ? value : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseResolution(
|
||||||
|
width: string | undefined,
|
||||||
|
height: string | undefined,
|
||||||
|
): { width: number; height: number } | null {
|
||||||
|
const parsedWidth = parseOptionalNumber(width);
|
||||||
|
const parsedHeight = parseOptionalNumber(height);
|
||||||
|
return parsedWidth !== null && parsedHeight !== null ? { width: parsedWidth, height: parsedHeight } : null;
|
||||||
|
}
|
||||||
|
|
||||||
export class PlexIntegration extends Integration implements IMediaServerIntegration, IMediaReleasesIntegration {
|
export class PlexIntegration extends Integration implements IMediaServerIntegration, IMediaReleasesIntegration {
|
||||||
public async getCurrentSessionsAsync(_options: CurrentSessionsInput): Promise<StreamSession[]> {
|
public async getCurrentSessionsAsync(_options: CurrentSessionsInput): Promise<StreamSession[]> {
|
||||||
const token = super.getSecretValue("apiKey");
|
const token = super.getSecretValue("apiKey");
|
||||||
@@ -43,11 +69,24 @@ export class PlexIntegration extends Integration implements IMediaServerIntegrat
|
|||||||
const userElement = mediaElement.User ? mediaElement.User[0] : undefined;
|
const userElement = mediaElement.User ? mediaElement.User[0] : undefined;
|
||||||
const playerElement = mediaElement.Player ? mediaElement.Player[0] : undefined;
|
const playerElement = mediaElement.Player ? mediaElement.Player[0] : undefined;
|
||||||
const sessionElement = mediaElement.Session ? mediaElement.Session[0] : undefined;
|
const sessionElement = mediaElement.Session ? mediaElement.Session[0] : undefined;
|
||||||
|
const transcodeElement = mediaElement.TranscodeSession ? mediaElement.TranscodeSession[0] : undefined;
|
||||||
|
const mediaInfoElement = mediaElement.Media ? mediaElement.Media[0] : undefined;
|
||||||
|
|
||||||
if (!playerElement) {
|
if (!playerElement) {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const positionMs = parseOptionalNumber(mediaElement.$.viewOffset);
|
||||||
|
const durationMs = parseOptionalNumber(mediaElement.$.duration);
|
||||||
|
|
||||||
|
const playbackState = parsePlaybackState(playerElement.$.state);
|
||||||
|
|
||||||
|
const location = parseLocation(sessionElement?.$.location);
|
||||||
|
|
||||||
|
const streams = mediaInfoElement?.Part?.[0]?.Stream ?? [];
|
||||||
|
const videoStream = streams.find((stream) => stream.$.streamType === "1");
|
||||||
|
const audioStream = streams.find((stream) => stream.$.streamType === "2");
|
||||||
|
|
||||||
return {
|
return {
|
||||||
sessionId: sessionElement?.$.id ?? "unknown",
|
sessionId: sessionElement?.$.id ?? "unknown",
|
||||||
sessionName: `${playerElement.$.product} (${playerElement.$.title})`,
|
sessionName: `${playerElement.$.product} (${playerElement.$.title})`,
|
||||||
@@ -63,7 +102,30 @@ export class PlexIntegration extends Integration implements IMediaServerIntegrat
|
|||||||
episodeName: mediaElement.$.title ?? null,
|
episodeName: mediaElement.$.title ?? null,
|
||||||
albumName: mediaElement.$.type === "track" ? (mediaElement.$.parentTitle ?? null) : null,
|
albumName: mediaElement.$.type === "track" ? (mediaElement.$.parentTitle ?? null) : null,
|
||||||
episodeCount: mediaElement.$.index ?? null,
|
episodeCount: mediaElement.$.index ?? null,
|
||||||
metadata: null,
|
playback: {
|
||||||
|
state: playbackState,
|
||||||
|
positionMs,
|
||||||
|
durationMs,
|
||||||
|
},
|
||||||
|
location,
|
||||||
|
metadata: {
|
||||||
|
video: {
|
||||||
|
resolution: parseResolution(videoStream?.$.width, videoStream?.$.height),
|
||||||
|
frameRate: parseOptionalNumber(videoStream?.$.frameRate),
|
||||||
|
},
|
||||||
|
audio: {
|
||||||
|
channelCount: parseOptionalNumber(audioStream?.$.channels),
|
||||||
|
codec: audioStream?.$.codec ?? mediaInfoElement?.$.audioCodec ?? null,
|
||||||
|
},
|
||||||
|
transcoding: {
|
||||||
|
container: transcodeElement?.$.container ?? null,
|
||||||
|
resolution: parseResolution(transcodeElement?.$.width, transcodeElement?.$.height),
|
||||||
|
target: {
|
||||||
|
audioCodec: transcodeElement?.$.audioCodec ?? null,
|
||||||
|
videoCodec: transcodeElement?.$.videoCodec ?? null,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -26,5 +26,4 @@ export * from "./paperless-ngx/paperless-ngx-types";
|
|||||||
export * from "./umami/umami-types";
|
export * from "./umami/umami-types";
|
||||||
export * from "./gluetun/gluetun-types";
|
export * from "./gluetun/gluetun-types";
|
||||||
export * from "./beszel/beszel-types";
|
export * from "./beszel/beszel-types";
|
||||||
export * from "./open-webui/open-webui-types";
|
|
||||||
export * from "./traefik/traefik-types";
|
export * from "./traefik/traefik-types";
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import type { fetch as undiciFetch } from "undici/types/fetch";
|
import type { fetch as undiciFetch } from "undici/types/fetch";
|
||||||
|
|
||||||
import { humanFileSize } from "@homarr/common";
|
|
||||||
import { ResponseError } from "@homarr/common/server";
|
import { ResponseError } from "@homarr/common/server";
|
||||||
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
|
||||||
import { createLogger } from "@homarr/core/infrastructure/logs";
|
import { createLogger } from "@homarr/core/infrastructure/logs";
|
||||||
@@ -59,7 +58,7 @@ export class UnraidIntegration extends Integration implements ISystemHealthMonit
|
|||||||
cpuTemp: undefined, // Not implemented, see https://github.com/unraid/api/issues/1597
|
cpuTemp: undefined, // Not implemented, see https://github.com/unraid/api/issues/1597
|
||||||
fileSystem: systemInfo.array.disks.map((disk) => ({
|
fileSystem: systemInfo.array.disks.map((disk) => ({
|
||||||
deviceName: disk.name,
|
deviceName: disk.name,
|
||||||
used: humanFileSize(disk.fsUsed * 1024), // API is in KiB (kibibytes), convert to bytes
|
used: `${disk.fsUsed * 1024}`, // API is in KiB (kibibytes), convert to bytes
|
||||||
available: `${(disk.size - disk.fsUsed) * 1024}`, // free space left on the disk, API is in KiB (kibibytes)
|
available: `${(disk.size - disk.fsUsed) * 1024}`, // free space left on the disk, API is in KiB (kibibytes)
|
||||||
percentage: (disk.fsUsed / disk.size) * 100, // The units are the same, therefore the actual unit is irrelevant
|
percentage: (disk.fsUsed / disk.size) * 100, // The units are the same, therefore the actual unit is irrelevant
|
||||||
})),
|
})),
|
||||||
|
|||||||
Loaded 100 of 194 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user