Merge branch 'feature/usenet-downloads' of https://github.com/homarr-…

…labs/homarr into feat/download-clients-integration-and-widget
homarr-labs · Jul 31, 2024 · 6700fce · 6700fce
2 parents e133977 + d90f9f0
commit 6700fce
Show file tree

Hide file tree

Showing 116 changed files with 4,777 additions and 1,236 deletions.
diff --git a/.github/workflows/deployment-docker-image.yml b/.github/workflows/deployment-docker-image.yml
@@ -13,6 +13,11 @@ on:
         required: false
         default: true
         description: Send notifications
+      push-image:
+        type: boolean
+        required: false
+        default: true
+        description: Push image to remote repository
 
 permissions:
   contents: write
@@ -63,17 +68,19 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: "pnpm"
-      - name: Install dependencies
-        run: pnpm install
-      - name: Build artifacts
-        run: pnpm build
       - name: Discord notification
         if: ${{ github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         uses: Ilshidur/action-discord@master
         with:
           args: "Built application artifacts. Building images..."
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -84,19 +91,20 @@ jobs:
         with:
           images: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
           tags: |
-            type=raw,value=latest
-            type=raw,value=${{ steps.semver.outputs.next }}
+            type=raw,value=alpha
+            type=raw,value=early-adopters
+#          tags: |
+#            type=raw,value=latest
+#            type=raw,value=${{ steps.semver.outputs.next }}
       - name: Build and push
         id: buildPushAction
         uses: docker/build-push-action@v6
         with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64 # we currently do't build for linux/arm64 as it's really slow and we'll move to a self hosted runner for that or use the official github runner, once it's available
           context: .
-          push: false
+          push: ${{ github.event.inputs['push-image'] }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
           network: host
         env:
           SKIP_ENV_VALIDATION: true

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.15.1
+20.16.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,9 @@
-FROM node:20.15.1-alpine AS base
+FROM node:20.16.0-alpine AS base
 
 FROM base AS builder
 RUN apk add --no-cache libc6-compat
 RUN apk update
+
 # Set working directory
 WORKDIR /app
 COPY . .
@@ -35,6 +36,7 @@ RUN corepack enable pnpm && pnpm install
 
 COPY --from=builder /app/next-out/json/ .
 COPY --from=builder /app/next-out/pnpm-lock.yaml ./pnpm-lock.yaml
+RUN corepack enable pnpm && pnpm install
 
 RUN corepack enable pnpm && pnpm install sharp -w
 
@@ -46,8 +48,9 @@ COPY --from=builder /app/migration-out/full/ .
 
 # Copy static data as it is not part of the build
 COPY static-data ./static-data
-ARG SKIP_ENV_VALIDATION=true
-RUN corepack enable pnpm && pnpm turbo run build
+ARG SKIP_ENV_VALIDATION='true'
+ARG DISABLE_REDIS_LOGS='true'
+RUN corepack enable pnpm && pnpm build
 
 FROM base AS runner
 WORKDIR /app
@@ -84,6 +87,6 @@ COPY --chown=nextjs:nodejs packages/redis/redis.conf /app/redis.conf
 ENV DB_URL='/appdata/db/db.sqlite'
 ENV DB_DIALECT='sqlite'
 ENV DB_DRIVER='better-sqlite3'
-ENV AUTH_PROVIDERS=credentials
+ENV AUTH_PROVIDERS='credentials'
 
 CMD ["sh", "run.sh"]
diff --git a/apps/nextjs/next.config.mjs b/apps/nextjs/next.config.mjs
@@ -9,11 +9,14 @@ const config = {
   /** We already do linting and typechecking as separate tasks in CI */
   eslint: { ignoreDuringBuilds: true },
   typescript: { ignoreBuildErrors: true },
-  webpack: (config) => {
-    config.module.rules.push({
-      test: /\.node$/,
-      loader: "node-loader",
-    });
+  webpack: (config, { isServer }) => {
+    if (isServer) {
+      config.module.rules.push({
+        test: /\.node$/,
+        loader: "node-loader",
+      });
+    }
+
     return config;
   },
   experimental: {

diff --git a/apps/nextjs/package.json b/apps/nextjs/package.json
@@ -38,10 +38,10 @@
     "@mantine/modals": "^7.11.2",
     "@mantine/tiptap": "^7.11.2",
     "@homarr/server-settings": "workspace:^0.1.0",
-    "@t3-oss/env-nextjs": "^0.10.1",
-    "@tanstack/react-query": "^5.51.11",
-    "@tanstack/react-query-devtools": "^5.51.11",
-    "@tanstack/react-query-next-experimental": "5.51.11",
+    "@t3-oss/env-nextjs": "^0.11.0",
+    "@tanstack/react-query": "^5.51.16",
+    "@tanstack/react-query-devtools": "^5.51.16",
+    "@tanstack/react-query-next-experimental": "5.51.16",
     "@tabler/icons-react": "^3.11.0",
     "@trpc/client": "next",
     "@trpc/next": "next",
@@ -50,16 +50,16 @@
     "@xterm/addon-canvas": "^0.7.0",
     "@xterm/addon-fit": "0.10.0",
     "@xterm/xterm": "^5.5.0",
-    "chroma-js": "^2.4.2",
+    "chroma-js": "^2.6.0",
     "clsx": "^2.1.1",
     "dayjs": "^1.11.12",
     "dotenv": "^16.4.5",
     "flag-icons": "^7.2.3",
     "glob": "^11.0.0",
-    "jotai": "^2.9.0",
+    "jotai": "^2.9.1",
     "mantine-react-table": "2.0.0-beta.6",
     "next": "^14.2.5",
-    "postcss-preset-mantine": "^1.16.0",
+    "postcss-preset-mantine": "^1.17.0",
     "prismjs": "^1.29.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -74,15 +74,15 @@
     "@homarr/prettier-config": "workspace:^0.1.0",
     "@homarr/tsconfig": "workspace:^0.1.0",
     "@types/chroma-js": "2.4.4",
-    "@types/node": "^20.14.11",
+    "@types/node": "^20.14.13",
     "@types/prismjs": "^1.26.4",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "concurrently": "^8.2.2",
-    "eslint": "^9.7.0",
+    "eslint": "^9.8.0",
     "node-loader": "^2.0.0",
     "prettier": "^3.3.3",
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.4"
   },
   "prettier": "@homarr/prettier-config"
 }
diff --git a/apps/nextjs/src/app/[locale]/auth/invite/[id]/page.tsx b/apps/nextjs/src/app/[locale]/auth/invite/[id]/page.tsx
@@ -2,6 +2,7 @@ import { notFound } from "next/navigation";
 import { Card, Center, Stack, Text, Title } from "@mantine/core";
 
 import { auth } from "@homarr/auth/next";
+import { isProviderEnabled } from "@homarr/auth/server";
 import { and, db, eq } from "@homarr/db";
 import { invites } from "@homarr/db/schema/sqlite";
 import { getScopedI18n } from "@homarr/translation/server";
@@ -19,6 +20,8 @@ interface InviteUsagePageProps {
 }
 
 export default async function InviteUsagePage({ params, searchParams }: InviteUsagePageProps) {
+  if (!isProviderEnabled("credentials")) notFound();
+
   const session = await auth();
   if (session) notFound();
 

diff --git a/apps/nextjs/src/app/[locale]/layout.tsx b/apps/nextjs/src/app/[locale]/layout.tsx
@@ -4,6 +4,7 @@ import { Inter } from "next/font/google";
 import "@homarr/ui/styles.css";
 import "@homarr/notifications/styles.css";
 import "@homarr/spotlight/styles.css";
+import "~/styles/scroll-area.scss";
 
 import { ColorSchemeScript, createTheme, MantineProvider } from "@mantine/core";
 

diff --git a/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx b/apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx
@@ -3,7 +3,8 @@
 import { useCallback } from "react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { Button, Fieldset, Group, SegmentedControl, Stack, TextInput } from "@mantine/core";
+import { Alert, Button, Fieldset, Group, SegmentedControl, Stack, Text, TextInput } from "@mantine/core";
+import { IconInfoCircle } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
 import type { IntegrationKind, IntegrationSecretKind } from "@homarr/definitions";
@@ -95,6 +96,11 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
                 {...form.getInputProps(`secrets.${index}.value`)}
               />
             ))}
+            {form.values.secrets.length === 0 && (
+              <Alert icon={<IconInfoCircle size={"1rem"} />} color={"blue"}>
+                <Text c={"blue"}>{t("integration.secrets.noSecretsRequired.text")}</Text>
+              </Alert>
+            )}
           </Stack>
         </Fieldset>
 
@@ -120,12 +126,20 @@ const SecretKindsSegmentedControl = ({ secretKinds, form }: SecretKindsSegmented
   const t = useScopedI18n("integration.secrets");
 
   const secretKindGroups = secretKinds.map((kinds) => ({
-    label: kinds.map((kind) => t(`kind.${kind}.label`)).join(" & "),
-    value: kinds.join("-"),
+    label:
+      kinds.length === 0
+        ? t("noSecretsRequired.segmentTitle")
+        : kinds.map((kind) => t(`kind.${kind}.label`)).join(" & "),
+    value: kinds.length === 0 ? "empty" : kinds.join("-"),
   }));
 
   const onChange = useCallback(
     (value: string) => {
+      if (value === "empty") {
+        form.setFieldValue("secrets", []);
+        return;
+      }
+
       const kinds = value.split("-") as IntegrationSecretKind[];
       const secrets = kinds.map((kind) => ({
         kind,

diff --git a/apps/nextjs/src/app/[locale]/manage/layout.tsx b/apps/nextjs/src/app/[locale]/manage/layout.tsx
@@ -22,6 +22,7 @@ import {
   IconUsersGroup,
 } from "@tabler/icons-react";
 
+import { isProviderEnabled } from "@homarr/auth/server";
 import { getScopedI18n } from "@homarr/translation/server";
 
 import { MainHeader } from "~/components/layout/header";
@@ -65,6 +66,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
           label: t("items.users.items.invites"),
           icon: IconMailForward,
           href: "/manage/users/invites",
+          hidden: !isProviderEnabled("credentials"),
         },
         {
           label: t("items.users.items.groups"),

diff --git a/apps/nextjs/src/app/[locale]/manage/page.tsx b/apps/nextjs/src/app/[locale]/manage/page.tsx
@@ -3,6 +3,7 @@ import { Card, Group, SimpleGrid, Space, Stack, Text } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
 
 import { api } from "@homarr/api/server";
+import { isProviderEnabled } from "@homarr/auth/server";
 import { getScopedI18n } from "@homarr/translation/server";
 
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
@@ -14,6 +15,7 @@ interface LinkProps {
   subtitle: string;
   count: number;
   href: string;
+  hidden?: boolean;
 }
 
 export async function generateMetadata() {
@@ -42,6 +44,7 @@ export default async function ManagementPage() {
       title: t("statistic.createUser"),
     },
     {
+      hidden: !isProviderEnabled("credentials"),
       count: statistics.countInvites,
       href: "/manage/users/invites",
       subtitle: t("statisticLabel.authentication"),
@@ -72,24 +75,27 @@ export default async function ManagementPage() {
       <HeroBanner />
       <Space h="md" />
       <SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
-        {links.map((link, index) => (
-          <Card component={Link} href={link.href} key={`link-${index}`} withBorder>
-            <Group justify="space-between" wrap="nowrap">
-              <Group wrap="nowrap">
-                <Text size="2.4rem" fw="bolder">
-                  {link.count}
-                </Text>
-                <Stack gap={0}>
-                  <Text c="red" size="xs">
-                    {link.subtitle}
-                  </Text>
-                  <Text fw="bold">{link.title}</Text>
-                </Stack>
-              </Group>
-              <IconArrowRight />
-            </Group>
-          </Card>
-        ))}
+        {links.map(
+          (link) =>
+            !link.hidden && (
+              <Card component={Link} href={link.href} key={link.href} withBorder>
+                <Group justify="space-between" wrap="nowrap">
+                  <Group wrap="nowrap">
+                    <Text size="2.4rem" fw="bolder">
+                      {link.count}
+                    </Text>
+                    <Stack gap={0}>
+                      <Text c="red" size="xs">
+                        {link.subtitle}
+                      </Text>
+                      <Text fw="bold">{link.title}</Text>
+                    </Stack>
+                  </Group>
+                  <IconArrowRight />
+                </Group>
+              </Card>
+            ),
+        )}
       </SimpleGrid>
     </>
   );

diff --git a/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-table.tsx b/apps/nextjs/src/app/[locale]/manage/tools/docker/docker-table.tsx
@@ -4,7 +4,7 @@ import type { MantineColor } from "@mantine/core";
 import { Avatar, Badge, Box, Button, Group, Text } from "@mantine/core";
 import { IconPlayerPlay, IconPlayerStop, IconRotateClockwise, IconTrash } from "@tabler/icons-react";
 import type { MRT_ColumnDef } from "mantine-react-table";
-import { MantineReactTable, useMantineReactTable } from "mantine-react-table";
+import { MantineReactTable } from "mantine-react-table";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -15,6 +15,7 @@ import type { TranslationFunction } from "@homarr/translation";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import type { TablerIcon } from "@homarr/ui";
 import { OverflowBadge } from "@homarr/ui";
+import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
 
 const createColumns = (
   t: TranslationFunction,
@@ -74,7 +75,7 @@ export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"
     refetchOnReconnect: false,
   });
   const relativeTime = useTimeAgo(data.timestamp);
-  const table = useMantineReactTable({
+  const table = useTranslatedMantineReactTable({
     data: data.containers,
     enableDensityToggle: false,
     enableColumnActions: false,

diff --git a/apps/nextjs/src/app/[locale]/manage/tools/tasks/_components/jobs-list.tsx b/apps/nextjs/src/app/[locale]/manage/tools/tasks/_components/jobs-list.tsx
@@ -58,7 +58,7 @@ export const JobsList = ({ initialJobs }: JobsListProps) => {
           <Group justify={"space-between"} gap={"md"}>
             <Stack gap={0}>
               <Group>
-                <Text>{t(`${job.job.name}.label` as TranslationKeys)}</Text>
+                <Text>{t(`job.${job.job.name}.label` as TranslationKeys)}</Text>
                 {job.status?.status === "idle" && <Badge variant="default">{t("status.idle")}</Badge>}
                 {job.status?.status === "running" && <Badge color="green">{t("status.running")}</Badge>}
                 {job.status?.lastExecutionStatus === "error" && <Badge color="red">{t("status.error")}</Badge>}