@faststore/core 3.67.0 → 3.68.1

package/src/pages/account/403.tsx

@@ -8,22 +8,23 @@ import {
 } from 'src/components/cms/GlobalSections'
 
 import { LinkButton } from '@faststore/ui'
+import { gql } from '@generated/gql'
+import type {
+  ServerAccountPageQueryQuery,
+  ServerAccountPageQueryQueryVariables,
+} from '@generated/graphql'
 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 { validateUser } from 'src/sdk/account/validateUser'
+import PageProvider from 'src/sdk/overrides/PageProvider'
+import { execute } from 'src/server'
 import { type PageContentType, getPage } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
-import { gql } from '@generated/gql'
-import { execute } from 'src/server'
-import type {
-  ServerAccountPageQueryQuery,
-  ServerAccountPageQueryQueryVariables,
-} from '@generated/graphql'
-import { validateUser } from 'src/sdk/account/validateUser'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -37,27 +38,29 @@ type Props = {
   accountName: ServerAccountPageQueryQuery['accountName']
 }
 
-function Page({ globalSections, accountName }: Props) {
+function Page({ globalSections: globalSectionsProp, accountName }: Props) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
-
-      <MyAccountLayout accountName={accountName}>
-        <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>
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
+
+        <MyAccountLayout accountName={accountName}>
+          <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>
+    </PageProvider>
   )
 }
 

package/src/pages/account/404.tsx

@@ -7,6 +7,11 @@ import {
   getGlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
 
+import { gql } from '@generated/gql'
+import type {
+  ServerAccountPageQueryQuery,
+  ServerAccountPageQueryQueryVariables,
+} from '@generated/graphql'
 import { MyAccountLayout } from 'src/components/account'
 import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
 import RenderSections, {
@@ -15,16 +20,12 @@ import 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 { validateUser } from 'src/sdk/account/validateUser'
+import PageProvider from 'src/sdk/overrides/PageProvider'
+import { execute } from 'src/server'
 import { type PageContentType, getPage } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
-import { gql } from '@generated/gql'
-import { execute } from 'src/server'
-import type {
-  ServerAccountPageQueryQuery,
-  ServerAccountPageQueryQueryVariables,
-} from '@generated/graphql'
-import { validateUser } from 'src/sdk/account/validateUser'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -40,20 +41,26 @@ type Props = {
   accountName: ServerAccountPageQueryQuery['accountName']
 }
 
-function Page({ page: { sections }, globalSections, accountName }: Props) {
+function Page({
+  page: { sections },
+  globalSections: globalSectionsProp,
+  accountName,
+}: Props) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
-
-      <MyAccountLayout accountName={accountName}>
-        {sections && sections.length > 0 && (
-          <RenderSectionsBase sections={sections} components={COMPONENTS} />
-        )}
-      </MyAccountLayout>
-    </RenderSections>
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
+
+        <MyAccountLayout accountName={accountName}>
+          {sections && sections.length > 0 && (
+            <RenderSectionsBase sections={sections} components={COMPONENTS} />
+          )}
+        </MyAccountLayout>
+      </RenderSections>
+    </PageProvider>
   )
 }
 

package/src/pages/account/orders/[id].tsx

@@ -11,19 +11,20 @@ import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
 import { validateUser } from 'src/sdk/account/validateUser'
 
 import { gql } from '@generated'
+import type {
+  ServerOrderDetailsQueryQuery,
+  ServerOrderDetailsQueryQueryVariables,
+} from '@generated/graphql'
 import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
 import { default as AfterSection } from 'src/customizations/src/myAccount/extensions/orders/[id]/after'
 import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/orders/[id]/before'
 import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
+import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import { extractStatusFromError } from 'src/utils/utilities'
 import storeConfig from '../../../../discovery.config'
-import type {
-  ServerOrderDetailsQueryQuery,
-  ServerOrderDetailsQueryQueryVariables,
-} from '@generated/graphql'
 
 const COMPONENTS: Record<string, ComponentType<any>> = {
   ...GLOBAL_COMPONENTS,
@@ -35,27 +36,29 @@ type OrderDetailsPageProps = {
 } & MyAccountProps
 
 export default function OrderDetailsPage({
-  globalSections,
+  globalSections: globalSectionsProp,
   order,
   accountName,
   isRepresentative,
 }: OrderDetailsPageProps) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
 
-      <MyAccountLayout
-        isRepresentative={isRepresentative}
-        accountName={accountName}
-      >
-        <BeforeSection />
-        <MyAccountOrderDetails order={order} />
-        <AfterSection />
-      </MyAccountLayout>
-    </RenderSections>
+        <MyAccountLayout
+          isRepresentative={isRepresentative}
+          accountName={accountName}
+        >
+          <BeforeSection />
+          <MyAccountOrderDetails order={order} />
+          <AfterSection />
+        </MyAccountLayout>
+      </RenderSections>
+    </PageProvider>
   )
 }
 

package/src/pages/account/orders/index.tsx

@@ -24,9 +24,10 @@ import { groupOrderStatusByLabel } from 'src/utils/userOrderStatus'
 
 import { MyAccountListOrders } from 'src/components/account/orders/MyAccountListOrders'
 import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
-import storeConfig from '../../../../discovery.config'
 import { validateUser } from 'src/sdk/account/validateUser'
+import PageProvider from 'src/sdk/overrides/PageProvider'
 import { extractStatusFromError } from 'src/utils/utilities'
+import storeConfig from '../../../../discovery.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -49,7 +50,7 @@ type ListOrdersPageProps = {
 } & MyAccountProps
 
 export default function ListOrdersPage({
-  globalSections,
+  globalSections: globalSectionsProp,
   accountName,
   listOrders,
   total,
@@ -57,27 +58,29 @@ export default function ListOrdersPage({
   filters,
   isRepresentative,
 }: ListOrdersPageProps) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
-
-      <MyAccountLayout
-        isRepresentative={isRepresentative}
-        accountName={accountName}
-      >
-        <BeforeSection />
-        <MyAccountListOrders
-          listOrders={listOrders}
-          filters={filters}
-          perPage={perPage}
-          total={total}
-        />
-        <AfterSection />
-      </MyAccountLayout>
-    </RenderSections>
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
+
+        <MyAccountLayout
+          isRepresentative={isRepresentative}
+          accountName={accountName}
+        >
+          <BeforeSection />
+          <MyAccountListOrders
+            listOrders={listOrders}
+            filters={filters}
+            perPage={perPage}
+            total={total}
+          />
+          <AfterSection />
+        </MyAccountLayout>
+      </RenderSections>
+    </PageProvider>
   )
 }
 

package/src/pages/account/profile.tsx

@@ -6,26 +6,28 @@ import type { GetServerSideProps } from 'next'
 import { NextSeo } from 'next-seo'
 import type { ComponentType } from 'react'
 import { MyAccountLayout } from 'src/components/account'
+import { ProfileSection } from 'src/components/account/profile'
 import RenderSections from 'src/components/cms/RenderSections'
 import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
-import { ProfileSection } from 'src/components/account/profile'
 
 import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
 
+import { gql } from '@generated/gql'
+import type {
+  ServerProfileQueryQuery,
+  ServerProfileQueryQueryVariables,
+} from '@generated/graphql'
 import { default as AfterSection } from 'src/customizations/src/myAccount/extensions/profile/after'
 import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/profile/before'
 import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
 import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
+import { validateUser } from 'src/sdk/account/validateUser'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
-import { gql } from '@generated/gql'
+
+import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
-import type {
-  ServerProfileQueryQuery,
-  ServerProfileQueryQueryVariables,
-} from '@generated/graphql'
-import { validateUser } from 'src/sdk/account/validateUser'
 import storeConfig from '../../../discovery.config'
 
 /* A list of components that can be used in the CMS. */
@@ -43,27 +45,29 @@ type ProfilePagePros = {
 } & MyAccountProps
 
 export default function Profile({
-  globalSections,
+  globalSections: globalSectionsProp,
   accountName,
   accountProfile,
   isRepresentative,
 }: ProfilePagePros) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
-
-      <MyAccountLayout
-        isRepresentative={isRepresentative}
-        accountName={accountName}
-      >
-        <BeforeSection />
-        <ProfileSection profile={accountProfile} />
-        <AfterSection />
-      </MyAccountLayout>
-    </RenderSections>
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
+
+        <MyAccountLayout
+          isRepresentative={isRepresentative}
+          accountName={accountName}
+        >
+          <BeforeSection />
+          <ProfileSection profile={accountProfile} />
+          <AfterSection />
+        </MyAccountLayout>
+      </RenderSections>
+    </PageProvider>
   )
 }
 

package/src/pages/account/security.tsx

@@ -13,21 +13,24 @@ import type { GetServerSideProps } from 'next'
 
 import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
 
+import { gql } from '@generated/gql'
+import type {
+  ServerSecurityQueryQuery,
+  ServerSecurityQueryQueryVariables,
+} from '@generated/graphql'
 import { default as AfterSection } from 'src/customizations/src/myAccount/extensions/security/after'
 import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/security/before'
 import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
 import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
+import { execute } from 'src/server'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
-import { execute } from 'src/server'
-import { gql } from '@generated/gql'
-import type {
-  ServerSecurityQueryQuery,
-  ServerSecurityQueryQueryVariables,
-} from '@generated/graphql'
+
 import { validateUser } from 'src/sdk/account/validateUser'
-import storeConfig from '../../../discovery.config'
+import PageProvider from 'src/sdk/overrides/PageProvider'
+
 import { SecuritySection } from 'src/components/account/security'
+import storeConfig from '../../../discovery.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -40,26 +43,28 @@ type SecurityPageProps = {
 } & MyAccountProps
 
 export default function Page({
-  globalSections,
+  globalSections: globalSectionsProp,
   accountName,
   isRepresentative,
 }: SecurityPageProps) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
-
-      <MyAccountLayout
-        isRepresentative={isRepresentative}
-        accountName={accountName}
-      >
-        <BeforeSection />
-        <SecuritySection />
-        <AfterSection />
-      </MyAccountLayout>
-    </RenderSections>
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
+
+        <MyAccountLayout
+          isRepresentative={isRepresentative}
+          accountName={accountName}
+        >
+          <BeforeSection />
+          <SecuritySection />
+          <AfterSection />
+        </MyAccountLayout>
+      </RenderSections>
+    </PageProvider>
   )
 }
 

package/src/pages/account/user-details.tsx

@@ -20,11 +20,12 @@ import { default as AfterSection } from 'src/customizations/src/myAccount/extens
 import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/user-details/before'
 import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
 import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
+import { validateUser } from 'src/sdk/account/validateUser'
+import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import storeConfig from '../../../discovery.config'
-import { validateUser } from 'src/sdk/account/validateUser'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -42,27 +43,29 @@ type UserDetailsPagePros = {
 } & MyAccountProps
 
 export default function Page({
-  globalSections,
+  globalSections: globalSectionsProp,
   accountName,
   isRepresentative,
   userDetails,
 }: UserDetailsPagePros) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
-
-      <MyAccountLayout
-        isRepresentative={isRepresentative}
-        accountName={accountName}
-      >
-        <BeforeSection />
-        <MyAccountUserDetails userDetails={userDetails} />
-        <AfterSection />
-      </MyAccountLayout>
-    </RenderSections>
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
+
+        <MyAccountLayout
+          isRepresentative={isRepresentative}
+          accountName={accountName}
+        >
+          <BeforeSection />
+          <MyAccountUserDetails userDetails={userDetails} />
+          <AfterSection />
+        </MyAccountLayout>
+      </RenderSections>
+    </PageProvider>
   )
 }
 

package/src/pages/checkout.tsx

@@ -12,6 +12,7 @@ import {
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 
 import RenderSections from 'src/components/cms/RenderSections'
+import PageProvider from 'src/sdk/overrides/PageProvider'
 import { injectGlobalSections } from 'src/server/cms/global'
 import storeConfig from '../../discovery.config'
 
@@ -25,20 +26,22 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   ...CUSTOM_COMPONENTS,
 }
 
-function Page({ globalSections }: Props) {
+function Page({ globalSections: globalSectionsProp }: Props) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   useEffect(() => {
     window.location.href = storeConfig.checkoutUrl
   }, [])
 
   return (
-    <RenderSections
-      globalSections={globalSections.sections}
-      components={COMPONENTS}
-    >
-      <NextSeo noindex nofollow />
+    <PageProvider context={{ globalSettings }}>
+      <RenderSections globalSections={globalSections} components={COMPONENTS}>
+        <NextSeo noindex nofollow />
 
-      <div>loading...</div>
-    </RenderSections>
+        <div>loading...</div>
+      </RenderSections>
+    </PageProvider>
   )
 }
 

package/src/pages/index.tsx

@@ -11,10 +11,10 @@ import {
 import COMPONENTS from 'src/components/cms/home/Components'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import { injectGlobalSections } from 'src/server/cms/global'
-import { getDynamicContent } from 'src/utils/dynamicContent'
-import storeConfig from '../../discovery.config'
 import { contentService } from 'src/server/content/service'
 import type { PreviewData } from 'src/server/content/types'
+import { getDynamicContent } from 'src/utils/dynamicContent'
+import storeConfig from '../../discovery.config'
 
 type Props = {
   page: PageContentType
@@ -24,11 +24,14 @@ type Props = {
 
 function Page({
   page: { sections, settings },
-  globalSections,
+  globalSections: globalSectionsProp,
   serverData,
 }: Props) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
   const context = {
     data: serverData,
+    globalSettings,
   }
 
   const publisherId = settings?.seo?.publisherId ?? storeConfig.seo.publisherId
@@ -134,7 +137,7 @@ function Page({
       */}
       <PageProvider context={context}>
         <RenderSections
-          globalSections={globalSections.sections}
+          globalSections={globalSections}
           sections={sections}
           components={COMPONENTS}
         />

package/src/pages/login.tsx

@@ -12,11 +12,12 @@ 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 PageProvider from 'src/sdk/overrides/PageProvider'
 import type { PageContentType } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
-import storeConfig from '../../discovery.config'
 import { contentService } from 'src/server/content/service'
 import type { PreviewData } from 'src/server/content/types'
+import storeConfig from '../../discovery.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -31,7 +32,13 @@ type Props = {
   globalSections: GlobalSectionsData
 }
 
-function Page({ page: { sections }, globalSections }: Props) {
+function Page({
+  page: { sections },
+  globalSections: globalSectionsProp,
+}: Props) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
+
   useEffect(() => {
     const loginUrl = new URL(storeConfig.loginUrl)
     const incomingParams = new URLSearchParams(window.location.search)
@@ -57,11 +64,13 @@ function Page({ page: { sections }, globalSections }: Props) {
         If needed, wrap your component in a <Section /> component
         (not the HTML tag) before rendering it here.
       */}
-      <RenderSections
-        sections={sections}
-        globalSections={globalSections.sections}
-        components={COMPONENTS}
-      />
+      <PageProvider context={{ globalSettings }}>
+        <RenderSections
+          sections={sections}
+          globalSections={globalSections}
+          components={COMPONENTS}
+        />
+      </PageProvider>
     </>
   )
 }

package/src/pages/s.tsx

@@ -97,9 +97,11 @@ function generateSEOData(storeConfig: StoreConfig, searchTerm?: string) {
 
 function Page({
   page: searchContentType,
-  globalSections,
+  globalSections: globalSectionsProp,
   searchTerm,
 }: SearchPageProps) {
+  const { sections: globalSections, settings: globalSettings } =
+    globalSectionsProp ?? {}
   const { settings } = searchContentType
   const applySearchState = useApplySearchState()
   const searchParams = useSearchParams({
@@ -146,7 +148,8 @@ function Page({
           title: seoData.title,
           searchTerm: searchTerm ?? searchParams.term ?? undefined,
         }}
-        globalSections={globalSections.sections}
+        globalSections={globalSections}
+        globalSettings={globalSettings}
       />
     </SearchProvider>
   )