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

package/src/pages/address-details.tsx

@@ -4,10 +4,7 @@ import { getAddressLocationService } from "../features/addresses/services/locati
 import { getAddressRecipientsService } from "../features/addresses/services/recipients/get-address-recipients.service";
 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 {
   PAGE_PARAMS,
@@ -16,9 +13,10 @@ import {
 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";
 
@@ -29,7 +27,7 @@ import type {
 } from "../features/addresses/types/AddressData";
 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";
 
 const DEFAULT_ADDRESS_PAGINATED_DATA = {
@@ -69,7 +67,7 @@ export type AddressDetailsPageData = {
 
 const loaderFunction = async (
   data: LoaderData<AddressDetailsPageQuery>
-): Promise<AddressDetailsPageData> => {
+): Promise<AuthRouteProps<AddressDetailsPageData>> => {
   const {
     contractId,
     orgUnitId,
@@ -82,83 +80,88 @@ const loaderFunction = async (
   const pageRecipients = getValidPage(pageRecipientsString);
   const pageLocation = getValidPage(pageLocationString);
 
-  const { customerId, cookie, userId, ...clientContext } =
-    await getClientContext(data);
-
-  if (!contractId || !orgUnitId) {
-    return {
-      data: {
-        addressDetails: null,
-        recipientsData: null,
-        locationsData: null,
-      },
-      context: {
-        clientContext: { customerId, cookie, userId, ...clientContext },
-        currentOrgUnit: null,
-        currentContract: null,
-        currentUser: null,
-      },
-    };
-  }
-
-  const orgUnit = await getOrgUnitBasicDataService({ cookie, id: orgUnitId });
-
-  const contract = await getContractDetailsService({
-    contractId,
-    cookie,
-    unitId: orgUnitId,
-  });
-
-  const user = await getUserByIdService({ orgUnitId, userId, cookie });
-
-  const { data: recipients = [], total = 0 } =
-    await getAddressRecipientsService({
-      unitId: orgUnitId,
-      customerId: contractId,
-      addressId,
-      cookie,
-      search: searchRecipients,
-      page: pageRecipients,
-    });
-
-  const { data: locations, total: totalLocations } =
-    await getAddressLocationService({
-      contractId,
-      addressId,
-      cookie,
-      unitId: orgUnitId,
-      search: searchLocations,
-      page: pageLocation,
-    });
-
-  return {
-    data: {
-      addressDetails: await getAddressDetailsService(
-        addressId,
+  return withAuthLoader(
+    data,
+    async ({ customerId, cookie, userId, ...clientContext }) => {
+      if (!contractId || !orgUnitId) {
+        return {
+          data: {
+            addressDetails: null,
+            recipientsData: null,
+            locationsData: null,
+          },
+          context: {
+            clientContext: { customerId, cookie, userId, ...clientContext },
+            currentOrgUnit: null,
+            currentContract: null,
+            currentUser: null,
+          },
+        };
+      }
+
+      const orgUnit = await getOrgUnitBasicDataService({
         cookie,
+        id: orgUnitId,
+      });
+
+      const contract = await getContractDetailsService({
         contractId,
-        orgUnitId
-      ),
-      recipientsData: {
-        data: recipients,
-        total,
-        search: searchRecipients ?? "",
-        page: pageRecipients ?? 1,
-      },
-      locationsData: {
-        data: locations,
-        total: totalLocations,
-        search: searchLocations ?? "",
-        page: pageLocation ?? 1,
-      },
-    },
-    context: {
-      clientContext: { customerId, cookie, userId, ...clientContext },
-      currentOrgUnit: orgUnit,
-      currentContract: contract,
-      currentUser: user,
-    },
-  };
+        cookie,
+        unitId: orgUnitId,
+      });
+
+      const user = await getUserByIdService({ orgUnitId, userId, cookie });
+
+      const { data: recipients = [], total = 0 } =
+        await getAddressRecipientsService({
+          unitId: orgUnitId,
+          customerId: contractId,
+          addressId,
+          cookie,
+          search: searchRecipients,
+          page: pageRecipients,
+        });
+
+      const { data: locations, total: totalLocations } =
+        await getAddressLocationService({
+          contractId,
+          addressId,
+          cookie,
+          unitId: orgUnitId,
+          search: searchLocations,
+          page: pageLocation,
+        });
+
+      return {
+        data: {
+          addressDetails: await getAddressDetailsService(
+            addressId,
+            cookie,
+            contractId,
+            orgUnitId
+          ),
+          recipientsData: {
+            data: recipients,
+            total,
+            search: searchRecipients ?? "",
+            page: pageRecipients ?? 1,
+          },
+          locationsData: {
+            data: locations,
+            total: totalLocations,
+            search: searchLocations ?? "",
+            page: pageLocation ?? 1,
+          },
+        },
+        context: {
+          clientContext: { customerId, cookie, userId, ...clientContext },
+          currentOrgUnit: orgUnit,
+          currentContract: contract,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -168,11 +171,10 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 
 const AddressDetailsPage = ({
   data,
-  context,
   hasError,
   error,
 }: AddressDetailsPageData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
@@ -182,12 +184,14 @@ const AddressDetailsPage = ({
         locationsData={data.locationsData ?? DEFAULT_ADDRESS_PAGINATED_DATA}
       />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(AddressDetailsPage, {
-  tags: {
-    component: "AddressDetailsPage",
-    errorType: "address_details_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(AddressDetailsPage, {
+    tags: {
+      component: "AddressDetailsPage",
+      errorType: "address_details_error",
+    },
+  })
+);

package/src/pages/addresses.tsx

@@ -5,24 +5,22 @@ import {
 } from "../features/addresses/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";
 
 import type { AddressData } from "../features/addresses/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 AddressesPageData = {
@@ -48,62 +46,63 @@ export type AddressesPageQuery = GetAddressesServiceProps & {
 
 const loaderFunction = async (
   data: LoaderData<AddressesPageQuery>
-): Promise<AddressesPageData> => {
+): Promise<AuthRouteProps<AddressesPageData>> => {
   const { contractId, orgUnitId, search, page: pageString } = data.query;
 
   const page = getValidPage(pageString);
 
-  const { cookie, userId, customerId, ...clientContext } =
-    await getClientContext(data);
+  return withAuthLoader(
+    data,
+    async ({ cookie, userId, customerId, ...clientContext }) => {
+      if (!contractId || !orgUnitId) {
+        return {
+          data: [],
+          search: search ?? "",
+          total: 0,
+          page: page ?? 1,
+          context: {
+            clientContext: { customerId, cookie, userId, ...clientContext },
+            currentOrgUnit: null,
+            currentContract: null,
+            currentUser: null,
+          },
+        };
+      }
 
-  if (!contractId || !orgUnitId) {
-    return {
-      data: [],
-      search: search ?? "",
-      total: 0,
-      page: page ?? 1,
-      context: {
-        clientContext: { customerId, cookie, userId, ...clientContext },
-        currentOrgUnit: null,
-        currentContract: null,
-        currentUser: null,
-      },
-    };
-  }
+      const [currentOrgUnit, user, contract, addressesResponse] =
+        await Promise.all([
+          getOrgUnitBasicDataService({
+            id: orgUnitId,
+            cookie,
+          }),
+          getUserByIdService({ orgUnitId, userId, cookie }),
+          getContractDetailsService({
+            contractId,
+            cookie,
+            unitId: orgUnitId,
+          }),
+          getAddressesByUnitIdService({
+            orgUnitId,
+            search,
+            page,
+            cookie,
+          }),
+        ]);
 
-  const [currentOrgUnit, user, contract, addressesResponse] = await Promise.all(
-    [
-      getOrgUnitBasicDataService({
-        id: orgUnitId,
-        cookie,
-      }),
-      getUserByIdService({ orgUnitId, userId, cookie }),
-      getContractDetailsService({
-        contractId,
-        cookie,
-        unitId: orgUnitId,
-      }),
-      getAddressesByUnitIdService({
-        orgUnitId,
-        search,
+      return {
+        data: addressesResponse.data,
+        total: addressesResponse.total,
         page,
-        cookie,
-      }),
-    ]
+        search: search ?? "",
+        context: {
+          clientContext: { cookie, userId, customerId, ...clientContext },
+          currentOrgUnit,
+          currentUser: user,
+          currentContract: contract,
+        },
+      };
+    }
   );
-
-  return {
-    data: addressesResponse.data,
-    total: addressesResponse.total,
-    page,
-    search: search ?? "",
-    context: {
-      clientContext: { cookie, userId, customerId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-      currentContract: contract,
-    },
-  };
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -116,11 +115,10 @@ const AddressPage = ({
   search,
   page,
   total,
-  context,
   hasError,
   error,
 }: AddressesPageData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
@@ -131,12 +129,14 @@ const AddressPage = ({
         total={total}
       />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(AddressPage, {
-  tags: {
-    component: "AddressesPage",
-    errorType: "addresses_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(AddressPage, {
+    tags: {
+      component: "AddressesPage",
+      errorType: "addresses_error",
+    },
+  })
+);

package/src/pages/budgets-details.tsx

@@ -3,22 +3,20 @@ import { getBudgetByIdService } from "../features/budgets/services";
 import { Budget } from "../features/budgets/types";
 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 { 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 BudgetsDetailsData = {
@@ -41,37 +39,39 @@ export type BudgetsDetailsQuery = {
 
 const loaderFunction = async (
   data: LoaderData<BudgetsDetailsQuery>
-): Promise<BudgetsDetailsData> => {
-  const { customerId, cookie, userId, ...clientContext } =
-    await getClientContext(data);
-
+): Promise<AuthRouteProps<BudgetsDetailsData>> => {
   const { contractId, orgUnitId, budgetId } = data.query;
 
-  const [orgUnit, contract, user, budgetsData] = await Promise.all([
-    getOrgUnitBasicDataService({ cookie, id: orgUnitId }),
-    getContractDetailsService({
-      contractId,
-      cookie,
-      unitId: orgUnitId,
-    }),
-    getUserByIdService({ orgUnitId, userId, cookie }),
-    getBudgetByIdService({
-      budgetId,
-      customerId,
-      unitId: orgUnitId,
-      cookie,
-    }),
-  ]);
+  return withAuthLoader(
+    data,
+    async ({ customerId, cookie, userId, ...clientContext }) => {
+      const [orgUnit, contract, user, budgetsData] = await Promise.all([
+        getOrgUnitBasicDataService({ cookie, id: orgUnitId }),
+        getContractDetailsService({
+          contractId,
+          cookie,
+          unitId: orgUnitId,
+        }),
+        getUserByIdService({ orgUnitId, userId, cookie }),
+        getBudgetByIdService({
+          budgetId,
+          customerId,
+          unitId: orgUnitId,
+          cookie,
+        }),
+      ]);
 
-  return {
-    budget: budgetsData,
-    context: {
-      clientContext: { customerId, cookie, userId, ...clientContext },
-      currentOrgUnit: orgUnit,
-      currentContract: contract,
-      currentUser: user,
-    },
-  };
+      return {
+        budget: budgetsData,
+        context: {
+          clientContext: { customerId, cookie, userId, ...clientContext },
+          currentOrgUnit: orgUnit,
+          currentContract: contract,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -81,22 +81,23 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 
 const BudgetsDetailsPage = ({
   budget,
-  context,
   hasError,
   error,
 }: BudgetsDetailsData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <BudgetsDetailsLayout budget={budget} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(BudgetsDetailsPage, {
-  tags: {
-    component: "BudgetsDetailsPage",
-    errorType: "budgets_details_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(BudgetsDetailsPage, {
+    tags: {
+      component: "BudgetsDetailsPage",
+      errorType: "budgets_details_error",
+    },
+  })
+);