diff --git a/packages/nicolium/src/actions/admin.ts b/packages/nicolium/src/actions/admin.ts index 7032bb36a..44861a11f 100644 --- a/packages/nicolium/src/actions/admin.ts +++ b/packages/nicolium/src/actions/admin.ts @@ -49,7 +49,7 @@ const updateFrontendConfig = (data: Record) => (dispatch: AppDispat key: ':frontend_configurations', value: [ { - tuple: [':pl_fe', data], + tuple: [':nicolium', data], }, ], }, diff --git a/packages/nicolium/src/actions/frontend-config.ts b/packages/nicolium/src/actions/frontend-config.ts index 29d2bd449..e1ce3794c 100644 --- a/packages/nicolium/src/actions/frontend-config.ts +++ b/packages/nicolium/src/actions/frontend-config.ts @@ -33,10 +33,14 @@ const fetchFrontendConfig = if (features.frontendConfigurations) { return dispatch(fetchFrontendConfigurations()).then((data) => { - const key = 'pl_fe'; - if (data[key]) { - dispatch(importFrontendConfig(data[key], host)); - return data[key]; + const legacyKey = 'pl_fe'; + const key = 'nicolium'; + + const foundData = data[key] || data[legacyKey]; + + if (foundData) { + dispatch(importFrontendConfig(foundData, host)); + return foundData; } else { return dispatch(fetchFrontendConfigJson(host)); } diff --git a/packages/nicolium/src/reducers/frontend-config.ts b/packages/nicolium/src/reducers/frontend-config.ts index d0dd466d7..0b36dce24 100644 --- a/packages/nicolium/src/reducers/frontend-config.ts +++ b/packages/nicolium/src/reducers/frontend-config.ts @@ -35,8 +35,8 @@ const preloadImport = (state: Record, action: Record) const feData = action.data[path]; if (feData) { - const plfe = feData.pl_fe; - return plfe ? { ...fallbackState, ...plfe } : fallbackState; + const nicoliumConfig = feData.nicolium || feData.pl_fe; + return nicoliumConfig ? { ...fallbackState, ...nicoliumConfig } : fallbackState; } else { return state; }