Merge pull request #210 from devtron-labs/fix/plugin-list-sort

fix: sorting for parent plugin list

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.1.7-beta-1",
+    "version": "0.1.7-beta-5",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -103,6 +103,7 @@ const PluginListContainer = ({
         const {
             pluginStore: { parentPluginStore, pluginVersionStore },
             totalCount: responseTotalCount,
+            parentPluginIdList,
         } = pluginResponse
 
         handlePluginDataStoreUpdate(getUpdatedPluginStore(pluginDataStore, parentPluginStore, pluginVersionStore))
@@ -117,10 +118,10 @@ const PluginListContainer = ({
             {} as Record<number, true>,
         )
 
-        Object.keys(parentPluginStore).forEach((key) => {
+        parentPluginIdList.forEach((key) => {
             if (!newPluginListMap[key]) {
                 newPluginList.push({
-                    parentPluginId: +key,
+                    parentPluginId: key,
                 })
                 newPluginListMap[key] = true
             }

src/Shared/Components/Plugin/PluginListContainer.tsx

@@ -65,6 +65,7 @@ export const getPluginStoreData = async ({
         return {
             totalCount: result?.totalCount || 0,
             pluginStore,
+            parentPluginIdList: result?.parentPlugins?.map((parentPluginDetails) => parentPluginDetails.id) || [],
         }
     } catch (error) {
         if (!getIsRequestAborted(error)) {

src/Shared/Components/Plugin/service.tsx

@@ -165,6 +165,10 @@ export interface GetPluginListPayloadType
 export interface GetPluginStoreDataReturnType {
     totalCount: number
     pluginStore: PluginDataStoreType
+    /**
+     * Sorted on the basis of name of latest version of parent plugin
+     */
+    parentPluginIdList: number[]
 }
 
 export interface PluginListParamsType {