Skip to content

Commit

Permalink
Adds config override to fix obsolete theme:version config value of v8…
Browse files Browse the repository at this point in the history
… (beta) rendering issue (#3045) (#3161)

Signed-off-by: Manasvini B Suryanarayana <manasvis@amazon.com>
(cherry picked from commit 7789295)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent cec8d1d commit e39d899
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
23 changes: 23 additions & 0 deletions src/core/server/ui_settings/ui_settings_client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,29 @@ describe('ui settings', () => {
expect(await uiSettings.get('dateFormat')).toBe('foo');
});

it('returns the overridden value for key theme:version', async () => {
const opensearchDocSource = { 'theme:version': 'v8 (beta)' };
const overrides = { 'theme:version': 'v7' };
const { uiSettings } = setup({ opensearchDocSource, overrides });

expect(await uiSettings.get('theme:version')).toBe('v7');
});

it('returns the overridden value for key theme:version when doc source is empty', async () => {
const opensearchDocSource = {};
const overrides = { 'theme:version': 'v7' };
const { uiSettings } = setup({ opensearchDocSource, overrides });

expect(await uiSettings.get('theme:version')).toBe('v7');
});

it('rewrites the key theme:version value without override', async () => {
const opensearchDocSource = { 'theme:version': 'v8 (beta)' };
const { uiSettings } = setup({ opensearchDocSource });

expect(await uiSettings.get('theme:version')).toBe('v8 (beta)');
});

it('returns the default value for an override with value null', async () => {
const opensearchDocSource = { dateFormat: 'YYYY-MM-DD' };
const overrides = { dateFormat: null };
Expand Down
7 changes: 6 additions & 1 deletion src/core/server/ui_settings/ui_settings_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ const deprecations: ConfigDeprecationProvider = ({ unused, renameFromRoot }) =>
];

const configSchema = schema.object({
overrides: schema.object({}, { unknowns: 'allow' }),
overrides: schema.object(
{
'theme:version': schema.string({ defaultValue: 'v7' }),
},
{ unknowns: 'allow' }
),
});

export type UiSettingsConfigType = TypeOf<typeof configSchema>;
Expand Down

0 comments on commit e39d899

Please sign in to comment.