@vtex/faststore-plugin-buyer-portal 1.0.31 → 1.0.32

package/package.json

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

package/src/features/addresses/clients/AddressesClient.ts

@@ -1,4 +1,4 @@
-import Client from "../../shared/clients/Client";
+import { Client } from "../../shared/clients/Client";
 import { getApiUrl } from "../../shared/utils";
 import type { AddressData } from "../types";
 

package/src/features/contracts/clients/ContractsClient.ts

@@ -1,4 +1,4 @@
-import Client from "../../shared/clients/Client";
+import { Client } from "../../shared/clients/Client";
 import { getApiUrl } from "../../shared/utils";
 import type { ContractData } from "../types";
 

package/src/features/org-units/clients/OrgUnitClient.ts

@@ -1,4 +1,4 @@
-import Client from "../../shared/clients/Client";
+import { Client } from "../../shared/clients/Client";
 import { getApiUrl } from "../../shared/utils";
 import type {
   OrgUnitBasicData,
@@ -6,7 +6,7 @@ import type {
   OrgUnitData,
 } from "../types";
 
-class OrgUnitClient extends Client {
+export class OrgUnitClient extends Client {
   constructor() {
     super(getApiUrl());
   }
@@ -138,5 +138,4 @@ class OrgUnitClient extends Client {
 }
 
 const orgUnitClient = new OrgUnitClient();
-
 export { orgUnitClient };

package/src/features/shared/clients/Client.ts

@@ -108,4 +108,4 @@ class Client {
   }
 }
 
-export default Client;
+export { Client };

package/src/features/shared/components/BuyerPortalProvider/BuyerPortalProvider.tsx

@@ -1,8 +1,10 @@
 import { createContext, type ReactNode } from "react";
 import type { ClientContext } from "../../utils";
+import type { OrgUnitBasicData } from "../../../org-units/types";
 
 export type BuyerPortalContextType = {
   clientContext: ClientContext;
+  currentOrgUnit?: OrgUnitBasicData | null;
 };
 
 export const BuyerPortalContext = createContext<
@@ -11,15 +13,17 @@ export const BuyerPortalContext = createContext<
 
 export type BuyerPortalProviderProps = {
   clientContext: ClientContext;
+  currentOrgUnit?: OrgUnitBasicData | null;
   children: ReactNode;
 };
 
 export const BuyerPortalProvider = ({
   clientContext,
+  currentOrgUnit,
   children,
 }: BuyerPortalProviderProps) => {
   return (
-    <BuyerPortalContext.Provider value={{ clientContext }}>
+    <BuyerPortalContext.Provider value={{ clientContext, currentOrgUnit }}>
       {children}
     </BuyerPortalContext.Provider>
   );

package/src/features/shared/hooks/useBuyerPortal.ts

@@ -1,10 +1,10 @@
 import { useContext } from "react";
 import { type BuyerPortalContextType, BuyerPortalContext } from "../components";
 
-export const useBuyerPortal = (): BuyerPortalContextType["clientContext"] => {
+export const useBuyerPortal = (): BuyerPortalContextType => {
   const context = useContext(BuyerPortalContext);
   if (!context) {
     throw new Error("useBuyerPortal must be used within a BuyerPortalProvider");
   }
-  return context?.clientContext;
+  return context;
 };

package/src/features/shared/hooks/useMutation.ts

@@ -23,7 +23,7 @@ export const useMutation = <TData, TVariables>(
   const [error, setError] = useState<Error | null>(null);
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  const clientContext = useBuyerPortal();
+  const { clientContext } = useBuyerPortal();
 
   const mutate = useCallback(
     async (variables: TVariables) => {

package/src/features/shared/hooks/useQuery.ts

@@ -22,7 +22,7 @@ export const useQuery = <TData>(
   const [data, setData] = useState<TData | null>(null);
   const [error, setError] = useState<Error | null>(null);
   const [isLoading, setIsLoading] = useState<boolean>(true);
-  const clientContext = useBuyerPortal();
+  const { clientContext } = useBuyerPortal();
 
   const fetchData = useCallback(async () => {
     setIsLoading(true);

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

@@ -1,8 +1,3 @@
-import {
-  getOrgUnitBasicDataService,
-  getOrgUnitByUserIdService,
-} from "../../org-units/services";
-import type { OrgUnitBasicData } from "../../org-units/types";
 import type { LoaderData } from "../types/LoaderData";
 import {
   getAuthCookie,
@@ -16,25 +11,13 @@ export type ClientContext = {
   cookie: string;
   customerId: string;
   userId: string;
-  currentOrgUnit?: OrgUnitBasicData | null;
-  userOrgUnit: {
-    id: string;
-    name: string;
-  } | null;
 };
 
 export const getClientContext = async ({
   req,
-  query,
 }: LoaderData): Promise<ClientContext> => {
   const cookie = getCookieAsString(req.cookies);
 
-  const orgUnitId: string = query?.orgUnitId
-    ? Array.isArray(query?.orgUnitId)
-      ? query.orgUnitId[0]
-      : query?.orgUnitId
-    : null;
-
   const userId = getUserIdFromCookieServerSide({ req });
 
   return {
@@ -44,9 +27,5 @@ export const getClientContext = async ({
     cookie,
     customerId: getCustomerIdFromCookieServerSide({ req }),
     userId,
-    currentOrgUnit: orgUnitId
-      ? await getOrgUnitBasicDataService({ id: orgUnitId, cookie })
-      : null,
-    userOrgUnit: await getOrgUnitByUserIdService({ userId, cookie }),
   };
 };

package/src/pages/addresses.tsx

@@ -13,32 +13,48 @@ import type { AddressSummaryData } from "../features/addresses/types";
 import { AddressLayout } from "../features/addresses/layouts";
 import { BuyerPortalProvider } from "../features/shared/components";
 import type { LoaderData } from "../features/shared/types";
+import type { OrgUnitBasicData } from "../features/org-units/types";
+import { getOrgUnitBasicDataService } from "../features/org-units/services";
 
 export type AddressesPageData = {
   data: AddressSummaryData[];
   clientContext: ClientContext;
+  currentOrgUnit: OrgUnitBasicData | null;
 };
 
 export type AddressesPageQuery = GetAddressesServiceProps & {
-  orgUnitId?: string[];
+  orgUnitId: string;
 };
 
 export async function loader(
   data: LoaderData<AddressesPageQuery>
 ): Promise<AddressesPageData> {
-  const { currentOrgUnit, ...clientContext } = await getClientContext(data);
+  const { cookie, ...clientContext } = await getClientContext(data);
+
+  const currentOrgUnit = await getOrgUnitBasicDataService({
+    id: data.query.orgUnitId,
+    cookie,
+  });
 
   return {
     data: await getAddressesService({
       customerId: getCustomerIdFromCookieServerSide(data),
       cookie: getCookieAsString(data?.req?.cookies),
     }),
-    clientContext: { currentOrgUnit, ...clientContext },
+    clientContext: { cookie, ...clientContext },
+    currentOrgUnit,
   };
 }
 
-const AddressPage = ({ data, clientContext }: AddressesPageData) => (
-  <BuyerPortalProvider clientContext={clientContext}>
+const AddressPage = ({
+  data,
+  clientContext,
+  currentOrgUnit,
+}: AddressesPageData) => (
+  <BuyerPortalProvider
+    clientContext={clientContext}
+    currentOrgUnit={currentOrgUnit}
+  >
     <AddressLayout data={data} />
   </BuyerPortalProvider>
 );

package/src/pages/contracts.tsx

@@ -1,46 +1,55 @@
 import { type ClientContext, getClientContext } from "../features/shared/utils";
 import { ContractsLayout } from "../features/contracts/layouts";
-import {
-  getContractsByCustomerIdService,
-  getContractsByOrgUnitIdService,
-} from "../features/contracts/services";
+import { getContractsByOrgUnitIdService } from "../features/contracts/services";
 import type { ContractData } from "../features/contracts/types";
 import { BuyerPortalProvider } from "../features/shared/components";
 import type { LoaderData } from "../features/shared/types";
+import type { OrgUnitBasicData } from "../features/org-units/types";
+import { getOrgUnitBasicDataService } from "../features/org-units/services";
 
 export type ContractsPageData = {
   data: ContractData[];
   clientContext: ClientContext;
+  currentOrgUnit: OrgUnitBasicData | null;
 };
 
 type ContractsPageQuery = {
-  orgUnitId?: string[];
+  orgUnitId: string;
 };
 
 export async function loader(
   data: LoaderData<ContractsPageQuery>
 ): Promise<ContractsPageData> {
-  const { customerId, cookie, currentOrgUnit, ...clientContext } =
-    await getClientContext(data);
+  const { customerId, cookie, ...clientContext } = await getClientContext(data);
+
+  const currentOrgUnit = await getOrgUnitBasicDataService({
+    id: data.query.orgUnitId,
+    cookie,
+  });
 
   return {
-    data: currentOrgUnit
-      ? await getContractsByOrgUnitIdService({
-          orgUnitId: currentOrgUnit.id,
-          cookie,
-        })
-      : await getContractsByCustomerIdService({ customerId, cookie }),
+    data: await getContractsByOrgUnitIdService({
+      orgUnitId: currentOrgUnit?.id,
+      cookie,
+    }),
     clientContext: {
       customerId,
       cookie,
-      currentOrgUnit: currentOrgUnit,
       ...clientContext,
     },
+    currentOrgUnit,
   };
 }
 
-const ContractsPage = ({ data, clientContext }: ContractsPageData) => (
-  <BuyerPortalProvider clientContext={clientContext}>
+const ContractsPage = ({
+  data,
+  clientContext,
+  currentOrgUnit,
+}: ContractsPageData) => (
+  <BuyerPortalProvider
+    clientContext={clientContext}
+    currentOrgUnit={currentOrgUnit}
+  >
     <ContractsLayout data={data} />
   </BuyerPortalProvider>
 );

package/src/pages/home.tsx

@@ -14,7 +14,9 @@ type HomePageQuery = {
 export async function loader(
   data: LoaderData<HomePageQuery>
 ): Promise<HomePageData> {
-  const { userOrgUnit } = await getClientContext(data);
+  const { userId, cookie } = await getClientContext(data);
+
+  const userOrgUnit = await getOrgUnitByUserIdService({ userId, cookie });
 
   if (userOrgUnit) {
     data.res?.writeHead(302, { Location: `/org-unit/${userOrgUnit?.id}` });

package/src/pages/org-units.tsx

@@ -1,7 +1,11 @@
 import { OrgUnitsLayout } from "../features/org-units/layouts";
-import type { OrgUnitData } from "../features/org-units/types";
+import type {
+  OrgUnitBasicData,
+  OrgUnitData,
+} from "../features/org-units/types";
 import {
   getChildrenOrgUnitsService,
+  getOrgUnitBasicDataService,
   getOrgUnitByIdService,
   searchOrgUnistByNameService,
 } from "../features/org-units/services";
@@ -13,6 +17,7 @@ export type OrgUnitsPageData = {
   data: { organizationalUnits: OrgUnitData[]; total: number };
   clientContext: ClientContext;
   search: string;
+  currentOrgUnit: OrgUnitBasicData | null;
 };
 
 type OrgUnitsPageQuery = {
@@ -26,6 +31,11 @@ export async function loader(
   const { cookie, customerId, userId, ...restClientContext } =
     await getClientContext(data);
 
+  const currentOrgUnit = await getOrgUnitBasicDataService({
+    id: data.query.orgUnitId,
+    cookie,
+  });
+
   const clientContext = {
     cookie,
     customerId,
@@ -40,6 +50,7 @@ export async function loader(
       data: await searchOrgUnistByNameService({ name: search }, cookie),
       clientContext,
       search,
+      currentOrgUnit,
     };
   }
 
@@ -62,6 +73,7 @@ export async function loader(
       },
       clientContext,
       search: "",
+      currentOrgUnit,
     };
   }
 
@@ -72,12 +84,21 @@ export async function loader(
     data: { organizationalUnits: [], total: 0 },
     clientContext,
     search: "",
+    currentOrgUnit,
   };
 }
 
-const OrgUnitsPage = ({ data, clientContext, search }: OrgUnitsPageData) => {
+const OrgUnitsPage = ({
+  data,
+  clientContext,
+  search,
+  currentOrgUnit,
+}: OrgUnitsPageData) => {
   return (
-    <BuyerPortalProvider clientContext={clientContext}>
+    <BuyerPortalProvider
+      clientContext={clientContext}
+      currentOrgUnit={currentOrgUnit}
+    >
       <OrgUnitsLayout data={data} search={search} />
     </BuyerPortalProvider>
   );

package/src/pages/user-details.tsx

@@ -4,6 +4,7 @@ import { type ClientContext, getClientContext } from "../features/shared/utils";
 import { UserDetailsLayout } from "../features/users/layouts";
 import {
   getUserDetailsService,
+  getUsersByOrgUnitIdService,
   getUsersService,
 } from "../features/users/services";
 import type { UserData } from "../features/users/types";

package/src/pages/users.tsx

@@ -1,27 +1,29 @@
 import React from "react";
 
 import {
-  getUsersService,
+  getUsersByOrgUnitIdService,
   type GetUsersServiceProps,
 } from "../features/users/services";
 import { type ClientContext, getClientContext } from "../features/shared/utils";
-import { getRootOrgUnitByCustomerIdService } from "../features/org-units/services";
-import type { OrgUnitData } from "../features/org-units/types";
+
 import type { UserData } from "../features/users/types";
 import { UsersLayout } from "../features/users/layouts";
 import { BuyerPortalProvider } from "../features/shared/components";
 import type { LoaderData } from "../features/shared/types";
+import { getOrgUnitBasicDataService } from "../features/org-units/services";
+import type { OrgUnitBasicData } from "../features/org-units/types";
 
 export type UsersPageData = {
   data: {
     users: UserData[];
-    orgUnitsHierarchy: OrgUnitData[];
+    total: number;
   };
   clientContext: ClientContext;
+  currentOrgUnit: OrgUnitBasicData | null;
 };
 
 export type UsersPageQuery = GetUsersServiceProps & {
-  orgUnitId?: string[];
+  orgUnitId: string;
 };
 
 export async function loader(
@@ -29,22 +31,28 @@ export async function loader(
 ): Promise<UsersPageData> {
   const { customerId, cookie, ...clientContext } = await getClientContext(data);
 
-  const initialOrgUnits = await getRootOrgUnitByCustomerIdService(
-    { customerId },
-    cookie
-  );
+  const { orgUnitId } = data.query;
+
+  const currentOrgUnit = await getOrgUnitBasicDataService({
+    id: orgUnitId,
+    cookie,
+  });
 
   return {
-    data: {
-      users: await getUsersService(data.query),
-      orgUnitsHierarchy: initialOrgUnits.organizationalUnits,
-    },
+    data: await getUsersByOrgUnitIdService({
+      cookie,
+      orgUnitId,
+    }),
     clientContext: { customerId, cookie, ...clientContext },
+    currentOrgUnit,
   };
 }
 
-const UsersPage = ({ data, clientContext }: UsersPageData) => (
-  <BuyerPortalProvider clientContext={clientContext}>
+const UsersPage = ({ data, clientContext, currentOrgUnit }: UsersPageData) => (
+  <BuyerPortalProvider
+    clientContext={clientContext}
+    currentOrgUnit={currentOrgUnit}
+  >
     <UsersLayout data={data} />
   </BuyerPortalProvider>
 );