Merge branch 'develop' into fix/deployment-history-config-compare

Author: RohitRaj011

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

package.json

@@ -99,9 +99,15 @@ export enum RefVariableStageType {
     POST_CI = 'POST_CI',
 }
 
+export enum FilePropertyTypeSizeUnit {
+    KB = 'KB',
+    MB = 'MB',
+}
+
 export interface FilePropertyType {
     allowedExtensions: string[]
     maxUploadSize: number
+    sizeUnit: FilePropertyTypeSizeUnit
 }
 
 export interface ConstraintType {

src/Common/CIPipeline.Types.ts

@@ -52,7 +52,16 @@ export const parseValueToCode = (value: string, mode: string, tabSize: number) =
     let final = value
 
     if (obj) {
-        final = mode === MODES.JSON ? JSON.stringify(obj, null, tabSize) : YAMLStringify(obj)
+        switch (mode) {
+            case MODES.JSON:
+                final = JSON.stringify(obj, null, tabSize)
+                break
+            case MODES.YAML:
+                final = YAMLStringify(obj)
+                break
+            default:
+                break
+        }
     }
 
     return final
@@ -68,7 +77,7 @@ export const initialState = ({
 }: CodeEditorInitialValueType): CodeEditorState => ({
     mode: mode as MODES,
     theme: (theme || CodeEditorThemesKeys.vs) as CodeEditorThemesKeys,
-    code: parseValueToCode(value, mode, tabSize),
+    code: noParsing ? value : parseValueToCode(value, mode, tabSize),
     diffMode: diffView,
     noParsing: [MODES.JSON, MODES.YAML].includes(mode as MODES) ? noParsing : true,
 })

src/Common/CodeEditor/CodeEditor.reducer.ts

@@ -92,7 +92,10 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         const monacoRef = useRef(null)
         const { width, height: windowHeight } = useWindowSize()
         const memoisedReducer = React.useCallback(CodeEditorReducer, [])
-        const [state, dispatch] = useReducer(memoisedReducer, initialState({ mode, theme, value, diffView, noParsing, tabSize }))
+        const [state, dispatch] = useReducer(
+            memoisedReducer,
+            initialState({ mode, theme, value, diffView, noParsing, tabSize }),
+        )
         const [, json, yamlCode, error] = useJsonYaml(state.code, tabSize, state.mode, !state.noParsing)
         const [, originalJson, originlaYaml] = useJsonYaml(defaultValue, tabSize, state.mode, !state.noParsing)
         const [contentHeight, setContentHeight] = useState(

src/Common/CodeEditor/CodeEditor.tsx

@@ -16,10 +16,10 @@
 
 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, getIsRequestAborted, post } from './Api'
-import { API_STATUS_CODES, GitProviderType, ROUTES } from './Constants'
+import { get, post } from './Api'
+import { GitProviderType, ROUTES } from './Constants'
 import { getUrlWithSearchParams, showError, sortCallback } from './Helper'
 import {
     TeamList,
@@ -49,8 +49,6 @@ import { ApiResourceType } from '../Pages'
 import { API_TOKEN_PREFIX } from '@Shared/constants'
 import { DefaultUserKey } from '@Shared/types'
 import { RefVariableType } from './CIPipeline.Types'
-import { ServerErrors } from './ServerError'
-import { ToastManager, ToastVariantType } from '@Shared/Services'
 
 export const getTeamListMin = (): Promise<TeamList> => {
     // ignore active field
@@ -118,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,
@@ -212,6 +225,7 @@ const cdMaterialListModal = ({
             deploymentWindowArtifactMetadata: material.deploymentWindowArtifactMetadata ?? null,
             configuredInReleases: material.configuredInReleases ?? [],
             appWorkflowId: material.appWorkflowId ?? null,
+            deploymentBlockedState: sanitizeDeploymentBlockedState(material.deploymentBlockedState)
         }
     })
     return materials
@@ -567,16 +581,6 @@ export const getGlobalVariables = async ({
 
         return variableList
     } catch (err) {
-        if (!getIsRequestAborted(err)) {
-            if (err instanceof ServerErrors && err.code === API_STATUS_CODES.PERMISSION_DENIED) {
-                ToastManager.showToast({
-                    variant: ToastVariantType.notAuthorized,
-                    description: 'You are not authorized to access global variables',
-                })
-            } else {
-                showError(err)
-            }
-        }
         throw err
     }
 }

src/Common/Common.service.ts

@@ -33,10 +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=""