@beinformed/ui 1.21.3 → 1.21.4

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 CHANGED
@@ -2,33 +2,35 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
- ### [1.21.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.21.2...v1.21.3) (2022-08-22)
5
+ ### [1.21.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.21.3...v1.21.4) (2022-08-25)
6
+
7
+ ### Bug Fixes
8
+
9
+ - **list-groups:** render correct label when group attribute has a dynamicschema ([cd5d145](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/cd5d14567c4eb82b994140d892ccec83d211c71e))
6
10
 
11
+ ### [1.21.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.21.2...v1.21.3) (2022-08-22)
7
12
 
8
13
  ### Bug Fixes
9
14
 
10
- * **error:** layouthint ([fb433dd](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/fb433dd7d170e0676356ce1f3bb4f2a2877ee60a))
15
+ - **error:** layouthint ([fb433dd](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/fb433dd7d170e0676356ce1f3bb4f2a2877ee60a))
11
16
 
12
17
  ### [1.21.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.21.1...v1.21.2) (2022-08-14)
13
18
 
14
-
15
19
  ### Bug Fixes
16
20
 
17
- * **error:** ErrorResponse messages ([7a153a8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/7a153a8c48be43f8ae4c1449880f8f901110ba3a))
21
+ - **error:** ErrorResponse messages ([7a153a8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/7a153a8c48be43f8ae4c1449880f8f901110ba3a))
18
22
 
19
23
  ### [1.21.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.21.0...v1.21.1) (2022-08-10)
20
24
 
21
-
22
25
  ### Bug Fixes
23
26
 
24
- * **error:** handle new error response messages ([9ce4d99](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/9ce4d9997a542a98164ff999e83ee0a8a40b0525))
27
+ - **error:** handle new error response messages ([9ce4d99](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/9ce4d9997a542a98164ff999e83ee0a8a40b0525))
25
28
 
26
29
  ## [1.21.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.20.10...v1.21.0) (2022-08-10)
27
30
 
28
-
29
31
  ### Features
30
32
 
31
- * **error:** handle new error response messages ([4373b18](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/4373b18675b2c74119b37734ce106239252c0883))
33
+ - **error:** handle new error response messages ([4373b18](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/4373b18675b2c74119b37734ce106239252c0883))
32
34
 
33
35
  ### [1.20.10](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.20.9...v1.20.10) (2022-08-09)
34
36
 
@@ -112,18 +112,46 @@ export default class GroupingModel {
112
112
  /**
113
113
  */
114
114
  constructor(data, contexts) {
115
- var _context;
116
-
117
115
  _defineProperty(this, "_prefix", void 0);
118
116
 
119
- _defineProperty(this, "_groups", void 0);
117
+ _defineProperty(this, "_groups", []);
120
118
 
121
119
  this._prefix = data && data.prefix ? data.prefix : null;
122
- const context = this.getContextFromContributionsByPrefix(contexts, this._prefix);
123
- const dynamicschema = data && data.dynamicschema;
124
- this._groups = data && data.group ? _mapInstanceProperty(_context = data.group).call(_context, group => new GroupModel({ ...group,
125
- dynamicschema
126
- }, context, contexts)) : [];
120
+
121
+ if (data !== null && data !== void 0 && data.group) {
122
+ this._groups = this.createGroup(data, contexts);
123
+ }
124
+ }
125
+ /**
126
+ */
127
+
128
+
129
+ createGroup(data, contributions) {
130
+ var _context;
131
+
132
+ const context = this.getContextFromContributionsByPrefix(contributions, this._prefix);
133
+ return _mapInstanceProperty(_context = data.group).call(_context, group => {
134
+ const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);
135
+ return new GroupModel({ ...group,
136
+ dynamicschema
137
+ }, context, contributions);
138
+ });
139
+ }
140
+ /**
141
+ * add grouped prefix to the dynamicschema
142
+ */
143
+
144
+
145
+ getDynamicSchema(group, dynamicschema) {
146
+ if (dynamicschema) {
147
+ if (this._prefix && dynamicschema[group.type] && !dynamicschema[this._prefix + group.type]) {
148
+ dynamicschema[this._prefix + group.type] = dynamicschema[group.type];
149
+ }
150
+
151
+ return dynamicschema;
152
+ }
153
+
154
+ return null;
127
155
  }
128
156
  /**
129
157
  * Retrieve groups of grouping
@@ -1 +1 @@
1
- {"version":3,"file":"GroupingModel.js","names":["AttributeCollection","GroupModel","constructor","group","context","contributions","_group","_context","_attributeCollection","attributes","grouping","_grouping","GroupingModel","dynamicschema","type","id","_id","label","attributeCollection","reference","hasAttributeByKey","key","getAttributeByKey","data","contexts","_prefix","prefix","getContextFromContributionsByPrefix","_groups","groups","hasGroups","length","some","groupByKey","getGroupByAttributeKey"],"sources":["../../../src/models/grouping/GroupingModel.js"],"sourcesContent":["// @flow\nimport AttributeCollection from \"../attributes/AttributeCollection\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Group information model\n * Put GroupModel here because of possible circular dependency with GroupingModel below\n */\nexport class GroupModel {\n _group: Object;\n _context: Object;\n _attributeCollection: AttributeCollection;\n _grouping: ?GroupingModel;\n\n /**\n */\n constructor(group: Object, context: Object, contributions: Array<Object>) {\n this._group = group;\n this._context = context;\n\n this._attributeCollection = new AttributeCollection(\n group,\n context.attributes\n );\n\n if (group.grouping) {\n this._grouping = new GroupingModel(\n { ...group.grouping, dynamicschema: group.dynamicschema },\n contributions\n );\n }\n }\n\n /**\n */\n get type(): string {\n return this._group.type;\n }\n\n /**\n */\n get id(): string {\n return this._group._id || \"unknown\";\n }\n\n /**\n */\n get label(): string {\n return this._context.label;\n }\n\n /**\n */\n get attributeCollection(): AttributeCollection {\n return this._attributeCollection;\n }\n\n /**\n */\n get grouping(): ?GroupingModel {\n return this._grouping;\n }\n\n /**\n * Retrieve array of reference id's\n */\n get reference(): Array<number> {\n return this._group.reference || [];\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return true;\n }\n\n if (this.grouping) {\n return this.grouping.hasAttributeByKey(key);\n }\n\n return false;\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return this.attributeCollection.getAttributeByKey(key);\n }\n\n if (this.grouping) {\n return this.grouping.getAttributeByKey(key);\n }\n\n return null;\n }\n}\n\ntype Context = {\n prefix: string,\n label: string,\n metadata: Object,\n attributes: Array<Object>,\n};\n\n/**\n * Grouping model to group lists\n */\nexport default class GroupingModel {\n _prefix: string | null;\n _groups: Array<GroupModel>;\n\n /**\n */\n constructor(data: Object, contexts: Array<Context>) {\n this._prefix = data && data.prefix ? data.prefix : null;\n\n const context = this.getContextFromContributionsByPrefix(\n contexts,\n this._prefix\n );\n\n const dynamicschema = data && data.dynamicschema;\n this._groups =\n data && data.group\n ? data.group.map(\n (group) =>\n new GroupModel({ ...group, dynamicschema }, context, contexts)\n )\n : [];\n }\n\n /**\n * Retrieve groups of grouping\n */\n get groups(): Array<GroupModel> {\n return this._groups;\n }\n\n /**\n * Inidicates if Grouping has one or more groups\n */\n hasGroups(): boolean {\n return this._groups.length > 0;\n }\n\n /**\n * Get context of grouping\n */\n getContextFromContributionsByPrefix(\n contexts: Array<Object>,\n prefix: string | null\n ): Object {\n if (contexts && prefix !== null) {\n return contexts.find((context) => context.prefix === prefix) || {};\n }\n\n return {};\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n return this.groups.some((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n const groupByKey = this.groups.find((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n\n if (groupByKey) {\n return groupByKey.getAttributeByKey(key);\n }\n return null;\n }\n\n /**\n */\n getGroupByAttributeKey(key: string): ?GroupModel {\n return this.groups.find((group) => group.hasAttributeByKey(key));\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"GroupingModel.js","names":["AttributeCollection","GroupModel","constructor","group","context","contributions","_group","_context","_attributeCollection","attributes","grouping","_grouping","GroupingModel","dynamicschema","type","id","_id","label","attributeCollection","reference","hasAttributeByKey","key","getAttributeByKey","data","contexts","_prefix","prefix","_groups","createGroup","getContextFromContributionsByPrefix","getDynamicSchema","groups","hasGroups","length","some","groupByKey","getGroupByAttributeKey"],"sources":["../../../src/models/grouping/GroupingModel.js"],"sourcesContent":["// @flow\nimport AttributeCollection from \"../attributes/AttributeCollection\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Group information model\n * Put GroupModel here because of possible circular dependency with GroupingModel below\n */\nexport class GroupModel {\n _group: Object;\n _context: Object;\n _attributeCollection: AttributeCollection;\n _grouping: ?GroupingModel;\n\n /**\n */\n constructor(group: Object, context: Object, contributions: Array<Object>) {\n this._group = group;\n this._context = context;\n\n this._attributeCollection = new AttributeCollection(\n group,\n context.attributes\n );\n\n if (group.grouping) {\n this._grouping = new GroupingModel(\n { ...group.grouping, dynamicschema: group.dynamicschema },\n contributions\n );\n }\n }\n\n /**\n */\n get type(): string {\n return this._group.type;\n }\n\n /**\n */\n get id(): string {\n return this._group._id || \"unknown\";\n }\n\n /**\n */\n get label(): string {\n return this._context.label;\n }\n\n /**\n */\n get attributeCollection(): AttributeCollection {\n return this._attributeCollection;\n }\n\n /**\n */\n get grouping(): ?GroupingModel {\n return this._grouping;\n }\n\n /**\n * Retrieve array of reference id's\n */\n get reference(): Array<number> {\n return this._group.reference || [];\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return true;\n }\n\n if (this.grouping) {\n return this.grouping.hasAttributeByKey(key);\n }\n\n return false;\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return this.attributeCollection.getAttributeByKey(key);\n }\n\n if (this.grouping) {\n return this.grouping.getAttributeByKey(key);\n }\n\n return null;\n }\n}\n\ntype Context = {\n prefix: string,\n label: string,\n metadata: Object,\n attributes: Array<Object>,\n};\n\n/**\n * Grouping model to group lists\n */\nexport default class GroupingModel {\n _prefix: string | null;\n _groups: Array<GroupModel> = [];\n\n /**\n */\n constructor(data: Object, contexts: Array<Context>) {\n this._prefix = data && data.prefix ? data.prefix : null;\n\n if (data?.group) {\n this._groups = this.createGroup(data, contexts);\n }\n }\n\n /**\n */\n createGroup(data: Object, contributions: Array<Context>): Array<Object> {\n const context = this.getContextFromContributionsByPrefix(\n contributions,\n this._prefix\n );\n\n return data.group.map((group) => {\n const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);\n return new GroupModel(\n {\n ...group,\n dynamicschema,\n },\n context,\n contributions\n );\n });\n }\n\n /**\n * add grouped prefix to the dynamicschema\n */\n getDynamicSchema(group: Object, dynamicschema: Object): Object {\n if (dynamicschema) {\n if (\n this._prefix &&\n dynamicschema[group.type] &&\n !dynamicschema[this._prefix + group.type]\n ) {\n dynamicschema[this._prefix + group.type] = dynamicschema[group.type];\n }\n return dynamicschema;\n }\n return null;\n }\n\n /**\n * Retrieve groups of grouping\n */\n get groups(): Array<GroupModel> {\n return this._groups;\n }\n\n /**\n * Inidicates if Grouping has one or more groups\n */\n hasGroups(): boolean {\n return this._groups.length > 0;\n }\n\n /**\n * Get context of grouping\n */\n getContextFromContributionsByPrefix(\n contexts: Array<Object>,\n prefix: string | null\n ): Object {\n if (contexts && prefix !== null) {\n return contexts.find((context) => context.prefix === prefix) || {};\n }\n\n return {};\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n return this.groups.some((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n const groupByKey = this.groups.find((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n\n if (groupByKey) {\n return groupByKey.getAttributeByKey(key);\n }\n return null;\n }\n\n /**\n */\n getGroupByAttributeKey(key: string): ?GroupModel {\n return this.groups.find((group) => group.hasAttributeByKey(key));\n }\n}\n"],"mappings":"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"}
@@ -122,16 +122,44 @@ class GroupingModel {
122
122
  /**
123
123
  */
124
124
  constructor(data, contexts) {
125
- var _context;
126
-
127
125
  (0, _defineProperty2.default)(this, "_prefix", void 0);
128
- (0, _defineProperty2.default)(this, "_groups", void 0);
126
+ (0, _defineProperty2.default)(this, "_groups", []);
129
127
  this._prefix = data && data.prefix ? data.prefix : null;
130
- const context = this.getContextFromContributionsByPrefix(contexts, this._prefix);
131
- const dynamicschema = data && data.dynamicschema;
132
- this._groups = data && data.group ? (0, _map.default)(_context = data.group).call(_context, group => new GroupModel({ ...group,
133
- dynamicschema
134
- }, context, contexts)) : [];
128
+
129
+ if (data !== null && data !== void 0 && data.group) {
130
+ this._groups = this.createGroup(data, contexts);
131
+ }
132
+ }
133
+ /**
134
+ */
135
+
136
+
137
+ createGroup(data, contributions) {
138
+ var _context;
139
+
140
+ const context = this.getContextFromContributionsByPrefix(contributions, this._prefix);
141
+ return (0, _map.default)(_context = data.group).call(_context, group => {
142
+ const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);
143
+ return new GroupModel({ ...group,
144
+ dynamicschema
145
+ }, context, contributions);
146
+ });
147
+ }
148
+ /**
149
+ * add grouped prefix to the dynamicschema
150
+ */
151
+
152
+
153
+ getDynamicSchema(group, dynamicschema) {
154
+ if (dynamicschema) {
155
+ if (this._prefix && dynamicschema[group.type] && !dynamicschema[this._prefix + group.type]) {
156
+ dynamicschema[this._prefix + group.type] = dynamicschema[group.type];
157
+ }
158
+
159
+ return dynamicschema;
160
+ }
161
+
162
+ return null;
135
163
  }
136
164
  /**
137
165
  * Retrieve groups of grouping
@@ -109,26 +109,54 @@ type Context = {
109
109
  */
110
110
  export default class GroupingModel {
111
111
  _prefix: string | null;
112
- _groups: Array<GroupModel>;
112
+ _groups: Array<GroupModel> = [];
113
113
 
114
114
  /**
115
115
  */
116
116
  constructor(data: Object, contexts: Array<Context>) {
117
117
  this._prefix = data && data.prefix ? data.prefix : null;
118
118
 
119
+ if (data?.group) {
120
+ this._groups = this.createGroup(data, contexts);
121
+ }
122
+ }
123
+
124
+ /**
125
+ */
126
+ createGroup(data: Object, contributions: Array<Context>): Array<Object> {
119
127
  const context = this.getContextFromContributionsByPrefix(
120
- contexts,
128
+ contributions,
121
129
  this._prefix
122
130
  );
123
131
 
124
- const dynamicschema = data && data.dynamicschema;
125
- this._groups =
126
- data && data.group
127
- ? data.group.map(
128
- (group) =>
129
- new GroupModel({ ...group, dynamicschema }, context, contexts)
130
- )
131
- : [];
132
+ return data.group.map((group) => {
133
+ const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);
134
+ return new GroupModel(
135
+ {
136
+ ...group,
137
+ dynamicschema,
138
+ },
139
+ context,
140
+ contributions
141
+ );
142
+ });
143
+ }
144
+
145
+ /**
146
+ * add grouped prefix to the dynamicschema
147
+ */
148
+ getDynamicSchema(group: Object, dynamicschema: Object): Object {
149
+ if (dynamicschema) {
150
+ if (
151
+ this._prefix &&
152
+ dynamicschema[group.type] &&
153
+ !dynamicschema[this._prefix + group.type]
154
+ ) {
155
+ dynamicschema[this._prefix + group.type] = dynamicschema[group.type];
156
+ }
157
+ return dynamicschema;
158
+ }
159
+ return null;
132
160
  }
133
161
 
134
162
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"GroupingModel.js","names":["GroupModel","constructor","group","context","contributions","_group","_context","_attributeCollection","AttributeCollection","attributes","grouping","_grouping","GroupingModel","dynamicschema","type","id","_id","label","attributeCollection","reference","hasAttributeByKey","key","getAttributeByKey","data","contexts","_prefix","prefix","getContextFromContributionsByPrefix","_groups","groups","hasGroups","length","some","groupByKey","getGroupByAttributeKey"],"sources":["../../../src/models/grouping/GroupingModel.js"],"sourcesContent":["// @flow\nimport AttributeCollection from \"../attributes/AttributeCollection\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Group information model\n * Put GroupModel here because of possible circular dependency with GroupingModel below\n */\nexport class GroupModel {\n _group: Object;\n _context: Object;\n _attributeCollection: AttributeCollection;\n _grouping: ?GroupingModel;\n\n /**\n */\n constructor(group: Object, context: Object, contributions: Array<Object>) {\n this._group = group;\n this._context = context;\n\n this._attributeCollection = new AttributeCollection(\n group,\n context.attributes\n );\n\n if (group.grouping) {\n this._grouping = new GroupingModel(\n { ...group.grouping, dynamicschema: group.dynamicschema },\n contributions\n );\n }\n }\n\n /**\n */\n get type(): string {\n return this._group.type;\n }\n\n /**\n */\n get id(): string {\n return this._group._id || \"unknown\";\n }\n\n /**\n */\n get label(): string {\n return this._context.label;\n }\n\n /**\n */\n get attributeCollection(): AttributeCollection {\n return this._attributeCollection;\n }\n\n /**\n */\n get grouping(): ?GroupingModel {\n return this._grouping;\n }\n\n /**\n * Retrieve array of reference id's\n */\n get reference(): Array<number> {\n return this._group.reference || [];\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return true;\n }\n\n if (this.grouping) {\n return this.grouping.hasAttributeByKey(key);\n }\n\n return false;\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return this.attributeCollection.getAttributeByKey(key);\n }\n\n if (this.grouping) {\n return this.grouping.getAttributeByKey(key);\n }\n\n return null;\n }\n}\n\ntype Context = {\n prefix: string,\n label: string,\n metadata: Object,\n attributes: Array<Object>,\n};\n\n/**\n * Grouping model to group lists\n */\nexport default class GroupingModel {\n _prefix: string | null;\n _groups: Array<GroupModel>;\n\n /**\n */\n constructor(data: Object, contexts: Array<Context>) {\n this._prefix = data && data.prefix ? data.prefix : null;\n\n const context = this.getContextFromContributionsByPrefix(\n contexts,\n this._prefix\n );\n\n const dynamicschema = data && data.dynamicschema;\n this._groups =\n data && data.group\n ? data.group.map(\n (group) =>\n new GroupModel({ ...group, dynamicschema }, context, contexts)\n )\n : [];\n }\n\n /**\n * Retrieve groups of grouping\n */\n get groups(): Array<GroupModel> {\n return this._groups;\n }\n\n /**\n * Inidicates if Grouping has one or more groups\n */\n hasGroups(): boolean {\n return this._groups.length > 0;\n }\n\n /**\n * Get context of grouping\n */\n getContextFromContributionsByPrefix(\n contexts: Array<Object>,\n prefix: string | null\n ): Object {\n if (contexts && prefix !== null) {\n return contexts.find((context) => context.prefix === prefix) || {};\n }\n\n return {};\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n return this.groups.some((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n const groupByKey = this.groups.find((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n\n if (groupByKey) {\n return groupByKey.getAttributeByKey(key);\n }\n return null;\n }\n\n /**\n */\n getGroupByAttributeKey(key: string): ?GroupModel {\n return this.groups.find((group) => group.hasAttributeByKey(key));\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"GroupingModel.js","names":["GroupModel","constructor","group","context","contributions","_group","_context","_attributeCollection","AttributeCollection","attributes","grouping","_grouping","GroupingModel","dynamicschema","type","id","_id","label","attributeCollection","reference","hasAttributeByKey","key","getAttributeByKey","data","contexts","_prefix","prefix","_groups","createGroup","getContextFromContributionsByPrefix","getDynamicSchema","groups","hasGroups","length","some","groupByKey","getGroupByAttributeKey"],"sources":["../../../src/models/grouping/GroupingModel.js"],"sourcesContent":["// @flow\nimport AttributeCollection from \"../attributes/AttributeCollection\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Group information model\n * Put GroupModel here because of possible circular dependency with GroupingModel below\n */\nexport class GroupModel {\n _group: Object;\n _context: Object;\n _attributeCollection: AttributeCollection;\n _grouping: ?GroupingModel;\n\n /**\n */\n constructor(group: Object, context: Object, contributions: Array<Object>) {\n this._group = group;\n this._context = context;\n\n this._attributeCollection = new AttributeCollection(\n group,\n context.attributes\n );\n\n if (group.grouping) {\n this._grouping = new GroupingModel(\n { ...group.grouping, dynamicschema: group.dynamicschema },\n contributions\n );\n }\n }\n\n /**\n */\n get type(): string {\n return this._group.type;\n }\n\n /**\n */\n get id(): string {\n return this._group._id || \"unknown\";\n }\n\n /**\n */\n get label(): string {\n return this._context.label;\n }\n\n /**\n */\n get attributeCollection(): AttributeCollection {\n return this._attributeCollection;\n }\n\n /**\n */\n get grouping(): ?GroupingModel {\n return this._grouping;\n }\n\n /**\n * Retrieve array of reference id's\n */\n get reference(): Array<number> {\n return this._group.reference || [];\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return true;\n }\n\n if (this.grouping) {\n return this.grouping.hasAttributeByKey(key);\n }\n\n return false;\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n if (this.attributeCollection.hasAttributeByKey(key)) {\n return this.attributeCollection.getAttributeByKey(key);\n }\n\n if (this.grouping) {\n return this.grouping.getAttributeByKey(key);\n }\n\n return null;\n }\n}\n\ntype Context = {\n prefix: string,\n label: string,\n metadata: Object,\n attributes: Array<Object>,\n};\n\n/**\n * Grouping model to group lists\n */\nexport default class GroupingModel {\n _prefix: string | null;\n _groups: Array<GroupModel> = [];\n\n /**\n */\n constructor(data: Object, contexts: Array<Context>) {\n this._prefix = data && data.prefix ? data.prefix : null;\n\n if (data?.group) {\n this._groups = this.createGroup(data, contexts);\n }\n }\n\n /**\n */\n createGroup(data: Object, contributions: Array<Context>): Array<Object> {\n const context = this.getContextFromContributionsByPrefix(\n contributions,\n this._prefix\n );\n\n return data.group.map((group) => {\n const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);\n return new GroupModel(\n {\n ...group,\n dynamicschema,\n },\n context,\n contributions\n );\n });\n }\n\n /**\n * add grouped prefix to the dynamicschema\n */\n getDynamicSchema(group: Object, dynamicschema: Object): Object {\n if (dynamicschema) {\n if (\n this._prefix &&\n dynamicschema[group.type] &&\n !dynamicschema[this._prefix + group.type]\n ) {\n dynamicschema[this._prefix + group.type] = dynamicschema[group.type];\n }\n return dynamicschema;\n }\n return null;\n }\n\n /**\n * Retrieve groups of grouping\n */\n get groups(): Array<GroupModel> {\n return this._groups;\n }\n\n /**\n * Inidicates if Grouping has one or more groups\n */\n hasGroups(): boolean {\n return this._groups.length > 0;\n }\n\n /**\n * Get context of grouping\n */\n getContextFromContributionsByPrefix(\n contexts: Array<Object>,\n prefix: string | null\n ): Object {\n if (contexts && prefix !== null) {\n return contexts.find((context) => context.prefix === prefix) || {};\n }\n\n return {};\n }\n\n /**\n */\n hasAttributeByKey(key: string): boolean {\n return this.groups.some((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n }\n\n /**\n */\n getAttributeByKey(key: string): AttributeType | null {\n const groupByKey = this.groups.find((group: GroupModel) =>\n group.hasAttributeByKey(key)\n );\n\n if (groupByKey) {\n return groupByKey.getAttributeByKey(key);\n }\n return null;\n }\n\n /**\n */\n getGroupByAttributeKey(key: string): ?GroupModel {\n return this.groups.find((group) => group.hasAttributeByKey(key));\n }\n}\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@beinformed/ui",
3
- "version": "1.21.3",
3
+ "version": "1.21.4",
4
4
  "description": "Toolbox for be informed javascript layouts",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "bugs": "http://support.beinformed.com",
@@ -109,26 +109,54 @@ type Context = {
109
109
  */
110
110
  export default class GroupingModel {
111
111
  _prefix: string | null;
112
- _groups: Array<GroupModel>;
112
+ _groups: Array<GroupModel> = [];
113
113
 
114
114
  /**
115
115
  */
116
116
  constructor(data: Object, contexts: Array<Context>) {
117
117
  this._prefix = data && data.prefix ? data.prefix : null;
118
118
 
119
+ if (data?.group) {
120
+ this._groups = this.createGroup(data, contexts);
121
+ }
122
+ }
123
+
124
+ /**
125
+ */
126
+ createGroup(data: Object, contributions: Array<Context>): Array<Object> {
119
127
  const context = this.getContextFromContributionsByPrefix(
120
- contexts,
128
+ contributions,
121
129
  this._prefix
122
130
  );
123
131
 
124
- const dynamicschema = data && data.dynamicschema;
125
- this._groups =
126
- data && data.group
127
- ? data.group.map(
128
- (group) =>
129
- new GroupModel({ ...group, dynamicschema }, context, contexts)
130
- )
131
- : [];
132
+ return data.group.map((group) => {
133
+ const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);
134
+ return new GroupModel(
135
+ {
136
+ ...group,
137
+ dynamicschema,
138
+ },
139
+ context,
140
+ contributions
141
+ );
142
+ });
143
+ }
144
+
145
+ /**
146
+ * add grouped prefix to the dynamicschema
147
+ */
148
+ getDynamicSchema(group: Object, dynamicschema: Object): Object {
149
+ if (dynamicschema) {
150
+ if (
151
+ this._prefix &&
152
+ dynamicschema[group.type] &&
153
+ !dynamicschema[this._prefix + group.type]
154
+ ) {
155
+ dynamicschema[this._prefix + group.type] = dynamicschema[group.type];
156
+ }
157
+ return dynamicschema;
158
+ }
159
+ return null;
132
160
  }
133
161
 
134
162
  /**