From 1a71bade703b7161e3220158e49031aa09be227f Mon Sep 17 00:00:00 2001
From: Florent Benoit <fbenoit@redhat.com>
Date: Thu, 25 Apr 2024 16:27:02 +0200
Subject: [PATCH] chore: handle properly extensions with case fixes
 https://github.com/containers/podman-desktop/issues/6961 Signed-off-by:
 Florent Benoit <fbenoit@redhat.com>

---
 .../InstalledExtensionCardLeftLifecycleDelete.spec.ts        | 4 ++--
 .../InstalledExtensionCardLeftLifecycleDelete.svelte         | 2 +-
 .../renderer/src/stores/all-installed-extensions.spec.ts     | 5 +++--
 packages/renderer/src/stores/all-installed-extensions.ts     | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.spec.ts b/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.spec.ts
index 1af25cbea81..739d63f9e1a 100644
--- a/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.spec.ts
+++ b/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.spec.ts
@@ -33,7 +33,7 @@ beforeEach(() => {
 test('Expect to delete dd Extension', async () => {
   const extension: CombinedExtensionInfoUI = {
     type: 'dd',
-    id: '',
+    id: 'my.ExtensionId',
     name: 'foo',
     description: 'my description',
     displayName: '',
@@ -54,7 +54,7 @@ test('Expect to delete dd Extension', async () => {
   await fireEvent.click(button);
 
   // expect the delete function to be called
-  expect(vi.mocked(window.ddExtensionDelete)).toHaveBeenCalledWith('foo');
+  expect(vi.mocked(window.ddExtensionDelete)).toHaveBeenCalledWith('my.ExtensionId');
   expect(vi.mocked(window.removeExtension)).not.toHaveBeenCalled();
 });
 
diff --git a/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.svelte b/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.svelte
index cd199bd59ed..104ee6f958e 100644
--- a/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.svelte
+++ b/packages/renderer/src/lib/extensions/InstalledExtensionCardLeftLifecycleDelete.svelte
@@ -12,7 +12,7 @@ let inProgress = false;
 async function deleteExtension(): Promise<void> {
   inProgress = true;
   if (extension.type === 'dd') {
-    await window.ddExtensionDelete(extension.name);
+    await window.ddExtensionDelete(extension.id);
   } else {
     await window.removeExtension(extension.id);
   }
diff --git a/packages/renderer/src/stores/all-installed-extensions.spec.ts b/packages/renderer/src/stores/all-installed-extensions.spec.ts
index e51f9d32dae..d4c7086e3fc 100644
--- a/packages/renderer/src/stores/all-installed-extensions.spec.ts
+++ b/packages/renderer/src/stores/all-installed-extensions.spec.ts
@@ -37,7 +37,7 @@ test('combined extensions from DD', async () => {
   // now, add some contributions
   contributions.set([
     {
-      id: 'first.extension1',
+      id: 'extension1',
       extensionId: 'first.extension1',
       description: 'test1',
       type: 'hello',
@@ -51,7 +51,7 @@ test('combined extensions from DD', async () => {
       version: '1.0.0',
     },
     {
-      id: 'second.extension2',
+      id: 'extension2',
       extensionId: 'second.extension2',
       description: 'test2',
       type: 'hello',
@@ -75,6 +75,7 @@ test('combined extensions from DD', async () => {
 
   expect(extension1?.type).toBe('dd');
   expect(extension1?.displayName).toBe('test1');
+  expect(extension1?.id).toBe('first.extension1');
 });
 
 test('combined extensions from PD', async () => {
diff --git a/packages/renderer/src/stores/all-installed-extensions.ts b/packages/renderer/src/stores/all-installed-extensions.ts
index ae69b45b2f2..514732e7ba0 100644
--- a/packages/renderer/src/stores/all-installed-extensions.ts
+++ b/packages/renderer/src/stores/all-installed-extensions.ts
@@ -44,6 +44,7 @@ export const combinedInstalledExtensions: Readable<CombinedExtensionInfoUI[]> =
       }
       return {
         ...ext,
+        id: ext.extensionId,
         displayName,
         type: 'dd',
         state: 'started',