Compare commits

...
Author SHA1 Message Date
Meier Lukas 6143e25686 feat: add recommended badge 2025-11-30 17:33:33 +01:00
Meier Lukas 384d83ef76 fix: export apply auto layout from client export instead 2025-11-30 17:33:15 +01:00
Meier Lukas 998161b1d9 fix: import 2025-11-30 17:00:13 +01:00
Meier Lukas a6e060265a fix: typecheck issue 2025-11-30 16:57:24 +01:00
Meier Lukas d8b278d716 fix: adjust grid-algorithm to reposition from less columns 2025-11-29 23:59:26 +01:00
Meier Lukas 813a91cb01 feat: add layout fields to board settings 2025-11-29 18:52:30 +01:00
Meier Lukas 990452a877 wip: load board with automatic size and position for non base layouts 2025-11-29 15:14:29 +01:00
Meier Lukas 0165e2e415 Merge branch 'dev' into add-auto-layout-mode 2025-11-29 13:30:04 +01:00
homarr-crowdin[bot] ed31e32150 chore(lang): updated translations from crowdin
Co-authored-by: Crowdin Homarr <190541745+homarr-crowdin[bot]@users.noreply.github.com>
2025-11-29 00:50:15 +00:00
Releases Homarr d07730b5f8 chore(release): 1.45.0 [skip ci] 2025-11-28 19:15:49 +00:00
homarr-releases[bot] 681236ec3b chore(release): automatic release v1.45.0 2025-11-28 19:14:48 +00:00
Meier Lukas 524e1a485b fix(security): restrict modification of entrypoint script (#4555) 2025-11-28 18:34:51 +01:00
homarr-renovate[bot] 2bc6964f7e fix(deps): update dependency next-intl to v4.5.5 (#4542)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-28 17:27:04 +00:00
Meier Lukas 21de817dba chore(deps): security hardening (#4551) 2025-11-28 18:09:10 +01:00
homarr-update-contributors[bot] b15d96e8dd chore: update contributors (#4554)
Co-authored-by: Homarr Update Contributors <210161987+homarr-update-contributors[bot]@users.noreply.github.com>
2025-11-28 12:36:13 +00:00
Meier Lukas 514c6edc8f feat(api): use fields in board creation 2025-11-27 17:30:02 +01:00
Noah Croghan 99949fe095 fix: Add fallback when no icon in Minecraft Server widget (#4544) (#4545) 2025-11-27 17:06:31 +01:00
Meier Lukas fdcfb775fa feat(boards): add columns for base layout and layout mode 2025-11-26 22:14:06 +01:00
Meier Lukas 0843ccda99 feat(boards): add form logic and translations to board create modal 2025-11-26 18:38:32 +01:00
Meier Lukas 2b6eb88a53 feat(boards): add layout mode selection to new board modal 2025-11-26 18:22:21 +01:00
Meier Lukas e65c3cd801 feat(ui): add reusable radio card from mantine
see https://mantine.dev/core/radio/#radiocard-component
2025-11-26 18:21:07 +01:00
homarr-crowdin[bot] 85d4931538 chore(lang): updated translations from crowdin
Co-authored-by: Crowdin Homarr <190541745+homarr-crowdin[bot]@users.noreply.github.com>
2025-11-26 00:52:18 +00:00
homarr-renovate[bot] 77a86ead41 fix(deps): update dependency next-intl to v4.5.4 (#4540)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-24 13:02:10 +00:00
homarr-renovate[bot] 27ca124d2a chore(deps): update dependency rollup@&gt;&#x3d;4.0.0 &lt;4.22.4 to >=4.53.3 (#4537)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-24 09:51:55 +00:00
homarr-renovate[bot] 3ca6cb18eb chore(deps): update dependency @types/dockerode to ^3.3.47 (#4539)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-24 09:39:01 +00:00
homarr-crowdin[bot] 245bab7cdd chore(lang): updated translations from crowdin
Co-authored-by: Crowdin Homarr <190541745+homarr-crowdin[bot]@users.noreply.github.com>
2025-11-24 00:56:25 +00:00
homarr-renovate[bot] 18a6bfd69d fix(deps): update dependency glob to v12 (#4530)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-23 20:07:39 +01:00
homarr-renovate[bot] c4e6528e6c chore(deps): update dependency @types/react to v19.2.6 (#4532)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-23 04:47:11 +00:00
homarr-renovate[bot] 24c985424e fix(deps): update dependency glob to ^11.1.0 (#4529)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-23 04:06:56 +00:00
homarr-renovate[bot] 292e36fec5 fix(deps): update dependency sass to ^1.94.1 (#4531)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-23 02:19:13 +00:00
homarr-renovate[bot] 7eee48ae88 chore(deps): update vitest monorepo to ^4.0.10 (#4528)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-22 13:34:54 +00:00
homarr-renovate[bot] 1b09b588f3 chore(deps): update dependency form-data@&gt;&#x3d;4.0.0 &lt;4.0.4 to >=4.0.5 (#4525)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-22 10:42:15 +00:00
ManuelandCopilot Autofix powered by AI 22fb696f25 ci(security): missing permissions for workflow (#4474)
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-11-22 10:39:45 +00:00
generalmat82andMeier Lukas 60ab98ae36 feat(docker): hide containers with label homarr.hide (#4506)
Co-authored-by: Meier Lukas <meierschlumpf@gmail.com>
2025-11-22 11:32:31 +01:00
homarr-renovate[bot] 9a3feb404c fix(deps): update dependency zod-validation-error to v5 (#4437)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-22 10:35:43 +01:00
homarr-renovate[bot] 9c5c4f33ef chore(deps): update node.js to v24.11.1 (#4502)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-22 10:34:17 +01:00
homarr-crowdin[bot] 3ec0c4097a chore(lang): updated translations from crowdin
Co-authored-by: Crowdin Homarr <190541745+homarr-crowdin[bot]@users.noreply.github.com>
2025-11-22 00:49:38 +00:00
homarr-renovate[bot] e87170ae6e fix(deps): update dependency @tanstack/react-query to ^5.90.10 (#4523)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-21 21:29:15 +00:00
Meier Lukas 30fedcb6f1 chore: update bug-report template 2025-11-21 22:14:37 +01:00
Releases Homarr 6cc1209fc0 chore(release): 1.44.0 [skip ci] 2025-11-21 19:17:06 +00:00
homarr-releases[bot] 2b8fdc0281 chore(release): automatic release v1.44.0 2025-11-21 19:16:09 +00:00
Meier Lukas d9cc35b985 fix(media-requests): incorrect availability mapping (#4520) 2025-11-21 19:05:51 +01:00
Meier Lukas 5a418d73bd fix(iframe): allow clicking links within (#4521) 2025-11-21 19:05:24 +01:00
homarr-renovate[bot] ded4e72e54 fix(deps): update mantine monorepo to ^8.3.8 (#4516)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-20 11:30:16 +00:00
homarr-renovate[bot] de3602da84 chore(deps): update dependency @semantic-release/npm to ^13.1.2 (#4513)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-19 23:30:39 +00:00
homarr-renovate[bot] c80075f1c3 chore(deps): update dependency @types/react to v19.2.5 (#4515)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-19 22:32:13 +00:00
homarr-renovate[bot] be52cb82fd chore(deps): update vitest monorepo to ^4.0.9 (#4509)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-19 21:28:39 +00:00
homarr-renovate[bot] 9304d73054 chore(deps): update dependency hono@&lt;4.6.5 to >=4.10.6 (#4512)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-19 21:27:46 +00:00
homarr-renovate[bot] 912f9ff884 chore(deps): update dependency @types/dockerode to ^3.3.46 (#4514)
Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>
2025-11-19 20:33:11 +00:00
106 changed files with 7997 additions and 1055 deletions

No files matched your search

+1
View File
@@ -33,6 +33,7 @@ body:
options:
# The below comment is used to insert a new version with on-release.yml
#NEXT_VERSION#
- 1.44.0
- 1.43.1
- 1.43.0
- 1.42.1
+15
View File
@@ -15,6 +15,21 @@
matchUpdateTypes: ["minor", "patch", "pin", "digest"],
automerge: true,
},
{
// disallow automerge for onlyBuiltDependencies
matchPackageNames: [
"@tree-sitter-grammars/tree-sitter-yaml",
"bcrypt",
"better-sqlite3",
"cpu-features",
"esbuild",
"sharp",
"ssh2",
"tree-sitter",
"tree-sitter-json",
],
automerge: false,
},
],
updateInternalDeps: true,
rangeStrategy: "bump",
+2
View File
@@ -1,4 +1,6 @@
name: "[Quality] Code Analysis"
permissions:
contents: read
on:
pull_request:
+2
View File
@@ -1,4 +1,6 @@
name: "[Crowdin] Upload translations"
permissions:
contents: read
on:
workflow_dispatch:
@@ -9,6 +9,8 @@ env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CROWDIN_TOKEN: "${{ secrets.CROWDIN_UPDATE_CONTRIBUTORS_TOKEN }}"
permissions:
contents: read
jobs:
update-contributors:
runs-on: ubuntu-latest
+1
View File
@@ -3,3 +3,4 @@
# @link https://docs.expo.dev/guides/monorepos/#common-issues
node-linker=hoisted
strict-peer-dependencies=false
engine-strict=true
+41
View File
@@ -1,3 +1,44 @@
## [1.45.0](https://github.com/homarr-labs/homarr/compare/v1.44.0...v1.45.0) (2025-11-28)
### Features
* **docker:** hide containers with label homarr.hide ([#4506](https://github.com/homarr-labs/homarr/issues/4506)) ([60ab98a](https://github.com/homarr-labs/homarr/commit/60ab98ae36abe712c825f7828394d3e3e98c888a))
### Bug Fixes
* Add fallback when no icon in Minecraft Server widget ([#4544](https://github.com/homarr-labs/homarr/issues/4544)) ([#4545](https://github.com/homarr-labs/homarr/issues/4545)) ([99949fe](https://github.com/homarr-labs/homarr/commit/99949fe095ac5a3616c8e9c1964d7eb253c9f826))
* **deps:** update dependency @tanstack/react-query to ^5.90.10 ([#4523](https://github.com/homarr-labs/homarr/issues/4523)) ([e87170a](https://github.com/homarr-labs/homarr/commit/e87170ae6e56cdbeef52e943353060329c39bdc9))
* **deps:** update dependency glob to ^11.1.0 ([#4529](https://github.com/homarr-labs/homarr/issues/4529)) ([24c9854](https://github.com/homarr-labs/homarr/commit/24c985424ecc795eb96b56881a9b00c0c37386c1))
* **deps:** update dependency glob to v12 ([#4530](https://github.com/homarr-labs/homarr/issues/4530)) ([18a6bfd](https://github.com/homarr-labs/homarr/commit/18a6bfd69d86de8c58dbfe6dc8b8fab78b2b5ee6))
* **deps:** update dependency next-intl to v4.5.4 ([#4540](https://github.com/homarr-labs/homarr/issues/4540)) ([77a86ea](https://github.com/homarr-labs/homarr/commit/77a86ead41c0d098987561249203667ac4d88177))
* **deps:** update dependency next-intl to v4.5.5 ([#4542](https://github.com/homarr-labs/homarr/issues/4542)) ([2bc6964](https://github.com/homarr-labs/homarr/commit/2bc6964f7efb5203f626d2f07b847dffd53191f0))
* **deps:** update dependency sass to ^1.94.1 ([#4531](https://github.com/homarr-labs/homarr/issues/4531)) ([292e36f](https://github.com/homarr-labs/homarr/commit/292e36fec5acff9b1d143f19e18ea170c87fa0d0))
* **deps:** update dependency zod-validation-error to v5 ([#4437](https://github.com/homarr-labs/homarr/issues/4437)) ([9a3feb4](https://github.com/homarr-labs/homarr/commit/9a3feb404c0c284b4f33fce12d87a469741a6ebd))
* **security:** restrict modification of entrypoint script ([#4555](https://github.com/homarr-labs/homarr/issues/4555)) ([524e1a4](https://github.com/homarr-labs/homarr/commit/524e1a485be56dbebf8f71d4546bc65672737f30))
## [1.44.0](https://github.com/homarr-labs/homarr/compare/v1.43.3...v1.44.0) (2025-11-21)
### Features
* **pi-hole:** support no-auth ([#4480](https://github.com/homarr-labs/homarr/issues/4480)) ([c89e35e](https://github.com/homarr-labs/homarr/commit/c89e35e13c794bbdf98748c00644b86f7f5dbe68))
### Bug Fixes
* **deps:** update dependency @tanstack/react-query to ^5.90.8 ([#4494](https://github.com/homarr-labs/homarr/issues/4494)) ([a5b6203](https://github.com/homarr-labs/homarr/commit/a5b6203be6ac3c2308614f10ef6a17590917e2c9))
* **deps:** update dependency @tanstack/react-query to ^5.90.9 ([#4508](https://github.com/homarr-labs/homarr/issues/4508)) ([b3db5d5](https://github.com/homarr-labs/homarr/commit/b3db5d5f7bc2d146f0b2c230a52e7bd4efad3bcb))
* **deps:** update dependency @tanstack/react-query-next-experimental to ^5.91.0 ([#4505](https://github.com/homarr-labs/homarr/issues/4505)) ([8ea6cff](https://github.com/homarr-labs/homarr/commit/8ea6cffb537ca54a413c583ab8b8fd24a52185be))
* **deps:** update dependency drizzle-kit to ^0.31.7 ([#4507](https://github.com/homarr-labs/homarr/issues/4507)) ([b4f9fb8](https://github.com/homarr-labs/homarr/commit/b4f9fb8b46a8f74e2d7896dfe98e80618cfbcde4))
* **deps:** update dependency fast-xml-parser to ^5.3.2 ([#4510](https://github.com/homarr-labs/homarr/issues/4510)) ([5e57a49](https://github.com/homarr-labs/homarr/commit/5e57a4906bcedc53d220e983827293f4a699c425))
* **deps:** update dependency next-intl to v4.5.1 ([#4484](https://github.com/homarr-labs/homarr/issues/4484)) ([06942ec](https://github.com/homarr-labs/homarr/commit/06942ecbcd245f5540f2960f437ca2955a5ed0c3))
* **deps:** update dependency next-intl to v4.5.3 ([#4503](https://github.com/homarr-labs/homarr/issues/4503)) ([0642773](https://github.com/homarr-labs/homarr/commit/064277373cacd3309d8da3779d5451d195da7f81))
* **deps:** update dependency sass to ^1.94.0 ([#4482](https://github.com/homarr-labs/homarr/issues/4482)) ([19ecede](https://github.com/homarr-labs/homarr/commit/19ecedea4370924d47545ca8d9d46a0b7c016cc9))
* **deps:** update mantine monorepo to ^8.3.8 ([#4516](https://github.com/homarr-labs/homarr/issues/4516)) ([ded4e72](https://github.com/homarr-labs/homarr/commit/ded4e72e5407b0076495a06111f3b04445f27276))
* **deps:** update nextjs monorepo to v16.0.3 ([#4504](https://github.com/homarr-labs/homarr/issues/4504)) ([7d0c1a1](https://github.com/homarr-labs/homarr/commit/7d0c1a14fdf1731ff44e3d00793cf4cd1c3e9b1f))
* **deps:** update testcontainers-node monorepo to ^11.8.1 ([#4486](https://github.com/homarr-labs/homarr/issues/4486)) ([64657d8](https://github.com/homarr-labs/homarr/commit/64657d831cbe28a59708b280b07889b9f0232743))
* **deps:** update turbo monorepo to ^2.6.1 ([#4483](https://github.com/homarr-labs/homarr/issues/4483)) ([cd124d6](https://github.com/homarr-labs/homarr/commit/cd124d6e8392eef5df0092481ec3cc26599f2902))
* **iframe:** allow clicking links within ([#4521](https://github.com/homarr-labs/homarr/issues/4521)) ([5a418d7](https://github.com/homarr-labs/homarr/commit/5a418d73bdb07cf3d3270983b6881f2de8d58ad7))
* **media-requests:** incorrect availability mapping ([#4520](https://github.com/homarr-labs/homarr/issues/4520)) ([d9cc35b](https://github.com/homarr-labs/homarr/commit/d9cc35b9859a14f44c4e4b13c6518287f8d18e54))
## [1.43.3](https://github.com/homarr-labs/homarr/compare/v1.43.2...v1.43.3) (2025-11-14)
### Bug Fixes
+2 -2
View File
@@ -1,4 +1,4 @@
FROM node:24.11.0-alpine AS base
FROM node:24.11.1-alpine AS base
FROM base AS builder
RUN apk add --no-cache libc6-compat
@@ -55,7 +55,7 @@ COPY --from=builder /app/apps/nextjs/.next/standalone ./
COPY --from=builder /app/apps/nextjs/.next/static ./apps/nextjs/.next/static
COPY --from=builder /app/apps/nextjs/public ./apps/nextjs/public
COPY scripts/run.sh ./run.sh
COPY --chmod=777 scripts/entrypoint.sh ./entrypoint.sh
COPY --chmod=755 scripts/entrypoint.sh ./entrypoint.sh
COPY packages/redis/redis.conf /app/redis.conf
COPY nginx.conf /etc/nginx/templates/nginx.conf
+10 -10
View File
@@ -50,15 +50,15 @@
"@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@homarr/widgets": "workspace:^0.1.0",
"@mantine/colors-generator": "^8.3.7",
"@mantine/core": "^8.3.7",
"@mantine/dropzone": "^8.3.7",
"@mantine/hooks": "^8.3.7",
"@mantine/modals": "^8.3.7",
"@mantine/tiptap": "^8.3.7",
"@mantine/colors-generator": "^8.3.8",
"@mantine/core": "^8.3.8",
"@mantine/dropzone": "^8.3.8",
"@mantine/hooks": "^8.3.8",
"@mantine/modals": "^8.3.8",
"@mantine/tiptap": "^8.3.8",
"@million/lint": "1.0.14",
"@tabler/icons-react": "^3.35.0",
"@tanstack/react-query": "^5.90.9",
"@tanstack/react-query": "^5.90.10",
"@tanstack/react-query-devtools": "^5.90.2",
"@tanstack/react-query-next-experimental": "^5.91.0",
"@trpc/client": "^11.7.1",
@@ -74,7 +74,7 @@
"dayjs": "^1.11.19",
"dotenv": "^17.2.3",
"flag-icons": "^7.5.0",
"glob": "^11.0.3",
"glob": "^12.0.0",
"isomorphic-dompurify": "^2.32.0",
"jotai": "^2.15.1",
"mantine-react-table": "2.0.0-beta.9",
@@ -85,7 +85,7 @@
"react-dom": "19.2.0",
"react-error-boundary": "^6.0.0",
"react-simple-code-editor": "^0.14.1",
"sass": "^1.94.0",
"sass": "^1.94.1",
"superjson": "2.2.5",
"swagger-ui-react": "^5.30.2",
"use-deep-compare-effect": "^1.8.1",
@@ -98,7 +98,7 @@
"@types/chroma-js": "3.1.2",
"@types/node": "^24.10.1",
"@types/prismjs": "^1.26.5",
"@types/react": "19.2.4",
"@types/react": "19.2.6",
"@types/react-dom": "19.2.3",
"@types/swagger-ui-react": "^5.18.0",
"concurrently": "^9.2.1",
@@ -17,7 +17,7 @@ import {
IconSettings,
} from "@tabler/icons-react";
import { clientApi } from "@homarr/api/client";
import { applyAutoLayoutToBoard, clientApi } from "@homarr/api/client";
import { useSession } from "@homarr/auth/client";
import { useRequiredBoard } from "@homarr/boards/context";
import { useEditMode } from "@homarr/boards/edit-mode";
@@ -165,7 +165,7 @@ const EditModeMenu = () => {
});
const toggle = useCallback(() => {
if (isEditMode) return saveBoard(board);
if (isEditMode) return saveBoard(applyAutoLayoutToBoard(board));
open();
}, [board, isEditMode, saveBoard, open]);
@@ -1,11 +1,31 @@
"use client";
import { Button, Fieldset, Grid, Group, Input, NumberInput, Slider, Stack, Text, TextInput } from "@mantine/core";
import {
Badge,
Box,
Button,
Chip,
ChipGroup,
Fieldset,
Grid,
Group,
Input,
InputWrapper,
NumberInput,
RadioGroup,
SimpleGrid,
Slider,
Stack,
Text,
TextInput,
} from "@mantine/core";
import { clientApi } from "@homarr/api/client";
import { createId } from "@homarr/common";
import { boardLayoutModes } from "@homarr/definitions";
import { useZodForm } from "@homarr/form";
import { useI18n } from "@homarr/translation/client";
import { CustomRadioCard } from "@homarr/ui";
import { boardSaveLayoutsSchema } from "@homarr/validation/board";
import type { Board } from "../../_types";
@@ -25,6 +45,8 @@ export const LayoutSettingsContent = ({ board }: Props) => {
const form = useZodForm(boardSaveLayoutsSchema.omit({ id: true }).required(), {
initialValues: {
layouts: board.layouts,
layoutMode: board.layoutMode,
baseLayoutId: board.baseLayoutId,
},
});
@@ -38,6 +60,53 @@ export const LayoutSettingsContent = ({ board }: Props) => {
})}
>
<Stack>
<RadioGroup {...form.getInputProps("layoutMode")} label={t("board.field.layoutMode.label")}>
<SimpleGrid cols={{ sm: 2, xs: 1 }} spacing="md">
{boardLayoutModes.values.map((layoutMode) => (
<Box w="100%" key={layoutMode} pos="relative">
<CustomRadioCard
value={layoutMode}
label={t(`board.field.layoutMode.option.${layoutMode}.label`)}
description={t(`board.field.layoutMode.option.${layoutMode}.description`)}
/>
{layoutMode === boardLayoutModes.defaultValue && (
<Badge pos="absolute" top="8px" right="8px" variant="light" size="sm">
{t("common.select.badge.recommended")}
</Badge>
)}
</Box>
))}
</SimpleGrid>
</RadioGroup>
{form.values.layoutMode === "auto" && (
<InputWrapper label={t("board.field.baseLayout.label")} description={t("board.field.baseLayout.description")}>
<ChipGroup {...form.getInputProps("baseLayoutId")} multiple={false}>
<SimpleGrid
cols={{
lg: Math.min(6, form.values.layouts.length),
sm: Math.min(4, form.values.layouts.length),
xs: Math.min(2, form.values.layouts.length),
}}
spacing="md"
mt="sm"
>
{form.values.layouts.map((layout) => (
<Chip
key={layout.id}
value={layout.id}
w="100%"
size="sm"
styles={{ label: { width: "100%", justifyContent: "center" } }}
>
{layout.name}
</Chip>
))}
</SimpleGrid>
</ChipGroup>
</InputWrapper>
)}
<Stack gap="sm">
<Group justify="space-between" align="center">
<Text fw={500}>{t("board.setting.section.layout.responsive.title")}</Text>
@@ -82,18 +151,21 @@ export const LayoutSettingsContent = ({ board }: Props) => {
/>
</Grid.Col>
</Grid>
{form.values.layouts.length >= 2 && (
{form.values.layouts.length >= 2 && form.values.baseLayoutId !== layout.id && (
<Group justify="end">
<Button
variant="subtle"
onClick={() => {
form.setValues((previous) =>
previous.layouts !== undefined && previous.layouts.length >= 2
? {
layouts: form.values.layouts.filter((filteredLayout) => filteredLayout.id !== layout.id),
}
: previous,
);
form.setValues((previous) => {
if (!previous.layouts) return previous;
if (previous.layouts.length < 2) return previous;
if (previous.baseLayoutId === layout.id) return previous;
return {
...previous,
layouts: previous.layouts.filter((filteredLayout) => filteredLayout.id !== layout.id),
};
});
}}
>
{t("common.action.remove")}
@@ -10,6 +10,7 @@ export class BoardMockBuilder {
private readonly board: Board;
constructor(board?: Partial<Omit<Board, "groupPermissions" | "userPermissions" | "sections" | "items" | "layouts">>) {
const baseLayoutId = createId();
this.board = {
id: createId(),
backgroundImageRepeat: "no-repeat",
@@ -41,12 +42,14 @@ export class BoardMockBuilder {
items: [],
layouts: [
{
id: createId(),
id: baseLayoutId,
name: "Base",
columnCount: 12,
breakpoint: 0,
},
],
baseLayoutId,
layoutMode: "auto",
...board,
};
}
+11 -9
View File
@@ -1,6 +1,6 @@
{
"name": "homarr",
"version": "1.43.3",
"version": "1.45.0",
"private": true,
"scripts": {
"build": "cross-env CI=true turbo build",
@@ -40,27 +40,29 @@
"@semantic-release/commit-analyzer": "^13.0.1",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^12.0.2",
"@semantic-release/npm": "^13.1.1",
"@semantic-release/npm": "^13.1.2",
"@semantic-release/release-notes-generator": "^14.1.0",
"@testcontainers/redis": "^11.8.1",
"@turbo/gen": "^2.6.1",
"@vitejs/plugin-react": "^5.1.1",
"@vitest/coverage-v8": "^4.0.8",
"@vitest/ui": "^4.0.8",
"@vitest/coverage-v8": "^4.0.10",
"@vitest/ui": "^4.0.10",
"conventional-changelog-conventionalcommits": "^9.1.0",
"cross-env": "^10.1.0",
"jsdom": "^27.2.0",
"json5": "^2.2.3",
"prettier": "^3.6.2",
"semantic-release": "^25.0.2",
"testcontainers": "^11.8.1",
"turbo": "^2.6.1",
"typescript": "^5.9.3",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^4.0.8"
"vitest": "^4.0.10"
},
"packageManager": "pnpm@10.22.0",
"engines": {
"node": ">=24.11.1"
"node": ">=24.11.1",
"pnpm": ">=10.22.0"
},
"pnpm": {
"onlyBuiltDependencies": [
@@ -81,14 +83,14 @@
"brace-expansion@>=2.0.0 <=2.0.1": ">=4.0.1",
"brace-expansion@>=1.0.0 <=1.1.11": ">=4.0.1",
"esbuild@<=0.24.2": ">=0.27.0",
"form-data@>=4.0.0 <4.0.4": ">=4.0.4",
"hono@<4.6.5": ">=4.10.5",
"form-data@>=4.0.0 <4.0.4": ">=4.0.5",
"hono@<4.6.5": ">=4.10.6",
"linkifyjs@<4.3.2": ">=4.3.2",
"nanoid@>=4.0.0 <5.0.9": ">=5.1.6",
"prismjs@<1.30.0": ">=1.30.0",
"proxmox-api>undici": "7.16.0",
"react-is": "^19.2.0",
"rollup@>=4.0.0 <4.22.4": ">=4.53.2",
"rollup@>=4.0.0 <4.22.4": ">=4.53.3",
"sha.js@<=2.4.11": ">=2.4.12",
"tar-fs@>=3.0.0 <3.0.9": ">=3.1.1",
"tar-fs@>=2.0.0 <2.1.3": ">=3.1.1",
+1 -1
View File
@@ -43,7 +43,7 @@
"@homarr/translation": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@kubernetes/client-node": "^1.4.0",
"@tanstack/react-query": "^5.90.9",
"@tanstack/react-query": "^5.90.10",
"@trpc/client": "^11.7.1",
"@trpc/react-query": "^11.7.1",
"@trpc/server": "^11.7.1",
+2
View File
@@ -17,3 +17,5 @@ export const fetchApi = createTRPCClient<AppRouter>({
}),
],
});
export { applyAutoLayoutToBoard } from "./router/board/board-layout";
+41 -249
View File
@@ -5,7 +5,7 @@ import { z } from "zod/v4";
import { constructBoardPermissions } from "@homarr/auth/shared";
import { createId } from "@homarr/common";
import type { DeviceType } from "@homarr/common/server";
import type { Database, InferInsertModel, InferSelectModel, SQL } from "@homarr/db";
import type { Database, InferInsertModel, InferSelectModel } from "@homarr/db";
import { and, asc, eq, handleTransactionsAsync, inArray, isNull, like, not, or, sql } from "@homarr/db";
import { createDbInsertCollectionWithoutTransaction } from "@homarr/db/collection";
import { getServerSettingByKeyAsync } from "@homarr/db/queries";
@@ -27,13 +27,11 @@ import {
sections,
users,
} from "@homarr/db/schema";
import type { WidgetKind } from "@homarr/definitions";
import {
emptySuperJSON,
everyoneGroup,
getPermissionsWithChildren,
getPermissionsWithParents,
widgetKinds,
} from "@homarr/definitions";
import { importOldmarrAsync } from "@homarr/old-import";
import { importJsonFileSchema } from "@homarr/old-import/shared";
@@ -50,13 +48,11 @@ import {
boardSaveSchema,
} from "@homarr/validation/board";
import { byIdSchema } from "@homarr/validation/common";
import { zodUnionFromArray } from "@homarr/validation/enums";
import type { BoardItemAdvancedOptions } from "@homarr/validation/shared";
import { sectionSchema, sharedItemSchema } from "@homarr/validation/shared";
import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../trpc";
import { throwIfActionForbiddenAsync } from "./board/board-access";
import { generateResponsiveGridFor } from "./board/grid-algorithm";
import { applyAutoLayoutToBoard, getUpdatedBoardLayout } from "./board/board-layout";
import { getFullBoardWithWhereAsync } from "./board/full-board-query";
export const boardRouter = createTRPCRouter({
exists: permissionRequiredProcedure
@@ -279,6 +275,7 @@ export const boardRouter = createTRPCRouter({
name: input.name,
isPublic: input.isPublic,
creatorId: ctx.session.user.id,
layoutMode: input.layoutMode,
});
createBoardCollection.sections.push({
id: createId(),
@@ -287,8 +284,9 @@ export const boardRouter = createTRPCRouter({
yOffset: 0,
boardId,
});
const baseLayoutId = createId();
createBoardCollection.layouts.push({
id: createId(),
id: baseLayoutId,
name: "Base",
columnCount: input.columnCount,
breakpoint: 0,
@@ -296,6 +294,10 @@ export const boardRouter = createTRPCRouter({
});
await createBoardCollection.insertAllAsync(ctx.db);
// Define the base layout (only for automatic layout mode)
if (input.layoutMode === "auto") {
await ctx.db.update(boards).set({ baseLayoutId }).where(eq(boards.id, boardId));
}
if (!user?.homeBoardId) {
await ctx.db.update(users).set({ homeBoardId: boardId }).where(eq(users.id, ctx.session.user.id));
@@ -582,13 +584,15 @@ export const boardRouter = createTRPCRouter({
await throwIfActionForbiddenAsync(ctx, boardWhere, "view");
return await getFullBoardWithWhereAsync(ctx.db, boardWhere, ctx.session?.user.id ?? null);
const board = await getFullBoardWithWhereAsync(ctx.db, boardWhere, ctx.session?.user.id ?? null);
return applyAutoLayoutToBoard(board);
}),
getBoardByName: publicProcedure.input(boardByNameSchema).query(async ({ input, ctx }) => {
const boardWhere = eq(sql`UPPER(${boards.name})`, input.name.toUpperCase());
await throwIfActionForbiddenAsync(ctx, boardWhere, "view");
return await getFullBoardWithWhereAsync(ctx.db, boardWhere, ctx.session?.user.id ?? null);
const board = await getFullBoardWithWhereAsync(ctx.db, boardWhere, ctx.session?.user.id ?? null);
return applyAutoLayoutToBoard(board);
}),
saveLayouts: protectedProcedure.input(boardSaveLayoutsSchema).mutation(async ({ ctx, input }) => {
await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.id), "modify");
@@ -596,13 +600,32 @@ export const boardRouter = createTRPCRouter({
const board = await getFullBoardWithWhereAsync(ctx.db, eq(boards.id, input.id), ctx.session.user.id);
const addedLayouts = filterAddedItems(input.layouts, board.layouts);
const removedLayouts = filterRemovedItems(input.layouts, board.layouts);
if (input.layoutMode === "auto" && input.baseLayoutId === null) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Base layout must be set when using automatic layout mode",
});
}
if (removedLayouts.some((layout) => layout.id === input.baseLayoutId)) {
throw new TRPCError({
code: "BAD_REQUEST",
message: "Cannot remove base layout",
});
}
const layoutsToInsert: InferInsertModel<typeof layouts>[] = [];
const itemSectionLayoutsToInsert: InferInsertModel<typeof itemLayouts>[] = [];
const sectionLayoutsToInsert: InferInsertModel<typeof sectionLayouts>[] = [];
let baseLayoutId = input.baseLayoutId;
for (const addedLayout of addedLayouts) {
const layoutId = createId();
if (addedLayout.id === input.baseLayoutId) {
baseLayoutId = layoutId;
}
layoutsToInsert.push({
id: layoutId,
@@ -709,11 +732,18 @@ export const boardRouter = createTRPCRouter({
.where(eq(layouts.id, updatedLayout.id));
}
const removedLayouts = filterRemovedItems(input.layouts, board.layouts);
const removedLayoutIds = removedLayouts.map((layout) => layout.id);
if (removedLayoutIds.length > 0) {
await ctx.db.delete(layouts).where(inArray(layouts.id, removedLayoutIds));
}
await ctx.db
.update(boards)
.set({
baseLayoutId,
layoutMode: input.layoutMode,
})
.where(eq(boards.id, input.id));
}),
savePartialBoardSettings: protectedProcedure
.input(boardSavePartialSettingsSchema.and(z.object({ id: z.string() })))
@@ -1408,244 +1438,6 @@ const noBoardWithSimilarNameAsync = async (db: Database, name: string, ignoredId
}
};
const getUpdatedBoardLayout = (
board: Awaited<ReturnType<typeof getFullBoardWithWhereAsync>>,
options: {
previous: {
layoutId: string;
columnCount: number;
};
current: {
layoutId: string;
columnCount: number;
};
},
) => {
const itemSectionLayoutsCollection: InferInsertModel<typeof itemLayouts>[] = [];
const sectionLayoutsCollection: InferInsertModel<typeof sectionLayouts>[] = [];
const elements = getElementsForLayout(board, options.previous.layoutId);
const rootSections = board.sections.filter((section) => section.kind !== "dynamic");
for (const rootSection of rootSections) {
const result = generateResponsiveGridFor({
items: elements,
previousWidth: options.previous.columnCount,
width: options.current.columnCount,
sectionId: rootSection.id,
});
itemSectionLayoutsCollection.push(
...board.items
.map((item): InferInsertModel<typeof itemLayouts> | null => {
const currentElement = result.items.find((element) => element.type === "item" && element.id === item.id);
if (!currentElement) {
return null;
}
return {
itemId: item.id,
layoutId: options.current.layoutId,
sectionId: currentElement.sectionId,
height: currentElement.height,
width: currentElement.width,
xOffset: currentElement.xOffset,
yOffset: currentElement.yOffset,
};
})
.filter((item) => item !== null),
);
sectionLayoutsCollection.push(
...board.sections
.filter((section) => section.kind === "dynamic")
.map((section): InferInsertModel<typeof sectionLayouts> | null => {
const currentElement = result.items.find(
(element) => element.type === "section" && element.id === section.id,
);
if (!currentElement) {
return null;
}
return {
layoutId: options.current.layoutId,
sectionId: section.id,
parentSectionId: currentElement.sectionId,
height: currentElement.height,
width: currentElement.width,
xOffset: currentElement.xOffset,
yOffset: currentElement.yOffset,
};
})
.filter((section) => section !== null),
);
}
return {
itemSectionLayouts: itemSectionLayoutsCollection,
sectionLayouts: sectionLayoutsCollection,
};
};
const getElementsForLayout = (board: Awaited<ReturnType<typeof getFullBoardWithWhereAsync>>, layoutId: string) => {
const sectionElements = board.sections
.filter((section) => section.kind === "dynamic")
.map((section) => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const clonedLayout = section.layouts.find((sectionLayout) => sectionLayout.layoutId === layoutId)!;
return {
id: section.id,
type: "section" as const,
height: clonedLayout.height,
width: clonedLayout.width,
xOffset: clonedLayout.xOffset,
yOffset: clonedLayout.yOffset,
sectionId: clonedLayout.parentSectionId,
};
});
const itemElements = board.items.map((item) => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const clonedLayout = item.layouts.find((itemLayout) => itemLayout.layoutId === layoutId)!;
return {
id: item.id,
type: "item" as const,
height: clonedLayout.height,
width: clonedLayout.width,
xOffset: clonedLayout.xOffset,
yOffset: clonedLayout.yOffset,
sectionId: clonedLayout.sectionId,
};
});
return [...itemElements, ...sectionElements];
};
const getFullBoardWithWhereAsync = async (db: Database, where: SQL<unknown>, userId: string | null) => {
const groupsOfCurrentUser = await db.query.groupMembers.findMany({
where: eq(groupMembers.userId, userId ?? ""),
});
const board = await db.query.boards.findFirst({
where,
with: {
creator: {
columns: {
id: true,
name: true,
image: true,
},
},
sections: {
with: {
collapseStates: {
where: eq(sectionCollapseStates.userId, userId ?? ""),
},
layouts: true,
},
},
items: {
with: {
integrations: {
with: {
integration: true,
},
},
layouts: true,
},
},
layouts: true,
userPermissions: {
where: eq(boardUserPermissions.userId, userId ?? ""),
columns: {
permission: true,
},
},
groupPermissions: {
where: inArray(boardGroupPermissions.groupId, groupsOfCurrentUser.map((group) => group.groupId).concat("")),
},
},
});
if (!board) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Board not found",
});
}
const { sections, items, layouts, ...otherBoardProperties } = board;
return {
...otherBoardProperties,
layouts: layouts
.map(({ boardId: _, ...layout }) => layout)
.sort((layoutA, layoutB) => layoutA.breakpoint - layoutB.breakpoint),
sections: sections.map(({ collapseStates, ...section }) =>
parseSection({
...section,
xOffset: section.xOffset,
yOffset: section.yOffset,
options: superjson.parse(section.options ?? emptySuperJSON),
layouts: section.layouts.map((layout) => ({
xOffset: layout.xOffset,
yOffset: layout.yOffset,
width: layout.width,
height: layout.height,
parentSectionId: layout.parentSectionId,
layoutId: layout.layoutId,
})),
collapsed: collapseStates.at(0)?.collapsed ?? false,
}),
),
items: items.map(({ integrations: itemIntegrations, ...item }) =>
parseItem({
...item,
layouts: item.layouts.map((layout) => ({
xOffset: layout.xOffset,
yOffset: layout.yOffset,
width: layout.width,
height: layout.height,
layoutId: layout.layoutId,
sectionId: layout.sectionId,
})),
integrationIds: itemIntegrations.map((item) => item.integration.id),
advancedOptions: superjson.parse<BoardItemAdvancedOptions>(item.advancedOptions),
options: superjson.parse<Record<string, unknown>>(item.options),
}),
),
};
};
const forKind = <T extends WidgetKind>(kind: T) =>
z.object({
kind: z.literal(kind),
options: z.record(z.string(), z.unknown()),
});
const outputItemSchema = zodUnionFromArray(widgetKinds.map((kind) => forKind(kind))).and(sharedItemSchema);
const parseItem = (item: unknown) => {
const result = outputItemSchema.safeParse(item);
if (!result.success) {
throw new Error(result.error.message);
}
return result.data;
};
const parseSection = (section: unknown) => {
const result = sectionSchema.safeParse(section);
if (!result.success) {
throw new Error(result.error.message);
}
return result.data;
};
const filterAddedItems = <TInput extends { id: string }>(inputArray: TInput[], dbArray: TInput[]) =>
inputArray.filter((inputItem) => !dbArray.some((dbItem) => dbItem.id === inputItem.id));
@@ -0,0 +1,186 @@
import type { Modify } from "@homarr/common/types";
import type { InferInsertModel } from "@homarr/db";
import type { itemLayouts, sectionLayouts } from "@homarr/db/schema";
import type { getFullBoardWithWhereAsync } from "./full-board-query";
import { generateResponsiveGridFor } from "./grid-algorithm";
type DynamicSectionLayout = Modify<InferInsertModel<typeof sectionLayouts>, { parentSectionId: string }>;
export const getUpdatedBoardLayout = (
board: Awaited<ReturnType<typeof getFullBoardWithWhereAsync>>,
options: {
previous: {
layoutId: string;
columnCount: number;
};
current: {
layoutId: string;
columnCount: number;
};
},
) => {
const itemSectionLayoutsCollection: InferInsertModel<typeof itemLayouts>[] = [];
const sectionLayoutsCollection: DynamicSectionLayout[] = [];
const elements = getElementsForLayout(board, options.previous.layoutId);
const rootSections = board.sections.filter((section) => section.kind !== "dynamic");
for (const rootSection of rootSections) {
const result = generateResponsiveGridFor({
items: elements,
previousWidth: options.previous.columnCount,
width: options.current.columnCount,
sectionId: rootSection.id,
});
itemSectionLayoutsCollection.push(
...board.items
.map((item): InferInsertModel<typeof itemLayouts> | null => {
const currentElement = result.items.find((element) => element.type === "item" && element.id === item.id);
if (!currentElement) {
return null;
}
return {
itemId: item.id,
layoutId: options.current.layoutId,
sectionId: currentElement.sectionId,
height: currentElement.height,
width: currentElement.width,
xOffset: currentElement.xOffset,
yOffset: currentElement.yOffset,
};
})
.filter((item) => item !== null),
);
sectionLayoutsCollection.push(
...board.sections
.filter((section) => section.kind === "dynamic")
.map((section): DynamicSectionLayout | null => {
const currentElement = result.items.find(
(element) => element.type === "section" && element.id === section.id,
);
if (!currentElement) {
return null;
}
return {
layoutId: options.current.layoutId,
sectionId: section.id,
parentSectionId: currentElement.sectionId,
height: currentElement.height,
width: currentElement.width,
xOffset: currentElement.xOffset,
yOffset: currentElement.yOffset,
};
})
.filter((section) => section !== null),
);
}
return {
itemSectionLayouts: itemSectionLayoutsCollection,
sectionLayouts: sectionLayoutsCollection,
};
};
const getElementsForLayout = (board: Awaited<ReturnType<typeof getFullBoardWithWhereAsync>>, layoutId: string) => {
const sectionElements = board.sections
.filter((section) => section.kind === "dynamic")
.map((section) => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const clonedLayout = section.layouts.find((sectionLayout) => sectionLayout.layoutId === layoutId)!;
return {
id: section.id,
type: "section" as const,
height: clonedLayout.height,
width: clonedLayout.width,
xOffset: clonedLayout.xOffset,
yOffset: clonedLayout.yOffset,
sectionId: clonedLayout.parentSectionId,
};
});
const itemElements = board.items.map((item) => {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const clonedLayout = item.layouts.find((itemLayout) => itemLayout.layoutId === layoutId)!;
return {
id: item.id,
type: "item" as const,
height: clonedLayout.height,
width: clonedLayout.width,
xOffset: clonedLayout.xOffset,
yOffset: clonedLayout.yOffset,
sectionId: clonedLayout.sectionId,
};
});
return [...itemElements, ...sectionElements];
};
export const applyAutoLayoutToBoard = (
board: Awaited<ReturnType<typeof getFullBoardWithWhereAsync>>,
): Awaited<ReturnType<typeof getFullBoardWithWhereAsync>> => {
if (board.layoutMode === "custom") return board;
const baseLayout = board.layouts.find((layout) => layout.id === board.baseLayoutId) ?? null;
if (!baseLayout) return board;
const updatedLayoutMap = new Map<string, ReturnType<typeof getUpdatedBoardLayout>>();
for (const layout of board.layouts) {
if (layout.id === baseLayout.id) continue;
updatedLayoutMap.set(
layout.id,
getUpdatedBoardLayout(board, {
previous: {
layoutId: baseLayout.id,
columnCount: baseLayout.columnCount,
},
current: {
layoutId: layout.id,
columnCount: layout.columnCount,
},
}),
);
}
return {
...board,
items: board.items.map((item) => ({
...item,
layouts: item.layouts.map(
(layoutSection) =>
updatedLayoutMap
.get(layoutSection.layoutId)
?.itemSectionLayouts.find(
(updatedLayoutSection) =>
updatedLayoutSection.itemId === item.id && updatedLayoutSection.layoutId === layoutSection.layoutId,
) ?? layoutSection,
),
})),
sections: board.sections.map((section) =>
"layouts" in section
? {
...section,
layouts: section.layouts.map(
(sectionLayout) =>
updatedLayoutMap
.get(sectionLayout.layoutId)
?.sectionLayouts.find(
(updatedSectionLayout) =>
updatedSectionLayout.sectionId === section.id &&
updatedSectionLayout.layoutId === sectionLayout.layoutId,
) ?? sectionLayout,
),
}
: section,
),
};
};
@@ -0,0 +1,133 @@
import { TRPCError } from "@trpc/server";
import superjson from "superjson";
import z from "zod";
import type { Database, SQL } from "@homarr/db";
import { eq, inArray } from "@homarr/db";
import { boardGroupPermissions, boardUserPermissions, groupMembers, sectionCollapseStates } from "@homarr/db/schema";
import type { WidgetKind } from "@homarr/definitions";
import { emptySuperJSON, widgetKinds } from "@homarr/definitions";
import { zodUnionFromArray } from "@homarr/validation/enums";
import { sectionSchema, sharedItemSchema } from "@homarr/validation/shared";
import type { BoardItemAdvancedOptions } from "@homarr/validation/shared";
export const getFullBoardWithWhereAsync = async (db: Database, where: SQL<unknown>, userId: string | null) => {
const groupsOfCurrentUser = await db.query.groupMembers.findMany({
where: eq(groupMembers.userId, userId ?? ""),
});
const board = await db.query.boards.findFirst({
where,
with: {
creator: {
columns: {
id: true,
name: true,
image: true,
},
},
sections: {
with: {
collapseStates: {
where: eq(sectionCollapseStates.userId, userId ?? ""),
},
layouts: true,
},
},
items: {
with: {
integrations: {
with: {
integration: true,
},
},
layouts: true,
},
},
layouts: true,
userPermissions: {
where: eq(boardUserPermissions.userId, userId ?? ""),
columns: {
permission: true,
},
},
groupPermissions: {
where: inArray(boardGroupPermissions.groupId, groupsOfCurrentUser.map((group) => group.groupId).concat("")),
},
},
});
if (!board) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Board not found",
});
}
const { sections, items, layouts, ...otherBoardProperties } = board;
return {
...otherBoardProperties,
layouts: layouts
.map(({ boardId: _, ...layout }) => layout)
.sort((layoutA, layoutB) => layoutA.breakpoint - layoutB.breakpoint),
sections: sections.map(({ collapseStates, ...section }) =>
parseSection({
...section,
xOffset: section.xOffset,
yOffset: section.yOffset,
options: superjson.parse(section.options ?? emptySuperJSON),
layouts: section.layouts.map((layout) => ({
xOffset: layout.xOffset,
yOffset: layout.yOffset,
width: layout.width,
height: layout.height,
parentSectionId: layout.parentSectionId,
layoutId: layout.layoutId,
})),
collapsed: collapseStates.at(0)?.collapsed ?? false,
}),
),
items: items.map(({ integrations: itemIntegrations, ...item }) =>
parseItem({
...item,
layouts: item.layouts.map((layout) => ({
xOffset: layout.xOffset,
yOffset: layout.yOffset,
width: layout.width,
height: layout.height,
layoutId: layout.layoutId,
sectionId: layout.sectionId,
})),
integrationIds: itemIntegrations.map((item) => item.integration.id),
advancedOptions: superjson.parse<BoardItemAdvancedOptions>(item.advancedOptions),
options: superjson.parse<Record<string, unknown>>(item.options),
}),
),
};
};
const forKind = <T extends WidgetKind>(kind: T) =>
z.object({
kind: z.literal(kind),
options: z.record(z.string(), z.unknown()),
});
const outputItemSchema = zodUnionFromArray(widgetKinds.map((kind) => forKind(kind))).and(sharedItemSchema);
const parseItem = (item: unknown) => {
const result = outputItemSchema.safeParse(item);
if (!result.success) {
throw new Error(result.error.message);
}
return result.data;
};
const parseSection = (section: unknown) => {
const result = sectionSchema.safeParse(section);
if (!result.success) {
throw new Error(result.error.message);
}
return result.data;
};
@@ -56,8 +56,7 @@ export const generateResponsiveGridFor = ({
dynamicSectionHeightMap.set(dynamicSection.id, result.height);
}
// Return same positions for items in the current section
if (width >= previousWidth) {
if (width === previousWidth) {
return {
height: Math.max(...itemsOfCurrentSection.map((item) => item.yOffset + item.height)),
items: newItems.concat(normalizedItems),
@@ -99,11 +99,12 @@ qlllmmmmmnnrrrst
ulllmmmmmnnrrrvw
xyz äö`;
// Just add two empty columns to the right
const eighteenColumns = sixteenColumns
.split("\n")
.map((line, index) => (index === 0 ? line : `${line} `))
.join("\n");
const eighteenColumns = `
abbccccddddeeefghi
jbbccccddddeeeklll
mmmmmnnopqseeetlll
mmmmmnnrrruvwxylll
mmmmmnnrrrzäö `;
const tenColumns = `
abbcccceee
@@ -3,6 +3,7 @@ import { z } from "zod/v4";
import { getIntegrationKindsByCategory } from "@homarr/definitions";
import { createIntegrationAsync } from "@homarr/integrations";
import { mediaRequestStatusConfiguration } from "@homarr/integrations/types";
import type { MediaRequest } from "@homarr/integrations/types";
import { mediaRequestListRequestHandler } from "@homarr/request-handler/media-request-list";
import { mediaRequestStatsRequestHandler } from "@homarr/request-handler/media-request-stats";
@@ -35,7 +36,10 @@ export const mediaRequestsRouter = createTRPCRouter({
return dataB.createdAt.getTime() - dataA.createdAt.getTime();
}
return dataA.status - dataB.status;
return (
mediaRequestStatusConfiguration[dataA.status].position -
mediaRequestStatusConfiguration[dataB.status].position
);
});
}),
subscribeToLatestRequests: publicProcedure
+8 -1
View File
@@ -7,6 +7,7 @@ import { usePathname } from "next/navigation";
import type { RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { useEditMode } from "./edit-mode";
import { updateBoardName } from "./updater";
const BoardContext = createContext<{
@@ -83,10 +84,12 @@ export const getCurrentLayout = (board: RouterOutputs["board"]["getBoardByName"]
export const useCurrentLayout = () => {
const board = useRequiredBoard();
const [currentLayout, setCurrentLayout] = useState(getCurrentLayout(board));
const [isEditMode] = useEditMode();
const onResize = useCallback(() => {
if (isEditMode && board.layoutMode === "auto") return;
setCurrentLayout(getCurrentLayout(board));
}, [board]);
}, [board, isEditMode]);
useEffect(() => {
if (typeof window === "undefined") return;
@@ -97,6 +100,10 @@ export const useCurrentLayout = () => {
};
}, [onResize]);
if (board.layoutMode === "auto" && isEditMode && board.baseLayoutId !== null) {
return board.baseLayoutId;
}
return currentLayout;
};
+1 -1
View File
@@ -38,7 +38,7 @@
"react-dom": "19.2.0",
"undici": "7.16.0",
"zod": "^4.1.12",
"zod-validation-error": "^4.0.2"
"zod-validation-error": "^5.0.0"
},
"devDependencies": {
"@homarr/eslint-config": "workspace:^0.2.0",
+2 -2
View File
@@ -29,7 +29,7 @@
"@homarr/core": "workspace:^0.1.0",
"@homarr/cron-jobs": "workspace:^0.1.0",
"@homarr/log": "workspace:^0.1.0",
"@tanstack/react-query": "^5.90.9",
"@tanstack/react-query": "^5.90.10",
"@trpc/client": "^11.7.1",
"@trpc/server": "^11.7.1",
"@trpc/tanstack-react-query": "^11.7.1",
@@ -42,7 +42,7 @@
"@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0",
"@types/node-cron": "^3.0.11",
"@types/react": "19.2.4",
"@types/react": "19.2.6",
"eslint": "^9.39.1",
"typescript": "^5.9.3"
}
@@ -0,0 +1,3 @@
ALTER TABLE `board` ADD `layout_mode` varchar(32) DEFAULT 'custom' NOT NULL;--> statement-breakpoint
ALTER TABLE `board` ADD `base_layout_id` varchar(64);--> statement-breakpoint
ALTER TABLE `board` ADD CONSTRAINT `board_base_layout_id_layout_id_fk` FOREIGN KEY (`base_layout_id`) REFERENCES `layout`(`id`) ON DELETE set null ON UPDATE no action;
File diff suppressed because it is too large. Load diff
@@ -260,6 +260,13 @@
"when": 1760968518445,
"tag": "0036_add_app_reference_to_integration",
"breakpoints": true
},
{
"idx": 37,
"version": "5",
"when": 1764190331048,
"tag": "0037_add_auto_layout_mode",
"breakpoints": true
}
]
}
@@ -0,0 +1,3 @@
ALTER TABLE "board" ADD COLUMN "layout_mode" varchar(32) DEFAULT 'custom' NOT NULL;--> statement-breakpoint
ALTER TABLE "board" ADD COLUMN "base_layout_id" varchar(64);--> statement-breakpoint
ALTER TABLE "board" ADD CONSTRAINT "board_base_layout_id_layout_id_fk" FOREIGN KEY ("base_layout_id") REFERENCES "public"."layout"("id") ON DELETE set null ON UPDATE no action;
File diff suppressed because it is too large. Load diff
@@ -22,6 +22,13 @@
"when": 1760968530084,
"tag": "0002_add_app_reference_to_integration",
"breakpoints": true
},
{
"idx": 3,
"version": "7",
"when": 1764190350662,
"tag": "0003_add_auto_layout_mode",
"breakpoints": true
}
]
}
@@ -0,0 +1,2 @@
ALTER TABLE `board` ADD `layout_mode` text DEFAULT 'custom' NOT NULL;--> statement-breakpoint
ALTER TABLE `board` ADD `base_layout_id` text REFERENCES layout(id);
File diff suppressed because it is too large. Load diff
@@ -246,6 +246,13 @@
"when": 1760968503571,
"tag": "0034_add_app_reference_to_integration",
"breakpoints": true
},
{
"idx": 35,
"version": "6",
"when": 1764190313293,
"tag": "0035_add_auto_layout_mode",
"breakpoints": true
}
]
}
+1 -1
View File
@@ -49,7 +49,7 @@
"@homarr/definitions": "workspace:^0.1.0",
"@homarr/log": "workspace:^0.1.0",
"@homarr/server-settings": "workspace:^0.1.0",
"@mantine/core": "^8.3.7",
"@mantine/core": "^8.3.8",
"@paralleldrive/cuid2": "^3.1.0",
"@testcontainers/mysql": "^11.8.1",
"@testcontainers/postgresql": "^11.8.1",
+16 -6
View File
@@ -17,16 +17,11 @@ import {
varchar,
} from "drizzle-orm/mysql-core";
import {
backgroundImageAttachments,
backgroundImageRepeats,
backgroundImageSizes,
emptySuperJSON,
} from "@homarr/definitions";
import type {
BackgroundImageAttachment,
BackgroundImageRepeat,
BackgroundImageSize,
BoardLayoutMode,
BoardPermission,
ColorScheme,
GroupPermissionKey,
@@ -39,6 +34,12 @@ import type {
SupportedAuthProvider,
WidgetKind,
} from "@homarr/definitions";
import {
backgroundImageAttachments,
backgroundImageRepeats,
backgroundImageSizes,
emptySuperJSON,
} from "@homarr/definitions";
const customBlob = customType<{ data: Buffer }>({
dataType() {
@@ -289,6 +290,11 @@ export const boards = mysqlTable("board", {
iconColor: text(),
itemRadius: text().$type<MantineSize>().default("lg").notNull(),
disableStatus: boolean().default(false).notNull(),
// This has to be custom as the previous behaviour was custom
layoutMode: varchar({ length: 32 }).$type<BoardLayoutMode>().default("custom").notNull(),
baseLayoutId: varchar({ length: 64 }).references((): AnyMySqlColumn => layouts.id, {
onDelete: "set null",
}),
});
export const boardUserPermissions = mysqlTable(
@@ -678,6 +684,10 @@ export const boardRelations = relations(boards, ({ many, one }) => ({
userPermissions: many(boardUserPermissions),
groupPermissions: many(boardGroupPermissions),
layouts: many(layouts),
baseLayout: one(layouts, {
fields: [boards.baseLayoutId],
references: [layouts.id],
}),
groupHomes: many(groups, {
relationName: "groupRelations__board__homeBoardId",
}),
+16 -6
View File
@@ -16,16 +16,11 @@ import {
varchar,
} from "drizzle-orm/pg-core";
import {
backgroundImageAttachments,
backgroundImageRepeats,
backgroundImageSizes,
emptySuperJSON,
} from "@homarr/definitions";
import type {
BackgroundImageAttachment,
BackgroundImageRepeat,
BackgroundImageSize,
BoardLayoutMode,
BoardPermission,
ColorScheme,
GroupPermissionKey,
@@ -38,6 +33,12 @@ import type {
SupportedAuthProvider,
WidgetKind,
} from "@homarr/definitions";
import {
backgroundImageAttachments,
backgroundImageRepeats,
backgroundImageSizes,
emptySuperJSON,
} from "@homarr/definitions";
const customBlob = customType<{ data: Buffer }>({
dataType() {
@@ -288,6 +289,11 @@ export const boards = pgTable("board", {
iconColor: text(),
itemRadius: text().$type<MantineSize>().default("lg").notNull(),
disableStatus: boolean().default(false).notNull(),
// This has to be custom as the previous behaviour was custom
layoutMode: varchar({ length: 32 }).$type<BoardLayoutMode>().default("custom").notNull(),
baseLayoutId: varchar({ length: 64 }).references((): AnyPgColumn => layouts.id, {
onDelete: "set null",
}),
});
export const boardUserPermissions = pgTable(
@@ -677,6 +683,10 @@ export const boardRelations = relations(boards, ({ many, one }) => ({
userPermissions: many(boardUserPermissions),
groupPermissions: many(boardGroupPermissions),
layouts: many(layouts),
baseLayout: one(layouts, {
fields: [boards.baseLayoutId],
references: [layouts.id],
}),
groupHomes: many(groups, {
relationName: "groupRelations__board__homeBoardId",
}),
+16 -6
View File
@@ -5,16 +5,11 @@ import { relations, sql } from "drizzle-orm";
import type { AnySQLiteColumn } from "drizzle-orm/sqlite-core";
import { blob, index, int, primaryKey, sqliteTable, text } from "drizzle-orm/sqlite-core";
import {
backgroundImageAttachments,
backgroundImageRepeats,
backgroundImageSizes,
emptySuperJSON,
} from "@homarr/definitions";
import type {
BackgroundImageAttachment,
BackgroundImageRepeat,
BackgroundImageSize,
BoardLayoutMode,
BoardPermission,
ColorScheme,
GroupPermissionKey,
@@ -27,6 +22,12 @@ import type {
SupportedAuthProvider,
WidgetKind,
} from "@homarr/definitions";
import {
backgroundImageAttachments,
backgroundImageRepeats,
backgroundImageSizes,
emptySuperJSON,
} from "@homarr/definitions";
export const apiKeys = sqliteTable("apiKey", {
id: text().notNull().primaryKey(),
@@ -274,6 +275,11 @@ export const boards = sqliteTable("board", {
iconColor: text(),
itemRadius: text().$type<MantineSize>().default("lg").notNull(),
disableStatus: int({ mode: "boolean" }).default(false).notNull(),
// This has to be custom as the previous behaviour was custom
layoutMode: text().$type<BoardLayoutMode>().default("custom").notNull(),
baseLayoutId: text().references((): AnySQLiteColumn => layouts.id, {
onDelete: "set null",
}),
});
export const boardUserPermissions = sqliteTable(
@@ -663,6 +669,10 @@ export const boardRelations = relations(boards, ({ many, one }) => ({
userPermissions: many(boardUserPermissions),
groupPermissions: many(boardGroupPermissions),
layouts: many(layouts),
baseLayout: one(layouts, {
fields: [boards.baseLayoutId],
references: [layouts.id],
}),
groupHomes: many(groups, {
relationName: "groupRelations__board__homeBoardId",
}),
+2
View File
@@ -8,7 +8,9 @@ export const backgroundImageRepeats = createDefinition(["repeat", "repeat-x", "r
export const backgroundImageSizes = createDefinition(["cover", "contain"], {
defaultValue: "cover",
});
export const boardLayoutModes = createDefinition(["auto", "custom"], { defaultValue: "auto" });
export type BackgroundImageAttachment = inferDefinitionType<typeof backgroundImageAttachments>;
export type BackgroundImageRepeat = inferDefinitionType<typeof backgroundImageRepeats>;
export type BackgroundImageSize = inferDefinitionType<typeof backgroundImageSizes>;
export type BoardLayoutMode = inferDefinitionType<typeof boardLayoutModes>;
+1 -1
View File
@@ -32,7 +32,7 @@
"@homarr/eslint-config": "workspace:^0.2.0",
"@homarr/prettier-config": "workspace:^0.1.0",
"@homarr/tsconfig": "workspace:^0.1.0",
"@types/dockerode": "^3.3.45",
"@types/dockerode": "^3.3.47",
"eslint": "^9.39.1",
"typescript": "^5.9.3"
}
+1
View File
@@ -8,3 +8,4 @@ export type { Docker };
export const containerStates = ["created", "running", "paused", "restarting", "exited", "removing", "dead"] as const;
export type ContainerState = (typeof containerStates)[number];
export * from "./labels";
+4
View File
@@ -0,0 +1,4 @@
export const dockerLabels = {
// Label to hide a container from Homarrs docker integration
hide: "homarr.hide",
} as const;
+1 -1
View File
@@ -26,7 +26,7 @@
"@homarr/common": "workspace:^0.1.0",
"@homarr/translation": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@mantine/form": "^8.3.7",
"@mantine/form": "^8.3.8",
"mantine-form-zod-resolver": "^1.3.0",
"zod": "^4.1.12"
},
+1 -1
View File
@@ -30,7 +30,7 @@
"@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@mantine/core": "^8.3.7",
"@mantine/core": "^8.3.8",
"react": "19.2.0",
"zod": "^4.1.12"
},
+1 -1
View File
@@ -38,7 +38,7 @@ export type {
FirewallMemorySummary,
} from "./interfaces/firewall-summary/firewall-summary-types";
export type { SystemHealthMonitoring } from "./interfaces/health-monitoring/health-monitoring-types";
export { MediaRequestStatus } from "./interfaces/media-requests/media-request-types";
export { UpstreamMediaRequestStatus } from "./interfaces/media-requests/media-request-types";
export type { MediaRequestList, MediaRequestStats } from "./interfaces/media-requests/media-request-types";
export type { StreamSession } from "./interfaces/media-server/media-server-types";
export type {
@@ -1,3 +1,5 @@
import { objectKeys } from "@homarr/common";
interface SerieSeason {
id: number;
seasonNumber: number;
@@ -34,6 +36,64 @@ export interface MediaRequest {
requestedBy?: Omit<RequestUser, "requestCount">;
}
export const mediaAvailabilityConfiguration = {
available: {
color: "green",
},
partiallyAvailable: {
color: "yellow",
},
processing: {
color: "blue",
},
requested: {
color: "violet",
},
pending: {
color: "violet",
},
unknown: {
color: "orange",
},
deleted: {
color: "red",
},
blacklisted: {
color: "gray",
},
} satisfies Record<string, { color: string }>;
export const mediaAvailabilities = objectKeys(mediaAvailabilityConfiguration);
export type MediaAvailability = (typeof mediaAvailabilities)[number];
export const mediaRequestStatusConfiguration = {
pending: {
color: "blue",
position: 1,
},
approved: {
color: "green",
position: 2,
},
declined: {
color: "red",
position: 3,
},
failed: {
color: "red",
position: 4,
},
completed: {
color: "green",
position: 5,
},
} satisfies Record<string, { color: string; position: number }>;
export const mediaRequestStatuses = objectKeys(mediaRequestStatusConfiguration);
export type MediaRequestStatus = (typeof mediaRequestStatuses)[number];
export interface MediaRequestList {
integration: {
id: string;
@@ -66,7 +126,7 @@ export interface MediaRequestStats {
}
// https://github.com/fallenbagel/jellyseerr/blob/0fd03f38480f853e7015ad9229ed98160e37602e/server/constants/media.ts#L1
export enum MediaRequestStatus {
export enum UpstreamMediaRequestStatus {
PendingApproval = 1,
Approved = 2,
Declined = 3,
@@ -75,12 +135,12 @@ export enum MediaRequestStatus {
}
// https://github.com/fallenbagel/jellyseerr/blob/0fd03f38480f853e7015ad9229ed98160e37602e/server/constants/media.ts#L14
export enum MediaAvailability {
export enum UpstreamMediaAvailability {
Unknown = 1,
Pending = 2,
Processing = 3,
PartiallyAvailable = 4,
Available = 5,
Blacklisted = 6,
Deleted = 7,
JellyseerrBlacklistedOrOverseerrDeleted = 6,
JellyseerrDeleted = 7,
}
@@ -1,3 +1,12 @@
import type { MediaAvailability } from "../interfaces/media-requests/media-request-types";
import { UpstreamMediaAvailability } from "../interfaces/media-requests/media-request-types";
import { OverseerrIntegration } from "../overseerr/overseerr-integration";
export class JellyseerrIntegration extends OverseerrIntegration {}
export class JellyseerrIntegration extends OverseerrIntegration {
protected override mapAvailability(availability: UpstreamMediaAvailability, inProgress: boolean): MediaAvailability {
// Availability statuses are not exactly the same between Jellyseerr and Overseerr (Jellyseerr has "blacklisted" additionally (deleted is the same value in overseerr))
if (availability === UpstreamMediaAvailability.JellyseerrBlacklistedOrOverseerrDeleted) return "blacklisted";
if (availability === UpstreamMediaAvailability.JellyseerrDeleted) return "deleted";
return super.mapAvailability(availability, inProgress);
}
}
@@ -1,8 +1,13 @@
import { objectEntries } from "@homarr/common";
import type { IMediaRequestIntegration } from "../../interfaces/media-requests/media-request-integration";
import type { MediaInformation, MediaRequest, RequestStats, RequestUser } from "../../types";
import { MediaAvailability, MediaRequestStatus } from "../../types";
import type {
MediaAvailability,
MediaInformation,
MediaRequest,
MediaRequestStatus,
RequestStats,
RequestUser,
} from "../../types";
import { mediaAvailabilities, mediaRequestStatuses } from "../../types";
export class MediaRequestMockService implements IMediaRequestIntegration {
public async getSeriesInformationAsync(mediaType: "movie" | "tv", id: number): Promise<MediaInformation> {
@@ -86,12 +91,10 @@ export class MediaRequestMockService implements IMediaRequestIntegration {
}
private static randomAvailability(): MediaAvailability {
const values = objectEntries(MediaAvailability).filter(([key]) => typeof key === "number");
return values[Math.floor(Math.random() * values.length)]?.[1] ?? MediaAvailability.Available;
return mediaAvailabilities.at(Math.floor(Math.random() * mediaAvailabilities.length)) ?? "unknown";
}
private static randomStatus(): MediaRequestStatus {
const values = objectEntries(MediaRequestStatus).filter(([key]) => typeof key === "number");
return values[Math.floor(Math.random() * values.length)]?.[1] ?? MediaRequestStatus.PendingApproval;
return mediaRequestStatuses.at(Math.floor(Math.random() * mediaRequestStatuses.length)) ?? "pending";
}
}
@@ -9,8 +9,17 @@ import type { ISearchableIntegration } from "../base/searchable-integration";
import { TestConnectionError } from "../base/test-connection/test-connection-error";
import type { TestingResult } from "../base/test-connection/test-connection-service";
import type { IMediaRequestIntegration } from "../interfaces/media-requests/media-request-integration";
import type { MediaRequest, RequestStats, RequestUser } from "../interfaces/media-requests/media-request-types";
import { MediaAvailability, MediaRequestStatus } from "../interfaces/media-requests/media-request-types";
import type {
MediaAvailability,
MediaRequest,
MediaRequestStatus,
RequestStats,
RequestUser,
} from "../interfaces/media-requests/media-request-types";
import {
UpstreamMediaAvailability,
UpstreamMediaRequestStatus,
} from "../interfaces/media-requests/media-request-types";
interface OverseerrSearchResult {
id: number;
@@ -128,7 +137,7 @@ export class OverseerrIntegration
if (pendingResults.length > 0 && allResults.length > 0) {
requests = pendingResults.concat(
allResults.filter(({ status }) => status !== MediaRequestStatus.PendingApproval),
allResults.filter(({ status }) => status !== UpstreamMediaRequestStatus.PendingApproval),
);
} else if (pendingResults.length > 0) requests = pendingResults;
else if (allResults.length > 0) requests = allResults;
@@ -137,11 +146,15 @@ export class OverseerrIntegration
return await Promise.all(
requests.map(async (request): Promise<MediaRequest> => {
const information = await this.getItemInformationAsync(request.media.tmdbId, request.type);
// See https://github.com/seerr-team/seerr/blob/af083a3cd5c3e3d5d7917fdf4fdd67fe3f39c46b/src/components/StatusBadge/index.tsx#L40
const inProgress = (request.media.downloadStatus ?? []).length >= 1;
return {
id: request.id,
name: information.name,
status: request.status,
availability: request.media.status,
status: this.mapRequestStatus(request.status),
availability: this.mapAvailability(request.media.status, inProgress),
backdropImageUrl: `https://image.tmdb.org/t/p/original/${information.backdropPath}`,
posterImagePath: `https://image.tmdb.org/t/p/w600_and_h900_bestv2/${information.posterPath}`,
href: this.externalUrl(`/${request.type}/${request.media.tmdbId}`).toString(),
@@ -161,6 +174,42 @@ export class OverseerrIntegration
);
}
protected mapRequestStatus(status: UpstreamMediaRequestStatus): MediaRequestStatus {
switch (status) {
case UpstreamMediaRequestStatus.PendingApproval:
return "pending";
case UpstreamMediaRequestStatus.Approved:
return "approved";
case UpstreamMediaRequestStatus.Declined:
return "declined";
case UpstreamMediaRequestStatus.Failed:
return "failed";
case UpstreamMediaRequestStatus.Completed:
return "completed";
default:
return "failed";
}
}
// See https://github.com/seerr-team/seerr/blob/af083a3cd5c3e3d5d7917fdf4fdd67fe3f39c46b/src/components/StatusBadge/index.tsx#L153-L387
protected mapAvailability(availability: UpstreamMediaAvailability, inProgress: boolean): MediaAvailability {
switch (availability) {
case UpstreamMediaAvailability.Available:
return inProgress ? "processing" : "available";
case UpstreamMediaAvailability.PartiallyAvailable:
return inProgress ? "processing" : "partiallyAvailable";
case UpstreamMediaAvailability.Processing:
return inProgress ? "processing" : "requested";
case UpstreamMediaAvailability.Pending:
return "pending";
case UpstreamMediaAvailability.JellyseerrBlacklistedOrOverseerrDeleted:
return "deleted";
case UpstreamMediaAvailability.Unknown:
default:
return inProgress ? "processing" : "unknown";
}
}
public async getStatsAsync(): Promise<RequestStats> {
const response = await fetchWithTrustedCertificatesAsync(this.url("/api/v1/request/count"), {
headers: {
@@ -339,11 +388,12 @@ const getRequestsSchema = z.object({
.array(
z.object({
id: z.number(),
status: z.nativeEnum(MediaRequestStatus),
status: z.enum(UpstreamMediaRequestStatus),
createdAt: z.string().transform((value) => new Date(value)),
media: z.object({
status: z.nativeEnum(MediaAvailability),
status: z.enum(UpstreamMediaAvailability),
tmdbId: z.number(),
downloadStatus: z.array(z.unknown()).optional(),
}),
type: z.enum(["movie", "tv"]),
requestedBy: z
+2 -1
View File
@@ -24,6 +24,7 @@
"dependencies": {
"@homarr/api": "workspace:^0.1.0",
"@homarr/common": "workspace:^0.1.0",
"@homarr/definitions": "workspace:^0.1.0",
"@homarr/form": "workspace:^0.1.0",
"@homarr/forms-collection": "workspace:^0.1.0",
"@homarr/modals": "workspace:^0.1.0",
@@ -33,7 +34,7 @@
"@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@mantine/core": "^8.3.7",
"@mantine/core": "^8.3.8",
"@tabler/icons-react": "^3.35.0",
"dayjs": "^1.11.19",
"next": "16.0.3",
@@ -1,13 +1,28 @@
import { Button, Group, InputWrapper, Slider, Stack, Switch, TextInput } from "@mantine/core";
import {
Badge,
Box,
Button,
Fieldset,
Group,
InputWrapper,
RadioGroup,
SimpleGrid,
Slider,
Stack,
Switch,
TextInput,
} from "@mantine/core";
import { useDebouncedValue } from "@mantine/hooks";
import { IconAlertTriangle, IconCircleCheck } from "@tabler/icons-react";
import { clientApi } from "@homarr/api/client";
import { revalidatePathActionAsync } from "@homarr/common/client";
import { boardLayoutModes } from "@homarr/definitions";
import { useZodForm } from "@homarr/form";
import { createModal } from "@homarr/modals";
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
import { useI18n } from "@homarr/translation/client";
import { CustomRadioCard } from "@homarr/ui";
import { boardColumnCountSchema, boardCreateSchema, boardNameSchema } from "@homarr/validation/board";
export const AddBoardModal = createModal(({ actions }) => {
@@ -18,6 +33,7 @@ export const AddBoardModal = createModal(({ actions }) => {
name: "",
columnCount: 10,
isPublic: false,
layoutMode: boardLayoutModes.defaultValue,
},
});
const { mutate, isPending } = clientApi.board.createBoard.useMutation({
@@ -64,14 +80,38 @@ export const AddBoardModal = createModal(({ actions }) => {
) : null
}
/>
<InputWrapper label={t("board.field.columnCount.label")} {...form.getInputProps("columnCount")}>
<Slider
min={boardColumnCountSchema.minValue ?? undefined}
max={boardColumnCountSchema.maxValue ?? undefined}
step={1}
{...form.getInputProps("columnCount")}
/>
</InputWrapper>
<Fieldset legend={t("board.setting.section.layout.title")}>
<Stack gap="sm">
<RadioGroup {...form.getInputProps("layoutMode")}>
<SimpleGrid cols={{ sm: 2, xs: 1 }} spacing="md">
{boardLayoutModes.values.map((mode) => (
<Box w="100%" key={mode} pos="relative">
<CustomRadioCard
value={mode}
label={t(`board.field.layoutMode.option.${mode}.label`)}
description={t(`board.field.layoutMode.option.${mode}.description`)}
/>
{mode === boardLayoutModes.defaultValue && (
<Badge pos="absolute" top="8px" right="8px" variant="light" size="sm">
{t("common.select.badge.recommended")}
</Badge>
)}
</Box>
))}
</SimpleGrid>
</RadioGroup>
<InputWrapper label={t("board.field.columnCount.label")} {...form.getInputProps("columnCount")}>
<Slider
min={boardColumnCountSchema.minValue ?? undefined}
max={boardColumnCountSchema.maxValue ?? undefined}
step={1}
{...form.getInputProps("columnCount")}
/>
</InputWrapper>
</Stack>
</Fieldset>
<Switch
label={t("board.field.isPublic.label")}
@@ -92,6 +132,7 @@ export const AddBoardModal = createModal(({ actions }) => {
);
}).withOptions({
defaultTitle: (t) => t("management.page.board.action.new.label"),
size: "lg",
});
export const useBoardNameStatus = (name: string) => {
+2 -2
View File
@@ -24,8 +24,8 @@
"dependencies": {
"@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0",
"@mantine/core": "^8.3.7",
"@mantine/hooks": "^8.3.7",
"@mantine/core": "^8.3.8",
"@mantine/hooks": "^8.3.8",
"react": "19.2.0"
},
"devDependencies": {
+1 -1
View File
@@ -24,7 +24,7 @@
"prettier": "@homarr/prettier-config",
"dependencies": {
"@homarr/ui": "workspace:^0.1.0",
"@mantine/notifications": "^8.3.7",
"@mantine/notifications": "^8.3.8",
"@tabler/icons-react": "^3.35.0"
},
"devDependencies": {
+2 -2
View File
@@ -37,8 +37,8 @@
"@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@mantine/core": "^8.3.7",
"@mantine/hooks": "^8.3.7",
"@mantine/core": "^8.3.8",
"@mantine/hooks": "^8.3.8",
"adm-zip": "0.5.16",
"next": "16.0.3",
"react": "19.2.0",
+1
View File
@@ -26,6 +26,7 @@
"@homarr/common": "workspace:^0.1.0",
"@homarr/db": "workspace:^0.1.0",
"@homarr/definitions": "workspace:^0.1.0",
"@homarr/docker": "workspace:^0.1.0",
"@homarr/integrations": "workspace:^0.1.0",
"@homarr/log": "workspace:^0.1.0",
"@homarr/redis": "workspace:^0.1.0",
+5 -7
View File
@@ -3,9 +3,9 @@ import type { ContainerInfo, ContainerStats } from "dockerode";
import { db, like, or } from "@homarr/db";
import { icons } from "@homarr/db/schema";
import type { ContainerState } from "@homarr/docker";
import { dockerLabels, DockerSingleton } from "@homarr/docker";
import type { ContainerState } from "../../docker/src";
import { DockerSingleton } from "../../docker/src";
import { createCachedWidgetRequestHandler } from "./lib/cached-widget-request-handler";
export const dockerContainersRequestHandler = createCachedWidgetRequestHandler({
@@ -27,13 +27,11 @@ async function getContainersWithStatsAsync() {
const containers = await Promise.all(
dockerInstances.map(async ({ instance, host }) => {
const instanceContainers = await instance.listContainers({ all: true });
return instanceContainers.map((container) => ({
...container,
instance: host,
}));
return instanceContainers
.filter((container) => dockerLabels.hide in container.Labels === false)
.map((container) => ({ ...container, instance: host }));
}),
).then((res) => res.flat());
const likeQueries = containers.map((container) => like(icons.name, `%${extractImage(container)}%`));
const dbIcons =
+1 -1
View File
@@ -26,7 +26,7 @@
"@homarr/api": "workspace:^0.1.0",
"@homarr/db": "workspace:^0.1.0",
"@homarr/server-settings": "workspace:^0.1.0",
"@mantine/dates": "^8.3.7",
"@mantine/dates": "^8.3.8",
"next": "16.0.3",
"react": "19.2.0",
"react-dom": "19.2.0"
+3 -3
View File
@@ -33,9 +33,9 @@
"@homarr/settings": "workspace:^0.1.0",
"@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0",
"@mantine/core": "^8.3.7",
"@mantine/hooks": "^8.3.7",
"@mantine/spotlight": "^8.3.7",
"@mantine/core": "^8.3.8",
"@mantine/hooks": "^8.3.8",
"@mantine/spotlight": "^8.3.8",
"@tabler/icons-react": "^3.35.0",
"jotai": "^2.15.1",
"next": "16.0.3",
+1 -1
View File
@@ -33,7 +33,7 @@
"deepmerge": "4.3.1",
"mantine-react-table": "2.0.0-beta.9",
"next": "16.0.3",
"next-intl": "4.5.3",
"next-intl": "4.5.5",
"react": "19.2.0",
"react-dom": "19.2.0"
},
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "",
"available": "",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "未知",
"pending": "等待处理",
"processing": "处理中",
"requested": "",
"partiallyAvailable": "部分",
"available": "可用",
"blacklisted": "已列入黑名单",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "crwdns1314:0crwdne1314:0",
"pending": "crwdns1316:0crwdne1316:0",
"processing": "crwdns1318:0crwdne1318:0",
"requested": "crwdns3806:0crwdne3806:0",
"partiallyAvailable": "crwdns1320:0crwdne1320:0",
"available": "crwdns1322:0crwdne1322:0",
"blacklisted": "crwdns3468:0crwdne3468:0",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Neznámý",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Částečně dostupné",
"available": "K dispozici",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Ukendt",
"pending": "Afventende",
"processing": "Behandler",
"requested": "",
"partiallyAvailable": "Delvis",
"available": "Tilgængelig",
"blacklisted": "Blacklistet",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Unbekannt",
"pending": "Ausstehend",
"processing": "In Bearbeitung",
"requested": "",
"partiallyAvailable": "Teilweise",
"available": "Verfügbar",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Unbekannt",
"pending": "Ausstehend",
"processing": "In Bearbeitung",
"requested": "",
"partiallyAvailable": "Teilweise",
"available": "Verfügbar",
"blacklisted": "Gesperrt",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Άγνωστο",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Μερικώς",
"available": "Διαθέσιμο",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "",
"available": "",
"blacklisted": "",
+18
View File
@@ -2232,6 +2232,7 @@
"unknown": "Unknown",
"pending": "Pending",
"processing": "Processing",
"requested": "Requested",
"partiallyAvailable": "Partial",
"available": "Available",
"blacklisted": "Blacklisted",
@@ -2792,6 +2793,23 @@
"label": "Disable app status",
"description": "Disables the status check for all apps on this board"
},
"layoutMode": {
"label": "Layout mode",
"option": {
"auto": {
"label": "Auto",
"description": "Position and size of all layouts are calculated from the base layout."
},
"custom": {
"label": "Custom",
"description": "Position and size must be configured for all layouts separately."
}
}
},
"baseLayout": {
"label": "Base layout",
"description": "The layout will be used to calculate positions and sizes for other layouts."
},
"columnCount": {
"label": "Column count"
},
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Desconocido",
"pending": "Pendiente",
"processing": "Procesando",
"requested": "",
"partiallyAvailable": "Parcial",
"available": "Disponible",
"blacklisted": "Lista negra",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "",
"available": "",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Inconnu",
"pending": "En attente",
"processing": "Traitement en cours",
"requested": "",
"partiallyAvailable": "Partiel",
"available": "Disponible",
"blacklisted": "Sur la liste noire",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "לא ידוע",
"pending": "בהמתנה",
"processing": "מעבד",
"requested": "",
"partiallyAvailable": "חלקי",
"available": "זמין",
"blacklisted": "ברשימה השחורה",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Nepoznato",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "",
"available": "",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Ismeretlen",
"pending": "",
"processing": "Feldolgozás",
"requested": "",
"partiallyAvailable": "Részleges",
"available": "Elérhető",
"blacklisted": "",
+65 -64
View File
@@ -730,7 +730,7 @@
"error": {
"common": {
"cause": {
"title": ""
"title": "Causa con più dettagli"
}
},
"unknown": {
@@ -738,7 +738,7 @@
"description": "Si è verificato un errore sconosciuto, apri la causa sottostante per vedere maggiori dettagli"
},
"parse": {
"title": "",
"title": "Errore di analisi",
"description": "La risposta non può essere analizzata. Si prega di verificare che l'URL stia puntando all'URL di base del servizio."
},
"authorization": {
@@ -959,8 +959,8 @@
"newLabel": "Nuovo ID token"
},
"realm": {
"label": "",
"newLabel": ""
"label": "Dominio",
"newLabel": "Nuovo dominio"
},
"personalAccessToken": {
"label": "Token d'Accesso Personale",
@@ -1053,7 +1053,7 @@
"backToOverview": "Torna alla panoramica",
"change": "Cambia",
"create": "Crea",
"createAnother": "",
"createAnother": "Crea e ricomincia",
"edit": "Modifica",
"import": "Importa",
"insert": "Inserisci",
@@ -1389,8 +1389,8 @@
}
},
"dnsHoleSummary": {
"name": "",
"description": "",
"name": "Riepilogo del filtraggio DNS",
"description": "Mostra il riepilogo del tuo filtro DNS",
"option": {
"layout": {
"label": "Layout",
@@ -1411,7 +1411,7 @@
}
},
"error": {
"internalServerError": "",
"internalServerError": "Impossibile recuperare il riepilogo del filtro DNS",
"integrationsDisconnected": "Nessun dato disponibile, tutte le integrazioni disconnesse"
},
"data": {
@@ -1423,7 +1423,7 @@
"domainsTooltip": "A causa di più integrazioni, Homarr non può calcolare il numero esatto di domini bloccati"
},
"dnsHoleControls": {
"name": "",
"name": "Controlli del filtro DNS",
"description": "Controlla PiHole o AdGuard dalla tua dashboard",
"option": {
"layout": {
@@ -1445,7 +1445,7 @@
}
},
"error": {
"internalServerError": ""
"internalServerError": "Impossibile controllare il DNS Hole"
},
"controls": {
"enableAll": "Abilita tutto",
@@ -1514,7 +1514,7 @@
"label": "Indirizzo del server"
},
"isBedrockServer": {
"label": ""
"label": "Server Bedrock"
}
},
"status": {
@@ -1625,7 +1625,7 @@
}
},
"error": {
"noUrl": "",
"noUrl": "Nessun URL iFrame fornito",
"unsupportedProtocol": "L'URL fornito sta usando un protocollo non supportato. Si prega di utilizzare uno di ({supportedProtocols})",
"noBrowerSupport": "Il tuo browser non supporta iframes. Aggiorna il tuo browser."
}
@@ -1664,7 +1664,7 @@
}
},
"stockPrice": {
"name": "",
"name": "Prezzo delle azioni",
"description": "Visualizza il prezzo attuale delle azioni di una società",
"option": {
"stock": {
@@ -1835,7 +1835,7 @@
"title": "Index manager",
"testAll": "Prova tutto",
"error": {
"internalServerError": ""
"internalServerError": "Impossibile recuperare lo stato degli indicizzatori"
}
},
"healthMonitoring": {
@@ -2020,7 +2020,7 @@
"name": "Nome",
"id": "Id",
"metadata": {
"title": "",
"title": "Statistiche per nerd",
"video": {
"title": "Video",
"resolution": "Risoluzione"
@@ -2034,7 +2034,7 @@
"title": "Transcodifica",
"container": "Container",
"resolution": "Risoluzione",
"target": ""
"target": "Codec di destinazione"
}
}
}
@@ -2098,7 +2098,7 @@
"detailsTitle": "Categorie (Informazioni aggiuntive)"
},
"downSpeed": {
"columnTitle": "",
"columnTitle": "Giù",
"detailsTitle": "Velocità Di Download"
},
"index": {
@@ -2112,22 +2112,22 @@
"columnTitle": "Integrazione"
},
"name": {
"columnTitle": ""
"columnTitle": "Nome del job"
},
"progress": {
"columnTitle": "Avanzamento",
"detailsTitle": ""
"detailsTitle": "Avanzamento del download"
},
"ratio": {
"columnTitle": "Rapporto",
"detailsTitle": "Rapporto torrent (ricevuti/inviati)"
},
"received": {
"columnTitle": "",
"columnTitle": "Totale fuori servizio",
"detailsTitle": "Totale scaricati"
},
"sent": {
"columnTitle": "",
"columnTitle": "Totale operativo",
"detailsTitle": "Totale Caricati"
},
"size": {
@@ -2136,7 +2136,7 @@
},
"state": {
"columnTitle": "Stato",
"detailsTitle": ""
"detailsTitle": "Stato job"
},
"time": {
"columnTitle": "Ora di fine",
@@ -2158,7 +2158,7 @@
"completed": "Completato",
"failed": "Non riuscito",
"processing": "In lavorazione",
"leeching": "",
"leeching": "Leeching",
"stalled": "In stallo",
"unknown": "Sconosciuto",
"seeding": "Seeding"
@@ -2205,7 +2205,7 @@
"label": "Mostra suggerimento descrizione"
},
"showType": {
"label": ""
"label": "Mostra il badge del tipo di media"
},
"showSource": {
"label": "Mostra sorgente integrazione"
@@ -2216,7 +2216,7 @@
}
},
"mediaRequests-requestList": {
"name": "",
"name": "Elenco Richieste Media",
"description": "Visualizza un elenco di tutte le richieste media dalla tua istanza Overseerr o Jellyseerr",
"option": {
"linksTargetNewTab": {
@@ -2232,9 +2232,10 @@
"unknown": "Sconosciuto",
"pending": "In sospeso",
"processing": "In lavorazione",
"requested": "Richiesto",
"partiallyAvailable": "Parziale",
"available": "Disponibile",
"blacklisted": "",
"blacklisted": "In blacklist",
"deleted": "Eliminato"
},
"status": {
@@ -2247,7 +2248,7 @@
"toBeDetermined": "TBD"
},
"mediaRequests-requestStats": {
"name": "",
"name": "Statistiche Richiesta Media",
"description": "Statistiche sulle richieste dei media",
"option": {},
"titles": {
@@ -2338,7 +2339,7 @@
"label": "Abilita RTL"
},
"textLinesClamp": {
"label": ""
"label": "Limita le righe della descrizione"
},
"maximumAmountPosts": {
"label": "Limite di post"
@@ -2353,11 +2354,11 @@
"description": "Visualizza un elenco della versione corrente dei repository dati con la versione regex specificata.",
"option": {
"newReleaseWithin": {
"label": "",
"label": "Nuova versione entro",
"description": "Esempio di utilizzo: 1w (1 settimana), 10M (10 mesi). Tipi di unità accettati h (ore), d (giorni), w (settimane), M (mesi), y (anni). Lasciare vuoto per non evidenziare le nuove versioni."
},
"staleReleaseWithin": {
"label": "",
"label": "Rilascio obsoleto entro",
"description": "Esempio di utilizzo: 1w (1 settimana), 10M (10 mesi). Tipi di unità accettati h (ore), d (giorni), w (settimane), M (mesi), y (anni). Lasciare vuoto per non evidenziare le release obsolete."
},
"showOnlyHighlighted": {
@@ -2702,7 +2703,7 @@
"label": "Titolo della pagina"
},
"metaTitle": {
"label": ""
"label": "Meta title"
},
"logoImageUrl": {
"label": "URL immagine del logo"
@@ -2948,7 +2949,7 @@
"label": "Numero di colonne"
},
"breakpoint": {
"label": "",
"label": "Breakpoint",
"description": "Il layout verrà utilizzato su tutti gli schermi più grandi di questo breakpoint fino al breakpoint più grande successivo."
}
}
@@ -3322,7 +3323,7 @@
"label": "Analytics"
},
"smartHomeEntityState": {
"label": ""
"label": "Stato dell'entità Smart Home"
},
"ping": {
"label": "Ping"
@@ -3337,10 +3338,10 @@
"label": "Scaricamenti"
},
"mediaRequestStats": {
"label": ""
"label": "Statistiche richieste media"
},
"mediaRequestList": {
"label": ""
"label": "Elenco richieste media"
},
"rssFeeds": {
"label": "Feeds RSS"
@@ -3349,10 +3350,10 @@
"label": "Gestione Indicizzatori"
},
"healthMonitoring": {
"label": ""
"label": "Monitoraggio integrità del sistema"
},
"dnsHole": {
"label": ""
"label": "Dati di filtraggio DNS"
},
"updateChecker": {
"label": "Controllo aggiornamenti"
@@ -3435,10 +3436,10 @@
},
"trigger": {
"success": {
"message": ""
"message": "Attività attivata con successo"
},
"error": {
"message": ""
"message": "Impossibile attivare l'attività"
}
},
"enable": {
@@ -3453,7 +3454,7 @@
},
"toggle": {
"error": {
"message": ""
"message": "Impossibile attivare lo stato dell'attività"
}
}
},
@@ -3517,12 +3518,12 @@
"action": "Azione"
},
"action": {
"toggleBoardEdit": "",
"toggleColorScheme": "",
"saveNotebook": "",
"toggleBoardEdit": "Attiva la modalità di modifica della board",
"toggleColorScheme": "Attiva tema chiaro/scuro",
"saveNotebook": "Salva notebook (solo nel widget notebook)",
"openSpotlight": "Apri ricerca"
},
"note": ""
"note": "Suggerimento: 'Mod' si riferisce sia al tasto Ctrl che al tasto ⌘ su macOS"
}
}
}
@@ -3534,7 +3535,7 @@
"updated": "Aggiornato {when}",
"search": "Cerca {count} container",
"selected": "{selectCount} di {totalCount} containers selezionati",
"footer": ""
"footer": "Totale container {count}"
},
"field": {
"name": {
@@ -3672,11 +3673,11 @@
"resources": {
"title": "Risorse",
"nodes": "Nodi",
"namespaces": "",
"namespaces": "Spazi dei nomi",
"ingresses": "Ingressi",
"services": "Servizi",
"pods": "Pods",
"configmaps": "",
"configmaps": "ConfigMaps",
"secrets": "Secrets",
"volumes": "Volumi"
}
@@ -3721,7 +3722,7 @@
}
},
"namespaces": {
"label": "",
"label": "Spazi dei nomi",
"field": {
"name": {
"label": "Nome"
@@ -3730,7 +3731,7 @@
"label": "Stato",
"option": {
"active": "Attivo",
"terminating": ""
"terminating": "Terminare"
}
},
"creationTimestamp": {
@@ -3738,7 +3739,7 @@
}
},
"table": {
"search": ""
"search": "Cerca {count} spazi dei nomi"
}
},
"ingresses": {
@@ -3761,7 +3762,7 @@
}
},
"table": {
"search": ""
"search": "Cerca {count} ingresses"
}
},
"services": {
@@ -3771,7 +3772,7 @@
"label": "Nome"
},
"namespace": {
"label": ""
"label": "Spazio del nome"
},
"type": {
"label": "Tipo"
@@ -3800,7 +3801,7 @@
"label": "Nome"
},
"namespace": {
"label": ""
"label": "Spazio del nome"
},
"image": {
"label": "Immagine"
@@ -3826,7 +3827,7 @@
"label": "Nome"
},
"namespace": {
"label": ""
"label": "spazio del nome"
},
"type": {
"label": "tipo"
@@ -3836,24 +3837,24 @@
}
},
"table": {
"search": ""
"search": "Cerca {count} segreti"
}
},
"configmaps": {
"label": "",
"label": "ConfigMaps",
"field": {
"name": {
"label": "Nome"
},
"namespace": {
"label": ""
"label": "namespace"
},
"creationTimestamp": {
"label": "Creato"
}
},
"table": {
"search": ""
"search": "Cerca {count} ConfigMaps"
}
},
"volumes": {
@@ -3863,7 +3864,7 @@
"label": "Nome"
},
"namespace": {
"label": ""
"label": "Namespace"
},
"accessModes": {
"label": "Modalità Di Accesso"
@@ -3872,7 +3873,7 @@
"label": "Spazio di archiviazione"
},
"storageClassName": {
"label": ""
"label": "Nome Classe Archivio"
},
"volumeMode": {
"label": "Modalità Volume"
@@ -3888,7 +3889,7 @@
}
},
"table": {
"search": ""
"search": "Cerca {count} volumi"
}
},
"error": {
@@ -3989,7 +3990,7 @@
"label": "Nodi"
},
"namespaces": {
"label": ""
"label": "Namespaces"
},
"ingresses": {
"label": "Ingressi"
@@ -4001,7 +4002,7 @@
"label": "pods"
},
"configmaps": {
"label": ""
"label": "ConfigMaps"
},
"secrets": {
"label": "Secrets"
@@ -4092,7 +4093,7 @@
"option": {
"colorScheme": {
"light": "Passa al tema chiaro",
"dark": "Passa alla modalità scura"
"dark": "Passa al tema scuro"
},
"language": {
"label": "Cambia lingua",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "不明",
"pending": "保留中",
"processing": "処理中",
"requested": "",
"partiallyAvailable": "一部",
"available": "利用可能",
"blacklisted": "ブラックリスト",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "알 수 없음",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "",
"available": "",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Nežinoma",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Dalis",
"available": "Galima",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Nezināms",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Daļējs",
"available": "Pieejams",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Onbekend",
"pending": "In afwachting",
"processing": "Verwerken",
"requested": "",
"partiallyAvailable": "Gedeeltelijk",
"available": "Beschikbaar",
"blacklisted": "Geblacklist",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Ukjent",
"pending": "Pågår",
"processing": "Prosesserer",
"requested": "",
"partiallyAvailable": "Delvis",
"available": "Tilgjengelig",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Nieznany",
"pending": "Oczekujący",
"processing": "Przetwarzanie",
"requested": "Żądanie",
"partiallyAvailable": "Częściowy",
"available": "Dostępne",
"blacklisted": "Zablokowany",
+38 -37
View File
@@ -7,7 +7,7 @@
"description": "Para começar, por favor selecione como você deseja configurar sua instância Homarr.",
"action": {
"scratch": "Começar do zero",
"importOldmarr": "Importe de uma instância Homarr anterior a 1,0"
"importOldmarr": "Importe de uma instância Homarr anterior a 1.0"
}
},
"import": {
@@ -307,12 +307,12 @@
"name": "Nome",
"members": "Membros",
"homeBoard": {
"label": "",
"description": ""
"label": "Quadro inicial",
"description": "Somente quadros acessíveis ao grupo podem ser selecionados"
},
"mobileBoard": {
"label": "",
"description": ""
"label": "Quadro para celular",
"description": "Somente quadros acessíveis ao grupo podem ser selecionados"
}
},
"permission": {
@@ -320,8 +320,8 @@
"title": "Administrador",
"item": {
"admin": {
"label": "",
"description": ""
"label": "Administrador",
"description": "Membros com essa permissão têm acesso total a todos os recursos e configurações"
}
}
},
@@ -329,15 +329,15 @@
"title": "Aplicativos",
"item": {
"create": {
"label": "",
"description": ""
"label": "Criar aplicativo",
"description": "Permitir que membros criem aplicativos"
},
"use-all": {
"label": "",
"description": ""
"label": "Usar todas aplicações",
"description": "Permitir que os membros adicionem qualquer aplicativo aos seus quadros"
},
"modify-all": {
"label": "",
"label": "Modificar todos os aplicativos",
"description": ""
},
"full-all": {
@@ -410,7 +410,7 @@
"item": {
"view-logs": {
"label": "",
"description": ""
"description": "Permitir que os membros visualizem os registros"
}
}
},
@@ -419,7 +419,7 @@
"item": {
"create": {
"label": "",
"description": ""
"description": "Permitir que os membros criem mecanismos de busca"
},
"modify-all": {
"label": "",
@@ -547,19 +547,19 @@
"title": "Aplicativos",
"noResults": {
"title": "",
"action": ""
"action": "Crie seu primeiro aplicativo"
}
},
"create": {
"title": "",
"title": "Novo Aplicativo",
"notification": {
"success": {
"title": "",
"message": ""
"title": "Criado com sucesso",
"message": "O aplicativo foi criado com sucesso"
},
"error": {
"title": "",
"message": ""
"title": "Falha ao criar",
"message": "Não foi possível criar o aplicativo"
}
}
},
@@ -618,9 +618,9 @@
"title": ""
},
"create": {
"title": "",
"description": "",
"action": ""
"title": "Criar aplicativo",
"description": "Criar um aplicativo",
"action": "Abrir criação de aplicativo"
},
"add": ""
}
@@ -649,14 +649,14 @@
"app": {
"option": {
"existing": {
"title": "",
"label": ""
"title": "Existente",
"label": "Selecione um aplicativo existente"
},
"new": {
"title": "",
"title": "Novo",
"url": {
"label": "",
"description": ""
"label": "URL da aplicação",
"description": "A URL do aplicativo será aberta quando acessada a partir do painel de controle"
}
}
}
@@ -712,8 +712,8 @@
"sectionTitle": ""
},
"createApp": {
"label": "",
"description": ""
"label": "Criar aplicativo",
"description": "Crie um aplicativo com o mesmo nome e ícone da integração. Deixe o campo de entrada abaixo vazio para criar o aplicativo com a URL de integração."
},
"appHref": {
"placeholder": ""
@@ -1973,8 +1973,8 @@
},
"app": {
"noData": "",
"description": "",
"quickCreate": ""
"description": "Clique <here></here> para criar um aplicativo",
"quickCreate": "Criar aplicativo em tempo real"
},
"error": {
"noIntegration": "",
@@ -2232,6 +2232,7 @@
"unknown": "Desconhecido",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Parcial",
"available": "Disponível",
"blacklisted": "",
@@ -2659,7 +2660,7 @@
},
"onlyImportApps": {
"label": "",
"description": ""
"description": "Só adiciona os aplicativos, o quadro precisa ser recriado manualmente"
}
},
"name": {
@@ -2692,8 +2693,8 @@
},
"quickCreateApp": {
"modal": {
"title": "",
"createAndUse": ""
"title": "Criar aplicativo em tempo real",
"createAndUse": "Criar e utilizar"
}
}
},
@@ -2911,7 +2912,7 @@
"title": "",
"description": "",
"link": "",
"notice": ""
"notice": "Para fazer esta página desaparecer, crie um quadro e defina-o como quadro inicial"
},
"notFound": {
"title": "",
@@ -4109,7 +4110,7 @@
"label": ""
},
"newApp": {
"label": ""
"label": "Criar aplicativo"
},
"newIntegration": {
"label": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Necunoscut",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Parțial",
"available": "Disponibil",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Неизвестно",
"pending": "В ожидании",
"processing": "Обработка",
"requested": "",
"partiallyAvailable": "Частично доступно",
"available": "Доступно",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Neznámy",
"pending": "Čakajúce",
"processing": "Spracovanie",
"requested": "",
"partiallyAvailable": "Čiastočný",
"available": "K dispozícii",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Neznano",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "",
"available": "",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Okänd",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Delmängd",
"available": "Tillgänglig",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Bilinmeyen",
"pending": "Bekleyen",
"processing": "İşlemde",
"requested": "",
"partiallyAvailable": "Kısmi",
"available": "Mevcut",
"blacklisted": "Engellenenler",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Невідомо",
"pending": "В очікуванні",
"processing": "В обробці",
"requested": "",
"partiallyAvailable": "Частково доступно",
"available": "Доступно",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "Không rõ",
"pending": "",
"processing": "",
"requested": "",
"partiallyAvailable": "Một phần",
"available": "Khả dụng",
"blacklisted": "",
+1
View File
@@ -2232,6 +2232,7 @@
"unknown": "未知",
"pending": "等待處理中",
"processing": "處理中",
"requested": "",
"partiallyAvailable": "部分",
"available": "待定",
"blacklisted": "",
+3 -3
View File
@@ -30,9 +30,9 @@
"@homarr/log": "workspace:^0.1.0",
"@homarr/translation": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@mantine/core": "^8.3.7",
"@mantine/dates": "^8.3.7",
"@mantine/hooks": "^8.3.7",
"@mantine/core": "^8.3.8",
"@mantine/dates": "^8.3.8",
"@mantine/hooks": "^8.3.8",
"@tabler/icons-react": "^3.35.0",
"mantine-react-table": "2.0.0-beta.9",
"next": "16.0.3",
+1
View File
@@ -16,3 +16,4 @@ export { MaskedImage } from "./masked-image";
export { MaskedOrNormalImage } from "./masked-or-normal-image";
export { LanguageIcon } from "./language-icon";
export { Link } from "./link";
export * from "./radio";
@@ -0,0 +1,33 @@
.root {
position: relative;
padding: var(--mantine-spacing-md);
transition: border-color 150ms ease;
&[data-checked] {
border-color: var(--mantine-primary-color-filled);
}
@mixin hover {
@mixin light {
background-color: var(--mantine-color-gray-0);
}
@mixin dark {
background-color: var(--mantine-color-dark-6);
}
}
}
.label {
font-family: var(--mantine-font-family-monospace);
font-weight: bold;
font-size: var(--mantine-font-size-md);
line-height: 1.3;
color: var(--mantine-color-bright);
}
.description {
margin-top: 8px;
color: var(--mantine-color-dimmed);
font-size: var(--mantine-font-size-xs);
}
+24
View File
@@ -0,0 +1,24 @@
import type { RadioCardProps } from "@mantine/core";
import { Group, RadioCard, RadioIndicator, Text } from "@mantine/core";
import clsx from "clsx";
import classes from "./radio.module.css";
interface CustomRadioCardProps extends RadioCardProps {
label: string;
description: string;
}
export const CustomRadioCard = (props: CustomRadioCardProps) => {
return (
<RadioCard className={clsx(classes.root, props.className)} {...props}>
<Group wrap="nowrap" align="flex-start">
<RadioIndicator />
<div>
<Text className={classes.label}>{props.label}</Text>
<Text className={classes.description}>{props.description}</Text>
</div>
</Group>
</RadioCard>
);
};
+5
View File
@@ -4,6 +4,7 @@ import {
backgroundImageAttachments,
backgroundImageRepeats,
backgroundImageSizes,
boardLayoutModes,
boardPermissions,
} from "@homarr/definitions";
@@ -79,6 +80,9 @@ export const boardSaveLayoutsSchema = z.object({
breakpoint: z.number().min(0).max(32767),
}),
),
// If not send it should fallback to the legacy behavior which is "custom"
layoutMode: z.enum(boardLayoutModes.values).default("custom"),
baseLayoutId: z.string().nullish(),
});
export const boardSaveSchema = z.object({
@@ -90,6 +94,7 @@ export const boardSaveSchema = z.object({
export const boardCreateSchema = z.object({
name: boardNameSchema,
columnCount: boardColumnCountSchema,
layoutMode: z.enum(boardLayoutModes.values).default(boardLayoutModes.defaultValue),
isPublic: z.boolean(),
});
+3 -3
View File
@@ -48,9 +48,9 @@
"@homarr/translation": "workspace:^0.1.0",
"@homarr/ui": "workspace:^0.1.0",
"@homarr/validation": "workspace:^0.1.0",
"@mantine/charts": "^8.3.7",
"@mantine/core": "^8.3.7",
"@mantine/hooks": "^8.3.7",
"@mantine/charts": "^8.3.8",
"@mantine/core": "^8.3.8",
"@mantine/hooks": "^8.3.8",
"@tabler/icons-react": "^3.35.0",
"@tiptap/extension-color": "2.27.1",
"@tiptap/extension-highlight": "2.27.1",
+7 -1
View File
@@ -85,7 +85,13 @@ const getAllowedPermissions = (
const getSandboxFlags = (
permissions: Omit<WidgetComponentProps<"iframe">["options"], "embedUrl" | "allowScrolling">,
) => {
const baseSandbox = ["allow-scripts", "allow-same-origin", "allow-forms", "allow-popups"];
const baseSandbox = [
"allow-scripts",
"allow-same-origin",
"allow-forms",
"allow-popups",
"allow-top-navigation-by-user-activation",
];
if (permissions.allowFullScreen) {
baseSandbox.push("allow-presentation");
@@ -3,10 +3,11 @@
import { ActionIcon, Anchor, Avatar, Badge, Card, Group, Image, ScrollArea, Stack, Text, Tooltip } from "@mantine/core";
import { IconThumbDown, IconThumbUp } from "@tabler/icons-react";
import type { RouterInputs, RouterOutputs } from "@homarr/api";
import { clientApi } from "@homarr/api/client";
import { useRequiredBoard } from "@homarr/boards/context";
import { MediaAvailability, MediaRequestStatus } from "@homarr/integrations/types";
import type { ScopedTranslationFunction } from "@homarr/translation";
import type { MediaRequestStatus } from "@homarr/integrations/types";
import { mediaAvailabilityConfiguration, mediaRequestStatusConfiguration } from "@homarr/integrations/types";
import { useScopedI18n } from "@homarr/translation/client";
import type { WidgetComponentProps } from "../../definition";
@@ -18,7 +19,6 @@ export default function MediaServerWidget({
options,
width,
}: WidgetComponentProps<"mediaRequests-requestList">) {
const t = useScopedI18n("widget.mediaRequests-requestList");
const [mediaRequests] = clientApi.widget.mediaRequests.getLatestRequests.useSuspenseQuery(
{
integrationIds,
@@ -48,20 +48,18 @@ export default function MediaServerWidget({
return dataB.createdAt.getTime() - dataA.createdAt.getTime();
}
return dataA.status - dataB.status;
return (
mediaRequestStatusConfiguration[dataA.status].position -
mediaRequestStatusConfiguration[dataB.status].position
);
});
});
},
},
);
const { mutate: mutateRequestAnswer } = clientApi.widget.mediaRequests.answerRequest.useMutation();
const board = useRequiredBoard();
if (mediaRequests.length === 0) throw new NoIntegrationDataError();
const isTiny = width < 256;
return (
<ScrollArea
className="mediaRequests-list-scrollArea"
@@ -70,193 +68,188 @@ export default function MediaServerWidget({
>
<Stack className="mediaRequests-list-list" gap="xs" p="sm">
{mediaRequests.map((mediaRequest) => (
<Card
className={`mediaRequests-list-item-wrapper mediaRequests-list-item-${mediaRequest.type} mediaRequests-list-item-${mediaRequest.status}`}
<MediaRequestCard
key={`${mediaRequest.integrationId}-${mediaRequest.id}`}
radius={board.itemRadius}
p="xs"
withBorder
>
<Image
className="mediaRequests-list-item-background"
src={mediaRequest.backdropImageUrl}
pos="absolute"
w="100%"
h="100%"
opacity={0.2}
top={0}
left={0}
alt=""
/>
<Group
className="mediaRequests-list-item-contents"
h="100%"
style={{ zIndex: 1 }}
justify="space-between"
wrap="nowrap"
gap={0}
>
<Group className="mediaRequests-list-item-left-side" h="100%" gap="md" wrap="nowrap" flex={1}>
{!isTiny && (
<Image
className="mediaRequests-list-item-poster"
src={mediaRequest.posterImagePath}
h={40}
w="auto"
radius={"md"}
/>
)}
<Stack gap={0} w="100%">
<Group justify="space-between" gap="xs" className="mediaRequests-list-item-top-group">
<Group gap="xs">
<Text className="mediaRequests-list-item-media-year" size="xs">
{mediaRequest.airDate?.getFullYear() ?? t("toBeDetermined")}
</Text>
{!isTiny && (
<Badge
className="mediaRequests-list-item-media-status"
color={getAvailabilityProperties(mediaRequest.availability, t).color}
variant="light"
size="xs"
>
{getAvailabilityProperties(mediaRequest.availability, t).label}
</Badge>
)}
</Group>
<Group className="mediaRequests-list-item-request-user" gap={4} wrap="nowrap">
<Avatar
className="mediaRequests-list-item-request-user-avatar"
src={mediaRequest.requestedBy?.avatar}
size="xs"
/>
<Anchor
className="mediaRequests-list-item-request-user-name"
href={mediaRequest.requestedBy?.link}
c="var(--mantine-color-text)"
target={options.linksTargetNewTab ? "_blank" : "_self"}
fz="xs"
lineClamp={1}
style={{ wordBreak: "break-all" }}
>
{(mediaRequest.requestedBy?.displayName ?? "") || "unknown"}
</Anchor>
</Group>
</Group>
<Group gap="xs" justify="space-between" className="mediaRequests-list-item-bottom-group">
<Anchor
className="mediaRequests-list-item-info-second-line mediaRequests-list-item-media-title"
href={mediaRequest.href}
c="var(--mantine-color-text)"
target={options.linksTargetNewTab ? "_blank" : "_self"}
fz={isTiny ? "xs" : "sm"}
fw={"bold"}
title={mediaRequest.name}
lineClamp={1}
>
{mediaRequest.name || "unknown"}
</Anchor>
{mediaRequest.status === MediaRequestStatus.PendingApproval ? (
<Group className="mediaRequests-list-item-pending-buttons" gap="sm">
<Tooltip label={t("pending.approve")}>
<ActionIcon
className="mediaRequests-list-item-pending-button-approve"
variant="light"
color="green"
size="xs"
radius="md"
onClick={() => {
mutateRequestAnswer({
integrationId: mediaRequest.integrationId,
requestId: mediaRequest.id,
answer: "approve",
});
}}
>
<IconThumbUp size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label={t("pending.decline")}>
<ActionIcon
className="mediaRequests-list-item-pending-button-decline"
variant="light"
color="red"
size="xs"
radius="md"
onClick={() => {
mutateRequestAnswer({
integrationId: mediaRequest.integrationId,
requestId: mediaRequest.id,
answer: "decline",
});
}}
>
<IconThumbDown size={16} />
</ActionIcon>
</Tooltip>
</Group>
) : (
<StatusBadge status={mediaRequest.status} />
)}
</Group>
</Stack>
</Group>
</Group>
</Card>
request={mediaRequest}
isTiny={width <= 256}
options={options}
/>
))}
</Stack>
</ScrollArea>
);
}
const statusMapping = {
[MediaRequestStatus.PendingApproval]: { color: "blue", label: (t) => t("pending") },
[MediaRequestStatus.Approved]: { color: "green", label: (t) => t("approved") },
[MediaRequestStatus.Declined]: { color: "red", label: (t) => t("declined") },
[MediaRequestStatus.Failed]: { color: "red", label: (t) => t("failed") },
[MediaRequestStatus.Completed]: { color: "green", label: (t) => t("completed") },
} satisfies Record<
MediaRequestStatus,
{
color: string;
label: (t: ScopedTranslationFunction<"widget.mediaRequests-requestList.status">) => string;
}
>;
interface MediaRequestCardProps {
request: RouterOutputs["widget"]["mediaRequests"]["getLatestRequests"][number];
isTiny: boolean;
options: WidgetComponentProps<"mediaRequests-requestList">["options"];
}
const MediaRequestCard = ({ request, isTiny, options }: MediaRequestCardProps) => {
const board = useRequiredBoard();
const t = useScopedI18n("widget.mediaRequests-requestList");
return (
<Card
className={`mediaRequests-list-item-wrapper mediaRequests-list-item-${request.type} mediaRequests-list-item-${request.status}`}
radius={board.itemRadius}
p="xs"
withBorder
>
<Image
className="mediaRequests-list-item-background"
src={request.backdropImageUrl}
pos="absolute"
w="100%"
h="100%"
opacity={0.2}
top={0}
left={0}
alt=""
/>
<Group
className="mediaRequests-list-item-contents"
h="100%"
style={{ zIndex: 1 }}
justify="space-between"
wrap="nowrap"
gap={0}
>
<Group className="mediaRequests-list-item-left-side" h="100%" gap="md" wrap="nowrap" flex={1}>
{!isTiny && (
<Image
className="mediaRequests-list-item-poster"
src={request.posterImagePath}
h={40}
w="auto"
radius={"md"}
/>
)}
<Stack gap={0} w="100%">
<Group justify="space-between" gap="xs" className="mediaRequests-list-item-top-group">
<Group gap="xs">
<Text className="mediaRequests-list-item-media-year" size="xs">
{request.airDate?.getFullYear() ?? t("toBeDetermined")}
</Text>
{!isTiny && (
<Badge
className="mediaRequests-list-item-media-status"
color={mediaAvailabilityConfiguration[request.availability].color}
variant="light"
size="xs"
>
{t(`availability.${request.availability}`)}
</Badge>
)}
</Group>
<Group className="mediaRequests-list-item-request-user" gap={4} wrap="nowrap">
<Avatar
className="mediaRequests-list-item-request-user-avatar"
src={request.requestedBy?.avatar}
size="xs"
/>
<Anchor
className="mediaRequests-list-item-request-user-name"
href={request.requestedBy?.link}
c="var(--mantine-color-text)"
target={options.linksTargetNewTab ? "_blank" : "_self"}
fz="xs"
lineClamp={1}
style={{ wordBreak: "break-all" }}
>
{(request.requestedBy?.displayName ?? "") || "unknown"}
</Anchor>
</Group>
</Group>
<Group gap="xs" justify="space-between" className="mediaRequests-list-item-bottom-group">
<Anchor
className="mediaRequests-list-item-info-second-line mediaRequests-list-item-media-title"
href={request.href}
c="var(--mantine-color-text)"
target={options.linksTargetNewTab ? "_blank" : "_self"}
fz={isTiny ? "xs" : "sm"}
fw={"bold"}
title={request.name}
lineClamp={1}
>
{request.name || "unknown"}
</Anchor>
{request.status === "pending" ? (
<DecisionButtons requestId={request.id} integrationId={request.integrationId} />
) : (
<StatusBadge status={request.status} />
)}
</Group>
</Stack>
</Group>
</Group>
</Card>
);
};
interface DecisionButtonsProps {
requestId: number;
integrationId: string;
}
const DecisionButtons = ({ requestId, integrationId }: DecisionButtonsProps) => {
const { mutate: mutateRequestAnswer } = clientApi.widget.mediaRequests.answerRequest.useMutation();
const t = useScopedI18n("widget.mediaRequests-requestList");
const handleDecision = (answer: RouterInputs["widget"]["mediaRequests"]["answerRequest"]["answer"]) => {
mutateRequestAnswer({
integrationId,
requestId,
answer,
});
};
return (
<Group className="mediaRequests-list-item-pending-buttons" gap="sm">
<Tooltip label={t("pending.approve")}>
<ActionIcon
className="mediaRequests-list-item-pending-button-approve"
variant="light"
color="green"
size="xs"
radius="md"
onClick={() => {
handleDecision("approve");
}}
>
<IconThumbUp size={16} />
</ActionIcon>
</Tooltip>
<Tooltip label={t("pending.decline")}>
<ActionIcon
className="mediaRequests-list-item-pending-button-decline"
variant="light"
color="red"
size="xs"
radius="md"
onClick={() => {
handleDecision("decline");
}}
>
<IconThumbDown size={16} />
</ActionIcon>
</Tooltip>
</Group>
);
};
interface StatusBadgeProps {
status: MediaRequestStatus;
}
const StatusBadge = ({ status }: StatusBadgeProps) => {
const { color, label } = statusMapping[status];
const tStatus = useScopedI18n("widget.mediaRequests-requestList.status");
return (
<Badge size="xs" color={color} variant="light">
{label(tStatus)}
<Badge size="xs" color={mediaRequestStatusConfiguration[status].color} variant="light">
{tStatus(status)}
</Badge>
);
};
function getAvailabilityProperties(
mediaRequestAvailability: MediaAvailability,
t: ScopedTranslationFunction<"widget.mediaRequests-requestList">,
) {
switch (mediaRequestAvailability) {
case MediaAvailability.Available:
return { color: "green", label: t("availability.available") };
case MediaAvailability.PartiallyAvailable:
return { color: "yellow", label: t("availability.partiallyAvailable") };
case MediaAvailability.Processing:
return { color: "blue", label: t("availability.processing") };
case MediaAvailability.Pending:
return { color: "violet", label: t("availability.pending") };
case MediaAvailability.Blacklisted:
return { color: "gray", label: t("availability.blacklisted") };
case MediaAvailability.Deleted:
return { color: "red", label: t("availability.deleted") };
default:
return { color: "orange", label: t("availability.unknown") };
}
}
Loaded 100 of 106 files, more files were not shown because too many files have changed in this diff. Show more