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

package/CHANGELOG.md

@@ -7,6 +7,12 @@ 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
@@ -138,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
 
@@ -229,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.21...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
@@ -244,6 +250,7 @@ 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtex/faststore-plugin-buyer-portal",
-  "version": "1.3.21",
+  "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/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.21";
+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,
+  };
+};