@vtex/faststore-plugin-buyer-portal 1.1.73 → 1.1.74-experimental.1

package/package.json

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

package/src/features/shared/components/Table/TableRow/TableRow.tsx

@@ -1,7 +1,5 @@
 import type { ReactNode } from "react";
 
-import Link from "next/link";
-
 import { Dropdown } from "@faststore/components";
 
 import { BasicDropdownMenu } from "../../BasicDropdownMenu/BasicDropdownMenu";
@@ -36,7 +34,7 @@ export const TableRow = ({
   enabled = true,
   ...otherProps
 }: TableRowProps) => {
-  const ClickComponent = href ? Link : "button";
+  const ClickComponent = href ? "a" : "button";
 
   return (
     <tr

package/src/features/users/components/CreateUserDrawer/CreateUserDrawer.tsx

@@ -1,7 +1,5 @@
 import { useState } from "react";
 
-import { useRouter } from "next/router";
-
 import { useUI } from "@faststore/ui";
 
 import { RoleData } from "../../../roles/types";
@@ -29,7 +27,6 @@ export const CreateUserDrawer = ({
   ...props
 }: CreateUserDrawerProps) => {
   const { pushToast } = useUI();
-  const router = useRouter();
   const [drawerState, setDrawerState] = useState<
     "CREATE_USER" | "USER_ALREADY_EXISTS"
   >("CREATE_USER");
@@ -79,12 +76,10 @@ export const CreateUserDrawer = ({
           data-fs-bp-toast-view-button
           type="button"
           onClick={() => {
-            router.push(
-              buyerPortalRoutes.userDetails({
-                userId: user.id,
-                orgUnitId: orgUnitId,
-              })
-            );
+            window.location.href = buyerPortalRoutes.userDetails({
+              userId: user.id,
+              orgUnitId: orgUnitId,
+            });
           }}
         >
           View

package/src/features/users/components/UserDropdownMenu/UserDropdownMenu.tsx

@@ -56,12 +56,10 @@ export const UserDropdownMenu = ({
       <BasicDropdownMenu>
         <DropdownItem
           onClick={() =>
-            route.push(
-              buyerPortalRoutes.userDetails({
-                orgUnitId: currentOrgUnit?.id ?? "",
-                userId: user.id,
-              })
-            )
+            (window.location.href = buyerPortalRoutes.userDetails({
+              orgUnitId: currentOrgUnit?.id ?? "",
+              userId: user.id,
+            }))
           }
         >
           <Icon name="OpenInNew" {...sizeProps} />

package/src/features/users/layouts/UserDetailsLayout/UserDetailsLayout.tsx

@@ -1,6 +1,5 @@
 import { Dropdown } from "@faststore/ui";
 
-import { useGetRolesOptions } from "../../../roles/hooks";
 import {
   BasicDropdownMenu,
   HeaderInside,
@@ -13,22 +12,22 @@ import { buyerPortalRoutes } from "../../../shared/utils/buyerPortalRoutes";
 import { ReassignOrgUnitDrawer, UpdateUserDrawer } from "../../components";
 import { UserDropdownMenu } from "../../components/UserDropdownMenu/UserDropdownMenu";
 
+import type { RoleData } from "../../../roles/types";
 import type { UserData } from "../../types/UserData";
 
 export type UserDetailsLayoutProps = {
   data: {
     user?: UserData | null;
     orgUnit: { id: string; name: string };
+    rolesOptions?: RoleData[] | null;
   };
 };
 
 export const UserDetailsLayout = ({
-  data: { user },
+  data: { user, rolesOptions },
 }: UserDetailsLayoutProps) => {
   const { currentOrgUnit } = useBuyerPortal();
 
-  const { rolesOptions } = useGetRolesOptions(currentOrgUnit?.id ?? "");
-
   const {
     open: openReassignDrawer,
     isOpen: isReassignDrawerOpen,
@@ -57,7 +56,7 @@ export const UserDetailsLayout = ({
               <BasicDropdownMenu.Trigger />
               <UserDropdownMenu
                 user={{ name: user?.name ?? "", id: user?.id ?? "" }}
-                rolesOptions={rolesOptions}
+                rolesOptions={rolesOptions ?? []}
               />
             </Dropdown>
           </HeaderInside>
@@ -128,7 +127,7 @@ export const UserDetailsLayout = ({
         )}
         {isUpdateUserDrawerOpen && (
           <UpdateUserDrawer
-            rolesOptions={rolesOptions}
+            rolesOptions={rolesOptions ?? []}
             userId={user?.id ?? ""}
             orgUnitId={currentOrgUnit?.id ?? ""}
             isOpen={isUpdateUserDrawerOpen}

package/src/pages/user-details.tsx

@@ -2,12 +2,14 @@ import {
   getOrgUnitBasicDataService,
   getOrgUnitByUserIdService,
 } from "../features/org-units/services";
+import { getRolesIdsService } from "../features/roles/services";
 import { BuyerPortalProvider } from "../features/shared/components";
 import { type ClientContext, getClientContext } from "../features/shared/utils";
 import { UserDetailsLayout } from "../features/users/layouts";
 import { getUserByIdService } from "../features/users/services/get-user-by-id.service";
 
 import type { OrgUnitBasicData } from "../features/org-units/types";
+import type { RoleData } from "../features/roles/types";
 import type { LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
@@ -20,6 +22,7 @@ export type UserDetailsPageData = {
   data: {
     user?: UserData | null;
     orgUnit: { id: string; name: string };
+    rolesOptions?: RoleData[] | null;
   };
   context: {
     clientContext: ClientContext;
@@ -31,7 +34,7 @@ export type UserDetailsPageData = {
 export async function loader(
   data: LoaderData<UserDetailsPageQuery>
 ): Promise<UserDetailsPageData> {
-  const { cookie, ...clientContext } = await getClientContext(data);
+  const { cookie, customerId, ...clientContext } = await getClientContext(data);
 
   const { userId, orgUnitId } = data.query;
 
@@ -42,15 +45,21 @@ export async function loader(
     data.res?.end();
   }
 
-  const currentOrgUnit = await getOrgUnitBasicDataService({
-    id: orgUnitId,
-    cookie,
-  });
-
-  const orgUnitFromUser = await getOrgUnitByUserIdService({
-    userId,
-    cookie,
-  });
+  const [currentOrgUnit, orgUnitFromUser, rolesOptions] = await Promise.all([
+    getOrgUnitBasicDataService({
+      id: orgUnitId,
+      cookie,
+    }),
+    getOrgUnitByUserIdService({
+      userId,
+      cookie,
+    }),
+    getRolesIdsService({
+      unitId: orgUnitId,
+      customerId,
+      cookie,
+    }),
+  ]);
 
   return {
     data: {
@@ -59,9 +68,10 @@ export async function loader(
         id: orgUnitFromUser?.id ?? "",
         name: orgUnitFromUser?.name ?? "",
       },
+      rolesOptions,
     },
     context: {
-      clientContext: { cookie, ...clientContext },
+      clientContext: { cookie, customerId, ...clientContext },
       currentOrgUnit,
       currentUser: user,
     },