@faststore/core 3.44.2 → 3.45.0

package/src/customizations/src/myAccount/extensions/orders/before.tsx

@@ -0,0 +1,7 @@
+// placeholder for the before component
+
+function Before() {
+  return <></>
+}
+
+export default Before

package/src/customizations/src/myAccount/extensions/profile/after.tsx

@@ -0,0 +1,7 @@
+// placeholder for the after component
+
+function After() {
+  return <></>
+}
+
+export default After

package/src/customizations/src/myAccount/extensions/profile/before.tsx

@@ -0,0 +1,7 @@
+// placeholder for the before component
+
+function Before() {
+  return <></>
+}
+
+export default Before

package/src/customizations/src/myAccount/extensions/security/after.tsx

@@ -0,0 +1,7 @@
+// placeholder for the after component
+
+function After() {
+  return <></>
+}
+
+export default After

package/src/customizations/src/myAccount/extensions/security/before.tsx

@@ -0,0 +1,7 @@
+// placeholder for the before component
+
+function Before() {
+  return <></>
+}
+
+export default Before

package/src/customizations/src/myAccount/extensions/user-details/after.tsx

@@ -0,0 +1,7 @@
+// placeholder for the after component
+
+function After() {
+  return <></>
+}
+
+export default After

package/src/customizations/src/myAccount/extensions/user-details/before.tsx

@@ -0,0 +1,7 @@
+// placeholder for the before component
+
+function Before() {
+  return <></>
+}
+
+export default Before

package/src/experimental/myAccountSeverSideProps.ts

@@ -7,6 +7,7 @@ import {
 } from 'src/components/cms/GlobalSections'
 
 import { injectGlobalSections } from 'src/server/cms/global'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 export type MyAccountProps = {
   globalSections: GlobalSectionsData
@@ -16,7 +17,17 @@ export const getServerSideProps: GetServerSideProps<
   MyAccountProps,
   Record<string, string>,
   Locator
-> = async ({ previewData }) => {
+> = async ({ previewData, query }) => {
+  // TODO validate permissions here
+
+  const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
+    query,
+  })
+
+  if (!isFaststoreMyAccountEnabled) {
+    return { redirect }
+  }
+
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,

package/src/pages/account/403.tsx

@@ -0,0 +1,103 @@
+import type { Locator } from '@vtex/client-cms'
+import type { GetStaticProps } from 'next'
+import { NextSeo } from 'next-seo'
+import type { ComponentType } from 'react'
+import {
+  type GlobalSectionsData,
+  getGlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
+
+import { LinkButton } from '@faststore/ui'
+import { MyAccountLayout } from 'src/components/account'
+import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
+import RenderSections from 'src/components/cms/RenderSections'
+import { OverriddenDefaultEmptyState as EmptyState } from 'src/components/sections/EmptyState/OverriddenDefaultEmptyState'
+import CUSTOM_COMPONENTS from 'src/customizations/src/components'
+import PLUGINS_COMPONENTS from 'src/plugins'
+import { type PageContentType, getPage } from 'src/server/cms'
+import { injectGlobalSections } from 'src/server/cms/global'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+
+/* A list of components that can be used in the CMS. */
+const COMPONENTS: Record<string, ComponentType<any>> = {
+  ...GLOBAL_COMPONENTS,
+  ...PLUGINS_COMPONENTS,
+  ...CUSTOM_COMPONENTS,
+}
+
+type Props = {
+  globalSections: GlobalSectionsData
+}
+
+function Page({ globalSections }: Props) {
+  return (
+    <RenderSections
+      globalSections={globalSections.sections}
+      components={COMPONENTS}
+    >
+      <NextSeo noindex nofollow />
+
+      <MyAccountLayout>
+        <EmptyState
+          title="Unauthorized Access"
+          titleIcon={{ icon: 'ShoppingCart', alt: 'Shopping Cart' }}
+          subtitle="You don't have permission to access this page."
+          showLoader={false}
+        >
+          <LinkButton variant="secondary" href="/account">
+            Back to Account
+          </LinkButton>
+        </EmptyState>
+      </MyAccountLayout>
+    </RenderSections>
+  )
+}
+
+export const getStaticProps: GetStaticProps<
+  Props,
+  Record<string, string>,
+  Locator
+> = async ({ previewData }) => {
+  // TODO validate permissions here
+
+  const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
+    query: {},
+  })
+
+  if (!isFaststoreMyAccountEnabled) {
+    return { redirect }
+  }
+
+  const [
+    globalSectionsPromise,
+    globalSectionsHeaderPromise,
+    globalSectionsFooterPromise,
+  ] = getGlobalSectionsData(previewData)
+
+  const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
+    await Promise.all([
+      getPage<PageContentType>({
+        ...(previewData?.contentType === '403' && previewData),
+        contentType: '403',
+      }),
+      globalSectionsPromise,
+      globalSectionsHeaderPromise,
+      globalSectionsFooterPromise,
+    ])
+
+  const globalSectionsResult = injectGlobalSections({
+    globalSections,
+    globalSectionsHeader,
+    globalSectionsFooter,
+  })
+
+  return {
+    props: {
+      // The sections from the CMS page are not utilized here for the My Account page.
+      // page,
+      globalSections: globalSectionsResult,
+    },
+  }
+}
+
+export default Page

package/src/pages/account/404.tsx

@@ -0,0 +1,95 @@
+import type { Locator } from '@vtex/client-cms'
+import type { GetStaticProps } from 'next'
+import { NextSeo } from 'next-seo'
+import type { ComponentType } from 'react'
+import {
+  type GlobalSectionsData,
+  getGlobalSectionsData,
+} from 'src/components/cms/GlobalSections'
+
+import { MyAccountLayout } from 'src/components/account'
+import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
+import RenderSections, {
+  RenderSectionsBase,
+} from 'src/components/cms/RenderSections'
+import { OverriddenDefaultEmptyState as EmptyState } from 'src/components/sections/EmptyState/OverriddenDefaultEmptyState'
+import CUSTOM_COMPONENTS from 'src/customizations/src/components'
+import PLUGINS_COMPONENTS from 'src/plugins'
+import { type PageContentType, getPage } from 'src/server/cms'
+import { injectGlobalSections } from 'src/server/cms/global'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+
+/* A list of components that can be used in the CMS. */
+const COMPONENTS: Record<string, ComponentType<any>> = {
+  ...GLOBAL_COMPONENTS,
+  EmptyState,
+  ...PLUGINS_COMPONENTS,
+  ...CUSTOM_COMPONENTS,
+}
+
+type Props = {
+  page: PageContentType
+  globalSections: GlobalSectionsData
+}
+
+function Page({ page: { sections }, globalSections }: Props) {
+  return (
+    <RenderSections
+      globalSections={globalSections.sections}
+      components={COMPONENTS}
+    >
+      <NextSeo noindex nofollow />
+
+      <MyAccountLayout>
+        {sections && sections.length > 0 && (
+          <RenderSectionsBase sections={sections} components={COMPONENTS} />
+        )}
+      </MyAccountLayout>
+    </RenderSections>
+  )
+}
+
+export const getStaticProps: GetStaticProps<
+  Props,
+  Record<string, string>,
+  Locator
+> = async ({ previewData }) => {
+  // TODO validate permissions here
+
+  const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
+    query: {},
+  })
+
+  if (!isFaststoreMyAccountEnabled) {
+    return { redirect }
+  }
+
+  const [
+    globalSectionsPromise,
+    globalSectionsHeaderPromise,
+    globalSectionsFooterPromise,
+  ] = getGlobalSectionsData(previewData)
+
+  const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
+    await Promise.all([
+      getPage<PageContentType>({
+        ...(previewData?.contentType === '404' && previewData),
+        contentType: '404',
+      }),
+      globalSectionsPromise,
+      globalSectionsHeaderPromise,
+      globalSectionsFooterPromise,
+    ])
+
+  const globalSectionsResult = injectGlobalSections({
+    globalSections,
+    globalSectionsHeader,
+    globalSectionsFooter,
+  })
+
+  return {
+    props: { page, globalSections: globalSectionsResult },
+  }
+}
+
+export default Page

package/src/pages/account/[...unknown].tsx

@@ -0,0 +1,39 @@
+import type { Locator } from '@vtex/client-cms'
+import type { GetStaticPaths, GetStaticProps } from 'next'
+
+import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+
+export default function Page() {
+  return <></>
+}
+
+export const getStaticProps: GetStaticProps<
+  MyAccountProps,
+  Record<string, string>,
+  Locator
+> = async () => {
+  // TODO validate permissions here
+
+  const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
+    query: {},
+  })
+
+  if (!isFaststoreMyAccountEnabled) {
+    return { redirect }
+  }
+
+  return {
+    redirect: {
+      destination: '/account/404',
+      permanent: false,
+    },
+  }
+}
+
+export const getStaticPaths: GetStaticPaths = async () => {
+  return {
+    paths: [],
+    fallback: 'blocking',
+  }
+}

package/src/pages/account/index.tsx

@@ -1,32 +1,24 @@
-import storeConfig from 'discovery.config'
-
 import type { GetServerSideProps, NextPage } from 'next'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 const MyAccountRedirectPage: NextPage = () => {
   return null
 }
 
 export const getServerSideProps: GetServerSideProps = async ({ query }) => {
-  if (storeConfig.experimental.enableFaststoreMyAccount) {
-    return {
-      redirect: {
-        destination: '/account/profile',
-        permanent: false,
-      },
-    }
-  }
+  // TODO validate permissions here
 
-  const searchParams = new URLSearchParams()
+  const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
+    query,
+  })
 
-  for (const key in query) {
-    const value = query[key]
-    const values = Array.isArray(value) ? value : [value]
-    values.forEach((v) => v && searchParams.append(key, v))
+  if (!isFaststoreMyAccountEnabled) {
+    return { redirect }
   }
 
   return {
     redirect: {
-      destination: `${storeConfig.accountUrl}?${searchParams.toString()}`,
+      destination: '/account/profile',
       permanent: false,
     },
   }