Merge pull request #7561 from VikalpRusia/improve-readablity

Fix: Ensure Image Name Reflects in ImagesOutputWindow During Build/Pull
rancher-sandbox · Oct 1, 2024 · b25d842 · b25d842
2 parents f7879df + 139600a
commit b25d842
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/pkg/rancher-desktop/components/Images.vue b/pkg/rancher-desktop/components/Images.vue
@@ -71,6 +71,7 @@
             :current-command="currentCommand"
             :image-output-culler="imageOutputCuller"
             :show-status="false"
+            :image-to-pull="imageToPull"
             @ok:process-end="resetCurrentCommand"
             @ok:show="toggleOutput"
           />
@@ -168,6 +169,7 @@ export default {
       imageOutputCuller:                null,
       mainWindowScroll:                 -1,
       selected:                         [],
+      imageToPull:                      null,
     };
   },
   computed: {

diff --git a/pkg/rancher-desktop/components/ImagesOutputWindow.vue b/pkg/rancher-desktop/components/ImagesOutputWindow.vue
@@ -30,6 +30,10 @@ export default {
       type:    Boolean,
       default: true,
     },
+    imageToPull: {
+      type:    String,
+      default: null,
+    },
   },
 
   data() {

diff --git a/pkg/rancher-desktop/pages/images/add.vue b/pkg/rancher-desktop/pages/images/add.vue
@@ -23,6 +23,7 @@
         :current-command="currentCommand"
         :action="activeTab"
         :image-output-culler="imageOutputCuller"
+        :image-to-pull="imageToPull"
         @ok:process-end="resetCurrentCommand"
         @ok:show="toggleOutput"
       />
@@ -89,7 +90,7 @@ export default {
       this.imageOutputCuller = getImageOutputCuller(command);
     },
     doImageAction({ action, image }) {
-      this.imageToPull = image;
+      this.imageToPull = image.trim();
       if (action === 'pull') {
         this.doPullAnImage();
       }
@@ -99,15 +100,15 @@ export default {
       }
     },
     doPullAnImage() {
-      const imageName = this.imageToPull.trim();
+      const imageName = this.imageToPull;
 
       this.currentCommand = `pull ${ imageName }`;
       this.startRunningCommand('pull');
       ipcRenderer.send('do-image-pull', imageName);
       this.showOutput = true;
     },
     doBuildAnImage() {
-      const imageName = this.imageToPull.trim();
+      const imageName = this.imageToPull;
 
       this.currentCommand = `build ${ imageName }`;
       this.startRunningCommand('build');

diff --git a/pkg/rancher-desktop/pages/images/scans/_image-name.vue b/pkg/rancher-desktop/pages/images/scans/_image-name.vue
@@ -4,6 +4,7 @@
       v-if="showOutput"
       :current-command="currentCommand"
       :image-output-culler="imageOutputCuller"
+      :image-to-pull="image"
       @ok:process-end="onProcessEnd"
     >
       <template #loading="{ isLoading }">