@beinformed/ui 1.28.2 → 1.28.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/esm/redux/actions/Preferences.js +2 -2
- package/esm/redux/actions/Preferences.js.map +1 -1
- package/lib/react-server/__tests__/serverUtil.spec.js.flow +4 -4
- package/lib/redux/actions/Preferences.js +2 -2
- package/lib/redux/actions/Preferences.js.flow +3 -2
- package/lib/redux/actions/Preferences.js.map +1 -1
- package/package.json +1 -1
- package/src/react-server/__tests__/serverUtil.spec.js +4 -4
- package/src/redux/actions/Preferences.js +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [1.28.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.28.2...v1.28.3) (2023-02-21)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
- **pac4j:** set pac4j as default in preferences ([ceb714b](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/ceb714bedf3282cc0a2de25eb1d6cdc87f142168))
|
|
10
|
+
|
|
5
11
|
## [1.28.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.28.1...v1.28.2) (2023-02-20)
|
|
6
12
|
|
|
7
13
|
### Bug Fixes
|
|
@@ -90,10 +90,10 @@ export const setAllContentInDataSetting = state => {
|
|
|
90
90
|
export const setLoginPreferences = state => {
|
|
91
91
|
const loginSettings = {
|
|
92
92
|
[LOGIN_TYPE]: getServerPreferenceValue(LOGIN_TYPE, state?.preferences[LOGIN_TYPE]),
|
|
93
|
-
[LOGIN_PATH_SETTING]: getServerPreferenceValue(LOGIN_PATH_SETTING, state?.preferences[LOGIN_PATH_SETTING] ?? `/
|
|
93
|
+
[LOGIN_PATH_SETTING]: getServerPreferenceValue(LOGIN_PATH_SETTING, state?.preferences[LOGIN_PATH_SETTING] ?? `/callback?client_name=FormClient`),
|
|
94
94
|
[LOGIN_USERNAME_SETTING]: getServerPreferenceValue(LOGIN_USERNAME_SETTING, state?.preferences[LOGIN_USERNAME_SETTING] ?? "j_username"),
|
|
95
95
|
[LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(LOGIN_PASSWORD_SETTING, state?.preferences[LOGIN_PASSWORD_SETTING] ?? "j_password"),
|
|
96
|
-
[LOGOUT_PATH_SETTING]: getServerPreferenceValue(LOGOUT_PATH_SETTING, state?.preferences[LOGOUT_PATH_SETTING] ?? `/
|
|
96
|
+
[LOGOUT_PATH_SETTING]: getServerPreferenceValue(LOGOUT_PATH_SETTING, state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`)
|
|
97
97
|
};
|
|
98
98
|
setSettings(loginSettings);
|
|
99
99
|
return setPreferences(loginSettings);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Preferences.js","names":["isPlainObject","JsonParseException","setSetting","setSettings","ALL_CONTENT_IN_DATA_SETTING","LOGIN_TYPE","LOGIN_PASSWORD_SETTING","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGOUT_PATH_SETTING","getServerPreferenceValue","preferenceName","defaultValue","type","value","preferencesProvider","getPreferenceByName","split","val","setServerPreference","propertyName","setPreference","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","setLoginPreferences","loginSettings"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n PreferenceValue,\n ReduxState,\n SetPreferenceAction,\n SetPreferencesAction,\n} from \"../types\";\n\nimport {\n ALL_CONTENT_IN_DATA_SETTING,\n LOGIN_TYPE,\n LOGIN_PASSWORD_SETTING,\n LOGIN_PATH_SETTING,\n LOGIN_USERNAME_SETTING,\n LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n preferenceName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n) => {\n let value: PreferenceValue = null;\n if (typeof preferencesProvider !== \"undefined\") {\n value = preferencesProvider.getPreferenceByName(preferenceName);\n }\n\n if (value == null) {\n value = defaultValue;\n }\n\n if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n value = value.split(\",\").map((val) => val.trim());\n }\n\n return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n propertyName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n): SetPreferenceAction => {\n const value = getServerPreferenceValue(propertyName, defaultValue, type);\n return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n propertyName: string,\n propertyValue: PreferenceValue = null\n): SetPreferenceAction => ({\n type: \"SET_PREFERENCE\",\n payload: {\n [propertyName]: propertyValue,\n },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n type: \"SET_PREFERENCES\",\n payload: {\n ...preferences,\n },\n});\n\n/**\n */\nexport const setThemePreference = (\n configTheme: string\n): SetPreferenceAction => {\n let themeData;\n\n try {\n themeData = configTheme ? JSON.parse(configTheme) : null;\n } catch (error) {\n throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n }\n\n if (themeData && isPlainObject(themeData)) {\n setSettings(themeData.settings);\n }\n\n return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n state?: ReduxState\n): SetPreferenceAction => {\n let allContentInDataSetting: PreferenceValue = false;\n\n if (\n typeof preferencesProvider !== \"undefined\" &&\n typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n ) {\n allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n } else if (typeof state !== \"undefined\") {\n allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n }\n\n setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n state?: ReduxState\n): SetPreferencesAction => {\n const loginSettings = {\n [LOGIN_TYPE]: getServerPreferenceValue(\n LOGIN_TYPE,\n state?.preferences[LOGIN_TYPE]\n ),\n [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n LOGIN_PATH_SETTING,\n state?.preferences[LOGIN_PATH_SETTING]
|
|
1
|
+
{"version":3,"file":"Preferences.js","names":["isPlainObject","JsonParseException","setSetting","setSettings","ALL_CONTENT_IN_DATA_SETTING","LOGIN_TYPE","LOGIN_PASSWORD_SETTING","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGOUT_PATH_SETTING","getServerPreferenceValue","preferenceName","defaultValue","type","value","preferencesProvider","getPreferenceByName","split","val","setServerPreference","propertyName","setPreference","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","setLoginPreferences","loginSettings"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n PreferenceValue,\n ReduxState,\n SetPreferenceAction,\n SetPreferencesAction,\n} from \"../types\";\n\nimport {\n ALL_CONTENT_IN_DATA_SETTING,\n LOGIN_TYPE,\n LOGIN_PASSWORD_SETTING,\n LOGIN_PATH_SETTING,\n LOGIN_USERNAME_SETTING,\n LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n preferenceName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n) => {\n let value: PreferenceValue = null;\n if (typeof preferencesProvider !== \"undefined\") {\n value = preferencesProvider.getPreferenceByName(preferenceName);\n }\n\n if (value == null) {\n value = defaultValue;\n }\n\n if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n value = value.split(\",\").map((val) => val.trim());\n }\n\n return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n propertyName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n): SetPreferenceAction => {\n const value = getServerPreferenceValue(propertyName, defaultValue, type);\n return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n propertyName: string,\n propertyValue: PreferenceValue = null\n): SetPreferenceAction => ({\n type: \"SET_PREFERENCE\",\n payload: {\n [propertyName]: propertyValue,\n },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n type: \"SET_PREFERENCES\",\n payload: {\n ...preferences,\n },\n});\n\n/**\n */\nexport const setThemePreference = (\n configTheme: string\n): SetPreferenceAction => {\n let themeData;\n\n try {\n themeData = configTheme ? JSON.parse(configTheme) : null;\n } catch (error) {\n throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n }\n\n if (themeData && isPlainObject(themeData)) {\n setSettings(themeData.settings);\n }\n\n return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n state?: ReduxState\n): SetPreferenceAction => {\n let allContentInDataSetting: PreferenceValue = false;\n\n if (\n typeof preferencesProvider !== \"undefined\" &&\n typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n ) {\n allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n } else if (typeof state !== \"undefined\") {\n allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n }\n\n setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n state?: ReduxState\n): SetPreferencesAction => {\n const loginSettings = {\n [LOGIN_TYPE]: getServerPreferenceValue(\n LOGIN_TYPE,\n state?.preferences[LOGIN_TYPE]\n ),\n [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n LOGIN_PATH_SETTING,\n state?.preferences[LOGIN_PATH_SETTING] ??\n `/callback?client_name=FormClient`\n ),\n [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(\n LOGIN_USERNAME_SETTING,\n state?.preferences[LOGIN_USERNAME_SETTING] ?? \"j_username\"\n ),\n [LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(\n LOGIN_PASSWORD_SETTING,\n state?.preferences[LOGIN_PASSWORD_SETTING] ?? \"j_password\"\n ),\n [LOGOUT_PATH_SETTING]: getServerPreferenceValue(\n LOGOUT_PATH_SETTING,\n state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`\n ),\n };\n\n setSettings(loginSettings);\n return setPreferences(loginSettings);\n};\n"],"mappings":"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"}
|
|
@@ -112,8 +112,8 @@ describe("serverUtil", () => {
|
|
|
112
112
|
{
|
|
113
113
|
type: "SET_PREFERENCES",
|
|
114
114
|
payload: {
|
|
115
|
-
"FormClient.login_url": "/
|
|
116
|
-
"FormClient.logout_url": "/
|
|
115
|
+
"FormClient.login_url": "/callback?client_name=FormClient",
|
|
116
|
+
"FormClient.logout_url": "/logout",
|
|
117
117
|
"FormClient.password_field_name": "j_password",
|
|
118
118
|
"FormClient.username_field_name": "j_username",
|
|
119
119
|
"security.clients": null,
|
|
@@ -159,8 +159,8 @@ describe("serverUtil", () => {
|
|
|
159
159
|
{
|
|
160
160
|
type: "SET_PREFERENCES",
|
|
161
161
|
payload: {
|
|
162
|
-
"FormClient.login_url": "/
|
|
163
|
-
"FormClient.logout_url": "/
|
|
162
|
+
"FormClient.login_url": "/callback?client_name=FormClient",
|
|
163
|
+
"FormClient.logout_url": "/logout",
|
|
164
164
|
"FormClient.password_field_name": "j_password",
|
|
165
165
|
"FormClient.username_field_name": "j_username",
|
|
166
166
|
"security.clients": null,
|
|
@@ -101,10 +101,10 @@ exports.setAllContentInDataSetting = setAllContentInDataSetting;
|
|
|
101
101
|
const setLoginPreferences = state => {
|
|
102
102
|
const loginSettings = {
|
|
103
103
|
[_constants.LOGIN_TYPE]: getServerPreferenceValue(_constants.LOGIN_TYPE, state?.preferences[_constants.LOGIN_TYPE]),
|
|
104
|
-
[_constants.LOGIN_PATH_SETTING]: getServerPreferenceValue(_constants.LOGIN_PATH_SETTING, state?.preferences[_constants.LOGIN_PATH_SETTING] ?? `/
|
|
104
|
+
[_constants.LOGIN_PATH_SETTING]: getServerPreferenceValue(_constants.LOGIN_PATH_SETTING, state?.preferences[_constants.LOGIN_PATH_SETTING] ?? `/callback?client_name=FormClient`),
|
|
105
105
|
[_constants.LOGIN_USERNAME_SETTING]: getServerPreferenceValue(_constants.LOGIN_USERNAME_SETTING, state?.preferences[_constants.LOGIN_USERNAME_SETTING] ?? "j_username"),
|
|
106
106
|
[_constants.LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(_constants.LOGIN_PASSWORD_SETTING, state?.preferences[_constants.LOGIN_PASSWORD_SETTING] ?? "j_password"),
|
|
107
|
-
[_constants.LOGOUT_PATH_SETTING]: getServerPreferenceValue(_constants.LOGOUT_PATH_SETTING, state?.preferences[_constants.LOGOUT_PATH_SETTING] ?? `/
|
|
107
|
+
[_constants.LOGOUT_PATH_SETTING]: getServerPreferenceValue(_constants.LOGOUT_PATH_SETTING, state?.preferences[_constants.LOGOUT_PATH_SETTING] ?? `/logout`)
|
|
108
108
|
};
|
|
109
109
|
(0, _Settings.setSettings)(loginSettings);
|
|
110
110
|
return setPreferences(loginSettings);
|
|
@@ -129,7 +129,8 @@ export const setLoginPreferences = (
|
|
|
129
129
|
),
|
|
130
130
|
[LOGIN_PATH_SETTING]: getServerPreferenceValue(
|
|
131
131
|
LOGIN_PATH_SETTING,
|
|
132
|
-
state?.preferences[LOGIN_PATH_SETTING] ??
|
|
132
|
+
state?.preferences[LOGIN_PATH_SETTING] ??
|
|
133
|
+
`/callback?client_name=FormClient`
|
|
133
134
|
),
|
|
134
135
|
[LOGIN_USERNAME_SETTING]: getServerPreferenceValue(
|
|
135
136
|
LOGIN_USERNAME_SETTING,
|
|
@@ -141,7 +142,7 @@ export const setLoginPreferences = (
|
|
|
141
142
|
),
|
|
142
143
|
[LOGOUT_PATH_SETTING]: getServerPreferenceValue(
|
|
143
144
|
LOGOUT_PATH_SETTING,
|
|
144
|
-
state?.preferences[LOGOUT_PATH_SETTING] ?? `/
|
|
145
|
+
state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`
|
|
145
146
|
),
|
|
146
147
|
};
|
|
147
148
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Preferences.js","names":["getServerPreferenceValue","preferenceName","defaultValue","type","value","preferencesProvider","getPreferenceByName","split","val","setServerPreference","propertyName","setPreference","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","JsonParseException","isPlainObject","setSettings","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","ALL_CONTENT_IN_DATA_SETTING","setSetting","setLoginPreferences","loginSettings","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n PreferenceValue,\n ReduxState,\n SetPreferenceAction,\n SetPreferencesAction,\n} from \"../types\";\n\nimport {\n ALL_CONTENT_IN_DATA_SETTING,\n LOGIN_TYPE,\n LOGIN_PASSWORD_SETTING,\n LOGIN_PATH_SETTING,\n LOGIN_USERNAME_SETTING,\n LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n preferenceName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n) => {\n let value: PreferenceValue = null;\n if (typeof preferencesProvider !== \"undefined\") {\n value = preferencesProvider.getPreferenceByName(preferenceName);\n }\n\n if (value == null) {\n value = defaultValue;\n }\n\n if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n value = value.split(\",\").map((val) => val.trim());\n }\n\n return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n propertyName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n): SetPreferenceAction => {\n const value = getServerPreferenceValue(propertyName, defaultValue, type);\n return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n propertyName: string,\n propertyValue: PreferenceValue = null\n): SetPreferenceAction => ({\n type: \"SET_PREFERENCE\",\n payload: {\n [propertyName]: propertyValue,\n },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n type: \"SET_PREFERENCES\",\n payload: {\n ...preferences,\n },\n});\n\n/**\n */\nexport const setThemePreference = (\n configTheme: string\n): SetPreferenceAction => {\n let themeData;\n\n try {\n themeData = configTheme ? JSON.parse(configTheme) : null;\n } catch (error) {\n throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n }\n\n if (themeData && isPlainObject(themeData)) {\n setSettings(themeData.settings);\n }\n\n return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n state?: ReduxState\n): SetPreferenceAction => {\n let allContentInDataSetting: PreferenceValue = false;\n\n if (\n typeof preferencesProvider !== \"undefined\" &&\n typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n ) {\n allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n } else if (typeof state !== \"undefined\") {\n allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n }\n\n setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n state?: ReduxState\n): SetPreferencesAction => {\n const loginSettings = {\n [LOGIN_TYPE]: getServerPreferenceValue(\n LOGIN_TYPE,\n state?.preferences[LOGIN_TYPE]\n ),\n [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n LOGIN_PATH_SETTING,\n state?.preferences[LOGIN_PATH_SETTING]
|
|
1
|
+
{"version":3,"file":"Preferences.js","names":["getServerPreferenceValue","preferenceName","defaultValue","type","value","preferencesProvider","getPreferenceByName","split","val","setServerPreference","propertyName","setPreference","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","JsonParseException","isPlainObject","setSettings","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","ALL_CONTENT_IN_DATA_SETTING","setSetting","setLoginPreferences","loginSettings","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n PreferenceValue,\n ReduxState,\n SetPreferenceAction,\n SetPreferencesAction,\n} from \"../types\";\n\nimport {\n ALL_CONTENT_IN_DATA_SETTING,\n LOGIN_TYPE,\n LOGIN_PASSWORD_SETTING,\n LOGIN_PATH_SETTING,\n LOGIN_USERNAME_SETTING,\n LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n preferenceName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n) => {\n let value: PreferenceValue = null;\n if (typeof preferencesProvider !== \"undefined\") {\n value = preferencesProvider.getPreferenceByName(preferenceName);\n }\n\n if (value == null) {\n value = defaultValue;\n }\n\n if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n value = value.split(\",\").map((val) => val.trim());\n }\n\n return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n propertyName: string,\n defaultValue: PreferenceValue = null,\n type?: string\n): SetPreferenceAction => {\n const value = getServerPreferenceValue(propertyName, defaultValue, type);\n return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n propertyName: string,\n propertyValue: PreferenceValue = null\n): SetPreferenceAction => ({\n type: \"SET_PREFERENCE\",\n payload: {\n [propertyName]: propertyValue,\n },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n type: \"SET_PREFERENCES\",\n payload: {\n ...preferences,\n },\n});\n\n/**\n */\nexport const setThemePreference = (\n configTheme: string\n): SetPreferenceAction => {\n let themeData;\n\n try {\n themeData = configTheme ? JSON.parse(configTheme) : null;\n } catch (error) {\n throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n }\n\n if (themeData && isPlainObject(themeData)) {\n setSettings(themeData.settings);\n }\n\n return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n state?: ReduxState\n): SetPreferenceAction => {\n let allContentInDataSetting: PreferenceValue = false;\n\n if (\n typeof preferencesProvider !== \"undefined\" &&\n typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n ) {\n allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n } else if (typeof state !== \"undefined\") {\n allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n }\n\n setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n state?: ReduxState\n): SetPreferencesAction => {\n const loginSettings = {\n [LOGIN_TYPE]: getServerPreferenceValue(\n LOGIN_TYPE,\n state?.preferences[LOGIN_TYPE]\n ),\n [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n LOGIN_PATH_SETTING,\n state?.preferences[LOGIN_PATH_SETTING] ??\n `/callback?client_name=FormClient`\n ),\n [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(\n LOGIN_USERNAME_SETTING,\n state?.preferences[LOGIN_USERNAME_SETTING] ?? \"j_username\"\n ),\n [LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(\n LOGIN_PASSWORD_SETTING,\n state?.preferences[LOGIN_PASSWORD_SETTING] ?? \"j_password\"\n ),\n [LOGOUT_PATH_SETTING]: getServerPreferenceValue(\n LOGOUT_PATH_SETTING,\n state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`\n ),\n };\n\n setSettings(loginSettings);\n return setPreferences(loginSettings);\n};\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -112,8 +112,8 @@ describe("serverUtil", () => {
|
|
|
112
112
|
{
|
|
113
113
|
type: "SET_PREFERENCES",
|
|
114
114
|
payload: {
|
|
115
|
-
"FormClient.login_url": "/
|
|
116
|
-
"FormClient.logout_url": "/
|
|
115
|
+
"FormClient.login_url": "/callback?client_name=FormClient",
|
|
116
|
+
"FormClient.logout_url": "/logout",
|
|
117
117
|
"FormClient.password_field_name": "j_password",
|
|
118
118
|
"FormClient.username_field_name": "j_username",
|
|
119
119
|
"security.clients": null,
|
|
@@ -159,8 +159,8 @@ describe("serverUtil", () => {
|
|
|
159
159
|
{
|
|
160
160
|
type: "SET_PREFERENCES",
|
|
161
161
|
payload: {
|
|
162
|
-
"FormClient.login_url": "/
|
|
163
|
-
"FormClient.logout_url": "/
|
|
162
|
+
"FormClient.login_url": "/callback?client_name=FormClient",
|
|
163
|
+
"FormClient.logout_url": "/logout",
|
|
164
164
|
"FormClient.password_field_name": "j_password",
|
|
165
165
|
"FormClient.username_field_name": "j_username",
|
|
166
166
|
"security.clients": null,
|
|
@@ -129,7 +129,8 @@ export const setLoginPreferences = (
|
|
|
129
129
|
),
|
|
130
130
|
[LOGIN_PATH_SETTING]: getServerPreferenceValue(
|
|
131
131
|
LOGIN_PATH_SETTING,
|
|
132
|
-
state?.preferences[LOGIN_PATH_SETTING] ??
|
|
132
|
+
state?.preferences[LOGIN_PATH_SETTING] ??
|
|
133
|
+
`/callback?client_name=FormClient`
|
|
133
134
|
),
|
|
134
135
|
[LOGIN_USERNAME_SETTING]: getServerPreferenceValue(
|
|
135
136
|
LOGIN_USERNAME_SETTING,
|
|
@@ -141,7 +142,7 @@ export const setLoginPreferences = (
|
|
|
141
142
|
),
|
|
142
143
|
[LOGOUT_PATH_SETTING]: getServerPreferenceValue(
|
|
143
144
|
LOGOUT_PATH_SETTING,
|
|
144
|
-
state?.preferences[LOGOUT_PATH_SETTING] ?? `/
|
|
145
|
+
state?.preferences[LOGOUT_PATH_SETTING] ?? `/logout`
|
|
145
146
|
),
|
|
146
147
|
};
|
|
147
148
|
|