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

Author: eshankvaish

.eslintignore

@@ -16,9 +16,7 @@ src/Common/Common.service.ts
 src/Common/CustomInput/CustomInput.tsx
 src/Common/CustomTagSelector/PropagateTagInfo.tsx
 src/Common/CustomTagSelector/TagDetails.tsx
-src/Common/CustomTagSelector/TagLabelSelect.tsx
 src/Common/CustomTagSelector/TagLabelValueSelector.tsx
-src/Common/CustomTagSelector/TagSelector.utils.ts
 src/Common/CustomTagSelector/ValidationRules.ts
 src/Common/DebouncedSearch/DebouncedSearch.tsx
 src/Common/DebouncedSearch/Utils.ts

package-lock.json

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

package.json

@@ -259,6 +259,11 @@ export interface DockerConfigOverrideType {
     ciBuildConfig: CIBuildConfigType
 }
 
+export enum WORKFLOW_CACHE_CONFIG_ENUM {
+    INHERIT = 'INHERIT',
+    OVERRIDE = 'OVERRIDE',
+}
+
 export interface FormType {
     name: string
     args: { key: string; value: string }[]
@@ -291,6 +296,11 @@ export interface FormType {
     isDockerConfigOverridden?: boolean
     dockerConfigOverride?: DockerConfigOverrideType
     isOffendingMandatoryPlugin?: boolean
+    workflowCacheConfig?: {
+        type: WORKFLOW_CACHE_CONFIG_ENUM
+        value: boolean
+        globalValue: boolean
+    }
 }
 
 export interface ErrorObj {

src/Assets/Sounds/DeployAudio.mp3

@@ -17,7 +17,7 @@
 import { MutableRefObject } from 'react'
 import moment from 'moment'
 import { sanitizeApprovalConfigData, sanitizeUserApprovalList } from '@Shared/Helpers'
-import { RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
+import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
 import { get, post } from './Api'
 import { GitProviderType, ROUTES } from './Constants'
 import { getUrlWithSearchParams, showError, sortCallback } from './Helper'
@@ -96,6 +96,21 @@ export const sanitizeUserApprovalMetadata = (userApprovalMetadata: UserApprovalM
     approvalConfigData: sanitizeApprovalConfigData(userApprovalMetadata?.approvalConfigData),
 })
 
+const sanitizeDeploymentBlockedState = (deploymentBlockedState: PolicyBlockInfo) => {
+    if (!deploymentBlockedState) {
+        return {
+            isBlocked: false,
+            blockedBy: null,
+            reason: '',
+        }
+    }
+    return {
+        isBlocked: deploymentBlockedState.isBlocked || false,
+        blockedBy: deploymentBlockedState.blockedBy || null,
+        reason: deploymentBlockedState.reason || '',
+    }
+}
+
 const cdMaterialListModal = ({
     artifacts,
     offset,
@@ -188,6 +203,7 @@ const cdMaterialListModal = ({
             deploymentWindowArtifactMetadata: material.deploymentWindowArtifactMetadata ?? null,
             configuredInReleases: material.configuredInReleases ?? [],
             appWorkflowId: material.appWorkflowId ?? null,
+            deploymentBlockedState: sanitizeDeploymentBlockedState(material.deploymentBlockedState)
         }
     })
     return materials

src/Common/CIPipeline.Types.ts

@@ -33,11 +33,12 @@ export const DOCUMENTATION = {
 }
 
 export const PATTERNS = {
+    STRING: /^[a-zA-Z0-9_]+$/,
     DECIMAL_NUMBERS: /^-?\d*\.?\d*$/,
     NATURAL_NUMBERS: /^\d*\.?\d*$/,
     KUBERNETES_KEY_PREFIX: /^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$/,
     KUBERNETES_KEY_NAME: /^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$/,
-    START_END_ALPHANUMERIC: /^([Az09].*[A-Za-z0-9])$|[A-Za-z0-9]$/,
+    START_END_ALPHANUMERIC: /^(([A-Za-z0-9].*[A-Za-z0-9])|[A-Za-z0-9])$/,
     ALPHANUMERIC_WITH_SPECIAL_CHAR: /^[A-Za-z0-9._-]+$/, // allow alphanumeric,(.) ,(-),(_)
     ESCAPED_CHARACTERS: /[.*+?^${}()|[\]\\]/g,
     NUMBERS_WITH_SCOPE_VARIABLES: /^(\d+(\.\d+)?|@{{[a-zA-Z0-9-]+}})$/,

src/Common/Common.service.ts

@@ -39,7 +39,7 @@ export default function PropagateTagInfo({ isCreateApp }: { isCreateApp: boolean
         <TippyCustomized
             theme={TippyTheme.white}
             className="w-300"
-            placement="top"
+            placement="left"
             Icon={InjectTag}
             heading="Propagate tags to K8s resources"
             infoText=""