[CP-3322] Handle entitiesTypes ordering

mudita · Dec 2, 2024 · 61e208e · 61e208e
1 parent 18be4b1
commit 61e208e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/libs/generic-view/ui/src/lib/generated/mc-file-manager-view/file-category-list.ts b/libs/generic-view/ui/src/lib/generated/mc-file-manager-view/file-category-list.ts
@@ -13,30 +13,26 @@ interface CategoryListItemConfig {
   icon: IconType
 }
 
-const CONFIG_MAP: Record<string, CategoryListItemConfig> = {
+const CONFIG_MAP: Record<string, Omit<CategoryListItemConfig, "id">> = {
   audioFiles: {
-    id: "0",
     name: "Music",
     icon: IconType.MusicNote,
     markerColor: "#E38577",
     entitiesType: "audioFiles",
   },
   imageFiles: {
-    id: "1",
     name: "Photos",
     icon: IconType.PhotoCatalog,
     markerColor: "#0E7490",
     entitiesType: "imageFiles",
   },
   ebookFiles: {
-    id: "2",
     name: "Ebooks",
     icon: IconType.Book,
     markerColor: "#A8DADC",
     entitiesType: "ebookFiles",
   },
   applicationFiles: {
-    id: "3",
     name: "Apps",
     icon: IconType.Grid,
     markerColor: "#AEBEC9",
@@ -45,9 +41,10 @@ const CONFIG_MAP: Record<string, CategoryListItemConfig> = {
 }
 
 function getConfigByEntityType(
-  entityType: string
+  entityType: string,
+  id: string
 ): CategoryListItemConfig | undefined {
-  return CONFIG_MAP[entityType] || undefined
+  return { ...CONFIG_MAP[entityType], id } || undefined
 }
 
 const generateFileCategoryListItem = ({
@@ -212,8 +209,8 @@ export const generateFileCategoryList = (entitiesTypes: string[]): Subview => {
     },
   }
 
-  return entitiesTypes.reduce((previousValue, entitiesType) => {
-    const config = getConfigByEntityType(entitiesType)
+  return entitiesTypes.reduce((previousValue, entitiesType, index) => {
+    const config = getConfigByEntityType(entitiesType, String(index))
     if (!config) {
       return previousValue
     }

diff --git a/libs/generic-view/ui/src/lib/generated/mc-file-manager-view/file-list.ts b/libs/generic-view/ui/src/lib/generated/mc-file-manager-view/file-list.ts
@@ -11,31 +11,30 @@ interface FileListConfig {
   entitiesType: string
 }
 
-const CONFIG_MAP: Record<string, FileListConfig> = {
+const CONFIG_MAP: Record<string, Omit<FileListConfig, "id">> = {
   audioFiles: {
-    id: "0",
     name: "Music",
     entitiesType: "audioFiles",
   },
   imageFiles: {
-    id: "1",
     name: "Photos",
     entitiesType: "imageFiles",
   },
   ebookFiles: {
-    id: "2",
     name: "Ebooks",
     entitiesType: "ebookFiles",
   },
   applicationFiles: {
-    id: "3",
     name: "Apps",
     entitiesType: "applicationFiles",
   },
 }
 
-function getConfigByEntityType(entityType: string): FileListConfig | undefined {
-  return CONFIG_MAP[entityType] || undefined
+function getConfigByEntityType(
+  entityType: string,
+  id: string
+): FileListConfig | undefined {
+  return { ...CONFIG_MAP[entityType], id } || undefined
 }
 
 const generateFileList = ({
@@ -479,8 +478,8 @@ export const generateFileListWrapper = (entitiesTypes: string[]): Subview => {
     },
   }
 
-  return entitiesTypes.reduce((previousValue, entitiesType) => {
-    const config = getConfigByEntityType(entitiesType)
+  return entitiesTypes.reduce((previousValue, entitiesType, index) => {
+    const config = getConfigByEntityType(entitiesType, String(index))
     if (!config) {
       return previousValue
     }