fix: merged main into branch

kubeshop · Jan 31, 2022 · 36714d0 · 36714d0
1 parent 49421e6
commit 36714d0
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/components/organisms/ActionsPane/ActionsPane.tsx b/src/components/organisms/ActionsPane/ActionsPane.tsx
@@ -444,12 +444,12 @@ const ActionsPane = (props: {contentHeight: string}) => {
             >
               {uiState.isFolderLoading || previewLoader.isLoading ? (
                 <S.Skeleton active />
-              ) : (
+              ) : activeTabKey === 'source' ? (
                 !isClusterDiffVisible &&
                 (selectedResourceId || selectedPath || selectedValuesFileId) && (
                   <Monaco applySelection={applySelection} diffSelectedResource={diffSelectedResource} />
                 )
-              )}
+              ) : null}
             </TabPane>
             {selectedResource && (isKustomization || resourceKindHandler?.formEditorOptions?.editorSchema) && (
               <TabPane
@@ -460,16 +460,18 @@ const ActionsPane = (props: {contentHeight: string}) => {
               >
                 {uiState.isFolderLoading || previewLoader.isLoading ? (
                   <S.Skeleton active />
-                ) : isKustomization ? (
-                  <FormEditor formSchema={extractFormSchema(getResourceSchema(selectedResource))} />
-                ) : (
-                  resourceKindHandler?.formEditorOptions && (
-                    <FormEditor
-                      formSchema={resourceKindHandler.formEditorOptions.editorSchema}
-                      formUiSchema={resourceKindHandler.formEditorOptions.editorUiSchema}
-                    />
+                ) : activeTabKey === 'form' ? (
+                  isKustomization ? (
+                    <FormEditor formSchema={extractFormSchema(getResourceSchema(selectedResource))} />
+                  ) : (
+                    resourceKindHandler?.formEditorOptions && (
+                      <FormEditor
+                        formSchema={resourceKindHandler.formEditorOptions.editorSchema}
+                        formUiSchema={resourceKindHandler.formEditorOptions.editorUiSchema}
+                      />
+                    )
                   )
-                )}
+                ) : null}
               </TabPane>
             )}
             {selectedResource && resourceKindHandler && !isKustomizationResource(selectedResource) && (