Merge pull request #446 from devtron-labs/fix/approval-policy

fix: code review changes

Author: eshankvaish

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.2.3-beta-3",
+    "version": "1.2.4-beta-4",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -10,7 +10,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/devtron-labs/devtron-fe-common-lib.git"
+        "url": "git+https://github.com/devtron-labs/devtron-fe-common-lib.git"
     },
     "author": "Devtron",
     "license": "ISC",

package.json

@@ -197,7 +197,7 @@ const sanitizeDeploymentApprovalInfo = (
             approverList: sanitizeUserApprovalList(deploymentApprovalInfo?.eligibleApprovers?.anyUsers?.approverList),
         },
         specificUsers: {
-            approverList: sanitizeUserApprovalList(deploymentApprovalInfo?.eligibleApprovers?.anyUsers?.approverList),
+            approverList: sanitizeUserApprovalList(deploymentApprovalInfo?.eligibleApprovers?.specificUsers?.approverList),
         },
         userGroups: (deploymentApprovalInfo?.eligibleApprovers?.userGroups ?? []).map(
             ({ groupName, groupIdentifier, approverList }) => ({

src/Common/Common.service.ts

@@ -490,6 +490,7 @@ export const processDeployedTime = (lastDeployed, isArgoInstalled) => {
  */
 export const getUrlWithSearchParams = <T extends string | number = string | number>(
     url: string,
+    // FIXME: Need to fix this as the generic typing is incorrect
     params = {} as Partial<Record<T, any>>,
 ) => {
     const searchParams = new URLSearchParams()

src/Common/Helper.tsx

@@ -374,9 +374,10 @@ export interface UserApprovalInfo {
 }
 
 export enum ApprovalConfigDataKindType {
-    configMap = 'CM',
-    configSecret = 'CS',
-    deploymentTemplate = 'DEPLOYMENT_TEMPLATE',
+    configMap = 'configuration/config-map',
+    configSecret = 'configuration/config-secret',
+    deploymentTemplate = 'configuration/deployment-template',
+    deploymentTrigger = 'approval/deployment',
 }
 
 export interface ApprovalConfigDataType extends Pick<UserApprovalInfo, 'currentCount' | 'requiredCount'> {