@vtex/faststore-plugin-buyer-portal 1.1.69 → 1.1.71

package/package.json

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

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

@@ -4,7 +4,8 @@ import { getApiUrl } from "../../shared/utils";
 import type {
   OrgUnitBasicData,
   OrgUnitSummaryData,
-  OrgUnitData,
+  OrgUnitSearchParams,
+  OrgUnitSearchResponse,
 } from "../types";
 
 export class OrgUnitClient extends Client {
@@ -114,12 +115,15 @@ export class OrgUnitClient extends Client {
     });
   }
 
-  searchOrgUnitsByName(name: string, cookie: string) {
-    return this.get<OrgUnitData[]>(`units?name=${name}`, {
-      headers: {
-        Cookie: cookie,
-      },
-    });
+  searchOrgUnitsByName({ cookie, name, contractId }: OrgUnitSearchParams) {
+    return this.get<OrgUnitSearchResponse>(
+      `customers/${contractId}/units?name=${name}`,
+      {
+        headers: {
+          Cookie: cookie,
+        },
+      }
+    );
   }
 }
 

package/src/features/org-units/hooks/useSearchOrgUnits.ts

@@ -7,7 +7,12 @@ export const useSearchOrgUnits = (
 ) => {
   const { data, error, isLoading, refetch } = useQuery(
     `api/search-org-unit/${name}`,
-    ({ cookie }) => searchOrgUnitsByNameService({ name }, cookie),
+    ({ cookie, customerId }) =>
+      searchOrgUnitsByNameService({
+        name,
+        contractId: customerId,
+        cookie,
+      }),
     options
   );
   return {

package/src/features/org-units/services/index.ts

@@ -18,7 +18,4 @@ export {
   updateOrgUnitService,
 } from "./update-org-unit.service";
 export { getOrgUnitByUserIdService } from "./get-org-unit-by-user-id.service";
-export {
-  type searchOrgUnitsByNameServiceProps,
-  searchOrgUnitsByNameService,
-} from "./search-org-units-by-name.service";
+export { searchOrgUnitsByNameService } from "./search-org-units-by-name.service";

package/src/features/org-units/services/search-org-units-by-name.service.ts

@@ -1,26 +1,21 @@
 import { orgUnitClient } from "../clients/OrgUnitClient";
 
-import type { OrgUnitData } from "../types";
-
-export type searchOrgUnitsByNameServiceProps = {
-  name: string;
-};
+import type { OrgUnitSearchParams, OrgUnitSearchResponse } from "../types";
 
 export const searchOrgUnitsByNameService = async (
-  { name }: searchOrgUnitsByNameServiceProps,
-  cookie: string
-): Promise<{ organizationalUnits: OrgUnitData[]; total: number }> => {
-  if (!name) {
+  params: OrgUnitSearchParams
+): Promise<OrgUnitSearchResponse> => {
+  if (!params.name) {
     return {
       organizationalUnits: [],
       total: 0,
     };
   }
 
-  const orgUnits = await orgUnitClient.searchOrgUnitsByName(name, cookie);
+  const orgUnits = await orgUnitClient.searchOrgUnitsByName(params);
 
   return {
-    organizationalUnits: orgUnits,
-    total: orgUnits?.length || 0,
+    organizationalUnits: orgUnits?.organizationalUnits || [],
+    total: orgUnits?.total || 0,
   };
 };

package/src/features/org-units/types/OrgUnitSearch.tsx

@@ -0,0 +1,12 @@
+import type { OrgUnitData } from "./OrgUnitsData";
+
+export type OrgUnitSearchParams = {
+  cookie: string;
+  name?: string;
+  contractId: string;
+};
+
+export type OrgUnitSearchResponse = {
+  organizationalUnits: OrgUnitData[];
+  total: number;
+};

package/src/features/org-units/types/index.ts

@@ -10,3 +10,7 @@ export type {
   OrgUnitBreadcrumbItemProps,
   OrgUnitBreadcrumbPathProps,
 } from "./OrgUnitBreadcrumbTypes";
+export type {
+  OrgUnitSearchParams,
+  OrgUnitSearchResponse,
+} from "./OrgUnitSearch";

package/src/features/users/hooks/useDebouncedSearchOrgUnit.ts

@@ -4,7 +4,8 @@ import { DEBOUNCE_TIMEOUT } from "../../shared/utils";
 
 export const useDebouncedSearchOrgUnit = (searchTerm = "") => {
   const debouncedSearchTerm = useDebounce(searchTerm, DEBOUNCE_TIMEOUT);
-  const { searchedOrgUnits } = useSearchOrgUnits(debouncedSearchTerm);
+  const { searchedOrgUnits, isSearchedOrgUnitsLoading } =
+    useSearchOrgUnits(debouncedSearchTerm);
 
   if (searchTerm === "") {
     return {
@@ -18,6 +19,6 @@ export const useDebouncedSearchOrgUnit = (searchTerm = "") => {
 
   return {
     searchedOrgUnits: searchedOrgUnits?.organizationalUnits ?? [],
-    isDebouncedSearchOrgUnitLoading: false,
+    isDebouncedSearchOrgUnitLoading: isSearchedOrgUnitsLoading,
   };
 };

package/src/pages/org-units.tsx

@@ -11,13 +11,13 @@ import { getUserByIdService } from "../features/users/services";
 
 import type {
   OrgUnitBasicData,
-  OrgUnitData,
+  OrgUnitSearchResponse,
 } from "../features/org-units/types";
 import type { LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type OrgUnitsPageData = {
-  data: { organizationalUnits: OrgUnitData[]; total: number };
+  data: OrgUnitSearchResponse;
   search: string;
   context: {
     clientContext: ClientContext;
@@ -55,7 +55,11 @@ export async function loader(
 
   if (search) {
     return {
-      data: await searchOrgUnitsByNameService({ name: search }, cookie),
+      data: await searchOrgUnitsByNameService({
+        name: search,
+        contractId: customerId,
+        cookie,
+      }),
       search,
       context: {
         clientContext,