Compare commits

...
Author SHA1 Message Date
Meier Lukas 0e89116a52 Merge branch 'dev' into libsql-migration 2026-01-18 10:10:22 +01:00
homarr-renovate[bot] 939996f41e chore(deps): update dependency prettier-plugin-packagejson to ^2.5.21 (#4866)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-18 07:28:16 +00:00
homarr-crowdin[bot] fbad058712 chore(lang): updated translations from crowdin
Co-authored-by: Crowdin Homarr <190541745+homarr-crowdin[bot]@users.noreply.github.com>
2026-01-18 01:02:11 +00:00
homarr-renovate[bot] 0c38e2f290 fix(deps): update turbo monorepo to ^2.7.4 (#4861)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-17 18:41:01 +00:00
homarr-renovate[bot] 31c68f43d5 chore(deps): update vitest monorepo to ^4.0.17 (#4862)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-17 18:40:14 +00:00
homarr-renovate[bot] f096476fc2 chore(deps): update babel monorepo to >=7.28.6 (#4864)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-17 18:39:50 +00:00
homarr-renovate[bot] e9020e68ec fix(deps): update dependency typescript-eslint to ^8.53.0 (#4863)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-17 17:26:06 +00:00
Releases Homarr be75c320f9 chore(release): 1.50.1 [skip ci] 2026-01-16 19:20:12 +00:00
homarr-releases[bot] 05ce9cf7a6 chore(release): automatic release v1.50.1 2026-01-16 19:19:19 +00:00
homarr-renovate[bot] a4a5d0ac51 chore(deps): update dependency hono@&lt;4.6.5 to >=4.11.4 [security] (#4846)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-16 14:26:55 +00:00
homarr-update-contributors[bot] 11c92929b1 chore: update contributors (#4857)
Co-authored-by: Homarr Update Contributors <210161987+homarr-update-contributors[bot]@users.noreply.github.com>
2026-01-16 13:03:27 +00:00
homarr-renovate[bot] 70f3ab21c1 chore(deps): update dependency @types/react to v19.2.8 (#4855)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-15 19:35:21 +00:00
homarr-renovate[bot] c3dc3f2eef chore(deps): update pnpm to v10.28.0 (#4851)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-15 19:33:38 +00:00
homarr-renovate[bot] 4f8b530294 chore(deps): update dependency @types/node to ^24.10.7 (#4852)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-15 18:57:32 +00:00
homarr-renovate[bot] c54d3498f3 chore(deps): update dependency vite-tsconfig-paths to ^6.0.4 (#4849)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-14 22:31:42 +00:00
homarr-renovate[bot] 275a346afa fix(deps): update mantine monorepo to ^8.3.12 (#4848)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-14 14:34:40 +00:00
homarr-renovate[bot] c24006dca6 fix(deps): update dependency react-error-boundary to ^6.0.3 (#4847)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-13 22:31:49 +00:00
homarr-renovate[bot] 5d00642268 fix(deps): update dependency ioredis to v5.9.1 (#4844)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-13 19:28:34 +00:00
homarr-crowdin[bot] b2798d7aca chore(lang): update translations from crowdin (#4834)
Co-authored-by: Crowdin Homarr <190541745+homarr-crowdin[bot]@users.noreply.github.com>
2026-01-13 20:21:03 +01:00
homarr-renovate[bot] b26cf0e65f fix(deps): update tiptap monorepo to v3.15.3 (#4843)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-12 15:36:08 +00:00
homarr-renovate[bot] 55c2666f9d fix(deps): update tiptap monorepo to v3.15.2 (#4842)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-12 12:59:38 +00:00
homarr-renovate[bot] 7fa990712b fix(deps): update dependency ldapts to v8.1.3 (#4841)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-12 09:41:50 +00:00
homarr-renovate[bot] 21db9618c6 chore(deps): update dependency vite@&gt;&#x3d;5.0.0 &lt;&#x3d;5.4.18 to >=7.3.1 (#4840)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-12 06:46:30 +00:00
homarr-renovate[bot] 07ba53165c fix(deps): update dependency sass to ^1.97.2 (#4835)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-11 18:38:22 +00:00
homarr-renovate[bot] 16733c2a0e fix(deps): update dependency undici to v7.18.2 (#4837)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-11 17:26:28 +00:00
homarr-renovate[bot] 33a3c857a6 chore(deps): update dependency proxmox-api&gt;undici to v7.18.2 (#4839)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-11 16:33:38 +00:00
homarr-renovate[bot] d479b63a80 fix(deps): update tiptap monorepo to v3.15.1 (#4838)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-11 12:52:08 +00:00
homarr-renovate[bot] 9043d8e4b8 chore(deps): update dependency proxmox-api&gt;undici to v7.18.1 (#4836)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-11 12:50:29 +00:00
homarr-renovate[bot] 629359e3e4 fix(deps): update dependency ws to ^8.19.0 (#4833)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 21:45:37 +00:00
homarr-renovate[bot] 50410fedb3 fix(deps): update turbo monorepo to ^2.7.3 (#4831)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 21:45:10 +00:00
homarr-renovate[bot] ab3ee4f78a fix(deps): update tiptap monorepo to v3.15.0 (#4832)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 20:32:53 +00:00
homarr-crowdin[bot] fe615755c7 chore(lang): update translations from crowdin (#4820)
Co-authored-by: Crowdin Homarr <190541745+homarr-crowdin[bot]@users.noreply.github.com>
2026-01-10 20:59:19 +01:00
homarr-renovate[bot] b76ab2961d fix(deps): update dependency undici to v7.18.0 (#4829)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 18:40:02 +00:00
homarr-renovate[bot] ab2703b32a chore(deps): update dependency proxmox-api&gt;undici to v7.18.0 (#4828)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 18:38:30 +00:00
homarr-renovate[bot] f67a915174 chore(deps): update dependency rollup@&gt;&#x3d;4.0.0 &lt;4.22.4 to >=4.55.1 (#4824)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 18:38:05 +00:00
homarr-renovate[bot] fa8af6a453 fix(deps): update dependency typescript-eslint to ^8.52.0 (#4830)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 17:26:48 +00:00
homarr-renovate[bot] 155d4f2270 fix(deps): update dependency ioredis to v5.9.0 (#4827)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 14:27:50 +00:00
homarr-renovate[bot] 21a91b1489 fix(deps): update dependency undici to v7.17.0 (#4826)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 12:50:10 +00:00
homarr-renovate[bot] 0d8695feae chore(deps): update dependency proxmox-api&gt;undici to v7.17.0 (#4825)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 12:49:27 +00:00
homarr-renovate[bot] 0364e102cd fix(deps): update mantine monorepo to ^8.3.11 (#4822)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 06:39:58 +00:00
homarr-renovate[bot] e9ba102cf6 fix(deps): update dependency react-error-boundary to ^6.0.2 (#4821)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2026-01-10 04:42:22 +00:00
Meier Lukas d2b24452e8 fix: missing file extension for local migrations 2026-01-04 19:59:40 +01:00
Meier Lukas 6dd7e23a97 fix: broken lockfile 2026-01-04 19:37:32 +01:00
Meier Lukas 3fbc5013c3 refactor(db): migrate to libsql 2026-01-04 19:30:37 +01:00
110 changed files with 2019 additions and 2505 deletions

No files matched your search

@@ -19,11 +19,6 @@ inputs:
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Prebuilt debian dependencies
uses: homarr-labs/homarr/.github/actions/prebuilt-debian@dev
id: prebuilt-debian
with:
architecture: ${{ inputs.architecture }}
- name: Start docker container for ${{ inputs.architecture }} - name: Start docker container for ${{ inputs.architecture }}
run: | run: |
docker run --name homarr \ docker run --name homarr \
@@ -41,12 +36,9 @@ runs:
docker cp homarr:/app/extraction-alpine.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz && \ docker cp homarr:/app/extraction-alpine.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz && \
docker exec homarr rm /app/extraction-alpine.tar.gz docker exec homarr rm /app/extraction-alpine.tar.gz
shell: bash shell: bash
- name: Extract source from ${{ inputs.architecture }} container (debian) - name: Copy source for debian build artifact
run: | run: |
docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/build && \ cp ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-alpine-${{ inputs.architecture }}.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz
docker cp ${{ steps.prebuilt-debian.outputs.path }}/. homarr:/app/node_modules/better-sqlite3/build/Release && \
docker exec homarr tar -czf extraction-debian.tar.gz -C /app . && \
docker cp homarr:/app/extraction-debian.tar.gz ${{ runner.temp }}/extraction/${{ inputs.architecture }}/build-debian-${{ inputs.architecture }}.tar.gz
shell: bash shell: bash
- name: Stop ${{ inputs.architecture }} container - name: Stop ${{ inputs.architecture }} container
if: always() if: always()
@@ -1,42 +0,0 @@
name: Prebuilt dependencies for debian
description: Provides prebuilt dependencies for debian based docker images
inputs:
architecture:
description: Name of architecture, will be used to build docker image (e.g. amd64, arm64)
required: true
outputs:
path:
description: Path to extracted prebuilt dependencies
value: ${{ runner.temp }}/prebuilts
runs:
using: "composite"
steps:
- uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build docker image for ${{ inputs.architecture }}
id: build
uses: docker/build-push-action@v6
with:
push: false
load: true
context: ./deployments/prebuilt-debian
platforms: linux/${{ inputs.architecture }}
tags: prebuilt-debian
- name: Start docker container for ${{ inputs.architecture }}
run: |
docker run --name prebuilt-debian \
--detach --rm prebuilt-debian
shell: bash
- name: Extract prebuilt dependencies from ${{ inputs.architecture }} container
run: |
mkdir -p ${{ runner.temp }}/prebuilts && \
docker cp prebuilt-debian:/app/node_modules/better-sqlite3/build/Release/better_sqlite3.node ${{ runner.temp }}/prebuilts/better_sqlite3.node
shell: bash
- name: Stop ${{ inputs.architecture }} container
if: always()
run: docker container remove --force --volumes prebuilt-debian
shell: bash
-1
View File
@@ -20,7 +20,6 @@
matchPackageNames: [ matchPackageNames: [
"@tree-sitter-grammars/tree-sitter-yaml", "@tree-sitter-grammars/tree-sitter-yaml",
"bcrypt", "bcrypt",
"better-sqlite3",
"cpu-features", "cpu-features",
"esbuild", "esbuild",
"sharp", "sharp",
@@ -1,45 +0,0 @@
name: "[Deployments] Validate prebuilt debian dependencies"
permissions:
contents: read
on:
pull_request:
branches: ["*"]
paths: [".github/actions/prebuilt-debian/**", "deployments/prebuilt-debian/**"]
jobs:
prebuilt-debian-validate-amd64:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v6
- name: Validate prebuilt dependencies for amd64
id: validate-amd64
uses: ./.github/actions/prebuilt-debian
with:
architecture: amd64
- name: Check extracted files for amd64
run: |
if [ ! -f "${{ steps.validate-amd64.outputs.path }}/better_sqlite3.node" ]; then
echo "better_sqlite3.node not found for amd64!"
exit 1
fi
prebuilt-debian-validate-arm64:
runs-on: ubuntu-24.04-
timeout-minutes: 5
steps:
- uses: actions/checkout@v6
- name: Validate prebuilt dependencies for arm64
id: validate-arm64
uses: ./.github/actions/prebuilt-debian
with:
architecture: arm64
- name: Check extracted files for arm64
run: |
if [ ! -f "${{ steps.validate-arm64.outputs.path }}/better_sqlite3.node" ]; then
echo "better_sqlite3.node not found for arm64!"
exit 1
fi
+23
View File
@@ -1,3 +1,26 @@
## [1.50.1](https://github.com/homarr-labs/homarr/compare/v1.50.0...v1.50.1) (2026-01-16)
### Bug Fixes
* **deps:** update dependency ioredis to v5.9.0 ([#4827](https://github.com/homarr-labs/homarr/issues/4827)) ([155d4f2](https://github.com/homarr-labs/homarr/commit/155d4f2270b3b35c4ad696499b0aaa0b10100989))
* **deps:** update dependency ioredis to v5.9.1 ([#4844](https://github.com/homarr-labs/homarr/issues/4844)) ([5d00642](https://github.com/homarr-labs/homarr/commit/5d006422688cf3fe7440ae3ab66ad3b2cc9286a8))
* **deps:** update dependency ldapts to v8.1.3 ([#4841](https://github.com/homarr-labs/homarr/issues/4841)) ([7fa9907](https://github.com/homarr-labs/homarr/commit/7fa990712bddc88bbb3bbe01e758bfef7cb4dea3))
* **deps:** update dependency react-error-boundary to ^6.0.2 ([#4821](https://github.com/homarr-labs/homarr/issues/4821)) ([e9ba102](https://github.com/homarr-labs/homarr/commit/e9ba102cf668c0ef54628d3dbc6e6cbda2d059b5))
* **deps:** update dependency react-error-boundary to ^6.0.3 ([#4847](https://github.com/homarr-labs/homarr/issues/4847)) ([c24006d](https://github.com/homarr-labs/homarr/commit/c24006dca691f26a7187c0ba112d9ed2ec424bb0))
* **deps:** update dependency sass to ^1.97.2 ([#4835](https://github.com/homarr-labs/homarr/issues/4835)) ([07ba531](https://github.com/homarr-labs/homarr/commit/07ba53165c90d675aa54c5ad3fca930fef5cd35e))
* **deps:** update dependency typescript-eslint to ^8.52.0 ([#4830](https://github.com/homarr-labs/homarr/issues/4830)) ([fa8af6a](https://github.com/homarr-labs/homarr/commit/fa8af6a453b846af2305db3c318c8c1c303a3a88))
* **deps:** update dependency undici to v7.17.0 ([#4826](https://github.com/homarr-labs/homarr/issues/4826)) ([21a91b1](https://github.com/homarr-labs/homarr/commit/21a91b1489ff1a1f0a1428a3f50f00db8932da72))
* **deps:** update dependency undici to v7.18.0 ([#4829](https://github.com/homarr-labs/homarr/issues/4829)) ([b76ab29](https://github.com/homarr-labs/homarr/commit/b76ab2961d84081c9ef04d76193f21a1068e72d9))
* **deps:** update dependency undici to v7.18.2 ([#4837](https://github.com/homarr-labs/homarr/issues/4837)) ([16733c2](https://github.com/homarr-labs/homarr/commit/16733c2a0efabcbc5b693a8b6f82833f6fc344b7))
* **deps:** update dependency ws to ^8.19.0 ([#4833](https://github.com/homarr-labs/homarr/issues/4833)) ([629359e](https://github.com/homarr-labs/homarr/commit/629359e3e44ddad880842cfd576edb514f80d61a))
* **deps:** update mantine monorepo to ^8.3.11 ([#4822](https://github.com/homarr-labs/homarr/issues/4822)) ([0364e10](https://github.com/homarr-labs/homarr/commit/0364e102cd6c0f560bc49e0b9ccd71df0b75eed6))
* **deps:** update mantine monorepo to ^8.3.12 ([#4848](https://github.com/homarr-labs/homarr/issues/4848)) ([275a346](https://github.com/homarr-labs/homarr/commit/275a346afaaebfa894ef2193f70966986a138dbb))
* **deps:** update tiptap monorepo to v3.15.0 ([#4832](https://github.com/homarr-labs/homarr/issues/4832)) ([ab3ee4f](https://github.com/homarr-labs/homarr/commit/ab3ee4f78a739bdb3b49a81652420df6ec143b62))
* **deps:** update tiptap monorepo to v3.15.1 ([#4838](https://github.com/homarr-labs/homarr/issues/4838)) ([d479b63](https://github.com/homarr-labs/homarr/commit/d479b63a803f2295ccdf20fcd31c418a4aab148c))
* **deps:** update tiptap monorepo to v3.15.2 ([#4842](https://github.com/homarr-labs/homarr/issues/4842)) ([55c2666](https://github.com/homarr-labs/homarr/commit/55c2666f9d27ca34b6d028070f0d7b84e4c40e97))
* **deps:** update tiptap monorepo to v3.15.3 ([#4843](https://github.com/homarr-labs/homarr/issues/4843)) ([b26cf0e](https://github.com/homarr-labs/homarr/commit/b26cf0e65fd8150e241465628df2cb8b5a72088e))
* **deps:** update turbo monorepo to ^2.7.3 ([#4831](https://github.com/homarr-labs/homarr/issues/4831)) ([50410fe](https://github.com/homarr-labs/homarr/commit/50410fedb3f33ed131f923257e61ae2dca4e0288))
## [1.50.0](https://github.com/homarr-labs/homarr/compare/v1.49.1...v1.50.0) (2026-01-09) ## [1.50.0](https://github.com/homarr-labs/homarr/compare/v1.49.1...v1.50.0) (2026-01-09)
### Features ### Features
-1
View File
@@ -45,7 +45,6 @@ COPY --from=builder /app/apps/nextjs/package.json .
COPY --from=builder /app/apps/tasks/tasks.cjs ./apps/tasks/tasks.cjs COPY --from=builder /app/apps/tasks/tasks.cjs ./apps/tasks/tasks.cjs
COPY --from=builder /app/apps/websocket/wssServer.cjs ./apps/websocket/wssServer.cjs COPY --from=builder /app/apps/websocket/wssServer.cjs ./apps/websocket/wssServer.cjs
COPY --from=builder /app/node_modules/better-sqlite3/build/Release/better_sqlite3.node /app/build/better_sqlite3.node
COPY --from=builder /app/packages/db/migrations ./db/migrations COPY --from=builder /app/packages/db/migrations ./db/migrations
+10 -10
View File
@@ -48,12 +48,12 @@
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"@homarr/widgets": "workspace:^0.1.0", "@homarr/widgets": "workspace:^0.1.0",
"@mantine/colors-generator": "^8.3.10", "@mantine/colors-generator": "^8.3.12",
"@mantine/core": "^8.3.10", "@mantine/core": "^8.3.12",
"@mantine/dropzone": "^8.3.10", "@mantine/dropzone": "^8.3.12",
"@mantine/hooks": "^8.3.10", "@mantine/hooks": "^8.3.12",
"@mantine/modals": "^8.3.10", "@mantine/modals": "^8.3.12",
"@mantine/tiptap": "^8.3.10", "@mantine/tiptap": "^8.3.12",
"@million/lint": "1.0.14", "@million/lint": "1.0.14",
"@tabler/icons-react": "^3.36.1", "@tabler/icons-react": "^3.36.1",
"@tanstack/react-query": "^5.90.16", "@tanstack/react-query": "^5.90.16",
@@ -81,9 +81,9 @@
"prismjs": "^1.30.0", "prismjs": "^1.30.0",
"react": "19.2.3", "react": "19.2.3",
"react-dom": "19.2.3", "react-dom": "19.2.3",
"react-error-boundary": "^6.0.1", "react-error-boundary": "^6.0.3",
"react-simple-code-editor": "^0.14.1", "react-simple-code-editor": "^0.14.1",
"sass": "^1.97.1", "sass": "^1.97.2",
"superjson": "2.2.6", "superjson": "2.2.6",
"swagger-ui-react": "^5.31.0", "swagger-ui-react": "^5.31.0",
"use-deep-compare-effect": "^1.8.1", "use-deep-compare-effect": "^1.8.1",
@@ -94,9 +94,9 @@
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/chroma-js": "3.1.2", "@types/chroma-js": "3.1.2",
"@types/node": "^24.10.4", "@types/node": "^24.10.7",
"@types/prismjs": "^1.26.5", "@types/prismjs": "^1.26.5",
"@types/react": "19.2.7", "@types/react": "19.2.8",
"@types/react-dom": "19.2.3", "@types/react-dom": "19.2.3",
"@types/swagger-ui-react": "^5.18.0", "@types/swagger-ui-react": "^5.18.0",
"concurrently": "^9.2.1", "concurrently": "^9.2.1",
+2 -2
View File
@@ -41,13 +41,13 @@
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"fastify": "^5.6.2", "fastify": "^5.6.2",
"superjson": "2.2.6", "superjson": "2.2.6",
"undici": "7.16.0" "undici": "7.18.2"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/node": "^24.10.4", "@types/node": "^24.10.7",
"dotenv-cli": "^11.0.0", "dotenv-cli": "^11.0.0",
"esbuild": "^0.27.2", "esbuild": "^0.27.2",
"eslint": "^9.39.2", "eslint": "^9.39.2",
+1 -1
View File
@@ -27,7 +27,7 @@
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"tsx": "4.20.4", "tsx": "4.20.4",
"ws": "^8.18.3" "ws": "^8.19.0"
}, },
"devDependencies": { "devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
-6
View File
@@ -1,6 +0,0 @@
FROM node:24.12.0-trixie AS base
WORKDIR /app
COPY package.json .
COPY pnpm-lock.yaml .
RUN corepack enable pnpm && pnpm install --frozen-lockfile
CMD ["sleep", "60s"]
-17
View File
@@ -1,17 +0,0 @@
{
"name": "homarr-prebuilt-debian",
"private": true,
"dependencies": {
"better-sqlite3": "^12.5.0"
},
"packageManager": "pnpm@10.27.0",
"engines": {
"node": ">=24.12.0",
"pnpm": ">=10.27.0"
},
"pnpm": {
"onlyBuiltDependencies": [
"better-sqlite3"
]
}
}
-286
View File
@@ -1,286 +0,0 @@
lockfileVersion: '9.0'
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
importers:
.:
dependencies:
better-sqlite3:
specifier: ^12.5.0
version: 12.5.0
packages:
base64-js@1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
better-sqlite3@12.5.0:
resolution: {integrity: sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg==}
engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x}
bindings@1.5.0:
resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
bl@4.1.0:
resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
buffer@5.7.1:
resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
chownr@1.1.4:
resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
decompress-response@6.0.0:
resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
engines: {node: '>=10'}
deep-extend@0.6.0:
resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
engines: {node: '>=4.0.0'}
detect-libc@2.1.2:
resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
engines: {node: '>=8'}
end-of-stream@1.4.5:
resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
expand-template@2.0.3:
resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
engines: {node: '>=6'}
file-uri-to-path@1.0.0:
resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
fs-constants@1.0.0:
resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
github-from-package@0.0.0:
resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
ieee754@1.2.1:
resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
inherits@2.0.4:
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
ini@1.3.8:
resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
mimic-response@3.1.0:
resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
engines: {node: '>=10'}
minimist@1.2.8:
resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
mkdirp-classic@0.5.3:
resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
napi-build-utils@2.0.0:
resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
node-abi@3.85.0:
resolution: {integrity: sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg==}
engines: {node: '>=10'}
once@1.4.0:
resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
prebuild-install@7.1.3:
resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
engines: {node: '>=10'}
hasBin: true
pump@3.0.3:
resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}
rc@1.2.8:
resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
hasBin: true
readable-stream@3.6.2:
resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
engines: {node: '>= 6'}
safe-buffer@5.2.1:
resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
semver@7.7.3:
resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
engines: {node: '>=10'}
hasBin: true
simple-concat@1.0.1:
resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
simple-get@4.0.1:
resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
string_decoder@1.3.0:
resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
strip-json-comments@2.0.1:
resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
engines: {node: '>=0.10.0'}
tar-fs@2.1.4:
resolution: {integrity: sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==}
tar-stream@2.2.0:
resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
engines: {node: '>=6'}
tunnel-agent@0.6.0:
resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
util-deprecate@1.0.2:
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
wrappy@1.0.2:
resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
snapshots:
base64-js@1.5.1: {}
better-sqlite3@12.5.0:
dependencies:
bindings: 1.5.0
prebuild-install: 7.1.3
bindings@1.5.0:
dependencies:
file-uri-to-path: 1.0.0
bl@4.1.0:
dependencies:
buffer: 5.7.1
inherits: 2.0.4
readable-stream: 3.6.2
buffer@5.7.1:
dependencies:
base64-js: 1.5.1
ieee754: 1.2.1
chownr@1.1.4: {}
decompress-response@6.0.0:
dependencies:
mimic-response: 3.1.0
deep-extend@0.6.0: {}
detect-libc@2.1.2: {}
end-of-stream@1.4.5:
dependencies:
once: 1.4.0
expand-template@2.0.3: {}
file-uri-to-path@1.0.0: {}
fs-constants@1.0.0: {}
github-from-package@0.0.0: {}
ieee754@1.2.1: {}
inherits@2.0.4: {}
ini@1.3.8: {}
mimic-response@3.1.0: {}
minimist@1.2.8: {}
mkdirp-classic@0.5.3: {}
napi-build-utils@2.0.0: {}
node-abi@3.85.0:
dependencies:
semver: 7.7.3
once@1.4.0:
dependencies:
wrappy: 1.0.2
prebuild-install@7.1.3:
dependencies:
detect-libc: 2.1.2
expand-template: 2.0.3
github-from-package: 0.0.0
minimist: 1.2.8
mkdirp-classic: 0.5.3
napi-build-utils: 2.0.0
node-abi: 3.85.0
pump: 3.0.3
rc: 1.2.8
simple-get: 4.0.1
tar-fs: 2.1.4
tunnel-agent: 0.6.0
pump@3.0.3:
dependencies:
end-of-stream: 1.4.5
once: 1.4.0
rc@1.2.8:
dependencies:
deep-extend: 0.6.0
ini: 1.3.8
minimist: 1.2.8
strip-json-comments: 2.0.1
readable-stream@3.6.2:
dependencies:
inherits: 2.0.4
string_decoder: 1.3.0
util-deprecate: 1.0.2
safe-buffer@5.2.1: {}
semver@7.7.3: {}
simple-concat@1.0.1: {}
simple-get@4.0.1:
dependencies:
decompress-response: 6.0.0
once: 1.4.0
simple-concat: 1.0.1
string_decoder@1.3.0:
dependencies:
safe-buffer: 5.2.1
strip-json-comments@2.0.1: {}
tar-fs@2.1.4:
dependencies:
chownr: 1.1.4
mkdirp-classic: 0.5.3
pump: 3.0.3
tar-stream: 2.2.0
tar-stream@2.2.0:
dependencies:
bl: 4.1.0
end-of-stream: 1.4.5
fs-constants: 1.0.0
inherits: 2.0.4
readable-stream: 3.6.2
tunnel-agent@0.6.0:
dependencies:
safe-buffer: 5.2.1
util-deprecate@1.0.2: {}
wrappy@1.0.2: {}
+8 -5
View File
@@ -1,9 +1,9 @@
import { mkdir } from "fs/promises"; import { mkdir } from "fs/promises";
import path from "path"; import path from "path";
import { createClient } from "@libsql/client/node";
import { createId } from "@paralleldrive/cuid2"; import { createId } from "@paralleldrive/cuid2";
import Database from "better-sqlite3"; import { drizzle, LibSQLDatabase } from "drizzle-orm/libsql";
import { BetterSQLite3Database, drizzle } from "drizzle-orm/better-sqlite3"; import { migrate } from "drizzle-orm/libsql/migrator";
import { migrate } from "drizzle-orm/better-sqlite3/migrator";
import { DB_CASING } from "../../packages/core/src/infrastructure/db/constants"; import { DB_CASING } from "../../packages/core/src/infrastructure/db/constants";
import * as sqliteSchema from "../../packages/db/schema/sqlite"; import * as sqliteSchema from "../../packages/db/schema/sqlite";
@@ -14,7 +14,10 @@ export const createSqliteDbFileAsync = async () => {
const localDbUrl = path.join(localMountPath, "db", "db.sqlite"); const localDbUrl = path.join(localMountPath, "db", "db.sqlite");
const connection = new Database(localDbUrl); const connection = createClient({
url: `file:${localDbUrl}`,
});
const db = drizzle(connection, { const db = drizzle(connection, {
schema: sqliteSchema, schema: sqliteSchema,
casing: DB_CASING, casing: DB_CASING,
@@ -30,4 +33,4 @@ export const createSqliteDbFileAsync = async () => {
}; };
}; };
export type SqliteDatabase = BetterSQLite3Database<typeof sqliteSchema>; export type SqliteDatabase = LibSQLDatabase<typeof sqliteSchema>;
+15 -16
View File
@@ -1,6 +1,6 @@
{ {
"name": "homarr", "name": "homarr",
"version": "1.50.0", "version": "1.50.1",
"private": true, "private": true,
"scripts": { "scripts": {
"build": "cross-env CI=true turbo build", "build": "cross-env CI=true turbo build",
@@ -43,10 +43,10 @@
"@semantic-release/npm": "^13.1.3", "@semantic-release/npm": "^13.1.3",
"@semantic-release/release-notes-generator": "^14.1.0", "@semantic-release/release-notes-generator": "^14.1.0",
"@testcontainers/redis": "^11.11.0", "@testcontainers/redis": "^11.11.0",
"@turbo/gen": "^2.7.2", "@turbo/gen": "^2.7.4",
"@vitejs/plugin-react": "^5.1.2", "@vitejs/plugin-react": "^5.1.2",
"@vitest/coverage-v8": "^4.0.16", "@vitest/coverage-v8": "^4.0.17",
"@vitest/ui": "^4.0.16", "@vitest/ui": "^4.0.17",
"conventional-changelog-conventionalcommits": "^9.1.0", "conventional-changelog-conventionalcommits": "^9.1.0",
"cross-env": "^10.1.0", "cross-env": "^10.1.0",
"jsdom": "^27.4.0", "jsdom": "^27.4.0",
@@ -54,21 +54,20 @@
"prettier": "^3.7.4", "prettier": "^3.7.4",
"semantic-release": "^25.0.2", "semantic-release": "^25.0.2",
"testcontainers": "^11.11.0", "testcontainers": "^11.11.0",
"turbo": "^2.7.2", "turbo": "^2.7.4",
"typescript": "^5.9.3", "typescript": "^5.9.3",
"vite-tsconfig-paths": "^6.0.3", "vite-tsconfig-paths": "^6.0.4",
"vitest": "^4.0.16" "vitest": "^4.0.17"
}, },
"packageManager": "pnpm@10.27.0", "packageManager": "pnpm@10.28.0",
"engines": { "engines": {
"node": ">=24.12.0", "node": ">=24.12.0",
"pnpm": ">=10.27.0" "pnpm": ">=10.28.0"
}, },
"pnpm": { "pnpm": {
"onlyBuiltDependencies": [ "onlyBuiltDependencies": [
"@tree-sitter-grammars/tree-sitter-yaml", "@tree-sitter-grammars/tree-sitter-yaml",
"bcrypt", "bcrypt",
"better-sqlite3",
"cpu-features", "cpu-features",
"esbuild", "esbuild",
"sharp", "sharp",
@@ -77,25 +76,25 @@
"tree-sitter-json" "tree-sitter-json"
], ],
"overrides": { "overrides": {
"@babel/helpers@<7.26.10": ">=7.28.4", "@babel/helpers@<7.26.10": ">=7.28.6",
"@babel/runtime@<7.26.10": ">=7.28.4", "@babel/runtime@<7.26.10": ">=7.28.6",
"axios@>=1.0.0 <1.8.2": ">=1.13.2", "axios@>=1.0.0 <1.8.2": ">=1.13.2",
"brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1", "brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1",
"brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1", "brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1",
"esbuild@<=0.24.2": ">=0.27.2", "esbuild@<=0.24.2": ">=0.27.2",
"form-data@>=4.0.0 <4.0.4": ">=4.0.5", "form-data@>=4.0.0 <4.0.4": ">=4.0.5",
"hono@<4.6.5": ">=4.11.3", "hono@<4.6.5": ">=4.11.4",
"linkifyjs@<4.3.2": ">=4.3.2", "linkifyjs@<4.3.2": ">=4.3.2",
"nanoid@>=4.0.0 <5.0.9": ">=5.1.6", "nanoid@>=4.0.0 <5.0.9": ">=5.1.6",
"prismjs@<1.30.0": ">=1.30.0", "prismjs@<1.30.0": ">=1.30.0",
"proxmox-api>undici": "7.16.0", "proxmox-api>undici": "7.18.2",
"react-is": "^19.2.3", "react-is": "^19.2.3",
"rollup@>=4.0.0 <4.22.4": ">=4.54.0", "rollup@>=4.0.0 <4.22.4": ">=4.55.1",
"sha.js@<=2.4.11": ">=2.4.12", "sha.js@<=2.4.11": ">=2.4.12",
"tar-fs@>=3.0.0 <3.0.9": ">=3.1.1", "tar-fs@>=3.0.0 <3.0.9": ">=3.1.1",
"tar-fs@>=2.0.0 <2.1.3": ">=3.1.1", "tar-fs@>=2.0.0 <2.1.3": ">=3.1.1",
"tmp@<=0.2.3": ">=0.2.5", "tmp@<=0.2.3": ">=0.2.5",
"vite@>=5.0.0 <=5.4.18": ">=7.3.0" "vite@>=5.0.0 <=5.4.18": ">=7.3.1"
}, },
"patchedDependencies": { "patchedDependencies": {
"@types/node-unifi": "patches/@types__node-unifi.patch", "@types/node-unifi": "patches/@types__node-unifi.patch",
+9 -7
View File
@@ -141,13 +141,15 @@ export const appRouter = createTRPCRouter({
.output(z.void()) .output(z.void())
.mutation(async ({ ctx, input }) => { .mutation(async ({ ctx, input }) => {
await ctx.db.insert(apps).values( await ctx.db.insert(apps).values(
input.map((app) => ({ await Promise.all(
id: createId(), input.map(async (app) => ({
name: app.name, id: createId(),
description: app.description, name: app.name,
iconUrl: app.iconUrl ?? getIconForName(ctx.db, app.name).sync()?.url ?? defaultIcon, description: app.description,
href: app.href, iconUrl: app.iconUrl ?? (await getIconForName(ctx.db, app.name))?.url ?? defaultIcon,
})), href: app.href,
})),
),
); );
}), }),
update: permissionRequiredProcedure update: permissionRequiredProcedure
+213 -530
View File
@@ -6,8 +6,8 @@ import { constructBoardPermissions } from "@homarr/auth/shared";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { DeviceType } from "@homarr/common/server"; import type { DeviceType } from "@homarr/common/server";
import type { Database, InferInsertModel, InferSelectModel, SQL } from "@homarr/db"; import type { Database, InferInsertModel, InferSelectModel, SQL } from "@homarr/db";
import { and, asc, eq, handleTransactionsAsync, inArray, isNull, like, not, or, sql } from "@homarr/db"; import { and, asc, eq, inArray, isNull, like, not, or, sql } from "@homarr/db";
import { createDbInsertCollectionWithoutTransaction } from "@homarr/db/collection"; import { createDbInsertCollection } from "@homarr/db/collection";
import { getServerSettingByKeyAsync } from "@homarr/db/queries"; import { getServerSettingByKeyAsync } from "@homarr/db/queries";
import { import {
boardGroupPermissions, boardGroupPermissions,
@@ -273,7 +273,7 @@ export const boardRouter = createTRPCRouter({
}, },
}); });
const createBoardCollection = createDbInsertCollectionWithoutTransaction(["boards", "sections", "layouts"]); const createBoardCollection = createDbInsertCollection(["boards", "sections", "layouts"]);
createBoardCollection.boards.push({ createBoardCollection.boards.push({
id: boardId, id: boardId,
@@ -439,86 +439,41 @@ export const boardRouter = createTRPCRouter({
})), })),
); );
await handleTransactionsAsync(ctx.db, { await ctx.db.transaction(async (transaction) => {
async handleAsync(db, schema) { transaction.insert(boards).values({
await db.transaction(async (transaction) => { ...boardProps,
transaction.insert(schema.boards).values({ id: newBoardId,
...boardProps, name: input.name,
id: newBoardId, creatorId: ctx.session.user.id,
name: input.name, });
creatorId: ctx.session.user.id,
});
if (layoutsToInsert.length > 0) { if (layoutsToInsert.length > 0) {
await transaction.insert(schema.layouts).values(layoutsToInsert); await transaction.insert(layouts).values(layoutsToInsert);
} }
if (sectionsToInsert.length > 0) { if (sectionsToInsert.length > 0) {
await transaction.insert(schema.sections).values(sectionsToInsert); await transaction.insert(sections).values(sectionsToInsert);
} }
if (sectionLayoutsToInsert.length > 0) { if (sectionLayoutsToInsert.length > 0) {
await transaction.insert(schema.sectionLayouts).values(sectionLayoutsToInsert); await transaction.insert(sectionLayouts).values(sectionLayoutsToInsert);
} }
if (sectionCollapseStatesToInsert.length > 0) { if (sectionCollapseStatesToInsert.length > 0) {
await transaction.insert(schema.sectionCollapseStates).values(sectionCollapseStatesToInsert); await transaction.insert(sectionCollapseStates).values(sectionCollapseStatesToInsert);
} }
if (itemsToInsert.length > 0) { if (itemsToInsert.length > 0) {
await transaction.insert(schema.items).values(itemsToInsert); await transaction.insert(items).values(itemsToInsert);
} }
if (itemLayoutsToInsert.length > 0) { if (itemLayoutsToInsert.length > 0) {
await transaction.insert(schema.itemLayouts).values(itemLayoutsToInsert); await transaction.insert(itemLayouts).values(itemLayoutsToInsert);
} }
if (itemIntegrationsToInsert.length > 0) { if (itemIntegrationsToInsert.length > 0) {
await transaction.insert(schema.integrationItems).values(itemIntegrationsToInsert); await transaction.insert(integrationItems).values(itemIntegrationsToInsert);
} }
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction
.insert(boards)
.values({
...boardProps,
id: newBoardId,
name: input.name,
creatorId: ctx.session.user.id,
})
.run();
if (layoutsToInsert.length > 0) {
transaction.insert(layouts).values(layoutsToInsert).run();
}
if (sectionsToInsert.length > 0) {
transaction.insert(sections).values(sectionsToInsert).run();
}
if (sectionLayoutsToInsert.length > 0) {
transaction.insert(sectionLayouts).values(sectionLayoutsToInsert).run();
}
if (sectionCollapseStatesToInsert.length > 0) {
transaction.insert(sectionCollapseStates).values(sectionCollapseStatesToInsert).run();
}
if (itemsToInsert.length > 0) {
transaction.insert(items).values(itemsToInsert).run();
}
if (itemLayoutsToInsert.length > 0) {
transaction.insert(itemLayouts).values(itemLayoutsToInsert).run();
}
if (itemIntegrationsToInsert.length > 0) {
transaction.insert(integrationItems).values(itemIntegrationsToInsert).run();
}
});
},
}); });
}), }),
renameBoard: protectedProcedure.input(boardRenameSchema).mutation(async ({ ctx, input }) => { renameBoard: protectedProcedure.input(boardRenameSchema).mutation(async ({ ctx, input }) => {
@@ -756,415 +711,189 @@ export const boardRouter = createTRPCRouter({
const dbBoard = await getFullBoardWithWhereAsync(ctx.db, eq(boards.id, input.id), ctx.session.user.id); const dbBoard = await getFullBoardWithWhereAsync(ctx.db, eq(boards.id, input.id), ctx.session.user.id);
await handleTransactionsAsync(ctx.db, { await ctx.db.transaction(async (transaction) => {
async handleAsync(db, schema) { const addedSections = filterAddedItems(input.sections, dbBoard.sections);
await db.transaction(async (transaction) => {
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
if (addedSections.length > 0) { if (addedSections.length > 0) {
await transaction.insert(schema.sections).values( await transaction.insert(sections).values(
addedSections.map((section) => ({ addedSections.map((section) => ({
id: section.id, id: section.id,
kind: section.kind, kind: section.kind,
yOffset: section.kind !== "dynamic" ? section.yOffset : null, yOffset: section.kind !== "dynamic" ? section.yOffset : null,
xOffset: section.kind === "dynamic" ? null : 0, xOffset: section.kind === "dynamic" ? null : 0,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON, options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: "name" in section ? section.name : null, name: "name" in section ? section.name : null,
boardId: dbBoard.id, boardId: dbBoard.id,
})), })),
); );
if (addedSections.some((section) => section.kind === "dynamic")) { if (addedSections.some((section) => section.kind === "dynamic")) {
await transaction.insert(schema.sectionLayouts).values( await transaction.insert(sectionLayouts).values(
addedSections addedSections
.filter((section) => section.kind === "dynamic") .filter((section) => section.kind === "dynamic")
.flatMap((section) => .flatMap((section) =>
section.layouts.map( section.layouts.map(
(sectionLayout): InferInsertModel<typeof schema.sectionLayouts> => ({ (sectionLayout): InferInsertModel<typeof sectionLayouts> => ({
layoutId: sectionLayout.layoutId, layoutId: sectionLayout.layoutId,
sectionId: section.id, sectionId: section.id,
parentSectionId: sectionLayout.parentSectionId, parentSectionId: sectionLayout.parentSectionId,
height: sectionLayout.height, height: sectionLayout.height,
width: sectionLayout.width, width: sectionLayout.width,
xOffset: sectionLayout.xOffset, xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset, yOffset: sectionLayout.yOffset,
}),
),
),
);
}
}
const addedItems = filterAddedItems(input.items, dbBoard.items);
if (addedItems.length > 0) {
await transaction.insert(schema.items).values(
addedItems.map((item) => ({
id: item.id,
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
boardId: dbBoard.id,
})),
);
await transaction.insert(schema.itemLayouts).values(
addedItems.flatMap((item) =>
item.layouts.map(
(layoutSection): InferInsertModel<typeof schema.itemLayouts> => ({
layoutId: layoutSection.layoutId,
sectionId: layoutSection.sectionId,
itemId: item.id,
height: layoutSection.height,
width: layoutSection.width,
xOffset: layoutSection.xOffset,
yOffset: layoutSection.yOffset,
}), }),
), ),
), ),
);
}
const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const addedIntegrationRelations = inputIntegrationRelations.filter(
(inputRelation) =>
!dbIntegrationRelations.some(
(dbRelation) =>
dbRelation.itemId === inputRelation.itemId &&
dbRelation.integrationId === inputRelation.integrationId,
),
); );
}
}
if (addedIntegrationRelations.length > 0) { const addedItems = filterAddedItems(input.items, dbBoard.items);
await transaction.insert(schema.integrationItems).values(
addedIntegrationRelations.map((relation) => ({
itemId: relation.itemId,
integrationId: relation.integrationId,
})),
);
}
const updatedItems = filterUpdatedItems(input.items, dbBoard.items); if (addedItems.length > 0) {
await transaction.insert(items).values(
addedItems.map((item) => ({
id: item.id,
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
boardId: dbBoard.id,
})),
);
await transaction.insert(itemLayouts).values(
addedItems.flatMap((item) =>
item.layouts.map(
(layoutSection): InferInsertModel<typeof itemLayouts> => ({
layoutId: layoutSection.layoutId,
sectionId: layoutSection.sectionId,
itemId: item.id,
height: layoutSection.height,
width: layoutSection.width,
xOffset: layoutSection.xOffset,
yOffset: layoutSection.yOffset,
}),
),
),
);
}
for (const item of updatedItems) { const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
await transaction integrationIds.map((integrationId) => ({
.update(schema.items) integrationId,
.set({ itemId,
kind: item.kind, })),
options: superjson.stringify(item.options), );
advancedOptions: superjson.stringify(item.advancedOptions), const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
}) integrationIds.map((integrationId) => ({
.where(eq(schema.items.id, item.id)); integrationId,
itemId,
for (const itemSectionLayout of item.layouts) { })),
await transaction );
.update(schema.itemLayouts) const addedIntegrationRelations = inputIntegrationRelations.filter(
.set({ (inputRelation) =>
height: itemSectionLayout.height, !dbIntegrationRelations.some(
width: itemSectionLayout.width,
xOffset: itemSectionLayout.xOffset,
yOffset: itemSectionLayout.yOffset,
sectionId: itemSectionLayout.sectionId,
})
.where(
and(
eq(schema.itemLayouts.itemId, item.id),
eq(schema.itemLayouts.layoutId, itemSectionLayout.layoutId),
),
);
}
}
const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
for (const section of updatedSections) {
const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
await transaction
.update(schema.sections)
.set({
yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: prev?.kind === "category" && "name" in section ? section.name : null,
})
.where(eq(schema.sections.id, section.id));
if (section.kind !== "dynamic") continue;
for (const sectionLayout of section.layouts) {
await transaction
.update(schema.sectionLayouts)
.set({
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
parentSectionId: sectionLayout.parentSectionId,
})
.where(
and(
eq(schema.sectionLayouts.sectionId, section.id),
eq(schema.sectionLayouts.layoutId, sectionLayout.layoutId),
),
);
}
}
const removedIntegrationRelations = dbIntegrationRelations.filter(
(dbRelation) => (dbRelation) =>
!inputIntegrationRelations.some( dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
(inputRelation) => ),
dbRelation.itemId === inputRelation.itemId && );
dbRelation.integrationId === inputRelation.integrationId,
),
);
for (const relation of removedIntegrationRelations) { if (addedIntegrationRelations.length > 0) {
await transaction await transaction.insert(integrationItems).values(
.delete(schema.integrationItems) addedIntegrationRelations.map((relation) => ({
.where( itemId: relation.itemId,
and( integrationId: relation.integrationId,
eq(integrationItems.itemId, relation.itemId), })),
eq(integrationItems.integrationId, relation.integrationId), );
), }
);
}
const removedItems = filterRemovedItems(input.items, dbBoard.items); const updatedItems = filterUpdatedItems(input.items, dbBoard.items);
const itemIds = removedItems.map((item) => item.id); for (const item of updatedItems) {
if (itemIds.length > 0) { await transaction
await transaction.delete(schema.items).where(inArray(schema.items.id, itemIds)); .update(items)
} .set({
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
})
.where(eq(items.id, item.id));
const removedSections = filterRemovedItems(input.sections, dbBoard.sections); for (const itemSectionLayout of item.layouts) {
const sectionIds = removedSections.map((section) => section.id); await transaction
.update(itemLayouts)
.set({
height: itemSectionLayout.height,
width: itemSectionLayout.width,
xOffset: itemSectionLayout.xOffset,
yOffset: itemSectionLayout.yOffset,
sectionId: itemSectionLayout.sectionId,
})
.where(and(eq(itemLayouts.itemId, item.id), eq(itemLayouts.layoutId, itemSectionLayout.layoutId)));
}
}
if (sectionIds.length > 0) { const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
await transaction.delete(schema.sections).where(inArray(schema.sections.id, sectionIds));
}
});
},
handleSync(db) {
db.transaction((transaction) => {
const addedSections = filterAddedItems(input.sections, dbBoard.sections);
if (addedSections.length > 0) { for (const section of updatedSections) {
transaction const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
.insert(sections) await transaction
.values( .update(sections)
addedSections.map((section) => ({ .set({
id: section.id, yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
kind: section.kind, xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
yOffset: section.kind !== "dynamic" ? section.yOffset : null, options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
xOffset: section.kind === "dynamic" ? null : 0, name: prev?.kind === "category" && "name" in section ? section.name : null,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON, })
name: "name" in section ? section.name : null, .where(eq(sections.id, section.id));
boardId: dbBoard.id,
})),
)
.run();
if (addedSections.some((section) => section.kind === "dynamic")) { if (section.kind !== "dynamic") continue;
transaction
.insert(sectionLayouts)
.values(
addedSections
.filter((section) => section.kind === "dynamic")
.flatMap((section) =>
section.layouts.map(
(sectionLayout): InferInsertModel<typeof sectionLayouts> => ({
layoutId: sectionLayout.layoutId,
sectionId: section.id,
parentSectionId: sectionLayout.parentSectionId,
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
}),
),
),
)
.run();
}
}
const addedItems = filterAddedItems(input.items, dbBoard.items); for (const sectionLayout of section.layouts) {
await transaction
.update(sectionLayouts)
.set({
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
parentSectionId: sectionLayout.parentSectionId,
})
.where(and(eq(sectionLayouts.sectionId, section.id), eq(sectionLayouts.layoutId, sectionLayout.layoutId)));
}
}
if (addedItems.length > 0) { const removedIntegrationRelations = dbIntegrationRelations.filter(
transaction (dbRelation) =>
.insert(items) !inputIntegrationRelations.some(
.values(
addedItems.map((item) => ({
id: item.id,
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
boardId: dbBoard.id,
})),
)
.run();
transaction
.insert(itemLayouts)
.values(
addedItems.flatMap((item) =>
item.layouts.map(
(layoutSection): InferInsertModel<typeof itemLayouts> => ({
layoutId: layoutSection.layoutId,
sectionId: layoutSection.sectionId,
itemId: item.id,
height: layoutSection.height,
width: layoutSection.width,
xOffset: layoutSection.xOffset,
yOffset: layoutSection.yOffset,
}),
),
),
)
.run();
}
const inputIntegrationRelations = input.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const dbIntegrationRelations = dbBoard.items.flatMap(({ integrationIds, id: itemId }) =>
integrationIds.map((integrationId) => ({
integrationId,
itemId,
})),
);
const addedIntegrationRelations = inputIntegrationRelations.filter(
(inputRelation) => (inputRelation) =>
!dbIntegrationRelations.some( dbRelation.itemId === inputRelation.itemId && dbRelation.integrationId === inputRelation.integrationId,
(dbRelation) => ),
dbRelation.itemId === inputRelation.itemId && );
dbRelation.integrationId === inputRelation.integrationId,
), for (const relation of removedIntegrationRelations) {
await transaction
.delete(integrationItems)
.where(
and(
eq(integrationItems.itemId, relation.itemId),
eq(integrationItems.integrationId, relation.integrationId),
),
); );
}
if (addedIntegrationRelations.length > 0) { const removedItems = filterRemovedItems(input.items, dbBoard.items);
transaction
.insert(integrationItems)
.values(
addedIntegrationRelations.map((relation) => ({
itemId: relation.itemId,
integrationId: relation.integrationId,
})),
)
.run();
}
const updatedItems = filterUpdatedItems(input.items, dbBoard.items); const itemIds = removedItems.map((item) => item.id);
if (itemIds.length > 0) {
await transaction.delete(items).where(inArray(items.id, itemIds));
}
for (const item of updatedItems) { const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
transaction const sectionIds = removedSections.map((section) => section.id);
.update(items)
.set({
kind: item.kind,
options: superjson.stringify(item.options),
advancedOptions: superjson.stringify(item.advancedOptions),
})
.where(eq(items.id, item.id))
.run();
for (const itemSectionLayout of item.layouts) { if (sectionIds.length > 0) {
transaction await transaction.delete(sections).where(inArray(sections.id, sectionIds));
.update(itemLayouts) }
.set({
height: itemSectionLayout.height,
width: itemSectionLayout.width,
xOffset: itemSectionLayout.xOffset,
yOffset: itemSectionLayout.yOffset,
sectionId: itemSectionLayout.sectionId,
})
.where(and(eq(itemLayouts.itemId, item.id), eq(itemLayouts.layoutId, itemSectionLayout.layoutId)))
.run();
}
}
const updatedSections = filterUpdatedItems(input.sections, dbBoard.sections);
for (const section of updatedSections) {
const prev = dbBoard.sections.find((dbSection) => dbSection.id === section.id);
transaction
.update(sections)
.set({
yOffset: prev?.kind !== "dynamic" && "yOffset" in section ? section.yOffset : null,
xOffset: prev?.kind !== "dynamic" && "yOffset" in section ? 0 : null,
options: section.kind === "dynamic" ? superjson.stringify(section.options) : emptySuperJSON,
name: prev?.kind === "category" && "name" in section ? section.name : null,
})
.where(eq(sections.id, section.id))
.run();
if (section.kind !== "dynamic") continue;
for (const sectionLayout of section.layouts) {
transaction
.update(sectionLayouts)
.set({
height: sectionLayout.height,
width: sectionLayout.width,
xOffset: sectionLayout.xOffset,
yOffset: sectionLayout.yOffset,
parentSectionId: sectionLayout.parentSectionId,
})
.where(
and(eq(sectionLayouts.sectionId, section.id), eq(sectionLayouts.layoutId, sectionLayout.layoutId)),
)
.run();
}
}
const removedIntegrationRelations = dbIntegrationRelations.filter(
(dbRelation) =>
!inputIntegrationRelations.some(
(inputRelation) =>
dbRelation.itemId === inputRelation.itemId &&
dbRelation.integrationId === inputRelation.integrationId,
),
);
for (const relation of removedIntegrationRelations) {
transaction
.delete(integrationItems)
.where(
and(
eq(integrationItems.itemId, relation.itemId),
eq(integrationItems.integrationId, relation.integrationId),
),
)
.run();
}
const removedItems = filterRemovedItems(input.items, dbBoard.items);
const itemIds = removedItems.map((item) => item.id);
if (itemIds.length > 0) {
transaction.delete(items).where(inArray(items.id, itemIds)).run();
}
const removedSections = filterRemovedItems(input.sections, dbBoard.sections);
const sectionIds = removedSections.map((section) => section.id);
if (sectionIds.length > 0) {
transaction.delete(sections).where(inArray(sections.id, sectionIds)).run();
}
});
},
}); });
}), }),
getBoardPermissions: protectedProcedure.input(byIdSchema).query(async ({ input, ctx }) => { getBoardPermissions: protectedProcedure.input(byIdSchema).query(async ({ input, ctx }) => {
@@ -1242,81 +971,35 @@ export const boardRouter = createTRPCRouter({
saveUserBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => { saveUserBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
await handleTransactionsAsync(ctx.db, { await ctx.db.transaction(async (transaction) => {
async handleAsync(db, schema) { await transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId));
await db.transaction(async (transaction) => { if (input.permissions.length === 0) {
await transaction.delete(schema.boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId)); return;
if (input.permissions.length === 0) { }
return; await transaction.insert(boardUserPermissions).values(
} input.permissions.map((permission) => ({
await transaction.insert(schema.boardUserPermissions).values( userId: permission.principalId,
input.permissions.map((permission) => ({ permission: permission.permission,
userId: permission.principalId, boardId: input.entityId,
permission: permission.permission, })),
boardId: input.entityId, );
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction.delete(boardUserPermissions).where(eq(boardUserPermissions.boardId, input.entityId)).run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(boardUserPermissions)
.values(
input.permissions.map((permission) => ({
userId: permission.principalId,
permission: permission.permission,
boardId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
saveGroupBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => { saveGroupBoardPermissions: protectedProcedure.input(boardSavePermissionsSchema).mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.entityId), "full");
await handleTransactionsAsync(ctx.db, { await ctx.db.transaction(async (transaction) => {
async handleAsync(db, schema) { await transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId));
await db.transaction(async (transaction) => { if (input.permissions.length === 0) {
await transaction return;
.delete(schema.boardGroupPermissions) }
.where(eq(boardGroupPermissions.boardId, input.entityId)); await transaction.insert(boardGroupPermissions).values(
if (input.permissions.length === 0) { input.permissions.map((permission) => ({
return; groupId: permission.principalId,
} permission: permission.permission,
await transaction.insert(schema.boardGroupPermissions).values( boardId: input.entityId,
input.permissions.map((permission) => ({ })),
groupId: permission.principalId, );
permission: permission.permission,
boardId: input.entityId,
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction.delete(boardGroupPermissions).where(eq(boardGroupPermissions.boardId, input.entityId)).run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(boardGroupPermissions)
.values(
input.permissions.map((permission) => ({
groupId: permission.principalId,
permission: permission.permission,
boardId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
importOldmarrConfig: permissionRequiredProcedure importOldmarrConfig: permissionRequiredProcedure
@@ -91,7 +91,7 @@ export const certificateRouter = createTRPCRouter({
hostname: input.hostname, hostname: input.hostname,
thumbprint: input.thumbprint, thumbprint: input.thumbprint,
}); });
const dbResult = await ctx.db await ctx.db
.delete(trustedCertificateHostnames) .delete(trustedCertificateHostnames)
.where( .where(
and( and(
@@ -103,7 +103,6 @@ export const certificateRouter = createTRPCRouter({
logger.info("Removed trusted hostname", { logger.info("Removed trusted hostname", {
hostname: input.hostname, hostname: input.hostname,
thumbprint: input.thumbprint, thumbprint: input.thumbprint,
count: dbResult.changes,
}); });
}), }),
removeCertificate: permissionRequiredProcedure removeCertificate: permissionRequiredProcedure
+5 -16
View File
@@ -3,7 +3,7 @@ import { z } from "zod/v4";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq, handleTransactionsAsync, like, not } from "@homarr/db"; import { and, eq, like, not } from "@homarr/db";
import { getMaxGroupPositionAsync } from "@homarr/db/queries"; import { getMaxGroupPositionAsync } from "@homarr/db/queries";
import { groupMembers, groupPermissions, groups } from "@homarr/db/schema"; import { groupMembers, groupPermissions, groups } from "@homarr/db/schema";
import { everyoneGroup } from "@homarr/definitions"; import { everyoneGroup } from "@homarr/definitions";
@@ -252,21 +252,10 @@ export const groupRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
const positions = input.positions.map((id, index) => ({ id, position: index + 1 })); const positions = input.positions.map((id, index) => ({ id, position: index + 1 }));
await handleTransactionsAsync(ctx.db, { await ctx.db.transaction(async (trx) => {
handleAsync: async (db, schema) => { for (const { id, position } of positions) {
await db.transaction(async (trx) => { await trx.update(groups).set({ position }).where(eq(groups.id, id));
for (const { id, position } of positions) { }
await trx.update(schema.groups).set({ position }).where(eq(groups.id, id));
}
});
},
handleSync: (db) => {
db.transaction((trx) => {
for (const { id, position } of positions) {
trx.update(groups).set({ position }).where(eq(groups.id, id)).run();
}
});
},
}); });
}), }),
savePermissions: permissionRequiredProcedure savePermissions: permissionRequiredProcedure
@@ -5,7 +5,7 @@ import { createId, objectEntries } from "@homarr/common";
import { decryptSecret, encryptSecret } from "@homarr/common/server"; import { decryptSecret, encryptSecret } from "@homarr/common/server";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, asc, eq, handleTransactionsAsync, inArray, like, or } from "@homarr/db"; import { and, asc, eq, inArray, like, or } from "@homarr/db";
import { import {
apps, apps,
groupMembers, groupMembers,
@@ -524,45 +524,20 @@ export const integrationRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
await handleTransactionsAsync(ctx.db, { await ctx.db.transaction(async (transaction) => {
async handleAsync(db, schema) { await transaction
await ctx.db.transaction(async (transaction) => { .delete(integrationUserPermissions)
await transaction .where(eq(integrationUserPermissions.integrationId, input.entityId));
.delete(schema.integrationUserPermissions) if (input.permissions.length === 0) {
.where(eq(schema.integrationUserPermissions.integrationId, input.entityId)); return;
if (input.permissions.length === 0) { }
return; await transaction.insert(integrationUserPermissions).values(
} input.permissions.map((permission) => ({
await transaction.insert(schema.integrationUserPermissions).values( userId: permission.principalId,
input.permissions.map((permission) => ({ permission: permission.permission,
userId: permission.principalId, integrationId: input.entityId,
permission: permission.permission, })),
integrationId: input.entityId, );
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction
.delete(integrationUserPermissions)
.where(eq(integrationUserPermissions.integrationId, input.entityId))
.run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(integrationUserPermissions)
.values(
input.permissions.map((permission) => ({
userId: permission.principalId,
permission: permission.permission,
integrationId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
saveGroupIntegrationPermissions: protectedProcedure saveGroupIntegrationPermissions: protectedProcedure
@@ -570,45 +545,20 @@ export const integrationRouter = createTRPCRouter({
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full"); await throwIfActionForbiddenAsync(ctx, eq(integrations.id, input.entityId), "full");
await handleTransactionsAsync(ctx.db, { await ctx.db.transaction(async (transaction) => {
async handleAsync(db, schema) { await transaction
await db.transaction(async (transaction) => { .delete(integrationGroupPermissions)
await transaction .where(eq(integrationGroupPermissions.integrationId, input.entityId));
.delete(schema.integrationGroupPermissions) if (input.permissions.length === 0) {
.where(eq(schema.integrationGroupPermissions.integrationId, input.entityId)); return;
if (input.permissions.length === 0) { }
return; await transaction.insert(integrationGroupPermissions).values(
} input.permissions.map((permission) => ({
await transaction.insert(schema.integrationGroupPermissions).values( groupId: permission.principalId,
input.permissions.map((permission) => ({ permission: permission.permission,
groupId: permission.principalId, integrationId: input.entityId,
permission: permission.permission, })),
integrationId: input.entityId, );
})),
);
});
},
handleSync(db) {
db.transaction((transaction) => {
transaction
.delete(integrationGroupPermissions)
.where(eq(integrationGroupPermissions.integrationId, input.entityId))
.run();
if (input.permissions.length === 0) {
return;
}
transaction
.insert(integrationGroupPermissions)
.values(
input.permissions.map((permission) => ({
groupId: permission.principalId,
permission: permission.permission,
integrationId: input.entityId,
})),
)
.run();
});
},
}); });
}), }),
searchInIntegration: protectedProcedure searchInIntegration: protectedProcedure
+11 -11
View File
@@ -4,7 +4,7 @@ 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 { apps } from "@homarr/db/schema"; import { apps } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import type { GroupPermissionKey } from "@homarr/definitions"; import type { GroupPermissionKey } from "@homarr/definitions";
import { appRouter } from "../app"; import { appRouter } from "../app";
@@ -21,7 +21,7 @@ const createDefaultSession = (permissions: GroupPermissionKey[] = []): Session =
describe("all should return all apps", () => { describe("all should return all apps", () => {
test("should return all apps with session", async () => { test("should return all apps with session", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -55,7 +55,7 @@ describe("all should return all apps", () => {
test("should throw UNAUTHORIZED if the user is not authenticated", async () => { test("should throw UNAUTHORIZED if the user is not authenticated", async () => {
// Arrange // Arrange
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db: createDb(), db: await createDbAsync(),
deviceType: undefined, deviceType: undefined,
session: null, session: null,
}); });
@@ -71,7 +71,7 @@ describe("all should return all apps", () => {
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
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -103,7 +103,7 @@ describe("byId should return an app by id", () => {
test("should throw NOT_FOUND error when canUserSeeAppAsync returns false", async () => { test("should throw NOT_FOUND error when canUserSeeAppAsync returns false", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -129,7 +129,7 @@ describe("byId should return an app by id", () => {
test("should throw an error if the app does not exist", async () => { test("should throw an error if the app does not exist", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -147,7 +147,7 @@ describe("byId should return an app by id", () => {
describe("create should create a new app with all arguments", () => { describe("create should create a new app with all arguments", () => {
test("should create a new app", async () => { test("should create a new app", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -176,7 +176,7 @@ describe("create should create a new app with all arguments", () => {
test("should create a new app only with required arguments", async () => { test("should create a new app only with required arguments", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -207,7 +207,7 @@ describe("create should create a new app with all arguments", () => {
describe("update should update an app", () => { describe("update should update an app", () => {
test("should update an app", async () => { test("should update an app", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -247,7 +247,7 @@ describe("update should update an app", () => {
test("should throw an error if the app does not exist", async () => { test("should throw an error if the app does not exist", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -273,7 +273,7 @@ describe("update should update an app", () => {
describe("delete should delete an app", () => { describe("delete should delete an app", () => {
test("should delete an app", async () => { test("should delete an app", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+39 -39
View File
@@ -22,7 +22,7 @@ import {
serverSettings, serverSettings,
users, users,
} from "@homarr/db/schema"; } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import type { BoardPermission, GroupPermissionKey } from "@homarr/definitions"; import type { BoardPermission, GroupPermissionKey } from "@homarr/definitions";
import type { RouterOutputs } from "../.."; import type { RouterOutputs } from "../..";
@@ -55,7 +55,7 @@ const createRandomUserAsync = async (db: Database) => {
describe("getAllBoards should return all boards accessable to the current user", () => { describe("getAllBoards should return all boards accessable to the current user", () => {
test("without session it should return only public boards", async () => { test("without session it should return only public boards", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: null }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: null });
const user1 = await createRandomUserAsync(db); const user1 = await createRandomUserAsync(db);
@@ -86,7 +86,7 @@ describe("getAllBoards should return all boards accessable to the current user",
test("with session containing board-view-all permission it should return all boards", async () => { test("with session containing board-view-all permission it should return all boards", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ const caller = boardRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -128,7 +128,7 @@ describe("getAllBoards should return all boards accessable to the current user",
test("with session user beeing creator it should return all private boards of them", async () => { test("with session user beeing creator it should return all private boards of them", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const user1 = await createRandomUserAsync(db); const user1 = await createRandomUserAsync(db);
@@ -170,7 +170,7 @@ describe("getAllBoards should return all boards accessable to the current user",
"with %s group board permission it should show board", "with %s group board permission it should show board",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ const caller = boardRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -236,7 +236,7 @@ describe("getAllBoards should return all boards accessable to the current user",
"with %s user board permission it should show board", "with %s user board permission it should show board",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ const caller = boardRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -290,7 +290,7 @@ describe("getAllBoards should return all boards accessable to the current user",
describe("createBoard should create a new board", () => { describe("createBoard should create a new board", () => {
test("should create a new board with permission board-create", async () => { test("should create a new board with permission board-create", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = { const session = {
...defaultSession, ...defaultSession,
user: { user: {
@@ -333,7 +333,7 @@ describe("createBoard should create a new board", () => {
test("should throw error when user has no board-create permission", async () => { test("should throw error when user has no board-create permission", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -347,7 +347,7 @@ describe("createBoard should create a new board", () => {
describe("rename board should rename board", () => { describe("rename board should rename board", () => {
test("should rename board", async () => { test("should rename board", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -375,7 +375,7 @@ describe("rename board should rename board", () => {
test("should throw error when similar board name exists", async () => { test("should throw error when similar board name exists", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
await db.insert(users).values({ await db.insert(users).values({
@@ -402,7 +402,7 @@ describe("rename board should rename board", () => {
test("should throw error when board not found", async () => { test("should throw error when board not found", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -418,7 +418,7 @@ describe("changeBoardVisibility should change board visibility", () => {
"should change board visibility to %s", "should change board visibility to %s",
async (visibility) => { async (visibility) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -453,7 +453,7 @@ describe("changeBoardVisibility should change board visibility", () => {
describe("deleteBoard should delete board", () => { describe("deleteBoard should delete board", () => {
test("should delete board", async () => { test("should delete board", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -480,7 +480,7 @@ describe("deleteBoard should delete board", () => {
test("should throw error when board not found", async () => { test("should throw error when board not found", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -495,7 +495,7 @@ describe("getHomeBoard should return home board", () => {
test("should return user home board when user has one", async () => { test("should return user home board when user has one", async () => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const fullBoardProps = await createFullBoardAsync(db, "home"); const fullBoardProps = await createFullBoardAsync(db, "home");
@@ -519,7 +519,7 @@ describe("getHomeBoard should return home board", () => {
test("should return global home board when user doesn't have one", async () => { test("should return global home board when user doesn't have one", async () => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const fullBoardProps = await createFullBoardAsync(db, "home"); const fullBoardProps = await createFullBoardAsync(db, "home");
@@ -540,7 +540,7 @@ describe("getHomeBoard should return home board", () => {
}); });
test("should throw error when home board not configured in serverSettings", async () => { test("should throw error when home board not configured in serverSettings", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
await createFullBoardAsync(db, "home"); await createFullBoardAsync(db, "home");
@@ -556,7 +556,7 @@ describe("getBoardByName should return board by name", () => {
it.each([["default"], ["something"]])("should return board by name %s when present", async (name) => { it.each([["default"], ["something"]])("should return board by name %s when present", async (name) => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const fullBoardProps = await createFullBoardAsync(db, name); const fullBoardProps = await createFullBoardAsync(db, name);
@@ -574,7 +574,7 @@ describe("getBoardByName should return board by name", () => {
it("should throw error when not present", async () => { it("should throw error when not present", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
await createFullBoardAsync(db, "default"); await createFullBoardAsync(db, "default");
@@ -590,7 +590,7 @@ describe("savePartialBoardSettings should save general settings", () => {
it("should save general settings", async () => { it("should save general settings", async () => {
// Arrange // Arrange
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const newPageTitle = "newPageTitle"; const newPageTitle = "newPageTitle";
@@ -647,7 +647,7 @@ describe("savePartialBoardSettings should save general settings", () => {
}); });
it("should throw error when board not found", async () => { it("should throw error when board not found", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const actAsync = async () => const actAsync = async () =>
@@ -666,7 +666,7 @@ describe("savePartialBoardSettings should save general settings", () => {
describe("saveBoard should save full board", () => { describe("saveBoard should save full board", () => {
it("should remove section when not present in input", async () => { it("should remove section when not present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -703,7 +703,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should remove item when not present in input", async () => { it("should remove item when not present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -760,7 +760,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should remove integration reference when not present in input", async () => { it("should remove integration reference when not present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const anotherIntegration = { const anotherIntegration = {
id: createId(), id: createId(),
@@ -832,7 +832,7 @@ describe("saveBoard should save full board", () => {
"should add section when present in input", "should add section when present in input",
async (partialSection) => { async (partialSection) => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -884,7 +884,7 @@ describe("saveBoard should save full board", () => {
); );
it("should add item when present in input", async () => { it("should add item when present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -956,7 +956,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should add integration reference when present in input", async () => { it("should add integration reference when present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const integration = { const integration = {
id: createId(), id: createId(),
@@ -1024,7 +1024,7 @@ describe("saveBoard should save full board", () => {
expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify"); expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify");
}); });
it("should update section when present in input", async () => { it("should update section when present in input", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, sectionId } = await createFullBoardAsync(db, "default"); const { boardId, sectionId } = await createFullBoardAsync(db, "default");
@@ -1083,7 +1083,7 @@ describe("saveBoard should save full board", () => {
}); });
it("should update item when present in input", async () => { it("should update item when present in input", async () => {
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, itemId, sectionId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1147,7 +1147,7 @@ describe("saveBoard should save full board", () => {
expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify"); expect(spy).toHaveBeenCalledWith(expect.anything(), expect.anything(), "modify");
}); });
it("should fail when board not found", async () => { it("should fail when board not found", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const actAsync = async () => const actAsync = async () =>
@@ -1164,7 +1164,7 @@ describe("saveBoard should save full board", () => {
describe("getBoardPermissions should return board permissions", () => { describe("getBoardPermissions should return board permissions", () => {
test("should return board permissions", async () => { test("should return board permissions", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -1239,7 +1239,7 @@ describe("saveUserBoardPermissions should save user board permissions", () => {
"should save user board permissions", "should save user board permissions",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -1281,7 +1281,7 @@ describe("saveGroupBoardPermissions should save group board permissions", () =>
"should save group board permissions", "should save group board permissions",
async (permission) => { async (permission) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync"); const spy = vi.spyOn(boardAccess, "throwIfActionForbiddenAsync");
@@ -1339,7 +1339,7 @@ const createNewLayout = (columnCount: number) => ({
describe("saveLayouts should save layout changes", () => { describe("saveLayouts should save layout changes", () => {
test("should add layout when not present in database", async () => { test("should add layout when not present in database", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1363,7 +1363,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should add items and dynamic sections generated from grid-algorithm when new layout is added", async () => { test("should add items and dynamic sections generated from grid-algorithm when new layout is added", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default");
@@ -1394,7 +1394,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should update layout when present in input", async () => { test("should update layout when present in input", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1420,7 +1420,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should update position of items when column count changes", async () => { test("should update position of items when column count changes", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId, sectionId, itemId } = await createFullBoardAsync(db, "default");
@@ -1447,7 +1447,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should remove layout when not present in input", async () => { test("should remove layout when not present in input", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { boardId, layoutId } = await createFullBoardAsync(db, "default"); const { boardId, layoutId } = await createFullBoardAsync(db, "default");
@@ -1466,7 +1466,7 @@ describe("saveLayouts should save layout changes", () => {
}); });
test("should fail when board not found", async () => { test("should fail when board not found", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = boardRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
const { layoutId } = await createFullBoardAsync(db, "default"); const { layoutId } = await createFullBoardAsync(db, "default");
@@ -4,7 +4,7 @@ import * as authShared from "@homarr/auth/shared";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { eq } from "@homarr/db"; import { eq } from "@homarr/db";
import { boards, users } from "@homarr/db/schema"; import { boards, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { throwIfActionForbiddenAsync } from "../../board/board-access"; import { throwIfActionForbiddenAsync } from "../../board/board-access";
@@ -26,7 +26,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, true], ["view" as const, true],
])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: true, hasFullAccess: true,
@@ -55,7 +55,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, true], ["view" as const, true],
])("with permission %s should return %s when hasChangeAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasChangeAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -84,7 +84,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, true], ["view" as const, true],
])("with permission %s should return %s when hasViewAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasViewAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -113,7 +113,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
["view" as const, false], ["view" as const, false],
])("with permission %s should return %s when hasViewAccess is false", async (permission, expectedResult) => { ])("with permission %s should return %s when hasViewAccess is false", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructBoardPermissions"); const spy = vi.spyOn(authShared, "constructBoardPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -138,7 +138,7 @@ describe("throwIfActionForbiddenAsync should check access to board and return bo
test("should throw when board is not found", async () => { test("should throw when board is not found", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
// Act // Act
const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(boards.id, createId()), "full"); const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(boards.id, createId()), "full");
+34 -34
View File
@@ -5,7 +5,7 @@ import * as env from "@homarr/auth/env";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { eq } from "@homarr/db"; import { eq } from "@homarr/db";
import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema"; import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import type { GroupPermissionKey } from "@homarr/definitions"; import type { GroupPermissionKey } from "@homarr/definitions";
import { groupRouter } from "../group"; import { groupRouter } from "../group";
@@ -37,7 +37,7 @@ describe("paginated should return a list of groups with pagination", () => {
"with 5 groups in database and pageSize set to 3 on page %s it should return %s groups", "with 5 groups in database and pageSize set to 3 on page %s it should return %s groups",
async (page, expectedCount) => { async (page, expectedCount) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values( await db.insert(groups).values(
@@ -61,7 +61,7 @@ describe("paginated should return a list of groups with pagination", () => {
test("with 5 groups in database and pagesize set to 3 it should return total count 5", async () => { test("with 5 groups in database and pagesize set to 3 it should return total count 5", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values( await db.insert(groups).values(
@@ -83,7 +83,7 @@ describe("paginated should return a list of groups with pagination", () => {
test("groups should contain id, name, email and image of members", async () => { test("groups should contain id, name, email and image of members", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const user = createDummyUser(); const user = createDummyUser();
@@ -120,7 +120,7 @@ describe("paginated should return a list of groups with pagination", () => {
"groups should be searchable by name with contains pattern, query %s should result in %s results", "groups should be searchable by name with contains pattern, query %s should result in %s results",
async (query, expectedCount, firstKey) => { async (query, expectedCount, firstKey) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values( await db.insert(groups).values(
@@ -144,7 +144,7 @@ describe("paginated should return a list of groups with pagination", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -158,7 +158,7 @@ describe("paginated should return a list of groups with pagination", () => {
describe("byId should return group by id including members and permissions", () => { describe("byId should return group by id including members and permissions", () => {
test('should return group with id "1" with members and permissions', async () => { test('should return group with id "1" with members and permissions', async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const user = createDummyUser(); const user = createDummyUser();
@@ -203,7 +203,7 @@ describe("byId should return group by id including members and permissions", ()
test("with group id 1 and group 2 in database it should throw NOT_FOUND error", async () => { test("with group id 1 and group 2 in database it should throw NOT_FOUND error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -221,7 +221,7 @@ describe("byId should return group by id including members and permissions", ()
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -235,7 +235,7 @@ describe("byId should return group by id including members and permissions", ()
describe("create should create group in database", () => { describe("create should create group in database", () => {
test("with valid input (64 character name) and non existing name it should be successful", async () => { test("with valid input (64 character name) and non existing name it should be successful", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const name = "a".repeat(64); const name = "a".repeat(64);
@@ -259,7 +259,7 @@ describe("create should create group in database", () => {
test("with more than 64 characters name it should fail while validation", async () => { test("with more than 64 characters name it should fail while validation", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const longName = "a".repeat(65); const longName = "a".repeat(65);
@@ -280,7 +280,7 @@ describe("create should create group in database", () => {
["test", " TeSt"], ["test", " TeSt"],
])("with similar name %s it should fail to create %s", async (similarName, nameToCreate) => { ])("with similar name %s it should fail to create %s", async (similarName, nameToCreate) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -298,7 +298,7 @@ describe("create should create group in database", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -315,7 +315,7 @@ describe("update should update name with value that is no duplicate", () => {
["first", " first", "first"], ["first", " first", "first"],
])("update should update name from %s to %s normalized", async (initialValue, updateValue, expectedValue) => { ])("update should update name from %s to %s normalized", async (initialValue, updateValue, expectedValue) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -350,7 +350,7 @@ describe("update should update name with value that is no duplicate", () => {
[" seCond", "second"], [" seCond", "second"],
])("with similar name %s it should fail to update %s", async (updateValue, initialDuplicate) => { ])("with similar name %s it should fail to update %s", async (updateValue, initialDuplicate) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -380,7 +380,7 @@ describe("update should update name with value that is no duplicate", () => {
test("with non existing id it should throw not found error", async () => { test("with non existing id it should throw not found error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -402,7 +402,7 @@ describe("update should update name with value that is no duplicate", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -420,7 +420,7 @@ describe("update should update name with value that is no duplicate", () => {
describe("savePermissions should save permissions for group", () => { describe("savePermissions should save permissions for group", () => {
test("with existing group and permissions it should save permissions", async () => { test("with existing group and permissions it should save permissions", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -451,7 +451,7 @@ describe("savePermissions should save permissions for group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -473,7 +473,7 @@ describe("savePermissions should save permissions for group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -491,7 +491,7 @@ describe("savePermissions should save permissions for group", () => {
describe("transferOwnership should transfer ownership of group", () => { describe("transferOwnership should transfer ownership of group", () => {
test("with existing group and user it should transfer ownership", async () => { test("with existing group and user it should transfer ownership", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -529,7 +529,7 @@ describe("transferOwnership should transfer ownership of group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -551,7 +551,7 @@ describe("transferOwnership should transfer ownership of group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -569,7 +569,7 @@ describe("transferOwnership should transfer ownership of group", () => {
describe("deleteGroup should delete group", () => { describe("deleteGroup should delete group", () => {
test("with existing group it should delete group", async () => { test("with existing group it should delete group", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
const groupId = createId(); const groupId = createId();
@@ -600,7 +600,7 @@ describe("deleteGroup should delete group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(groups).values({ await db.insert(groups).values({
@@ -621,7 +621,7 @@ describe("deleteGroup should delete group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -638,7 +638,7 @@ describe("deleteGroup should delete group", () => {
describe("addMember should add member to group", () => { describe("addMember should add member to group", () => {
test("with existing group and user it should add member", async () => { test("with existing group and user it should add member", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -679,7 +679,7 @@ describe("addMember should add member to group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(users).values({ await db.insert(users).values({
@@ -700,7 +700,7 @@ describe("addMember should add member to group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -716,7 +716,7 @@ describe("addMember should add member to group", () => {
test("without credentials provider it should throw FORBIDDEN error", async () => { test("without credentials provider it should throw FORBIDDEN error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -755,7 +755,7 @@ describe("addMember should add member to group", () => {
describe("removeMember should remove member from group", () => { describe("removeMember should remove member from group", () => {
test("with existing group and user it should remove member", async () => { test("with existing group and user it should remove member", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["credentials"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -799,7 +799,7 @@ describe("removeMember should remove member from group", () => {
test("with non existing group it should throw not found error", async () => { test("with non existing group it should throw not found error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
await db.insert(users).values({ await db.insert(users).values({
@@ -820,7 +820,7 @@ describe("removeMember should remove member from group", () => {
test("without admin permissions it should throw unauthorized error", async () => { test("without admin permissions it should throw unauthorized error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: defaultSession });
// Act // Act
@@ -836,7 +836,7 @@ describe("removeMember should remove member from group", () => {
test("without credentials provider it should throw FORBIDDEN error", async () => { test("without credentials provider it should throw FORBIDDEN error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(env, "env", "get"); const spy = vi.spyOn(env, "env", "get");
spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never); spy.mockReturnValue({ AUTH_PROVIDERS: ["ldap"] } as never);
const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession }); const caller = groupRouter.createCaller({ db, deviceType: undefined, session: adminSession });
@@ -4,7 +4,7 @@ import * as authShared from "@homarr/auth/shared";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { eq } from "@homarr/db"; import { eq } from "@homarr/db";
import { integrations, users } from "@homarr/db/schema"; import { integrations, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { throwIfActionForbiddenAsync } from "../../integration/integration-access"; import { throwIfActionForbiddenAsync } from "../../integration/integration-access";
@@ -26,7 +26,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, true], ["use" as const, true],
])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasFullAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: true, hasFullAccess: true,
@@ -56,7 +56,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, true], ["use" as const, true],
])("with permission %s should return %s when hasInteractAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasInteractAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -87,7 +87,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, true], ["use" as const, true],
])("with permission %s should return %s when hasUseAccess is true", async (permission, expectedResult) => { ])("with permission %s should return %s when hasUseAccess is true", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -118,7 +118,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
["use" as const, false], ["use" as const, false],
])("with permission %s should return %s when hasUseAccess is false", async (permission, expectedResult) => { ])("with permission %s should return %s when hasUseAccess is false", async (permission, expectedResult) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(authShared, "constructIntegrationPermissions"); const spy = vi.spyOn(authShared, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
hasFullAccess: false, hasFullAccess: false,
@@ -145,7 +145,7 @@ describe("throwIfActionForbiddenAsync should check access to integration and ret
test("should throw when integration is not found", async () => { test("should throw when integration is not found", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
// Act // Act
const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(integrations.id, createId()), "full"); const act = () => throwIfActionForbiddenAsync({ db, session: null }, eq(integrations.id, createId()), "full");
@@ -5,7 +5,7 @@ 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 { apps, integrations, integrationSecrets } from "@homarr/db/schema"; import { apps, integrations, integrationSecrets } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import type { GroupPermissionKey } from "@homarr/definitions"; import type { GroupPermissionKey } from "@homarr/definitions";
import { integrationRouter } from "../../integration/integration-router"; import { integrationRouter } from "../../integration/integration-router";
@@ -30,7 +30,7 @@ vi.mock("../../integration/integration-test-connection", () => ({
describe("all should return all integrations", () => { describe("all should return all integrations", () => {
test("with any session should return all integrations", async () => { test("with any session should return all integrations", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -61,7 +61,7 @@ describe("all should return all integrations", () => {
describe("byId should return an integration by id", () => { describe("byId should return an integration by id", () => {
test("with full access should return an integration by id", async () => { test("with full access should return an integration by id", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -88,7 +88,7 @@ describe("byId should return an integration by id", () => {
}); });
test("with full access should throw an error if the integration does not exist", async () => { test("with full access should throw an error if the integration does not exist", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -100,7 +100,7 @@ describe("byId should return an integration by id", () => {
}); });
test("with full access should only return the public secret values", async () => { test("with full access should only return the public secret values", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -148,7 +148,7 @@ describe("byId should return an integration by id", () => {
test("without full access should throw integration not found error", async () => { test("without full access should throw integration not found error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -174,7 +174,7 @@ describe("byId should return an integration by id", () => {
describe("create should create a new integration", () => { describe("create should create a new integration", () => {
test("with create integration access should create a new integration", async () => { test("with create integration access should create a new integration", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -209,7 +209,7 @@ describe("create should create a new integration", () => {
}); });
test("with create integration access should create a new integration when creating search engine", async () => { test("with create integration access should create a new integration when creating search engine", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -252,7 +252,7 @@ describe("create should create a new integration", () => {
}); });
test("with create integration access should create a new integration with new linked app", async () => { test("with create integration access should create a new integration with new linked app", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -302,7 +302,7 @@ describe("create should create a new integration", () => {
}); });
test("with create integration access should create a new integration with existing linked app", async () => { test("with create integration access should create a new integration with existing linked app", async () => {
const db = createDb(); const db = await createDbAsync();
const appId = createId(); const appId = createId();
await db.insert(apps).values({ await db.insert(apps).values({
id: appId, id: appId,
@@ -349,7 +349,7 @@ describe("create should create a new integration", () => {
test("without create integration access should throw permission error", async () => { test("without create integration access should throw permission error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -372,7 +372,7 @@ describe("create should create a new integration", () => {
test("without create app access should throw permission error with new linked app", async () => { test("without create app access should throw permission error with new linked app", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -403,7 +403,7 @@ describe("create should create a new integration", () => {
describe("update should update an integration", () => { describe("update should update an integration", () => {
test("with full access should update an integration", async () => { test("with full access should update an integration", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -486,7 +486,7 @@ describe("update should update an integration", () => {
}); });
test("with full access should throw an error if the integration does not exist", async () => { test("with full access should throw an error if the integration does not exist", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -506,7 +506,7 @@ describe("update should update an integration", () => {
test("without full access should throw permission error", async () => { test("without full access should throw permission error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -530,7 +530,7 @@ describe("update should update an integration", () => {
describe("delete should delete an integration", () => { describe("delete should delete an integration", () => {
test("with full access should delete an integration", async () => { test("with full access should delete an integration", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -564,7 +564,7 @@ describe("delete should delete an integration", () => {
test("without full access should throw permission error", async () => { test("without full access should throw permission error", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = integrationRouter.createCaller({ const caller = integrationRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+6 -6
View File
@@ -4,7 +4,7 @@ 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 { invites, users } from "@homarr/db/schema"; import { invites, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { inviteRouter } from "../invite"; import { inviteRouter } from "../invite";
@@ -35,7 +35,7 @@ vi.mock("@homarr/auth/env", () => {
describe("all should return all existing invites without sensitive informations", () => { describe("all should return all existing invites without sensitive informations", () => {
test("invites should not contain sensitive informations", async () => { test("invites should not contain sensitive informations", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -70,7 +70,7 @@ describe("all should return all existing invites without sensitive informations"
test("invites should be sorted ascending by expiration date", async () => { test("invites should be sorted ascending by expiration date", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -110,7 +110,7 @@ describe("all should return all existing invites without sensitive informations"
describe("create should create a new invite expiring on the specified date with a token and id returned to generate url", () => { describe("create should create a new invite expiring on the specified date with a token and id returned to generate url", () => {
test("creation should work with a date in the future, but less than 6 months.", async () => { test("creation should work with a date in the future, but less than 6 months.", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -142,7 +142,7 @@ describe("create should create a new invite expiring on the specified date with
describe("delete should remove invite by id", () => { describe("delete should remove invite by id", () => {
test("deletion should remove present invite", async () => { test("deletion should remove present invite", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -180,7 +180,7 @@ describe("delete should remove invite by id", () => {
test("deletion should throw with NOT_FOUND code when specified invite not present", async () => { test("deletion should throw with NOT_FOUND code when specified invite not present", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = inviteRouter.createCaller({ const caller = inviteRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -4,7 +4,7 @@ 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 { serverSettings } from "@homarr/db/schema"; import { serverSettings } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings"; import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";
import { serverSettingsRouter } from "../serverSettings"; import { serverSettingsRouter } from "../serverSettings";
@@ -23,7 +23,7 @@ const defaultSession = {
describe("getAll server settings", () => { describe("getAll server settings", () => {
test("getAll should throw error when unauthorized", async () => { test("getAll should throw error when unauthorized", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = serverSettingsRouter.createCaller({ const caller = serverSettingsRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -42,7 +42,7 @@ describe("getAll server settings", () => {
await expect(actAsync()).rejects.toThrow(); await expect(actAsync()).rejects.toThrow();
}); });
test("getAll should return default server settings when nothing in database", async () => { test("getAll should return default server settings when nothing in database", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = serverSettingsRouter.createCaller({ const caller = serverSettingsRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -57,7 +57,7 @@ describe("getAll server settings", () => {
describe("saveSettings", () => { describe("saveSettings", () => {
test("saveSettings should update settings and return true when it updated only one", async () => { test("saveSettings should update settings and return true when it updated only one", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = serverSettingsRouter.createCaller({ const caller = serverSettingsRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+9 -9
View File
@@ -5,7 +5,7 @@ import { createId } from "@homarr/common";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { eq } from "@homarr/db"; import { eq } from "@homarr/db";
import { invites, onboarding, users } from "@homarr/db/schema"; import { invites, onboarding, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions"; import type { GroupPermissionKey, OnboardingStep } from "@homarr/definitions";
import { userRouter } from "../user"; import { userRouter } from "../user";
@@ -39,7 +39,7 @@ vi.mock("@homarr/auth/env", () => {
describe("initUser should initialize the first user", () => { describe("initUser should initialize the first user", () => {
it("should create a user if none exists", async () => { it("should create a user if none exists", async () => {
const db = createDb(); const db = await createDbAsync();
await createOnboardingStepAsync(db, "user"); await createOnboardingStepAsync(db, "user");
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
@@ -63,7 +63,7 @@ describe("initUser should initialize the first user", () => {
}); });
it("should not create a user if the password and confirmPassword do not match", async () => { it("should not create a user if the password and confirmPassword do not match", async () => {
const db = createDb(); const db = await createDbAsync();
await createOnboardingStepAsync(db, "user"); await createOnboardingStepAsync(db, "user");
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
@@ -88,7 +88,7 @@ describe("initUser should initialize the first user", () => {
["ABC123+/-"], // does not contain lowercase ["ABC123+/-"], // does not contain lowercase
["abc123+/-"], // does not contain uppercase ["abc123+/-"], // does not contain uppercase
])("should throw error that password requirements do not match for '%s' as password", async (password) => { ])("should throw error that password requirements do not match for '%s' as password", async (password) => {
const db = createDb(); const db = await createDbAsync();
await createOnboardingStepAsync(db, "user"); await createOnboardingStepAsync(db, "user");
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
@@ -110,7 +110,7 @@ describe("initUser should initialize the first user", () => {
describe("register should create a user with valid invitation", () => { describe("register should create a user with valid invitation", () => {
test("register should create a user with valid invitation", async () => { test("register should create a user with valid invitation", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -166,7 +166,7 @@ describe("register should create a user with valid invitation", () => {
"register should throw an error with input %s and date %s if the invitation is invalid", "register should throw an error with input %s and date %s if the invitation is invalid",
async (partialInput, systemTime) => { async (partialInput, systemTime) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -209,7 +209,7 @@ describe("register should create a user with valid invitation", () => {
describe("editProfile shoud update user", () => { describe("editProfile shoud update user", () => {
test("editProfile should update users and not update emailVerified when email not dirty", async () => { test("editProfile should update users and not update emailVerified when email not dirty", async () => {
// arrange // arrange
const db = createDb(); const db = await createDbAsync();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -246,7 +246,7 @@ describe("editProfile shoud update user", () => {
test("editProfile should update users and update emailVerified when email dirty", async () => { test("editProfile should update users and update emailVerified when email dirty", async () => {
// arrange // arrange
const db = createDb(); const db = await createDbAsync();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -282,7 +282,7 @@ describe("editProfile shoud update user", () => {
describe("delete should delete user", () => { describe("delete should delete user", () => {
test("delete should delete user", async () => { test("delete should delete user", async () => {
const db = createDb(); const db = await createDbAsync();
const caller = userRouter.createCaller({ const caller = userRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -1,7 +1,7 @@
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import type { Session } from "@homarr/auth"; import type { Session } from "@homarr/auth";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import * as ping from "@homarr/ping"; import * as ping from "@homarr/ping";
import { appRouter } from "../../widgets/app"; import { appRouter } from "../../widgets/app";
@@ -15,7 +15,7 @@ describe("ping should call sendPingRequestAsync with url and return result", ()
// Arrange // Arrange
const spy = vi.spyOn(ping, "sendPingRequestAsync"); const spy = vi.spyOn(ping, "sendPingRequestAsync");
const url = "http://localhost"; const url = "http://localhost";
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
@@ -35,7 +35,7 @@ describe("ping should call sendPingRequestAsync with url and return result", ()
// Arrange // Arrange
const spy = vi.spyOn(ping, "sendPingRequestAsync"); const spy = vi.spyOn(ping, "sendPingRequestAsync");
const url = "http://localhost"; const url = "http://localhost";
const db = createDb(); const db = await createDbAsync();
const caller = appRouter.createCaller({ const caller = appRouter.createCaller({
db, db,
deviceType: undefined, deviceType: undefined,
+1 -1
View File
@@ -33,7 +33,7 @@
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"bcrypt": "^6.0.0", "bcrypt": "^6.0.0",
"cookies": "^0.9.1", "cookies": "^0.9.1",
"ldapts": "8.1.2", "ldapts": "8.1.3",
"next": "16.1.1", "next": "16.1.1",
"next-auth": "5.0.0-beta.30", "next-auth": "5.0.0-beta.30",
"react": "19.2.3", "react": "19.2.3",
@@ -4,7 +4,7 @@ import { describe, expect, test, vi } from "vitest";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import type { InferInsertModel } from "@homarr/db"; import type { InferInsertModel } from "@homarr/db";
import { boardGroupPermissions, boards, boardUserPermissions, groupMembers, groups, users } from "@homarr/db/schema"; import { boardGroupPermissions, boards, boardUserPermissions, groupMembers, groups, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import * as integrationPermissions from "../integration-permissions"; import * as integrationPermissions from "../integration-permissions";
import { hasQueryAccessToIntegrationsAsync } from "../integration-query-permissions"; import { hasQueryAccessToIntegrationsAsync } from "../integration-query-permissions";
@@ -22,7 +22,7 @@ const createSession = (user: Partial<Session["user"]>): Session => ({
describe("hasQueryAccessToIntegrationsAsync should check if the user has query access to the specified integrations", () => { describe("hasQueryAccessToIntegrationsAsync should check if the user has query access to the specified integrations", () => {
test("should return true if the user has the board-view-all permission and the integrations are used anywhere", async () => { test("should return true if the user has the board-view-all permission and the integrations are used anywhere", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({ const session = createSession({
permissions: ["board-view-all"], permissions: ["board-view-all"],
}); });
@@ -50,7 +50,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has the board-view-all permission, the first integration is used and the second one he has use access", async () => { test("should return true if the user has the board-view-all permission, the first integration is used and the second one he has use access", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({ const session = createSession({
permissions: ["board-view-all"], permissions: ["board-view-all"],
}); });
@@ -84,7 +84,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has use access to all integrations", async () => { test("should return true if the user has use access to all integrations", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
spy.mockReturnValue({ spy.mockReturnValue({
@@ -116,7 +116,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has user permission to access to at least one board of each integration", async () => { test("should return true if the user has user permission to access to at least one board of each integration", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -168,7 +168,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user has user permission to access board of first integration but not of second one", async () => { test("should return false if the user has user permission to access board of first integration but not of second one", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -215,7 +215,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has group permission to access to at least one board of each integration", async () => { test("should return true if the user has group permission to access to at least one board of each integration", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -269,7 +269,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user has group permission to access board of first integration but not of second one", async () => { test("should return false if the user has group permission to access board of first integration but not of second one", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -318,7 +318,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user has user permission to access first board and group permission to access second one", async () => { test("should return true if the user has user permission to access first board and group permission to access second one", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions"); const spy = vi.spyOn(integrationPermissions, "constructIntegrationPermissions");
@@ -369,7 +369,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if one of the boards the integration is used is public", async () => { test("should return true if one of the boards the integration is used is public", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
const integrations = [ const integrations = [
{ {
@@ -413,7 +413,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user is creator of the board the integration is used", async () => { test("should return true if the user is creator of the board the integration is used", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
await db.insert(users).values({ id: session.user.id }); await db.insert(users).values({ id: session.user.id });
const integrations = [ const integrations = [
@@ -458,7 +458,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user has no access to any of the integrations", async () => { test("should return false if the user has no access to any of the integrations", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const session = createSession({}); const session = createSession({});
const integrations = [ const integrations = [
{ {
@@ -496,7 +496,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return false if the user is anonymous and the board is not public", async () => { test("should return false if the user is anonymous and the board is not public", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const integrations = [ const integrations = [
{ {
id: "1", id: "1",
@@ -534,7 +534,7 @@ describe("hasQueryAccessToIntegrationsAsync should check if the user has query a
test("should return true if the user is anonymous and the board is public", async () => { test("should return true if the user is anonymous and the board is public", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const integrations = [ const integrations = [
{ {
id: "1", id: "1",
@@ -2,7 +2,7 @@ import { describe, expect, test } from "vitest";
import { createId } from "@homarr/common"; import { createId } from "@homarr/common";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { createSaltAsync, hashPasswordAsync } from "../../security"; import { createSaltAsync, hashPasswordAsync } from "../../security";
import { authorizeWithBasicCredentialsAsync } from "../credentials/authorization/basic-authorization"; import { authorizeWithBasicCredentialsAsync } from "../credentials/authorization/basic-authorization";
@@ -12,7 +12,7 @@ const defaultUserId = createId();
describe("authorizeWithBasicCredentials", () => { describe("authorizeWithBasicCredentials", () => {
test("should authorize user with correct credentials", async () => { test("should authorize user with correct credentials", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const salt = await createSaltAsync(); const salt = await createSaltAsync();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
@@ -33,7 +33,7 @@ describe("authorizeWithBasicCredentials", () => {
test("should not authorize user with incorrect credentials", async () => { test("should not authorize user with incorrect credentials", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const salt = await createSaltAsync(); const salt = await createSaltAsync();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
@@ -54,7 +54,7 @@ describe("authorizeWithBasicCredentials", () => {
test("should not authorize user with incorrect username", async () => { test("should not authorize user with incorrect username", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const salt = await createSaltAsync(); const salt = await createSaltAsync();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
@@ -75,7 +75,7 @@ describe("authorizeWithBasicCredentials", () => {
test("should not authorize user when password is not set", async () => { test("should not authorize user when password is not set", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await db.insert(users).values({ await db.insert(users).values({
id: defaultUserId, id: defaultUserId,
name: "test", name: "test",
@@ -5,7 +5,7 @@ import { createId } from "@homarr/common";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { and, eq } from "@homarr/db"; import { and, eq } from "@homarr/db";
import { groups, users } from "@homarr/db/schema"; import { groups, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization"; import { authorizeWithLdapCredentialsAsync } from "../credentials/authorization/ldap-authorization";
import * as ldapClient from "../credentials/ldap-client"; import * as ldapClient from "../credentials/ldap-client";
@@ -123,7 +123,7 @@ describe("authorizeWithLdapCredentials", () => {
test("should authorize user with correct credentials and create user", async () => { test("should authorize user with correct credentials and create user", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(ldapClient, "LdapClient"); const spy = vi.spyOn(ldapClient, "LdapClient");
spy.mockImplementation(function () { spy.mockImplementation(function () {
return { return {
@@ -161,7 +161,7 @@ describe("authorizeWithLdapCredentials", () => {
test("should authorize user with correct credentials and create user with same email when credentials user already exists", async () => { test("should authorize user with correct credentials and create user with same email when credentials user already exists", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const spy = vi.spyOn(ldapClient, "LdapClient"); const spy = vi.spyOn(ldapClient, "LdapClient");
spy.mockImplementation(function () { spy.mockImplementation(function () {
return { return {
@@ -230,7 +230,7 @@ describe("authorizeWithLdapCredentials", () => {
}); });
const userId = createId(); const userId = createId();
const db = createDb(); const db = await createDbAsync();
await db.insert(users).values({ await db.insert(users).values({
id: userId, id: userId,
name: "test-old", name: "test-old",
@@ -281,7 +281,7 @@ describe("authorizeWithLdapCredentials", () => {
disconnectAsync: vi.fn(), disconnectAsync: vi.fn(),
} as unknown as ldapClient.LdapClient; } as unknown as ldapClient.LdapClient;
}); });
const db = createDb(); const db = await createDbAsync();
const userId = createId(); const userId = createId();
await db.insert(users).values({ await db.insert(users).values({
id: userId, id: userId,
+4 -4
View File
@@ -1,7 +1,7 @@
import { describe, expect, test } from "vitest"; import { describe, expect, test } from "vitest";
import { users } from "@homarr/db/schema"; import { users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { createAdapter } from "../adapter"; import { createAdapter } from "../adapter";
@@ -10,7 +10,7 @@ describe("createAdapter should create drizzle adapter", () => {
"createAdapter getUserByEmail should return user for provider %s when this provider provided", "createAdapter getUserByEmail should return user for provider %s when this provider provided",
async (provider) => { async (provider) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const adapter = createAdapter(db, provider); const adapter = createAdapter(db, provider);
const email = "test@example.com"; const email = "test@example.com";
await db.insert(users).values({ id: "1", name: "test", email, provider }); await db.insert(users).values({ id: "1", name: "test", email, provider });
@@ -37,7 +37,7 @@ describe("createAdapter should create drizzle adapter", () => {
"createAdapter getUserByEmail should return null if only for other providers than %s exist", "createAdapter getUserByEmail should return null if only for other providers than %s exist",
async (requestedProvider, existingProviders) => { async (requestedProvider, existingProviders) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const adapter = createAdapter(db, requestedProvider); const adapter = createAdapter(db, requestedProvider);
const email = "test@example.com"; const email = "test@example.com";
for (const provider of existingProviders) { for (const provider of existingProviders) {
@@ -54,7 +54,7 @@ describe("createAdapter should create drizzle adapter", () => {
test("createAdapter getUserByEmail should throw error if provider is unknown", async () => { test("createAdapter getUserByEmail should throw error if provider is unknown", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const adapter = createAdapter(db, "unknown"); const adapter = createAdapter(db, "unknown");
const email = "test@example.com"; const email = "test@example.com";
+5 -5
View File
@@ -4,7 +4,7 @@ import type { JWT } from "next-auth/jwt";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema"; import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import * as definitions from "@homarr/definitions"; import * as definitions from "@homarr/definitions";
import { createSessionCallback, getCurrentUserPermissionsAsync } from "../callbacks"; import { createSessionCallback, getCurrentUserPermissionsAsync } from "../callbacks";
@@ -20,7 +20,7 @@ vi.mock("next/headers", () => ({
describe("getCurrentUserPermissions", () => { describe("getCurrentUserPermissions", () => {
test("should return empty permissions when non existing user requested", async () => { test("should return empty permissions when non existing user requested", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await db.insert(groups).values({ await db.insert(groups).values({
id: "2", id: "2",
@@ -46,7 +46,7 @@ describe("getCurrentUserPermissions", () => {
test("should return empty permissions when user has no groups", async () => { test("should return empty permissions when user has no groups", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const userId = "1"; const userId = "1";
await db.insert(groups).values({ await db.insert(groups).values({
@@ -71,7 +71,7 @@ describe("getCurrentUserPermissions", () => {
test("should return permissions for user", async () => { test("should return permissions for user", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
const getPermissionsWithChildrenMock = vi const getPermissionsWithChildrenMock = vi
.spyOn(definitions, "getPermissionsWithChildren") .spyOn(definitions, "getPermissionsWithChildren")
.mockReturnValue(["board-create"]); .mockReturnValue(["board-create"]);
@@ -113,7 +113,7 @@ describe("session callback", () => {
emailVerified: new Date("2023-01-13"), emailVerified: new Date("2023-01-13"),
}; };
const token: JWT = {}; const token: JWT = {};
const db = createDb(); const db = await createDbAsync();
const callback = createSessionCallback(db); const callback = createSessionCallback(db);
// Act // Act
+10 -10
View File
@@ -6,7 +6,7 @@ import { describe, expect, test, vi } from "vitest";
import { eq } from "@homarr/db"; import { eq } from "@homarr/db";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { groupMembers, groups, users } from "@homarr/db/schema"; import { groupMembers, groups, users } from "@homarr/db/schema";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions"; import { colorSchemeCookieKey, everyoneGroup } from "@homarr/definitions";
import { createSignInEventHandler } from "../events"; import { createSignInEventHandler } from "../events";
@@ -39,7 +39,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
describe("signInEventHandler should add users to everyone group", () => { describe("signInEventHandler should add users to everyone group", () => {
test("should add user to everyone group if he isn't already", async () => { test("should add user to everyone group if he isn't already", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db, everyoneGroup); await createGroupAsync(db, everyoneGroup);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -62,7 +62,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
describe("signInEventHandler should synchronize ldap groups", () => { describe("signInEventHandler should synchronize ldap groups", () => {
test("should add missing group membership", async () => { test("should add missing group membership", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -82,7 +82,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should remove group membership", async () => { test("should remove group membership", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -106,7 +106,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should not remove group membership for everyone group", async () => { test("should not remove group membership for everyone group", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db, everyoneGroup); await createGroupAsync(db, everyoneGroup);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -132,7 +132,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
describe("signInEventHandler should synchronize oidc groups", () => { describe("signInEventHandler should synchronize oidc groups", () => {
test("should add missing group membership", async () => { test("should add missing group membership", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -152,7 +152,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should remove group membership", async () => { test("should remove group membership", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db); await createGroupAsync(db);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -176,7 +176,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("should not remove group membership for everyone group", async () => { test("should not remove group membership for everyone group", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
await createGroupAsync(db, everyoneGroup); await createGroupAsync(db, everyoneGroup);
await db.insert(groupMembers).values({ await db.insert(groupMembers).values({
@@ -205,7 +205,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
["oidc" as const, { name: "test" }, { preferred_username: "test@example.com", name: "test-new" }], ["oidc" as const, { name: "test" }, { preferred_username: "test@example.com", name: "test-new" }],
])("signInEventHandler should update username for %s provider", async (_provider, user, profile) => { ])("signInEventHandler should update username for %s provider", async (_provider, user, profile) => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
@@ -227,7 +227,7 @@ describe("createSignInEventHandler should create signInEventHandler", () => {
}); });
test("signInEventHandler should set color-scheme cookie", async () => { test("signInEventHandler should set color-scheme cookie", async () => {
// Arrange // Arrange
const db = createDb(); const db = await createDbAsync();
await createUserAsync(db); await createUserAsync(db);
const eventHandler = createSignInEventHandler(db); const eventHandler = createSignInEventHandler(db);
+1 -1
View File
@@ -33,7 +33,7 @@
"octokit": "^5.0.5", "octokit": "^5.0.5",
"react": "19.2.3", "react": "19.2.3",
"react-dom": "19.2.3", "react-dom": "19.2.3",
"undici": "7.16.0", "undici": "7.18.2",
"zod": "^4.2.1", "zod": "^4.2.1",
"zod-validation-error": "^5.0.0" "zod-validation-error": "^5.0.0"
}, },
+2 -3
View File
@@ -37,11 +37,11 @@
}, },
"prettier": "@homarr/prettier-config", "prettier": "@homarr/prettier-config",
"dependencies": { "dependencies": {
"@libsql/client": "0.15.15",
"@t3-oss/env-nextjs": "^0.13.10", "@t3-oss/env-nextjs": "^0.13.10",
"better-sqlite3": "^12.5.0",
"dns-caching": "^0.2.9", "dns-caching": "^0.2.9",
"drizzle-orm": "^0.45.1", "drizzle-orm": "^0.45.1",
"ioredis": "5.8.2", "ioredis": "5.9.1",
"mysql2": "3.16.0", "mysql2": "3.16.0",
"pg": "^8.16.3", "pg": "^8.16.3",
"superjson": "2.2.6", "superjson": "2.2.6",
@@ -52,7 +52,6 @@
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/better-sqlite3": "7.6.13",
"@types/pg": "^8.16.0", "@types/pg": "^8.16.0",
"eslint": "^9.39.2", "eslint": "^9.39.2",
"typescript": "^5.9.3" "typescript": "^5.9.3"
@@ -1,10 +1,12 @@
import Database from "better-sqlite3"; import { createClient } from "@libsql/client/node";
import { drizzle as drizzleSqlite } from "drizzle-orm/better-sqlite3"; import { drizzle as drizzleSqlite } from "drizzle-orm/libsql";
import { dbEnv } from "../env"; import { dbEnv } from "../env";
import type { SharedDrizzleConfig } from "./shared"; import type { SharedDrizzleConfig } from "./shared";
export const createSqliteDb = <TSchema extends Record<string, unknown>>(config: SharedDrizzleConfig<TSchema>) => { export const createSqliteDb = <TSchema extends Record<string, unknown>>(config: SharedDrizzleConfig<TSchema>) => {
const connection = new Database(dbEnv.URL); const connection = createClient({
url: dbEnv.URL ? `file:${dbEnv.URL}` : ":memory:",
});
return drizzleSqlite<TSchema>(connection, config); return drizzleSqlite<TSchema>(connection, config);
}; };
+1 -1
View File
@@ -41,7 +41,7 @@
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/node-cron": "^3.0.11", "@types/node-cron": "^3.0.11",
"@types/react": "19.2.7", "@types/react": "19.2.8",
"eslint": "^9.39.2", "eslint": "^9.39.2",
"typescript": "^5.9.3" "typescript": "^5.9.3"
} }
+29 -73
View File
@@ -3,7 +3,7 @@ import { env } from "@homarr/common/env";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { EVERY_WEEK } from "@homarr/cron-jobs-core/expressions"; import { EVERY_WEEK } from "@homarr/cron-jobs-core/expressions";
import type { InferInsertModel } from "@homarr/db"; import type { InferInsertModel } from "@homarr/db";
import { db, handleTransactionsAsync, inArray, sql } from "@homarr/db"; import { db, inArray, sql } from "@homarr/db";
import { iconRepositories, icons } from "@homarr/db/schema"; import { iconRepositories, icons } from "@homarr/db/schema";
import { fetchIconsAsync } from "@homarr/icons"; import { fetchIconsAsync } from "@homarr/icons";
@@ -89,81 +89,37 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
(iconRepository) => !repositoryIconGroups.some((group) => group.slug === iconRepository.slug), (iconRepository) => !repositoryIconGroups.some((group) => group.slug === iconRepository.slug),
); );
await handleTransactionsAsync(db, { await db.transaction(async (transaction) => {
async handleAsync(db, schema) { if (newIconRepositories.length >= 1) {
await db.transaction(async (transaction) => { await transaction.insert(iconRepositories).values(newIconRepositories);
if (newIconRepositories.length >= 1) { }
await transaction.insert(schema.iconRepositories).values(newIconRepositories);
}
if (newIcons.length >= 1) { if (newIcons.length >= 1) {
// We only insert 5000 icons at a time to avoid SQLite limitations // We only insert 5000 icons at a time to avoid SQLite limitations
for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) { for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
await transaction.insert(schema.icons).values(chunck); await transaction.insert(icons).values(chunck);
} }
} }
if (deadIcons.length >= 1) { if (deadIcons.length >= 1) {
await transaction.delete(schema.icons).where( await transaction.delete(icons).where(
inArray( inArray(
// Combine iconRepositoryId and checksum to allow same icons on different repositories // Combine iconRepositoryId and checksum to allow same icons on different repositories
sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`, sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`,
deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`), deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`),
), ),
); );
} }
if (deadIconRepositories.length >= 1) { if (deadIconRepositories.length >= 1) {
await transaction.delete(schema.iconRepositories).where( await transaction.delete(iconRepositories).where(
inArray( inArray(
iconRepositories.id, iconRepositories.id,
deadIconRepositories.map((iconRepository) => iconRepository.id), deadIconRepositories.map((iconRepository) => iconRepository.id),
), ),
); );
} }
countDeleted += deadIcons.length; countDeleted += deadIcons.length;
});
},
handleSync() {
db.transaction((transaction) => {
if (newIconRepositories.length >= 1) {
transaction.insert(iconRepositories).values(newIconRepositories).run();
}
if (newIcons.length >= 1) {
// We only insert 5000 icons at a time to avoid SQLite limitations
for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
transaction.insert(icons).values(chunck).run();
}
}
if (deadIcons.length >= 1) {
transaction
.delete(icons)
.where(
inArray(
// Combine iconRepositoryId and checksum to allow same icons on different repositories
sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`,
deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`),
),
)
.run();
}
if (deadIconRepositories.length >= 1) {
transaction
.delete(iconRepositories)
.where(
inArray(
iconRepositories.id,
deadIconRepositories.map((iconRepository) => iconRepository.id),
),
)
.run();
}
countDeleted += deadIcons.length;
});
},
}); });
logger.info("Updated icons in database", { logger.info("Updated icons in database", {
+4 -54
View File
@@ -1,26 +1,15 @@
import type { InferInsertModel } from "drizzle-orm"; import type { InferInsertModel } from "drizzle-orm";
import { objectEntries } from "@homarr/common"; import { objectEntries } from "@homarr/common";
import { dbEnv } from "@homarr/core/infrastructure/db/env";
import type { HomarrDatabase, HomarrDatabaseMysql, HomarrDatabasePostgresql } from "./driver"; import type { HomarrDatabase, HomarrTransaction } from "./driver";
import * as schema from "./schema"; import * as schema from "./schema";
type TableKey = { type TableKey = {
[K in keyof typeof schema]: (typeof schema)[K] extends { _: { brand: "Table" } } ? K : never; [K in keyof typeof schema]: (typeof schema)[K] extends { _: { brand: "Table" } } ? K : never;
}[keyof typeof schema]; }[keyof typeof schema];
export function isMysql(): boolean { export const createDbInsertCollection = <TTableKey extends TableKey>(tablesInInsertOrder: TTableKey[]) => {
return dbEnv.DRIVER === "mysql2";
}
export function isPostgresql(): boolean {
return dbEnv.DRIVER === "node-postgres";
}
export const createDbInsertCollectionForTransaction = <TTableKey extends TableKey>(
tablesInInsertOrder: TTableKey[],
) => {
const context = tablesInInsertOrder.reduce( const context = tablesInInsertOrder.reduce(
(acc, key) => { (acc, key) => {
acc[key] = []; acc[key] = [];
@@ -31,25 +20,10 @@ export const createDbInsertCollectionForTransaction = <TTableKey extends TableKe
return { return {
...context, ...context,
insertAll: (db: HomarrDatabase) => { insertAllAsync: async (db: HomarrDatabase | HomarrTransaction) => {
db.transaction((transaction) => { await db.transaction(async (transaction) => {
for (const [key, values] of objectEntries(context)) { for (const [key, values] of objectEntries(context)) {
if (values.length >= 1) { if (values.length >= 1) {
transaction
.insert(schema[key])
.values(values as never)
.run();
}
}
});
},
// We allow any database that supports async passed here but then fallback to mysql to prevent typescript errors
insertAllAsync: async (db: HomarrDatabaseMysql | HomarrDatabasePostgresql) => {
const innerDb = db as HomarrDatabaseMysql;
await innerDb.transaction(async (transaction) => {
for (const [key, values] of objectEntries(context)) {
if (values.length >= 1) {
// Below is actually the mysqlSchema when the driver is mysql
await transaction.insert(schema[key] as never).values(values as never); await transaction.insert(schema[key] as never).values(values as never);
} }
} }
@@ -57,27 +31,3 @@ export const createDbInsertCollectionForTransaction = <TTableKey extends TableKe
}, },
}; };
}; };
export const createDbInsertCollectionWithoutTransaction = <TTableKey extends TableKey>(
tablesInInsertOrder: TTableKey[],
) => {
const { insertAll, insertAllAsync, ...collection } = createDbInsertCollectionForTransaction(tablesInInsertOrder);
return {
...collection,
insertAllAsync: async (db: HomarrDatabase) => {
switch (dbEnv.DRIVER) {
case "mysql2":
case "node-postgres":
// For mysql2 and node-postgres, we can use the async insertAllAsync method
await insertAllAsync(db as unknown as HomarrDatabaseMysql | HomarrDatabasePostgresql);
return;
default:
// For better-sqlite3, we need to use the synchronous insertAll method
// default assumes better-sqlite3. It's original implementation.
insertAll(db);
break;
}
},
};
};
+1 -1
View File
@@ -7,6 +7,6 @@ export default {
dialect: "sqlite", dialect: "sqlite",
schema: "./schema", schema: "./schema",
casing: DB_CASING, casing: DB_CASING,
dbCredentials: { url: dbEnv.URL }, dbCredentials: { url: `file:${dbEnv.URL}` },
out: "./migrations/sqlite", out: "./migrations/sqlite",
} satisfies Config; } satisfies Config;
+4 -2
View File
@@ -1,4 +1,5 @@
import type { BetterSQLite3Database } from "drizzle-orm/better-sqlite3"; import type { ExtractTablesWithRelations } from "drizzle-orm";
import type { LibSQLDatabase, LibSQLTransaction } from "drizzle-orm/libsql";
import type { MySql2Database } from "drizzle-orm/mysql2"; import type { MySql2Database } from "drizzle-orm/mysql2";
import type { NodePgDatabase } from "drizzle-orm/node-postgres"; import type { NodePgDatabase } from "drizzle-orm/node-postgres";
@@ -6,6 +7,7 @@ import type * as mysqlSchema from "./schema/mysql";
import type * as pgSchema from "./schema/postgresql"; import type * as pgSchema from "./schema/postgresql";
import type * as sqliteSchema from "./schema/sqlite"; import type * as sqliteSchema from "./schema/sqlite";
export type HomarrDatabase = BetterSQLite3Database<typeof sqliteSchema>; export type HomarrDatabase = LibSQLDatabase<typeof sqliteSchema>;
export type HomarrTransaction = LibSQLTransaction<typeof sqliteSchema, ExtractTablesWithRelations<typeof sqliteSchema>>;
export type HomarrDatabaseMysql = MySql2Database<typeof mysqlSchema>; export type HomarrDatabaseMysql = MySql2Database<typeof mysqlSchema>;
export type HomarrDatabasePostgresql = NodePgDatabase<typeof pgSchema>; export type HomarrDatabasePostgresql = NodePgDatabase<typeof pgSchema>;
-2
View File
@@ -8,5 +8,3 @@ export type { HomarrDatabaseMysql, HomarrDatabasePostgresql } from "./driver";
export const db = createDb(schema); export const db = createDb(schema);
export type Database = typeof db; export type Database = typeof db;
export { handleDiffrentDbDriverOperationsAsync as handleTransactionsAsync } from "./transactions";
+2 -2
View File
@@ -1,4 +1,4 @@
import { migrate } from "drizzle-orm/better-sqlite3/migrator"; import { migrate } from "drizzle-orm/libsql/migrator";
import { createSharedDbConfig, createSqliteDb } from "@homarr/core/infrastructure/db"; import { createSharedDbConfig, createSqliteDb } from "@homarr/core/infrastructure/db";
@@ -12,7 +12,7 @@ const migrateAsync = async () => {
const config = createSharedDbConfig(sqliteSchema); const config = createSharedDbConfig(sqliteSchema);
const db = createSqliteDb(config); const db = createSqliteDb(config);
migrate(db, { migrationsFolder }); await migrate(db, { migrationsFolder });
await seedDataAsync(db); await seedDataAsync(db);
await applyCustomMigrationsAsync(db); await applyCustomMigrationsAsync(db);
+2 -3
View File
@@ -47,11 +47,11 @@
"@homarr/core": "workspace:^0.1.0", "@homarr/core": "workspace:^0.1.0",
"@homarr/definitions": "workspace:^0.1.0", "@homarr/definitions": "workspace:^0.1.0",
"@homarr/server-settings": "workspace:^0.1.0", "@homarr/server-settings": "workspace:^0.1.0",
"@mantine/core": "^8.3.10", "@libsql/client": "0.15.15",
"@mantine/core": "^8.3.12",
"@paralleldrive/cuid2": "^3.1.0", "@paralleldrive/cuid2": "^3.1.0",
"@testcontainers/mysql": "^11.11.0", "@testcontainers/mysql": "^11.11.0",
"@testcontainers/postgresql": "^11.11.0", "@testcontainers/postgresql": "^11.11.0",
"better-sqlite3": "^12.5.0",
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"drizzle-kit": "^0.31.8", "drizzle-kit": "^0.31.8",
"drizzle-orm": "^0.45.1", "drizzle-orm": "^0.45.1",
@@ -64,7 +64,6 @@
"@homarr/eslint-config": "workspace:^0.2.0", "@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0", "@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0", "@homarr/tsconfig": "workspace:^0.1.0",
"@types/better-sqlite3": "7.6.13",
"@types/pg": "^8.16.0", "@types/pg": "^8.16.0",
"dotenv-cli": "^11.0.0", "dotenv-cli": "^11.0.0",
"esbuild": "^0.27.2", "esbuild": "^0.27.2",
+8 -6
View File
@@ -1,15 +1,17 @@
import Database from "better-sqlite3"; import { createClient } from "@libsql/client/node";
import { drizzle } from "drizzle-orm/better-sqlite3"; import { drizzle } from "drizzle-orm/libsql";
import { migrate } from "drizzle-orm/better-sqlite3/migrator"; import { migrate } from "drizzle-orm/libsql/migrator";
import { DB_CASING } from "@homarr/core/infrastructure/db/constants"; import { DB_CASING } from "@homarr/core/infrastructure/db/constants";
import * as sqliteSchema from "../schema/sqlite"; import * as sqliteSchema from "../schema/sqlite";
export const createDb = (debug?: boolean) => { export const createDbAsync = async (debug?: boolean) => {
const sqlite = new Database(":memory:"); const sqlite = createClient({
url: ":memory:",
});
const db = drizzle(sqlite, { schema: sqliteSchema, logger: debug, casing: DB_CASING }); const db = drizzle(sqlite, { schema: sqliteSchema, logger: debug, casing: DB_CASING });
migrate(db, { await migrate(db, {
migrationsFolder: "./packages/db/migrations/sqlite", migrationsFolder: "./packages/db/migrations/sqlite",
}); });
-23
View File
@@ -1,23 +0,0 @@
import { isMysql, isPostgresql } from "./collection";
import type { HomarrDatabase, HomarrDatabaseMysql } from "./driver";
import type { MySqlSchema } from "./schema";
import * as schema from "./schema";
interface HandleTransactionInput {
handleAsync: (db: HomarrDatabaseMysql, schema: MySqlSchema) => Promise<void>;
handleSync: (db: HomarrDatabase) => void;
}
/**
* The below method is mostly used to handle transactions in different database drivers.
* As better-sqlite3 transactions have to be synchronous, we have to implement them in a different way.
* But it can also generally be used when dealing with different database drivers.
*/
export const handleDiffrentDbDriverOperationsAsync = async (db: HomarrDatabase, input: HandleTransactionInput) => {
if (isMysql() || isPostgresql()) {
// Schema type is always the correct one based on env variables
await input.handleAsync(db as unknown as HomarrDatabaseMysql, schema as unknown as MySqlSchema);
} else {
input.handleSync(db);
}
};
+1 -1
View File
@@ -26,7 +26,7 @@
"@homarr/common": "workspace:^0.1.0", "@homarr/common": "workspace:^0.1.0",
"@homarr/translation": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"@mantine/form": "^8.3.10", "@mantine/form": "^8.3.12",
"mantine-form-zod-resolver": "^1.3.0", "mantine-form-zod-resolver": "^1.3.0",
"zod": "^4.2.1" "zod": "^4.2.1"
}, },
+1 -1
View File
@@ -30,7 +30,7 @@
"@homarr/translation": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"@mantine/core": "^8.3.10", "@mantine/core": "^8.3.12",
"react": "19.2.3", "react": "19.2.3",
"zod": "^4.2.1" "zod": "^4.2.1"
}, },
+1 -1
View File
@@ -46,7 +46,7 @@
"octokit": "^5.0.5", "octokit": "^5.0.5",
"proxmox-api": "1.1.1", "proxmox-api": "1.1.1",
"tsdav": "^2.1.6", "tsdav": "^2.1.6",
"undici": "7.16.0", "undici": "7.18.2",
"xml2js": "^0.6.2", "xml2js": "^0.6.2",
"zod": "^4.2.1" "zod": "^4.2.1"
}, },
+2 -2
View File
@@ -2,7 +2,7 @@ import type { StartedTestContainer } from "testcontainers";
import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers"; import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers";
import { beforeAll, describe, expect, test, vi } from "vitest"; import { beforeAll, describe, expect, test, vi } from "vitest";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { Aria2Integration } from "../src"; import { Aria2Integration } from "../src";
@@ -11,7 +11,7 @@ vi.mock("@homarr/db", async (importActual) => {
const actual = await importActual<typeof import("@homarr/db")>(); const actual = await importActual<typeof import("@homarr/db")>();
return { return {
...actual, ...actual,
db: createDb(), db: await createDbAsync(),
}; };
}); });
vi.mock("@homarr/core/infrastructure/certificates", async (importActual) => { vi.mock("@homarr/core/infrastructure/certificates", async (importActual) => {
+2 -2
View File
@@ -1,7 +1,7 @@
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import { ResponseError } from "@homarr/common/server"; import { ResponseError } from "@homarr/common/server";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import type { IntegrationTestingInput } from "../src/base/integration"; import type { IntegrationTestingInput } from "../src/base/integration";
import { Integration } from "../src/base/integration"; import { Integration } from "../src/base/integration";
@@ -12,7 +12,7 @@ vi.mock("@homarr/db", async (importActual) => {
const actual = await importActual<typeof import("@homarr/db")>(); const actual = await importActual<typeof import("@homarr/db")>();
return { return {
...actual, ...actual,
db: createDb(), db: await createDbAsync(),
}; };
}); });
@@ -3,7 +3,7 @@ import type { StartedTestContainer } from "testcontainers";
import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers"; import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers";
import { beforeAll, describe, expect, test, vi } from "vitest"; import { beforeAll, describe, expect, test, vi } from "vitest";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { HomeAssistantIntegration } from "../src"; import { HomeAssistantIntegration } from "../src";
import { TestConnectionError } from "../src/base/test-connection/test-connection-error"; import { TestConnectionError } from "../src/base/test-connection/test-connection-error";
@@ -13,7 +13,7 @@ vi.mock("@homarr/db", async (importActual) => {
const actual = await importActual<typeof import("@homarr/db")>(); const actual = await importActual<typeof import("@homarr/db")>();
return { return {
...actual, ...actual,
db: createDb(), db: await createDbAsync(),
}; };
}); });
+2 -2
View File
@@ -4,7 +4,7 @@ import type { StartedTestContainer } from "testcontainers";
import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers"; import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "testcontainers";
import { beforeAll, describe, expect, test, vi } from "vitest"; import { beforeAll, describe, expect, test, vi } from "vitest";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { NzbGetIntegration } from "../src"; import { NzbGetIntegration } from "../src";
import { TestConnectionError } from "../src/base/test-connection/test-connection-error"; import { TestConnectionError } from "../src/base/test-connection/test-connection-error";
@@ -14,7 +14,7 @@ vi.mock("@homarr/db", async (importActual) => {
const actual = await importActual<typeof import("@homarr/db")>(); const actual = await importActual<typeof import("@homarr/db")>();
return { return {
...actual, ...actual,
db: createDb(), db: await createDbAsync(),
}; };
}); });
+2 -2
View File
@@ -2,7 +2,7 @@ import type { StartedTestContainer } from "testcontainers";
import { GenericContainer, Wait } from "testcontainers"; import { GenericContainer, Wait } from "testcontainers";
import { describe, expect, test, vi } from "vitest"; import { describe, expect, test, vi } from "vitest";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { PiHoleIntegrationV5, PiHoleIntegrationV6 } from "../src"; import { PiHoleIntegrationV5, PiHoleIntegrationV6 } from "../src";
import type { SessionStore } from "../src/base/session-store"; import type { SessionStore } from "../src/base/session-store";
@@ -13,7 +13,7 @@ vi.mock("@homarr/db", async (importActual) => {
const actual = await importActual<typeof import("@homarr/db")>(); const actual = await importActual<typeof import("@homarr/db")>();
return { return {
...actual, ...actual,
db: createDb(), db: await createDbAsync(),
}; };
}); });
+2 -2
View File
@@ -3,7 +3,7 @@ import { GenericContainer, getContainerRuntimeClient, ImageName, Wait } from "te
import type { StartedTestContainer } from "testcontainers"; import type { StartedTestContainer } from "testcontainers";
import { beforeAll, describe, expect, test, vi } from "vitest"; import { beforeAll, describe, expect, test, vi } from "vitest";
import { createDb } from "@homarr/db/test"; import { createDbAsync } from "@homarr/db/test";
import { SabnzbdIntegration } from "../src"; import { SabnzbdIntegration } from "../src";
import { TestConnectionError } from "../src/base/test-connection/test-connection-error"; import { TestConnectionError } from "../src/base/test-connection/test-connection-error";
@@ -14,7 +14,7 @@ vi.mock("@homarr/db", async (importActual) => {
const actual = await importActual<typeof import("@homarr/db")>(); const actual = await importActual<typeof import("@homarr/db")>();
return { return {
...actual, ...actual,
db: createDb(), db: await createDbAsync(),
}; };
}); });
+1 -1
View File
@@ -33,7 +33,7 @@
"@homarr/translation": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"@mantine/core": "^8.3.10", "@mantine/core": "^8.3.12",
"@tabler/icons-react": "^3.36.1", "@tabler/icons-react": "^3.36.1",
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
"next": "16.1.1", "next": "16.1.1",
+2 -2
View File
@@ -24,8 +24,8 @@
"dependencies": { "dependencies": {
"@homarr/translation": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@mantine/core": "^8.3.10", "@mantine/core": "^8.3.12",
"@mantine/hooks": "^8.3.10", "@mantine/hooks": "^8.3.12",
"react": "19.2.3" "react": "19.2.3"
}, },
"devDependencies": { "devDependencies": {
+1 -1
View File
@@ -24,7 +24,7 @@
"prettier": "@homarr/prettier-config", "prettier": "@homarr/prettier-config",
"dependencies": { "dependencies": {
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@mantine/notifications": "^8.3.10", "@mantine/notifications": "^8.3.12",
"@tabler/icons-react": "^3.36.1" "@tabler/icons-react": "^3.36.1"
}, },
"devDependencies": { "devDependencies": {
+2 -2
View File
@@ -37,8 +37,8 @@
"@homarr/translation": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0", "@homarr/validation": "workspace:^0.1.0",
"@mantine/core": "^8.3.10", "@mantine/core": "^8.3.12",
"@mantine/hooks": "^8.3.10", "@mantine/hooks": "^8.3.12",
"adm-zip": "0.5.16", "adm-zip": "0.5.16",
"next": "16.1.1", "next": "16.1.1",
"react": "19.2.3", "react": "19.2.3",
@@ -1,6 +1,6 @@
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 { createDbInsertCollectionForTransaction } from "@homarr/db/collection"; import { createDbInsertCollection } from "@homarr/db/collection";
import type { BoardSize, OldmarrConfig } from "@homarr/old-schema"; import type { BoardSize, OldmarrConfig } from "@homarr/old-schema";
import { boardSizes, getBoardSizeName } from "@homarr/old-schema"; import { boardSizes, getBoardSizeName } from "@homarr/old-schema";
@@ -21,14 +21,7 @@ export const createBoardInsertCollection = (
{ preparedApps, preparedBoards }: Omit<ReturnType<typeof prepareMultipleImports>, "preparedIntegrations">, { preparedApps, preparedBoards }: Omit<ReturnType<typeof prepareMultipleImports>, "preparedIntegrations">,
settings: InitialOldmarrImportSettings, settings: InitialOldmarrImportSettings,
) => { ) => {
const insertCollection = createDbInsertCollectionForTransaction([ const insertCollection = createDbInsertCollection(["apps", "boards", "layouts", "sections", "items", "itemLayouts"]);
"apps",
"boards",
"layouts",
"sections",
"items",
"itemLayouts",
]);
logger.info("Preparing boards for insert collection"); logger.info("Preparing boards for insert collection");
const appsMap = new Map( const appsMap = new Map(
@@ -1,6 +1,6 @@
import { encryptSecret } from "@homarr/common/server"; import { encryptSecret } from "@homarr/common/server";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { createDbInsertCollectionForTransaction } from "@homarr/db/collection"; import { createDbInsertCollection } from "@homarr/db/collection";
import { mapAndDecryptIntegrations } from "../../mappers/map-integration"; import { mapAndDecryptIntegrations } from "../../mappers/map-integration";
import type { PreparedIntegration } from "../../prepare/prepare-integrations"; import type { PreparedIntegration } from "../../prepare/prepare-integrations";
@@ -11,7 +11,7 @@ export const createIntegrationInsertCollection = (
preparedIntegrations: PreparedIntegration[], preparedIntegrations: PreparedIntegration[],
encryptionToken: string | null | undefined, encryptionToken: string | null | undefined,
) => { ) => {
const insertCollection = createDbInsertCollectionForTransaction(["integrations", "integrationSecrets"]); const insertCollection = createDbInsertCollection(["integrations", "integrationSecrets"]);
if (preparedIntegrations.length === 0) { if (preparedIntegrations.length === 0) {
return insertCollection; return insertCollection;
@@ -1,6 +1,6 @@
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 { createDbInsertCollectionForTransaction } from "@homarr/db/collection"; import { createDbInsertCollection } from "@homarr/db/collection";
import { credentialsAdminGroup } from "@homarr/definitions"; import { credentialsAdminGroup } from "@homarr/definitions";
import { mapAndDecryptUsers } from "../../mappers/map-user"; import { mapAndDecryptUsers } from "../../mappers/map-user";
@@ -12,12 +12,7 @@ export const createUserInsertCollection = (
importUsers: OldmarrImportUser[], importUsers: OldmarrImportUser[],
encryptionToken: string | null | undefined, encryptionToken: string | null | undefined,
) => { ) => {
const insertCollection = createDbInsertCollectionForTransaction([ const insertCollection = createDbInsertCollection(["users", "groups", "groupMembers", "groupPermissions"]);
"users",
"groups",
"groupMembers",
"groupPermissions",
]);
if (importUsers.length === 0) { if (importUsers.length === 0) {
return insertCollection; return insertCollection;
@@ -2,7 +2,6 @@ import type { z } from "zod/v4";
import { Stopwatch } from "@homarr/common"; import { Stopwatch } from "@homarr/common";
import { createLogger } from "@homarr/core/infrastructure/logs"; import { createLogger } from "@homarr/core/infrastructure/logs";
import { handleTransactionsAsync } from "@homarr/db";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { analyseOldmarrImportAsync } from "../analyse/analyse-oldmarr-import"; import { analyseOldmarrImportAsync } from "../analyse/analyse-oldmarr-import";
@@ -37,21 +36,10 @@ export const importInitialOldmarrAsync = async (
logger.info("Inserting import data to database"); logger.info("Inserting import data to database");
await handleTransactionsAsync(db, { await db.transaction(async (transaction) => {
async handleAsync(db) { await boardInsertCollection.insertAllAsync(transaction);
await db.transaction(async (transaction) => { await userInsertCollection.insertAllAsync(transaction);
await boardInsertCollection.insertAllAsync(transaction); await integrationInsertCollection.insertAllAsync(transaction);
await userInsertCollection.insertAllAsync(transaction);
await integrationInsertCollection.insertAllAsync(transaction);
});
},
handleSync(db) {
db.transaction((transaction) => {
boardInsertCollection.insertAll(transaction);
userInsertCollection.insertAll(transaction);
integrationInsertCollection.insertAll(transaction);
});
},
}); });
logger.info("Import successful", { duration: stopwatch.getElapsedInHumanWords() }); logger.info("Import successful", { duration: stopwatch.getElapsedInHumanWords() });
@@ -1,5 +1,5 @@
import { handleTransactionsAsync, inArray } from "@homarr/db";
import type { Database } from "@homarr/db"; import type { Database } from "@homarr/db";
import { inArray } from "@homarr/db";
import { apps } from "@homarr/db/schema"; import { apps } from "@homarr/db/schema";
import type { OldmarrConfig } from "@homarr/old-schema"; import type { OldmarrConfig } from "@homarr/old-schema";
@@ -31,12 +31,5 @@ export const importSingleOldmarrConfigAsync = async (
const boardInsertCollection = createBoardInsertCollection({ preparedApps, preparedBoards }, settings); const boardInsertCollection = createBoardInsertCollection({ preparedApps, preparedBoards }, settings);
await handleTransactionsAsync(db, { await boardInsertCollection.insertAllAsync(db);
async handleAsync(db) {
await boardInsertCollection.insertAllAsync(db);
},
handleSync(db) {
boardInsertCollection.insertAll(db);
},
});
}; };
+1 -1
View File
@@ -26,7 +26,7 @@
"@homarr/core": "workspace:^", "@homarr/core": "workspace:^",
"@homarr/db": "workspace:^", "@homarr/db": "workspace:^",
"@homarr/definitions": "workspace:^", "@homarr/definitions": "workspace:^",
"ioredis": "5.8.2", "ioredis": "5.9.1",
"superjson": "2.2.6" "superjson": "2.2.6"
}, },
"devDependencies": { "devDependencies": {
+1 -1
View File
@@ -33,7 +33,7 @@
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
"octokit": "^5.0.5", "octokit": "^5.0.5",
"superjson": "2.2.6", "superjson": "2.2.6",
"undici": "7.16.0", "undici": "7.18.2",
"zod": "^4.2.1" "zod": "^4.2.1"
}, },
"devDependencies": { "devDependencies": {
+1 -1
View File
@@ -25,7 +25,7 @@
"dependencies": { "dependencies": {
"@homarr/db": "workspace:^0.1.0", "@homarr/db": "workspace:^0.1.0",
"@homarr/server-settings": "workspace:^0.1.0", "@homarr/server-settings": "workspace:^0.1.0",
"@mantine/dates": "^8.3.10", "@mantine/dates": "^8.3.12",
"next": "16.1.1", "next": "16.1.1",
"react": "19.2.3", "react": "19.2.3",
"react-dom": "19.2.3" "react-dom": "19.2.3"
+3 -3
View File
@@ -33,9 +33,9 @@
"@homarr/settings": "workspace:^0.1.0", "@homarr/settings": "workspace:^0.1.0",
"@homarr/translation": "workspace:^0.1.0", "@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0", "@homarr/ui": "workspace:^0.1.0",
"@mantine/core": "^8.3.10", "@mantine/core": "^8.3.12",
"@mantine/hooks": "^8.3.10", "@mantine/hooks": "^8.3.12",
"@mantine/spotlight": "^8.3.10", "@mantine/spotlight": "^8.3.12",
"@tabler/icons-react": "^3.36.1", "@tabler/icons-react": "^3.36.1",
"jotai": "^2.16.1", "jotai": "^2.16.1",
"next": "16.1.1", "next": "16.1.1",
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "用户",
"enableGravatar": {
"label": "启用Gravatar",
"description": "未设置自定义头像时,若用户有邮箱,则自动采用其 Libravatar/Gravatar 头像"
}
},
"search": { "search": {
"title": "搜索", "title": "搜索",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "crwdns3822:0crwdne3822:0",
"enableGravatar": {
"label": "crwdns3824:0crwdne3824:0",
"description": "crwdns3826:0crwdne3826:0"
}
},
"search": { "search": {
"title": "crwdns2550:0crwdne2550:0", "title": "crwdns2550:0crwdne2550:0",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Søg", "title": "Søg",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Suche", "title": "Suche",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Suche", "title": "Suche",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Buscar", "title": "Buscar",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+8 -1
View File
@@ -2,7 +2,7 @@
"init": { "init": {
"step": { "step": {
"start": { "start": {
"title": "Bienvenue dans Homarr", "title": "Bienvenue sur Homarr",
"subtitle": "Commençons par configurer votre instance Homarr.", "subtitle": "Commençons par configurer votre instance Homarr.",
"description": "Pour commencer, veuillez selectionner comment vous souhaitez configurer votre instance Homarr.", "description": "Pour commencer, veuillez selectionner comment vous souhaitez configurer votre instance Homarr.",
"action": { "action": {
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "Utilisateurs",
"enableGravatar": {
"label": "Activer Gravatar",
"description": "Revient aux avatars des utilisateurs de Libravatar/Gravatar quand aucun avatar personnalisé n'est défini et qu'un e-mail est configuré"
}
},
"search": { "search": {
"title": "Rechercher", "title": "Rechercher",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "חיפוש", "title": "חיפוש",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "Utenti",
"enableGravatar": {
"label": "Abilita Gravatar",
"description": "Torna agli avatar degli utenti da Libravatar/Gravatar quando non è impostato alcun avatar personalizzato e viene configurata un'email"
}
},
"search": { "search": {
"title": "Cerca", "title": "Cerca",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "検索", "title": "検索",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Zoeken", "title": "Zoeken",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "Brukere",
"enableGravatar": {
"label": "Aktiver Gravatar",
"description": "Bruker avatarer fra Libravatar/Gravatar som reserve når ingen egendefinert avatar er angitt og en e-post er konfigurert"
}
},
"search": { "search": {
"title": "Søk", "title": "Søk",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Szukaj", "title": "Szukaj",
"defaultSearchEngine": { "defaultSearchEngine": {
+13 -6
View File
@@ -491,24 +491,24 @@
"message": "Permissões foram salvas com sucesso" "message": "Permissões foram salvas com sucesso"
}, },
"error": { "error": {
"title": "", "title": "Permissões não salvas",
"message": "" "message": "As permissões não foram salvas"
} }
} }
}, },
"update": { "update": {
"notification": { "notification": {
"success": { "success": {
"message": "" "message": "O grupo {name} foi salvo com sucesso"
}, },
"error": { "error": {
"message": "" "message": "Não é possível salvar o grupo {name}"
} }
} }
}, },
"select": { "select": {
"label": "", "label": "Selecionar grupo",
"notFound": "" "notFound": "Nenhum grupo encontrado"
}, },
"settings": { "settings": {
"board": { "board": {
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Поиск", "title": "Поиск",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Hladať", "title": "Hladať",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "", "title": "",
"defaultSearchEngine": { "defaultSearchEngine": {
+7
View File
@@ -3294,6 +3294,13 @@
} }
} }
}, },
"user": {
"title": "",
"enableGravatar": {
"label": "",
"description": ""
}
},
"search": { "search": {
"title": "Sökning", "title": "Sökning",
"defaultSearchEngine": { "defaultSearchEngine": {
Loaded 100 of 110 files, more files were not shown because too many files have changed in this diff. Show more