@beinformed/ui 1.20.0 → 1.20.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 +22 -2
- package/esm/constants/Constants.js +0 -15
- package/esm/constants/Constants.js.map +1 -1
- package/esm/constants/Settings.js +6 -0
- package/esm/constants/Settings.js.map +1 -1
- package/esm/hooks/useAuthentication.js +40 -5
- package/esm/hooks/useAuthentication.js.map +1 -1
- package/esm/hooks/useContent.js +2 -6
- package/esm/hooks/useContent.js.map +1 -1
- package/esm/hooks/useI18n.js +10 -11
- package/esm/hooks/useI18n.js.map +1 -1
- package/esm/hooks/useModularUI.js +2 -3
- package/esm/hooks/useModularUI.js.map +1 -1
- package/esm/hooks/useModularUIRequest.js +2 -5
- package/esm/hooks/useModularUIRequest.js.map +1 -1
- package/esm/i18n/Message.js.map +1 -1
- package/esm/i18n/withMessage.js +2 -10
- package/esm/i18n/withMessage.js.map +1 -1
- package/esm/models/application/ApplicationModel.js +6 -1
- package/esm/models/application/ApplicationModel.js.map +1 -1
- package/esm/redux/_modularui/connector.js +3 -4
- package/esm/redux/_modularui/connector.js.map +1 -1
- package/esm/redux/_modularui/selectors.js +22 -5
- package/esm/redux/_modularui/selectors.js.map +1 -1
- package/esm/redux/_modularui/withModularUI.js +2 -10
- package/esm/redux/_modularui/withModularUI.js.map +1 -1
- package/esm/redux/actions/Application.js +26 -7
- package/esm/redux/actions/Application.js.map +1 -1
- package/esm/redux/actions/Authorization.js +2 -1
- package/esm/redux/actions/Authorization.js.map +1 -1
- package/esm/redux/actions/Error.js +3 -1
- package/esm/redux/actions/Error.js.map +1 -1
- package/esm/redux/selectors/i18n.js +16 -0
- package/esm/redux/selectors/i18n.js.map +1 -0
- package/esm/utils/datetime/DateTimeUtil.js +3 -1
- package/esm/utils/datetime/DateTimeUtil.js.map +1 -1
- package/lib/constants/Constants.js +2 -20
- package/lib/constants/Constants.js.flow +0 -15
- package/lib/constants/Constants.js.map +1 -1
- package/lib/constants/Settings.js +6 -0
- package/lib/constants/Settings.js.flow +9 -0
- package/lib/constants/Settings.js.map +1 -1
- package/lib/hooks/__tests__/useAuthentication.spec.js.flow +0 -8
- package/lib/hooks/useAuthentication.js +47 -5
- package/lib/hooks/useAuthentication.js.flow +40 -3
- package/lib/hooks/useAuthentication.js.map +1 -1
- package/lib/hooks/useContent.js +3 -7
- package/lib/hooks/useContent.js.flow +2 -2
- package/lib/hooks/useContent.js.map +1 -1
- package/lib/hooks/useI18n.js +12 -9
- package/lib/hooks/useI18n.js.flow +10 -11
- package/lib/hooks/useI18n.js.map +1 -1
- package/lib/hooks/useModularUI.js +3 -3
- package/lib/hooks/useModularUI.js.flow +3 -2
- package/lib/hooks/useModularUI.js.map +1 -1
- package/lib/hooks/useModularUIRequest.js +2 -4
- package/lib/hooks/useModularUIRequest.js.flow +8 -10
- package/lib/hooks/useModularUIRequest.js.map +1 -1
- package/lib/i18n/Message.js.flow +1 -1
- package/lib/i18n/Message.js.map +1 -1
- package/lib/i18n/withMessage.js +2 -8
- package/lib/i18n/withMessage.js.flow +3 -4
- package/lib/i18n/withMessage.js.map +1 -1
- package/lib/models/application/ApplicationModel.js +7 -1
- package/lib/models/application/ApplicationModel.js.flow +7 -1
- package/lib/models/application/ApplicationModel.js.map +1 -1
- package/lib/redux/_modularui/connector.js +3 -3
- package/lib/redux/_modularui/connector.js.flow +3 -2
- package/lib/redux/_modularui/connector.js.map +1 -1
- package/lib/redux/_modularui/selectors.js +26 -6
- package/lib/redux/_modularui/selectors.js.flow +19 -1
- package/lib/redux/_modularui/selectors.js.map +1 -1
- package/lib/redux/_modularui/withModularUI.js +3 -9
- package/lib/redux/_modularui/withModularUI.js.flow +3 -5
- package/lib/redux/_modularui/withModularUI.js.map +1 -1
- package/lib/redux/actions/Application.js +31 -8
- package/lib/redux/actions/Application.js.flow +6 -8
- package/lib/redux/actions/Application.js.map +1 -1
- package/lib/redux/actions/Authorization.js +3 -2
- package/lib/redux/actions/Authorization.js.flow +2 -1
- package/lib/redux/actions/Authorization.js.map +1 -1
- package/lib/redux/actions/Error.js +4 -1
- package/lib/redux/actions/Error.js.flow +3 -1
- package/lib/redux/actions/Error.js.map +1 -1
- package/lib/redux/actions/__tests__/Application.spec.js.flow +1 -5
- package/lib/redux/actions/__tests__/Authorization.spec.js.flow +1 -1
- package/lib/redux/selectors/i18n.js +28 -0
- package/lib/redux/selectors/i18n.js.flow +15 -0
- package/lib/redux/selectors/i18n.js.map +1 -0
- package/lib/utils/datetime/DateTimeUtil.js +3 -1
- package/lib/utils/datetime/DateTimeUtil.js.flow +1 -1
- package/lib/utils/datetime/DateTimeUtil.js.map +1 -1
- package/package.json +5 -5
- package/src/constants/Constants.js +0 -15
- package/src/constants/Settings.js +9 -0
- package/src/hooks/__tests__/useAuthentication.spec.js +0 -8
- package/src/hooks/useAuthentication.js +40 -3
- package/src/hooks/useContent.js +2 -2
- package/src/hooks/useI18n.js +10 -11
- package/src/hooks/useModularUI.js +3 -2
- package/src/hooks/useModularUIRequest.js +8 -10
- package/src/i18n/Message.js +1 -1
- package/src/i18n/withMessage.js +3 -4
- package/src/models/application/ApplicationModel.js +7 -1
- package/src/redux/_modularui/connector.js +3 -2
- package/src/redux/_modularui/selectors.js +19 -1
- package/src/redux/_modularui/withModularUI.js +3 -5
- package/src/redux/actions/Application.js +6 -8
- package/src/redux/actions/Authorization.js +2 -1
- package/src/redux/actions/Error.js +3 -1
- package/src/redux/actions/__tests__/Application.spec.js +1 -5
- package/src/redux/actions/__tests__/Authorization.spec.js +1 -1
- package/src/redux/selectors/i18n.js +15 -0
- package/src/utils/datetime/DateTimeUtil.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Constants.js","names":["USE_CACHE","serverBase","__CONTEXT_PATH__","BASE","window","contextPath","MODULARUI_CONTRIBUTIONS","APPLICATION_URI","APPLICATION_PATH","CONTENT_PATH","UPLOAD_PATH","CAPTCHA_PATH","
|
|
1
|
+
{"version":3,"file":"Constants.js","names":["USE_CACHE","serverBase","__CONTEXT_PATH__","BASE","window","contextPath","MODULARUI_CONTRIBUTIONS","APPLICATION_URI","APPLICATION_PATH","CONTENT_PATH","UPLOAD_PATH","CAPTCHA_PATH","CHANGEPASSWORD_PATH","USERPROFILE_PATH","PARAMETER_SEPARATOR","TIMEVERSION_FILTER_NAME","PARAMETER_OVERVIEW_VIEWTYPE","DEFAULT_UI_PARAMETERS","ISO_DATE_FORMAT","ISO_DATETIME_FORMAT","ISO_TIME_FORMAT","ISO_TIMESTAMP_FORMAT","DEFAULT_WEEK_STARTS_ON","DEFAULT_FIRST_WEEK_CONTAINS_DATE","KEYCODES","TAB","ENTER","ESCAPE","SPACE","PAGE_UP","PAGE_DOWN","ARROW_LEFT","ARROW_UP","ARROW_RIGHT","ARROW_DOWN","IS_SYNC","dataFetcher","IS_SERVER","NOTIFICATION_TYPES","SUCCESS","INFO","WARNING","ERROR","HTTP_METHODS","GET","POST","MODULARUI_STATUS","LOADING","FINISHED","AUTOSAVE_STATUS","START","INPUT_DEBOUNCE_TIMEOUT","VALIDATE_DEBOUNCE_TIMEOUT","ATTRIBUTE_WIDTH","EXTRA_SMALL","SMALL","MEDIUM","LARGE","EXTRA_LARGE","ALL_CONTENT_IN_DATA_SETTING","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING"],"sources":["../../src/constants/Constants.js"],"sourcesContent":["// @flow\n/**\n * Indicates if contributions should be cached\n */\nexport const USE_CACHE = true;\n\nconst serverBase =\n typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\n/**\n * Base path\n * This uses contextPath set from property from server\n * When requesting a remote server with CORS enabled, add the origin, for example:\n * export const BEINFORMED_PATH = 'http://192.168.128.61:8080/BeInformed';\n */\nexport const BASE: string =\n serverBase ??\n (typeof window !== \"undefined\" && window.contextPath\n ? window.contextPath\n : \"/BeInformed\");\n\n/**\n * Path to the contributions api end point\n * /contributions uri part is added through the _links in the data service\n */\nexport const MODULARUI_CONTRIBUTIONS = \"/contributions\";\n\n/**\n * Application uri\n * @private\n */\nconst APPLICATION_URI = \"/\";\n\n/**\n * Base Path\n */\nexport const APPLICATION_PATH: string = BASE + APPLICATION_URI;\n\n/**\n * path to content service\n */\nexport const CONTENT_PATH = `${BASE}/content`;\n\n/**\n * Upload Path\n */\nexport const UPLOAD_PATH = `${BASE}/uploadFile`;\n\n/**\n * Captcha Path\n */\nexport const CAPTCHA_PATH = `${BASE}/captchaServices`;\n\n/**\n * Path to change password page / component\n */\nexport const CHANGEPASSWORD_PATH = \"/change-password\";\n\n/**\n * Path to user profile page / component\n */\nexport const USERPROFILE_PATH = \"/user\";\n\n/**\n * Separator for parameters of a list, makes it possible to render multiple lists on a page in a non-js environment\n */\nexport const PARAMETER_SEPARATOR = \"~\";\n\n/**\n * Timeversion filter name\n */\nexport const TIMEVERSION_FILTER_NAME = \"entryDate\";\n\nconst PARAMETER_OVERVIEW_VIEWTYPE = \"viewType\";\n/**\n * Parameter name for the viewtype toggle\n */\nexport const DEFAULT_UI_PARAMETERS: Array<string> = [\n PARAMETER_OVERVIEW_VIEWTYPE,\n];\n\n/**\n */\nexport const ISO_DATE_FORMAT = \"yyyy-MM-dd\";\n/**\n */\nexport const ISO_DATETIME_FORMAT = \"yyyy-MM-dd'T'HH:mm:ss\";\n/**\n */\nexport const ISO_TIME_FORMAT = \"HH:mm:ss\";\n/**\n */\nexport const ISO_TIMESTAMP_FORMAT = \"yyyy-MM-dd'T'HH:mm:ss.SSS\";\n/**\n * week starts on monday by default\n */\nexport const DEFAULT_WEEK_STARTS_ON = 1;\n\n/**\n * first week indicated by the 1st of january\n */\nexport const DEFAULT_FIRST_WEEK_CONTAINS_DATE = 1;\n\n/**\n * Key codes\n * @type {{SPACE: number, PAGE_DOWN: number, TAB: number, ARROW_RIGHT: number, ARROW_DOWN: number, ENTER: number, ARROW_UP: number, ARROW_LEFT: number, PAGE_UP: number, ESCAPE: number}}\n */\nexport const KEYCODES = {\n TAB: 9,\n ENTER: 13,\n ESCAPE: 27,\n SPACE: 32,\n PAGE_UP: 33,\n PAGE_DOWN: 34,\n ARROW_LEFT: 37,\n ARROW_UP: 38,\n ARROW_RIGHT: 39,\n ARROW_DOWN: 40,\n};\n\n/**\n * @type {boolean}\n */\nexport const IS_SYNC = typeof dataFetcher !== \"undefined\";\n/**\n * @type {boolean}\n */\nexport const IS_SERVER = IS_SYNC;\n\n/**\n * @type {{SUCCESS: string, ERROR: string, INFO: string, WARNING: string}}\n */\nexport const NOTIFICATION_TYPES = {\n SUCCESS: \"SUCCESS\",\n INFO: \"INFO\",\n WARNING: \"WARNING\",\n ERROR: \"ERROR\",\n};\n\n/**\n * SUPPORTED HTTP METHODS\n * @type {{POST: string, GET: string}}\n */\nexport const HTTP_METHODS = {\n GET: \"GET\",\n POST: \"POST\",\n};\n\n/**\n * POSSIBLE MODULARUI STATUSSES\n * @type {{LOADING: string, ERROR: string, FINISHED: string}}\n */\nexport const MODULARUI_STATUS = {\n LOADING: \"LOADING\",\n FINISHED: \"FINISHED\",\n ERROR: \"ERROR\",\n};\n\n/**\n * POSSIBLE AUTOSAVE STATUSSES\n * @type {{START: string, FINISHED: string}}\n */\nexport const AUTOSAVE_STATUS = {\n START: \"START\",\n FINISHED: \"FINISHED\",\n};\n\n/**\n * DEBOUNCE INPUT TIMEOUT\n */\nexport const INPUT_DEBOUNCE_TIMEOUT = 100;\n\n/**\n * DEBOUNCE VALIDATION TIMEOUT\n */\nexport const VALIDATE_DEBOUNCE_TIMEOUT = 500;\n\n/**\n * ATTRIBUTE WIDTH\n */\nexport const ATTRIBUTE_WIDTH = {\n EXTRA_SMALL: \"EXTRA_SMALL\",\n SMALL: \"SMALL\",\n MEDIUM: \"MEDIUM\",\n LARGE: \"LARGE\",\n EXTRA_LARGE: \"EXTRA_LARGE\",\n};\n\nexport const ALL_CONTENT_IN_DATA_SETTING = \"hasAllContentInData\";\n\nexport const LOGIN_TYPE = \"security.clients\";\nexport const LOGIN_PATH_SETTING = \"FormClient.login_url\";\nexport const LOGIN_USERNAME_SETTING = \"FormClient.username_field_name\";\nexport const LOGIN_PASSWORD_SETTING = \"FormClient.password_field_name\";\nexport const LOGOUT_PATH_SETTING = \"FormClient.logout_url\";\n"],"mappings":";;;;;;;AACA;AACA;AACA;AACO,IAAMA,SAAS,GAAG,IAAlB;;AAEP,IAAMC,UAAU,GACd,OAAOC,gBAAP,KAA4B,WAA5B,GAA0C,IAA1C,GAAiDA,gBADnD;AAGA;AACA;AACA;AACA;AACA;AACA;;AACO,IAAMC,IAAY,GACvBF,UADuB,aACvBA,UADuB,cACvBA,UADuB,GAEtB,OAAOG,MAAP,KAAkB,WAAlB,IAAiCA,MAAM,CAACC,WAAxC,GACGD,MAAM,CAACC,WADV,GAEG,aAJC;AAMP;AACA;AACA;AACA;;;AACO,IAAMC,uBAAuB,GAAG,gBAAhC;AAEP;AACA;AACA;AACA;;;AACA,IAAMC,eAAe,GAAG,GAAxB;AAEA;AACA;AACA;;AACO,IAAMC,gBAAwB,GAAGL,IAAI,GAAGI,eAAxC;AAEP;AACA;AACA;;;AACO,IAAME,YAAY,aAAMN,IAAN,aAAlB;AAEP;AACA;AACA;;;AACO,IAAMO,WAAW,aAAMP,IAAN,gBAAjB;AAEP;AACA;AACA;;;AACO,IAAMQ,YAAY,aAAMR,IAAN,qBAAlB;AAEP;AACA;AACA;;;AACO,IAAMS,mBAAmB,GAAG,kBAA5B;AAEP;AACA;AACA;;;AACO,IAAMC,gBAAgB,GAAG,OAAzB;AAEP;AACA;AACA;;;AACO,IAAMC,mBAAmB,GAAG,GAA5B;AAEP;AACA;AACA;;;AACO,IAAMC,uBAAuB,GAAG,WAAhC;;AAEP,IAAMC,2BAA2B,GAAG,UAApC;AACA;AACA;AACA;;AACO,IAAMC,qBAAoC,GAAG,CAClDD,2BADkD,CAA7C;AAIP;AACA;;;AACO,IAAME,eAAe,GAAG,YAAxB;AACP;AACA;;;AACO,IAAMC,mBAAmB,GAAG,uBAA5B;AACP;AACA;;;AACO,IAAMC,eAAe,GAAG,UAAxB;AACP;AACA;;;AACO,IAAMC,oBAAoB,GAAG,2BAA7B;AACP;AACA;AACA;;;AACO,IAAMC,sBAAsB,GAAG,CAA/B;AAEP;AACA;AACA;;;AACO,IAAMC,gCAAgC,GAAG,CAAzC;AAEP;AACA;AACA;AACA;;;AACO,IAAMC,QAAQ,GAAG;EACtBC,GAAG,EAAE,CADiB;EAEtBC,KAAK,EAAE,EAFe;EAGtBC,MAAM,EAAE,EAHc;EAItBC,KAAK,EAAE,EAJe;EAKtBC,OAAO,EAAE,EALa;EAMtBC,SAAS,EAAE,EANW;EAOtBC,UAAU,EAAE,EAPU;EAQtBC,QAAQ,EAAE,EARY;EAStBC,WAAW,EAAE,EATS;EAUtBC,UAAU,EAAE;AAVU,CAAjB;AAaP;AACA;AACA;;;AACO,IAAMC,OAAO,GAAG,OAAOC,WAAP,KAAuB,WAAvC;AACP;AACA;AACA;;;AACO,IAAMC,SAAS,GAAGF,OAAlB;AAEP;AACA;AACA;;;AACO,IAAMG,kBAAkB,GAAG;EAChCC,OAAO,EAAE,SADuB;EAEhCC,IAAI,EAAE,MAF0B;EAGhCC,OAAO,EAAE,SAHuB;EAIhCC,KAAK,EAAE;AAJyB,CAA3B;AAOP;AACA;AACA;AACA;;;AACO,IAAMC,YAAY,GAAG;EAC1BC,GAAG,EAAE,KADqB;EAE1BC,IAAI,EAAE;AAFoB,CAArB;AAKP;AACA;AACA;AACA;;;AACO,IAAMC,gBAAgB,GAAG;EAC9BC,OAAO,EAAE,SADqB;EAE9BC,QAAQ,EAAE,UAFoB;EAG9BN,KAAK,EAAE;AAHuB,CAAzB;AAMP;AACA;AACA;AACA;;;AACO,IAAMO,eAAe,GAAG;EAC7BC,KAAK,EAAE,OADsB;EAE7BF,QAAQ,EAAE;AAFmB,CAAxB;AAKP;AACA;AACA;;;AACO,IAAMG,sBAAsB,GAAG,GAA/B;AAEP;AACA;AACA;;;AACO,IAAMC,yBAAyB,GAAG,GAAlC;AAEP;AACA;AACA;;;AACO,IAAMC,eAAe,GAAG;EAC7BC,WAAW,EAAE,aADgB;EAE7BC,KAAK,EAAE,OAFsB;EAG7BC,MAAM,EAAE,QAHqB;EAI7BC,KAAK,EAAE,OAJsB;EAK7BC,WAAW,EAAE;AALgB,CAAxB;;AAQA,IAAMC,2BAA2B,GAAG,qBAApC;;AAEA,IAAMC,UAAU,GAAG,kBAAnB;;AACA,IAAMC,kBAAkB,GAAG,sBAA3B;;AACA,IAAMC,sBAAsB,GAAG,gCAA/B;;AACA,IAAMC,sBAAsB,GAAG,gCAA/B;;AACA,IAAMC,mBAAmB,GAAG,uBAA5B"}
|
|
@@ -40,6 +40,12 @@ var defaultSettings = {
|
|
|
40
40
|
RENDER_GLOBAL_LOGOUT_PAGE: false,
|
|
41
41
|
// Renders the login variants as option on the global logout page
|
|
42
42
|
RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,
|
|
43
|
+
// Path to login page / component
|
|
44
|
+
LOGIN_PATH: "/signin",
|
|
45
|
+
// Path to administrator login page / component
|
|
46
|
+
ADMINISTRATOR_LOGIN_PATH: "",
|
|
47
|
+
// Path to logout page / component
|
|
48
|
+
LOGOUT_PATH: "/signout",
|
|
43
49
|
// Render forms in a modal
|
|
44
50
|
RENDER_FORMS_IN_MODAL: true,
|
|
45
51
|
// Wait timeout before rendering submit wait icon
|
|
@@ -51,6 +51,15 @@ const defaultSettings = {
|
|
|
51
51
|
// Renders the login variants as option on the global logout page
|
|
52
52
|
RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,
|
|
53
53
|
|
|
54
|
+
// Path to login page / component
|
|
55
|
+
LOGIN_PATH: "/signin",
|
|
56
|
+
|
|
57
|
+
// Path to administrator login page / component
|
|
58
|
+
ADMINISTRATOR_LOGIN_PATH: "",
|
|
59
|
+
|
|
60
|
+
// Path to logout page / component
|
|
61
|
+
LOGOUT_PATH: "/signout",
|
|
62
|
+
|
|
54
63
|
// Render forms in a modal
|
|
55
64
|
RENDER_FORMS_IN_MODAL: true,
|
|
56
65
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Settings.js","names":["defaultSettings","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","DATE_INPUT_FORMAT","DATE_READONLY_FORMAT","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","settings","setSettings","config","isPlainObject","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","loginType","LOGIN_TYPE","loginPath","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport {\n ALL_CONTENT_IN_DATA_SETTING,\n LOGIN_TYPE,\n LOGIN_PATH_SETTING,\n LOGIN_USERNAME_SETTING,\n LOGIN_PASSWORD_SETTING,\n LOGOUT_PATH_SETTING,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst defaultSettings = {\n // Debug missing i18n messages in layout\n DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n // Time to show the notification bar\n HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n // Always commit form, does not show result pages for instruments\n ALWAYS_COMMIT_FORM: false,\n\n // Render instrument and event question labels on forms (might result in duplicate labels)\n RENDER_QUESTION_LABELS: true,\n\n // Render mandatory indications on attributes\n RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n // Render optional indications on attributes\n RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n // Renders a toggle with supported list views, options are ListView and TableView\n AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n // Toggle client side validation\n USE_CLIENTSIDE_VALIDATION: true,\n\n // Indicates if server validation should be used when a form field is changed\n USE_INSTANT_SERVER_VALIDATION: true,\n\n // Indicates which locales are enabled\n ENABLED_LOCALES: [\"en\", \"nl\"],\n\n // Renders the global log in page\n RENDER_GLOBAL_LOGIN_PAGE: false,\n\n // Renders the global log out page\n RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n // Renders the login variants as option on the global logout page\n RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n // Render forms in a modal\n RENDER_FORMS_IN_MODAL: true,\n\n // Wait timeout before rendering submit wait icon\n SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n // Swim lane diagram configuration file\n SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n // Business scenario concept types\n BUSINESS_SCENARIO_CONCEPT_TYPE: [\n \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n ],\n BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n ],\n BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n \"/Library/KMTs/Business scenarios.bixml/Persona\",\n ],\n\n // Input format for dates. Without this setting having a value, the contributions format is used\n DATE_INPUT_FORMAT: \"\",\n\n // Readonly format for dates. Without this setting having a value, the contributions format is used\n DATE_READONLY_FORMAT: \"\",\n\n // indicates on what day the week starts (0 = Sunday)\n CALENDAR_WEEK_STARTS_ON: 1,\n\n // indicates which date indicates the first week of the year\n CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n // parameters that are added for the ui state, but should not be send to the modular ui\n UI_PARAMETERS: [],\n\n // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n // reload the complete page on signout, usefull when third party authentication is in place\n PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n XHR_TIMEOUT_MS: 300000,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n if (isPlainObject(config)) {\n settings = Object.assign(defaultSettings, config);\n }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n if (!has(settings, key) && defaultValue === undefined) {\n throw new Error(\n `Setting with name ${key} not found and no defaultValue given`\n );\n }\n\n return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n * Login type, only available when pac4j is configured\n */\nexport const loginType = (): string => getSetting(LOGIN_TYPE, \"JAAS\");\n\n/**\n */\nexport const loginPath = (): string =>\n getSetting(LOGIN_PATH_SETTING, \"/j_security_check\");\n/**\n */\nexport const loginUsernameField = (): string =>\n getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n getSetting(LOGOUT_PATH_SETTING, \"/Logoff\");\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AAWA,IAAMA,eAAe,GAAG;EACtB;EACAC,4BAA4B,EAAE,IAFR;EAItB;EACAC,yBAAyB,EAAE,IALL;EAOtB;EACAC,kBAAkB,EAAE,KARE;EAUtB;EACAC,sBAAsB,EAAE,IAXF;EAatB;EACAC,qCAAqC,EAAE,IAdjB;EAgBtB;EACAC,oCAAoC,EAAE,KAjBhB;EAmBtB;EACAC,oBAAoB,EAAE,CAAC,UAAD,EAAa,WAAb,CApBA;EAsBtB;EACAC,yBAAyB,EAAE,IAvBL;EAyBtB;EACAC,6BAA6B,EAAE,IA1BT;EA4BtB;EACAC,eAAe,EAAE,CAAC,IAAD,EAAO,IAAP,CA7BK;EA+BtB;EACAC,wBAAwB,EAAE,KAhCJ;EAkCtB;EACAC,yBAAyB,EAAE,KAnCL;EAqCtB;EACAC,wCAAwC,EAAE,KAtCpB;EAwCtB;EACAC,
|
|
1
|
+
{"version":3,"file":"Settings.js","names":["defaultSettings","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","DATE_INPUT_FORMAT","DATE_READONLY_FORMAT","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","settings","setSettings","config","isPlainObject","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","loginType","LOGIN_TYPE","loginPath","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport {\n ALL_CONTENT_IN_DATA_SETTING,\n LOGIN_TYPE,\n LOGIN_PATH_SETTING,\n LOGIN_USERNAME_SETTING,\n LOGIN_PASSWORD_SETTING,\n LOGOUT_PATH_SETTING,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst defaultSettings = {\n // Debug missing i18n messages in layout\n DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n // Time to show the notification bar\n HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n // Always commit form, does not show result pages for instruments\n ALWAYS_COMMIT_FORM: false,\n\n // Render instrument and event question labels on forms (might result in duplicate labels)\n RENDER_QUESTION_LABELS: true,\n\n // Render mandatory indications on attributes\n RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n // Render optional indications on attributes\n RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n // Renders a toggle with supported list views, options are ListView and TableView\n AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n // Toggle client side validation\n USE_CLIENTSIDE_VALIDATION: true,\n\n // Indicates if server validation should be used when a form field is changed\n USE_INSTANT_SERVER_VALIDATION: true,\n\n // Indicates which locales are enabled\n ENABLED_LOCALES: [\"en\", \"nl\"],\n\n // Renders the global log in page\n RENDER_GLOBAL_LOGIN_PAGE: false,\n\n // Renders the global log out page\n RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n // Renders the login variants as option on the global logout page\n RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n // Path to login page / component\n LOGIN_PATH: \"/signin\",\n\n // Path to administrator login page / component\n ADMINISTRATOR_LOGIN_PATH: \"\",\n\n // Path to logout page / component\n LOGOUT_PATH: \"/signout\",\n\n // Render forms in a modal\n RENDER_FORMS_IN_MODAL: true,\n\n // Wait timeout before rendering submit wait icon\n SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n // Swim lane diagram configuration file\n SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n // Business scenario concept types\n BUSINESS_SCENARIO_CONCEPT_TYPE: [\n \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n ],\n BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n ],\n BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n \"/Library/KMTs/Business scenarios.bixml/Persona\",\n ],\n\n // Input format for dates. Without this setting having a value, the contributions format is used\n DATE_INPUT_FORMAT: \"\",\n\n // Readonly format for dates. Without this setting having a value, the contributions format is used\n DATE_READONLY_FORMAT: \"\",\n\n // indicates on what day the week starts (0 = Sunday)\n CALENDAR_WEEK_STARTS_ON: 1,\n\n // indicates which date indicates the first week of the year\n CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n // parameters that are added for the ui state, but should not be send to the modular ui\n UI_PARAMETERS: [],\n\n // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n // reload the complete page on signout, usefull when third party authentication is in place\n PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n XHR_TIMEOUT_MS: 300000,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n if (isPlainObject(config)) {\n settings = Object.assign(defaultSettings, config);\n }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n if (!has(settings, key) && defaultValue === undefined) {\n throw new Error(\n `Setting with name ${key} not found and no defaultValue given`\n );\n }\n\n return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n * Login type, only available when pac4j is configured\n */\nexport const loginType = (): string => getSetting(LOGIN_TYPE, \"JAAS\");\n\n/**\n */\nexport const loginPath = (): string =>\n getSetting(LOGIN_PATH_SETTING, \"/j_security_check\");\n/**\n */\nexport const loginUsernameField = (): string =>\n getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n getSetting(LOGOUT_PATH_SETTING, \"/Logoff\");\n"],"mappings":"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"}
|
|
@@ -61,10 +61,6 @@ describe("authentication hooks", () => {
|
|
|
61
61
|
|
|
62
62
|
expect(store.getActions()).toStrictEqual([
|
|
63
63
|
{ type: "START_PROGRESS" },
|
|
64
|
-
{
|
|
65
|
-
type: "MODULARUI/REMOVE_KEY",
|
|
66
|
-
payload: "application(/)(en)",
|
|
67
|
-
},
|
|
68
64
|
{
|
|
69
65
|
type: "MODULARUI/STATUS",
|
|
70
66
|
payload: { key: "application(/)(en)", status: "LOADING" },
|
|
@@ -112,10 +108,6 @@ describe("authentication hooks", () => {
|
|
|
112
108
|
expect(store.getActions()).toStrictEqual([
|
|
113
109
|
{ type: "START_PROGRESS" },
|
|
114
110
|
{ type: "MODULARUI/RESET" },
|
|
115
|
-
{
|
|
116
|
-
type: "MODULARUI/REMOVE_KEY",
|
|
117
|
-
payload: "application(/)(en)",
|
|
118
|
-
},
|
|
119
111
|
{
|
|
120
112
|
type: "MODULARUI/STATUS",
|
|
121
113
|
payload: { key: "application(/)(en)", status: "LOADING" },
|
|
@@ -1,34 +1,62 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
|
|
4
|
+
|
|
3
5
|
Object.defineProperty(exports, "__esModule", {
|
|
4
6
|
value: true
|
|
5
7
|
});
|
|
6
8
|
exports.useLogout = exports.useLogin = void 0;
|
|
7
9
|
|
|
10
|
+
var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
|
|
11
|
+
|
|
8
12
|
var _reactRedux = require("react-redux");
|
|
9
13
|
|
|
10
14
|
var _selectors = require("../redux/_modularui/selectors");
|
|
11
15
|
|
|
12
16
|
var _actions = require("../redux/actions");
|
|
13
17
|
|
|
18
|
+
var _Cache = _interopRequireDefault(require("../utils/browser/Cache"));
|
|
19
|
+
|
|
20
|
+
var _constants = require("../constants");
|
|
21
|
+
|
|
22
|
+
var _exceptions = require("../exceptions");
|
|
23
|
+
|
|
14
24
|
/**
|
|
15
25
|
*/
|
|
16
26
|
var useLogin = function useLogin() {
|
|
17
|
-
var _application$isLogged;
|
|
27
|
+
var _application$isLogged, _application$authenti;
|
|
18
28
|
|
|
19
29
|
var dispatch = (0, _reactRedux.useDispatch)();
|
|
20
30
|
var application = (0, _reactRedux.useSelector)(_selectors.getApplication);
|
|
21
31
|
var auth = (0, _reactRedux.useSelector)(function (state) {
|
|
22
32
|
return state.auth;
|
|
23
33
|
});
|
|
34
|
+
var isAuthenticated = (_application$isLogged = application === null || application === void 0 ? void 0 : application.isLoggedIn) !== null && _application$isLogged !== void 0 ? _application$isLogged : false;
|
|
24
35
|
return {
|
|
25
|
-
isAuthenticated:
|
|
36
|
+
isAuthenticated: isAuthenticated,
|
|
37
|
+
authenticationTypes: (_application$authenti = application === null || application === void 0 ? void 0 : application.authenticationTypes) !== null && _application$authenti !== void 0 ? _application$authenti : [],
|
|
26
38
|
errorMessage: auth.error,
|
|
27
39
|
resetErrors: function resetErrors() {
|
|
28
40
|
return dispatch((0, _actions.resetAuthErrors)());
|
|
29
41
|
},
|
|
30
42
|
login: function login(username, password) {
|
|
31
43
|
return dispatch((0, _actions.login)(username, password));
|
|
44
|
+
},
|
|
45
|
+
redirectLogin: function redirectLogin(authenticationType) {
|
|
46
|
+
if (_Cache.default.getItem("isRedirectLogin")) {
|
|
47
|
+
var _context;
|
|
48
|
+
|
|
49
|
+
// prevent endless loop in redirects when authentication type can't be redirected
|
|
50
|
+
throw new _exceptions.IllegalStateException((0, _concat.default)(_context = "Could not redirect to '".concat(authenticationType.authentication, "' using url: '")).call(_context, authenticationType.redirectUri, "'"));
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
if (!isAuthenticated) {
|
|
54
|
+
var _context2;
|
|
55
|
+
|
|
56
|
+
_Cache.default.setItem("isRedirectLogin", true);
|
|
57
|
+
|
|
58
|
+
window.location.assign((0, _concat.default)(_context2 = "".concat(_constants.BASE)).call(_context2, authenticationType.redirectUri));
|
|
59
|
+
}
|
|
32
60
|
}
|
|
33
61
|
};
|
|
34
62
|
};
|
|
@@ -39,14 +67,28 @@ var useLogin = function useLogin() {
|
|
|
39
67
|
exports.useLogin = useLogin;
|
|
40
68
|
|
|
41
69
|
var useLogout = function useLogout() {
|
|
42
|
-
var _application$isLogged2;
|
|
70
|
+
var _application$isLogged2, _application$authenti2;
|
|
43
71
|
|
|
44
72
|
var dispatch = (0, _reactRedux.useDispatch)();
|
|
45
73
|
var application = (0, _reactRedux.useSelector)(_selectors.getApplication);
|
|
74
|
+
var LOGOUT_PATH = (0, _constants.getSetting)("LOGOUT_PATH", "/signout");
|
|
75
|
+
var isAuthenticated = (_application$isLogged2 = application === null || application === void 0 ? void 0 : application.isLoggedIn) !== null && _application$isLogged2 !== void 0 ? _application$isLogged2 : false;
|
|
46
76
|
return {
|
|
47
|
-
isAuthenticated:
|
|
77
|
+
isAuthenticated: isAuthenticated,
|
|
78
|
+
authenticationTypes: (_application$authenti2 = application === null || application === void 0 ? void 0 : application.authenticationTypes) !== null && _application$authenti2 !== void 0 ? _application$authenti2 : [],
|
|
48
79
|
logout: function logout() {
|
|
49
|
-
|
|
80
|
+
if (_Cache.default.getItem("isRedirectLogin")) {
|
|
81
|
+
var _context3, _context4, _context5, _context6;
|
|
82
|
+
|
|
83
|
+
var origin = window.location.origin;
|
|
84
|
+
var url = (0, _concat.default)(_context3 = (0, _concat.default)(_context4 = (0, _concat.default)(_context5 = (0, _concat.default)(_context6 = "".concat(origin)).call(_context6, _constants.BASE, "/logout?url=")).call(_context5, origin)).call(_context4, _constants.BASE)).call(_context3, LOGOUT_PATH);
|
|
85
|
+
|
|
86
|
+
_Cache.default.setItem("isRedirectLogin", false);
|
|
87
|
+
|
|
88
|
+
window.location.assign(url);
|
|
89
|
+
} else {
|
|
90
|
+
return dispatch((0, _actions.logout)());
|
|
91
|
+
}
|
|
50
92
|
}
|
|
51
93
|
};
|
|
52
94
|
};
|
|
@@ -4,15 +4,23 @@ import { useSelector, useDispatch } from "react-redux";
|
|
|
4
4
|
import { getApplication } from "../redux/_modularui/selectors";
|
|
5
5
|
import { login, logout, resetAuthErrors } from "../redux/actions";
|
|
6
6
|
|
|
7
|
+
import Cache from "../utils/browser/Cache";
|
|
8
|
+
import { BASE, getSetting } from "../constants";
|
|
9
|
+
|
|
7
10
|
import type { ResetAuthErrorsAction } from "../redux/types";
|
|
11
|
+
import type { AuthenticationType } from "../models/types";
|
|
12
|
+
import { IllegalStateException } from "../exceptions";
|
|
8
13
|
type LoginHook = {
|
|
9
14
|
isAuthenticated: boolean,
|
|
15
|
+
authenticationTypes: Array<AuthenticationType>,
|
|
10
16
|
errorMessage: ?string,
|
|
11
17
|
resetErrors: () => ResetAuthErrorsAction,
|
|
12
18
|
login: (username: string, password: string) => void,
|
|
19
|
+
redirectLogin: (authenticationType: AuthenticationType) => void,
|
|
13
20
|
};
|
|
14
21
|
type LogoutHook = {
|
|
15
22
|
isAuthenticated: boolean,
|
|
23
|
+
authenticationTypes: Array<AuthenticationType>,
|
|
16
24
|
logout: () => void,
|
|
17
25
|
};
|
|
18
26
|
|
|
@@ -24,12 +32,28 @@ export const useLogin = (): LoginHook => {
|
|
|
24
32
|
const application = useSelector(getApplication);
|
|
25
33
|
const auth = useSelector((state) => state.auth);
|
|
26
34
|
|
|
35
|
+
const isAuthenticated = application?.isLoggedIn ?? false;
|
|
36
|
+
|
|
27
37
|
return {
|
|
28
|
-
isAuthenticated
|
|
38
|
+
isAuthenticated,
|
|
39
|
+
authenticationTypes: application?.authenticationTypes ?? [],
|
|
29
40
|
errorMessage: auth.error,
|
|
30
41
|
resetErrors: () => dispatch(resetAuthErrors()),
|
|
31
42
|
login: (username: string, password: string) =>
|
|
32
43
|
dispatch(login(username, password)),
|
|
44
|
+
redirectLogin: (authenticationType: AuthenticationType) => {
|
|
45
|
+
if (Cache.getItem("isRedirectLogin")) {
|
|
46
|
+
// prevent endless loop in redirects when authentication type can't be redirected
|
|
47
|
+
throw new IllegalStateException(
|
|
48
|
+
`Could not redirect to '${authenticationType.authentication}' using url: '${authenticationType.redirectUri}'`
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
if (!isAuthenticated) {
|
|
53
|
+
Cache.setItem("isRedirectLogin", true);
|
|
54
|
+
window.location.assign(`${BASE}${authenticationType.redirectUri}`);
|
|
55
|
+
}
|
|
56
|
+
},
|
|
33
57
|
};
|
|
34
58
|
};
|
|
35
59
|
|
|
@@ -39,8 +63,21 @@ export const useLogout = (): LogoutHook => {
|
|
|
39
63
|
const dispatch = useDispatch();
|
|
40
64
|
const application = useSelector(getApplication);
|
|
41
65
|
|
|
66
|
+
const LOGOUT_PATH = getSetting("LOGOUT_PATH", "/signout");
|
|
67
|
+
|
|
68
|
+
const isAuthenticated = application?.isLoggedIn ?? false;
|
|
42
69
|
return {
|
|
43
|
-
isAuthenticated
|
|
44
|
-
|
|
70
|
+
isAuthenticated,
|
|
71
|
+
authenticationTypes: application?.authenticationTypes ?? [],
|
|
72
|
+
logout: () => {
|
|
73
|
+
if (Cache.getItem("isRedirectLogin")) {
|
|
74
|
+
const origin = window.location.origin;
|
|
75
|
+
const url = `${origin}${BASE}/logout?url=${origin}${BASE}${LOGOUT_PATH}`;
|
|
76
|
+
Cache.setItem("isRedirectLogin", false);
|
|
77
|
+
window.location.assign(url);
|
|
78
|
+
} else {
|
|
79
|
+
return dispatch(logout());
|
|
80
|
+
}
|
|
81
|
+
},
|
|
45
82
|
};
|
|
46
83
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthentication.js","names":["useLogin","dispatch","useDispatch","application","useSelector","getApplication","auth","state","isAuthenticated","isLoggedIn","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","useLogout","logout"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/selectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\ntype LoginHook = {\n isAuthenticated: boolean,\n errorMessage: ?string,\n resetErrors: () => ResetAuthErrorsAction,\n login: (username: string, password: string) => void,\n};\ntype LogoutHook = {\n isAuthenticated: boolean,\n logout: () => void,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n const dispatch = useDispatch();\n\n const application = useSelector(getApplication);\n const auth = useSelector((state) => state.auth);\n\n return {\n isAuthenticated: application?.
|
|
1
|
+
{"version":3,"file":"useAuthentication.js","names":["useLogin","dispatch","useDispatch","application","useSelector","getApplication","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","Cache","getItem","IllegalStateException","authentication","redirectUri","setItem","window","location","assign","BASE","useLogout","LOGOUT_PATH","getSetting","logout","origin","url"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/selectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport { BASE, getSetting } from \"../constants\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\nimport { IllegalStateException } from \"../exceptions\";\ntype LoginHook = {\n isAuthenticated: boolean,\n authenticationTypes: Array<AuthenticationType>,\n errorMessage: ?string,\n resetErrors: () => ResetAuthErrorsAction,\n login: (username: string, password: string) => void,\n redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n isAuthenticated: boolean,\n authenticationTypes: Array<AuthenticationType>,\n logout: () => void,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n const dispatch = useDispatch();\n\n const application = useSelector(getApplication);\n const auth = useSelector((state) => state.auth);\n\n const isAuthenticated = application?.isLoggedIn ?? false;\n\n return {\n isAuthenticated,\n authenticationTypes: application?.authenticationTypes ?? [],\n errorMessage: auth.error,\n resetErrors: () => dispatch(resetAuthErrors()),\n login: (username: string, password: string) =>\n dispatch(login(username, password)),\n redirectLogin: (authenticationType: AuthenticationType) => {\n if (Cache.getItem(\"isRedirectLogin\")) {\n // prevent endless loop in redirects when authentication type can't be redirected\n throw new IllegalStateException(\n `Could not redirect to '${authenticationType.authentication}' using url: '${authenticationType.redirectUri}'`\n );\n }\n\n if (!isAuthenticated) {\n Cache.setItem(\"isRedirectLogin\", true);\n window.location.assign(`${BASE}${authenticationType.redirectUri}`);\n }\n },\n };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n const dispatch = useDispatch();\n const application = useSelector(getApplication);\n\n const LOGOUT_PATH = getSetting(\"LOGOUT_PATH\", \"/signout\");\n\n const isAuthenticated = application?.isLoggedIn ?? false;\n return {\n isAuthenticated,\n authenticationTypes: application?.authenticationTypes ?? [],\n logout: () => {\n if (Cache.getItem(\"isRedirectLogin\")) {\n const origin = window.location.origin;\n const url = `${origin}${BASE}/logout?url=${origin}${BASE}${LOGOUT_PATH}`;\n Cache.setItem(\"isRedirectLogin\", false);\n window.location.assign(url);\n } else {\n return dispatch(logout());\n }\n },\n };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AAEA;;AACA;;AAEA;;AACA;;AAIA;;AAeA;AACA;AACO,IAAMA,QAAQ,GAAG,SAAXA,QAAW,GAAiB;EAAA;;EACvC,IAAMC,QAAQ,GAAG,IAAAC,uBAAA,GAAjB;EAEA,IAAMC,WAAW,GAAG,IAAAC,uBAAA,EAAYC,yBAAZ,CAApB;EACA,IAAMC,IAAI,GAAG,IAAAF,uBAAA,EAAY,UAACG,KAAD;IAAA,OAAWA,KAAK,CAACD,IAAjB;EAAA,CAAZ,CAAb;EAEA,IAAME,eAAe,4BAAGL,WAAH,aAAGA,WAAH,uBAAGA,WAAW,CAAEM,UAAhB,yEAA8B,KAAnD;EAEA,OAAO;IACLD,eAAe,EAAfA,eADK;IAELE,mBAAmB,2BAAEP,WAAF,aAAEA,WAAF,uBAAEA,WAAW,CAAEO,mBAAf,yEAAsC,EAFpD;IAGLC,YAAY,EAAEL,IAAI,CAACM,KAHd;IAILC,WAAW,EAAE;MAAA,OAAMZ,QAAQ,CAAC,IAAAa,wBAAA,GAAD,CAAd;IAAA,CAJR;IAKLC,KAAK,EAAE,eAACC,QAAD,EAAmBC,QAAnB;MAAA,OACLhB,QAAQ,CAAC,IAAAc,cAAA,EAAMC,QAAN,EAAgBC,QAAhB,CAAD,CADH;IAAA,CALF;IAOLC,aAAa,EAAE,uBAACC,kBAAD,EAA4C;MACzD,IAAIC,cAAA,CAAMC,OAAN,CAAc,iBAAd,CAAJ,EAAsC;QAAA;;QACpC;QACA,MAAM,IAAIC,iCAAJ,kEACsBH,kBAAkB,CAACI,cADzC,oCACwEJ,kBAAkB,CAACK,WAD3F,OAAN;MAGD;;MAED,IAAI,CAAChB,eAAL,EAAsB;QAAA;;QACpBY,cAAA,CAAMK,OAAN,CAAc,iBAAd,EAAiC,IAAjC;;QACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB,4CAA0BC,eAA1B,mBAAiCV,kBAAkB,CAACK,WAApD;MACD;IACF;EAnBI,CAAP;AAqBD,CA7BM;AA+BP;AACA;;;;;AACO,IAAMM,SAAS,GAAG,SAAZA,SAAY,GAAkB;EAAA;;EACzC,IAAM7B,QAAQ,GAAG,IAAAC,uBAAA,GAAjB;EACA,IAAMC,WAAW,GAAG,IAAAC,uBAAA,EAAYC,yBAAZ,CAApB;EAEA,IAAM0B,WAAW,GAAG,IAAAC,qBAAA,EAAW,aAAX,EAA0B,UAA1B,CAApB;EAEA,IAAMxB,eAAe,6BAAGL,WAAH,aAAGA,WAAH,uBAAGA,WAAW,CAAEM,UAAhB,2EAA8B,KAAnD;EACA,OAAO;IACLD,eAAe,EAAfA,eADK;IAELE,mBAAmB,4BAAEP,WAAF,aAAEA,WAAF,uBAAEA,WAAW,CAAEO,mBAAf,2EAAsC,EAFpD;IAGLuB,MAAM,EAAE,kBAAM;MACZ,IAAIb,cAAA,CAAMC,OAAN,CAAc,iBAAd,CAAJ,EAAsC;QAAA;;QACpC,IAAMa,MAAM,GAAGR,MAAM,CAACC,QAAP,CAAgBO,MAA/B;QACA,IAAMC,GAAG,iJAAMD,MAAN,mBAAeL,eAAf,mCAAkCK,MAAlC,mBAA2CL,eAA3C,mBAAkDE,WAAlD,CAAT;;QACAX,cAAA,CAAMK,OAAN,CAAc,iBAAd,EAAiC,KAAjC;;QACAC,MAAM,CAACC,QAAP,CAAgBC,MAAhB,CAAuBO,GAAvB;MACD,CALD,MAKO;QACL,OAAOlC,QAAQ,CAAC,IAAAgC,eAAA,GAAD,CAAf;MACD;IACF;EAZI,CAAP;AAcD,CArBM"}
|
package/lib/hooks/useContent.js
CHANGED
|
@@ -19,14 +19,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/hel
|
|
|
19
19
|
|
|
20
20
|
var _react = require("react");
|
|
21
21
|
|
|
22
|
-
var _reactRedux = require("react-redux");
|
|
23
|
-
|
|
24
22
|
var _SourceReferenceCollection = _interopRequireDefault(require("../models/concepts/SourceReferenceCollection"));
|
|
25
23
|
|
|
26
24
|
var _ModularUIRequest = _interopRequireDefault(require("../modularui/ModularUIRequest"));
|
|
27
25
|
|
|
28
26
|
var _useProgressIndicator2 = require("../hooks/useProgressIndicator");
|
|
29
27
|
|
|
28
|
+
var _useI18n = require("../hooks/useI18n");
|
|
29
|
+
|
|
30
30
|
/**
|
|
31
31
|
* Hook to retrieve multiple source references at once
|
|
32
32
|
*/
|
|
@@ -38,11 +38,7 @@ var useContentFromSourceReferences = function useContentFromSourceReferences(sou
|
|
|
38
38
|
content = _useState2[0],
|
|
39
39
|
setContent = _useState2[1];
|
|
40
40
|
|
|
41
|
-
var localeCode = (0,
|
|
42
|
-
var _state$i18n$locale;
|
|
43
|
-
|
|
44
|
-
return (_state$i18n$locale = state.i18n.locale) !== null && _state$i18n$locale !== void 0 ? _state$i18n$locale : "en";
|
|
45
|
-
});
|
|
41
|
+
var localeCode = (0, _useI18n.useLocale)();
|
|
46
42
|
|
|
47
43
|
var _useProgressIndicator = (0, _useProgressIndicator2.useProgressIndicator)(),
|
|
48
44
|
start = _useProgressIndicator.start,
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
// @flow
|
|
2
2
|
import { useState, useEffect } from "react";
|
|
3
|
-
import { useSelector } from "react-redux";
|
|
4
3
|
|
|
5
4
|
import SourceReferenceCollection from "../models/concepts/SourceReferenceCollection";
|
|
6
5
|
import ModularUIRequest from "../modularui/ModularUIRequest";
|
|
7
6
|
|
|
8
7
|
import { useProgressIndicator } from "../hooks/useProgressIndicator";
|
|
8
|
+
import { useLocale } from "../hooks/useI18n";
|
|
9
9
|
|
|
10
10
|
import type ContentModel from "../models/content/ContentModel";
|
|
11
11
|
|
|
@@ -17,7 +17,7 @@ export const useContentFromSourceReferences = (
|
|
|
17
17
|
renderChildSections: boolean
|
|
18
18
|
): Array<ContentModel> => {
|
|
19
19
|
const [content, setContent] = useState([]);
|
|
20
|
-
const localeCode =
|
|
20
|
+
const localeCode = useLocale();
|
|
21
21
|
|
|
22
22
|
const { start, finish } = useProgressIndicator();
|
|
23
23
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useContent.js","names":["useContentFromSourceReferences","sourceReferences","renderChildSections","useState","content","setContent","localeCode","
|
|
1
|
+
{"version":3,"file":"useContent.js","names":["useContentFromSourceReferences","sourceReferences","renderChildSections","useState","content","setContent","localeCode","useLocale","useProgressIndicator","start","finish","hrefs","sourceReference","link","selfhref","href","index","self","indexOf","toString","allHrefs","useEffect","requests","JSON","parse","modularuiRequest","ModularUIRequest","locale","fetchContent","all","then","responseContent"],"sources":["../../src/hooks/useContent.js"],"sourcesContent":["// @flow\nimport { useState, useEffect } from \"react\";\n\nimport SourceReferenceCollection from \"../models/concepts/SourceReferenceCollection\";\nimport ModularUIRequest from \"../modularui/ModularUIRequest\";\n\nimport { useProgressIndicator } from \"../hooks/useProgressIndicator\";\nimport { useLocale } from \"../hooks/useI18n\";\n\nimport type ContentModel from \"../models/content/ContentModel\";\n\n/**\n * Hook to retrieve multiple source references at once\n */\nexport const useContentFromSourceReferences = (\n sourceReferences: SourceReferenceCollection,\n renderChildSections: boolean\n): Array<ContentModel> => {\n const [content, setContent] = useState([]);\n const localeCode = useLocale();\n\n const { start, finish } = useProgressIndicator();\n\n const hrefs = sourceReferences\n .map((sourceReference) => sourceReference.link.selfhref.href)\n .filter((href, index, self) => self.indexOf(href) === index)\n .map((href) => href.toString());\n\n const allHrefs = JSON.stringify(hrefs);\n useEffect(() => {\n const requests = JSON.parse(allHrefs).map((href) => {\n const modularuiRequest = new ModularUIRequest(href);\n modularuiRequest.locale = localeCode;\n return modularuiRequest.fetchContent(renderChildSections);\n });\n\n start();\n Promise.all(requests).then((responseContent) => {\n setContent(responseContent);\n finish();\n });\n\n // start and finish don't change\n // eslint-disable-next-line react-hooks/exhaustive-deps\n }, [allHrefs, localeCode, renderChildSections]);\n\n return content;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;AACA;;AAEA;;AACA;;AAEA;;AACA;;AAIA;AACA;AACA;AACO,IAAMA,8BAA8B,GAAG,SAAjCA,8BAAiC,CAC5CC,gBAD4C,EAE5CC,mBAF4C,EAGpB;EAAA;;EACxB,gBAA8B,IAAAC,eAAA,EAAS,EAAT,CAA9B;EAAA;EAAA,IAAOC,OAAP;EAAA,IAAgBC,UAAhB;;EACA,IAAMC,UAAU,GAAG,IAAAC,kBAAA,GAAnB;;EAEA,4BAA0B,IAAAC,2CAAA,GAA1B;EAAA,IAAQC,KAAR,yBAAQA,KAAR;EAAA,IAAeC,MAAf,yBAAeA,MAAf;;EAEA,IAAMC,KAAK,GAAG,gFAAAV,gBAAgB,MAAhB,CAAAA,gBAAgB,EACvB,UAACW,eAAD;IAAA,OAAqBA,eAAe,CAACC,IAAhB,CAAqBC,QAArB,CAA8BC,IAAnD;EAAA,CADuB,CAAhB,kBAEJ,UAACA,IAAD,EAAOC,KAAP,EAAcC,IAAd;IAAA,OAAuBA,IAAI,CAACC,OAAL,CAAaH,IAAb,MAAuBC,KAA9C;EAAA,CAFI,kBAGP,UAACD,IAAD;IAAA,OAAUA,IAAI,CAACI,QAAL,EAAV;EAAA,CAHO,CAAd;EAKA,IAAMC,QAAQ,GAAG,wBAAeT,KAAf,CAAjB;EACA,IAAAU,gBAAA,EAAU,YAAM;IAAA;;IACd,IAAMC,QAAQ,GAAG,8BAAAC,IAAI,CAACC,KAAL,CAAWJ,QAAX,mBAAyB,UAACL,IAAD,EAAU;MAClD,IAAMU,gBAAgB,GAAG,IAAIC,yBAAJ,CAAqBX,IAArB,CAAzB;MACAU,gBAAgB,CAACE,MAAjB,GAA0BrB,UAA1B;MACA,OAAOmB,gBAAgB,CAACG,YAAjB,CAA8B1B,mBAA9B,CAAP;IACD,CAJgB,CAAjB;IAMAO,KAAK;;IACL,iBAAQoB,GAAR,CAAYP,QAAZ,EAAsBQ,IAAtB,CAA2B,UAACC,eAAD,EAAqB;MAC9C1B,UAAU,CAAC0B,eAAD,CAAV;MACArB,MAAM;IACP,CAHD,EARc,CAad;IACA;;EACD,CAfD,EAeG,CAACU,QAAD,EAAWd,UAAX,EAAuBJ,mBAAvB,CAfH;EAiBA,OAAOE,OAAP;AACD,CAjCM"}
|
package/lib/hooks/useI18n.js
CHANGED
|
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.useTranslate = exports.useMessage = void 0;
|
|
8
|
+
exports.useTranslate = exports.useMessage = exports.useLocale = void 0;
|
|
9
9
|
|
|
10
10
|
var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
|
|
11
11
|
|
|
@@ -15,15 +15,9 @@ var _reselect = require("reselect");
|
|
|
15
15
|
|
|
16
16
|
var _memoize = _interopRequireDefault(require("lodash/memoize"));
|
|
17
17
|
|
|
18
|
-
var
|
|
19
|
-
return state.i18n.locale || "en";
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
var getLocales = function getLocales(state) {
|
|
23
|
-
return state.i18n.locales;
|
|
24
|
-
};
|
|
18
|
+
var _i18n = require("../redux/selectors/i18n");
|
|
25
19
|
|
|
26
|
-
var getMessage = (0, _reselect.createSelector)([getLocales,
|
|
20
|
+
var getMessage = (0, _reselect.createSelector)([_i18n.getLocales, _i18n.getLocale], function (locales, localeCode) {
|
|
27
21
|
return (0, _memoize.default)(function (id, defaultMessage, placeholders) {
|
|
28
22
|
return locales.getLocale(localeCode).getMessage(id, defaultMessage, placeholders);
|
|
29
23
|
}, function () {
|
|
@@ -49,6 +43,15 @@ exports.useMessage = useMessage;
|
|
|
49
43
|
var useTranslate = function useTranslate() {
|
|
50
44
|
return (0, _reactRedux.useSelector)(getMessage);
|
|
51
45
|
};
|
|
46
|
+
/**
|
|
47
|
+
*/
|
|
48
|
+
|
|
52
49
|
|
|
53
50
|
exports.useTranslate = useTranslate;
|
|
51
|
+
|
|
52
|
+
var useLocale = function useLocale() {
|
|
53
|
+
return (0, _reactRedux.useSelector)(_i18n.getLocale);
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
exports.useLocale = useLocale;
|
|
54
57
|
//# sourceMappingURL=useI18n.js.map
|
|
@@ -3,18 +3,13 @@ import { useSelector } from "react-redux";
|
|
|
3
3
|
import { createSelector } from "reselect";
|
|
4
4
|
import memoize from "lodash/memoize";
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
const getLocales = (state) => state.i18n.locales;
|
|
6
|
+
import { getLocales, getLocale } from "../redux/selectors/i18n";
|
|
8
7
|
|
|
9
8
|
const getMessage = createSelector(
|
|
10
|
-
[getLocales,
|
|
9
|
+
[getLocales, getLocale],
|
|
11
10
|
(locales, localeCode) =>
|
|
12
11
|
memoize(
|
|
13
|
-
(
|
|
14
|
-
id?: string | null,
|
|
15
|
-
defaultMessage?: string | null,
|
|
16
|
-
placeholders?: Object
|
|
17
|
-
) =>
|
|
12
|
+
(id: string, defaultMessage?: string, placeholders?: Object) =>
|
|
18
13
|
locales
|
|
19
14
|
.getLocale(localeCode)
|
|
20
15
|
.getMessage(id, defaultMessage, placeholders),
|
|
@@ -25,8 +20,8 @@ const getMessage = createSelector(
|
|
|
25
20
|
/**
|
|
26
21
|
*/
|
|
27
22
|
const useMessage = (
|
|
28
|
-
id
|
|
29
|
-
defaultMessage?: string
|
|
23
|
+
id: string,
|
|
24
|
+
defaultMessage?: string,
|
|
30
25
|
placeholders?: Object | null
|
|
31
26
|
): any => useSelector(getMessage)(id, defaultMessage, placeholders);
|
|
32
27
|
|
|
@@ -34,4 +29,8 @@ const useMessage = (
|
|
|
34
29
|
*/
|
|
35
30
|
const useTranslate = (): ((...any) => any) => useSelector(getMessage);
|
|
36
31
|
|
|
37
|
-
|
|
32
|
+
/**
|
|
33
|
+
*/
|
|
34
|
+
const useLocale = (): string => useSelector(getLocale);
|
|
35
|
+
|
|
36
|
+
export { useTranslate, useMessage, useLocale };
|
package/lib/hooks/useI18n.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useI18n.js","names":["
|
|
1
|
+
{"version":3,"file":"useI18n.js","names":["getMessage","createSelector","getLocales","getLocale","locales","localeCode","memoize","id","defaultMessage","placeholders","args","useMessage","useSelector","useTranslate","useLocale"],"sources":["../../src/hooks/useI18n.js"],"sourcesContent":["// @flow\nimport { useSelector } from \"react-redux\";\nimport { createSelector } from \"reselect\";\nimport memoize from \"lodash/memoize\";\n\nimport { getLocales, getLocale } from \"../redux/selectors/i18n\";\n\nconst getMessage = createSelector(\n [getLocales, getLocale],\n (locales, localeCode) =>\n memoize(\n (id: string, defaultMessage?: string, placeholders?: Object) =>\n locales\n .getLocale(localeCode)\n .getMessage(id, defaultMessage, placeholders),\n (...args) => JSON.stringify(args)\n )\n);\n\n/**\n */\nconst useMessage = (\n id: string,\n defaultMessage?: string,\n placeholders?: Object | null\n): any => useSelector(getMessage)(id, defaultMessage, placeholders);\n\n/**\n */\nconst useTranslate = (): ((...any) => any) => useSelector(getMessage);\n\n/**\n */\nconst useLocale = (): string => useSelector(getLocale);\n\nexport { useTranslate, useMessage, useLocale };\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AACA;;AAEA;;AAEA,IAAMA,UAAU,GAAG,IAAAC,wBAAA,EACjB,CAACC,gBAAD,EAAaC,eAAb,CADiB,EAEjB,UAACC,OAAD,EAAUC,UAAV;EAAA,OACE,IAAAC,gBAAA,EACE,UAACC,EAAD,EAAaC,cAAb,EAAsCC,YAAtC;IAAA,OACEL,OAAO,CACJD,SADH,CACaE,UADb,EAEGL,UAFH,CAEcO,EAFd,EAEkBC,cAFlB,EAEkCC,YAFlC,CADF;EAAA,CADF,EAKE;IAAA,kCAAIC,IAAJ;MAAIA,IAAJ;IAAA;;IAAA,OAAa,wBAAeA,IAAf,CAAb;EAAA,CALF,CADF;AAAA,CAFiB,CAAnB;AAYA;AACA;;AACA,IAAMC,UAAU,GAAG,SAAbA,UAAa,CACjBJ,EADiB,EAEjBC,cAFiB,EAGjBC,YAHiB;EAAA,OAIT,IAAAG,uBAAA,EAAYZ,UAAZ,EAAwBO,EAAxB,EAA4BC,cAA5B,EAA4CC,YAA5C,CAJS;AAAA,CAAnB;AAMA;AACA;;;;;AACA,IAAMI,YAAY,GAAG,SAAfA,YAAe;EAAA,OAAyB,IAAAD,uBAAA,EAAYZ,UAAZ,CAAzB;AAAA,CAArB;AAEA;AACA;;;;;AACA,IAAMc,SAAS,GAAG,SAAZA,SAAY;EAAA,OAAc,IAAAF,uBAAA,EAAYT,eAAZ,CAAd;AAAA,CAAlB"}
|
|
@@ -19,14 +19,14 @@ var _actions = require("../redux/_modularui/actions");
|
|
|
19
19
|
|
|
20
20
|
var _useDeepCompareEffect = _interopRequireDefault(require("./useDeepCompareEffect"));
|
|
21
21
|
|
|
22
|
+
var _useI18n = require("./useI18n");
|
|
23
|
+
|
|
22
24
|
/**
|
|
23
25
|
*/
|
|
24
26
|
var useKeyForHook = function useKeyForHook(modelKey, url) {
|
|
25
27
|
var _context, _context2;
|
|
26
28
|
|
|
27
|
-
var locale = (0,
|
|
28
|
-
return state.i18n.locale;
|
|
29
|
-
});
|
|
29
|
+
var locale = (0, _useI18n.useLocale)();
|
|
30
30
|
return (0, _concat.default)(_context = (0, _concat.default)(_context2 = "".concat(modelKey, "(")).call(_context2, url.split("?")[0], ")(")).call(_context, locale, ")");
|
|
31
31
|
};
|
|
32
32
|
/**
|
|
@@ -7,14 +7,15 @@ import { loadModularUI, removeModelByKey } from "../redux/_modularui/actions";
|
|
|
7
7
|
|
|
8
8
|
import useDeepCompareEffect from "./useDeepCompareEffect";
|
|
9
9
|
|
|
10
|
+
import { useLocale } from "./useI18n";
|
|
11
|
+
|
|
10
12
|
import type Href from "../models/href/Href";
|
|
11
13
|
import type { RequestBaseOptions } from "../utils";
|
|
12
14
|
|
|
13
15
|
/**
|
|
14
16
|
*/
|
|
15
17
|
const useKeyForHook = (modelKey: string, url: string) => {
|
|
16
|
-
const locale =
|
|
17
|
-
|
|
18
|
+
const locale = useLocale();
|
|
18
19
|
return `${modelKey}(${url.split("?")[0]})(${locale})`;
|
|
19
20
|
};
|
|
20
21
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useModularUI.js","names":["useKeyForHook","modelKey","url","locale","
|
|
1
|
+
{"version":3,"file":"useModularUI.js","names":["useKeyForHook","modelKey","url","locale","useLocale","split","useModularUI","options","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","toString","key","prevOptions","useRef","prevHref","useDeepCompareEffect","isOldReload","current","isReload","loadModularUI","useEffect","removeModelByKey","useSelector","state","modularui"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport { loadModularUI, removeModelByKey } from \"../redux/_modularui/actions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\n\nimport { useLocale } from \"./useI18n\";\n\nimport type Href from \"../models/href/Href\";\nimport type { RequestBaseOptions } from \"../utils\";\n\n/**\n */\nconst useKeyForHook = (modelKey: string, url: string) => {\n const locale = useLocale();\n return `${modelKey}(${url.split(\"?\")[0]})(${locale})`;\n};\n\n/**\n * Use redux action and selector to retrieve the correct modular ui service model\n */\nexport const useModularUI = (\n modelKey: string,\n url: string | Href,\n options: RequestBaseOptions = {\n method: HTTP_METHODS.GET,\n removeOnUnmount: false,\n }\n): any => {\n const dispatch = useDispatch();\n const href = url.toString();\n const key = useKeyForHook(modelKey, href);\n\n const prevOptions = useRef(options);\n const prevHref = useRef(href);\n\n // dispatch loadModularUI\n useDeepCompareEffect(() => {\n // prevent reloads when previous option had the isReload, but the new options not\n const isOldReload =\n prevHref.current === href &&\n prevOptions.current.isReload &&\n !options.isReload;\n\n if (!isOldReload) {\n dispatch(loadModularUI(key, href, options));\n }\n\n prevOptions.current = options;\n prevHref.current = href;\n }, [key, href, options]);\n\n const { removeOnUnmount = false } = options;\n useEffect(() => {\n return () => {\n if (removeOnUnmount) {\n dispatch(removeModelByKey(key));\n }\n };\n }, [dispatch, key, removeOnUnmount]);\n\n // retrieve current model from modularui reducer\n return useSelector((state) => {\n return state.modularui[key];\n });\n};\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AAEA;;AACA;;AAEA;;AAEA;;AAKA;AACA;AACA,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,CAACC,QAAD,EAAmBC,GAAnB,EAAmC;EAAA;;EACvD,IAAMC,MAAM,GAAG,IAAAC,kBAAA,GAAf;EACA,kFAAUH,QAAV,wBAAsBC,GAAG,CAACG,KAAJ,CAAU,GAAV,EAAe,CAAf,CAAtB,wBAA4CF,MAA5C;AACD,CAHD;AAKA;AACA;AACA;;;AACO,IAAMG,YAAY,GAAG,SAAfA,YAAe,CAC1BL,QAD0B,EAE1BC,GAF0B,EAOlB;EAAA,IAJRK,OAIQ,uEAJsB;IAC5BC,MAAM,EAAEC,uBAAA,CAAaC,GADO;IAE5BC,eAAe,EAAE;EAFW,CAItB;EACR,IAAMC,QAAQ,GAAG,IAAAC,uBAAA,GAAjB;EACA,IAAMC,IAAI,GAAGZ,GAAG,CAACa,QAAJ,EAAb;EACA,IAAMC,GAAG,GAAGhB,aAAa,CAACC,QAAD,EAAWa,IAAX,CAAzB;EAEA,IAAMG,WAAW,GAAG,IAAAC,aAAA,EAAOX,OAAP,CAApB;EACA,IAAMY,QAAQ,GAAG,IAAAD,aAAA,EAAOJ,IAAP,CAAjB,CANQ,CAQR;;EACA,IAAAM,6BAAA,EAAqB,YAAM;IACzB;IACA,IAAMC,WAAW,GACfF,QAAQ,CAACG,OAAT,KAAqBR,IAArB,IACAG,WAAW,CAACK,OAAZ,CAAoBC,QADpB,IAEA,CAAChB,OAAO,CAACgB,QAHX;;IAKA,IAAI,CAACF,WAAL,EAAkB;MAChBT,QAAQ,CAAC,IAAAY,sBAAA,EAAcR,GAAd,EAAmBF,IAAnB,EAAyBP,OAAzB,CAAD,CAAR;IACD;;IAEDU,WAAW,CAACK,OAAZ,GAAsBf,OAAtB;IACAY,QAAQ,CAACG,OAAT,GAAmBR,IAAnB;EACD,CAbD,EAaG,CAACE,GAAD,EAAMF,IAAN,EAAYP,OAAZ,CAbH;EAeA,4BAAoCA,OAApC,CAAQI,eAAR;EAAA,IAAQA,eAAR,sCAA0B,KAA1B;EACA,IAAAc,gBAAA,EAAU,YAAM;IACd,OAAO,YAAM;MACX,IAAId,eAAJ,EAAqB;QACnBC,QAAQ,CAAC,IAAAc,yBAAA,EAAiBV,GAAjB,CAAD,CAAR;MACD;IACF,CAJD;EAKD,CAND,EAMG,CAACJ,QAAD,EAAWI,GAAX,EAAgBL,eAAhB,CANH,EAzBQ,CAiCR;;EACA,OAAO,IAAAgB,uBAAA,EAAY,UAACC,KAAD,EAAW;IAC5B,OAAOA,KAAK,CAACC,SAAN,CAAgBb,GAAhB,CAAP;EACD,CAFM,CAAP;AAGD,CA5CM"}
|
|
@@ -13,11 +13,9 @@ var _reactRedux = require("react-redux");
|
|
|
13
13
|
|
|
14
14
|
var _ModularUIRequest = _interopRequireDefault(require("../modularui/ModularUIRequest"));
|
|
15
15
|
|
|
16
|
-
var
|
|
17
|
-
var _state$i18n$locale;
|
|
16
|
+
var _i18n = require("../redux/selectors/i18n");
|
|
18
17
|
|
|
19
|
-
|
|
20
|
-
}], function (localeCode) {
|
|
18
|
+
var getModularUIRequest = (0, _reselect.createSelector)([_i18n.getLocale], function (localeCode) {
|
|
21
19
|
return function (href, options) {
|
|
22
20
|
var request = new _ModularUIRequest.default(href, options);
|
|
23
21
|
request.locale = localeCode;
|