Merge pull request #1234 from kubeshop/mm/bugfix/defaultsourceeditor

fix: fallback to source editor if no form available
kubeshop · Jan 31, 2022 · 067b3b7 · 067b3b7
2 parents c1d7ed5 + 1ce5ae3
commit 067b3b7
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/components/organisms/ActionsPane/ActionsPane.tsx b/src/components/organisms/ActionsPane/ActionsPane.tsx
@@ -317,13 +317,14 @@ const ActionsPane = (props: {contentHeight: string}) => {
   }, [selectedResourceId, resourceMap]);
 
   useEffect(() => {
-    if (
-      (activeTabKey === 'metadataForm' || activeTabKey === 'form') &&
-      (!selectedResourceId || !(isKustomization || (resourceKindHandler && resourceKindHandler.formEditorOptions)))
-    ) {
+    if (activeTabKey === 'form' && !isKustomization && !resourceKindHandler?.formEditorOptions?.editorSchema) {
       setActiveTabKey('source');
     }
-  }, [selectedResourceId, selectedResource, activeTabKey, resourceKindHandler]);
+
+    if (activeTabKey === 'metadataForm' && (!resourceKindHandler || isKustomization)) {
+      setActiveTabKey('source');
+    }
+  }, [selectedResource, activeTabKey, resourceKindHandler, isKustomization]);
 
   const isSelectedResourceUnsaved = useCallback(() => {
     if (!selectedResource) {
@@ -474,7 +475,7 @@ const ActionsPane = (props: {contentHeight: string}) => {
                 ) : null}
               </TabPane>
             )}
-            {selectedResource && resourceKindHandler && !isKustomizationResource(selectedResource) && (
+            {selectedResource && resourceKindHandler && !isKustomization && (
               <TabPane
                 key="metadataForm"
                 style={{height: editorTabPaneHeight}}