Address review comments

mook-as · mook-as · commit 864bc2560fa9 · 2026-02-03T13:07:44.000-08:00
- imageEvents: use `ImageType` directly
- components/images: Simplify rows()
- pages/images: Remove unnecessary (and incorrect) typing

Signed-off-by: Mark Yen &lt;mark.yen@suse.com&gt;
diff --git a/pkg/rancher-desktop/backend/images/imageProcessor.ts b/pkg/rancher-desktop/backend/images/imageProcessor.ts
@@ -25,7 +25,7 @@ export interface childResultType {
 /**
  * The fields for display in the images table
  */
-export interface imageType {
+export interface ImageType {
   imageName: string;
   tag:       string;
   imageID:   string;
@@ -77,7 +77,7 @@ export abstract class ImageProcessor extends EventEmitter {
   private sameErrorMessageCount = 0;
   protected showedStderr = false;
   private refreshInterval: ReturnType<typeof timers.setInterval> | null = null;
-  protected images:        imageType[] = [];
+  protected images:        ImageType[] = [];
   protected _isReady = false;
   protected isK8sReady = false;
   private hasImageListeners = false;
@@ -208,7 +208,7 @@ export abstract class ImageProcessor extends EventEmitter {
   /**
    * Returns the current list of cached images.
    */
-  listImages(): imageType[] {
+  listImages(): ImageType[] {
     return this.images;
   }
 
@@ -256,7 +256,7 @@ export abstract class ImageProcessor extends EventEmitter {
     }
   }
 
-  protected parse(data: string): imageType[] {
+  protected parse(data: string): ImageType[] {
     const results = data
       .trimEnd()
       .split(/\r?\n/)
diff --git a/pkg/rancher-desktop/backend/images/mobyImageProcessor.ts b/pkg/rancher-desktop/backend/images/mobyImageProcessor.ts
@@ -92,8 +92,8 @@ export default class MobyImageProcessor extends imageProcessor.ImageProcessor {
    * ...
    */
 
-  parse(data: string): imageProcessor.imageType[] {
-    const images: imageProcessor.imageType[] = [];
+  parse(data: string): imageProcessor.ImageType[] {
+    const images: imageProcessor.ImageType[] = [];
     const records = data
       .split(/\r?\n/)
       .filter(line => line.trim().length > 0)
@@ -125,7 +125,7 @@ export default class MobyImageProcessor extends imageProcessor.ImageProcessor {
   }
 }
 
-function imageComparator(a: imageProcessor.imageType, b: imageProcessor.imageType): number {
+function imageComparator(a: imageProcessor.ImageType, b: imageProcessor.ImageType): number {
   return a.imageName.localeCompare(b.imageName) ||
     a.tag.localeCompare(b.tag) ||
     a.imageID.localeCompare(b.imageID);
diff --git a/pkg/rancher-desktop/backend/images/nerdctlImageProcessor.ts b/pkg/rancher-desktop/backend/images/nerdctlImageProcessor.ts
@@ -102,8 +102,8 @@ export default class NerdctlImageProcessor extends imageProcessor.ImageProcessor
    * ...
    */
 
-  parse(data: string): imageProcessor.imageType[] {
-    const images: imageProcessor.imageType[] = [];
+  parse(data: string): imageProcessor.ImageType[] {
+    const images: imageProcessor.ImageType[] = [];
     const records = data.split(/\r?\n/)
       .filter(line => line.trim().length > 0)
       .map((line) => {
@@ -134,7 +134,7 @@ export default class NerdctlImageProcessor extends imageProcessor.ImageProcessor
   }
 }
 
-function imageComparator(a: imageProcessor.imageType, b: imageProcessor.imageType): number {
+function imageComparator(a: imageProcessor.ImageType, b: imageProcessor.ImageType): number {
   return a.imageName.localeCompare(b.imageName) ||
     a.tag.localeCompare(b.tag) ||
     a.imageID.localeCompare(b.imageID);
diff --git a/pkg/rancher-desktop/components/Images.vue b/pkg/rancher-desktop/components/Images.vue
@@ -226,15 +226,11 @@ export default {
         .map(this.getTaggedImage);
     },
     rows(): RowItem[] {
-      const filteredImages = _.cloneDeep(this.filteredImages);
-
-      return filteredImages
-        .map<RowItem>((image: Image & Partial<RowItem>) => ({
+      return this.filteredImages
+        .map(image => ({
           ...image,
           // The `availableActions` property is used by the ActionMenu to fill
-          // out the menu entries.  Note that we need to modify the items
-          // in-place, as SortableTable depends on object identity to manage its
-          // selection state.
+          // out the menu entries.
           availableActions: [
             {
               label:   this.t('images.manager.table.action.push'),
@@ -259,10 +255,10 @@ export default {
           ].filter(x => x.enabled),
           // ActionMenu callbacks - SortableTable assumes that these methods live
           // on the rows directly.
-          doPush:       image.doPush ?? this.doPush.bind(this, image),
-          deleteImage:  image.deleteImage ?? this.deleteImage.bind(this, image),
-          deleteImages: image.deleteImages ?? this.deleteImages.bind(this),
-          scanImage:    image.scanImage ?? this.scanImage.bind(this, image),
+          doPush:       this.doPush.bind(this, image),
+          deleteImage:  this.deleteImage.bind(this, image),
+          deleteImages: this.deleteImages.bind(this),
+          scanImage:    this.scanImage.bind(this, image),
         }));
     },
     showImageManagerOutput() {
diff --git a/pkg/rancher-desktop/entry/store.ts b/pkg/rancher-desktop/entry/store.ts
@@ -118,7 +118,7 @@ export function mapTypedMutations
 >(namespace: N, mappings: G): {
   [key in keyof G]: (payload: Parameters<M[G[key]]>[1]) => ReturnType<M[G[key]]>;
 };
-// Actual implementation defers to mapState
+// Actual implementation defers to mapMutations
 export function mapTypedMutations(namespace: string, arg: any) {
   return mapMutations(namespace, arg);
 }
diff --git a/pkg/rancher-desktop/main/imageEvents.ts b/pkg/rancher-desktop/main/imageEvents.ts
@@ -6,7 +6,7 @@ import path from 'path';
 
 import Electron from 'electron';
 
-import { ImageProcessor } from '@pkg/backend/images/imageProcessor';
+import { ImageProcessor, ImageType } from '@pkg/backend/images/imageProcessor';
 import { getIpcMainProxy } from '@pkg/main/ipcMain';
 import { isUnixError } from '@pkg/typings/unix.interface';
 import Logging from '@pkg/utils/logging';
@@ -15,14 +15,6 @@ import * as window from '@pkg/window';
 const console = Logging.images;
 const ipcMainProxy = getIpcMainProxy(console);
 
-interface ImageContents {
-  imageName: string;
-  tag:       string;
-  imageID:   string;
-  size:      string;
-  digest:    string;
-}
-
 // Map image-related events to the associated image processor's methods
 // TODO: export the factory function to make this a singleton
 /**
@@ -42,7 +34,7 @@ export class ImageEventHandler {
     this.initEventHandlers();
   }
 
-  protected onImagesChanged(images: ImageContents[]) {
+  protected onImagesChanged(images: ImageType[]) {
     window.send('images-changed', images);
   }
 
diff --git a/pkg/rancher-desktop/pages/Images.vue b/pkg/rancher-desktop/pages/Images.vue
@@ -116,15 +116,15 @@ export default defineComponent({
       }
     });
 
-    ipcRenderer.on('images-check-state', (event, state: any) => {
+    ipcRenderer.on('images-check-state', (event, state) => {
       this.setImageManagerState(state);
     });
 
-    ipcRenderer.invoke('images-check-state').then((state: any) => {
+    ipcRenderer.invoke('images-check-state').then((state) => {
       this.setImageManagerState(state);
     });
 
-    ipcRenderer.on('settings-update', (event, settings: any) => {
+    ipcRenderer.on('settings-update', (event, settings) => {
       // TODO: put in a status bar
       this.$data.settings = settings;
       this.checkSelectedNamespace();
@@ -134,14 +134,14 @@ export default defineComponent({
       this.images = await ipcRenderer.invoke('images-mounted', true);
     })();
 
-    ipcRenderer.on('images-namespaces', (event, namespaces: string[]) => {
+    ipcRenderer.on('images-namespaces', (event, namespaces) => {
       // TODO: Use a specific message to indicate whether or not messages are supported.
       this.imageNamespaces = namespaces;
       this.supportsNamespaces = namespaces.length > 0;
       this.checkSelectedNamespace();
     });
     ipcRenderer.send('images-namespaces-read');
-    ipcRenderer.on('settings-read', (event, settings: any) => {
+    ipcRenderer.on('settings-read', (event, settings) => {
       this.settings = settings;
     });
     ipcRenderer.send('settings-read');
diff --git a/pkg/rancher-desktop/typings/electron-ipc.d.ts b/pkg/rancher-desktop/typings/electron-ipc.d.ts
@@ -127,7 +127,7 @@ export interface IpcMainInvokeEvents {
   'k8s-progress':              () => Readonly<{ current: number, max: number, description?: string, transitionTime?: Date }>;
 
   // #region main/imageEvents
-  'images-mounted':     (mounted: boolean) => (import('@pkg/backend/images/imageProcessor').imageType)[];
+  'images-mounted':     (mounted: boolean) => (import('@pkg/backend/images/imageProcessor').ImageType)[];
   'images-check-state': () => boolean;
   // #endregion
 
@@ -202,7 +202,7 @@ export interface IpcRendererEvents {
   'images-process-output':    (data: string, isStdErr: boolean) => void;
   'ok:images-process-output': (data: string) => void;
   'images-changed': (
-    images: (import('@pkg/backend/images/imageProcessor').imageType)[]
+    images: (import('@pkg/backend/images/imageProcessor').ImageType)[]
   ) => void;
   'images-check-state':       (state: boolean) => void;
   'images-namespaces':        (namespaces: string[]) => void;

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ export function mapTypedMutations`
`118`	`118`	`>(namespace: N, mappings: G): {`
`119`	`119`	`[key in keyof G]: (payload: Parameters<M[G[key]]>[1]) => ReturnType<M[G[key]]>;`
`120`	`120`	`};`
`121`		`-// Actual implementation defers to mapState`
	`121`	`+// Actual implementation defers to mapMutations`
`122`	`122`	`export function mapTypedMutations(namespace: string, arg: any) {`
`123`	`123`	`return mapMutations(namespace, arg);`
`124`	`124`	`}`