Merge pull request #13646 from sg00dwin/release-4.14-backports

OCPBUGS-29813: Release 4.14 backports
openshift · Mar 6, 2024 · dca881c · dca881c
2 parents 773c6d9 + fb02148
commit dca881c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/frontend/packages/console-shared/src/components/editor/yaml-editor-utils.ts b/frontend/packages/console-shared/src/components/editor/yaml-editor-utils.ts
@@ -187,7 +187,7 @@ export const enableYAMLValidation = (
 ) => {
   const pendingValidationRequests = new Map();
 
-  const getModel = () => monaco.editor.getModels()[0];
+  const getModel = () => monaco.editor?.getModels()[0];
 
   const cleanPendingValidation = (document) => {
     const request = pendingValidationRequests.get(document.uri);
@@ -226,7 +226,7 @@ export const enableYAMLValidation = (
     tryFolding();
   }
 
-  getModel().onDidChangeContent(() => {
+  getModel()?.onDidChangeContent(() => {
     tryFolding();
 
     const document = createDocument(getModel());

diff --git a/frontend/public/components/edit-yaml.jsx b/frontend/public/components/edit-yaml.jsx
@@ -199,7 +199,7 @@ const EditYAMLInner = (props) => {
           const notAll = !resp.status.allowed;
           setNotAllowed(notAll);
           if (monacoRef.current) {
-            monacoRef.current.editor.updateOptions({ readOnly: notAll });
+            monacoRef.current.editor?.updateOptions({ readOnly: notAll });
           }
         })
         .catch((e) => {
@@ -638,7 +638,7 @@ const EditYAMLInner = (props) => {
     'co-file-dropzone--drop-over': isOver,
   });
 
-  monacoRef.current?.editor.updateOptions({ hover: showTooltips });
+  monacoRef.current?.editor?.updateOptions({ hover: showTooltips });
 
   if (displayResults) {
     return (