@vtex/faststore-plugin-buyer-portal 1.1.106 → 1.1.108

package/src/pages/budgets.tsx

@@ -2,23 +2,21 @@ import { BudgetsLayout } from "../features/budgets/layouts";
 import { listBudgetsService } from "../features/budgets/services";
 import { getContractDetailsService } from "../features/contracts/services";
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
 import type { BudgetListResponse } from "../features/budgets/types";
 import type { ContractData } from "../features/contracts/types";
 import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type BudgetPageData = {
@@ -40,51 +38,53 @@ export type BudgetPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<BudgetPageQuery>
-): Promise<BudgetPageData> => {
-  const { customerId, cookie, userId, ...clientContext } =
-    await getClientContext(data);
-
+): Promise<AuthRouteProps<BudgetPageData>> => {
   const { contractId, orgUnitId } = data.query;
 
-  if (!contractId || !orgUnitId) {
-    return {
-      data: { data: [], total: 0 },
-      context: {
-        clientContext: { cookie, userId, customerId, ...clientContext },
-        currentOrgUnit: null,
-        currentContract: null,
-        currentUser: null,
-      },
-    };
-  }
+  return withAuthLoader(
+    data,
+    async ({ customerId, cookie, userId, ...clientContext }) => {
+      if (!contractId || !orgUnitId) {
+        return {
+          data: { data: [], total: 0 },
+          context: {
+            clientContext: { customerId, cookie, userId, ...clientContext },
+            currentOrgUnit: null,
+            currentContract: null,
+            currentUser: null,
+          },
+        };
+      }
 
-  const [orgUnit, contract, user, budgetsData] = await Promise.all([
-    getOrgUnitBasicDataService({
-      cookie,
-      id: orgUnitId,
-    }),
-    getContractDetailsService({
-      contractId,
-      unitId: orgUnitId,
-      cookie,
-    }),
-    getUserByIdService({ orgUnitId, userId, cookie }),
-    listBudgetsService({
-      customerId,
-      cookie,
-      unitId: orgUnitId,
-    }),
-  ]);
+      const [orgUnit, contract, user, budgetsData] = await Promise.all([
+        getOrgUnitBasicDataService({
+          cookie,
+          id: orgUnitId,
+        }),
+        getContractDetailsService({
+          contractId,
+          unitId: orgUnitId,
+          cookie,
+        }),
+        getUserByIdService({ orgUnitId, userId, cookie }),
+        listBudgetsService({
+          customerId,
+          cookie,
+          unitId: orgUnitId,
+        }),
+      ]);
 
-  return {
-    data: budgetsData,
-    context: {
-      clientContext: { customerId, cookie, userId, ...clientContext },
-      currentOrgUnit: orgUnit,
-      currentContract: contract,
-      currentUser: user,
-    },
-  };
+      return {
+        data: budgetsData,
+        context: {
+          clientContext: { customerId, cookie, userId, ...clientContext },
+          currentOrgUnit: orgUnit,
+          currentContract: contract,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -92,19 +92,21 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const ContractsPage = ({ data, context, hasError, error }: BudgetPageData) => (
-  <BuyerPortalProvider {...context}>
+const ContractsPage = ({ data, hasError, error }: BudgetPageData) => (
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <BudgetsLayout data={data} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(ContractsPage, {
-  tags: {
-    component: "BudgetsPage",
-    errorType: "budgets_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(ContractsPage, {
+    tags: {
+      component: "BudgetsPage",
+      errorType: "budgets_error",
+    },
+  })
+);

package/src/pages/buying-policies.tsx

@@ -3,17 +3,15 @@ import { BuyingPoliciesLayout } from "../features/buying-policies/layouts";
 import { getBuyingPoliciesService } from "../features/buying-policies/services";
 import { getContractDetailsService } from "../features/contracts/services";
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  getClientContext,
   getValidPage,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
@@ -22,7 +20,7 @@ import type { BudgetListResponse } from "../features/budgets/types";
 import type { BuyingPolicy } from "../features/buying-policies/types";
 import type { ContractData } from "../features/contracts/types";
 import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type BuyingPoliciesPageData = {
@@ -50,77 +48,84 @@ export type BuyingPoliciesPageQuery = GetAddressesServiceProps & {
 
 const loaderFunction = async (
   data: LoaderData<BuyingPoliciesPageQuery>
-): Promise<BuyingPoliciesPageData> => {
+): Promise<AuthRouteProps<BuyingPoliciesPageData>> => {
   const { contractId, orgUnitId, search = "", page: pageString } = data.query;
 
   const page = getValidPage(pageString);
 
-  const { cookie, userId, ...clientContext } = await getClientContext(data);
-
-  if (!contractId || !orgUnitId) {
-    return {
-      buyingPolicies: [],
-      total: 0,
-      search: search ?? "",
-      page: page ?? 1,
-      context: {
-        clientContext: { cookie, userId, ...clientContext },
-        currentOrgUnit: null,
-        currentContract: null,
-        currentUser: null,
-      },
-    };
-  }
+  return withAuthLoader(
+    data,
+    async ({ cookie, userId, customerId, ...clientContext }) => {
+      if (!contractId || !orgUnitId) {
+        return {
+          buyingPolicies: [],
+          total: 0,
+          search: search ?? "",
+          page: page ?? 1,
+          context: {
+            clientContext: { cookie, userId, customerId, ...clientContext },
+            currentOrgUnit: null,
+            currentContract: null,
+            currentUser: null,
+          },
+          budgetData: { data: [], total: 0 },
+        };
+      }
 
-  const [currentOrgUnit, user, contract, budgetData, buyingPoliciesResponse] =
-    await Promise.all([
-      getOrgUnitBasicDataService({
-        id: orgUnitId,
-        cookie,
-      }),
-      getUserByIdService({ orgUnitId, userId, cookie }),
-      getContractDetailsService({
-        contractId,
-        cookie,
-        unitId: orgUnitId,
-      }),
+      const [
+        currentOrgUnit,
+        user,
+        contract,
+        budgetData,
+        buyingPoliciesResponse,
+      ] = await Promise.all([
+        getOrgUnitBasicDataService({
+          id: orgUnitId,
+          cookie,
+        }),
+        getUserByIdService({ orgUnitId, userId, cookie }),
+        getContractDetailsService({
+          contractId,
+          cookie,
+          unitId: orgUnitId,
+        }),
+        listBudgetsService({
+          customerId,
+          cookie,
+          unitId: orgUnitId,
+        }),
+        getBuyingPoliciesService({
+          orgUnitId,
+          contractId,
+          cookie,
+          page,
+          search,
+        }),
+      ]);
 
-      listBudgetsService({
-        customerId: clientContext.customerId,
-        cookie,
-        unitId: orgUnitId,
-      }),
+      const { data: buyingPolicies = [], total = 0 } = buyingPoliciesResponse;
 
-      getBuyingPoliciesService({
-        orgUnitId,
-        contractId,
-        cookie,
-        page,
+      return {
+        buyingPolicies: search
+          ? buyingPolicies.filter((buyingPolicy) =>
+              buyingPolicy.name
+                .toLocaleLowerCase()
+                .includes(search.toLocaleLowerCase())
+            )
+          : buyingPolicies,
+        total,
         search,
-      }),
-    ]);
-
-  const { data: buyingPolicies = [], total = 0 } = buyingPoliciesResponse;
-
-  return {
-    buyingPolicies: search
-      ? buyingPolicies.filter((buyingPolicy) =>
-          buyingPolicy.name
-            .toLocaleLowerCase()
-            .includes(search.toLocaleLowerCase())
-        )
-      : buyingPolicies,
-    total,
-    search,
-    page,
-    context: {
-      clientContext: { cookie, userId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-      currentContract: contract,
-    },
-    budgetData: budgetData ?? { data: [], total: 0 },
-  };
+        page,
+        context: {
+          clientContext: { cookie, userId, customerId, ...clientContext },
+          currentOrgUnit,
+          currentUser: user,
+          currentContract: contract,
+        },
+        budgetData: budgetData ?? { data: [], total: 0 },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -132,13 +137,12 @@ const BuyingPoliciesPage = ({
   buyingPolicies,
   search,
   page,
-  context,
   total,
   hasError,
   error,
   budgetData = { data: [], total: 0 },
 }: BuyingPoliciesPageData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
@@ -150,12 +154,14 @@ const BuyingPoliciesPage = ({
         budgetData={budgetData}
       />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(BuyingPoliciesPage, {
-  tags: {
-    component: "BuyingPoliciesPage",
-    errorType: "buying_policies_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(BuyingPoliciesPage, {
+    tags: {
+      component: "BuyingPoliciesPage",
+      errorType: "buying_policies_error",
+    },
+  })
+);

package/src/pages/buying-policy-details.tsx

@@ -2,16 +2,14 @@ import { BuyingPolicyDetailsLayout } from "../features/buying-policies/layouts/B
 import { getBuyingPolicyService } from "../features/buying-policies/services";
 import { getContractDetailsService } from "../features/contracts/services";
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
@@ -19,7 +17,7 @@ import type { GetAddressesServiceProps } from "../features/addresses/services";
 import type { BuyingPolicy } from "../features/buying-policies/types";
 import type { ContractData } from "../features/contracts/types";
 import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type BuyingPolicyDetailsPageData = {
@@ -42,42 +40,42 @@ export type BuyingPolicyDetailsPageQuery = GetAddressesServiceProps & {
 
 const loaderFunction = async (
   data: LoaderData<BuyingPolicyDetailsPageQuery>
-): Promise<BuyingPolicyDetailsPageData> => {
+): Promise<AuthRouteProps<BuyingPolicyDetailsPageData>> => {
   const { contractId, orgUnitId, buyingPolicyId } = data.query;
 
-  const { cookie, userId, ...clientContext } = await getClientContext(data);
+  return withAuthLoader(data, async ({ cookie, userId, ...clientContext }) => {
+    const currentOrgUnit = await getOrgUnitBasicDataService({
+      id: orgUnitId,
+      cookie,
+    });
 
-  const currentOrgUnit = await getOrgUnitBasicDataService({
-    id: orgUnitId,
-    cookie,
-  });
+    const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
-  const user = await getUserByIdService({ orgUnitId, userId, cookie });
+    const contract = await getContractDetailsService({
+      contractId,
+      cookie,
+      unitId: orgUnitId,
+    });
 
-  const contract = await getContractDetailsService({
-    contractId,
-    cookie,
-    unitId: orgUnitId,
-  });
+    const buyingPolicy = await getBuyingPolicyService({
+      orgUnitId,
+      contractId,
+      buyingPolicyId,
+      cookie,
+    });
 
-  const buyingPolicy = await getBuyingPolicyService({
-    orgUnitId,
-    contractId,
-    buyingPolicyId,
-    cookie,
+    return {
+      data: {
+        buyingPolicy,
+      },
+      context: {
+        clientContext: { cookie, userId, ...clientContext },
+        currentOrgUnit,
+        currentUser: user,
+        currentContract: contract,
+      },
+    };
   });
-
-  return {
-    data: {
-      buyingPolicy,
-    },
-    context: {
-      clientContext: { cookie, userId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-      currentContract: contract,
-    },
-  };
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -87,22 +85,23 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 
 const BuyingPolicyDetailsPage = ({
   data,
-  context,
   hasError,
   error,
 }: BuyingPolicyDetailsPageData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <BuyingPolicyDetailsLayout data={data} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(BuyingPolicyDetailsPage, {
-  tags: {
-    component: "BuyingPolicyDetailsPage",
-    errorType: "buying_policy_details_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(BuyingPolicyDetailsPage, {
+    tags: {
+      component: "BuyingPolicyDetailsPage",
+      errorType: "buying_policy_details_error",
+    },
+  })
+);

package/src/pages/collections.tsx

@@ -5,21 +5,19 @@ import { ScopeCollection } from "../features/collections/types";
 import { getContractDetailsService } from "../features/contracts/services";
 import { ContractData } from "../features/contracts/types";
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  getClientContext,
   getValidPage,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 
 import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 
 export type CollectionsData = {
   collections: ScopeCollection[];
@@ -45,58 +43,58 @@ export type CollectionsQuery = {
 
 const loaderFunction = async (
   data: LoaderData<CollectionsQuery>
-): Promise<CollectionsData> => {
+): Promise<AuthRouteProps<CollectionsData>> => {
   const { contractId, orgUnitId, search = "", page: pageString } = data.query;
 
   const page = getValidPage(pageString);
 
-  const { cookie, ...clientContext } = await getClientContext(data);
-
-  const [currentOrgUnit, contract] = await Promise.all([
-    getOrgUnitBasicDataService({ id: orgUnitId, cookie }),
-    getContractDetailsService({ contractId, cookie, unitId: orgUnitId }),
-  ]);
-
-  const [enabledCollections, allCollections, contractCollections] =
-    await Promise.all([
-      getCollectionsFromScopeService({
-        cookie,
-        contractId,
-        unitId: orgUnitId,
-        filterByScope: true,
-        name: search,
-        page,
-      }),
-      getCollectionsFromScopeService({
-        cookie,
-        contractId,
-        unitId: orgUnitId,
-        filterByScope: false,
-        page: 1,
-      }),
-      getCollectionsFromContractService({
-        contractId,
-        cookie,
-        unitId: orgUnitId,
-      }),
+  return withAuthLoader(data, async ({ cookie, ...clientContext }) => {
+    const [currentOrgUnit, contract] = await Promise.all([
+      getOrgUnitBasicDataService({ id: orgUnitId, cookie }),
+      getContractDetailsService({ contractId, cookie, unitId: orgUnitId }),
     ]);
 
-  const isContractEmpty =
-    !Array.isArray(contractCollections) || contractCollections?.length === 0;
-  const drawerCollections = allCollections.filter((col) => !col.isEnabled);
+    const [enabledCollections, allCollections, contractCollections] =
+      await Promise.all([
+        getCollectionsFromScopeService({
+          cookie,
+          contractId,
+          unitId: orgUnitId,
+          filterByScope: true,
+          name: search,
+          page,
+        }),
+        getCollectionsFromScopeService({
+          cookie,
+          contractId,
+          unitId: orgUnitId,
+          filterByScope: false,
+          page: 1,
+        }),
+        getCollectionsFromContractService({
+          contractId,
+          cookie,
+          unitId: orgUnitId,
+        }),
+      ]);
 
-  return {
-    collections: enabledCollections,
-    drawerCollections,
-    isContractEmpty,
-    search,
-    page,
-    context: {
-      clientContext: { cookie, ...clientContext },
-      currentContract: contract,
-      currentOrgUnit,
-    },
-  };
+    const isContractEmpty =
+      !Array.isArray(contractCollections) || contractCollections?.length === 0;
+    const drawerCollections = allCollections.filter((col) => !col.isEnabled);
+
+    return {
+      collections: enabledCollections,
+      drawerCollections,
+      isContractEmpty,
+      search,
+      page,
+      context: {
+        clientContext: { cookie, ...clientContext },
+        currentContract: contract,
+        currentOrgUnit,
+      },
+    };
+  });
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -105,7 +103,6 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 });
 
 const CollectionsPage = ({
-  context,
   collections,
   drawerCollections,
   isContractEmpty,
@@ -114,7 +111,7 @@ const CollectionsPage = ({
   hasError,
   error,
 }: CollectionsData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
@@ -126,12 +123,14 @@ const CollectionsPage = ({
         isContractEmpty={isContractEmpty}
       />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(CollectionsPage, {
-  tags: {
-    component: "CollectionsPage",
-    errorType: "collections_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(CollectionsPage, {
+    tags: {
+      component: "CollectionsPage",
+      errorType: "collections_error",
+    },
+  })
+);