fix: custom urlPath for extensibility (kyma-project#2956)

* fix: custom urlPath for extensibility * fix: isSelectedNode * fix: urlPath * fix
pbochynski · Jun 5, 2024 · e3fa5fd · e3fa5fd
1 parent 743ae22
commit e3fa5fd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/components/App/ExtensibilityRoutes.js b/src/components/App/ExtensibilityRoutes.js
@@ -21,7 +21,12 @@ const Details = React.lazy(() =>
 );
 const Create = React.lazy(() => import('../Extensibility/ExtensibilityCreate'));
 
-const ColumnWrapper = ({ defaultColumn = 'list', resourceType, extension }) => {
+const ColumnWrapper = ({
+  defaultColumn = 'list',
+  resourceType,
+  extension,
+  urlPath,
+}) => {
   const { isEnabled: isColumnLeyoutEnabled } = useFeature('COLUMN_LAYOUT');
   const [layoutState, setLayoutColumn] = useRecoilState(columnLayoutState);
   const [searchParams] = useSearchParams();
@@ -36,7 +41,7 @@ const ColumnWrapper = ({ defaultColumn = 'list', resourceType, extension }) => {
         layout: isColumnLeyoutEnabled && layout ? layout : layoutState?.layout,
         midColumn: {
           resourceName: resourceName,
-          resourceType: resourceType,
+          resourceType: urlPath ?? resourceType,
           namespaceId: namespaceId,
         },
         endColumn: null,
@@ -50,12 +55,17 @@ const ColumnWrapper = ({ defaultColumn = 'list', resourceType, extension }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [layout, isColumnLeyoutEnabled, namespaceId, resourceName, resourceType]);
 
-  const layoutCloseCreateUrl = resourceListUrl({
-    kind: resourceType,
-    metadata: {
-      namespace: layoutState?.midColumn?.namespaceId ?? namespaceId,
+  const overrides = { resourceType: urlPath };
+
+  const layoutCloseCreateUrl = resourceListUrl(
+    {
+      kind: urlPath ?? resourceType,
+      metadata: {
+        namespace: layoutState?.midColumn?.namespaceId ?? namespaceId,
+      },
     },
-  });
+    urlPath ? overrides : null,
+  );
 
   let startColumnComponent = null;
   if ((!layout || !isColumnLeyoutEnabled) && defaultColumn === 'details') {
@@ -150,7 +160,11 @@ export const createExtensibilityRoutes = (extension, language, ...props) => {
         exact
         element={
           <Suspense fallback={<Spinner />}>
-            <ColumnWrapper resourceType={resourceType} extension={extension} />
+            <ColumnWrapper
+              resourceType={resourceType}
+              extension={extension}
+              urlPath={urlPath}
+            />
           </Suspense>
         }
       />
@@ -163,6 +177,7 @@ export const createExtensibilityRoutes = (extension, language, ...props) => {
               <ColumnWrapper
                 defaultColumn="details"
                 resourceType={resourceType}
+                urlPath={urlPath}
               />
             </Suspense>
           }

diff --git a/src/sidebar/NavItem.tsx b/src/sidebar/NavItem.tsx
@@ -46,9 +46,7 @@ export function NavItem({ node, subItem = false }: NavItemProps) {
         '',
       );
       const pathSegment = resourcePart.split('/')?.[0];
-      return (
-        pathSegment === node.pathSegment || pathSegment === node.resourceType
-      );
+      return pathSegment === node.pathSegment;
     }
   };