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

fix: migrate to use isApprovalPolicyApplicable

Author: eshankvaish

package-lock.json

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

package.json

@@ -54,9 +54,12 @@ import { getIsRequestAborted } from './Api'
 export function showError(serverError, showToastOnUnknownError = true, hideAccessError = false) {
     if (serverError instanceof ServerErrors && Array.isArray(serverError.errors)) {
         serverError.errors.map(({ userMessage, internalMessage }) => {
+            const userMessageInLowercase = userMessage?.toLowerCase()
+
             if (
                 serverError.code === 403 &&
-                (userMessage === ERROR_EMPTY_SCREEN.UNAUTHORIZED || userMessage === ERROR_EMPTY_SCREEN.FORBIDDEN)
+                (userMessageInLowercase === ERROR_EMPTY_SCREEN.UNAUTHORIZED.toLowerCase() ||
+                    userMessageInLowercase === ERROR_EMPTY_SCREEN.FORBIDDEN.toLowerCase())
             ) {
                 if (!hideAccessError) {
                     ToastManager.showToast({

src/Common/Helper.tsx

@@ -182,6 +182,12 @@ export interface DraftMetadataDTO {
     dataEncrypted: boolean
     isAppAdmin: boolean
     userApprovalMetadata: UserApprovalMetadataType
+    /**
+     * User id of the user who has requested the data
+     *
+     * This would be the id of the user whose token is sent in the cookie
+     */
+    requestedUserId: number
 }
 
 export enum CMSecretExternalType {

src/Shared/Services/app.types.ts

@@ -227,7 +227,7 @@ export interface AppDetails {
     clusterName?: string
     dockerRegistryId?: string
     deploymentAppDeleteRequest?: boolean
-    approvalConfigData?: ApprovalConfigDataType
+    isApprovalPolicyApplicable?: boolean
     isVirtualEnvironment?: boolean
     imageTag?: string
     helmPackageName?: string