In schema viewer, updated open list view check to be menu agnostic

opsmill · Oct 25, 2024 · 52933d7 · 52933d7
1 parent 0a875a4
commit 52933d7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/frontend/app/src/config/constants.tsx b/frontend/app/src/config/constants.tsx
@@ -87,6 +87,8 @@ export const MENU_EXCLUDELIST = [
   "CoreDataValidator",
   "CoreRepositoryValidator",
   "CoreArtifactValidator",
+  "LineageOwner",
+  "LineageSource",
 ];
 
 export const NODE_PATH_EXCLUDELIST = ["property"];

diff --git a/frontend/app/src/screens/schema/schema-help-menu.tsx b/frontend/app/src/screens/schema/schema-help-menu.tsx
@@ -6,8 +6,10 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { INFRAHUB_DOC_LOCAL } from "@/config/config";
+import { MENU_EXCLUDELIST } from "@/config/constants";
 import { IModelSchema, menuFlatAtom } from "@/state/atoms/schema.atom";
 import { constructPath } from "@/utils/fetch";
+import { getObjectDetailsUrl2 } from "@/utils/objects";
 import { Icon } from "@iconify-icon/react";
 import { useAtomValue } from "jotai/index";
 import { Link } from "react-router-dom";
@@ -20,6 +22,8 @@ export const SchemaHelpMenu = ({ schema }: SchemaHelpMenuProps) => {
   const menuItems = useAtomValue(menuFlatAtom);
   const schemaInMenu = menuItems.find(({ label }) => label === schema.label);
 
+  const isListViewDisabled = MENU_EXCLUDELIST.includes(schema.kind as string);
+
   const documentationUrl = schema.documentation
     ? `${INFRAHUB_DOC_LOCAL}${schema.documentation}`
     : INFRAHUB_DOC_LOCAL;
@@ -42,8 +46,8 @@ export const SchemaHelpMenu = ({ schema }: SchemaHelpMenuProps) => {
           </Link>
         </DropdownMenuItem>
 
-        <DropdownMenuItem disabled={!schemaInMenu} asChild>
-          <Link to={objectListUrl} className="flex gap-2">
+        <DropdownMenuItem disabled={isListViewDisabled} asChild>
+          <Link to={getObjectDetailsUrl2(schema.kind as string)} className="flex gap-2">
             <Icon icon="mdi:table-eye" className="text-lg text-custom-blue-700" />
             Open list view
           </Link>

diff --git a/frontend/app/src/utils/objects.ts b/frontend/app/src/utils/objects.ts
@@ -25,11 +25,11 @@ export const getObjectDetailsUrl2 = (
   overrideParams?: overrideQueryParams[]
 ) => {
   if (objectKind === IP_PREFIX_GENERIC) {
-    return constructPathForIpam(`${IPAM_ROUTE.PREFIXES}/${objectId}`, overrideParams);
+    return constructPathForIpam(`${IPAM_ROUTE.PREFIXES}/${objectId ?? ""}`, overrideParams);
   }
 
   if (objectKind === IP_ADDRESS_GENERIC) {
-    return constructPathForIpam(`${IPAM_ROUTE.ADDRESSES}/${objectId}`, [
+    return constructPathForIpam(`${IPAM_ROUTE.ADDRESSES}/${objectId ?? ""}`, [
       { name: IPAM_QSP.TAB, value: "ip-details" },
       ...(overrideParams ?? []),
     ]);
@@ -45,11 +45,11 @@ export const getObjectDetailsUrl2 = (
     const inheritFrom = schema.inherit_from;
 
     if (inheritFrom?.includes(IP_PREFIX_GENERIC)) {
-      return constructPathForIpam(`${IPAM_ROUTE.PREFIXES}/${objectId}`, overrideParams);
+      return constructPathForIpam(`${IPAM_ROUTE.PREFIXES}/${objectId ?? ""}`, overrideParams);
     }
 
     if (inheritFrom?.includes(IP_ADDRESS_GENERIC)) {
-      return constructPathForIpam(`${IPAM_ROUTE.ADDRESSES}/${objectId}`, [
+      return constructPathForIpam(`${IPAM_ROUTE.ADDRESSES}/${objectId ?? ""}`, [
         { name: IPAM_QSP.TAB, value: "ip-details" },
         ...(overrideParams ?? []),
       ]);

diff --git a/frontend/app/tests/e2e/role-management/read.spec.ts b/frontend/app/tests/e2e/role-management/read.spec.ts
@@ -21,7 +21,7 @@ test.describe("Role management - READ", () => {
 
     await test.step("check groups view", async () => {
       await page.getByRole("link", { name: "Groups 2" }).click();
-      await expect(page.getByRole("cell", { name: "Administrators" })).toBeVisible();
+      await expect(page.getByRole("cell", { name: "Super Administrators" }).first()).toBeVisible();
       await expect(page.getByRole("button", { name: "+4" })).toBeVisible();
     });