From 21d209d14ff68ff7c805d6c9fd0b340c545dbda5 Mon Sep 17 00:00:00 2001
From: Florent Benoit <fbenoit@redhat.com>
Date: Mon, 1 Apr 2024 16:02:46 +0200
Subject: [PATCH] fix: provides the tag names rather than id when saving images

it allows to restore images under their proper names

fixes https://github.com/containers/podman-desktop/issues/6582
Signed-off-by: Florent Benoit <fbenoit@redhat.com>
---
 .../renderer/src/lib/image/SaveImages.spec.ts | 65 +++++++++++++++++++
 .../renderer/src/lib/image/SaveImages.svelte  |  7 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/packages/renderer/src/lib/image/SaveImages.spec.ts b/packages/renderer/src/lib/image/SaveImages.spec.ts
index aec9dc7c913..64162eb2edf 100644
--- a/packages/renderer/src/lib/image/SaveImages.spec.ts
+++ b/packages/renderer/src/lib/image/SaveImages.spec.ts
@@ -137,6 +137,71 @@ test('Expect save button to be enabled if output target is selected and saveImag
   expect(goToMock).toBeCalledWith('/images/');
 });
 
+test('Expect saveImages function called with tagged images', async () => {
+  saveDialogMock.mockResolvedValue({ scheme: 'file', path: '/tmp/my/path' } as Uri);
+  saveImagesMock.mockResolvedValue('');
+  const goToMock = vi.spyOn(router, 'goto');
+
+  // default tag (latest)
+  const imageInfo1: ImageInfoUI = {
+    id: 'id1',
+    shortId: 'id1',
+    tag: 'latest',
+    name: 'quay.io/podman/hello',
+    engineId: 'engine',
+  } as ImageInfoUI;
+
+  // no tag
+  const imageInfo2: ImageInfoUI = {
+    id: 'id2',
+    shortId: 'id2',
+    tag: 'latest',
+    name: '<none>',
+    engineId: 'engine',
+  } as ImageInfoUI;
+  // custom tag (not latest)
+  const imageInfo3: ImageInfoUI = {
+    id: 'id1',
+    shortId: 'id1',
+    tag: '123',
+    name: 'quay.io/podman/hello',
+    engineId: 'engine',
+  } as ImageInfoUI;
+
+  saveImagesInfo.set([imageInfo1, imageInfo2, imageInfo3]);
+  await waitRender();
+
+  const selectOutputPathButton = screen.getByRole('button', { name: 'Select output folder' });
+  expect(selectOutputPathButton).toBeInTheDocument();
+
+  await userEvent.click(selectOutputPathButton);
+
+  const saveButton = screen.getByRole('button', { name: 'Save images' });
+  expect(saveButton).toBeInTheDocument();
+  expect(saveButton).toBeEnabled();
+
+  await userEvent.click(saveButton);
+
+  expect(saveImagesMock).toBeCalledWith({
+    images: [
+      {
+        id: 'quay.io/podman/hello:latest',
+        engineId: 'engine',
+      },
+      {
+        id: 'id2',
+        engineId: 'engine',
+      },
+      {
+        id: 'quay.io/podman/hello:123',
+        engineId: 'engine',
+      },
+    ],
+    outputTarget: '/tmp/my/path',
+  });
+  expect(goToMock).toBeCalledWith('/images/');
+});
+
 test('Expect error message dispayed if saveImages fails', async () => {
   saveDialogMock.mockResolvedValue({ scheme: 'file', path: '/tmp/my/path' } as Uri);
   saveImagesMock.mockRejectedValue('error while saving');
diff --git a/packages/renderer/src/lib/image/SaveImages.svelte b/packages/renderer/src/lib/image/SaveImages.svelte
index 591f0f09e86..a69688e678e 100644
--- a/packages/renderer/src/lib/image/SaveImages.svelte
+++ b/packages/renderer/src/lib/image/SaveImages.svelte
@@ -104,8 +104,13 @@ async function saveImages() {
   try {
     await window.saveImages({
       images: imagesToSave.map(img => {
+        // do we have a valid name for the image?
+        let imageId = `${img.name}:${img.tag}`;
+        if (imageId.startsWith('<none>')) {
+          imageId = img.shortId;
+        }
         return {
-          id: img.shortId,
+          id: imageId,
           engineId: img.engineId,
         };
       }),