Merge branch 'feat/approval-policy' of github.com:devtron-labs/devtron-fe-common-lib into fix/approval-policy

Author: eshankvaish

package-lock.json

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

package.json

@@ -116,6 +116,7 @@ export const ROUTES = {
     USER_LIST_MIN: 'user/list/min',
     CONFIG_DATA: 'config/data',
     K8S_RESOURCE_LIST: 'k8s/resource/list',
+    CONFIG_COMPARE_SECRET: 'config/compare/secret',
 }
 
 export enum KEY_VALUE {

src/Common/Constants.ts

@@ -4,13 +4,14 @@ import { generatePath, Route, Switch, useLocation, useRouteMatch } from 'react-r
 import { ReactComponent as ICError } from '@Icons/ic-error.svg'
 import { getAppEnvDeploymentConfigList } from '@Shared/Components/DeploymentConfigDiff'
 import { useAsync } from '@Common/Helper'
-import { EnvResourceType, getAppEnvDeploymentConfig } from '@Shared/Services'
+import { EnvResourceType, getAppEnvDeploymentConfig, getCompareSecretsData } from '@Shared/Services'
 import { groupArrayByObjectKey } from '@Shared/Helpers'
 import ErrorScreenManager from '@Common/ErrorScreenManager'
 import { Progressing } from '@Common/Progressing'
 import { useUrlFilters } from '@Common/Hooks'
 import { GenericEmptyState, InfoColourBar } from '@Common/index'
 
+import { useMainContext } from '@Shared/Providers'
 import { DeploymentHistoryConfigDiffCompare } from './DeploymentHistoryConfigDiffCompare'
 import { DeploymentHistoryConfigDiffProps, DeploymentHistoryConfigDiffQueryParams } from './types'
 import {
@@ -35,6 +36,7 @@ export const DeploymentHistoryConfigDiff = ({
     // HOOKS
     const { path, params } = useRouteMatch()
     const { pathname, search } = useLocation()
+    const { isSuperAdmin } = useMainContext()
 
     // CONSTANTS
     const pipelineDeployments = useMemo(() => getPipelineDeployments(triggerHistory), [triggerHistory])
@@ -54,32 +56,49 @@ export const DeploymentHistoryConfigDiff = ({
 
     // ASYNC CALLS
     // Load comparison deployment data
-    const [compareDeploymentConfigLoader, compareDeploymentConfig, , reloadCompareDeploymentConfig] = useAsync(
-        () =>
-            Promise.allSettled([
-                getAppEnvDeploymentConfig({
-                    params: {
-                        appName,
-                        envName,
-                        configArea: 'DeploymentHistory',
-                        pipelineId,
-                        wfrId: currentWfrId,
-                    },
-                }),
+    const [compareDeploymentConfigLoader, compareDeploymentConfig, , reloadCompareDeploymentConfig] =
+        useAsync(async () => {
+            const payloads = [
+                {
+                    appName,
+                    envName,
+                    configArea: 'DeploymentHistory',
+                    pipelineId,
+                    wfrId: currentWfrId,
+                } as const,
                 isPreviousDeploymentConfigAvailable
-                    ? getAppEnvDeploymentConfig({
-                          params: {
-                              appName,
-                              envName,
-                              configArea: 'DeploymentHistory',
-                              pipelineId,
-                              wfrId: compareWfrId,
-                          },
-                      })
+                    ? ({
+                          appName,
+                          envName,
+                          configArea: 'DeploymentHistory',
+                          pipelineId,
+                          wfrId: compareWfrId,
+                      } as const)
                     : null,
-            ]),
-        [currentWfrId, compareWfrId],
-    )
+            ] as const
+
+            const [secretsData, ...configDatas] = await Promise.allSettled([
+                !isSuperAdmin ? getCompareSecretsData([...payloads]) : null,
+                ...payloads.map((payload) => payload && getAppEnvDeploymentConfig({ params: payload })),
+            ])
+
+            if (secretsData.status !== 'fulfilled' || !secretsData.value) {
+                return configDatas
+            }
+
+            secretsData.value.forEach((data, index) => {
+                if (
+                    configDatas[index].status !== 'fulfilled' ||
+                    !configDatas[index].value ||
+                    configDatas[index].value.result.isAppAdmin
+                ) {
+                    return
+                }
+                configDatas[index].value.result.secretsData = data.secretsData
+            })
+
+            return configDatas
+        }, [currentWfrId, compareWfrId])
 
     // METHODS
     const getNavItemHref = (resourceType: EnvResourceType, resourceName: string) =>

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiff.tsx

@@ -63,3 +63,29 @@ export const getAppEnvDeploymentConfig = ({
     signal?: AbortSignal
 }): Promise<ResponseType<AppEnvDeploymentConfigDTO>> =>
     get(getUrlWithSearchParams(ROUTES.CONFIG_DATA, params), { signal })
+
+export const getCompareSecretsData = async (
+    params: AppEnvDeploymentConfigPayloadType[],
+): Promise<AppEnvDeploymentConfigDTO[]> => {
+    const payload = {
+        comparisonItems: params.filter((param) => !!param).map((param, index) => ({ index, ...param })),
+    }
+
+    const results = Array(params.length).fill(null)
+
+    const {
+        result: { comparisonItemResponse },
+    } = await (get(
+        getUrlWithSearchParams(ROUTES.CONFIG_COMPARE_SECRET, {
+            compareConfig: JSON.stringify(payload),
+        }),
+    ) as Promise<
+        ResponseType<Record<'comparisonItemResponse', (AppEnvDeploymentConfigDTO & Record<'index', number>)[]>>
+    >)
+
+    comparisonItemResponse.forEach((resp) => {
+        results[resp.index] = resp
+    })
+
+    return results
+}

src/Shared/Services/app.service.ts

@@ -274,7 +274,7 @@ export type AppEnvDeploymentConfigPayloadType =
           appName: string
           envName: string
           configType: AppEnvDeploymentConfigType
-          identifierId?: number
+          wfrId?: number
           pipelineId?: number
           resourceType?: ConfigResourceType
           resourceId?: number