@vtex/faststore-plugin-buyer-portal 1.3.66 → 1.3.67

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.67] - 2026-03-05
+
+### Changed
+
+- Product Assortment table list now uses `collections/attached` endpoint
+- Product Assortment drawer listing now uses `collections/available` endpoint
+- Product Assortment drawer now shows already attached collections as selected and disabled
+
 ## [1.3.66] - 2026-02-13
 
 ### Fixed
@@ -487,7 +495,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add CHANGELOG file
 - Add README file
 
-[unreleased]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.66...HEAD
+[unreleased]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.67...HEAD
 [1.3.55]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.54...v1.3.55
 [1.3.54]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.53...v1.3.54
 [1.3.53]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.52...v1.3.53
@@ -550,6 +558,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.3.60]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.59...v1.3.60
 [1.3.59]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.58...v1.3.59
 [1.3.58]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/1.3.58
+[1.3.67]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.66...v1.3.67
 [1.3.66]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.65...v1.3.66
 [1.3.65]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.64...v1.3.65
 [1.3.64]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/1.3.64

package/package.json

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

package/src/features/product-assortment/clients/ProductAssortmentClient.ts

@@ -24,7 +24,7 @@ export class ProductAssortmentClient extends Client {
     const { contractId, cookie, name, unitId, page } = args;
 
     return this.get<GetProductAssortmentFromContractResponse>(
-      `customers/${contractId}/units/${unitId}/collections/paginated`,
+      `customers/${contractId}/units/${unitId}/collections/attached`,
       {
         headers: { Cookie: cookie },
         params: {
@@ -40,19 +40,17 @@ export class ProductAssortmentClient extends Client {
       unitId: string;
       name?: string;
       page: number;
-      filterByScope: boolean;
     }
   ) {
-    const { contractId, cookie, name, unitId, filterByScope, page } = args;
+    const { contractId, cookie, name, unitId, page } = args;
 
     return this.get<GetProductAssortmentFromContractResponse>(
-      `customers/${contractId}/units/${unitId}/collections/paginated`,
+      `customers/${contractId}/units/${unitId}/collections/available`,
       {
         headers: { Cookie: cookie },
         params: {
           ...(name ? { name } : undefined),
           page,
-          filterByScope,
           v: new Date().getTime(),
         },
       }

package/src/features/product-assortment/components/AddProductAssortmentDrawer/AddProductAssortmentDrawer.tsx

@@ -18,7 +18,7 @@ import { AddProductAssortmentDrawerTable } from "../table/AddProductAssortmentDr
 
 import type {
   AddProductAssortmentDrawerProps,
-  ProductAssortmentSummary,
+  ProductAssortmentWithAdditionalInformation,
 } from "../../types";
 
 export const AddProductAssortmentDrawer = ({
@@ -35,7 +35,6 @@ export const AddProductAssortmentDrawer = ({
     useGetProductAssorments({
       contractId: currentContract?.id ?? "",
       unitId: currentOrgUnit?.id ?? "",
-      filterByScope: false,
       page: drawerPage,
       name: drawerSearch,
     });
@@ -65,14 +64,21 @@ export const AddProductAssortmentDrawer = ({
   const addProductAssortmentMutation = useAddProductAssortmentToScope();
 
   const [selectedAssortment, setSelectedAssortment] = useState<
-    ProductAssortmentSummary[]
+    ProductAssortmentWithAdditionalInformation[]
   >([]);
 
   const handleSuccess = async () => {
+    const itemsToAdd = selectedAssortment.filter((s) => !s.isEnabled);
+
+    if (itemsToAdd.length === 0) {
+      close();
+      return;
+    }
+
     await addProductAssortmentMutation.mutate({
       unitId: unitId ?? "",
       contractId: contractId ?? "",
-      data: selectedAssortment.map((s) => ({ name: s.name })),
+      data: itemsToAdd.map((s) => ({ name: s.name })),
     });
 
     pushToast({
@@ -177,12 +183,13 @@ export const AddProductAssortmentDrawer = ({
         </BasicDrawer.Button>
         <BasicDrawer.Button
           variant="confirm"
-          disabled={selectedAssortment.length === 0}
+          disabled={selectedAssortment.filter((s) => !s.isEnabled).length === 0}
           onClick={handleSuccess}
           isLoading={addProductAssortmentMutation.isLoading}
         >
           Add
-          {selectedAssortment.length > 0 && `(${selectedAssortment.length})`}
+          {selectedAssortment.filter((s) => !s.isEnabled).length > 0 &&
+            `(${selectedAssortment.filter((s) => !s.isEnabled).length})`}
         </BasicDrawer.Button>
       </BasicDrawer.Footer>
     </BasicDrawer>

package/src/features/product-assortment/components/table/AddProductAssortmentDrawerTable.tsx

@@ -11,12 +11,14 @@ import { Checkbox } from "@faststore/ui";
 import { Table } from "../../../shared/components";
 
 import type { TableColumn } from "../../../shared/components/Table/TableHead/TableHead";
-import type { ProductAssortmentSummary } from "../../types";
+import type { ProductAssortmentWithAdditionalInformation } from "../../types";
 
 interface AddProductAssortmentDrawerTableProps {
   loading?: boolean;
-  data: ProductAssortmentSummary[];
-  onChange: Dispatch<SetStateAction<ProductAssortmentSummary[]>>;
+  data: ProductAssortmentWithAdditionalInformation[];
+  onChange: Dispatch<
+    SetStateAction<ProductAssortmentWithAdditionalInformation[]>
+  >;
 }
 
 export const AddProductAssortmentDrawerTable = ({
@@ -24,14 +26,27 @@ export const AddProductAssortmentDrawerTable = ({
   loading,
   onChange,
 }: AddProductAssortmentDrawerTableProps) => {
-  const [selectedIds, setSelectedIds] = useState<string[]>([]);
+  const enabledIds = useMemo(
+    () => data.filter((item) => item.isEnabled).map((item) => item.id),
+    [data]
+  );
+
+  const [selectedIds, setSelectedIds] = useState<string[]>(enabledIds);
 
-  const allIds = useMemo(() => data.map((item) => item.id), [data]);
-  const allSelected = selectedIds.length === data.length && data.length > 0;
-  const partiallySelected = selectedIds.length > 0 && !allSelected;
+  const selectableIds = useMemo(
+    () => data.filter((item) => !item.isEnabled).map((item) => item.id),
+    [data]
+  );
+  const allSelected =
+    selectableIds.every((id) => selectedIds.includes(id)) &&
+    selectableIds.length > 0;
+  const partiallySelected =
+    selectedIds.some((id) => selectableIds.includes(id)) && !allSelected;
 
   const handleSelect = useCallback(
-    (id: string) => {
+    (id: string, isEnabled: boolean) => {
+      if (isEnabled) return;
+
       const newSelectedIds = selectedIds.includes(id)
         ? selectedIds.filter((item) => item !== id)
         : [...selectedIds, id];
@@ -44,11 +59,13 @@ export const AddProductAssortmentDrawerTable = ({
   );
 
   const handleSelectAll = useCallback(() => {
-    const newSelectedIds = allSelected ? [] : allIds;
+    const newSelectedIds = allSelected
+      ? enabledIds
+      : [...selectableIds, ...enabledIds];
     setSelectedIds(newSelectedIds);
     const selectedItems = data.filter((d) => newSelectedIds.includes(d.id));
     onChange(selectedItems);
-  }, [allSelected, allIds, data, onChange]);
+  }, [allSelected, selectableIds, enabledIds, data, onChange]);
 
   const columns: TableColumn[] = [
     {
@@ -92,7 +109,8 @@ export const AddProductAssortmentDrawerTable = ({
                     <Checkbox
                       data-fs-bp-product-assortment-checkbox
                       checked={selectedIds.includes(option.id)}
-                      onChange={() => handleSelect(option.id)}
+                      disabled={option.isEnabled}
+                      onChange={() => handleSelect(option.id, option.isEnabled)}
                     />
                   </Table.Cell>
                 }

package/src/features/product-assortment/hooks/useGetProductAssortment.ts

@@ -1,32 +1,29 @@
 import { type QueryOptions, useQuery } from "../../shared/hooks";
-import { getProductAssortmentFromScopeService } from "../services/get-product-assortment-from-scope.service";
+import { getProductAssortmentAttachedService } from "../services/get-product-assortment-attached.service";
 
 export const useGetProductAssortment = ({
   contractId,
   orgUnitId,
   search = "",
-  filterByScope = false,
   page = 1,
   options,
 }: {
   contractId: string;
   orgUnitId: string;
-  filterByScope?: boolean;
   search?: string;
   page?: number;
   options?: QueryOptions<
-    AwaitedType<typeof getProductAssortmentFromScopeService>
+    AwaitedType<typeof getProductAssortmentAttachedService>
   >;
 }) => {
   const { data, error, isLoading, refetch } = useQuery(
-    `customers/${contractId}/units/${orgUnitId}/collections`,
+    `customers/${contractId}/units/${orgUnitId}/collections/attached`,
     ({ cookie }) =>
-      getProductAssortmentFromScopeService({
+      getProductAssortmentAttachedService({
         args: {
           cookie,
           contractId,
           unitId: orgUnitId,
-          filterByScope,
           name: search,
           page,
         },

package/src/features/product-assortment/layouts/ProductAssortmentLayout/ProductAssortmentLayout.tsx

@@ -60,12 +60,12 @@ export const ProductAssortmentLayout = ({
     contractId,
     orgUnitId,
   });
+
   const {
     data: initialProductAssortment,
     isProductAssortmentLoading,
     refetchProductAssortment,
   } = useGetProductAssortment({
-    filterByScope: true,
     contractId,
     orgUnitId,
     search,

package/src/features/product-assortment/services/get-product-assortment-attached.service.ts

@@ -0,0 +1,32 @@
+import { isRightFormat } from "../../shared/utils/isRightFormat";
+import { productAssortmentClient } from "../clients/ProductAssortmentClient";
+import { GetProductAssortmentFromContractResponse } from "../types";
+
+export interface GetProductAssortmentAttachedServiceProps {
+  args: Parameters<
+    typeof productAssortmentClient.getProductAssortmentsInfoInContract
+  >[0];
+}
+
+export const getProductAssortmentAttachedService = async ({
+  args,
+}: GetProductAssortmentAttachedServiceProps) => {
+  try {
+    const data =
+      await productAssortmentClient.getProductAssortmentsInfoInContract(args);
+
+    return data;
+  } catch (error) {
+    if (error instanceof Error) {
+      const err = JSON.parse(error.message) as unknown;
+      if (
+        isRightFormat(err) &&
+        err.message.startsWith("No Product assortment found for the name")
+      ) {
+        return {} as GetProductAssortmentFromContractResponse;
+      }
+    }
+
+    throw error;
+  }
+};

package/src/features/product-assortment/services/index.ts

@@ -2,3 +2,8 @@ export {
   getProductAssortmentFromScopeService,
   type GetProductAssortmentFromScopeServiceProps,
 } from "./get-product-assortment-from-scope.service";
+
+export {
+  getProductAssortmentAttachedService,
+  type GetProductAssortmentAttachedServiceProps,
+} from "./get-product-assortment-attached.service";

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

@@ -22,4 +22,4 @@ export const SCOPE_KEYS = {
   CREDIT_CARDS: "creditCards",
 } as const;
 
-export const CURRENT_VERSION = "1.3.66";
+export const CURRENT_VERSION = "1.3.67";