@vtex/faststore-plugin-buyer-portal 2.0.12 → 2.0.13

package/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.13] - 2026-07-21
+
+### Fixed
+
+- Navigating between organizational units (hierarchy tree, breadcrumbs, and the "View" links after creating/editing/deleting a unit) now carries the currently viewed contract's id through, instead of dropping it — this previously caused the `suma`-flag redirect on `/org-unit/[orgUnitId]` to land on the target org unit's default contract instead of the one being viewed. The Contract Listing page now also honors a `contractId` carried in the URL when it belongs to the org unit's attached contracts, falling back to the org unit's default contract otherwise
+- Accounting Fields data (sidebar list, Buying Policy criteria selectors, the Accounting Field details page, and Budget allocation drawers) was fetched using the session's active contract instead of the contract actually being viewed — noticeable when navigating straight to a page for a non-active contract (e.g. from Contract Listing) without first "switching" to it. All accounting-fields read hooks now take an explicit `contractId` instead of silently substituting the session's customerId
+
 ## [2.0.12] - 2026-07-17
 
 ### Fixed
@@ -763,7 +770,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add CHANGELOG file
 - Add README file
 
-[unreleased]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v2.0.12...HEAD
+[unreleased]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v2.0.13...HEAD
 [1.3.55]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.54...v1.3.55
 [1.3.54]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.53...v1.3.54
 [1.3.53]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.52...v1.3.53
@@ -861,5 +868,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.0.10]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v2.0.9...v2.0.10
 [2.0.9]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/2.0.9
 
+[2.0.13]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v2.0.12...v2.0.13
 [2.0.12]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v2.0.11...v2.0.12
 [2.0.11]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtex/faststore-plugin-buyer-portal",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "A plugin for faststore with buyer portal",
   "main": "index.js",
   "scripts": {

package/src/features/accounting-fields/components/CreateAccountingValueDrawer/CreateAccountingValueDrawer.tsx

@@ -133,6 +133,7 @@ export const CreateAccountingValueDrawer = ({
   const { listAccountingValuesData } = useListAccountingValues({
     accountingFieldId: accountingField.id,
     orgUnitId,
+    contractId: contract?.id ?? "",
     page: 1,
     search,
     filterByUnit: false,

package/src/features/accounting-fields/hooks/useDetailsAccountingField.ts

@@ -6,17 +6,18 @@ export const useDetailsAccountingField = (
   {
     accountingFieldId,
     orgUnitId,
-  }: Omit<DetailsAccountingFieldParams, "cookie" | "contractId">,
+    contractId,
+  }: Omit<DetailsAccountingFieldParams, "cookie">,
   options?: QueryOptions<AwaitedType<typeof detailsAccoutingFieldService>>
 ) => {
   const { data, error, isLoading, refetch } = useQuery(
-    `accounting-fields/${accountingFieldId}/details`,
-    ({ cookie, customerId }) =>
+    `accounting-fields/${accountingFieldId}/details/${contractId}`,
+    ({ cookie }) =>
       detailsAccoutingFieldService({
         orgUnitId,
         accountingFieldId,
         cookie,
-        contractId: customerId,
+        contractId,
       }),
     options
   );

package/src/features/accounting-fields/hooks/useDetailsAccountingValue.ts

@@ -8,18 +8,19 @@ export const useDetailsAccountingValue = (
     accountingFieldId,
     accountingValueId,
     orgUnitId,
-  }: Omit<DetailsAccountingValueParams, "cookie" | "contractId">,
+    contractId,
+  }: Omit<DetailsAccountingValueParams, "cookie">,
   options?: QueryOptions<AwaitedType<typeof detailsAccountingValueService>>
 ) => {
   const { data, error, isLoading, refetch } = useQuery(
-    `accounting-values/${accountingValueId}/details`,
-    ({ cookie, customerId }) =>
+    `accounting-values/${accountingValueId}/details/${contractId}`,
+    ({ cookie }) =>
       detailsAccountingValueService({
         orgUnitId,
         accountingFieldId,
         accountingValueId,
         cookie,
-        contractId: customerId,
+        contractId,
       }),
     options
   );

package/src/features/accounting-fields/hooks/useListAccountingFields.ts

@@ -3,14 +3,14 @@ import { listAccountingFielsdService } from "../services";
 import { AccountingFieldsParams } from "../types";
 
 export const useListAccountingFields = (
-  { orgUnitId }: Omit<AccountingFieldsParams, "cookie" | "contractId">,
+  { orgUnitId, contractId }: Omit<AccountingFieldsParams, "cookie">,
   options?: QueryOptions<AwaitedType<typeof listAccountingFielsdService>>
 ) => {
   const { data, error, isLoading, refetch } = useQuery(
-    ["api", "accounting-fields", orgUnitId].join("/"),
-    ({ cookie, customerId }) =>
+    ["api", "accounting-fields", orgUnitId, contractId].join("/"),
+    ({ cookie }) =>
       listAccountingFielsdService({
-        contractId: customerId,
+        contractId,
         orgUnitId,
         cookie,
       }),

package/src/features/accounting-fields/hooks/useListAccountingValues.ts

@@ -6,12 +6,13 @@ import type { ListAccountingValuesParams } from "../types";
 export const useListAccountingValues = (
   {
     orgUnitId,
+    contractId,
     accountingFieldId,
     page,
     search,
     budgetId,
     filterByUnit,
-  }: Omit<ListAccountingValuesParams, "cookie" | "contractId">,
+  }: Omit<ListAccountingValuesParams, "cookie">,
   options?: QueryOptions<AwaitedType<typeof listAccountingValuesdService>>,
   key?: string
 ) => {
@@ -21,13 +22,14 @@ export const useListAccountingValues = (
         "api",
         "accounting-field-values",
         orgUnitId,
+        contractId,
         accountingFieldId,
         `page=${page}`,
         `search=${search}`,
       ].join("/"),
-    ({ cookie, customerId }) =>
+    ({ cookie }) =>
       listAccountingValuesdService({
-        contractId: customerId,
+        contractId,
         cookie,
         orgUnitId,
         accountingFieldId,

package/src/features/accounting-fields/layouts/AccountingFieldLayout/AccountingFieldLayout.tsx

@@ -96,6 +96,7 @@ export const AccountingFieldLayout = ({
   } = useListAccountingValues({
     accountingFieldId: accountingField?.id ?? "",
     orgUnitId: orgUnit?.id ?? "",
+    contractId: contract?.id ?? "",
     page,
     search: debouncedSearch,
   });

package/src/features/budgets/components/CreateBudgetAllocationDrawer/CreateBudgetAllocationDrawer.tsx

@@ -42,7 +42,7 @@ export const CreateBudgetAllocationDrawer = ({
   const { pushToast } = useUI();
 
   const { listAccountingFieldData, listAccountingFieldLoading } =
-    useListAccountingFields({ orgUnitId });
+    useListAccountingFields({ orgUnitId, contractId });
 
   const dynamicSortingOptions = useMemo<Dictionary<string>>(() => {
     const accountingFieldsOptions =

package/src/features/budgets/components/CreateBudgetDrawer/CreateBudgetDrawer.tsx

@@ -92,7 +92,7 @@ export const CreateBudgetDrawer = ({
     });
 
   const { listAccountingFieldData, listAccountingFieldLoading } =
-    useListAccountingFields({ orgUnitId: unitId });
+    useListAccountingFields({ orgUnitId: unitId, contractId });
 
   const dynamicSortingOptions = useMemo<Dictionary<string>>(() => {
     const accountingFieldsOptions =

package/src/features/budgets/hooks/useGetAllocations.ts

@@ -129,6 +129,7 @@ export function useGetAllocations({
       budgetId,
       accountingFieldId: selectedAllocationOption,
       orgUnitId: unitId,
+      contractId,
       page: filter.page,
       search: debouncedSearch,
       filterByUnit: true,

package/src/features/buying-policies/components/AccountingFieldCriteriaSelector/AccountingFieldCriteriaSelector.tsx

@@ -29,10 +29,13 @@ export const AccountingFieldCriteriaSelector = ({
   const dropdownRef = useRef<HTMLDivElement>(null);
 
   const { pushToast } = useUI();
-  const { currentOrgUnit } = useBuyerPortal();
+  const { currentOrgUnit, currentContract } = useBuyerPortal();
   const { listAccountingFieldData, listAccountingFieldLoading } =
     useListAccountingFields(
-      { orgUnitId: currentOrgUnit?.id ?? "" },
+      {
+        orgUnitId: currentOrgUnit?.id ?? "",
+        contractId: currentContract?.id ?? "",
+      },
       {
         onError: () => {
           pushToast({

package/src/features/buying-policies/components/AccountingFieldCriteriaSelector/AccountingValueCriteriaSelector.tsx

@@ -44,10 +44,13 @@ export const AccountingValueCriteriaSelector = ({
 
   const debouncedSearch = useDebounce(search, 300);
   const { pushToast } = useUI();
-  const { currentOrgUnit } = useBuyerPortal();
+  const { currentOrgUnit, currentContract } = useBuyerPortal();
   const { listAccountingFieldData, listAccountingFieldLoading } =
     useListAccountingFields(
-      { orgUnitId: currentOrgUnit?.id ?? "" },
+      {
+        orgUnitId: currentOrgUnit?.id ?? "",
+        contractId: currentContract?.id ?? "",
+      },
       {
         onError: () => {
           pushToast({
@@ -66,6 +69,7 @@ export const AccountingValueCriteriaSelector = ({
     {
       accountingFieldId: fieldId ?? "",
       orgUnitId: currentOrgUnit?.id ?? "",
+      contractId: currentContract?.id ?? "",
       search: debouncedSearch,
     },
     {
@@ -85,6 +89,7 @@ export const AccountingValueCriteriaSelector = ({
         accountingFieldId: initialFieldIdRef.current,
         accountingValueId: initialValueIdRef.current,
         orgUnitId: currentOrgUnit?.id ?? "",
+        contractId: currentContract?.id ?? "",
       },
       {
         lazy:

package/src/features/buying-policies/layouts/BuyingPolicyDetailsLayout/BuyingPolicyDetailsLayout.tsx

@@ -43,6 +43,7 @@ export const BuyingPolicyDetailsLayout = ({
       {
         accountingFieldId,
         orgUnitId: currentOrgUnit?.id ?? "",
+        contractId: currentContract?.id ?? "",
       },
       {
         lazy: !accountFieldCriteria,
@@ -55,6 +56,7 @@ export const BuyingPolicyDetailsLayout = ({
         accountingFieldId,
         accountingValueId,
         orgUnitId: currentOrgUnit?.id ?? "",
+        contractId: currentContract?.id ?? "",
       },
       {
         lazy: !accountFieldCriteria || !accountingValueId,

package/src/features/contracts/layouts/ContractListingLayout/ContractListingLayout.tsx

@@ -39,7 +39,7 @@ import {
 } from "../../hooks";
 
 import { buildContractSettingsNavItems } from "./ContractSettingsNav";
-import { getDefaultContractId } from "./utils";
+import { getDefaultContractId, resolveViewedContractId } from "./utils";
 
 import type { OrgUnitBasicData } from "../../../org-units/types";
 import type { UserData } from "../../../users/types";
@@ -77,7 +77,10 @@ export const ContractListingLayout = ({
   const { pushToast } = useUI();
   const { subscribe } = useContractSwitchChannel();
 
-  const defaultContractId = getDefaultContractId(contracts);
+  const queryContractId = Array.isArray(router.query.contractId)
+    ? router.query.contractId[0]
+    : router.query.contractId;
+  const defaultContractId = resolveViewedContractId(contracts, queryContractId);
   const singleContract = contracts[0];
   const displayName =
     singleContract?.name ?? singleContract?.email ?? orgUnit.name;
@@ -86,7 +89,10 @@ export const ContractListingLayout = ({
     listAccountingFieldData,
     listAccountingFieldLoading,
     listAccountingFieldRefresh,
-  } = useListAccountingFields({ orgUnitId: orgUnit.id });
+  } = useListAccountingFields({
+    orgUnitId: orgUnit.id,
+    contractId: defaultContractId,
+  });
 
   const {
     open: openAccountingFieldDrawer,

package/src/features/contracts/layouts/ContractListingLayout/__tests__/utils.test.ts

@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+
+import { getDefaultContractId, resolveViewedContractId } from "../utils";
+
+import type { ContractData } from "../../../types";
+
+const contracts = [
+  { id: "contract-a", isDefault: false },
+  { id: "contract-b", isDefault: true },
+] as ContractData[];
+
+describe("getDefaultContractId", () => {
+  it("prefers the contract flagged as default", () => {
+    expect(getDefaultContractId(contracts)).toBe("contract-b");
+  });
+
+  it("falls back to the first contract when none is flagged as default", () => {
+    expect(getDefaultContractId([contracts[0]])).toBe("contract-a");
+  });
+
+  it("returns an empty string when there are no contracts", () => {
+    expect(getDefaultContractId([])).toBe("");
+  });
+});
+
+describe("resolveViewedContractId", () => {
+  it("uses the query contractId when it belongs to this org unit's contracts", () => {
+    expect(resolveViewedContractId(contracts, "contract-a")).toBe("contract-a");
+  });
+
+  it("falls back to the default contract when the query contractId isn't attached here", () => {
+    expect(resolveViewedContractId(contracts, "contract-from-elsewhere")).toBe(
+      "contract-b"
+    );
+  });
+
+  it("falls back to the default contract when no query contractId is given", () => {
+    expect(resolveViewedContractId(contracts, undefined)).toBe("contract-b");
+  });
+});

package/src/features/contracts/layouts/ContractListingLayout/utils.ts

@@ -2,3 +2,16 @@ import type { ContractData } from "../../types";
 
 export const getDefaultContractId = (contracts: ContractData[]) =>
   contracts.find((c) => c.isDefault)?.id ?? contracts[0]?.id ?? "";
+
+/**
+ * Contracts aren't attached uniformly across the org unit hierarchy, so a
+ * contractId carried over from another org unit (e.g. via URL) may not apply
+ * here — fall back to this org unit's own default contract when that happens.
+ */
+export const resolveViewedContractId = (
+  contracts: ContractData[],
+  queryContractId?: string
+) =>
+  contracts.some((c) => c.id === queryContractId)
+    ? (queryContractId as string)
+    : getDefaultContractId(contracts);

package/src/features/org-units/components/CreateOrgUnitDrawer/CreateOrgUnitDrawer.tsx

@@ -12,10 +12,11 @@ import {
   InputText,
   Icon,
 } from "../../../shared/components";
-import { useAnalytics } from "../../../shared/hooks";
+import { useAnalytics, useBuyerPortal } from "../../../shared/hooks";
 import { ANALYTICS_EVENTS } from "../../../shared/services/logger/analytics/constants";
 import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
 import { CHANGES_TIMEOUT_MESSAGE } from "../../../shared/utils/constants";
+import { resolveContractId } from "../../../shared/utils/resolveContractId";
 import { useCreateNewOrgUnit } from "../../hooks";
 
 import type { createNewOrgUnitService } from "../../services";
@@ -37,6 +38,12 @@ export const CreateOrgUnitDrawer = ({
 }: CreateOrgUnitDrawerProps) => {
   const { pushToast } = useUI();
   const router = useRouter();
+  const { currentContract, currentOrgUnit } = useBuyerPortal();
+  const contractId = resolveContractId({
+    queryContractId: router.query.contractId,
+    currentContract,
+    currentOrgUnit,
+  });
   const { trackEntityCreated, trackEntityCreateError } = useAnalytics({
     entityType: "org_unit",
     defaultTimerName: "org_unit_creation",
@@ -70,6 +77,7 @@ export const CreateOrgUnitDrawer = ({
             router.push(
               buyerPortalRoutes.orgUnitDetails({
                 orgUnitId: data.id,
+                contractId,
               })
             )
           }

package/src/features/org-units/components/DeleteOrgUnitDrawer/DeleteOrgUnitDrawer.tsx

@@ -15,6 +15,7 @@ import { useBuyerPortal, useAnalytics } from "../../../shared/hooks";
 import { ANALYTICS_EVENTS } from "../../../shared/services/logger/analytics/constants";
 import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
 import { CHANGES_TIMEOUT_MESSAGE } from "../../../shared/utils/constants";
+import { resolveContractId } from "../../../shared/utils/resolveContractId";
 import { useGetUserByOrgUnitId } from "../../../users/hooks/useGetUserByOrgUnitId";
 import { useChildrenOrgUnits } from "../../hooks";
 import { useDeleteOrgUnit } from "../../hooks/useDeleteOrgUnit";
@@ -34,7 +35,12 @@ export const DeleteOrgUnitDrawer = ({
   ...props
 }: DeleteOrgUnitDrawerProps) => {
   const router = useRouter();
-  const { currentOrgUnit } = useBuyerPortal();
+  const { currentOrgUnit, currentContract } = useBuyerPortal();
+  const contractId = resolveContractId({
+    queryContractId: router.query.contractId,
+    currentContract,
+    currentOrgUnit,
+  });
   const { childrenOrgUnits } = useChildrenOrgUnits(id, name);
   const { users } = useGetUserByOrgUnitId(id);
   const { pushToast } = useUI();
@@ -80,6 +86,7 @@ export const DeleteOrgUnitDrawer = ({
         const parentId = ids[ids.length - 2];
         const redirectUrl = buyerPortalRoutes.orgUnitDetails({
           orgUnitId: parentId,
+          contractId,
         });
         router.replace(redirectUrl);
       } else {

package/src/features/org-units/components/OrgUnitBreadcrumb/OrgUnitBreadcrumb.tsx

@@ -1,6 +1,9 @@
+import { useRouter } from "next/router";
+
 import { Icon } from "../../../shared/components";
 import { useBuyerPortal } from "../../../shared/hooks";
 import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
+import { resolveContractId } from "../../../shared/utils/resolveContractId";
 import { USER_ROLES } from "../../../users/types";
 import { useOrgUnitByUser } from "../../hooks";
 
@@ -19,8 +22,15 @@ export const OrgUnitBreadcrumb = ({
   userId,
   userRoles,
 }: OrgUnitBreadcrumbProps) => {
-  const { currentContract } = useBuyerPortal();
+  const { currentContract, currentOrgUnit } = useBuyerPortal();
   const { orgUnit: userUnit } = useOrgUnitByUser(userId);
+  const router = useRouter();
+
+  const contractId = resolveContractId({
+    queryContractId: router.query.contractId,
+    currentContract,
+    currentOrgUnit,
+  });
 
   const orgUnitList = orgUnit?.path.ids.split("/").slice(1) ?? [];
 
@@ -36,7 +46,7 @@ export const OrgUnitBreadcrumb = ({
       ) {
         acc.push({
           unitId: orgUnitId,
-          item: buyerPortalRoutes.orgUnitDetails({ orgUnitId }),
+          item: buyerPortalRoutes.orgUnitDetails({ orgUnitId, contractId }),
           name: orgUnit?.path.names.split("/")[index] ?? "",
           position: index + 1,
           enabled: true,
@@ -68,7 +78,7 @@ export const OrgUnitBreadcrumb = ({
       {Boolean(inBreadcrumb.length) && divider}
 
       <OrgUnitBreadcrumbPath
-        contractId={currentContract?.id ?? ""}
+        contractId={contractId}
         items={sortedByPosition.slice(offset)}
         divider={divider}
         hasDropdown={hasDropdown}

package/src/features/org-units/components/OrgUnitsHierarchyTree/OrgUnitsHierarchyTree.tsx

@@ -1,4 +1,5 @@
 import Link from "next/link";
+import { useRouter } from "next/router";
 
 import { Dropdown } from "@faststore/ui";
 
@@ -8,7 +9,9 @@ import {
   HierarchyTree,
   Icon,
 } from "../../../shared/components";
+import { useBuyerPortal } from "../../../shared/hooks";
 import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
+import { resolveContractId } from "../../../shared/utils/resolveContractId";
 import { useChildrenOrgUnits, useOrgUnitStructure } from "../../hooks";
 
 import type { OrgUnitHierarchyData } from "../../types";
@@ -25,6 +28,13 @@ export const OrgUnitsHierarchyTree = ({
   enableChildren = true,
 }: OrgUnitsHierarchyTreeProps) => {
   const { structure, setNode } = useOrgUnitStructure(orgUnitHierarchyData);
+  const router = useRouter();
+  const { currentContract, currentOrgUnit } = useBuyerPortal();
+  const contractId = resolveContractId({
+    queryContractId: router.query.contractId,
+    currentContract,
+    currentOrgUnit,
+  });
 
   return (
     <HierarchyTree
@@ -48,7 +58,10 @@ export const OrgUnitsHierarchyTree = ({
               {!readonly && (
                 <Link
                   data-fs-org-unit-item-click-area
-                  href={buyerPortalRoutes.orgUnitDetails({ orgUnitId: id })}
+                  href={buyerPortalRoutes.orgUnitDetails({
+                    orgUnitId: id,
+                    contractId,
+                  })}
                 />
               )}
               {enableChildren && (

package/src/features/org-units/components/UpdateOrgUnitDrawer/UpdateOrgUnitDrawer.tsx

@@ -10,10 +10,11 @@ import {
   ErrorMessage,
   InputText,
 } from "../../../shared/components";
-import { useAnalytics } from "../../../shared/hooks";
+import { useAnalytics, useBuyerPortal } from "../../../shared/hooks";
 import { ANALYTICS_EVENTS } from "../../../shared/services/logger/analytics/constants";
 import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
 import { CHANGES_TIMEOUT_MESSAGE } from "../../../shared/utils/constants";
+import { resolveContractId } from "../../../shared/utils/resolveContractId";
 import { useUpdateOrgUnit } from "../../hooks";
 
 export type UpdateOrgUnitDrawerProps = Omit<BasicDrawerProps, "children"> & {
@@ -33,6 +34,12 @@ export const UpdateOrgUnitDrawer = ({
 }: UpdateOrgUnitDrawerProps) => {
   const router = useRouter();
   const { pushToast } = useUI();
+  const { currentContract, currentOrgUnit } = useBuyerPortal();
+  const contractId = resolveContractId({
+    queryContractId: router.query.contractId,
+    currentContract,
+    currentOrgUnit,
+  });
   const { trackEntityEdited, trackEntityEditError } = useAnalytics({
     entityType: "org_unit",
     entityId: id,
@@ -61,6 +68,7 @@ export const UpdateOrgUnitDrawer = ({
             router.push(
               buyerPortalRoutes.orgUnitDetails({
                 orgUnitId: id,
+                contractId,
               })
             )
           }

package/src/features/org-units/layouts/OrgUnitDetailsLayout/OrgUnitDetailsLayout.tsx

@@ -102,7 +102,10 @@ export const OrgUnitsDetailsLayout = ({
     listAccountingFieldData,
     listAccountingFieldLoading,
     listAccountingFieldRefresh,
-  } = useListAccountingFields({ orgUnitId: orgUnit.id });
+  } = useListAccountingFields({
+    orgUnitId: orgUnit.id,
+    contractId: linkParams.contractId,
+  });
 
   const organizationMenu = getOrganizationSettingsLinks({
     orgUnitId: orgUnit.id,

package/src/features/shared/layouts/SumaPageLayout/FullSidebarNav.tsx

@@ -66,7 +66,7 @@ export const FullSidebarNav = ({
     listAccountingFieldData,
     listAccountingFieldRefresh,
   } = useListAccountingFields(
-    { orgUnitId: resolvedOrgUnitId },
+    { orgUnitId: resolvedOrgUnitId, contractId: resolvedContractId },
     { lazy: loading }
   );
 

package/src/features/shared/utils/buyerPortalRoutes.ts

@@ -105,8 +105,13 @@ export const buyerPortalRoutes = {
   userDetails: (params: { orgUnitId: string; userId: string }) =>
     replaceParams(`${base}/user/[orgUnitId]/[userId]`, params),
 
-  orgUnitDetails: (params: { orgUnitId: string }) =>
-    replaceParams(`${base}/org-unit/[orgUnitId]`, params),
+  orgUnitDetails: (params: { orgUnitId: string; contractId?: string }) =>
+    appendContractIdParam(
+      replaceParams(`${base}/org-unit/[orgUnitId]`, {
+        orgUnitId: params.orgUnitId,
+      }),
+      params.contractId
+    ),
 
   accountingFields: (params: {
     orgUnitId: string;
@@ -118,8 +123,13 @@ export const buyerPortalRoutes = {
       params
     ),
 
-  contracts: (params: { orgUnitId: string }) =>
-    replaceParams(`${base}/contracts/[orgUnitId]`, params),
+  contracts: (params: { orgUnitId: string; contractId?: string }) =>
+    appendContractIdParam(
+      replaceParams(`${base}/contracts/[orgUnitId]`, {
+        orgUnitId: params.orgUnitId,
+      }),
+      params.contractId
+    ),
 
   contractInformation: (params: { orgUnitId: string; contractId: string }) =>
     replaceParams(

package/src/features/shared/utils/constants.ts

@@ -22,7 +22,7 @@ export const SCOPE_KEYS = {
   CREDIT_CARDS: "creditCards",
 } as const;
 
-export const CURRENT_VERSION = "2.0.12";
+export const CURRENT_VERSION = "2.0.13";
 
 export const CHANGES_TIMEOUT_MESSAGE =
   "Changes may take up to 10 minutes to apply.";

package/src/pages/org-unit-details.tsx

@@ -51,12 +51,13 @@ export type OrgUnitDetailsPageData = {
 
 type OrgUnitDetailsPageQuery = {
   orgUnitId: string;
+  contractId?: string;
 };
 
 const loaderFunction = async (
   data: LoaderData<OrgUnitDetailsPageQuery>
 ): Promise<AuthRouteProps<OrgUnitDetailsPageData>> => {
-  const { orgUnitId } = data.query;
+  const { orgUnitId, contractId } = data.query;
 
   if (!orgUnitId) {
     throw new Error(`Missing required query param: orgUnitId=${orgUnitId}`);
@@ -66,7 +67,7 @@ const loaderFunction = async (
     const featureFlags = await getBuyerPortalFeatureFlags(cookie);
 
     if (featureFlags?.suma) {
-      const location = buyerPortalRoutes.contracts({ orgUnitId });
+      const location = buyerPortalRoutes.contracts({ orgUnitId, contractId });
 
       data.res?.writeHead(302, { Location: location });
       data.res?.end();