Merge pull request #429 from devtron-labs/feat/mandatory-tags-cd

feat: add type for trigger block state due to mandatory tags

Author: arunjaindev

.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",
+    "version": "1.3.0-beta-8",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -16,7 +16,7 @@
 
 import { MutableRefObject } from 'react'
 import moment from 'moment'
-import { RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
+import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
 import { getIsManualApprovalSpecific, sanitizeUserApprovalConfig, stringComparatorBySortOrder } from '@Shared/Helpers'
 import { get, post } from './Api'
 import { GitProviderType, ROUTES } from './Constants'
@@ -116,6 +116,21 @@ const sanitizeApprovalConfigFromApprovalMetadata = (
     }
 }
 
+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,
@@ -210,6 +225,7 @@ const cdMaterialListModal = ({
             deploymentWindowArtifactMetadata: material.deploymentWindowArtifactMetadata ?? null,
             configuredInReleases: material.configuredInReleases ?? [],
             appWorkflowId: material.appWorkflowId ?? null,
+            deploymentBlockedState: sanitizeDeploymentBlockedState(material.deploymentBlockedState)
         }
     })
     return materials

src/Common/Common.service.ts

@@ -49,21 +49,6 @@ export interface TagType {
     valueConstraint?: VariableValueConstraintTypes
 }
 
-export interface TagErrorType {
-    isValid: boolean
-    messages: string[]
-}
-export interface TagLabelSelectType {
-    isCreateApp?: boolean
-    labelTags: TagType[]
-    setLabelTags: (tagList: TagType[]) => void
-    tabIndex?: number
-    selectedProjectId?: number
-    suggestedTagsOptions?: SuggestedTagOptionType[]
-    reloadProjectTags?: boolean
-    hidePropagateTag?: boolean
-}
-
 export interface TagDetailType {
     index: number
     tagData: TagType

src/Common/CustomTagSelector/TagLabelSelect.tsx

@@ -16,8 +16,7 @@
 
 export { default as PropagateTagInfo } from './PropagateTagInfo'
 export * from './TagDetails'
-export * from './TagLabelSelect'
 export * from './TagLabelValueSelector'
 export * from './ResizableTagTextArea'
 export * from './Types'
-export { validateTagKeyValue } from './tags.utils'
+export { validateTagKeyValue, validateTagValue } from './tags.utils'

src/Common/CustomTagSelector/TagSelector.utils.ts

@@ -27,3 +27,10 @@ export const validateTagKeyValue = (value: string): { isValid: boolean; errorMes
     const { isValid, messages } = propagateTagKey(value)
     return { isValid, errorMessages: messages }
 }
+
+export const validateTagValue = (value: string, key: string): { isValid: boolean; errorMessages: string[] } => {
+    const { propagateTagValue } = new ValidationRules()
+
+    const { isValid, messages } = propagateTagValue(value, key)
+    return { isValid, errorMessages: messages }
+}

src/Common/CustomTagSelector/Types.ts

@@ -39,6 +39,7 @@ export interface DraggableWrapperProps {
     childDivProps?: HTMLAttributes<HTMLDivElement>
     /**
      * Delta for fixing the scrollable layout positioning
+     * @deprecated
      */
     layoutFixDelta?: number
 }