fix: notification display and functionality + nuxtui refactor

.gitignore

@@ -122,7 +122,10 @@ api/dev/Unraid.net/myservers.cfg
 
 # local Mise settings
 .mise.toml
+mise.toml
 
 # Compiled test pages (generated from Nunjucks templates)
 web/public/test-pages/*.html
 
+# local scripts for testing and development
+.dev-scripts/

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.page": "php"
+    },
+    "intelephense.format.enable": false,
+}

@tailwind-shared/base-utilities.css

@@ -86,4 +86,4 @@ unraid-sso-button.unapi {
   --text-7xl: 4.5rem;
   --text-8xl: 6rem;
   --text-9xl: 8rem;
-}
+}

@tailwind-shared/index.css

@@ -2,4 +2,4 @@
 @import './css-variables.css';
 @import './unraid-theme.css';
 @import './theme-variants.css';
-@import './base-utilities.css';
+@import './base-utilities.css';

@tailwind-shared/theme-variants.css

@@ -65,4 +65,4 @@
 /* Dark Mode Overrides */
 .dark {
   --color-border: #383735;
-}
+}

api/dev/configs/api.json

@@ -3,7 +3,5 @@
   "extraOrigins": [],
   "sandbox": true,
   "ssoSubIds": [],
-  "plugins": [
-    "unraid-api-plugin-connect"
-  ]
+  "plugins": []
 }

api/generated-schema.graphql

@@ -1395,6 +1395,13 @@ type NotificationCounts {
   total: Int!
 }
 
+type NotificationSettings {
+  position: String!
+  expand: Boolean!
+  duration: Int!
+  max: Int!
+}
+
 type NotificationOverview {
   unread: NotificationCounts!
   archive: NotificationCounts!
@@ -1438,6 +1445,7 @@ type Notifications implements Node {
   Deduplicated list of unread warning and alert notifications, sorted latest first.
   """
   warningsAndAlerts: [Notification!]!
+  settings: NotificationSettings!
 }
 
 input NotificationFilter {

api/package.json

@@ -39,13 +39,15 @@
         "// Testing": "",
         "test": "NODE_ENV=test vitest run",
         "test:watch": "NODE_ENV=test vitest --ui",
+        "test:modifications:update": "rm -rf src/unraid-api/unraid-file-modifier/modifications/__test__/__fixtures__/downloaded src/unraid-api/unraid-file-modifier/modifications/patches /Users/ajitmehrotra/Projects/Unraid/api/api/src/unraid-api/unraid-file-modifier/modifications/__test__/snapshots && NODE_ENV=test vitest run src/unraid-api/unraid-file-modifier/modifications/__test__/generic-modification.spec.ts -u",
         "coverage": "NODE_ENV=test vitest run --coverage",
         "// Docker": "",
         "container:build": "./scripts/dc.sh build dev",
         "container:start": "pnpm run container:stop && ./scripts/dc.sh run --rm --service-ports dev",
         "container:stop": "./scripts/dc.sh stop dev",
         "container:test": "./scripts/dc.sh run --rm builder pnpm run test",
         "container:enter": "./scripts/dc.sh exec dev /bin/bash",
+        "docker:build-and-run": "pnpm --filter @unraid/connect-plugin docker:build-and-run",
         "// Migration Scripts": "",
         "migration:codefirst": "tsx ./src/unraid-api/graph/migration-script.ts"
     },

api/src/__test__/utils.test.ts

@@ -68,6 +68,29 @@ describe('formatDatetime', () => {
             }
         );
     });
+
+    describe('Unraid PHP-style date formats (conversion)', () => {
+        const phpFormats = [
+            ['d-m-Y', '14-02-2024'],
+            ['m-d-Y', '02-14-2024'],
+            ['Y-m-d', '2024-02-14'],
+        ];
+
+        const phpTimeFormats = [
+            ['h:i A', '12:34 PM'],
+            ['H:i', '12:34'],
+        ];
+
+        it.each(phpFormats)('converts and formats date with %s', (format, expected) => {
+            const result = formatDatetime(testDate, { dateFormat: format });
+            expect(result).toContain(expected);
+        });
+
+        it.each(phpTimeFormats)('converts and formats time with %s', (format, expected) => {
+            const result = formatDatetime(testDate, { timeFormat: format, dateFormat: 'Y-m-d' });
+            expect(result).toContain(expected);
+        });
+    });
 });
 
 describe('csvStringToArray', () => {

api/src/core/types/ini.ts

@@ -73,10 +73,10 @@ interface Notify {
     plugin: string;
     docker_notify: string;
     report: string;
-    /** @deprecated (will remove in future release). Date format: DD-MM-YYYY, MM-DD-YYY, or YYYY-MM-DD */
+    /** Date format: DD-MM-YYYY, MM-DD-YYY, or YYYY-MM-DD */
     date: 'd-m-Y' | 'm-d-Y' | 'Y-m-d';
     /**
-     * @deprecated (will remove in future release). Time format:
+     * Time format:
      * - `hi: A` => 12 hr
      * - `H:i`   => 24 hr (default)
      */
@@ -93,6 +93,9 @@ interface Notify {
     system: string;
     version: string;
     docker_update: string;
+    expand?: string | boolean;
+    duration?: string | number;
+    max?: string | number;
 }
 
 interface Ssmtp {

api/src/unraid-api/cli/generated/graphql.ts

@@ -560,6 +560,17 @@ export type CpuLoad = {
   percentUser: Scalars['Float']['output'];
 };
 
+export type CpuPackages = Node & {
+  __typename?: 'CpuPackages';
+  id: Scalars['PrefixedID']['output'];
+  /** Power draw per package (W) */
+  power: Array<Scalars['Float']['output']>;
+  /** Temperature per package (°C) */
+  temp: Array<Scalars['Float']['output']>;
+  /** Total CPU package power draw (W) */
+  totalPower: Scalars['Float']['output'];
+};
+
 export type CpuUtilization = Node & {
   __typename?: 'CpuUtilization';
   /** CPU load for each core */
@@ -591,6 +602,19 @@ export type Customization = {
   theme: Theme;
 };
 
+/** Customization related mutations */
+export type CustomizationMutations = {
+  __typename?: 'CustomizationMutations';
+  /** Update the UI theme (writes dynamix.cfg) */
+  setTheme: Theme;
+};
+
+
+/** Customization related mutations */
+export type CustomizationMutationsSetThemeArgs = {
+  theme: ThemeName;
+};
+
 export type DeleteApiKeyInput = {
   ids: Array<Scalars['PrefixedID']['input']>;
 };
@@ -1065,6 +1089,7 @@ export type InfoCpu = Node & {
   manufacturer?: Maybe<Scalars['String']['output']>;
   /** CPU model */
   model?: Maybe<Scalars['String']['output']>;
+  packages: CpuPackages;
   /** Number of physical processors */
   processors?: Maybe<Scalars['Int']['output']>;
   /** CPU revision */
@@ -1081,6 +1106,8 @@ export type InfoCpu = Node & {
   stepping?: Maybe<Scalars['Int']['output']>;
   /** Number of CPU threads */
   threads?: Maybe<Scalars['Int']['output']>;
+  /** Per-package array of core/thread pairs, e.g. [[[0,1],[2,3]], [[4,5],[6,7]]] */
+  topology: Array<Array<Array<Scalars['Int']['output']>>>;
   /** CPU vendor */
   vendor?: Maybe<Scalars['String']['output']>;
   /** CPU voltage */
@@ -1422,6 +1449,7 @@ export type Mutation = {
   createDockerFolderWithItems: ResolvedOrganizerV1;
   /** Creates a new notification record */
   createNotification: Notification;
+  customization: CustomizationMutations;
   /** Deletes all archived notifications on server. */
   deleteArchivedNotifications: NotificationOverview;
   deleteDockerEntries: ResolvedOrganizerV1;
@@ -1659,6 +1687,14 @@ export type NotificationOverview = {
   unread: NotificationCounts;
 };
 
+export type NotificationSettings = {
+  __typename?: 'NotificationSettings';
+  duration: Scalars['Int']['output'];
+  expand: Scalars['Boolean']['output'];
+  max: Scalars['Int']['output'];
+  position: Scalars['String']['output'];
+};
+
 export enum NotificationType {
   ARCHIVE = 'ARCHIVE',
   UNREAD = 'UNREAD'
@@ -1670,6 +1706,7 @@ export type Notifications = Node & {
   list: Array<Notification>;
   /** A cached overview of the notifications in the system & their severity. */
   overview: NotificationOverview;
+  settings: NotificationSettings;
   /** Deduplicated list of unread warning and alert notifications, sorted latest first. */
   warningsAndAlerts: Array<Notification>;
 };
@@ -2269,6 +2306,7 @@ export type Subscription = {
   parityHistorySubscription: ParityCheck;
   serversSubscription: Server;
   systemMetricsCpu: CpuUtilization;
+  systemMetricsCpuTelemetry: CpuPackages;
   systemMetricsMemory: MemoryUtilization;
   upsUpdates: UpsDevice;
 };

api/src/unraid-api/config/api-config.module.ts

@@ -29,21 +29,25 @@ export const loadApiConfig = async () => {
     const defaultConfig = createDefaultConfig();
     const apiHandler = new ApiConfigPersistence(new ConfigService()).getFileHandler();
 
-    const diskConfig: Partial<ApiConfig> = await apiHandler.loadConfig();
-    // Hack: cleanup stale connect plugin entry if necessary
-    if (!isConnectPluginInstalled()) {
-        diskConfig.plugins = diskConfig.plugins?.filter(
-            (plugin) => plugin !== 'unraid-api-plugin-connect'
-        );
-        await apiHandler.writeConfigFile(diskConfig as ApiConfig);
-    }
+    try {
+        const diskConfig: Partial<ApiConfig> = await apiHandler.loadConfig();
+        // Hack: cleanup stale connect plugin entry if necessary
+        if (!isConnectPluginInstalled() && diskConfig.plugins) {
+            diskConfig.plugins = diskConfig.plugins?.filter(
+                (plugin) => plugin !== 'unraid-api-plugin-connect'
+            );
+            await apiHandler.writeConfigFile(diskConfig as ApiConfig);
+        }
 
-    return {
-        ...defaultConfig,
-        ...diskConfig,
-        // diskConfig's version may be older, but we still want to use the correct version
-        version: API_VERSION,
-    };
+        return {
+            ...defaultConfig,
+            ...diskConfig,
+            // diskConfig's version may be older, but we still want to use the correct version
+            version: API_VERSION,
+        };
+    } catch (e) {
+        return defaultConfig;
+    }
 };
 
 /**

api/src/unraid-api/config/api-config.test.ts

@@ -194,6 +194,12 @@ describe('ApiConfigPersistence', () => {
 describe('loadApiConfig', () => {
     beforeEach(async () => {
         vi.clearAllMocks();
+        vi.spyOn(ApiConfigPersistence.prototype, 'getFileHandler').mockReturnValue({
+            loadConfig: vi.fn().mockResolvedValue({}),
+            readConfigFile: vi.fn().mockResolvedValue({}),
+            writeConfigFile: vi.fn().mockResolvedValue(true),
+            updateConfig: vi.fn().mockResolvedValue(true),
+        } as any);
     });
 
     it('should return default config with current API_VERSION', async () => {
@@ -209,6 +215,13 @@ describe('loadApiConfig', () => {
     });
 
     it('should handle errors gracefully and return defaults', async () => {
+        vi.spyOn(ApiConfigPersistence.prototype, 'getFileHandler').mockReturnValue({
+            loadConfig: vi.fn().mockRejectedValue(new Error('Config load failed')),
+            readConfigFile: vi.fn().mockResolvedValue({}),
+            writeConfigFile: vi.fn(),
+            updateConfig: vi.fn(),
+        } as any);
+
         const result = await loadApiConfig();
 
         expect(result).toEqual({

api/src/unraid-api/graph/resolvers/docker/docker.constants.ts

@@ -0,0 +1 @@
+export const DOCKER_SERVICE_TOKEN = Symbol('DOCKER_SERVICE');

api/src/unraid-api/graph/resolvers/notifications/notifications.model.ts

@@ -1,7 +1,7 @@
 import { Field, InputType, Int, ObjectType, registerEnumType } from '@nestjs/graphql';
 
 import { Node } from '@unraid/shared/graphql.model.js';
-import { IsEnum, IsInt, IsNotEmpty, IsOptional, IsString, Min } from 'class-validator';
+import { IsBoolean, IsEnum, IsInt, IsNotEmpty, IsOptional, IsString, Min } from 'class-validator';
 
 export enum NotificationType {
     UNREAD = 'UNREAD',
@@ -99,6 +99,31 @@ export class NotificationCounts {
     total!: number;
 }
 
+@ObjectType('NotificationSettings')
+export class NotificationSettings {
+    @Field()
+    @IsString()
+    @IsNotEmpty()
+    position!: string;
+
+    @Field(() => Boolean)
+    @IsBoolean()
+    @IsNotEmpty()
+    expand!: boolean;
+
+    @Field(() => Int)
+    @IsInt()
+    @Min(1)
+    @IsNotEmpty()
+    duration!: number;
+
+    @Field(() => Int)
+    @IsInt()
+    @Min(1)
+    @IsNotEmpty()
+    max!: number;
+}
+
 @ObjectType('NotificationOverview')
 export class NotificationOverview {
     @Field(() => NotificationCounts)
@@ -170,4 +195,8 @@ export class Notifications extends Node {
     })
     @IsNotEmpty()
     warningsAndAlerts!: Notification[];
+
+    @Field(() => NotificationSettings)
+    @IsNotEmpty()
+    settings!: NotificationSettings;
 }

api/src/unraid-api/graph/resolvers/notifications/notifications.resolver.ts

@@ -13,6 +13,7 @@ import {
     NotificationImportance,
     NotificationOverview,
     Notifications,
+    NotificationSettings,
     NotificationType,
 } from '@app/unraid-api/graph/resolvers/notifications/notifications.model.js';
 import { NotificationsService } from '@app/unraid-api/graph/resolvers/notifications/notifications.service.js';
@@ -41,6 +42,11 @@ export class NotificationsResolver {
         return this.notificationsService.getOverview();
     }
 
+    @ResolveField(() => NotificationSettings)
+    public settings(): NotificationSettings {
+        return this.notificationsService.getSettings();
+    }
+
     @ResolveField(() => [Notification])
     public async list(
         @Args('filter', { type: () => NotificationFilter })