unify iconUrl retrieval

Author: pujitm

api/generated-schema.graphql

@@ -1361,7 +1361,6 @@ type FlatOrganizerEntry {
   hasChildren: Boolean!
   childrenIds: [String!]!
   meta: DockerContainer
-  icon: String
 }
 
 type FlashBackupStatus {

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 */
@@ -682,8 +693,11 @@ export type Docker = Node & {
   containerUpdateStatuses: Array<ExplicitStatusItem>;
   containers: Array<DockerContainer>;
   id: Scalars['PrefixedID']['output'];
+  /** Access container logs. Requires specifying a target container id through resolver arguments. */
+  logs: DockerContainerLogs;
   networks: Array<DockerNetwork>;
   organizer: ResolvedOrganizerV1;
+  portConflicts: DockerPortConflicts;
 };
 
 
@@ -692,6 +706,13 @@ export type DockerContainersArgs = {
 };
 
 
+export type DockerLogsArgs = {
+  id: Scalars['PrefixedID']['input'];
+  since?: InputMaybe<Scalars['DateTime']['input']>;
+  tail?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
 export type DockerNetworksArgs = {
   skipCache?: Scalars['Boolean']['input'];
 };
@@ -701,6 +722,11 @@ export type DockerOrganizerArgs = {
   skipCache?: Scalars['Boolean']['input'];
 };
 
+
+export type DockerPortConflictsArgs = {
+  skipCache?: Scalars['Boolean']['input'];
+};
+
 export type DockerAutostartEntryInput = {
   /** Whether the container should auto-start */
   autoStart: Scalars['Boolean']['input'];
@@ -720,9 +746,13 @@ export type DockerContainer = Node & {
   command: Scalars['String']['output'];
   created: Scalars['Int']['output'];
   hostConfig?: Maybe<ContainerHostConfig>;
+  /** Icon URL */
+  iconUrl?: Maybe<Scalars['String']['output']>;
   id: Scalars['PrefixedID']['output'];
   image: Scalars['String']['output'];
   imageId: Scalars['String']['output'];
+  /** Whether the container is orphaned (no template found) */
+  isOrphaned: Scalars['Boolean']['output'];
   isRebuildReady?: Maybe<Scalars['Boolean']['output']>;
   isUpdateAvailable?: Maybe<Scalars['Boolean']['output']>;
   labels?: Maybe<Scalars['JSON']['output']>;
@@ -732,6 +762,10 @@ export type DockerContainer = Node & {
   names: Array<Scalars['String']['output']>;
   networkSettings?: Maybe<Scalars['JSON']['output']>;
   ports: Array<ContainerPort>;
+  /** Project/Product homepage URL */
+  projectUrl?: Maybe<Scalars['String']['output']>;
+  /** Registry/Docker Hub URL */
+  registryUrl?: Maybe<Scalars['String']['output']>;
   /** Size of container logs (in bytes) */
   sizeLog?: Maybe<Scalars['BigInt']['output']>;
   /** Total size of all files in the container (in bytes) */
@@ -740,9 +774,25 @@ export type DockerContainer = Node & {
   sizeRw?: Maybe<Scalars['BigInt']['output']>;
   state: ContainerState;
   status: Scalars['String']['output'];
+  /** Support page/thread URL */
+  supportUrl?: Maybe<Scalars['String']['output']>;
   templatePath?: Maybe<Scalars['String']['output']>;
 };
 
+export type DockerContainerLogLine = {
+  __typename?: 'DockerContainerLogLine';
+  message: Scalars['String']['output'];
+  timestamp: Scalars['DateTime']['output'];
+};
+
+export type DockerContainerLogs = {
+  __typename?: 'DockerContainerLogs';
+  containerId: Scalars['PrefixedID']['output'];
+  /** Cursor that can be passed back through the since argument to continue streaming logs. */
+  cursor?: Maybe<Scalars['DateTime']['output']>;
+  lines: Array<DockerContainerLogLine>;
+};
+
 export type DockerContainerOverviewForm = {
   __typename?: 'DockerContainerOverviewForm';
   data: Scalars['JSON']['output'];
@@ -751,16 +801,50 @@ export type DockerContainerOverviewForm = {
   uiSchema: Scalars['JSON']['output'];
 };
 
+export type DockerContainerPortConflict = {
+  __typename?: 'DockerContainerPortConflict';
+  containers: Array<DockerPortConflictContainer>;
+  privatePort: Scalars['Port']['output'];
+  type: ContainerPortType;
+};
+
+export type DockerContainerStats = {
+  __typename?: 'DockerContainerStats';
+  /** Block I/O String (e.g. 100MB / 1GB) */
+  blockIO: Scalars['String']['output'];
+  /** CPU Usage Percentage */
+  cpuPercent: Scalars['Float']['output'];
+  id: Scalars['PrefixedID']['output'];
+  /** Memory Usage Percentage */
+  memPercent: Scalars['Float']['output'];
+  /** Memory Usage String (e.g. 100MB / 1GB) */
+  memUsage: Scalars['String']['output'];
+  /** Network I/O String (e.g. 100MB / 1GB) */
+  netIO: Scalars['String']['output'];
+};
+
+export type DockerLanPortConflict = {
+  __typename?: 'DockerLanPortConflict';
+  containers: Array<DockerPortConflictContainer>;
+  lanIpPort: Scalars['String']['output'];
+  publicPort?: Maybe<Scalars['Port']['output']>;
+  type: ContainerPortType;
+};
+
 export type DockerMutations = {
   __typename?: 'DockerMutations';
   /** Pause (Suspend) a container */
   pause: DockerContainer;
+  /** Remove a container */
+  removeContainer: Scalars['Boolean']['output'];
   /** Start a container */
   start: DockerContainer;
   /** Stop a container */
   stop: DockerContainer;
   /** Unpause (Resume) a container */
   unpause: DockerContainer;
+  /** Update all containers that have available updates */
+  updateAllContainers: Array<DockerContainer>;
   /** Update auto-start configuration for Docker containers */
   updateAutostartConfiguration: Scalars['Boolean']['output'];
   /** Update a container to the latest image */
@@ -775,6 +859,11 @@ export type DockerMutationsPauseArgs = {
 };
 
 
+export type DockerMutationsRemoveContainerArgs = {
+  id: Scalars['PrefixedID']['input'];
+};
+
+
 export type DockerMutationsStartArgs = {
   id: Scalars['PrefixedID']['input'];
 };
@@ -824,6 +913,18 @@ export type DockerNetwork = Node & {
   scope: Scalars['String']['output'];
 };
 
+export type DockerPortConflictContainer = {
+  __typename?: 'DockerPortConflictContainer';
+  id: Scalars['PrefixedID']['output'];
+  name: Scalars['String']['output'];
+};
+
+export type DockerPortConflicts = {
+  __typename?: 'DockerPortConflicts';
+  containerPorts: Array<DockerContainerPortConflict>;
+  lanPorts: Array<DockerLanPortConflict>;
+};
+
 export type DockerTemplateSyncResult = {
   __typename?: 'DockerTemplateSyncResult';
   errors: Array<Scalars['String']['output']>;
@@ -882,7 +983,6 @@ export type FlatOrganizerEntry = {
   childrenIds: Array<Scalars['String']['output']>;
   depth: Scalars['Float']['output'];
   hasChildren: Scalars['Boolean']['output'];
-  icon?: Maybe<Scalars['String']['output']>;
   id: Scalars['String']['output'];
   meta?: Maybe<DockerContainer>;
   name: Scalars['String']['output'];
@@ -962,6 +1062,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 */
@@ -978,6 +1079,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 */
@@ -2161,6 +2264,7 @@ export type SsoSettings = Node & {
 export type Subscription = {
   __typename?: 'Subscription';
   arraySubscription: UnraidArray;
+  dockerContainerStats: DockerContainerStats;
   logFile: LogFileContent;
   notificationAdded: Notification;
   notificationsOverview: NotificationOverview;
@@ -2169,6 +2273,7 @@ export type Subscription = {
   parityHistorySubscription: ParityCheck;
   serversSubscription: Server;
   systemMetricsCpu: CpuUtilization;
+  systemMetricsCpuTelemetry: CpuPackages;
   systemMetricsMemory: MemoryUtilization;
   upsUpdates: UpsDevice;
 };

api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer.service.ts

@@ -3,7 +3,6 @@ import { Injectable, Logger } from '@nestjs/common';
 import type { ContainerListOptions } from 'dockerode';
 
 import { AppError } from '@app/core/errors/app-error.js';
-import { DockerTemplateIconService } from '@app/unraid-api/graph/resolvers/docker/docker-template-icon.service.js';
 import { DockerContainer } from '@app/unraid-api/graph/resolvers/docker/docker.model.js';
 import { DockerService } from '@app/unraid-api/graph/resolvers/docker/docker.service.js';
 import { DockerOrganizerConfigService } from '@app/unraid-api/graph/resolvers/docker/organizer/docker-organizer-config.service.js';
@@ -52,8 +51,7 @@ export class DockerOrganizerService {
     private readonly logger = new Logger(DockerOrganizerService.name);
     constructor(
         private readonly dockerConfigService: DockerOrganizerConfigService,
-        private readonly dockerService: DockerService,
-        private readonly dockerTemplateIconService: DockerTemplateIconService
+        private readonly dockerService: DockerService
     ) {}
 
     async getResources(
@@ -99,17 +97,7 @@ export class DockerOrganizerService {
         opts?: { skipCache?: boolean }
     ): Promise<ResolvedOrganizerV1> {
         organizer ??= await this.syncAndGetOrganizer(opts);
-
-        const containers = Object.values(organizer.resources)
-            .filter((r) => r.type === 'container')
-            .map((r) => ({
-                id: r.id,
-                templatePath: (r as OrganizerContainerResource).meta?.templatePath,
-            }));
-
-        const iconMap = await this.dockerTemplateIconService.getIconsForContainers(containers);
-
-        return resolveOrganizer(organizer, iconMap);
+        return resolveOrganizer(organizer);
     }
 
     async createFolder(params: {

api/src/unraid-api/organizer/organizer.model.ts

@@ -302,9 +302,4 @@ export class FlatOrganizerEntry {
     @ValidateNested()
     @Type(() => DockerContainer)
     meta?: DockerContainer;
-
-    @Field({ nullable: true })
-    @IsOptional()
-    @IsString()
-    icon?: string;
 }

api/src/unraid-api/organizer/organizer.ts

@@ -94,13 +94,11 @@ export function addMissingResourcesToView(
  *
  * @param view - The flat organizer view
  * @param resources - The collection of all available resources
- * @param iconMap - Optional map of resource IDs to icon URLs
  * @returns Array of enriched flat organizer entries with metadata
  */
 export function enrichFlatEntries(
     view: OrganizerView,
-    resources: OrganizerV1['resources'],
-    iconMap?: Map<string, string>
+    resources: OrganizerV1['resources']
 ): FlatOrganizerEntry[] {
     const entries: FlatOrganizerEntry[] = [];
     const parentMap = new Map<string, string>();
@@ -141,16 +139,6 @@ export function enrichFlatEntries(
             name = (entry as OrganizerFolder).name;
         }
 
-        let icon: string | undefined;
-        if (entry.type === 'folder') {
-            icon = undefined;
-        } else if (entry.type === 'ref') {
-            const resource = resources[(entry as OrganizerResourceRef).target];
-            if (resource && iconMap) {
-                icon = iconMap.get(resource.id);
-            }
-        }
-
         entries.push({
             id: entryId,
             type,
@@ -162,7 +150,6 @@ export function enrichFlatEntries(
             hasChildren: isFolder && children.length > 0,
             childrenIds: children,
             meta,
-            icon,
         });
 
         if (isFolder) {
@@ -184,15 +171,13 @@ export function enrichFlatEntries(
  *
  * @param view - The flat organizer view to resolve
  * @param resources - The collection of all available resources
- * @param iconMap - Optional map of resource IDs to icon URLs
  * @returns A resolved view with nested objects instead of ID references
  */
 export function resolveOrganizerView(
     view: OrganizerView,
-    resources: OrganizerV1['resources'],
-    iconMap?: Map<string, string>
+    resources: OrganizerV1['resources']
 ): ResolvedOrganizerView {
-    const flatEntries = enrichFlatEntries(view, resources, iconMap);
+    const flatEntries = enrichFlatEntries(view, resources);
 
     return {
         id: view.id,
@@ -208,17 +193,13 @@ export function resolveOrganizerView(
  * are replaced with actual objects for frontend convenience.
  *
  * @param organizer - The flat organizer structure to resolve
- * @param iconMap - Optional map of resource IDs to icon URLs
  * @returns A resolved organizer with nested objects instead of ID references
  */
-export function resolveOrganizer(
-    organizer: OrganizerV1,
-    iconMap?: Map<string, string>
-): ResolvedOrganizerV1 {
+export function resolveOrganizer(organizer: OrganizerV1): ResolvedOrganizerV1 {
     const resolvedViews: ResolvedOrganizerView[] = [];
 
     for (const [viewId, view] of Object.entries(organizer.views)) {
-        resolvedViews.push(resolveOrganizerView(view, organizer.resources, iconMap));
+        resolvedViews.push(resolveOrganizerView(view, organizer.resources));
     }
 
     return {

web/src/components/Docker/docker-containers.query.ts

@@ -67,7 +67,6 @@ export const GET_DOCKER_CONTAINERS = gql`
             path
             hasChildren
             childrenIds
-            icon
             meta {
               id
               names