Merge branch 'develop' into feat/history-ui

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.2.7-beta-1",
+    "version": "0.2.12",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { useEffect, useReducer, useRef } from 'react'
+import React, { useEffect, useMemo, useReducer, useRef, useState } from 'react'
 import MonacoEditor, { MonacoDiffEditor } from 'react-monaco-editor'
 import YAML from 'yaml'
 import ReactGA from 'react-ga4'
@@ -55,12 +55,9 @@ function useCodeEditorContext() {
 }
 
 /**
- * NOTE: once monaco editor mounts it doesn't update it's internal onChange state.
- * Since most of the time onChange methods are declared inside the render body of a component
- * we should use the latest references of onChange.
- * Please see: https://github.com/react-monaco-editor/react-monaco-editor/issues/704
- * Thus as a hack we are using this objects reference to call the latest onChange reference
- */
+ * TODO: can be removed with this new merge into react-monaco-editor :)
+ * see: https://github.com/react-monaco-editor/react-monaco-editor/pull/955
+ * */
 const _onChange = {
     onChange: null,
 }
@@ -90,6 +87,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         cleanData = false,
         onBlur,
         onFocus,
+        adjustEditorHeightToContent,
     }) => {
         if (cleanData) {
             value = cleanKubeManifest(value)
@@ -103,6 +101,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         const [state, dispatch] = useReducer(memoisedReducer, initialState({ mode, theme, value, diffView, noParsing }))
         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(height)
         monaco.editor.defineTheme(CodeEditorThemesKeys.vsDarkDT, {
             base: 'vs-dark',
             inherit: true,
@@ -167,10 +166,24 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                 }
             }
 
+            if (adjustEditorHeightToContent) {
+                setContentHeight(editor.getContentHeight())
+                editor.onDidContentSizeChange(() => {
+                    setContentHeight(editor.getContentHeight())
+                })
+            }
+
             editorRef.current = editor
             monacoRef.current = monaco
         }
 
+        const editorHeight = useMemo(() => {
+            if (!adjustEditorHeightToContent) {
+                return height
+            }
+            return contentHeight
+        }, [height, contentHeight, adjustEditorHeightToContent])
+
         useEffect(() => {
             if (!validatorSchema) {
                 return
@@ -283,7 +296,9 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         }
 
         return (
-            <CodeEditorContext.Provider value={{ dispatch, state, handleLanguageChange, error, defaultValue, height }}>
+            <CodeEditorContext.Provider
+                value={{ dispatch, state, handleLanguageChange, error, defaultValue, height: editorHeight }}
+            >
                 {children}
                 {loading ? (
                     <CodeEditorPlaceholder customLoader={customLoader} />
@@ -301,7 +316,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                                 options={diffViewOptions}
                                 theme={state.theme.toLowerCase().split(' ').join('-')}
                                 editorDidMount={editorDidMount}
-                                height={height}
+                                height={editorHeight}
                                 width="100%"
                             />
                         ) : (
@@ -312,7 +327,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                                 options={options}
                                 onChange={handleOnChange}
                                 editorDidMount={editorDidMount}
-                                height={height}
+                                height={editorHeight}
                                 width="100%"
                             />
                         )}

src/Common/CodeEditor/CodeEditor.tsx

@@ -48,6 +48,7 @@ export interface CodeEditorInterface {
     isKubernetes?: boolean
     cleanData?: boolean
     chartVersion?: any
+    adjustEditorHeightToContent?: boolean
 }
 
 export interface CodeEditorHeaderInterface {

src/Common/CodeEditor/types.ts

@@ -62,6 +62,7 @@ export const URLS = {
     GLOBAL_CONFIG_DOCKER: '/global-config/docker',
     DEPLOYMENT_HISTORY_CONFIGURATIONS: '/configuration',
     GLOBAL_CONFIG_SCOPED_VARIABLES: '/global-config/scoped-variables',
+    GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST: '/global-config/deployment-charts',
     NETWORK_STATUS_INTERFACE: '/network-status-interface',
 }
 
@@ -105,6 +106,7 @@ export const ROUTES = {
     PLUGIN_GLOBAL_LIST_DETAIL_V2: 'plugin/global/list/detail/v2',
     PLUGIN_GLOBAL_LIST_V2: 'plugin/global/list/v2',
     PLUGIN_GLOBAL_LIST_TAGS: 'plugin/global/list/tags',
+    DEPLOYMENT_CHARTS_LIST: 'deployment/template/fetch',
     CONFIG_DATA: 'config/data',
 }
 

src/Common/Constants.ts

@@ -562,7 +562,10 @@ export const processDeployedTime = (lastDeployed, isArgoInstalled) => {
  * @param url URL to which the search params needs to be added
  * @param params Object for the search parameters
  */
-export const getUrlWithSearchParams = (url: string, params: Record<string | number, any> = {}) => {
+export const getUrlWithSearchParams = <T extends string | number = string | number>(
+    url: string,
+    params = {} as Partial<Record<T, any>>,
+) => {
     const searchParams = new URLSearchParams()
     Object.keys(params).forEach((key) => {
         if (!EXCLUDED_FALSY_VALUES.includes(params[key])) {

src/Common/Helper.tsx

@@ -21,3 +21,9 @@ export const PLACEHOLDERS = {
 }
 
 export const DEFAULT_FIELD_TITLE = 'Key not available'
+
+export const HIDE_SUBMIT_BUTTON_UI_SCHEMA = {
+    'ui:submitButtonOptions': {
+        norender: true,
+    },
+}

src/Common/RJSF/constants.ts

@@ -17,3 +17,4 @@
 export { RJSFForm } from './Form'
 export * from './types'
 export { getInferredTypeFromValueType, getRedirectionProps } from './utils'
+export { HIDE_SUBMIT_BUTTON_UI_SCHEMA } from './constants'

src/Common/RJSF/index.ts

@@ -0,0 +1 @@
+export * from './types'

src/Pages/CDPipeline/index.tsx

@@ -0,0 +1,91 @@
+import { BuildStageType, FormType } from '@Common/CIPipeline.Types'
+import { DeploymentAppTypes } from '@Common/Types'
+import { DeploymentStrategy } from '@Shared/Components'
+import { EnvListMinDTO } from '@Shared/types'
+
+interface ConfigSecretType {
+    label: string
+    value: string
+    type: string
+}
+
+export interface Environment
+    extends Pick<EnvListMinDTO, 'id' | 'active' | 'namespace' | 'isClusterCdActive'>,
+        Partial<
+            Pick<
+                EnvListMinDTO,
+                'isVirtualEnvironment' | 'allowedDeploymentTypes' | 'description' | 'isDigestEnforcedForEnv'
+            >
+        > {
+    name: string
+    clusterName: string
+    clusterId: string
+}
+
+export interface PipelineBuildStageType extends BuildStageType {
+    triggerType?: string
+}
+
+export interface SavedDeploymentStrategy extends DeploymentStrategy {
+    isCollapsed?: boolean
+    defaultConfig?: any
+    yamlStr?: any
+    jsonStr?: any
+}
+
+export interface CustomTagType {
+    tagPattern: string
+    counterX: string
+}
+
+export enum ReleaseMode {
+    NEW_DEPLOYMENT = 'create',
+    MIGRATE_HELM = 'link',
+}
+
+export interface CDFormType {
+    name: string
+    ciPipelineId: number
+    environmentId: number
+    environmentName: string
+    namespace: string
+    environments: Environment[]
+    deploymentAppType: string
+    deploymentAppName?: string
+    releaseMode: ReleaseMode
+    triggerType: string
+    preBuildStage?: PipelineBuildStageType
+    postBuildStage?: PipelineBuildStageType
+    strategies: DeploymentStrategy[]
+    savedStrategies: SavedDeploymentStrategy[]
+    preStageConfigMapSecretNames: { configMaps: ConfigSecretType[]; secrets: ConfigSecretType[] }
+    postStageConfigMapSecretNames: { configMaps: ConfigSecretType[]; secrets: ConfigSecretType[] }
+    requiredApprovals: string
+    userApprovalConfig?: {
+        requiredCount: number
+    }
+    isClusterCdActive: boolean
+    deploymentAppCreated: boolean
+    clusterId: string
+    clusterName: string
+    runPreStageInEnv: boolean
+    runPostStageInEnv: boolean
+    allowedDeploymentTypes: DeploymentAppTypes[]
+    containerRegistryName: string
+    repoName: string
+    selectedRegistry: any
+    generatedHelmPushAction: string
+}
+
+export interface PipelineFormType extends Partial<FormType>, Partial<CDFormType> {
+    name: string
+    triggerType: string
+    preBuildStage?: PipelineBuildStageType
+    postBuildStage?: PipelineBuildStageType
+    defaultTag?: string[]
+    customTag?: CustomTagType
+    enableCustomTag?: boolean
+    customTagStage?: string
+    isDigestEnforcedForPipeline?: boolean
+    isDigestEnforcedForEnv?: boolean
+}