Merge branch 'main' of github.com:devtron-labs/dashboard into feat/user-status-p2

eshankvaish · eshankvaish · commit 953267a398b2 · 2024-02-14T15:57:53.000+05:30
diff --git a/config-overrides.js b/config-overrides.js
diff --git a/package.json b/package.json
@@ -25,9 +25,8 @@
         "http-proxy-middleware": "^2.0.6",
         "marked": "4.3.0",
         "moment": "^2.29.4",
-        "monaco-editor": "0.38.0",
-        "monaco-editor-webpack-plugin": "^7.1.0",
-        "monaco-yaml": "4.0.4",
+        "monaco-editor": "0.45.0",
+        "monaco-yaml": "5.1.1",
         "query-string": "^7.1.1",
         "react": "^17.0.2",
         "react-csv": "^2.2.2",
@@ -38,7 +37,7 @@
         "react-gtm-module": "^2.0.11",
         "react-keybind": "^0.9.4",
         "react-mde": "^11.5.0",
-        "react-monaco-editor": "^0.54.0",
+        "react-monaco-editor": "^0.55.0",
         "react-router-dom": "^5.3.4",
         "react-select": "^5.2.2",
         "react-toastify": "^8.2.0",
diff --git a/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionListHeader.tsx b/src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionListHeader.tsx
@@ -55,7 +55,9 @@ const UserPermissionListHeader = ({
                         </div>
                     }
                 >
-                    <HelpOutlineIcon className="mw-20 icon-dim-20 fcn-6 cursor" />
+                    <div className="flex">
+                        <HelpOutlineIcon className="mw-20 icon-dim-20 fcn-6 cursor" />
+                    </div>
                 </TippyCustomized>
             </div>
             <div className="flex dc__gap-8">
diff --git a/src/components/CodeEditor/CodeEditor.tsx b/src/components/CodeEditor/CodeEditor.tsx
@@ -1,18 +1,32 @@
 import React, { useEffect, useCallback, useReducer, useRef } from 'react'
 import MonacoEditor, { MonacoDiffEditor } from 'react-monaco-editor'
-import { Progressing, copyToClipboard, useWindowSize } from '@devtron-labs/devtron-fe-common-lib'
+import { MODES, Progressing, copyToClipboard, useWindowSize } from '@devtron-labs/devtron-fe-common-lib'
 import YAML from 'yaml'
 import ReactGA from 'react-ga4'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
+import { configureMonacoYaml } from 'monaco-yaml'
+
 import { useJsonYaml, Select, RadioGroup } from '../common'
 import { ReactComponent as ClipboardIcon } from '../../assets/icons/ic-copy.svg'
 import { ReactComponent as Info } from '../../assets/icons/ic-info-filled.svg'
 import { ReactComponent as ErrorIcon } from '../../assets/icons/ic-error-exclamation.svg'
 import { ReactComponent as WarningIcon } from '../../assets/icons/ic-warning.svg'
 import './codeEditor.scss'
 import 'monaco-editor'
+
+import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
+import YamlWorker from '../../yaml.worker.js?worker'
 import { cleanKubeManifest } from '../../util/Util'
 
+self.MonacoEnvironment = {
+    getWorker(_, label) {
+        if (label === MODES.YAML) {
+            return new YamlWorker()
+        }
+        return new editorWorker()
+    },
+}
+
 // @ts-ignore
 const { yaml } = monaco.languages || {}
 
@@ -223,22 +237,20 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         if (!validatorSchema) {
             return
         }
-        yaml &&
-            yaml.yamlDefaults.setDiagnosticsOptions({
-                validate: true,
-                enableSchemaRequest: true,
-                hover: true,
-                completion: true,
-                isKubernetes,
-                format: true,
-                schemas: [
-                    {
-                        uri: `https://github.com/devtron-labs/devtron/tree/main/scripts/devtron-reference-helm-charts/reference-chart_${chartVersion}/schema.json`, // id of the first schema
-                        fileMatch: ['*'], // associate with our model
-                        schema: validatorSchema,
-                    },
-                ],
-            })
+        const config= configureMonacoYaml(monaco, {
+          enableSchemaRequest: true,
+          isKubernetes,
+          schemas: [
+            {
+                uri: `https://github.com/devtron-labs/devtron/tree/main/scripts/devtron-reference-helm-charts/reference-chart_${chartVersion}/schema.json`, // id of the first schema
+                fileMatch: ['*'], // associate with our model
+                schema: validatorSchema,
+            },
+        ],
+        })
+        return ()=>{
+          config.dispose()
+        }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [validatorSchema, chartVersion])
     useEffect(() => {
diff --git a/src/components/app/list-new/AppList.tsx b/src/components/app/list-new/AppList.tsx
@@ -720,7 +720,7 @@ export default function AppList({ isSuperAdmin, appListCount, isArgoInstalled }:
                             {isArgoInstalled && (
                                 <>
                                     <Filter
-                                        list={masterFilters.appStatus}
+                                        list={appStatusFilters}
                                         labelKey="label"
                                         buttonText={APP_LIST_HEADERS.AppStatus}
                                         placeholder={APP_LIST_HEADERS.SearchAppStatus}
@@ -737,7 +737,7 @@ export default function AppList({ isSuperAdmin, appListCount, isArgoInstalled }:
                                 </>
                             )}
                             <Filter
-                                list={appStatusFilters}
+                                list={masterFilters.projects}
                                 labelKey="label"
                                 buttonText="Projects"
                                 placeholder="Search Project"
@@ -1083,13 +1083,13 @@ export default function AppList({ isSuperAdmin, appListCount, isArgoInstalled }:
     }
 
     return (
-        <>
+        <div>
             <HeaderWithCreateButton headerName="Applications" isSuperAdmin={isSuperAdmin} />
             {renderMasterFilters()}
             {renderAppliedFilters()}
             {renderAppTabs()}
             {serverMode === SERVER_MODE.FULL && renderAppCreateRouter()}
             {renderAppListBody()}
-        </>
+        </div>
     )
 }
diff --git a/src/components/app/list-new/ExternalArgoList.tsx b/src/components/app/list-new/ExternalArgoList.tsx
@@ -197,7 +197,9 @@ export default function ExternalArgoList({
                 <div className="app-list__cell app-list__cell--env">
                     <span className="app-list__cell-header mr-4">{APP_LIST_HEADERS.Environment}</span>
                     <Tippy className="default-tt" arrow placement="top" content={ENVIRONMENT_HEADER_TIPPY_CONTENT}>
-                        <HelpOutlineIcon className="icon-dim-20" />
+                        <span>
+                            <HelpOutlineIcon className="icon-dim-20" />
+                        </span>
                     </Tippy>
                 </div>
 
diff --git a/src/components/deploymentConfig/DeploymentTemplateView/DeploymentTemplateEditorView.tsx b/src/components/deploymentConfig/DeploymentTemplateView/DeploymentTemplateEditorView.tsx
@@ -466,7 +466,9 @@ const DeploymentTemplateEditorView = ({
                     value === null ||
                     fetchingValues ||
                     draftLoading ||
-                    resolveLoading
+                    resolveLoading ||
+                    !rhs ||
+                    (state.openComparison && !lhs)
                 }
                 height={getCodeEditorHeight(isUnSet, isEnvOverride, state.openComparison, state.showReadme)}
                 diffView={state.openComparison}
diff --git a/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Logs.component.tsx b/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Logs.component.tsx
@@ -685,15 +685,17 @@ const LogsComponent = ({
                                 />
                             ) : (
                                 <Tippy className="default-tt" arrow={false} placement="top" content="Download logs">
-                                    <Download
-                                        className={`icon-dim-16 mr-8 cursor ${
-                                            (podContainerOptions?.containerOptions ?? []).length === 0 ||
-                                            (prevContainer && showNoPrevContainer != '')
-                                                ? 'cursor-not-allowed dc__opacity-0_5'
-                                                : ''
-                                        }`}
-                                        onClick={handleDownloadLogs}
-                                    />
+                                    <span>
+                                        <Download
+                                            className={`icon-dim-16 mr-8 cursor ${
+                                                (podContainerOptions?.containerOptions ?? []).length === 0 ||
+                                                (prevContainer && showNoPrevContainer != '')
+                                                    ? 'cursor-not-allowed dc__opacity-0_5'
+                                                    : ''
+                                            }`}
+                                            onClick={handleDownloadLogs}
+                                        />
+                                    </span>
                                 </Tippy>
                             ))}
                     </div>
diff --git a/src/yaml.worker.js b/src/yaml.worker.js
@@ -0,0 +1 @@
+import 'monaco-yaml/yaml.worker'
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,9 @@ const UserPermissionListHeader = ({`
`55`	`55`	`</div>`
`56`	`56`	`}`
`57`	`57`	`>`
`58`		`- <HelpOutlineIcon className="mw-20 icon-dim-20 fcn-6 cursor" />`
	`58`	`+ <div className="flex">`
	`59`	`+ <HelpOutlineIcon className="mw-20 icon-dim-20 fcn-6 cursor" />`
	`60`	`+ </div>`
`59`	`61`	`</TippyCustomized>`
`60`	`62`	`</div>`
`61`	`63`	`<div className="flex dc__gap-8">`