@beinformed/ui 1.13.2 → 1.13.6
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 +20 -0
- package/esm/constants/LayoutHintConfig.js +9 -0
- package/esm/constants/LayoutHintConfig.js.map +1 -1
- package/esm/constants/LayoutHints.js +5 -0
- package/esm/constants/LayoutHints.js.map +1 -1
- package/esm/models/attributes/AttributeContent.js +3 -3
- package/esm/models/attributes/AttributeContent.js.map +1 -1
- package/esm/models/attributes/AttributeModel.js.map +1 -1
- package/esm/models/attributes/BooleanAttributeModel.js +1 -0
- package/esm/models/attributes/BooleanAttributeModel.js.map +1 -1
- package/esm/models/attributes/ChoiceAttributeModel.js +1 -0
- package/esm/models/attributes/ChoiceAttributeModel.js.map +1 -1
- package/esm/models/attributes/ChoiceAttributeOptionCollection.js.map +1 -1
- package/esm/models/attributes/ChoiceAttributeOptionModel.js.map +1 -1
- package/esm/models/attributes/CompositeAttributeChildCollection.js +1 -1
- package/esm/models/attributes/CompositeAttributeChildCollection.js.map +1 -1
- package/esm/models/attributes/CompositeAttributeModel.js +2 -1
- package/esm/models/attributes/CompositeAttributeModel.js.map +1 -1
- package/esm/models/attributes/DatetimeAttributeModel.js +8 -3
- package/esm/models/attributes/DatetimeAttributeModel.js.map +1 -1
- package/esm/models/base/BaseCollection.js.map +1 -1
- package/esm/models/base/ResourceCollection.js +4 -2
- package/esm/models/base/ResourceCollection.js.map +1 -1
- package/esm/models/base/ResourceModel.js +1 -0
- package/esm/models/base/ResourceModel.js.map +1 -1
- package/esm/models/concepts/BusinessScenarioModel.js +2 -1
- package/esm/models/concepts/BusinessScenarioModel.js.map +1 -1
- package/esm/models/concepts/ConceptDetailModel.js +2 -1
- package/esm/models/concepts/ConceptDetailModel.js.map +1 -1
- package/esm/models/concepts/ConceptLinkModel.js.map +1 -1
- package/esm/models/concepts/ConceptRelationModel.js.map +1 -1
- package/esm/models/content/ContentLinkModel.js +2 -0
- package/esm/models/content/ContentLinkModel.js.map +1 -1
- package/esm/models/href/Href.js +1 -1
- package/esm/models/href/Href.js.map +1 -1
- package/esm/react-server/renderSSRComplete.js +2 -1
- package/esm/react-server/renderSSRComplete.js.map +1 -1
- package/esm/react-server/serverNoSSR.js +1 -1
- package/esm/react-server/serverNoSSR.js.map +1 -1
- package/esm/redux/_modularui/actions.js +16 -17
- package/esm/redux/_modularui/actions.js.map +1 -1
- package/esm/redux/_modularui/reducer.js +1 -2
- package/esm/redux/_modularui/reducer.js.map +1 -1
- package/esm/redux/actions/SignIn.js +5 -9
- package/esm/redux/actions/SignIn.js.map +1 -1
- package/esm/utils/helpers/objects.js +2 -1
- package/esm/utils/helpers/objects.js.map +1 -1
- package/lib/constants/LayoutHintConfig.js +9 -0
- package/lib/constants/LayoutHintConfig.js.flow +9 -0
- package/lib/constants/LayoutHintConfig.js.map +1 -1
- package/lib/constants/LayoutHints.js +8 -2
- package/lib/constants/LayoutHints.js.flow +4 -0
- package/lib/constants/LayoutHints.js.map +1 -1
- package/lib/hooks/__tests__/useAuthentication.spec.js.flow +1 -0
- package/lib/models/attributes/AttributeContent.js +3 -3
- package/lib/models/attributes/AttributeContent.js.flow +3 -3
- package/lib/models/attributes/AttributeContent.js.map +1 -1
- package/lib/models/attributes/AttributeModel.js.flow +10 -2
- package/lib/models/attributes/AttributeModel.js.map +1 -1
- package/lib/models/attributes/BooleanAttributeModel.js +1 -0
- package/lib/models/attributes/BooleanAttributeModel.js.flow +4 -1
- package/lib/models/attributes/BooleanAttributeModel.js.map +1 -1
- package/lib/models/attributes/ChoiceAttributeModel.js +1 -0
- package/lib/models/attributes/ChoiceAttributeModel.js.flow +4 -1
- package/lib/models/attributes/ChoiceAttributeModel.js.map +1 -1
- package/lib/models/attributes/ChoiceAttributeOptionCollection.js.flow +1 -1
- package/lib/models/attributes/ChoiceAttributeOptionCollection.js.map +1 -1
- package/lib/models/attributes/ChoiceAttributeOptionModel.js.flow +5 -2
- package/lib/models/attributes/ChoiceAttributeOptionModel.js.map +1 -1
- package/lib/models/attributes/CompositeAttributeChildCollection.js +1 -1
- package/lib/models/attributes/CompositeAttributeChildCollection.js.flow +1 -1
- package/lib/models/attributes/CompositeAttributeChildCollection.js.map +1 -1
- package/lib/models/attributes/CompositeAttributeModel.js +2 -1
- package/lib/models/attributes/CompositeAttributeModel.js.flow +1 -0
- package/lib/models/attributes/CompositeAttributeModel.js.map +1 -1
- package/lib/models/attributes/DatetimeAttributeModel.js +9 -3
- package/lib/models/attributes/DatetimeAttributeModel.js.flow +7 -4
- package/lib/models/attributes/DatetimeAttributeModel.js.map +1 -1
- package/lib/models/base/BaseCollection.js.flow +2 -2
- package/lib/models/base/BaseCollection.js.map +1 -1
- package/lib/models/base/ResourceCollection.js +4 -2
- package/lib/models/base/ResourceCollection.js.flow +4 -6
- package/lib/models/base/ResourceCollection.js.map +1 -1
- package/lib/models/base/ResourceModel.js +1 -0
- package/lib/models/base/ResourceModel.js.flow +3 -2
- package/lib/models/base/ResourceModel.js.map +1 -1
- package/lib/models/concepts/BusinessScenarioModel.js +3 -1
- package/lib/models/concepts/BusinessScenarioModel.js.flow +2 -1
- package/lib/models/concepts/BusinessScenarioModel.js.map +1 -1
- package/lib/models/concepts/ConceptDetailModel.js +3 -1
- package/lib/models/concepts/ConceptDetailModel.js.flow +2 -2
- package/lib/models/concepts/ConceptDetailModel.js.map +1 -1
- package/lib/models/concepts/ConceptLinkModel.js.flow +5 -2
- package/lib/models/concepts/ConceptLinkModel.js.map +1 -1
- package/lib/models/concepts/ConceptRelationModel.js.flow +6 -2
- package/lib/models/concepts/ConceptRelationModel.js.map +1 -1
- package/lib/models/content/ContentLinkModel.js +2 -0
- package/lib/models/content/ContentLinkModel.js.flow +2 -0
- package/lib/models/content/ContentLinkModel.js.map +1 -1
- package/lib/models/href/Href.js +1 -1
- package/lib/models/href/Href.js.flow +2 -1
- package/lib/models/href/Href.js.map +1 -1
- package/lib/models/types.js.flow +2 -2
- package/lib/react-server/__tests__/serverUtil.spec.js.flow +15 -14
- package/lib/react-server/renderSSRComplete.js +2 -1
- package/lib/react-server/renderSSRComplete.js.flow +4 -1
- package/lib/react-server/renderSSRComplete.js.map +1 -1
- package/lib/react-server/serverNoSSR.js +1 -1
- package/lib/react-server/serverNoSSR.js.flow +1 -1
- package/lib/react-server/serverNoSSR.js.map +1 -1
- package/lib/redux/_modularui/__tests__/actions.spec.js.flow +1 -0
- package/lib/redux/_modularui/actions.js +12 -12
- package/lib/redux/_modularui/actions.js.flow +12 -12
- package/lib/redux/_modularui/actions.js.map +1 -1
- package/lib/redux/_modularui/reducer.js +1 -2
- package/lib/redux/_modularui/reducer.js.flow +0 -1
- package/lib/redux/_modularui/reducer.js.map +1 -1
- package/lib/redux/actions/SignIn.js +6 -9
- package/lib/redux/actions/SignIn.js.flow +5 -11
- package/lib/redux/actions/SignIn.js.map +1 -1
- package/lib/redux/actions/__tests__/Application.spec.js.flow +1 -0
- package/lib/redux/actions/__tests__/CustomErrorResponseHandler.spec.js.flow +2 -0
- package/lib/utils/fetch/__tests__/xhr.spec.js.flow +1 -0
- package/lib/utils/helpers/objects.js +3 -1
- package/lib/utils/helpers/objects.js.flow +2 -2
- package/lib/utils/helpers/objects.js.map +1 -1
- package/package.json +15 -15
- package/src/constants/LayoutHintConfig.js +9 -0
- package/src/constants/LayoutHints.js +4 -0
- package/src/hooks/__tests__/useAuthentication.spec.js +1 -0
- package/src/models/attributes/AttributeContent.js +3 -3
- package/src/models/attributes/AttributeModel.js +10 -2
- package/src/models/attributes/BooleanAttributeModel.js +4 -1
- package/src/models/attributes/ChoiceAttributeModel.js +4 -1
- package/src/models/attributes/ChoiceAttributeOptionCollection.js +1 -1
- package/src/models/attributes/ChoiceAttributeOptionModel.js +5 -2
- package/src/models/attributes/CompositeAttributeChildCollection.js +1 -1
- package/src/models/attributes/CompositeAttributeModel.js +1 -0
- package/src/models/attributes/DatetimeAttributeModel.js +7 -4
- package/src/models/base/BaseCollection.js +2 -2
- package/src/models/base/ResourceCollection.js +4 -6
- package/src/models/base/ResourceModel.js +3 -2
- package/src/models/concepts/BusinessScenarioModel.js +2 -1
- package/src/models/concepts/ConceptDetailModel.js +2 -2
- package/src/models/concepts/ConceptLinkModel.js +5 -2
- package/src/models/concepts/ConceptRelationModel.js +6 -2
- package/src/models/content/ContentLinkModel.js +2 -0
- package/src/models/href/Href.js +2 -1
- package/src/models/types.js +2 -2
- package/src/react-server/__tests__/serverUtil.spec.js +15 -14
- package/src/react-server/renderSSRComplete.js +4 -1
- package/src/react-server/serverNoSSR.js +1 -1
- package/src/redux/_modularui/__tests__/actions.spec.js +1 -0
- package/src/redux/_modularui/actions.js +12 -12
- package/src/redux/_modularui/reducer.js +0 -1
- package/src/redux/actions/SignIn.js +5 -11
- package/src/redux/actions/__tests__/Application.spec.js +1 -0
- package/src/redux/actions/__tests__/CustomErrorResponseHandler.spec.js +2 -0
- package/src/utils/fetch/__tests__/xhr.spec.js +1 -0
- package/src/utils/helpers/objects.js +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/models/href/Href.js"],"names":["Href","href","resourcetype","path","parameters","hash","state","method","HTTP_METHODS","GET","setFromHref","setFromString","setFromLocationOrObject","pathname","_path","search","addParametersFromString","Array","isArray","_parameters","param","addParameter","_name","_value","_prefix","getHashFromString","_hash","_state","getPathFromString","checkAbsoluteUrl","split","forEach","paramFromString","Parameter","fromString","setParameter","name","value","prefix","removeParameter","push","getParameter","undefined","_method","withPrefix","toQuerystring","join","isModUIParameter","getQuerystring","_resourcetype","isExternal","BASE","querystring","length","absolutepath","thisPath","otherPath","equals","thisParams","toString","every","IllegalArgumentException","CONTENT_PATH","checkAbsolute","RegExp","test","decodedHref","decodeURI","hrefNoHash","substr","indexOf"],"mappings":"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","sourcesContent":["// @flow\nimport { BASE, CONTENT_PATH, HTTP_METHODS } from \"../../constants/Constants\";\n\nimport Parameter from \"../parameter/Parameter\";\nimport { IllegalArgumentException } from \"../../exceptions\";\n\nimport type { LocationShape } from \"react-router\";\n\ntype HrefObject = {\n _path: string,\n _hash: string,\n _parameters: Array<Parameter>,\n _resourcetype: string,\n _method: $Keys<typeof HTTP_METHODS>,\n _state: ?{ [key: string]: any },\n};\n\nexport type HrefInput = Href | HrefObject | LocationShape | string;\n\n/**\n * Defines a Href with the parameters\n */\nclass Href {\n _path: string;\n _hash: string;\n _parameters: Array<Parameter>;\n _resourcetype: string;\n _method: $Keys<typeof HTTP_METHODS>;\n _state: ?{ +[key: string]: any };\n\n /**\n * Create a Href\n */\n constructor(href?: HrefInput, resourcetype?: string) {\n this.path = \"\";\n this.parameters = [];\n this.hash = \"\";\n this.state = null;\n this.method = HTTP_METHODS.GET;\n this.resourcetype = resourcetype || \"\";\n\n if (href instanceof Href) {\n this.setFromHref(href);\n } else if (typeof href === \"string\") {\n this.setFromString(href);\n } else if (typeof href === \"object\") {\n this.setFromLocationOrObject(href);\n }\n }\n\n /**\n * Set parameters from Href model input\n */\n setFromHref(href: Href) {\n this.path = href.path;\n this.parameters = href.parameters;\n this.hash = href.hash;\n this.state = href.state;\n }\n\n /**\n */\n setFromLocationOrObject(href: LocationShape | HrefObject) {\n if (href.pathname) {\n this.path = href.pathname;\n } else if (typeof href._path === \"string\") {\n this.path = href._path;\n }\n\n if (href.search) {\n this.addParametersFromString(href.search);\n } else if (Array.isArray(href._parameters)) {\n // $FlowExpectedError[incompatible-call]\n href._parameters.map((param: Parameter) =>\n this.addParameter(param._name, param._value, param._prefix)\n );\n }\n\n if (href.hash) {\n this.hash = Href.getHashFromString(href.hash);\n } else if (typeof href._hash === \"string\") {\n this.hash = href._hash;\n }\n\n if (href.state) {\n this.state = href.state || null;\n } else if (typeof href._state === \"object\") {\n this.state = href._state;\n }\n }\n\n /**\n * Set parameters from string input\n */\n setFromString(href: string) {\n this.path = Href.getPathFromString(href);\n this.addParametersFromString(href);\n this.hash = Href.getHashFromString(href);\n }\n\n /**\n */\n get isChangePassword(): boolean {\n return this._path.includes(\"/change-password\");\n }\n\n /**\n * check if the path is referencing a camel route\n */\n static isCamelRoute(path: string): boolean {\n return (\n path.startsWith(\"/restServices\") && !path.startsWith(\"/restServices/ui\")\n );\n }\n\n /**\n */\n static checkAbsoluteUrl(href: string): boolean {\n const checkAbsolute = new RegExp(\"^(?:[a-z]+:)?//\", \"i\");\n return checkAbsolute.test(href);\n }\n\n // Check if url is relative (not checking for absolute urls with same domain)\n /**\n */\n get isExternal(): boolean {\n return Href.checkAbsoluteUrl(this.path);\n }\n\n /**\n * Retrieve the relative path part of a href string, e.g. https://www.beinformed.com/BeInformed/tab/view?q=url => /tab/view\n */\n static getPathFromString(href: string): string {\n const decodedHref = decodeURI(href);\n\n const hrefNoHash = decodedHref.includes(\"#\")\n ? decodedHref.substr(0, decodedHref.indexOf(\"#\"))\n : decodedHref;\n\n return hrefNoHash.includes(\"?\") ? hrefNoHash.split(\"?\")[0] : hrefNoHash;\n }\n\n /**\n * Retrieve hash of href string\n */\n static getHashFromString(href: string = \"\"): string {\n return href.includes(\"#\") ? href.substr(href.indexOf(\"#\") + 1) : \"\";\n }\n\n /**\n * Add a parameter for each parameter found in the querystring of an URL string, e.g. https://www.beinformed.com?q=url => q=url\n */\n addParametersFromString(href: string): Href {\n if (href.includes(\"?\")) {\n href\n .split(\"?\")[1]\n .split(\"&\")\n .forEach((param) => {\n const paramFromString = Parameter.fromString(param);\n if (paramFromString) {\n this.setParameter(\n paramFromString.name,\n paramFromString.value,\n paramFromString.prefix\n );\n }\n });\n }\n\n return this;\n }\n\n /**\n * Add a querystring parameter to the parameter collection of this Href, skips parameters that have a value of null\n */\n addParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value !== null) {\n this.removeParameter(name, prefix);\n this._parameters.push(new Parameter(prefix, name, value));\n }\n\n return this;\n }\n\n /**\n * Adds or overwrites a parameter when it exists and value is not null.\n * Removes the parameter when the value is null\n */\n setParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value === null) {\n this.removeParameter(name, prefix);\n } else {\n this.addParameter(name, value, prefix);\n }\n\n return this;\n }\n\n /**\n * Retrieve a parameter by it's name and (optionally) prefix\n */\n getParameter(name: string, prefix: ?string): ?Parameter {\n return this._parameters.find(\n (param) => param.prefix === prefix && param.name === name\n );\n }\n\n /**\n */\n hasParameter(name: string, prefix: ?string): boolean {\n return this.getParameter(name, prefix) !== undefined;\n }\n\n /**\n * Get request method\n */\n get method(): $Keys<typeof HTTP_METHODS> {\n return this._method;\n }\n\n /**\n * Set request method\n */\n set method(method: $Keys<typeof HTTP_METHODS>) {\n this._method = method || HTTP_METHODS.GET;\n }\n\n /**\n * Retrieve all paremters\n */\n get parameters(): Array<Parameter> {\n return this._parameters;\n }\n\n /**\n * Replace parameters of Href\n */\n set parameters(parameters: Array<Parameter>) {\n this._parameters = parameters;\n }\n\n /**\n * Remove a parameter from the parameter collection\n */\n removeParameter(name: string, prefix: ?string): Href {\n this._parameters = this._parameters.filter(\n (param) => param.prefix !== prefix || param.name !== name\n );\n\n return this;\n }\n\n /**\n * Get the parameters as a querystring, e.g. param1=value1¶m2=value2, optionally with prefix\n */\n getQuerystring(withPrefix: boolean = false): string {\n return this.parameters\n .filter((param) => param.value != null)\n .map((param) => param.toQuerystring(withPrefix))\n .join(\"&\");\n }\n\n /**\n * Retrieve a querystring that only contains parameter that can be send to the modular ui, parameters are filtered by prefix\n */\n getQuerystringForModularUI(prefix: string = \"\"): string {\n return this.parameters\n .filter(\n (param) =>\n param.isModUIParameter &&\n (!prefix || !param.prefix || param.prefix === prefix) &&\n param.value != null\n )\n .map((param) => param.toQuerystring(false))\n .join(\"&\");\n }\n\n /**\n * Retrieve all parameters from the parameter collection in a querystring style name1=value1&name2=value2, without the prefix\n */\n get querystring(): string {\n return this.getQuerystring(false);\n }\n\n /**\n * Set the path of the Href, the part before the querystring question mark\n */\n set path(path: string) {\n this._path = path;\n }\n\n /**\n * Retrieve the path\n */\n get path(): string {\n return this._path || \"\";\n }\n\n /**\n * Set hash\n */\n set hash(hash: string) {\n this._hash = hash;\n }\n\n /**\n * Retrieve hash\n */\n get hash(): string {\n return this._hash;\n }\n\n /**\n */\n set state(state: ?{ +[key: string]: any }) {\n this._state = state;\n }\n\n /**\n */\n get state(): ?{ +[key: string]: any } {\n return this._state;\n }\n\n /**\n */\n setState(state: { [key: string]: any }): Href {\n this.state = state;\n\n return this;\n }\n\n /**\n * Set resourctype\n */\n set resourcetype(resourcetype: string) {\n this._resourcetype = resourcetype;\n }\n\n /**\n * Retrieve resourceType\n */\n get resourcetype(): string {\n return this._resourcetype;\n }\n\n /**\n * Retrieve the path combined with the BASE of the application, e.g. /BeInformed\n */\n get absolutepath(): string {\n if (this.isExternal) {\n return this.path;\n }\n\n return BASE + this.path;\n }\n\n /**\n * Retrieves the combination of the path and the querystring\n */\n get href(): string {\n return this.querystring.length > 0\n ? [this.path, this.querystring].join(\"?\")\n : this.path;\n }\n\n /**\n * Getting the URL including the base path\n */\n get absolutehref(): string {\n const querystring = this.getQuerystring(true);\n\n return querystring.length > 0\n ? [this.absolutepath, querystring].join(\"?\")\n : this.absolutepath;\n }\n\n /**\n * Checks if the URL starts within the given href\n */\n startsWith(href: Href | string): boolean {\n const thisPath = `${this.path}/`;\n const otherPath = href instanceof Href ? `${href.path}/` : href;\n\n return thisPath.startsWith(otherPath);\n }\n\n /**\n * Checks if the given Href equals this Href\n */\n equals(href: Href | string): boolean {\n if (href instanceof Href) {\n return this.path === href.path;\n }\n\n return this.path === href;\n }\n\n /**\n */\n equalsWithParameters(href: Href): boolean {\n if (!this.equals(href)) {\n return false;\n }\n\n if (href instanceof Href) {\n if (this.parameters.length !== href.parameters.length) {\n return false;\n }\n\n if (this.parameters.length === 0 && href.parameters.length === 0) {\n return true;\n }\n\n const thisParams = this.parameters.map((param) => param.toString());\n\n return href.parameters.every((param) =>\n thisParams.includes(param.toString())\n );\n }\n\n throw new IllegalArgumentException(`${href} is not an instance of Href`);\n }\n\n /**\n * Indicates if the link is a content link\n */\n get isContent(): boolean {\n return this.absolutepath.startsWith(CONTENT_PATH);\n }\n\n /**\n * Returns a complete url from the Href\n */\n toString(): string {\n return this.href;\n }\n\n /**\n */\n toLocation(): LocationShape {\n return {\n pathname: this.path,\n search: this.querystring.length > 0 ? `?${this.querystring}` : \"\",\n hash: this.hash.length > 0 ? `#${this.hash}` : \"\",\n state: this.state,\n };\n }\n}\n\nexport default Href;\n"],"file":"Href.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/models/href/Href.js"],"names":["Href","href","resourcetype","path","parameters","hash","state","method","HTTP_METHODS","GET","setFromHref","setFromString","setFromLocationOrObject","pathname","_path","search","addParametersFromString","Array","isArray","_parameters","param","addParameter","_name","_value","_prefix","getHashFromString","_hash","_state","getPathFromString","checkAbsoluteUrl","split","forEach","paramFromString","Parameter","fromString","setParameter","name","value","prefix","removeParameter","push","getParameter","undefined","_method","withPrefix","toQuerystring","join","isModUIParameter","getQuerystring","_resourcetype","isExternal","BASE","querystring","length","absolutepath","thisPath","otherPath","equals","thisParams","toString","every","IllegalArgumentException","CONTENT_PATH","checkAbsolute","RegExp","test","decodedHref","decodeURI","hrefNoHash","substr","indexOf"],"mappings":"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","sourcesContent":["// @flow\nimport { BASE, CONTENT_PATH, HTTP_METHODS } from \"../../constants/Constants\";\n\nimport Parameter from \"../parameter/Parameter\";\nimport { IllegalArgumentException } from \"../../exceptions\";\n\nimport type { LocationShape } from \"react-router\";\n\ntype HrefObject = {\n _path: string,\n _hash: string,\n _parameters: Array<Parameter>,\n _resourcetype: string,\n _method: $Keys<typeof HTTP_METHODS>,\n _state: ?{ [key: string]: any },\n pathname: ?string,\n};\n\nexport type HrefInput = Href | HrefObject | LocationShape | string;\n\n/**\n * Defines a Href with the parameters\n */\nclass Href {\n _path: string;\n _hash: string;\n _parameters: Array<Parameter>;\n _resourcetype: string;\n _method: $Keys<typeof HTTP_METHODS>;\n _state: ?{ +[key: string]: any };\n\n /**\n * Create a Href\n */\n constructor(href?: HrefInput, resourcetype?: string) {\n this.path = \"\";\n this.parameters = [];\n this.hash = \"\";\n this.state = null;\n this.method = HTTP_METHODS.GET;\n this.resourcetype = resourcetype || \"\";\n\n if (href instanceof Href) {\n this.setFromHref(href);\n } else if (typeof href === \"string\") {\n this.setFromString(href);\n } else if (typeof href === \"object\") {\n this.setFromLocationOrObject(href);\n }\n }\n\n /**\n * Set parameters from Href model input\n */\n setFromHref(href: Href) {\n this.path = href.path;\n this.parameters = href.parameters;\n this.hash = href.hash;\n this.state = href.state;\n }\n\n /**\n */\n setFromLocationOrObject(href: LocationShape | HrefObject) {\n if (typeof href[\"pathname\"] === \"string\") {\n this.path = href.pathname;\n } else if (typeof href._path === \"string\") {\n this.path = href._path;\n }\n\n if (href.search) {\n this.addParametersFromString(href.search);\n } else if (Array.isArray(href._parameters)) {\n // $FlowExpectedError[incompatible-call]\n href._parameters.map((param: Parameter) =>\n this.addParameter(param._name, param._value, param._prefix)\n );\n }\n\n if (href.hash) {\n this.hash = Href.getHashFromString(href.hash);\n } else if (typeof href._hash === \"string\") {\n this.hash = href._hash;\n }\n\n if (href.state) {\n this.state = href.state || null;\n } else if (typeof href._state === \"object\") {\n this.state = href._state;\n }\n }\n\n /**\n * Set parameters from string input\n */\n setFromString(href: string) {\n this.path = Href.getPathFromString(href);\n this.addParametersFromString(href);\n this.hash = Href.getHashFromString(href);\n }\n\n /**\n */\n get isChangePassword(): boolean {\n return this._path.includes(\"/change-password\");\n }\n\n /**\n * check if the path is referencing a camel route\n */\n static isCamelRoute(path: string): boolean {\n return (\n path.startsWith(\"/restServices\") && !path.startsWith(\"/restServices/ui\")\n );\n }\n\n /**\n */\n static checkAbsoluteUrl(href: string): boolean {\n const checkAbsolute = new RegExp(\"^(?:[a-z]+:)?//\", \"i\");\n return checkAbsolute.test(href);\n }\n\n // Check if url is relative (not checking for absolute urls with same domain)\n /**\n */\n get isExternal(): boolean {\n return Href.checkAbsoluteUrl(this.path);\n }\n\n /**\n * Retrieve the relative path part of a href string, e.g. https://www.beinformed.com/BeInformed/tab/view?q=url => /tab/view\n */\n static getPathFromString(href: string): string {\n const decodedHref = decodeURI(href);\n\n const hrefNoHash = decodedHref.includes(\"#\")\n ? decodedHref.substr(0, decodedHref.indexOf(\"#\"))\n : decodedHref;\n\n return hrefNoHash.includes(\"?\") ? hrefNoHash.split(\"?\")[0] : hrefNoHash;\n }\n\n /**\n * Retrieve hash of href string\n */\n static getHashFromString(href: string = \"\"): string {\n return href.includes(\"#\") ? href.substr(href.indexOf(\"#\") + 1) : \"\";\n }\n\n /**\n * Add a parameter for each parameter found in the querystring of an URL string, e.g. https://www.beinformed.com?q=url => q=url\n */\n addParametersFromString(href: string): Href {\n if (href.includes(\"?\")) {\n href\n .split(\"?\")[1]\n .split(\"&\")\n .forEach((param) => {\n const paramFromString = Parameter.fromString(param);\n if (paramFromString) {\n this.setParameter(\n paramFromString.name,\n paramFromString.value,\n paramFromString.prefix\n );\n }\n });\n }\n\n return this;\n }\n\n /**\n * Add a querystring parameter to the parameter collection of this Href, skips parameters that have a value of null\n */\n addParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value !== null) {\n this.removeParameter(name, prefix);\n this._parameters.push(new Parameter(prefix, name, value));\n }\n\n return this;\n }\n\n /**\n * Adds or overwrites a parameter when it exists and value is not null.\n * Removes the parameter when the value is null\n */\n setParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value === null) {\n this.removeParameter(name, prefix);\n } else {\n this.addParameter(name, value, prefix);\n }\n\n return this;\n }\n\n /**\n * Retrieve a parameter by it's name and (optionally) prefix\n */\n getParameter(name: string, prefix: ?string): ?Parameter {\n return this._parameters.find(\n (param) => param.prefix === prefix && param.name === name\n );\n }\n\n /**\n */\n hasParameter(name: string, prefix: ?string): boolean {\n return this.getParameter(name, prefix) !== undefined;\n }\n\n /**\n * Get request method\n */\n get method(): $Keys<typeof HTTP_METHODS> {\n return this._method;\n }\n\n /**\n * Set request method\n */\n set method(method: $Keys<typeof HTTP_METHODS>) {\n this._method = method || HTTP_METHODS.GET;\n }\n\n /**\n * Retrieve all paremters\n */\n get parameters(): Array<Parameter> {\n return this._parameters;\n }\n\n /**\n * Replace parameters of Href\n */\n set parameters(parameters: Array<Parameter>) {\n this._parameters = parameters;\n }\n\n /**\n * Remove a parameter from the parameter collection\n */\n removeParameter(name: string, prefix: ?string): Href {\n this._parameters = this._parameters.filter(\n (param) => param.prefix !== prefix || param.name !== name\n );\n\n return this;\n }\n\n /**\n * Get the parameters as a querystring, e.g. param1=value1¶m2=value2, optionally with prefix\n */\n getQuerystring(withPrefix: boolean = false): string {\n return this.parameters\n .filter((param) => param.value != null)\n .map((param) => param.toQuerystring(withPrefix))\n .join(\"&\");\n }\n\n /**\n * Retrieve a querystring that only contains parameter that can be send to the modular ui, parameters are filtered by prefix\n */\n getQuerystringForModularUI(prefix: string = \"\"): string {\n return this.parameters\n .filter(\n (param) =>\n param.isModUIParameter &&\n (!prefix || !param.prefix || param.prefix === prefix) &&\n param.value != null\n )\n .map((param) => param.toQuerystring(false))\n .join(\"&\");\n }\n\n /**\n * Retrieve all parameters from the parameter collection in a querystring style name1=value1&name2=value2, without the prefix\n */\n get querystring(): string {\n return this.getQuerystring(false);\n }\n\n /**\n * Set the path of the Href, the part before the querystring question mark\n */\n set path(path: string) {\n this._path = path;\n }\n\n /**\n * Retrieve the path\n */\n get path(): string {\n return this._path || \"\";\n }\n\n /**\n * Set hash\n */\n set hash(hash: string) {\n this._hash = hash;\n }\n\n /**\n * Retrieve hash\n */\n get hash(): string {\n return this._hash;\n }\n\n /**\n */\n set state(state: ?{ +[key: string]: any }) {\n this._state = state;\n }\n\n /**\n */\n get state(): ?{ +[key: string]: any } {\n return this._state;\n }\n\n /**\n */\n setState(state: { [key: string]: any }): Href {\n this.state = state;\n\n return this;\n }\n\n /**\n * Set resourctype\n */\n set resourcetype(resourcetype: string) {\n this._resourcetype = resourcetype;\n }\n\n /**\n * Retrieve resourceType\n */\n get resourcetype(): string {\n return this._resourcetype;\n }\n\n /**\n * Retrieve the path combined with the BASE of the application, e.g. /BeInformed\n */\n get absolutepath(): string {\n if (this.isExternal) {\n return this.path;\n }\n\n return BASE + this.path;\n }\n\n /**\n * Retrieves the combination of the path and the querystring\n */\n get href(): string {\n return this.querystring.length > 0\n ? [this.path, this.querystring].join(\"?\")\n : this.path;\n }\n\n /**\n * Getting the URL including the base path\n */\n get absolutehref(): string {\n const querystring = this.getQuerystring(true);\n\n return querystring.length > 0\n ? [this.absolutepath, querystring].join(\"?\")\n : this.absolutepath;\n }\n\n /**\n * Checks if the URL starts within the given href\n */\n startsWith(href: Href | string): boolean {\n const thisPath = `${this.path}/`;\n const otherPath = href instanceof Href ? `${href.path}/` : href;\n\n return thisPath.startsWith(otherPath);\n }\n\n /**\n * Checks if the given Href equals this Href\n */\n equals(href: Href | string): boolean {\n if (href instanceof Href) {\n return this.path === href.path;\n }\n\n return this.path === href;\n }\n\n /**\n */\n equalsWithParameters(href: Href): boolean {\n if (!this.equals(href)) {\n return false;\n }\n\n if (href instanceof Href) {\n if (this.parameters.length !== href.parameters.length) {\n return false;\n }\n\n if (this.parameters.length === 0 && href.parameters.length === 0) {\n return true;\n }\n\n const thisParams = this.parameters.map((param) => param.toString());\n\n return href.parameters.every((param) =>\n thisParams.includes(param.toString())\n );\n }\n\n throw new IllegalArgumentException(`${href} is not an instance of Href`);\n }\n\n /**\n * Indicates if the link is a content link\n */\n get isContent(): boolean {\n return this.absolutepath.startsWith(CONTENT_PATH);\n }\n\n /**\n * Returns a complete url from the Href\n */\n toString(): string {\n return this.href;\n }\n\n /**\n */\n toLocation(): LocationShape {\n return {\n pathname: this.path,\n search: this.querystring.length > 0 ? `?${this.querystring}` : \"\",\n hash: this.hash.length > 0 ? `#${this.hash}` : \"\",\n state: this.state,\n };\n }\n}\n\nexport default Href;\n"],"file":"Href.js"}
|
package/lib/models/types.js.flow
CHANGED
|
@@ -149,8 +149,8 @@ export interface ILayoutHintRule {
|
|
|
149
149
|
}
|
|
150
150
|
|
|
151
151
|
export interface IModelWithChildModels {
|
|
152
|
-
|
|
153
|
-
|
|
152
|
+
getInitialChildModelLinks(): Array<LinkModel>;
|
|
153
|
+
setChildModels(models: Array<ModularUIModel>): void;
|
|
154
154
|
}
|
|
155
155
|
|
|
156
156
|
export type FileEntryType = {
|
|
@@ -16,6 +16,20 @@ global.preferencesProvider = {
|
|
|
16
16
|
|
|
17
17
|
const mockStore = configureMockStore();
|
|
18
18
|
|
|
19
|
+
const getExpectedLocales = () =>
|
|
20
|
+
new Locales([
|
|
21
|
+
...availableLocales.map((locale) =>
|
|
22
|
+
locale.code === "nl"
|
|
23
|
+
? {
|
|
24
|
+
...locale,
|
|
25
|
+
messages: {
|
|
26
|
+
message_nl: "Dutch message",
|
|
27
|
+
},
|
|
28
|
+
}
|
|
29
|
+
: locale
|
|
30
|
+
),
|
|
31
|
+
]);
|
|
32
|
+
|
|
19
33
|
describe("serverUtil", () => {
|
|
20
34
|
it("handles setI18n", () => {
|
|
21
35
|
const store = mockStore({ i18n: {} });
|
|
@@ -39,25 +53,12 @@ describe("serverUtil", () => {
|
|
|
39
53
|
}
|
|
40
54
|
);
|
|
41
55
|
|
|
42
|
-
const expectedLocales = new Locales([
|
|
43
|
-
...availableLocales.map((locale) =>
|
|
44
|
-
locale.code === "nl"
|
|
45
|
-
? {
|
|
46
|
-
...locale,
|
|
47
|
-
messages: {
|
|
48
|
-
message_nl: "Dutch message",
|
|
49
|
-
},
|
|
50
|
-
}
|
|
51
|
-
: locale
|
|
52
|
-
),
|
|
53
|
-
]);
|
|
54
|
-
|
|
55
56
|
expect(store.getActions()).toStrictEqual([
|
|
56
57
|
{
|
|
57
58
|
type: "SET_LOCALES",
|
|
58
59
|
payload: {
|
|
59
60
|
locale: "en",
|
|
60
|
-
locales:
|
|
61
|
+
locales: getExpectedLocales(),
|
|
61
62
|
},
|
|
62
63
|
},
|
|
63
64
|
]);
|
|
@@ -46,7 +46,8 @@ var renderSSRComplete = function renderSSRComplete(_ref) {
|
|
|
46
46
|
template = _ref$template === void 0 ? _htmlpage.default : _ref$template;
|
|
47
47
|
var helmetContext = {};
|
|
48
48
|
var routerContext = {};
|
|
49
|
-
var sheet = new _styledComponents.ServerStyleSheet(); // $
|
|
49
|
+
var sheet = new _styledComponents.ServerStyleSheet(); // $FlowFixMe[incompatible-type]
|
|
50
|
+
// $FlowFixMe[prop-missing]
|
|
50
51
|
|
|
51
52
|
var location = requestHref.toLocation();
|
|
52
53
|
return (0, _createSSRComplete.default)(store, function () {
|
|
@@ -21,6 +21,8 @@ import type { Theme } from "../react-theme/types";
|
|
|
21
21
|
import type { ReduxStore } from "../redux/types";
|
|
22
22
|
import type Href from "../models/href/Href";
|
|
23
23
|
import type { TemplateProps } from "./htmlpage";
|
|
24
|
+
import type { Location } from "react-router";
|
|
25
|
+
|
|
24
26
|
type Props = {
|
|
25
27
|
store: ReduxStore,
|
|
26
28
|
theme: Theme,
|
|
@@ -46,7 +48,8 @@ const renderSSRComplete = ({
|
|
|
46
48
|
|
|
47
49
|
const sheet = new ServerStyleSheet();
|
|
48
50
|
|
|
49
|
-
// $
|
|
51
|
+
// $FlowFixMe[incompatible-type]
|
|
52
|
+
// $FlowFixMe[prop-missing]
|
|
50
53
|
const location: Location = requestHref.toLocation();
|
|
51
54
|
|
|
52
55
|
return createSSRComplete(store, () =>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/react-server/renderSSRComplete.js"],"names":["renderSSRComplete","store","theme","UUID","requestHref","render","ErrorPage","template","htmlpage","helmetContext","routerContext","sheet","ServerStyleSheet","location","toLocation","instance","BASE","then","appHTML","head","contextPath","html","state","catch","error","message","fileName","lineNumber","stack","helmet"],"mappings":";;;;;;;;;AACA;;AACA;;AACA;;AAEA;;AAEA;;AAEA;;AACA;;AAEA;;AAEA;;AACA;;AAEA;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/react-server/renderSSRComplete.js"],"names":["renderSSRComplete","store","theme","UUID","requestHref","render","ErrorPage","template","htmlpage","helmetContext","routerContext","sheet","ServerStyleSheet","location","toLocation","instance","BASE","then","appHTML","head","contextPath","html","state","catch","error","message","fileName","lineNumber","stack","helmet"],"mappings":";;;;;;;;;AACA;;AACA;;AACA;;AAEA;;AAEA;;AAEA;;AACA;;AAEA;;AAEA;;AACA;;AAEA;;;;AAiBA;AACA;AACA,IAAMA,iBAAiB,GAAG,SAApBA,iBAAoB,OAQI;AAAA,MAP5BC,KAO4B,QAP5BA,KAO4B;AAAA,wBAN5BC,KAM4B;AAAA,MAN5BA,KAM4B,2BANpB,EAMoB;AAAA,uBAL5BC,IAK4B;AAAA,MAL5BA,IAK4B,0BALrB,EAKqB;AAAA,MAJ5BC,WAI4B,QAJ5BA,WAI4B;AAAA,MAH5BC,MAG4B,QAH5BA,MAG4B;AAAA,MAF5BC,SAE4B,QAF5BA,SAE4B;AAAA,2BAD5BC,QAC4B;AAAA,MAD5BA,QAC4B,8BADjBC,iBACiB;AAC5B,MAAMC,aAAa,GAAG,EAAtB;AACA,MAAMC,aAAa,GAAG,EAAtB;AAEA,MAAMC,KAAK,GAAG,IAAIC,kCAAJ,EAAd,CAJ4B,CAM5B;AACA;;AACA,MAAMC,QAAkB,GAAGT,WAAW,CAACU,UAAZ,EAA3B;AAEA,SAAO,gCAAkBb,KAAlB,EAAyB;AAAA,WAC9B,0CACE,qBAAC,oBAAD;AAAU,MAAA,KAAK,EAAEA,KAAjB;AAAA,6BACE,qBAAC,mCAAD;AAAmB,QAAA,KAAK,EAAEU,KAAK,CAACI,QAAhC;AAAA,+BACE,qBAAC,sBAAD;AAAe,UAAA,KAAK,EAAEb,KAAtB;AAAA,iCACE,qBAAC,gCAAD;AAAgB,YAAA,OAAO,EAAEO,aAAzB;AAAA,mCACE,qBAAC,sBAAD;AAAA,qCACE,qBAAC,yBAAD;AACE,gBAAA,QAAQ,EAAEO,eADZ;AAEE,gBAAA,QAAQ,EAAEH,QAFZ;AAGE,gBAAA,OAAO,EAAEH,aAHX;AAAA,0BAKGL,MAAM;AALT;AADF;AADF;AADF;AADF;AADF,MADF,CAD8B;AAAA,GAAzB,EAqBJY,IArBI,CAqBC,UAACC,OAAD,EAAa;AACjB,kCAAajB,KAAb;AACA,QAAMkB,IAAI,GAAG,4BAAWR,KAAX,EAAkBR,IAAlB,EAAwBM,aAAxB,CAAb;AACA,WAAOF,QAAQ,CAAC;AACda,MAAAA,WAAW,EAAEJ,eADC;AAEdK,MAAAA,IAAI,EAAEH,OAFQ;AAGdC,MAAAA,IAAI,EAAJA,IAHc;AAIdG,MAAAA,KAAK,EAAE,2BAAUrB,KAAV,CAJO;AAKdE,MAAAA,IAAI,EAAJA;AALc,KAAD,CAAf;AAOD,GA/BI,EAgCJoB,KAhCI,CAgCE,UAACC,KAAD;AAAA,WACLjB,QAAQ,CAAC;AACPa,MAAAA,WAAW,EAAEJ,eADN;AAEPK,MAAAA,IAAI,EAAE,0CACJ,qBAAC,mCAAD;AAAmB,QAAA,KAAK,EAAEV,KAAK,CAACI,QAAhC;AAAA,+BACE,qBAAC,sBAAD;AAAe,UAAA,KAAK,EAAEb,KAAtB;AAAA,iCACE,qBAAC,SAAD;AACE,YAAA,YAAY,EAAEsB,KAAK,CAACC,OADtB;AAEE,YAAA,aAAa,EAAED,KAAK,CAACE,QAFvB;AAGE,YAAA,SAAS,EAAEF,KAAK,CAACG,UAHnB;AAIE,YAAA,UAAU,EAAEH,KAAK,CAACI;AAJpB;AADF;AADF,QADI,CAFC;AAcPT,MAAAA,IAAI,EAAEV,aAAa,CAACoB,MAdb;AAePP,MAAAA,KAAK,EAAE,EAfA;AAgBPnB,MAAAA,IAAI,EAAJA;AAhBO,KAAD,CADH;AAAA,GAhCF,CAAP;AAoDD,CAtED;;eAwEeH,iB","sourcesContent":["// @flow\nimport { renderToString } from \"react-dom/server\";\nimport { Provider } from \"react-redux\";\nimport { StaticRouter as Router } from \"react-router\";\n\nimport { HelmetProvider } from \"react-helmet-async\";\n\nimport { ServerStyleSheet, StyleSheetManager } from \"styled-components\";\n\nimport createSSRComplete from \"./createSSRComplete\";\nimport htmlpage from \"./htmlpage\";\n\nimport { BASE } from \"../constants/Constants\";\n\nimport ThemeProvider from \"../react-theme/ThemeProvider\";\nimport ErrorBoundary from \"../react/ErrorBoundary\";\n\nimport { createHead, handleErrors, dehydrate } from \"./serverUtil\";\n\nimport type { Theme } from \"../react-theme/types\";\nimport type { ReduxStore } from \"../redux/types\";\nimport type Href from \"../models/href/Href\";\nimport type { TemplateProps } from \"./htmlpage\";\nimport type { Location } from \"react-router\";\n\ntype Props = {\n store: ReduxStore,\n theme: Theme,\n UUID: string,\n requestHref: Href,\n render: Function,\n ErrorPage: any,\n template?: (TemplateProps) => string,\n};\n/**\n */\nconst renderSSRComplete = ({\n store,\n theme = {},\n UUID = \"\",\n requestHref,\n render,\n ErrorPage,\n template = htmlpage,\n}: Props): Promise<string> => {\n const helmetContext = {};\n const routerContext = {};\n\n const sheet = new ServerStyleSheet();\n\n // $FlowFixMe[incompatible-type]\n // $FlowFixMe[prop-missing]\n const location: Location = requestHref.toLocation();\n\n return createSSRComplete(store, () =>\n renderToString(\n <Provider store={store}>\n <StyleSheetManager sheet={sheet.instance}>\n <ThemeProvider theme={theme}>\n <HelmetProvider context={helmetContext}>\n <ErrorBoundary>\n <Router\n basename={BASE}\n location={location}\n context={routerContext}\n >\n {render()}\n </Router>\n </ErrorBoundary>\n </HelmetProvider>\n </ThemeProvider>\n </StyleSheetManager>\n </Provider>\n )\n )\n .then((appHTML) => {\n handleErrors(store);\n const head = createHead(sheet, UUID, helmetContext);\n return template({\n contextPath: BASE,\n html: appHTML,\n head,\n state: dehydrate(store),\n UUID,\n });\n })\n .catch((error) =>\n template({\n contextPath: BASE,\n html: renderToString(\n <StyleSheetManager sheet={sheet.instance}>\n <ThemeProvider theme={theme}>\n <ErrorPage\n errorMessage={error.message}\n errorResource={error.fileName}\n errorLine={error.lineNumber}\n errorStack={error.stack}\n />\n </ThemeProvider>\n </StyleSheetManager>\n ),\n head: helmetContext.helmet,\n state: \"\",\n UUID,\n })\n );\n};\n\nexport default renderSSRComplete;\n"],"file":"renderSSRComplete.js"}
|
|
@@ -45,7 +45,7 @@ var serverNoSSR = function serverNoSSR(_ref) {
|
|
|
45
45
|
if (theme) {
|
|
46
46
|
var _store$getState, _store$getState$prefe;
|
|
47
47
|
|
|
48
|
-
var storedTheme = (_store$getState = store.getState()) === null || _store$getState === void 0 ? void 0 : (_store$getState$prefe = _store$getState.preferences) === null || _store$getState$prefe === void 0 ? void 0 : _store$getState$prefe.theme; // $FlowFixMe
|
|
48
|
+
var storedTheme = (_store$getState = store.getState()) === null || _store$getState === void 0 ? void 0 : (_store$getState$prefe = _store$getState.preferences) === null || _store$getState$prefe === void 0 ? void 0 : _store$getState$prefe.theme; // $FlowFixMe[incompatible-call]
|
|
49
49
|
|
|
50
50
|
(0, _createTheme.default)(storedTheme, theme);
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/react-server/serverNoSSR.js"],"names":["serverNoSSR","request","locales","customReducers","serverPreferences","theme","render","template","beforeRenderHooks","UUID","__webpack_nonce__","requestHref","store","storedTheme","getState","preferences"],"mappings":";;;;;;;;;AACA;;AAEA;;AACA;;AAEA;;AAQA;;AAEA;;AAEA;;AAiBA;AACA;AACA,IAAMA,WAAW,GAAG,SAAdA,WAAc,OASO;AAAA,MARzBC,OAQyB,QARzBA,OAQyB;AAAA,MAPzBC,OAOyB,QAPzBA,OAOyB;AAAA,MANzBC,cAMyB,QANzBA,cAMyB;AAAA,mCALzBC,iBAKyB;AAAA,MALzBA,iBAKyB,sCALL,EAKK;AAAA,wBAJzBC,KAIyB;AAAA,MAJzBA,KAIyB,2BAJjB,IAIiB;AAAA,MAHzBC,MAGyB,QAHzBA,MAGyB;AAAA,MAFzBC,QAEyB,QAFzBA,QAEyB;AAAA,MADzBC,iBACyB,QADzBA,iBACyB;AACzB,MAAMC,IAAI,GAAG,0BAAb;AACAC,EAAAA,iBAAiB,GAAGD,IAApB,CAFyB,CAEC;;AAE1B,MAAME,WAAW,GAAG,4CAAmBV,OAAnB,CAApB;AACA,MAAMW,KAAK,GAAG,kCAAiBD,WAAjB,EAA8BR,cAA9B,CAAd;AAEA,wCAAqBS,KAArB,EAA4BR,iBAA5B;AACA,yCAAsBQ,KAAtB;;AAEA,MAAIP,KAAJ,EAAW;AAAA;;AACT,QAAMQ,WAAW,sBAAGD,KAAK,CAACE,QAAN,EAAH,6EAAG,gBAAkBC,WAArB,0DAAG,sBAA+BV,KAAnD,CADS,CAET;;AACA,8BAAYQ,WAAZ,EAAyBR,KAAzB;AACD;;AAED,2BAAQO,KAAR,EAAeV,OAAf,EAAwBD,OAAxB;AAEA,gCAAaW,KAAb;AAEA,kDAAwBJ,iBAAxB,EAA2C;AAAEI,IAAAA,KAAK,EAALA,KAAF;AAASX,IAAAA,OAAO,EAAPA;AAAT,GAA3C;AAEA,SAAO,+BAAiB;AAAEW,IAAAA,KAAK,EAALA,KAAF;AAASP,IAAAA,KAAK,EAALA,KAAT;AAAgBI,IAAAA,IAAI,EAAJA,IAAhB;AAAsBH,IAAAA,MAAM,EAANA,MAAtB;AAA8BC,IAAAA,QAAQ,EAARA;AAA9B,GAAjB,CAAP;AACD,CAhCD;;eAkCeP,W","sourcesContent":["// @flow\nimport \"./contextPath\";\n\nimport createUUID from \"../utils/helpers/createUUID\";\nimport { getFullRequestHref } from \"./requestInformation\";\n\nimport {\n createReduxStore,\n setI18n,\n setServerPreferences,\n setConfigurationTheme,\n handleErrors,\n} from \"./serverUtil\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport renderSSRMinimal from \"./renderSSRMinimal\";\n\nimport createTheme from \"../react-theme/createTheme\";\n\nimport type { TemplateProps } from \"./htmlpage\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { PreferenceValue } from \"./serverUtil\";\nimport type { LocaleConfiguration } from \"../i18n/types\";\ntype serverProps = {\n request: HttpServletRequestJava,\n locales?: Array<LocaleConfiguration>,\n customReducers?: Object,\n theme?: Object,\n serverPreferences?: Array<string | PreferenceValue>,\n render: Function,\n template?: (TemplateProps) => string,\n beforeRenderHooks?: Array<BeforeRenderHook>,\n};\n\n/**\n */\nconst serverNoSSR = ({\n request,\n locales,\n customReducers,\n serverPreferences = [],\n theme = null,\n render,\n template,\n beforeRenderHooks,\n}: serverProps): string => {\n const UUID = createUUID();\n __webpack_nonce__ = UUID; // NOSONAR\n\n const requestHref = getFullRequestHref(request);\n const store = createReduxStore(requestHref, customReducers);\n\n setServerPreferences(store, serverPreferences);\n setConfigurationTheme(store);\n\n if (theme) {\n const storedTheme = store.getState()?.preferences?.theme;\n // $FlowFixMe\n createTheme(storedTheme, theme);\n }\n\n setI18n(store, locales, request);\n\n handleErrors(store);\n\n handleBeforeRenderHooks(beforeRenderHooks, { store, request });\n\n return renderSSRMinimal({ store, theme, UUID, render, template });\n};\n\nexport default serverNoSSR;\n"],"file":"serverNoSSR.js"}
|
|
1
|
+
{"version":3,"sources":["../../src/react-server/serverNoSSR.js"],"names":["serverNoSSR","request","locales","customReducers","serverPreferences","theme","render","template","beforeRenderHooks","UUID","__webpack_nonce__","requestHref","store","storedTheme","getState","preferences"],"mappings":";;;;;;;;;AACA;;AAEA;;AACA;;AAEA;;AAQA;;AAEA;;AAEA;;AAiBA;AACA;AACA,IAAMA,WAAW,GAAG,SAAdA,WAAc,OASO;AAAA,MARzBC,OAQyB,QARzBA,OAQyB;AAAA,MAPzBC,OAOyB,QAPzBA,OAOyB;AAAA,MANzBC,cAMyB,QANzBA,cAMyB;AAAA,mCALzBC,iBAKyB;AAAA,MALzBA,iBAKyB,sCALL,EAKK;AAAA,wBAJzBC,KAIyB;AAAA,MAJzBA,KAIyB,2BAJjB,IAIiB;AAAA,MAHzBC,MAGyB,QAHzBA,MAGyB;AAAA,MAFzBC,QAEyB,QAFzBA,QAEyB;AAAA,MADzBC,iBACyB,QADzBA,iBACyB;AACzB,MAAMC,IAAI,GAAG,0BAAb;AACAC,EAAAA,iBAAiB,GAAGD,IAApB,CAFyB,CAEC;;AAE1B,MAAME,WAAW,GAAG,4CAAmBV,OAAnB,CAApB;AACA,MAAMW,KAAK,GAAG,kCAAiBD,WAAjB,EAA8BR,cAA9B,CAAd;AAEA,wCAAqBS,KAArB,EAA4BR,iBAA5B;AACA,yCAAsBQ,KAAtB;;AAEA,MAAIP,KAAJ,EAAW;AAAA;;AACT,QAAMQ,WAAW,sBAAGD,KAAK,CAACE,QAAN,EAAH,6EAAG,gBAAkBC,WAArB,0DAAG,sBAA+BV,KAAnD,CADS,CAET;;AACA,8BAAYQ,WAAZ,EAAyBR,KAAzB;AACD;;AAED,2BAAQO,KAAR,EAAeV,OAAf,EAAwBD,OAAxB;AAEA,gCAAaW,KAAb;AAEA,kDAAwBJ,iBAAxB,EAA2C;AAAEI,IAAAA,KAAK,EAALA,KAAF;AAASX,IAAAA,OAAO,EAAPA;AAAT,GAA3C;AAEA,SAAO,+BAAiB;AAAEW,IAAAA,KAAK,EAALA,KAAF;AAASP,IAAAA,KAAK,EAALA,KAAT;AAAgBI,IAAAA,IAAI,EAAJA,IAAhB;AAAsBH,IAAAA,MAAM,EAANA,MAAtB;AAA8BC,IAAAA,QAAQ,EAARA;AAA9B,GAAjB,CAAP;AACD,CAhCD;;eAkCeP,W","sourcesContent":["// @flow\nimport \"./contextPath\";\n\nimport createUUID from \"../utils/helpers/createUUID\";\nimport { getFullRequestHref } from \"./requestInformation\";\n\nimport {\n createReduxStore,\n setI18n,\n setServerPreferences,\n setConfigurationTheme,\n handleErrors,\n} from \"./serverUtil\";\n\nimport { handleBeforeRenderHooks } from \"../redux/store/beforeRenderHooks\";\n\nimport renderSSRMinimal from \"./renderSSRMinimal\";\n\nimport createTheme from \"../react-theme/createTheme\";\n\nimport type { TemplateProps } from \"./htmlpage\";\nimport type { BeforeRenderHook } from \"../redux/store/beforeRenderHooks\";\nimport type { PreferenceValue } from \"./serverUtil\";\nimport type { LocaleConfiguration } from \"../i18n/types\";\ntype serverProps = {\n request: HttpServletRequestJava,\n locales?: Array<LocaleConfiguration>,\n customReducers?: Object,\n theme?: Object,\n serverPreferences?: Array<string | PreferenceValue>,\n render: Function,\n template?: (TemplateProps) => string,\n beforeRenderHooks?: Array<BeforeRenderHook>,\n};\n\n/**\n */\nconst serverNoSSR = ({\n request,\n locales,\n customReducers,\n serverPreferences = [],\n theme = null,\n render,\n template,\n beforeRenderHooks,\n}: serverProps): string => {\n const UUID = createUUID();\n __webpack_nonce__ = UUID; // NOSONAR\n\n const requestHref = getFullRequestHref(request);\n const store = createReduxStore(requestHref, customReducers);\n\n setServerPreferences(store, serverPreferences);\n setConfigurationTheme(store);\n\n if (theme) {\n const storedTheme = store.getState()?.preferences?.theme;\n // $FlowFixMe[incompatible-call]\n createTheme(storedTheme, theme);\n }\n\n setI18n(store, locales, request);\n\n handleErrors(store);\n\n handleBeforeRenderHooks(beforeRenderHooks, { store, request });\n\n return renderSSRMinimal({ store, theme, UUID, render, template });\n};\n\nexport default serverNoSSR;\n"],"file":"serverNoSSR.js"}
|
|
@@ -19,6 +19,8 @@ exports.updateStatus = exports.updateModel = exports.setModel = exports.resetMod
|
|
|
19
19
|
|
|
20
20
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
|
|
21
21
|
|
|
22
|
+
var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
|
|
23
|
+
|
|
22
24
|
var _Constants = require("../../constants/Constants");
|
|
23
25
|
|
|
24
26
|
var _Href = _interopRequireDefault(require("../../models/href/Href"));
|
|
@@ -105,7 +107,8 @@ exports.updateStatus = updateStatus;
|
|
|
105
107
|
|
|
106
108
|
var loadModelSuccessAction = function loadModelSuccessAction(key, model, modelToUpdate) {
|
|
107
109
|
if (modelToUpdate) {
|
|
108
|
-
|
|
110
|
+
// $FlowFixMe[prop-missing]
|
|
111
|
+
if (typeof modelToUpdate["update"] === "function") {
|
|
109
112
|
var clonedModel = modelToUpdate.clone();
|
|
110
113
|
clonedModel.update(model);
|
|
111
114
|
return updateModel(clonedModel);
|
|
@@ -168,18 +171,15 @@ var loadModularUI = function loadModularUI(key, href, options) {
|
|
|
168
171
|
dispatch(updateStatus(key, _Constants.MODULARUI_STATUS.LOADING));
|
|
169
172
|
dispatch((0, _ProgressIndicator.startProgress)());
|
|
170
173
|
var loadModelPromise = dispatch(loadModel(key, href, options));
|
|
174
|
+
return _promise.default.resolve(loadModelPromise).then(function (response) {
|
|
175
|
+
if ((response === null || response === void 0 ? void 0 : response.type) === "FINISH_PROGRESS") {
|
|
176
|
+
dispatch(updateStatus(key, _Constants.MODULARUI_STATUS.FINISHED));
|
|
177
|
+
}
|
|
171
178
|
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
return dispatch((0, _ProgressIndicator.finishProgress)());
|
|
179
|
-
}).catch(function (error) {
|
|
180
|
-
return dispatch((0, _Error.handleError)(error));
|
|
181
|
-
});
|
|
182
|
-
}
|
|
179
|
+
return dispatch((0, _ProgressIndicator.finishProgress)());
|
|
180
|
+
}).catch(function (error) {
|
|
181
|
+
return dispatch((0, _Error.handleError)(error));
|
|
182
|
+
});
|
|
183
183
|
};
|
|
184
184
|
};
|
|
185
185
|
/**
|
|
@@ -73,7 +73,8 @@ const loadModelSuccessAction = (
|
|
|
73
73
|
modelToUpdate
|
|
74
74
|
): UpdateModelAction | SetModelAction => {
|
|
75
75
|
if (modelToUpdate) {
|
|
76
|
-
|
|
76
|
+
// $FlowFixMe[prop-missing]
|
|
77
|
+
if (typeof modelToUpdate["update"] === "function") {
|
|
77
78
|
const clonedModel = modelToUpdate.clone();
|
|
78
79
|
clonedModel.update(model);
|
|
79
80
|
|
|
@@ -140,17 +141,16 @@ export const loadModularUI =
|
|
|
140
141
|
dispatch(startProgress());
|
|
141
142
|
|
|
142
143
|
const loadModelPromise = dispatch(loadModel(key, href, options));
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
}
|
|
144
|
+
|
|
145
|
+
return Promise.resolve(loadModelPromise)
|
|
146
|
+
.then((response) => {
|
|
147
|
+
if (response?.type === "FINISH_PROGRESS") {
|
|
148
|
+
dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
return dispatch(finishProgress());
|
|
152
|
+
})
|
|
153
|
+
.catch((error) => dispatch(handleError(error)));
|
|
154
154
|
};
|
|
155
155
|
|
|
156
156
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/redux/_modularui/actions.js"],"names":["setModel","key","model","connectKey","type","payload","updateModel","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","modelToUpdate","
|
|
1
|
+
{"version":3,"sources":["../../../src/redux/_modularui/actions.js"],"names":["setModel","key","model","connectKey","type","payload","updateModel","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","modelToUpdate","clonedModel","clone","update","Error","loadModel","href","options","Href","method","HTTP_METHODS","GET","data","locale","childmodels","targetModel","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","isInvalidUsername","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","loadModelPromise","resolve","then","response","FINISHED","catch","reloadModel","selfhref","isReload"],"mappings":"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","sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n ModularUIAction,\n SetModelAction,\n UpdateModelAction,\n RemoveModelByKeyAction,\n ResetModularUIAction,\n UpdateStatusAction,\n} from \"./types\";\nimport type { RequestBaseOptions } from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n key: string,\n model: ModularUIModel\n): SetModelAction => {\n // set key on model for later reference\n model.connectKey = key;\n return {\n type: \"MODULARUI/SET\",\n payload: {\n key,\n model,\n },\n };\n};\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n type: \"MODULARUI/UPDATE\",\n payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n type: \"MODULARUI/REMOVE_KEY\",\n payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n key: string,\n status: $Keys<typeof MODULARUI_STATUS>\n): UpdateStatusAction => ({\n type: \"MODULARUI/STATUS\",\n payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n key: string,\n model: ModularUIModel,\n modelToUpdate\n): UpdateModelAction | SetModelAction => {\n if (modelToUpdate) {\n // $FlowFixMe[prop-missing]\n if (typeof modelToUpdate[\"update\"] === \"function\") {\n const clonedModel = modelToUpdate.clone();\n clonedModel.update(model);\n\n return updateModel(clonedModel);\n }\n\n throw new Error(\n `loadModel action: updateModel is set as option for ${key}, but the model is missing an update methode`\n );\n }\n\n return setModel(key, model);\n};\n\n/**\n */\nexport const loadModel = (\n key: string,\n href: Href | string,\n options?: RequestBaseOptions\n): ModularUIAction => ({\n type: \"MODULARUI/FETCH\",\n payload: {\n href: href instanceof Href ? href : new Href(href),\n method: options?.method ?? HTTP_METHODS.GET,\n data: options?.data,\n locale: options?.locale ?? \"en\",\n childmodels: options?.childmodels,\n targetModel: options?.targetModel,\n /**\n */\n successAction: (model) =>\n loadModelSuccessAction(key, model, options?.updateModel),\n /**\n */\n errorAction: (error) => {\n const errorResponse = new ErrorResponse(error, key);\n if (errorResponse.isChangePassword) {\n return {\n type: \"NO_ACTION\",\n };\n } else if (\n errorResponse.isResourceNotFoundAfterReload ||\n errorResponse.isInvalidUsername\n ) {\n return removeModelByKey(key);\n }\n\n return updateStatus(key, MODULARUI_STATUS.ERROR);\n },\n },\n});\n\n/**\n */\nexport const loadModularUI =\n (\n key: string,\n href: Href | string,\n options?: RequestBaseOptions\n ): ThunkAction =>\n (dispatch: Dispatch) => {\n dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n dispatch(startProgress());\n\n const loadModelPromise = dispatch(loadModel(key, href, options));\n\n return Promise.resolve(loadModelPromise)\n .then((response) => {\n if (response?.type === \"FINISH_PROGRESS\") {\n dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));\n }\n\n return dispatch(finishProgress());\n })\n .catch((error) => dispatch(handleError(error)));\n };\n\n/**\n */\nexport const reloadModel = (\n model: ModularUIModel,\n options?: RequestBaseOptions\n): ThunkAction =>\n loadModularUI(model.connectKey, model.selfhref, {\n ...options,\n isReload: true,\n });\n"],"file":"actions.js"}
|
|
@@ -121,8 +121,7 @@ var removeKey = function removeKey(modelKey, state) {
|
|
|
121
121
|
|
|
122
122
|
// eslint-disable-next-line no-unused-vars
|
|
123
123
|
var _ = state[modelKey],
|
|
124
|
-
newState = (0, _objectWithoutProperties2.default)(state, (0, _map.default)(_context2 = [modelKey]).call(_context2, _toPropertyKey));
|
|
125
|
-
|
|
124
|
+
newState = (0, _objectWithoutProperties2.default)(state, (0, _map.default)(_context2 = [modelKey]).call(_context2, _toPropertyKey));
|
|
126
125
|
return newState;
|
|
127
126
|
};
|
|
128
127
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/redux/_modularui/reducer.js"],"names":["updateStatus","state","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","model","IllegalArgumentException","getModelKey","connectKey","updateModel","modelKey","Error","removeKey","_","newState","resetModularUI","ApplicationModel","initialState","ModularUIReducer","action","type","payload"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;;;;;;;;;AAMA;AACA;AACA,IAAMA,YAAY,GAAG,SAAfA,YAAe,CAACC,KAAD,QAA4B;AAAA,MAAlBC,GAAkB,QAAlBA,GAAkB;AAAA,MAAbC,MAAa,QAAbA,MAAa;;AAC/C;AACA,MAAIA,MAAM,KAAKC,4BAAiBC,OAA5B,IAAuC,CAACJ,KAAK,CAACC,GAAD,CAAjD,EAAwD;AACtD,WAAOD,KAAP;AACD;;AAED,yCACKA,KADL,yCAEGC,GAFH,kCAGOD,KAAK,CAACC,GAAD,CAHZ;AAIIC,IAAAA,MAAM,EAANA,MAJJ;AAKIG,IAAAA,gBAAgB,EAAEC,IAAI,CAACC,GAAL;AALtB;AAQD,CAdD;AAgBA;AACA;;;AACA,IAAMC,QAAQ,GAAG,SAAXA,QAAW,CAACR,KAAD,SAA2B;AAAA,MAAjBC,GAAiB,SAAjBA,GAAiB;AAAA,MAAZQ,KAAY,SAAZA,KAAY;;AAC1C,MAAI,CAACT,KAAK,CAACC,GAAD,CAAV,EAAiB;AACf,WAAOD,KAAP;AACD;;AAED,MAAIS,KAAJ,EAAW;AACT,2CACKT,KADL,yCAEGC,GAFH,kCAGOD,KAAK,CAACC,GAAD,CAHZ;AAIIQ,MAAAA,KAAK,EAALA,KAJJ;AAKIJ,MAAAA,gBAAgB,EAAEC,IAAI,CAACC,GAAL;AALtB;AAQD;;AAED,QAAM,IAAIG,oCAAJ,CAA6B,uBAA7B,CAAN;AACD,CAjBD;AAmBA;AACA;;;AACA,IAAMC,WAAW,GAAG,SAAdA,WAAc,CAACX,KAAD,EAAQS,KAAR;AAAA;;AAAA,SAClB,iDAAYT,KAAZ,kBAAwB,UAACC,GAAD,EAAS;AAAA;;AAC/B,QAAMW,UAAU,0CAAGZ,KAAK,CAACC,GAAD,CAAR,mEAAG,WAAYQ,KAAf,qDAAG,iBAAmBG,UAAtB,yEAAoC,EAApD;AACA,WAAOA,UAAU,KAAKH,KAAK,CAACG,UAA5B;AACD,GAHD,CADkB;AAAA,CAApB;AAMA;AACA;;;AACA,IAAMC,WAAW,GAAG,SAAdA,WAAc,CAACb,KAAD,EAAQS,KAAR,EAAkB;AACpC,MAAMK,QAAQ,GAAGH,WAAW,CAACX,KAAD,EAAQS,KAAR,CAA5B;;AAEA,MAAIK,QAAJ,EAAc;AACZ,WAAON,QAAQ,CAACR,KAAD,EAAQ;AAAEC,MAAAA,GAAG,EAAEa,QAAP;AAAiBL,MAAAA,KAAK,EAALA;AAAjB,KAAR,CAAf;AACD;;AAED,QAAM,IAAIM,KAAJ,0DAC8CN,KAAK,CAACG,UADpD,EAAN;AAGD,CAVD;AAYA;AACA;;;AACA,IAAMI,SAAS,GAAG,SAAZA,SAAY,CAACF,QAAD,EAAmBd,KAAnB,EAA6D;AAAA;;AAC7E;AACA,MAAoBiB,CAApB,GAAuCjB,KAAvC,CAASc,QAAT;AAAA,MAA0BI,QAA1B,0CAAuClB,KAAvC,iCAASc,QAAT,
|
|
1
|
+
{"version":3,"sources":["../../../src/redux/_modularui/reducer.js"],"names":["updateStatus","state","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","model","IllegalArgumentException","getModelKey","connectKey","updateModel","modelKey","Error","removeKey","_","newState","resetModularUI","ApplicationModel","initialState","ModularUIReducer","action","type","payload"],"mappings":"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","sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\n\n/**\n */\nconst updateStatus = (state, { key, status }) => {\n // model should always be available when status is not loading\n if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n return state;\n }\n\n return {\n ...state,\n [key]: {\n ...state[key],\n status,\n lastModification: Date.now(),\n },\n };\n};\n\n/**\n */\nconst setModel = (state, { key, model }) => {\n if (!state[key]) {\n return state;\n }\n\n if (model) {\n return {\n ...state,\n [key]: {\n ...state[key],\n model,\n lastModification: Date.now(),\n },\n };\n }\n\n throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst getModelKey = (state, model) =>\n Object.keys(state).find((key) => {\n const connectKey = state[key]?.model?.connectKey ?? \"\";\n return connectKey === model.connectKey;\n });\n\n/**\n */\nconst updateModel = (state, model) => {\n const modelKey = getModelKey(state, model);\n\n if (modelKey) {\n return setModel(state, { key: modelKey, model });\n }\n\n throw new Error(\n `ModularUIReducer: Cannot update model with key ${model.connectKey}`\n );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n // eslint-disable-next-line no-unused-vars\n const { [modelKey]: _, ...newState } = state;\n\n return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n const newState = {};\n\n for (const key in state) {\n if (state[key].model instanceof ApplicationModel) {\n newState[key] = { ...state[key] };\n }\n }\n\n return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n state = initialState,\n action\n) => {\n if (!action) {\n return state;\n }\n\n switch (action.type) {\n case \"MODULARUI/RESET\":\n return resetModularUI(state);\n\n case \"MODULARUI/STATUS\":\n return updateStatus(state, action.payload);\n\n case \"MODULARUI/SET\":\n return setModel(state, action.payload);\n\n case \"MODULARUI/UPDATE\":\n return updateModel(state, action.payload);\n\n case \"MODULARUI/REMOVE_KEY\":\n return removeKey(action.payload, state);\n\n default:\n return state;\n }\n};\n"],"file":"reducer.js"}
|
|
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.loginSuccess = exports.loginFailed = exports.login = exports.changePassword = void 0;
|
|
9
9
|
|
|
10
|
+
var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
|
|
11
|
+
|
|
10
12
|
var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
|
|
11
13
|
|
|
12
14
|
var _Authenticate = _interopRequireDefault(require("../../modularui/Authenticate"));
|
|
@@ -81,16 +83,11 @@ var login = function login(username, password) {
|
|
|
81
83
|
}).catch(function (error) {
|
|
82
84
|
if (error.id === "Error.ChangePasswordRequired") {
|
|
83
85
|
var dispatchedReloadApplication = dispatch((0, _Application.reloadApplication)());
|
|
86
|
+
return _promise.default.resolve(dispatchedReloadApplication).then(function () {
|
|
87
|
+
_Cache.default.addItem("auth", true);
|
|
84
88
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
_Cache.default.addItem("auth", true);
|
|
88
|
-
|
|
89
|
-
return dispatch(changePassword());
|
|
90
|
-
}).then(function () {
|
|
91
|
-
return dispatch((0, _ProgressIndicator.finishProgress)());
|
|
92
|
-
});
|
|
93
|
-
}
|
|
89
|
+
return dispatch(changePassword());
|
|
90
|
+
});
|
|
94
91
|
}
|
|
95
92
|
|
|
96
93
|
dispatch(loginFailed(error.id));
|
|
@@ -66,17 +66,11 @@ export const login =
|
|
|
66
66
|
.catch((error) => {
|
|
67
67
|
if (error.id === "Error.ChangePasswordRequired") {
|
|
68
68
|
const dispatchedReloadApplication = dispatch(reloadApplication());
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
.then(() => {
|
|
75
|
-
Cache.addItem("auth", true);
|
|
76
|
-
return dispatch(changePassword());
|
|
77
|
-
})
|
|
78
|
-
.then(() => dispatch(finishProgress()));
|
|
79
|
-
}
|
|
69
|
+
|
|
70
|
+
return Promise.resolve(dispatchedReloadApplication).then(() => {
|
|
71
|
+
Cache.addItem("auth", true);
|
|
72
|
+
return dispatch(changePassword());
|
|
73
|
+
});
|
|
80
74
|
}
|
|
81
75
|
|
|
82
76
|
dispatch(loginFailed(error.id));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/redux/actions/SignIn.js"],"names":["loginFailed","errorMessage","type","payload","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","CHANGEPASSWORD_PATH","login","username","password","Authenticate","then","Cache","addItem","catch","error","id","dispatchedReloadApplication"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/redux/actions/SignIn.js"],"names":["loginFailed","errorMessage","type","payload","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","CHANGEPASSWORD_PATH","login","username","password","Authenticate","then","Cache","addItem","catch","error","id","dispatchedReloadApplication","resolve"],"mappings":";;;;;;;;;;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAQA;AACA;AACA;AACO,IAAMA,WAAW,GAAG,SAAdA,WAAc,CAACC,YAAD;AAAA,SAA8C;AACvEC,IAAAA,IAAI,EAAE,sBADiE;AAEvEC,IAAAA,OAAO,EAAEF;AAF8D,GAA9C;AAAA,CAApB;AAKP;AACA;AACA;;;;;AACO,IAAMG,YAAY,GAAG,SAAfA,YAAe;AAAA,SAA2B;AACrDF,IAAAA,IAAI,EAAE;AAD+C,GAA3B;AAAA,CAArB;AAIP;AACA;AACA;;;;;AACO,IAAMG,cAAc,GAAG,SAAjBA,cAAiB;AAAA,SAAmB,UAACC,QAAD,EAAWC,QAAX,EAAwB;AAAA;;AACvED,IAAAA,QAAQ,CAAC;AACPJ,MAAAA,IAAI,EAAE;AADC,KAAD,CAAR;AAIA,QAAMM,OAAO,4BAAGD,QAAQ,GAAGE,MAAX,CAAkBC,QAArB,oFAAG,sBAA4BC,KAA/B,2DAAG,uBAAmCC,KAAnD;AACA,QAAMC,YAAY,6BAAGN,QAAQ,GAAGE,MAAX,CAAkBC,QAArB,qFAAG,uBAA4BC,KAA/B,2DAAG,uBAAmCG,IAAxD;AACA,WAAOR,QAAQ,CACb,mBAAKS,8BAAL,EAA0B;AACxBD,MAAAA,IAAI,EAAED,YAAY,GAAGA,YAAH,GAAkBN,QAAQ,GAAGE,MAAX,CAAkBC,QAD9B;AAExBE,MAAAA,KAAK,EAAEJ;AAFiB,KAA1B,CADa,CAAf;AAMD,GAb6B;AAAA,CAAvB;AAeP;AACA;;;;;AACO,IAAMQ,KAAK,GAChB,SADWA,KACX,CAACC,QAAD,EAAmBC,QAAnB;AAAA,SACA,UAACZ,QAAD,EAAc;AACZA,IAAAA,QAAQ,CAAC,uCAAD,CAAR;AAEA,WAAO,IAAIa,qBAAJ,GACJH,KADI,CACEC,QADF,EACYC,QADZ,EAEJE,IAFI,CAEC;AAAA,aAAMd,QAAQ,CAAC,qCAAD,CAAd;AAAA,KAFD,EAGJc,IAHI,CAGC,YAAM;AACVC,qBAAMC,OAAN,CAAc,MAAd,EAAsB,IAAtB;;AACAhB,MAAAA,QAAQ,CAACF,YAAY,EAAb,CAAR;AAEA,aAAOE,QAAQ,CAAC,wCAAD,CAAf;AACD,KARI,EASJiB,KATI,CASE,UAACC,KAAD,EAAW;AAChB,UAAIA,KAAK,CAACC,EAAN,KAAa,8BAAjB,EAAiD;AAC/C,YAAMC,2BAA2B,GAAGpB,QAAQ,CAAC,qCAAD,CAA5C;AAEA,eAAO,iBAAQqB,OAAR,CAAgBD,2BAAhB,EAA6CN,IAA7C,CAAkD,YAAM;AAC7DC,yBAAMC,OAAN,CAAc,MAAd,EAAsB,IAAtB;;AACA,iBAAOhB,QAAQ,CAACD,cAAc,EAAf,CAAf;AACD,SAHM,CAAP;AAID;;AAEDC,MAAAA,QAAQ,CAACN,WAAW,CAACwB,KAAK,CAACC,EAAP,CAAZ,CAAR;AACA,aAAOnB,QAAQ,CAAC,wCAAD,CAAf;AACD,KArBI,CAAP;AAsBD,GA1BD;AAAA,CADK","sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { push } from \"../_router/actions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n LoginFailedAction,\n LoginSuccessAction,\n ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (errorMessage: string): LoginFailedAction => ({\n type: \"AUTHENTICATION_ERROR\",\n payload: errorMessage,\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n dispatch({\n type: \"CHANGE_PASSWORD\",\n });\n\n const isModal = getState().router.location?.state?.modal;\n const locationFrom = getState().router.location?.state?.from;\n return dispatch(\n push(CHANGEPASSWORD_PATH, {\n from: locationFrom ? locationFrom : getState().router.location,\n modal: isModal,\n })\n );\n};\n\n/**\n */\nexport const login =\n (username: string, password: string): ThunkAction =>\n (dispatch) => {\n dispatch(startProgress());\n\n return new Authenticate()\n .login(username, password)\n .then(() => dispatch(reloadApplication()))\n .then(() => {\n Cache.addItem(\"auth\", true);\n dispatch(loginSuccess());\n\n return dispatch(finishProgress());\n })\n .catch((error) => {\n if (error.id === \"Error.ChangePasswordRequired\") {\n const dispatchedReloadApplication = dispatch(reloadApplication());\n\n return Promise.resolve(dispatchedReloadApplication).then(() => {\n Cache.addItem(\"auth\", true);\n return dispatch(changePassword());\n });\n }\n\n dispatch(loginFailed(error.id));\n return dispatch(finishProgress());\n });\n };\n"],"file":"SignIn.js"}
|
|
@@ -27,6 +27,7 @@ describe("custom error response handling", () => {
|
|
|
27
27
|
const store = mockStore({});
|
|
28
28
|
|
|
29
29
|
setCustomErrorResponseHandler((error) => {
|
|
30
|
+
// eslint-disable-next-line jest/no-conditional-in-test
|
|
30
31
|
if (error.isRemoteServiceException) {
|
|
31
32
|
return {
|
|
32
33
|
type: "REMOTE_SERVICE_EXCEPTION",
|
|
@@ -50,6 +51,7 @@ describe("custom error response handling", () => {
|
|
|
50
51
|
const store = mockStore({});
|
|
51
52
|
|
|
52
53
|
setCustomErrorResponseHandler((error, defaultHandler) => (dispatch) => {
|
|
54
|
+
// eslint-disable-next-line jest/no-conditional-in-test
|
|
53
55
|
if (error.isRemoteServiceException) {
|
|
54
56
|
dispatch({
|
|
55
57
|
type: "REMOTE_SERVICE_EXCEPTION",
|
|
@@ -156,6 +156,7 @@ describe("xhr", () => {
|
|
|
156
156
|
onProgress: ({ type, loaded, total, lengthComputable }) => {
|
|
157
157
|
events.push({ type, loaded, total, lengthComputable });
|
|
158
158
|
|
|
159
|
+
// eslint-disable-next-line jest/no-conditional-in-test
|
|
159
160
|
if (type === "loadend") {
|
|
160
161
|
resolve(events);
|
|
161
162
|
}
|
|
@@ -11,10 +11,12 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/ty
|
|
|
11
11
|
|
|
12
12
|
var _has2 = _interopRequireDefault(require("lodash/has"));
|
|
13
13
|
|
|
14
|
+
var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
|
|
15
|
+
|
|
14
16
|
/**
|
|
15
17
|
*/
|
|
16
18
|
var isPlainObject = function isPlainObject(value) {
|
|
17
|
-
return
|
|
19
|
+
return (0, _isPlainObject2.default)(value);
|
|
18
20
|
};
|
|
19
21
|
/**
|
|
20
22
|
*/
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
// @flow
|
|
2
2
|
import _has from "lodash/has";
|
|
3
|
+
import _isPlainObject from "lodash/isPlainObject";
|
|
3
4
|
|
|
4
5
|
/**
|
|
5
6
|
*/
|
|
6
|
-
export const isPlainObject = (value: any): boolean =>
|
|
7
|
-
Object.prototype.toString.call(value) === "[object Object]";
|
|
7
|
+
export const isPlainObject = (value: any): boolean => _isPlainObject(value);
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
10
|
*/
|