Merge branch 'dev' into feat/rework-perferences

apps/nextjs/src/app/[locale]/init/_steps/settings/init-settings.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { startTransition } from "react";
 import { Button, Card, Group, Stack, Switch, Text } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
 import type { z } from "zod/v4";
@@ -24,16 +23,6 @@ export const InitSettings = () => {
   });
   const form = useZodForm(settingsInitSchema, { initialValues: defaultServerSettings });
 
-  form.watch("analytics.enableGeneral", ({ value }) => {
-    if (!value) {
-      startTransition(() => {
-        form.setFieldValue("analytics.enableWidgetData", false);
-        form.setFieldValue("analytics.enableIntegrationData", false);
-        form.setFieldValue("analytics.enableUserData", false);
-      });
-    }
-  });
-
   const handleSubmitAsync = async (values: z.infer<typeof settingsInitSchema>) => {
     await mutateAsync(values);
   };
@@ -47,24 +36,6 @@ export const InitSettings = () => {
 
             <Stack gap="xs">
               <AnalyticsRow kind="general" {...form.getInputProps("analytics.enableGeneral", { type: "checkbox" })} />
-
-              <Stack gap="xs" ps="md" w="100%">
-                <AnalyticsRow
-                  kind="integrationData"
-                  disabled={!form.values.analytics.enableGeneral}
-                  {...form.getInputProps("analytics.enableWidgetData", { type: "checkbox" })}
-                />
-                <AnalyticsRow
-                  kind="widgetData"
-                  disabled={!form.values.analytics.enableGeneral}
-                  {...form.getInputProps("analytics.enableIntegrationData", { type: "checkbox" })}
-                />
-                <AnalyticsRow
-                  kind="usersData"
-                  disabled={!form.values.analytics.enableGeneral}
-                  {...form.getInputProps("analytics.enableUserData", { type: "checkbox" })}
-                />
-              </Stack>
             </Stack>
           </Stack>
         </Card>

apps/nextjs/src/app/[locale]/manage/settings/_components/analytics.settings.tsx

@@ -24,15 +24,6 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
         return;
       }
 
-      if (
-        !updatedValues.enableGeneral &&
-        (updatedValues.enableWidgetData || updatedValues.enableIntegrationData || updatedValues.enableUserData)
-      ) {
-        updatedValues.enableIntegrationData = false;
-        updatedValues.enableUserData = false;
-        updatedValues.enableWidgetData = false;
-      }
-
       void mutateAsync({
         settingsKey: "analytics",
         value: updatedValues,
@@ -54,30 +45,6 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
         <LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
         <Stack>
           <SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
-          <SwitchSetting
-            form={form}
-            formKey="enableIntegrationData"
-            ms="xl"
-            title={t("integrationData.title")}
-            text={t("integrationData.text")}
-            disabled={!form.values.enableGeneral}
-          />
-          <SwitchSetting
-            form={form}
-            formKey="enableWidgetData"
-            ms="xl"
-            title={t("widgetData.title")}
-            text={t("widgetData.text")}
-            disabled={!form.values.enableGeneral}
-          />
-          <SwitchSetting
-            form={form}
-            formKey="enableUserData"
-            ms="xl"
-            title={t("usersData.title")}
-            text={t("usersData.text")}
-            disabled={!form.values.enableGeneral}
-          />
         </Stack>
       </Card>
     </>

apps/nextjs/src/app/[locale]/manage/tools/tasks/_components/tasks-table.tsx

@@ -117,6 +117,8 @@ const createColumns = (
     header: tTasks("field.interval.label"),
     size: 200,
     Cell({ row }) {
+      if (row.original.preventCustomInterval) return null;
+
       const handleIntervalChange = (newCron: string | null) => {
         if (!newCron || newCron === row.original.cron) return;
 

apps/nextjs/src/components/board/items/item-menu.tsx

@@ -3,6 +3,7 @@ import { ActionIcon, Menu } from "@mantine/core";
 import { IconCopy, IconDotsVertical, IconLayoutKanban, IconPencil, IconTrash } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
+import { useSession } from "@homarr/auth/client";
 import { useEditMode } from "@homarr/boards/edit-mode";
 import { useConfirmModal, useModalAction } from "@homarr/modals";
 import { useSettings } from "@homarr/settings";
@@ -15,15 +16,20 @@ import { useSectionContext } from "../sections/section-context";
 import { useItemActions } from "./item-actions";
 import { ItemMoveModal } from "./item-move-modal";
 
-export const BoardItemMenu = ({
-  offset,
-  item,
-  resetErrorBoundary,
-}: {
+interface BoardItemMenuProps {
   offset: number;
   item: SectionItem;
   resetErrorBoundary?: () => void;
-}) => {
+}
+
+export const BoardItemMenu = (props: BoardItemMenuProps) => {
+  const { data: session } = useSession();
+  if (!session) return null;
+
+  return <BoardItemMenuInner {...props} />;
+};
+
+const BoardItemMenuInner = ({ offset, item, resetErrorBoundary }: BoardItemMenuProps) => {
   const refResetErrorBoundaryOnNextRender = useRef(false);
   const tItem = useScopedI18n("item");
   const t = useI18n();

apps/nextjs/src/components/board/items/item-select-modal.tsx

@@ -1,9 +1,10 @@
 import { useMemo, useState } from "react";
-import { Button, Card, Center, Grid, Input, Stack, Text } from "@mantine/core";
+import { Avatar, Button, Card, Center, Grid, Group, Input, Stack, Text, Tooltip } from "@mantine/core";
 import { IconSearch } from "@tabler/icons-react";
 
 import { objectEntries } from "@homarr/common";
-import type { WidgetKind } from "@homarr/definitions";
+import { getIconUrl, getIntegrationName } from "@homarr/definitions";
+import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
 import { createModal } from "@homarr/modals";
 import { useI18n } from "@homarr/translation/client";
 import type { TablerIcon } from "@homarr/ui";
@@ -21,6 +22,10 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
       objectEntries(widgetImports)
         .map(([kind, value]) => ({
           kind,
+          supportedIntegrations:
+            "supportedIntegrations" in value.definition
+              ? value.definition.supportedIntegrations.filter((integration) => integration !== "mock")
+              : [],
           icon: value.definition.icon,
           name: t(`widget.${kind}.name`),
           description: t(`widget.${kind}.description`),
@@ -74,6 +79,7 @@ const WidgetItem = ({
 }: {
   item: {
     kind: WidgetKind;
+    supportedIntegrations: IntegrationKind[];
     name: string;
     description: string;
     icon: TablerIcon;
@@ -97,7 +103,8 @@ const WidgetItem = ({
               {item.description}
             </Text>
           </Stack>
-          <Button onClick={onSelect} variant="light" size="xs" mt="auto" radius="md" fullWidth>
+          <SupportedIntegrations mt="auto" integrations={item.supportedIntegrations} />
+          <Button onClick={onSelect} variant="light" size="xs" radius="md" fullWidth>
             {t(`item.create.addToBoard`)}
           </Button>
         </Stack>
@@ -105,3 +112,48 @@ const WidgetItem = ({
     </Grid.Col>
   );
 };
+
+interface SupportedIntegrationsProps {
+  integrations: IntegrationKind[];
+  mt: string;
+}
+
+const SupportedIntegrations = ({ integrations, mt }: SupportedIntegrationsProps) => {
+  if (integrations.length === 0) {
+    return null;
+  }
+
+  // When there are 8 or more integrations, we show 6 and a "+X" avatar. Otherwise, we show all integrations.
+  const countToShow = integrations.length >= 8 ? 6 : 7;
+  const moreCount = integrations.length - countToShow;
+
+  return (
+    <Center mt={mt}>
+      <Tooltip.Group openDelay={300} closeDelay={100}>
+        <Group gap={2}>
+          {integrations.slice(0, countToShow).map((integration) => (
+            <Tooltip key={integration} label={getIntegrationName(integration)} withArrow>
+              <Avatar src={getIconUrl(integration)} size="xs" radius="xl" />
+            </Tooltip>
+          ))}
+          {moreCount > 0 && (
+            <Tooltip
+              withArrow
+              label={
+                <>
+                  {integrations.slice(countToShow).map((integration) => (
+                    <div key={integration}>{getIntegrationName(integration)}</div>
+                  ))}
+                </>
+              }
+            >
+              <Avatar radius="xl" size="xs">
+                +{moreCount}
+              </Avatar>
+            </Tooltip>
+          )}
+        </Group>
+      </Tooltip.Group>
+    </Center>
+  );
+};

apps/nextjs/src/components/board/sections/category/category-actions.ts

@@ -58,6 +58,7 @@ export const useCategoryActions = () => {
               ...section,
               yOffset: section.yOffset + 2,
             })),
+          ...previous.sections.filter((section) => section.kind !== "category" && section.kind !== "empty"),
         ] satisfies Section[],
       }));
     },