removed COLUMN_LAYOUT flag

kyma-project · Jun 20, 2024 · bc80ab6 · bc80ab6
1 parent 393cb99
commit bc80ab6
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 153 deletions.
diff --git a/public/defaultConfig.yaml b/public/defaultConfig.yaml
@@ -76,5 +76,3 @@ config:
     FEEDBACK:
       isEnabled: true
       link: https://sapinsights.eu.qualtrics.com/jfe/form/SV_d3UPNymSgUHAb9Y?product=SAP%20BTP,%20Kyma%20Runtime&product_filter=Kyma
-    COLUMN_LAYOUT:
-      isEnabled: true
diff --git a/src/components/App/ExtensibilityRoutes.js b/src/components/App/ExtensibilityRoutes.js
@@ -7,7 +7,6 @@ import { FlexibleColumnLayout } from '@ui5/webcomponents-react';
 import { useTranslation } from 'react-i18next';
 
 import { columnLayoutState } from 'state/columnLayoutAtom';
-import { useFeature } from 'hooks/useFeature';
 import { useUrl } from 'hooks/useUrl';
 
 import { usePrepareCreateProps } from 'resources/helpers';
@@ -27,7 +26,6 @@ const ColumnWrapper = ({
   extension,
   urlPath,
 }) => {
-  const { isEnabled: isColumnLeyoutEnabled } = useFeature('COLUMN_LAYOUT');
   const [layoutState, setLayoutColumn] = useRecoilState(columnLayoutState);
   const [searchParams] = useSearchParams();
   const layout = searchParams.get('layout');
@@ -38,7 +36,7 @@ const ColumnWrapper = ({
   const { namespaceId, resourceName } = useParams();
   const initialLayoutState = layout
     ? {
-        layout: isColumnLeyoutEnabled && layout ? layout : layoutState?.layout,
+        layout: layout ? layout : layoutState?.layout,
         midColumn: {
           resourceName: resourceName,
           resourceType: urlPath ?? resourceType,
@@ -53,8 +51,8 @@ const ColumnWrapper = ({
       setLayoutColumn(initialLayoutState);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [layout, isColumnLeyoutEnabled, namespaceId, resourceName, resourceType]);
-
+  }, [layout, namespaceId, resourceName, resourceType]);
+  console.log(initialLayoutState);
   const overrides = { resourceType: urlPath };
 
   const layoutCloseCreateUrl = resourceListUrl(
@@ -68,17 +66,12 @@ const ColumnWrapper = ({
   );
 
   let startColumnComponent = null;
-  if ((!layout || !isColumnLeyoutEnabled) && defaultColumn === 'details') {
+  if (!layout && defaultColumn === 'details') {
     startColumnComponent = (
       <Details resourceName={resourceName} namespaceId={namespaceId} />
     );
   } else {
-    startColumnComponent = (
-      <List
-        enableColumnLayout={isColumnLeyoutEnabled}
-        layoutCloseCreateUrl={layoutCloseCreateUrl}
-      />
-    );
+    startColumnComponent = <List layoutCloseCreateUrl={layoutCloseCreateUrl} />;
   }
 
   const elementCreateProps = usePrepareCreateProps({
@@ -114,7 +107,7 @@ const ColumnWrapper = ({
 
   if (
     !layoutState?.showCreate &&
-    (layoutState?.midColumn || isColumnLeyoutEnabled) &&
+    layoutState?.midColumn &&
     !(layoutState?.layout === 'OneColumn' && defaultColumn === 'details')
   ) {
     midColumnComponent = (

diff --git a/src/components/BusolaExtensions/BusolaExtensionCreate.js b/src/components/BusolaExtensions/BusolaExtensionCreate.js
@@ -1,6 +1,5 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 
 import * as Inputs from 'shared/ResourceForm/inputs';
@@ -13,7 +12,6 @@ import { createExtensibilityTemplate, createConfigmap } from './helpers';
 import { ColumnsInput } from './ColumnsInput';
 import './ExtensibilityStarterForm.scss';
 import { clusterState } from 'state/clusterAtom';
-import { useFeature } from 'hooks/useFeature';
 import { usePrepareLayout } from 'shared/hooks/usePrepareLayout';
 import { columnLayoutState } from 'state/columnLayoutAtom';
 
@@ -25,10 +23,8 @@ export default function BusolaExtensionCreate({
   const { t } = useTranslation();
   const notificationManager = useNotification();
   const upsert = useUpsert();
-  const navigate = useNavigate();
   const cluster = useRecoilValue(clusterState);
   const setLayoutColumn = useSetRecoilState(columnLayoutState);
-  const { isEnabled: isColumnLeyoutEnabled } = useFeature('COLUMN_LAYOUT');
 
   const { nextQuery, nextLayout } = usePrepareLayout(layoutNumber);
 
@@ -59,27 +55,21 @@ export default function BusolaExtensionCreate({
               content: t('extensibility.starter-modal.messages.success'),
             });
 
-            if (isColumnLeyoutEnabled) {
-              setLayoutColumn({
-                layout: nextLayout,
-                showCreate: null,
-                midColumn: {
-                  resourceName: crd.metadata.name,
-                  resourceType: 'Extensions',
-                  namespaceId: 'kube-public',
-                },
-                endColumn: null,
-              });
-              window.history.pushState(
-                window.history.state,
-                '',
-                `/cluster/${cluster.contextName}/busolaextensions/kube-public/${crd.metadata.name}${nextQuery}`,
-              );
-            } else {
-              navigate(
-                `/cluster/${cluster.contextName}/busolaextensions/kube-public/${crd.metadata.name}`,
-              );
-            }
+            setLayoutColumn({
+              layout: nextLayout,
+              showCreate: null,
+              midColumn: {
+                resourceName: crd.metadata.name,
+                resourceType: 'Extensions',
+                namespaceId: 'kube-public',
+              },
+              endColumn: null,
+            });
+            window.history.pushState(
+              window.history.state,
+              '',
+              `/cluster/${cluster.contextName}/busolaextensions/kube-public/${crd.metadata.name}${nextQuery}`,
+            );
           };
 
           const configmap = createConfigmap(crd, state);

diff --git a/src/resources/createResourceRoutes.js b/src/resources/createResourceRoutes.js
@@ -18,8 +18,6 @@ import { ErrorBoundary } from 'shared/components/ErrorBoundary/ErrorBoundary';
 import { ResourceCreate } from 'shared/components/ResourceCreate/ResourceCreate';
 import { useUrl } from 'hooks/useUrl';
 
-import { useFeature } from 'hooks/useFeature';
-
 export const createPath = (
   config = { detailsView: false, pathSegment: '' },
 ) => {
@@ -63,7 +61,6 @@ const ColumnWrapper = ({
   create,
   ...props
 }) => {
-  const { isEnabled: isColumnLeyoutEnabled } = useFeature('COLUMN_LAYOUT');
   const [layoutState, setLayoutColumn] = useRecoilState(columnLayoutState);
   const [searchParams] = useSearchParams();
   const layout = searchParams.get('layout');
@@ -87,7 +84,7 @@ const ColumnWrapper = ({
 
   const initialLayoutState = layout
     ? {
-        layout: isColumnLeyoutEnabled && layout ? layout : layoutState?.layout,
+        layout: layout ? layout : layoutState?.layout,
         midColumn: {
           resourceName: resourceName,
           resourceType: props.resourceType,
@@ -102,13 +99,7 @@ const ColumnWrapper = ({
       setLayoutColumn(initialLayoutState);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    layout,
-    isColumnLeyoutEnabled,
-    namespaceId,
-    resourceName,
-    props.resourceType,
-  ]);
+  }, [layout, namespaceId, resourceName, props.resourceType]);
 
   const layoutCloseCreateUrl = resourceListUrl({
     kind: props.resourceType,
@@ -134,18 +125,15 @@ const ColumnWrapper = ({
   const listComponent = React.cloneElement(list, {
     ...elementListProps,
     layoutCloseCreateUrl,
-    enableColumnLayout:
-      elementListProps.resourceType !== 'Namespaces'
-        ? isColumnLeyoutEnabled
-        : false,
+    enableColumnLayout: elementListProps.resourceType !== 'Namespaces',
   });
   const detailsComponent = React.cloneElement(details, {
     ...elementDetailsProps,
   });
 
   let startColumnComponent = null;
 
-  if ((!layout || !isColumnLeyoutEnabled) && defaultColumn === 'details') {
+  if (!layout && defaultColumn === 'details') {
     startColumnComponent = detailsComponent;
   } else {
     startColumnComponent = listComponent;
@@ -179,11 +167,13 @@ const ColumnWrapper = ({
       />
     );
   }
+  console.log(layout);
   if (
     !layoutState?.showCreate &&
-    (layoutState?.midColumn || isColumnLeyoutEnabled) &&
+    (layoutState?.midColumn || true) &&
     !(layoutState?.layout === 'OneColumn' && defaultColumn === 'details')
   ) {
+    console.log('DETAILS');
     midColumnComponent = detailsComponent;
   }
 

diff --git a/src/resources/other/BusolaExtensions.routes.js b/src/resources/other/BusolaExtensions.routes.js
@@ -9,7 +9,6 @@ import { ResourceCreate } from 'shared/components/ResourceCreate/ResourceCreate'
 import { usePrepareCreateProps } from 'resources/helpers';
 
 import { columnLayoutState } from 'state/columnLayoutAtom';
-import { useFeature } from 'hooks/useFeature';
 import { useUrl } from 'hooks/useUrl';
 
 const BusolaExtensionList = React.lazy(() =>
@@ -24,7 +23,6 @@ const BusolaExtensionCreate = React.lazy(() =>
 );
 
 const ColumnWrapper = ({ defaultColumn = 'list' }) => {
-  const { isEnabled: isColumnLeyoutEnabled } = useFeature('COLUMN_LAYOUT');
   const [layoutState, setLayoutColumn] = useRecoilState(columnLayoutState);
   const [searchParams] = useSearchParams();
   const layout = searchParams.get('layout');
@@ -36,7 +34,7 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
 
   const initialLayoutState = layout
     ? {
-        layout: isColumnLeyoutEnabled && layout ? layout : layoutState?.layout,
+        layout: layout ? layout : layoutState?.layout,
         midColumn: {
           resourceName: name,
           resourceType: 'Extensions',
@@ -50,7 +48,7 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
     if (layout) {
       setLayoutColumn(initialLayoutState);
     }
-  }, [layout, isColumnLeyoutEnabled, namespace, name]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [layout, namespace, name]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const elementCreateProps = usePrepareCreateProps({
     resourceType: 'ConfigMap',
@@ -61,7 +59,7 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
 
   let startColumnComponent = null;
 
-  if ((!layout || !isColumnLeyoutEnabled) && defaultColumn === 'details') {
+  if (!layout && defaultColumn === 'details') {
     startColumnComponent = (
       <BusolaExtensionDetails
         name={layoutState?.midColumn?.resourceName || name}
@@ -71,7 +69,6 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
   } else {
     startColumnComponent = (
       <BusolaExtensionList
-        enableColumnLayout={isColumnLeyoutEnabled}
         layoutCloseCreateUrl={clusterUrl('busolaextensions')}
       />
     );

diff --git a/src/resources/other/CustomResourcesByGroup.routes.js b/src/resources/other/CustomResourcesByGroup.routes.js
@@ -12,7 +12,6 @@ import { usePrepareCreateProps } from 'resources/helpers';
 
 import { columnLayoutState } from 'state/columnLayoutAtom';
 import { useUrl } from 'hooks/useUrl';
-import { useFeature } from 'hooks/useFeature';
 import CRCreate from '../CustomResourceDefinitions/CRCreate';
 
 const CustomResourcesByGroup = React.lazy(() =>
@@ -28,7 +27,6 @@ const CustomResource = React.lazy(() =>
 );
 
 export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
-  const { isEnabled: isColumnLeyoutEnabled } = useFeature('COLUMN_LAYOUT');
   const [layoutState, setLayoutColumn] = useRecoilState(columnLayoutState);
   const [searchParams] = useSearchParams();
   const layout = searchParams.get('layout');
@@ -40,7 +38,7 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
 
   const initialLayoutState = layout
     ? {
-        layout: isColumnLeyoutEnabled && layout ? layout : layoutState?.layout,
+        layout: layout ? layout : layoutState?.layout,
         midColumn: crdName
           ? {
               resourceName: crdName,
@@ -63,7 +61,7 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
     if (layout) {
       setLayoutColumn(initialLayoutState);
     }
-  }, [layout, isColumnLeyoutEnabled, crdName, crName, namespace]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [layout, crdName, crName, namespace]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const layoutCloseCreateUrl = scopedUrl(
     `customresources/${layoutState?.midColumn?.resourceName ?? crdName}`,
@@ -96,7 +94,7 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
   });
 
   let startColumnComponent = null;
-  if (!layout || !isColumnLeyoutEnabled) {
+  if (!layout) {
     if (defaultColumn === 'details') {
       startColumnComponent = (
         <CustomResource
@@ -118,13 +116,11 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
       );
     } else {
       startColumnComponent = (
-        <CustomResourcesByGroup enableColumnLayout={isColumnLeyoutEnabled} />
+        <CustomResourcesByGroup enableColumnLayout={true} />
       );
     }
   } else {
-    startColumnComponent = (
-      <CustomResourcesByGroup enableColumnLayout={isColumnLeyoutEnabled} />
-    );
+    startColumnComponent = <CustomResourcesByGroup enableColumnLayout={true} />;
   }
 
   let midColumnComponent = null;
@@ -149,13 +145,13 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
       />
     );
   } else if (
-    (layoutState?.midColumn?.resourceName || isColumnLeyoutEnabled) &&
+    layoutState?.midColumn?.resourceName &&
     !(layoutState?.layout === 'OneColumn' && defaultColumn === 'listOfType')
   ) {
     midColumnComponent = (
       <CustomResourcesOfType
+        enableColumnLayout={true}
         crdName={layoutState?.midColumn?.resourceName ?? crdName}
-        enableColumnLayout={isColumnLeyoutEnabled}
         layoutCloseCreateUrl={layoutCloseCreateUrl}
       />
     );
@@ -187,7 +183,7 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
 
   if (
     !layoutState?.showCreate &&
-    (layoutState?.endColumn || isColumnLeyoutEnabled) &&
+    layoutState?.endColumn &&
     !(layoutState?.layout === 'OneColumn' && defaultColumn === 'details')
   ) {
     endColumnComponent = (