Merge pull request #13541 from openshift-cherrypick-robot/cherry-pick…

…-13510-to-release-4.14 [release-4.14] OCPBUGS-29813: Addition of optional chaining to prevent yaml crash
openshift · Mar 4, 2024 · 773c6d9 · 773c6d9
2 parents c5c6009 + 4f8ffc2
commit 773c6d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/frontend/packages/console-shared/src/components/editor/CodeEditor.tsx b/frontend/packages/console-shared/src/components/editor/CodeEditor.tsx
@@ -24,7 +24,7 @@ const CodeEditor = React.forwardRef<MonacoEditor, CodeEditorProps>((props, ref)
   const [usesValue] = React.useState<boolean>(value !== undefined);
   const editorDidMount = React.useCallback(
     (editor, monaco) => {
-      const currentLanguage = editor.getModel().getModeId();
+      const currentLanguage = editor.getModel()?.getModeId();
       editor.layout();
       editor.focus();
       switch (currentLanguage) {

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
@@ -16,7 +16,12 @@ const MODEL_URI = 'inmemory://model.yaml';
 const MONACO_URI = monaco.Uri.parse(MODEL_URI);
 
 const createDocument = (model) => {
-  return TextDocument.create(MODEL_URI, model.getModeId(), model.getVersionId(), model.getValue());
+  return TextDocument.create(
+    MODEL_URI,
+    model?.getModeId(),
+    model?.getVersionId(),
+    model?.getValue(),
+  );
 };
 
 // Unfortunately, `editor.focus()` doesn't work when hiding the shortcuts