diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 962dc291e..a6abcb27c 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -22,7 +22,7 @@ type TypeHeader = 'static' | 'fixed'; type Props = { headerType?: TypeHeader; onMenuButtonClick: () => void; - logoSrc?: string; + logoSrc?: string | null; searchBarProps: SearchBarProps; searchEnabled: boolean; searchActive: boolean; diff --git a/src/services/config.service.ts b/src/services/config.service.ts index 62bb773f3..648bbefeb 100644 --- a/src/services/config.service.ts +++ b/src/services/config.service.ts @@ -81,7 +81,7 @@ const configSchema: SchemaOf = object({ analyticsToken: string().nullable(), adSchedule: string().nullable(), assets: object({ - banner: string().notRequired(), + banner: string().notRequired().nullable(), }).notRequired(), content: array().of(contentSchema), menu: array().of(menuSchema), diff --git a/src/utils/configLoad.ts b/src/utils/configLoad.ts index 383d456fb..8691c2627 100644 --- a/src/utils/configLoad.ts +++ b/src/utils/configLoad.ts @@ -13,7 +13,9 @@ const defaultConfig: Config = { siteName: '', description: '', player: '', - assets: {}, + assets: { + banner: '/images/logo.png', + }, content: [], menu: [], integrations: { @@ -90,6 +92,11 @@ export const loadAndValidateConfig = async ( .then(async (configValidated) => { const configWithDefaults = merge({}, defaultConfig, configValidated); + // make sure the banner always defaults to the JWP banner when not defined in the config + if (!configWithDefaults.assets.banner) { + configWithDefaults.assets.banner = defaultConfig.assets.banner; + } + const accessModel = calculateAccessModel(configWithDefaults); useConfigStore.setState({ diff --git a/types/Config.d.ts b/types/Config.d.ts index cf7127a7d..03f82adfb 100644 --- a/types/Config.d.ts +++ b/types/Config.d.ts @@ -12,7 +12,7 @@ export type Config = { integrations: { cleeng?: Cleeng; }; - assets: { banner?: string }; + assets: { banner?: string | null }; content: Content[]; menu: Menu[]; styling: Styling;