Merge pull request #424 from devtron-labs/feat/mandatory-tags-v2

feat: mandatory tags v2

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-patch-2",
     "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

@@ -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/Constants.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=""

src/Common/CustomTagSelector/PropagateTagInfo.tsx

@@ -22,6 +22,18 @@ export interface SuggestedTagOptionType extends OptionType {
     description: string
     propagate: boolean
 }
+
+export enum DeploymentPolicy {
+    ALLOW = 'allow',
+    BLOCK = 'block',
+    BLOCK_PROD = 'block-prod',
+    BLOCK_NON_PROD = 'block-non-prod',
+}
+
+export interface VariableValueConstraintTypes {
+    choices?: string[]
+    blockCustomValue?: boolean
+}
 export interface TagType {
     id?: number
     key: string
@@ -33,21 +45,8 @@ export interface TagType {
     isInvalidValue?: boolean
     isSuggested?: boolean
     isPropagateDisabled?: boolean
-}
-
-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
+    deploymentPolicy?: DeploymentPolicy
+    valueConstraint?: VariableValueConstraintTypes
 }
 
 export interface TagDetailType {

src/Common/CustomTagSelector/TagLabelSelect.tsx

@@ -16,7 +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, validateTagValue } from './tags.utils'