@vtex/faststore-plugin-buyer-portal 1.3.46 → 1.3.48

package/src/pages/productAssortment.tsx

@@ -1,80 +1,80 @@
 import { getContractDetailsService } from "../features/contracts/services";
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
 import { ProductAssortmentLayout } from "../features/product-assortment/layouts";
-import { getProductAssortmentFromContractService } from "../features/product-assortment/services/get-product-assortment-from-contract.service";
-import { getProductAssortmentFromScopeService } from "../features/product-assortment/services/get-product-assortment-from-scope.service";
 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,
   getValidPage,
-  withLoaderErrorBoundary,
   withAuthLoader,
+  withLoaderErrorBoundary,
   withProviders,
 } from "../features/shared/utils";
+import { getUserByIdService } from "../features/users/services";
 
-import type {
-  ProductAssortmentData,
-  ProductAssortmentQuery,
-} from "../features/product-assortment/types";
+import type { ContractData } from "../features/contracts/types";
+import type { OrgUnitBasicData } from "../features/org-units/types";
+import type { ProductAssortmentQuery } from "../features/product-assortment/types";
 import type { AuthRouteProps, LoaderData } from "../features/shared/types";
+import type { UserData } from "../features/users/types";
+
+export type ProductAssortmentPageData = {
+  data: {
+    orgUnitId: string;
+    contractId: string;
+    userId: string;
+    search: string;
+    page: number;
+  };
+  context: {
+    clientContext: ClientContext;
+    currentOrgUnit: OrgUnitBasicData;
+    currentContract: ContractData | null;
+    currentUser: UserData | null;
+  };
+  hasError?: boolean;
+  error?: ErrorBoundaryProps;
+};
 
 const loaderFunction = async (
   data: LoaderData<ProductAssortmentQuery>
-): Promise<AuthRouteProps<ProductAssortmentData>> => {
+): Promise<AuthRouteProps<ProductAssortmentPageData>> => {
   const { contractId, orgUnitId, search = "", page: pageString } = data.query;
 
-  const page = getValidPage(pageString);
-
-  return withAuthLoader(data, async ({ cookie, ...clientContext }) => {
-    const [currentOrgUnit, contract] = await Promise.all([
-      getOrgUnitBasicDataService({ id: orgUnitId, cookie }),
-      getContractDetailsService({ contractId, cookie, unitId: orgUnitId }),
-    ]);
-
-    const [enabledAssortment, notAddedAssortments, contractAssortment] =
-      await Promise.all([
-        getProductAssortmentFromScopeService({
-          args: {
-            cookie,
-            contractId,
-            unitId: orgUnitId,
-            filterByScope: true,
-            name: search,
-            page,
-          },
-        }),
-        getProductAssortmentFromScopeService({
-          args: {
-            cookie,
-            contractId,
-            unitId: orgUnitId,
-            filterByScope: false,
-            page: 1,
-          },
+  return withAuthLoader(
+    data,
+    async ({ customerId, cookie, userId, ...clientContext }) => {
+      const [orgUnit, contract, user] = await Promise.all([
+        getOrgUnitBasicDataService({
+          id: orgUnitId,
+          cookie,
         }),
-        getProductAssortmentFromContractService({
+        getContractDetailsService({
           contractId,
-          cookie,
           unitId: orgUnitId,
+          cookie,
         }),
+        getUserByIdService({ orgUnitId, userId, cookie }),
       ]);
 
-    const isContractEmpty =
-      !contractAssortment || contractAssortment.total === 0;
-
-    return {
-      productAssortment: enabledAssortment,
-      drawerProductAssortment: notAddedAssortments,
-      isContractEmpty,
-      search,
-      page,
-      context: {
-        clientContext: { cookie, ...clientContext },
-        currentContract: contract,
-        currentOrgUnit,
-      },
-    };
-  });
+      return {
+        data: {
+          orgUnitId,
+          contractId,
+          userId,
+          search,
+          page: getValidPage(pageString),
+        },
+        context: {
+          clientContext: { customerId, cookie, userId, ...clientContext },
+          currentOrgUnit: orgUnit,
+          currentContract: contract,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -83,24 +83,20 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 });
 
 const ProductAssortmentPage = ({
-  productAssortment,
-  drawerProductAssortment,
-  isContractEmpty,
-  page,
-  search,
+  data,
   hasError,
   error,
-}: ProductAssortmentData) => (
+}: ProductAssortmentPageData) => (
   <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <ProductAssortmentLayout
-        page={page}
-        search={search}
-        initialProductAssortment={productAssortment}
-        drawerProductAssortment={drawerProductAssortment}
-        isContractEmpty={isContractEmpty}
+        page={data.page}
+        search={data.search}
+        userId={data.userId}
+        orgUnitId={data.orgUnitId}
+        contractId={data.contractId}
       />
     )}
   </>