Merge stable into develop

.github/workflows/sync-docs.yml

@@ -9,6 +9,9 @@ on:
     paths:
       - 'docs/docs/**'
       - 'docs/sidebars.ts'
+      - 'docs/sidebar-releases.ts'
+      - 'docs/plugins/**'
+      - 'docs/src/components/ReleaseFeed/**'
   workflow_dispatch:
 
 jobs:
@@ -32,10 +35,19 @@ jobs:
           # Remove existing files in target repo
           rm -rf target-repo/docs/docs/*
           rm -f target-repo/docs/sidebars.ts
+          rm -f target-repo/docs/sidebar-releases.ts
+          rm -rf target-repo/docs/plugins
+          rm -rf target-repo/docs/src/components/ReleaseFeed
 
           # Copy files from source repo to target repo
           cp -r source-repo/docs/docs/* target-repo/docs/docs/
           cp source-repo/docs/sidebars.ts target-repo/docs/sidebars.ts
+          # sidebars.ts imports ./sidebar-releases; the ReleaseFeed component and
+          # release-notes-data plugin power the /release-notes/infrahub feed.
+          cp source-repo/docs/sidebar-releases.ts target-repo/docs/sidebar-releases.ts
+          cp -r source-repo/docs/plugins target-repo/docs/plugins
+          mkdir -p target-repo/docs/src/components
+          cp -r source-repo/docs/src/components/ReleaseFeed target-repo/docs/src/components/ReleaseFeed
 
           # Commit and push changes to target repository
           cd target-repo

changelog/9892.fixed.md

@@ -0,0 +1 @@
+Following an IP prefix or address link from the relationship tabs of an IPAM namespace now keeps you in that namespace, instead of redirecting to the default namespace.

frontend/app/src/entities/nodes/object/ui/object-table/cells/table-identifier-cell.tsx

@@ -1,6 +1,7 @@
 import { LinkButton } from "@infrahub/ui";
 import type { PressEvent } from "react-aria-components";
 
+import type { overrideQueryParams } from "@/shared/api/rest/fetch";
 import { Checkbox } from "@/shared/components/aria/checkbox";
 
 import { useAuth } from "@/entities/authentication/ui/useAuth";
@@ -13,6 +14,7 @@ export interface TableIdentifierCellProps {
   label: React.ReactNode;
   isSelected?: boolean;
   onClickCheckbox?: (e: PressEvent) => void;
+  overrideParams?: overrideQueryParams[];
 }
 
 export function TableIdentifierCell({
@@ -21,6 +23,7 @@ export function TableIdentifierCell({
   label,
   isSelected,
   onClickCheckbox,
+  overrideParams,
 }: TableIdentifierCellProps) {
   const { isAuthenticated } = useAuth();
   return (
@@ -36,7 +39,7 @@ export function TableIdentifierCell({
       <LinkButton
         variant="ghost"
         size="sm"
-        href={getObjectDetailsUrl(objectKind, objectId)}
+        href={getObjectDetailsUrl(objectKind, objectId, overrideParams)}
         className="-mx-1 truncate rounded-xl px-2 text-custom-blue-700 hover:underline"
       >
         {label}

frontend/app/src/entities/nodes/object/ui/object-table/utils/get-object-table-columns.tsx

@@ -1,6 +1,7 @@
 import type { PopoverTriggerProps } from "@radix-ui/react-popover";
 import { type ColumnDef, createColumnHelper } from "@tanstack/react-table";
 
+import type { overrideQueryParams } from "@/shared/api/rest/fetch";
 import { FROM_RESOURCE_POOL_SUFFIX } from "@/shared/components/form/constants";
 import { TableCell } from "@/shared/components/table/table-cell";
 import { sortByOrderWeight } from "@/shared/utils/common";
@@ -34,7 +35,8 @@ import { isGenericSchema } from "@/entities/schema/utils/is-generic-schema";
 const columnHelper = createColumnHelper<NodeObject>();
 
 export function getObjectIdentifierColumns(
-  schema: ModelSchema
+  schema: ModelSchema,
+  identifierOverrideParams?: overrideQueryParams[]
 ): Array<ColumnDef<NodeObject, string>> {
   return [
     columnHelper.accessor((node) => getNodeLabel(node), {
@@ -59,6 +61,7 @@ export function getObjectIdentifierColumns(
             label={label}
             isSelected={row.getIsSelected()}
             onClickCheckbox={getToggleSelectedRowHandler({ row, table })}
+            overrideParams={identifierOverrideParams}
           />
         );
       },
@@ -145,10 +148,11 @@ export function getObjectFieldsColumns(
 
 export const getObjectTableColumns = (
   schema: ModelSchema,
-  headerProps?: PopoverTriggerProps
+  headerProps?: PopoverTriggerProps,
+  identifierOverrideParams?: overrideQueryParams[]
 ): Array<ColumnDef<NodeObject>> => {
   return [
-    ...getObjectIdentifierColumns(schema),
+    ...getObjectIdentifierColumns(schema, identifierOverrideParams),
     ...getObjectGenericColumns(schema),
     ...getObjectFieldsColumns(schema, headerProps),
   ] as Array<ColumnDef<NodeObject>>;

frontend/app/src/entities/nodes/relationships/ui/relationship-table/relationship-table.tsx

@@ -3,6 +3,7 @@ import { DataTable } from "@/shared/components/table/data-table";
 import { InfiniteScroll } from "@/shared/components/utils/infinite-scroll";
 import useFilters from "@/shared/hooks/useFilters";
 
+import { IP_NAMESPACE_GENERIC, IPAM_QSP } from "@/entities/ipam/constants";
 import { ObjectTableEmpty } from "@/entities/nodes/object/ui/object-table/object-table-empty";
 import { getObjectTableColumns } from "@/entities/nodes/object/ui/object-table/utils/get-object-table-columns";
 import {
@@ -15,6 +16,7 @@ import { ToolbarDissociateAction } from "@/entities/nodes/relationships/ui/relat
 import { canDissociateRelationship } from "@/entities/nodes/relationships/utils/can-dissociate-relationship";
 import { useGetObjectPermissions } from "@/entities/permission/ui/queries/get-object-permissions.query";
 import { useSchema } from "@/entities/schema/ui/hooks/useSchema";
+import { isOfKind } from "@/entities/schema/utils/is-of-kind";
 
 export interface RelationshipTableProps extends UseObjectRelationshipsParams {}
 
@@ -49,8 +51,18 @@ export function RelationshipTable({
   }
 
   const flatData = data?.pages?.flat() ?? [];
+
+  // On an IP namespace's relationship tabs (e.g. its prefixes/addresses), the active
+  // namespace lives in the route path, not the `namespace` query param that IPAM links
+  // rely on. Forward it explicitly so child IP links stay in this namespace instead of
+  // falling back to the default one.
+  const identifierOverrideParams =
+    parentSchema && isOfKind(IP_NAMESPACE_GENERIC, parentSchema)
+      ? [{ name: IPAM_QSP.NAMESPACE, value: parentId }]
+      : undefined;
+
   const columns = [
-    ...getObjectTableColumns(relationshipSchema, { disabled: true }),
+    ...getObjectTableColumns(relationshipSchema, { disabled: true }, identifierOverrideParams),
     getRelationshipActionsColumn({
       parentId,
       parentKind,

frontend/app/src/entities/nodes/utils.test.ts

@@ -0,0 +1,49 @@
+import { afterEach, describe, expect, it } from "vitest";
+
+import { store } from "@/shared/stores";
+
+import { IP_PREFIX_GENERIC, IPAM_QSP } from "@/entities/ipam/constants";
+import { getObjectDetailsUrl } from "@/entities/nodes/utils";
+import {
+  genericSchemasAtom,
+  nodeSchemasAtom,
+  profileSchemasAtom,
+  templateSchemasAtom,
+} from "@/entities/schema/stores/schema.atom";
+
+import { generateNodeSchema } from "../../../tests/fake/schema";
+
+const ipPrefixSchema = generateNodeSchema({
+  kind: "BuiltinIPPrefix",
+  name: "IPPrefix",
+  namespace: "Builtin",
+  inherit_from: [IP_PREFIX_GENERIC],
+});
+
+describe("getObjectDetailsUrl", () => {
+  afterEach(() => {
+    store.set(nodeSchemasAtom, []);
+    store.set(genericSchemasAtom, []);
+    store.set(profileSchemasAtom, []);
+    store.set(templateSchemasAtom, []);
+  });
+
+  it("keeps the namespace context for an IP prefix link when passed as an override param", () => {
+    store.set(nodeSchemasAtom, [ipPrefixSchema]);
+
+    const url = getObjectDetailsUrl("BuiltinIPPrefix", "prefix-1", [
+      { name: IPAM_QSP.NAMESPACE, value: "namespace-1" },
+    ]);
+
+    expect(url).toContain("/ipam/BuiltinIPPrefix/prefix-1");
+    expect(url).toContain(`${IPAM_QSP.NAMESPACE}=namespace-1`);
+  });
+
+  it("does not add a namespace param to an IP prefix link when none is provided", () => {
+    store.set(nodeSchemasAtom, [ipPrefixSchema]);
+
+    const url = getObjectDetailsUrl("BuiltinIPPrefix", "prefix-1");
+
+    expect(url).toBe("/ipam/BuiltinIPPrefix/prefix-1");
+  });
+});