@vtex/faststore-plugin-buyer-portal 1.3.20 → 1.3.22

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.22] - 2025-11-21
+
+### Added
+
+- Add validation to prevent Org Unit deletion if it has users
+
+## [1.3.21] - 2025-11-05
+
+### Removed
+
+- Remove cookie-based preference validation on Payment Methods remove Drawer.
+
 ## [1.3.20] - 2025-11-05
 
 ### Added
@@ -132,8 +144,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.2.4] - 2025-10-16
 
 ### Added
-- Responsiviness adjustment to to Buying policies page
 
+- Responsiviness adjustment to to Buying policies page
 
 ### Added
 
@@ -223,7 +235,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.20...HEAD
+[unreleased]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.22...HEAD
 [1.2.3]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.2.2...1.2.3
 [1.2.3]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/1.2.3
 [1.2.4]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/1.2.4
@@ -238,6 +250,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # <<<<<<< HEAD
 
+[1.3.22]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.21...v1.3.22
+[1.3.21]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.20...v1.3.21
 [1.3.20]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.19...v1.3.20
 [1.3.19]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.18...v1.3.19
 [1.3.18]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.17...v1.3.18

package/package.json

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

package/src/features/org-units/components/DeleteOrgUnitDrawer/DeleteOrgUnitDrawer.tsx

@@ -11,6 +11,7 @@ import {
   InputText,
   type BasicDrawerProps,
 } from "../../../shared/components";
+import { useGetUserByOrgUnitId } from "../../../users/hooks/useGetUserByOrgUnitId";
 import { useChildrenOrgUnits } from "../../hooks";
 import { useDeleteOrgUnit } from "../../hooks/useDeleteOrgUnit";
 
@@ -28,12 +29,14 @@ export const DeleteOrgUnitDrawer = ({
 }: DeleteOrgUnitDrawerProps) => {
   const router = useRouter();
   const { childrenOrgUnits } = useChildrenOrgUnits(id, name);
+  const { users } = useGetUserByOrgUnitId(id);
   const { pushToast } = useUI();
 
   const [confirmName, setConfirmName] = useState("");
   const [isTouched, setIsTouched] = useState(false);
 
-  const hasChildren = Boolean(childrenOrgUnits?.nodes?.length);
+  const hasChildren =
+    Boolean(childrenOrgUnits?.nodes?.length) || Boolean(users?.length);
 
   const handleDeleteOrgUnitSuccess = () => {
     pushToast({
@@ -111,13 +114,14 @@ export const DeleteOrgUnitDrawer = ({
               <span data-fs-bp-delete-org-unit-drawer-message-name>
                 {` ${name} `}
               </span>
-              , you must first remove all child organizational units.
+              , you must first remove all child organizational units{" "}
+              {users?.length ? "and users" : ""}.
               <br />
               Please delete them individually, starting from the lowest level.
               <br />
               <br />
-              Once all child units bellow are removed, you’ll be able to delete{" "}
-              {name}.
+              Once all child units {users?.length ? "and users" : ""} bellow are
+              removed, you’ll be able to delete {name}.
             </p>
 
             <span data-fs-bp-delete-org-unit-drawer-subtitle>

package/src/features/payment-methods/components/RemovePaymentMethodsDrawer/RemovePaymentMethodsDrawer.tsx

@@ -1,10 +1,5 @@
-import { useState } from "react";
-
-import { CheckboxField } from "@faststore/ui";
-
 import { type BasicDrawerProps, BasicDrawer } from "../../../shared/components";
 import { useBuyerPortal } from "../../../shared/hooks";
-import { useCookiePreferenceHideDrawer } from "../../hooks/useCookiePreferenceHideDrawer";
 import { useRemovePaymentMethod } from "../../hooks/useRemovePaymentMethodSubmit";
 
 import type { PaymentMethodData } from "../../types";
@@ -24,17 +19,9 @@ export const RemovePaymentMethodsDrawer = ({
   ...props
 }: RemovePaymentMethodsDrawerProps) => {
   const { currentOrgUnit: orgUnit } = useBuyerPortal();
-  const { hideMessage, isMessageHidden } = useCookiePreferenceHideDrawer();
-
-  const [dontShowAgain, setDontShowAgain] = useState<boolean>(
-    isMessageHidden || false
-  );
 
   const handleSuccess = () => {
     close();
-    if (dontShowAgain) {
-      hideMessage();
-    }
   };
 
   const { remove, isRemovingPaymentMethod } =
@@ -44,7 +31,7 @@ export const RemovePaymentMethodsDrawer = ({
     remove(paymentMethodId);
   };
 
-  if (!paymentMethod || isMessageHidden) {
+  if (!paymentMethod) {
     return null;
   }
 
@@ -68,14 +55,6 @@ export const RemovePaymentMethodsDrawer = ({
             This action will prevent users in this unit from acessing this
             payment method during checkout.
           </p>
-          <CheckboxField
-            data-fs-checkbox-field-content
-            data-fs-bp-payment-methods-checkbox
-            label="Don't show this message again"
-            id="prevent-message"
-            checked={dontShowAgain}
-            onChange={(e) => setDontShowAgain(e.target.checked)}
-          />
         </section>
       </BasicDrawer.Body>
 

package/src/features/payment-methods/layouts/PaymentMethodsLayout/PaymentMethodsLayout.tsx

@@ -16,7 +16,6 @@ import {
   RemovePaymentMethodsDrawer,
   SearchPaymentMethods,
 } from "../../components";
-import { useCookiePreferenceHideDrawer } from "../../hooks/useCookiePreferenceHideDrawer";
 import { useDebouncedSearchPaymentMethods } from "../../hooks/useDebouncedSearchPaymentMethods";
 import { useRemovePaymentMethod } from "../../hooks/useRemovePaymentMethodSubmit";
 
@@ -39,8 +38,7 @@ export const PaymentMethodsLayout = ({
   const [querySearch, setQuerySearch] = useState(search ?? "");
 
   const { setQueryString, removeQueryString } = useQueryParams();
-  const { isMessageHidden } = useCookiePreferenceHideDrawer();
-  const { remove, isRemovingPaymentMethod } = useRemovePaymentMethod(() => {
+  const { isRemovingPaymentMethod } = useRemovePaymentMethod(() => {
     setSelectedMethod(undefined);
   });
 
@@ -98,11 +96,7 @@ export const PaymentMethodsLayout = ({
 
   const onRemoveClick = (method: PaymentMethodData) => {
     setSelectedMethod(method);
-    if (isMessageHidden) {
-      remove(method);
-    } else {
-      openRemoveDrawer();
-    }
+    openRemoveDrawer();
   };
 
   const columns = getTableColumns({ actionsLength: 1 });

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

@@ -13,4 +13,4 @@ export const LOCAL_STORAGE_LOCATION_EDIT_KEY = "bp_hide_edit_location_confirm";
 export const LOCAL_STORAGE_RECIPIENT_EDIT_KEY =
   "bp_hide_edit_recipient_confirm";
 
-export const CURRENT_VERSION = "1.3.20";
+export const CURRENT_VERSION = "1.3.22";

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

@@ -0,0 +1,20 @@
+import { type QueryOptions, useQuery } from "../../shared/hooks";
+import { getUsersByOrgUnitIdService } from "../services";
+
+export const useGetUserByOrgUnitId = (
+  orgUnitId: string,
+  options?: QueryOptions<AwaitedType<typeof getUsersByOrgUnitIdService>>
+) => {
+  const { data, error, isLoading, refetch } = useQuery(
+    `org-unit/user/${orgUnitId}`,
+    ({ cookie }) => getUsersByOrgUnitIdService({ orgUnitId, cookie }),
+    options
+  );
+
+  return {
+    users: data?.users,
+    hasUserError: error,
+    isUserLoading: isLoading,
+    refetchUser: refetch,
+  };
+};

package/src/features/payment-methods/hooks/useCookiePreferenceHideDrawer.ts

@@ -1,34 +0,0 @@
-import { useEffect, useState } from "react";
-
-const COOKIE_NAME = "hideMessage";
-const MAX_AGE = 60 * 60 * 24 * 365; // a year
-
-type UseCookiePreferenceHideDrawerResult = {
-  isMessageHidden: boolean;
-  hideMessage: () => void;
-};
-
-export function useCookiePreferenceHideDrawer(): UseCookiePreferenceHideDrawerResult {
-  const [isMessageHidden, setIsMessageHidden] = useState(false);
-
-  useEffect(() => {
-    const cookie = document.cookie
-      .split("; ")
-      .find((row) => row.startsWith(`${COOKIE_NAME}=`));
-
-    if (cookie) {
-      const value = cookie.split("=")[1];
-      setIsMessageHidden(value === "true");
-    }
-  }, []);
-
-  const hideMessage = () => {
-    document.cookie = `${COOKIE_NAME}=true; path=/; max-age=${MAX_AGE}`;
-    setIsMessageHidden(true);
-  };
-
-  return {
-    isMessageHidden,
-    hideMessage,
-  };
-}