Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { provideConfig } from '@spartacus/core';
import { defaultB2bOccConfig } from '@spartacus/setup';
import { environment } from '../../environments/environment';

let baseSite = ['powertools-spa', 'powertools-standalone'];
const baseSite = ['powertools-spa', 'powertools-standalone'];

if (environment.epdVisualization) {
baseSite.unshift('powertools-epdvisualization-spa');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ registerLocaleData(localeZh);
* In customers' applications, either B2B or B2C configuration is used, which is decided
* at the installation time of Spartacus (i.e. when running `ng add @spartacus/schematics`).
*/
let spartacusChannelSpecificConfigurationProviders = environment.b2b
const spartacusChannelSpecificConfigurationProviders = environment.b2b
? spartacusB2bConfigurationProviders
: spartacusB2cConfigurationProviders;

Expand Down
47 changes: 28 additions & 19 deletions projects/storefrontlib/recipes/config/layout-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,8 @@ export const layoutConfig: LayoutConfig = {
},
};

/**
* Factory for layout configuration.
*/
export function layoutConfigFactory(): LayoutConfig {
const config: LayoutConfig = JSON.parse(JSON.stringify(layoutConfig));
const featureToggles = inject(FeatureToggles);

function applyUnifiedHeaderSlots(config: LayoutConfig): void {
if (
featureToggles.unifiedDefaultHeaderSlotsAcrossBreakpoints &&
config.layoutSlots &&
config.layoutSlots.header &&
'slots' in config.layoutSlots.header
Expand All @@ -162,20 +155,36 @@ export function layoutConfigFactory(): LayoutConfig {
'NavigationBar',
];
}
}

if (featureToggles.defaultLayoutConfigWithoutPageFold) {
const homepageConfig =
(config?.layoutSlots?.LandingPage2Template as SlotConfig) ?? {};
delete homepageConfig.pageFold;
function applyWithoutPageFold(config: LayoutConfig): void {
const homepageConfig =
(config?.layoutSlots?.LandingPage2Template as SlotConfig) ?? {};
delete homepageConfig.pageFold;

const categoryPageConfig =
(config?.layoutSlots?.CategoryPageTemplate as SlotConfig) ?? {};
delete categoryPageConfig.pageFold;
const categoryPageConfig =
(config?.layoutSlots?.CategoryPageTemplate as SlotConfig) ?? {};
delete categoryPageConfig.pageFold;

const productDetailsPageConfig =
(config?.layoutSlots?.ProductDetailsPageTemplate as SlotConfig) ?? {};
delete productDetailsPageConfig.pageFold;
delete ((productDetailsPageConfig as SlotGroup).lg ?? {}).pageFold;
}

const productDetailsPageConfig =
(config?.layoutSlots?.ProductDetailsPageTemplate as SlotConfig) ?? {};
delete productDetailsPageConfig.pageFold;
delete ((productDetailsPageConfig as SlotGroup).lg ?? {}).pageFold;
/**
* Factory for layout configuration.
*/
export function layoutConfigFactory(): LayoutConfig {
const config: LayoutConfig = JSON.parse(JSON.stringify(layoutConfig));
const featureToggles = inject(FeatureToggles);

if (featureToggles.unifiedDefaultHeaderSlotsAcrossBreakpoints) {
applyUnifiedHeaderSlots(config);
}

if (featureToggles.defaultLayoutConfigWithoutPageFold) {
applyWithoutPageFold(config);
}

return config;
Expand Down
Loading