fix for extensions and modules

kyma-project · Jun 26, 2024 · 3bb3393 · 3bb3393
1 parent 36af246
commit 3bb3393
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 42 deletions.
diff --git a/src/resources/other/BusolaExtensions.routes.js b/src/resources/other/BusolaExtensions.routes.js
@@ -74,42 +74,52 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
     );
   }
 
-  let midColumnComponent = null;
+  let detailsMidColumn = null;
   if (!layoutState?.showCreate) {
-    midColumnComponent = (
+    detailsMidColumn = (
       <BusolaExtensionDetails
         name={layoutState?.midColumn?.resourceName || name}
         namespace={layoutState.midColumn?.namespaceId || namespace}
       />
     );
   }
-  if (layoutState?.showCreate?.resourceType) {
-    midColumnComponent = (
-      <ResourceCreate
-        title={elementCreateProps.resourceTitle}
-        confirmText={t('common.buttons.create')}
-        layoutCloseCreateUrl={clusterUrl('busolaextensions')}
-        renderForm={renderProps => {
-          const createComponent = layoutState?.showCreate?.resourceType && (
-            <BusolaExtensionCreate
-              {...renderProps}
-              {...elementCreateProps}
-              layoutNumber="StartColumn" // For ResourceCreate we want to set layoutNumber to previous column so detail are opened instead of create
-            />
-          );
-
-          return <ErrorBoundary>{createComponent}</ErrorBoundary>;
-        }}
-      />
-    );
-  }
+
+  const createMidColumn = (
+    <ResourceCreate
+      title={elementCreateProps.resourceTitle}
+      confirmText={t('common.buttons.create')}
+      layoutCloseCreateUrl={clusterUrl('busolaextensions')}
+      renderForm={renderProps => {
+        const createComponent = (
+          <BusolaExtensionCreate
+            {...renderProps}
+            {...elementCreateProps}
+            layoutNumber="StartColumn" // For ResourceCreate we want to set layoutNumber to previous column so detail are opened instead of create
+          />
+        );
+
+        return <ErrorBoundary>{createComponent}</ErrorBoundary>;
+      }}
+    />
+  );
 
   return (
     <FlexibleColumnLayout
       style={{ height: '100%' }}
       layout={layoutState?.layout || 'OneColumn'}
       startColumn={<div className="column-content">{startColumnComponent}</div>}
-      midColumn={<div className="column-content">{midColumnComponent}</div>}
+      midColumn={
+        <>
+          {!layoutState?.showCreate &&
+            (defaultColumn !== 'details' || layout) && (
+              <div className="column-content">{detailsMidColumn}</div>
+            )}
+          {!layoutState?.midColumn &&
+            (defaultColumn !== 'details' || layout) && (
+              <div className="column-content">{createMidColumn}</div>
+            )}
+        </>
+      }
     />
   );
 };

diff --git a/src/resources/other/kymaModules.routes.js b/src/resources/other/kymaModules.routes.js
@@ -58,25 +58,9 @@ const ColumnWraper = (defaultColumn = 'list') => {
     startColumnComponent = <KymaModulesList />;
   }
 
-  let midColumnComponent = null;
-  if (layoutState?.showCreate?.resourceType) {
-    midColumnComponent = (
-      <ResourceCreate
-        title={t('kyma-modules.add-module')}
-        confirmText={t('common.buttons.add')}
-        layoutCloseCreateUrl={clusterUrl('kymamodules')}
-        renderForm={renderProps => {
-          return (
-            <ErrorBoundary>
-              <KymaModulesAddModule {...renderProps} />
-            </ErrorBoundary>
-          );
-        }}
-      />
-    );
-  }
+  let detailsMidColumn = null;
   if (!layoutState?.showCreate && layoutState?.midColumn) {
-    midColumnComponent = (
+    detailsMidColumn = (
       <ExtensibilityDetails
         layoutCloseCreateUrl={clusterUrl('kymamodules')}
         resourceName={layoutState?.midColumn?.resourceName || resourceName}
@@ -86,12 +70,38 @@ const ColumnWraper = (defaultColumn = 'list') => {
     );
   }
 
+  const createMidColumn = (
+    <ResourceCreate
+      title={t('kyma-modules.add-module')}
+      confirmText={t('common.buttons.add')}
+      layoutCloseCreateUrl={clusterUrl('kymamodules')}
+      renderForm={renderProps => {
+        return (
+          <ErrorBoundary>
+            <KymaModulesAddModule {...renderProps} />
+          </ErrorBoundary>
+        );
+      }}
+    />
+  );
+
   return (
     <FlexibleColumnLayout
       style={{ height: '100%' }}
       layout={layoutState?.layout || 'OneColumn'}
       startColumn={<div className="column-content">{startColumnComponent}</div>}
-      midColumn={<div className="column-content">{midColumnComponent}</div>}
+      midColumn={
+        <>
+          {!layoutState?.showCreate &&
+            (defaultColumn !== 'details' || layout) && (
+              <div className="column-content">{detailsMidColumn}</div>
+            )}
+          {!layoutState?.midColumn &&
+            (defaultColumn !== 'details' || layout) && (
+              <div className="column-content">{createMidColumn}</div>
+            )}
+        </>
+      }
     />
   );
 };