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

Author: eshankvaish

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.2.17-beta-4",
+    "version": "1.3.0-beta-4",
     "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

@@ -18,8 +18,8 @@ import { MutableRefObject } from 'react'
 import moment from 'moment'
 import { sanitizeApprovalConfigData, sanitizeUserApprovalList } from '@Shared/Helpers'
 import { RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
-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,
@@ -43,8 +43,6 @@ import {
 } from './Types'
 import { ApiResourceType } from '../Pages'
 import { RefVariableType } from './CIPipeline.Types'
-import { ServerErrors } from './ServerError'
-import { ToastManager, ToastVariantType } from '@Shared/Services'
 
 export const getTeamListMin = (): Promise<TeamList> => {
     // ignore active field
@@ -472,16 +470,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,6 +33,7 @@ export const DOCUMENTATION = {
 }
 
 export const PATTERNS = {
+    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])$/,

src/Common/Constants.ts

@@ -54,7 +54,7 @@
             width: 100%;
 
             > button {
-                padding: 10px 8px;
+                padding: 9px 8px;
                 width: 100%;
                 height: 100%;
                 border-radius: 0;

src/Shared/Components/DynamicDataTable/styles.scss

@@ -141,7 +141,7 @@ export type SelectPickerProps<OptionValue = number | string, IsMulti extends boo
                 IsMulti,
                 GroupBase<SelectPickerOptionType<OptionValue>>
             >,
-            'onCreateOption' | 'formatCreateLabel'
+            'onCreateOption' | 'formatCreateLabel' | 'menuPortalTarget'
         >
     > & {
         /**