@vtex/faststore-plugin-buyer-portal 1.3.44 → 1.3.46

package/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.46] - 2025-12-19
+
+### Fixed
+
+- Organizational unit deletion now redirects to parent org unit instead of staying on deleted entity's page
+
+## [1.3.45] - 2025-12-17
+
+### Fixed
+- Remove AwaitedType imports
+
 ## [1.3.44] - 2025-12-16
 
 ### Fixed
@@ -389,7 +400,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.44...HEAD
+[unreleased]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.46...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
@@ -439,6 +450,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.3.36]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.35...v1.3.36
 [1.3.35]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/1.3.35
 
+[1.3.46]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.45...v1.3.46
+[1.3.45]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.44...v1.3.45
 [1.3.44]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.43...v1.3.44
 [1.3.43]: https://github.com/vtex/faststore-plugin-buyer-portal/compare/v1.3.42...v1.3.43
 [1.3.42]: https://github.com/vtex/faststore-plugin-buyer-portal/releases/tag/1.3.42

package/package.json

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

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

@@ -25,6 +25,7 @@ export type AddAllToOrgUnitDropdownProps = {
   unitId: string;
   unitName: string;
   contractId: string;
+  pathIds?: string;
   align?: "left" | "right";
 };
 
@@ -33,6 +34,7 @@ export const AddAllToOrgUnitDropdown = ({
   unitId,
   unitName,
   contractId,
+  pathIds,
   align = "right",
 }: AddAllToOrgUnitDropdownProps) => {
   const sizeProps = { width: 20, height: 20 };
@@ -260,6 +262,7 @@ export const AddAllToOrgUnitDropdown = ({
         <DeleteOrgUnitDrawer
           id={unitId}
           name={unitName}
+          pathIds={pathIds}
           {...deleteDrawerProps}
           isOpen={isOpenDeleteDrawer}
         />

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

@@ -11,8 +11,9 @@ import {
   InputText,
   type BasicDrawerProps,
 } from "../../../shared/components";
-import { useAnalytics } from "../../../shared/hooks";
+import { useBuyerPortal, useAnalytics } from "../../../shared/hooks";
 import { ANALYTICS_EVENTS } from "../../../shared/services/logger/analytics/constants";
+import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
 import { useGetUserByOrgUnitId } from "../../../users/hooks/useGetUserByOrgUnitId";
 import { useChildrenOrgUnits } from "../../hooks";
 import { useDeleteOrgUnit } from "../../hooks/useDeleteOrgUnit";
@@ -21,15 +22,18 @@ import { useDeleteOrgUnit } from "../../hooks/useDeleteOrgUnit";
 export type DeleteOrgUnitDrawerProps = Omit<BasicDrawerProps, "children"> & {
   id: string;
   name: string;
+  pathIds?: string;
 };
 
 export const DeleteOrgUnitDrawer = ({
   id,
   name,
+  pathIds,
   close,
   ...props
 }: DeleteOrgUnitDrawerProps) => {
   const router = useRouter();
+  const { currentOrgUnit } = useBuyerPortal();
   const { childrenOrgUnits } = useChildrenOrgUnits(id, name);
   const { users } = useGetUserByOrgUnitId(id);
   const { pushToast } = useUI();
@@ -58,14 +62,35 @@ export const DeleteOrgUnitDrawer = ({
       message: "Organizational unit deleted successfully",
       status: "INFO",
     });
-    close();
 
-    if (router.asPath === `/org-unit/${id}`) {
-      router.replace("/org-units/${id}");
-      return;
+    const currentPath = router.asPath;
+    const isOnDetailsPage = currentPath.includes(`/org-unit/${id}`);
+    const isOnListPageOfDeletedUnit =
+      currentPath === `/pvt/organization-account/org-units/${id}`;
+
+    const effectivePathIds =
+      pathIds ||
+      (id === currentOrgUnit?.id ? currentOrgUnit?.path?.ids : undefined);
+
+    if ((isOnDetailsPage || isOnListPageOfDeletedUnit) && effectivePathIds) {
+      const ids = effectivePathIds.split("/").filter(Boolean);
+
+      if (ids.length >= 2) {
+        const parentId = ids[ids.length - 2];
+        const redirectUrl = buyerPortalRoutes.orgUnitDetails({
+          orgUnitId: parentId,
+        });
+        router.replace(redirectUrl);
+      } else {
+        router.replace(`/pvt/organization-account`);
+      }
+    } else if (isOnDetailsPage || isOnListPageOfDeletedUnit) {
+      router.replace(`/pvt/organization-account`);
     } else {
       router.reload();
     }
+
+    close();
   };
 
   const { deleteOrgUnit, isDeleteOrgUnitLoading } = useDeleteOrgUnit({

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

@@ -15,6 +15,7 @@ export type OrgUnitsDropdownMenuProps = {
   name: string;
   onCreate?: () => void;
   isComplete?: boolean;
+  pathIds?: string;
 };
 
 export const OrgUnitsDropdownMenu = ({
@@ -22,6 +23,7 @@ export const OrgUnitsDropdownMenu = ({
   name,
   onCreate,
   isComplete = true,
+  pathIds,
 }: OrgUnitsDropdownMenuProps) => {
   const { rolesOptions } = useGetRolesOptions(id);
   const {
@@ -97,6 +99,7 @@ export const OrgUnitsDropdownMenu = ({
         <DeleteOrgUnitDrawer
           id={id}
           name={name}
+          pathIds={pathIds}
           {...deleteDrawerProps}
           isOpen={isDeleteDrawerOpen}
         />

package/src/features/org-units/layouts/OrgUnitDetailsLayout/OrgUnitDetailsLayout.tsx

@@ -113,6 +113,7 @@ export const OrgUnitsDetailsLayout = ({
               contractId={contracts[0]?.id}
               unitId={orgUnit?.id}
               unitName={orgUnit?.name}
+              pathIds={orgUnit?.path?.ids}
             />
           </Dropdown>
         </HeaderInside>

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

@@ -6,8 +6,6 @@ import {
 
 import { useQuery, type QueryOptions } from "./useQuery";
 
-import type { AwaitedType } from "../types";
-
 export const useGetScopeConfig = (
   props: Omit<GetScopeConfigServiceProps, "cookie">,
   options?: QueryOptions<AwaitedType<typeof getScopeConfigService>>

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

@@ -6,8 +6,6 @@ import {
 
 import { type MutationOptions, useMutation } from "./useMutation";
 
-import type { AwaitedType } from "../types";
-
 export const useSetScopeConfig = (
   options?: MutationOptions<AwaitedType<typeof setScopeConfigService>>
 ) => {

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.44";
+export const CURRENT_VERSION = "1.3.46";