Merge branch 'fix/plugin-policy-qa' into feat/plugin-policy

Author: eshankvaish

package-lock.json

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

package.json

@@ -119,5 +119,11 @@ export const getAvailablePluginTags = async (appId: number): Promise<string[]> =
 
 export const getParentPluginList = async (
     params?: Partial<GetParentPluginListPayloadType>,
-): Promise<ResponseType<MinParentPluginDTO[]>> =>
-    get<MinParentPluginDTO[]>(getUrlWithSearchParams(ROUTES.PLUGIN_LIST_MIN, params))
+): Promise<ResponseType<MinParentPluginDTO[]>> => {
+    const response = await get<MinParentPluginDTO[]>(getUrlWithSearchParams(ROUTES.PLUGIN_LIST_MIN, params))
+
+    return {
+        ...response,
+        result: (response?.result ?? []).sort((a, b) => stringComparatorBySortOrder(a.name, b.name)),
+    }
+}

src/Shared/Components/Plugin/service.tsx

@@ -77,23 +77,25 @@ export const getEnvironmentOptionsGroupedByClusters = async (): Promise<Environm
         return []
     }
 
-    const sortedEnvList = result.map(
-        ({
-            id,
-            environment_name: name,
-            isVirtualEnvironment,
-            cluster_name: cluster,
-            default: isDefault,
-            namespace,
-        }) => ({
-            id,
-            name,
-            isVirtual: isVirtualEnvironment ?? false,
-            cluster,
-            environmentType: isDefault ? EnvironmentTypeEnum.production : EnvironmentTypeEnum.nonProduction,
-            namespace,
-        }),
-    )
+    const sortedEnvList = result
+        .map(
+            ({
+                id,
+                environment_name: name,
+                isVirtualEnvironment,
+                cluster_name: cluster,
+                default: isDefault,
+                namespace,
+            }) => ({
+                id,
+                name,
+                isVirtual: isVirtualEnvironment ?? false,
+                cluster,
+                environmentType: isDefault ? EnvironmentTypeEnum.production : EnvironmentTypeEnum.nonProduction,
+                namespace,
+            }),
+        )
+        .sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
 
     const envGroupedByCluster = Object.values(
         sortedEnvList.reduce<