@vtex/faststore-plugin-buyer-portal 1.1.91 → 1.1.93

package/src/pages/user-details.tsx

@@ -3,8 +3,17 @@ import {
   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 {
+  BuyerPortalProvider,
+  withErrorBoundary,
+} from "../features/shared/components";
+import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
+import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
+import {
+  type ClientContext,
+  getClientContext,
+  withLoaderErrorBoundary,
+} from "../features/shared/utils";
 import { UserDetailsLayout } from "../features/users/layouts";
 import { getUserByIdService } from "../features/users/services/get-user-by-id.service";
 
@@ -29,11 +38,13 @@ export type UserDetailsPageData = {
     currentOrgUnit: OrgUnitBasicData | null;
     currentUser: UserData | null;
   };
+  hasError?: boolean;
+  error?: ErrorBoundaryProps;
 };
 
-export async function loader(
+const loaderFunction = async (
   data: LoaderData<UserDetailsPageQuery>
-): Promise<UserDetailsPageData> {
+): Promise<UserDetailsPageData> => {
   const { cookie, customerId, ...clientContext } = await getClientContext(data);
 
   const { userId, orgUnitId } = data.query;
@@ -76,11 +87,31 @@ export async function loader(
       currentUser: user,
     },
   };
-}
+};
 
-const UserDetailsPage = ({ data, context }: UserDetailsPageData) => (
+export const loader = withLoaderErrorBoundary(loaderFunction, {
+  componentName: "UserDetailsPage",
+  redirectToError: true,
+});
+
+const UserDetailsPage = ({
+  data,
+  context,
+  hasError,
+  error,
+}: UserDetailsPageData) => (
   <BuyerPortalProvider {...context}>
-    <UserDetailsLayout data={data} />
+    {hasError ? (
+      <ErrorTabsLayout error={error} />
+    ) : (
+      <UserDetailsLayout data={data} />
+    )}
   </BuyerPortalProvider>
 );
-export default UserDetailsPage;
+
+export default withErrorBoundary(UserDetailsPage, {
+  tags: {
+    component: "UserDetailsPage",
+    errorType: "user_details_error",
+  },
+});

package/src/pages/users.tsx

@@ -1,11 +1,17 @@
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
 import { getRolesIdsService } from "../features/roles/services";
 import { RoleData } from "../features/roles/types";
-import { BuyerPortalProvider } from "../features/shared/components";
+import {
+  BuyerPortalProvider,
+  withErrorBoundary,
+} from "../features/shared/components";
+import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
+import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
   getClientContext,
   getValidPage,
+  withLoaderErrorBoundary,
 } from "../features/shared/utils";
 import { UsersLayout } from "../features/users/layouts";
 import {
@@ -34,6 +40,8 @@ export type UsersPageData = {
     currentUser: UserData | null;
     rolesOptions: RoleData[];
   };
+  hasError?: boolean;
+  error?: ErrorBoundaryProps;
 };
 
 export type UsersPageQuery = GetUsersByOrgUnitIdServiceProps & {
@@ -42,9 +50,9 @@ export type UsersPageQuery = GetUsersByOrgUnitIdServiceProps & {
   page?: string;
 };
 
-export async function loader(
+const loaderFunction = async (
   data: LoaderData<UsersPageQuery>
-): Promise<UsersPageData> {
+): Promise<UsersPageData> => {
   const { cookie, userId, ...clientContext } = await getClientContext(data);
 
   const { orgUnitId, search = "", page = "1" } = data.query;
@@ -97,12 +105,22 @@ export async function loader(
       rolesOptions,
     },
   };
-}
+};
+
+export const loader = withLoaderErrorBoundary(loaderFunction, {
+  componentName: "UsersPage",
+  redirectToError: true,
+});
 
-const UsersPage = ({ data, context }: UsersPageData) => (
+const UsersPage = ({ data, context, hasError, error }: UsersPageData) => (
   <BuyerPortalProvider {...context}>
-    <UsersLayout data={data} />
+    {hasError ? <ErrorTabsLayout error={error} /> : <UsersLayout data={data} />}
   </BuyerPortalProvider>
 );
 
-export default UsersPage;
+export default withErrorBoundary(UsersPage, {
+  tags: {
+    component: "UsersPage",
+    errorType: "users_error",
+  },
+});