@vtex/faststore-plugin-buyer-portal 1.1.115 → 1.1.116-poc-1

package/src/pages/org-unit-details.tsx

@@ -1,42 +1,29 @@
-import { getContractsByOrgUnitIdService } from "../features/contracts/services";
 import { OrgUnitsDetailsLayout } from "../features/org-units/layouts";
-import { getOrgUnitBasicDataService } from "../features/org-units/services";
-import { withErrorBoundary } from "../features/shared/components";
+import { PageLoader, withErrorBoundary } from "../features/shared/components";
+import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
+import { useAuth } from "../features/shared/hooks";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
-  type ClientContext,
   withLoaderErrorBoundary,
-  withAuthLoader,
   withProviders,
 } from "../features/shared/utils";
-import { getUserByIdService } from "../features/users/services";
+import {
+  ClientContext,
+  getClientContext,
+} from "../features/shared/utils/getClientContext";
 
-import type { ContractData } from "../features/contracts/types";
-import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { AuthRouteProps, LoaderData } from "../features/shared/types";
-import type { UserData } from "../features/users/types";
+import type { LoaderData } from "../features/shared/types";
 
 export type OrgUnitDetailsPageData = {
   data: {
-    orgUnit: OrgUnitBasicData;
-    contracts: ContractData[];
-    user: UserData | null;
+    orgUnitId: string;
+    userId: string;
   };
   context: {
     clientContext: ClientContext;
   };
   hasError?: boolean;
-  error?: {
-    error: {
-      message: string;
-      name: string;
-      stack?: string;
-    };
-    tags: {
-      component: string;
-      errorType: string;
-    };
-  };
+  error?: ErrorBoundaryProps;
 };
 
 type OrgUnitDetailsPageQuery = {
@@ -45,37 +32,20 @@ type OrgUnitDetailsPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<OrgUnitDetailsPageQuery>
-): Promise<AuthRouteProps<OrgUnitDetailsPageData>> => {
+): Promise<OrgUnitDetailsPageData> => {
   const { orgUnitId } = data.query;
 
-  if (!orgUnitId) {
-    throw new Error(`Missing required query param: orgUnitId=${orgUnitId}`);
-  }
-
-  return withAuthLoader(data, async ({ cookie, userId, ...clientContext }) => {
-    const orgUnit = await getOrgUnitBasicDataService({
-      id: orgUnitId,
-      cookie,
-    });
-
-    const user = await getUserByIdService({ orgUnitId, userId, cookie });
+  const { cookie, userId, ...clientContext } = await getClientContext(data);
 
-    const contracts = await getContractsByOrgUnitIdService({
+  return {
+    data: {
       orgUnitId,
-      cookie,
-    });
-
-    return {
-      data: {
-        contracts,
-        orgUnit,
-        user,
-      },
-      context: {
-        clientContext: { cookie, userId, ...clientContext },
-      },
-    };
-  });
+      userId,
+    },
+    context: {
+      clientContext: { cookie, userId, ...clientContext },
+    },
+  };
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -88,14 +58,18 @@ const OrgUnitDetailsPage = ({
   hasError,
   error,
 }: OrgUnitDetailsPageData) => {
+  if (hasError) {
+    return <ErrorTabsLayout error={error} />;
+  }
+
+  const { isAuthenticated, isLoading } = useAuth();
+
+  if (isLoading || isAuthenticated === null) {
+    return <PageLoader />;
+  }
+
   return (
-    <>
-      {hasError ? (
-        <ErrorTabsLayout error={error} />
-      ) : (
-        <OrgUnitsDetailsLayout data={data} />
-      )}
-    </>
+    <OrgUnitsDetailsLayout orgUnitId={data.orgUnitId} userId={data.userId} />
   );
 };
 

package/src/pages/profile.tsx

@@ -1,29 +1,25 @@
-import { getContractDetailsService } from "../features/contracts/services";
-import { getOrgUnitBasicDataService } from "../features/org-units/services";
 import { ProfileLayout } from "../features/profile/layouts";
-import { withErrorBoundary } from "../features/shared/components";
+import { PageLoader, withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
+import { useAuth } from "../features/shared/hooks";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  withLoaderErrorBoundary,
-  withAuthLoader,
   withProviders,
+  getClientContext,
+  withLoaderErrorBoundary,
 } from "../features/shared/utils";
-import { getUserByIdService } from "../features/users/services";
 
-import type { ContractData } from "../features/contracts/types";
-import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { AuthRouteProps, LoaderData } from "../features/shared/types";
-import type { UserData } from "../features/users/types";
+import type { LoaderData } from "../features/shared/types";
 
 export type ProfilePageData = {
-  data: ContractData | null;
+  data: {
+    contractId: string;
+    orgUnitId: string;
+    userId: string;
+  };
   context: {
     clientContext: ClientContext;
-    currentOrgUnit: OrgUnitBasicData | null;
-    currentContract: ContractData | null;
-    currentUser: UserData | null;
   };
   hasError?: boolean;
   error?: ErrorBoundaryProps;
@@ -32,68 +28,54 @@ export type ProfilePageData = {
 export type ProfilePageQuery = {
   contractId: string;
   orgUnitId: string;
+  userId: string;
 };
 
-export async function loaderFunction(
+const loaderFunction = async (
   data: LoaderData<ProfilePageQuery>
-): Promise<AuthRouteProps<ProfilePageData>> {
+): Promise<ProfilePageData> => {
   const { contractId, orgUnitId } = data.query;
 
-  return withAuthLoader(
-    data,
-    async ({ customerId, cookie, userId, ...clientContext }) => {
-      if (!contractId || !orgUnitId) {
-        return {
-          data: null,
-          context: {
-            clientContext: { customerId, cookie, userId, ...clientContext },
-            currentOrgUnit: null,
-            currentContract: null,
-            currentUser: null,
-          },
-        };
-      }
-
-      const [orgUnit, contract, user] = await Promise.all([
-        getOrgUnitBasicDataService({
-          cookie,
-          id: orgUnitId,
-        }),
-        getContractDetailsService({
-          contractId,
-          cookie,
-          unitId: orgUnitId,
-        }),
-        getUserByIdService({ orgUnitId, userId, cookie }),
-      ]);
+  const { cookie, userId, ...clientContext } = await getClientContext(data);
 
-      return {
-        data: contract,
-        context: {
-          clientContext: { customerId, cookie, userId, ...clientContext },
-          currentOrgUnit: orgUnit,
-          currentContract: contract,
-          currentUser: user,
-        },
-      };
-    }
-  );
-}
+  return {
+    data: {
+      contractId,
+      orgUnitId,
+      userId,
+    },
+    context: {
+      clientContext: { cookie, userId, ...clientContext },
+    },
+    hasError: false,
+    error: undefined,
+  };
+};
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
   componentName: "ProfilePage",
   redirectToError: true,
 });
 
-const ProfilePage = ({ data, hasError, error }: ProfilePageData) => (
-  <>
-    {hasError ? (
-      <ErrorTabsLayout error={error} />
-    ) : (
-      <ProfileLayout data={data} />
-    )}
-  </>
-);
+const ProfilePage = ({ data, hasError, error }: ProfilePageData) => {
+  if (hasError) {
+    return <ErrorTabsLayout error={error} />;
+  }
+
+  const { isAuthenticated, isLoading } = useAuth();
+
+  if (isLoading || isAuthenticated === null) {
+    return <PageLoader />;
+  }
+
+  return (
+    <ProfileLayout
+      orgUnitId={data.orgUnitId}
+      contractId={data.contractId}
+      userId={data.userId}
+    />
+  );
+};
 
 export default withProviders(
   withErrorBoundary(ProfilePage, {