From d2e576d55aead2de14810485b4c6ac796eda6192 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 18 Jan 2024 17:32:48 +0100
Subject: [PATCH] frontend-plugin-api: swtich IconApi.listIconKeys to return an
 array direcly instead

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/compatWrapper/BackwardsCompatProvider.tsx           | 4 +---
 .../IconsApi/{IconsApi.ts => DefaultIconsApi.ts}            | 6 +++---
 .../src/apis/implementations/IconsApi/index.ts              | 2 +-
 packages/frontend-plugin-api/api-report.md                  | 4 +---
 .../frontend-plugin-api/src/apis/definitions/IconsApi.ts    | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)
 rename packages/frontend-app-api/src/apis/implementations/IconsApi/{IconsApi.ts => DefaultIconsApi.ts} (91%)

diff --git a/packages/core-compat-api/src/compatWrapper/BackwardsCompatProvider.tsx b/packages/core-compat-api/src/compatWrapper/BackwardsCompatProvider.tsx
index 1dd64efb89..8c6ef1f375 100644
--- a/packages/core-compat-api/src/compatWrapper/BackwardsCompatProvider.tsx
+++ b/packages/core-compat-api/src/compatWrapper/BackwardsCompatProvider.tsx
@@ -122,10 +122,8 @@ function LegacyAppContextProvider(props: { children: ReactNode }) {
       },
 
       getSystemIcons(): Record<string, IconComponent> {
-        const { keys } = iconsApi.listIconKeys();
-
         return Object.fromEntries(
-          Array.from(keys).map(key => [key, iconsApi.getIcon(key)!]),
+          iconsApi.listIconKeys().map(key => [key, iconsApi.getIcon(key)!]),
         );
       },
 
diff --git a/packages/frontend-app-api/src/apis/implementations/IconsApi/IconsApi.ts b/packages/frontend-app-api/src/apis/implementations/IconsApi/DefaultIconsApi.ts
similarity index 91%
rename from packages/frontend-app-api/src/apis/implementations/IconsApi/IconsApi.ts
rename to packages/frontend-app-api/src/apis/implementations/IconsApi/DefaultIconsApi.ts
index f64bbc67f9..53a7fa6421 100644
--- a/packages/frontend-app-api/src/apis/implementations/IconsApi/IconsApi.ts
+++ b/packages/frontend-app-api/src/apis/implementations/IconsApi/DefaultIconsApi.ts
@@ -32,7 +32,7 @@ export class DefaultIconsApi implements IconsApi {
     return this.#icons.get(key);
   }
 
-  listIconKeys: IconsApi['listIconKeys'] = () => {
-    return { keys: this.#icons.keys() };
-  };
+  listIconKeys(): string[] {
+    return Array.from(this.#icons.keys());
+  }
 }
diff --git a/packages/frontend-app-api/src/apis/implementations/IconsApi/index.ts b/packages/frontend-app-api/src/apis/implementations/IconsApi/index.ts
index 4a73182e84..e07f6379ed 100644
--- a/packages/frontend-app-api/src/apis/implementations/IconsApi/index.ts
+++ b/packages/frontend-app-api/src/apis/implementations/IconsApi/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { DefaultIconsApi } from './IconsApi';
+export { DefaultIconsApi } from './DefaultIconsApi';
diff --git a/packages/frontend-plugin-api/api-report.md b/packages/frontend-plugin-api/api-report.md
index fd0e1302b7..3a7a0f3ee6 100644
--- a/packages/frontend-plugin-api/api-report.md
+++ b/packages/frontend-plugin-api/api-report.md
@@ -981,9 +981,7 @@ export interface IconsApi {
   // (undocumented)
   getIcon(key: string): IconComponent | undefined;
   // (undocumented)
-  listIconKeys(): {
-    keys: Iterable<string>;
-  };
+  listIconKeys(): string[];
 }
 
 // @public
diff --git a/packages/frontend-plugin-api/src/apis/definitions/IconsApi.ts b/packages/frontend-plugin-api/src/apis/definitions/IconsApi.ts
index daef2ca40f..aa5b7f4fac 100644
--- a/packages/frontend-plugin-api/src/apis/definitions/IconsApi.ts
+++ b/packages/frontend-plugin-api/src/apis/definitions/IconsApi.ts
@@ -25,7 +25,7 @@ import { IconComponent } from '../../icons';
 export interface IconsApi {
   getIcon(key: string): IconComponent | undefined;
 
-  listIconKeys(): { keys: Iterable<string> };
+  listIconKeys(): string[];
 }
 
 /**