Merge pull request #518 from devtron-labs/release-candidate-v0.27.0

release: Release candidate v0.27.0

Author: eshankvaish

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.4.0-patch-3",
+    "version": "1.5.0",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -106,6 +106,7 @@
         "react-dates": "^21.8.0",
         "react-diff-viewer-continued": "^3.4.0",
         "react-monaco-editor": "^0.54.0",
+        "react-virtualized-sticky-tree": "^3.0.0-beta18",
         "sass": "^1.69.7",
         "tslib": "2.7.0"
     },
@@ -120,6 +121,10 @@
         },
         "vite-plugin-svgr": {
             "vite": "5.4.11"
+        },
+        "react-virtualized-sticky-tree": {
+            "react": "^17.0.2",
+            "react-dom": "^17.0.2"
         }
     }
 }

package.json

@@ -29,6 +29,8 @@ export const CodeEditorReducer = (state: CodeEditorState, action: Action) => {
             return { ...state, theme: action.value }
         case 'setCode':
             return { ...state, code: action.value }
+        case 'setDefaultCode':
+            return { ...state, defaultCode: action.value }
         case 'setHeight':
             return { ...state, height: action.value.toString() }
         default:
@@ -71,13 +73,15 @@ export const initialState = ({
     mode,
     theme,
     value,
+    defaultValue,
     diffView,
     noParsing,
     tabSize,
 }: CodeEditorInitialValueType): CodeEditorState => ({
     mode: mode as MODES,
     theme: (theme || CodeEditorThemesKeys.vs) as CodeEditorThemesKeys,
     code: noParsing ? value : parseValueToCode(value, mode, tabSize),
+    defaultCode: noParsing ? defaultValue : parseValueToCode(defaultValue, mode, tabSize),
     diffMode: diffView,
     noParsing: [MODES.JSON, MODES.YAML].includes(mode as MODES) ? noParsing : true,
 })

src/Assets/Icon/ic-arrows-clockwise.svg

@@ -15,7 +15,7 @@
  */
 
 import React, { useEffect, useMemo, useReducer, useRef, useState } from 'react'
-import MonacoEditor, { MonacoDiffEditor } from 'react-monaco-editor'
+import MonacoEditor, { ChangeHandler, DiffEditorDidMount, EditorDidMount, MonacoDiffEditor } from 'react-monaco-editor'
 import ReactGA from 'react-ga4'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
 import { configureMonacoYaml } from 'monaco-yaml'
@@ -94,10 +94,10 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         const memoisedReducer = React.useCallback(CodeEditorReducer, [])
         const [state, dispatch] = useReducer(
             memoisedReducer,
-            initialState({ mode, theme, value, diffView, noParsing, tabSize }),
+            initialState({ mode, theme, value, defaultValue, 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 [, originalJson, originalYaml] = useJsonYaml(state.defaultCode, tabSize, state.mode, !state.noParsing)
         const [contentHeight, setContentHeight] = useState(
             adjustEditorHeightToContent ? INITIAL_HEIGHT_WHEN_DYNAMIC_HEIGHT : height,
         )
@@ -160,7 +160,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
             }
         }, [disableSearch])
 
-        const editorDidMount = (editor, monaco) => {
+        const editorDidMount: EditorDidMount = (editor) => {
             if (
                 mode === MODES.YAML &&
                 editor &&
@@ -181,15 +181,21 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
             }
 
             if (adjustEditorHeightToContent && editor) {
-                if (!('getModifiedEditor' in editor)) {
-                    editor.onDidContentSizeChange(() => {
-                        setContentHeight(editor.getContentHeight())
-                    })
+                editor.onDidContentSizeChange(() => {
                     setContentHeight(editor.getContentHeight())
-                    return
-                }
-                const modifiedEditor = editor.getModifiedEditor()
-                const originalEditor = editor.getOriginalEditor()
+                })
+                setContentHeight(editor.getContentHeight())
+            }
+
+            editorRef.current = editor
+            monacoRef.current = monaco
+        }
+
+        const diffEditorDidMount: DiffEditorDidMount = (editor, monaco) => {
+            const originalEditor = editor.getOriginalEditor()
+            const modifiedEditor = editor.getModifiedEditor()
+
+            if (adjustEditorHeightToContent) {
                 originalEditor.onDidContentSizeChange(() => {
                     setContentHeight(
                         Math.max(
@@ -198,6 +204,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                         ),
                     )
                 })
+
                 modifiedEditor.onDidContentSizeChange(() => {
                     setContentHeight(
                         Math.max(
@@ -206,9 +213,14 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                         ),
                     )
                 })
-                setContentHeight(Math.max(modifiedEditor.getContentHeight(), modifiedEditor.getContentHeight()))
+
+                setContentHeight(Math.max(originalEditor.getContentHeight(), modifiedEditor.getContentHeight()))
             }
 
+            originalEditor.onDidChangeModelContent(() => {
+                codeEditorOnChange(modifiedEditor.getValue(), originalEditor.getValue())
+            })
+
             editorRef.current = editor
             monacoRef.current = monaco
         }
@@ -254,14 +266,15 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
             editorRef.current.layout()
         }, [width, windowHeight])
 
-        const setCode = (value: string) => {
+        const setCode = (value: string, originalValue: string) => {
             dispatch({ type: 'setCode', value })
-            onChangeRef.current?.(value)
+            dispatch({ type: 'setDefaultCode', value: originalValue })
+            onChangeRef.current?.(value, originalValue)
         }
 
         useEffectAfterMount(() => {
             if (noParsing) {
-                setCode(value)
+                setCode(value, defaultValue)
 
                 return
             }
@@ -270,8 +283,8 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                 return
             }
 
-            setCode(parseValueToCode(value, state.mode, tabSize))
-        }, [value, noParsing])
+            setCode(parseValueToCode(value, state.mode, tabSize), parseValueToCode(defaultValue, state.mode, tabSize))
+        }, [value, defaultValue, noParsing])
 
         useEffect(() => {
             dispatch({ type: 'setDiff', value: diffView })
@@ -283,13 +296,17 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
             }
         }, [focus])
 
-        function handleOnChange(newValue, e) {
-            setCode(newValue)
+        const codeEditorOnChange = (newValue: string, newOriginalValue: string) => {
+            setCode(newValue, newOriginalValue)
+        }
+
+        const handleOnChange: ChangeHandler = (newValue) => {
+            codeEditorOnChange(newValue, editorRef.current?.getOriginalEditor?.().getValue?.() ?? '')
         }
 
         function handleLanguageChange(mode: 'json' | 'yaml') {
             dispatch({ type: 'changeLanguage', value: mode })
-            setCode(mode === 'json' ? json : yamlCode)
+            setCode(mode === 'json' ? json : yamlCode, mode === 'json' ? originalJson : originalYaml)
         }
 
         const options: monaco.editor.IEditorConstructionOptions = {
@@ -325,6 +342,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
 
         const diffViewOptions: monaco.editor.IDiffEditorConstructionOptions = {
             ...options,
+            originalEditable: !readOnly,
             useInlineViewWhenSpaceIsLimited: false,
         }
 
@@ -340,15 +358,13 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                         {shebang && <div className="code-editor__shebang">{shebang}</div>}
                         {state.diffMode ? (
                             <MonacoDiffEditor
-                                original={
-                                    noParsing ? defaultValue : state.mode === 'json' ? originalJson : originlaYaml
-                                }
+                                original={state.defaultCode}
                                 value={state.code}
                                 language={state.mode}
                                 onChange={handleOnChange}
                                 options={diffViewOptions}
                                 theme={state.theme.toLowerCase().split(' ').join('-')}
-                                editorDidMount={editorDidMount}
+                                editorDidMount={diffEditorDidMount}
                                 height={editorHeight}
                                 width="100%"
                             />

src/Assets/Icon/ic-shield-check.svg

@@ -26,7 +26,7 @@ interface CodeEditorBaseInterface {
     value?: string
     lineDecorationsWidth?: number
     responseType?: string
-    onChange?: (string) => void
+    onChange?: (value: string, defaultValue: string) => void
     onBlur?: () => void
     onFocus?: () => void
     children?: any
@@ -88,7 +88,7 @@ export interface CodeEditorHeaderComposition {
     Clipboard?: React.FC<any>
 }
 
-export type ActionTypes = 'changeLanguage' | 'setDiff' | 'setTheme' | 'setCode' | 'setHeight'
+export type ActionTypes = 'changeLanguage' | 'setDiff' | 'setTheme' | 'setCode' | 'setDefaultCode' | 'setHeight'
 
 export interface Action {
     type: ActionTypes
@@ -108,6 +108,7 @@ export interface CodeEditorInitialValueType {
     diffView: boolean
     theme?: string
     value: string
+    defaultValue: string
     noParsing?: boolean
     tabSize: number
 }
@@ -117,6 +118,7 @@ export interface CodeEditorState {
     diffMode: boolean
     theme: CodeEditorThemesKeys
     code: string
+    defaultCode: string
     noParsing: boolean
 }
 

src/Assets/Icon/ic-shield-warning-outline.svg

@@ -41,7 +41,7 @@ import {
     GlobalVariableDTO,
     GlobalVariableOptionType,
 } from './Types'
-import { ApiResourceType } from '../Pages'
+import { ApiResourceType, STAGE_MAP } from '../Pages'
 import { RefVariableType, VariableTypeFormat } from './CIPipeline.Types'
 
 export const getTeamListMin = (): Promise<TeamList> => {
@@ -68,13 +68,6 @@ interface UserRole extends ResponseType {
     }
 }
 
-const stageMap = {
-    PRECD: 'PRE',
-    CD: 'DEPLOY',
-    POSTCD: 'POST',
-    APPROVAL: 'APPROVAL',
-}
-
 export const SourceTypeMap = {
     BranchFixed: 'SOURCE_TYPE_BRANCH_FIXED',
     WEBHOOK: 'WEBHOOK',
@@ -396,7 +389,7 @@ export const genericCDMaterialsService = (
         default:
             URL = getUrlWithSearchParams(`${ROUTES.CD_MATERIAL_GET}/${cdMaterialID}/material`, {
                 ...manipulatedParams,
-                stage: stageMap[stage],
+                stage: STAGE_MAP[stage],
             })
             break
     }