@reltio/components 1.4.1564 → 1.4.1565-hf

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.
Files changed (9) hide show
  1. package/cjs/components/AttributesFiltersBuilder/components/FilterSelector/FilterSelector.js +3 -2
  2. package/cjs/components/AttributesFiltersBuilder/components/ValuesEditor/ValuesEditor.js +1 -1
  3. package/cjs/components/AttributesFiltersBuilder/helpers.js +10 -7
  4. package/cjs/components/QueryBuilderRow/QueryBuilderRow.js +1 -1
  5. package/esm/components/AttributesFiltersBuilder/components/FilterSelector/FilterSelector.js +3 -2
  6. package/esm/components/AttributesFiltersBuilder/components/ValuesEditor/ValuesEditor.js +1 -1
  7. package/esm/components/AttributesFiltersBuilder/helpers.js +10 -7
  8. package/esm/components/QueryBuilderRow/QueryBuilderRow.js +1 -1
  9. package/package.json +3 -3
package/cjs/components/AttributesFiltersBuilder/components/FilterSelector/FilterSelector.js CHANGED
@@ -35,9 +35,10 @@ var SimpleDropDownSelector_1 = __importDefault(require("../../../SimpleDropDownS
35
35
  var helpers_1 = require("../../helpers");
36
36
  var styles_1 = __importDefault(require("./styles"));
37
37
  var FilterSelector = function (_a) {
38
+ var _b;
38
39
  var rowData = _a.rowData, rowContext = _a.rowContext, textFieldInputRef = _a.textFieldInputRef, optionsProp = _a.options;
39
40
  var styles = (0, styles_1.default)();
40
- var _b = rowData || {}, _c = _b.attribute, _d = _c === void 0 ? {} : _c, _e = _d.attrType, attrType = _e === void 0 ? {} : _e, _f = _d.fieldName, fieldName = _f === void 0 ? null : _f, filter = _b.filter, id = _b.id;
41
+ var _c = rowData || {}, _d = _c.attribute, _e = _d === void 0 ? {} : _d, _f = _e.attrType, attrType = _f === void 0 ? {} : _f, _g = _e.fieldName, fieldName = _g === void 0 ? null : _g, filter = _c.filter, id = _c.id;
41
42
  var changeFilter = rowContext.changeFilter;
42
43
  var options = optionsProp ||
43
44
  (attrType &&
@@ -56,6 +57,6 @@ var FilterSelector = function (_a) {
56
57
  onChangeFilter(options[0]);
57
58
  }
58
59
  }, [fieldName, filter, onChangeFilter, options]);
59
- return (react_1.default.createElement(SimpleDropDownSelector_1.default, { label: "", height: 40, isDisabled: !options, placeholder: ui_i18n_1.default.text('Equals'), value: (0, helpers_1.findValue)(options, filter), options: options, onChange: onChangeFilter, className: styles.dropDownSelector, textFieldInputRef: textFieldInputRef }));
60
+ return (react_1.default.createElement(SimpleDropDownSelector_1.default, { label: "", height: 40, isDisabled: !options, placeholder: ui_i18n_1.default.text('Equals'), value: (0, helpers_1.findValue)(options, filter), options: options, onChange: onChangeFilter, className: styles.dropDownSelector, textFieldInputRef: textFieldInputRef, TextFieldProps: { inputProps: (_b = {}, _b['data-reltio-id'] = 'filter-selector', _b) } }));
60
61
  };
61
62
  exports.default = (0, react_1.memo)(FilterSelector);
package/cjs/components/AttributesFiltersBuilder/components/ValuesEditor/ValuesEditor.js CHANGED
@@ -59,6 +59,6 @@ var ValuesEditor = function (_a) {
59
59
  };
60
60
  changeFilter(newFilter, id);
61
61
  }, [changeFilter, id, fieldName, filter]);
62
- return (react_1.default.createElement("div", { className: styles.valuesEditor }, (rowData === null || rowData === void 0 ? void 0 : rowData.attribute) && canFilterAcceptValues && (react_1.default.createElement(FilterValueEditor_1.default, { filter: editorFilter, onChange: changeValue, dataTypeDefinition: filterValueDataTypeDefinition, fullWidth: true, TextFieldProps: TextFieldProps, color: "primary", classes: editorClasses, orientation: "horizontal" }))));
62
+ return (react_1.default.createElement("div", { className: styles.valuesEditor }, (rowData === null || rowData === void 0 ? void 0 : rowData.attribute) && canFilterAcceptValues && (react_1.default.createElement(FilterValueEditor_1.default, { "data-reltio-id": "filter-value-editor", filter: editorFilter, onChange: changeValue, dataTypeDefinition: filterValueDataTypeDefinition, fullWidth: true, TextFieldProps: TextFieldProps, color: "primary", classes: editorClasses, orientation: "horizontal" }))));
63
63
  };
64
64
  exports.default = (0, react_1.memo)(ValuesEditor);
package/cjs/components/AttributesFiltersBuilder/helpers.js CHANGED
@@ -22,6 +22,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
22
22
  Object.defineProperty(exports, "__esModule", { value: true });
23
23
  exports.getEntityTypeFromAttrTypes = exports.getRowsDataFromFilters = exports.findValue = exports.getAttributeSelectorItems = void 0;
24
24
  var mdm_sdk_1 = require("@reltio/mdm-sdk");
25
+ var ramda_1 = require("ramda");
25
26
  var createAttributeItem = function (metadata, attrType, entityTypeUri, parents) {
26
27
  var entityTypeLabel = (0, mdm_sdk_1.getEntityTypeLabel)(metadata, { type: entityTypeUri });
27
28
  var title = attrType.label || attrType.name;
@@ -31,28 +32,30 @@ var createAttributeItem = function (metadata, attrType, entityTypeUri, parents)
31
32
  }
32
33
  : {
33
34
  entityTypeUri: entityTypeUri,
34
- pathToTitle: Array.isArray(parents) ? __spreadArray(__spreadArray([entityTypeLabel], parents, true), [title], false) : [entityTypeLabel, title],
35
- fieldName: (0, mdm_sdk_1.attributeUriToSearchUri)(attrType.uri)
35
+ pathToTitle: Array.isArray(parents)
36
+ ? __spreadArray(__spreadArray([entityTypeLabel], (0, ramda_1.chain)((0, ramda_1.prop)('label'), parents), true), [title], false) : [entityTypeLabel, title],
37
+ fieldName: (0, mdm_sdk_1.attributeUriToSearchUri)(attrType.uri, parents)
36
38
  };
37
39
  return __assign({ attrType: attrType, title: title }, attributeProps);
38
40
  };
39
- var createAttributesConfig = function (metadata, attrNode, entityTypeUri, createAttributeConfig, parents) {
41
+ var createAttributesConfig = function (metadata, attrNode, entityTypeUri, parents) {
40
42
  if (parents === void 0) { parents = []; }
41
- var resConfig = __assign(__assign({}, createAttributeConfig(metadata, attrNode, entityTypeUri, parents)), { uri: attrNode.uri });
43
+ var resConfig = __assign(__assign({}, createAttributeItem(metadata, attrNode, entityTypeUri, parents)), { uri: attrNode.uri });
42
44
  var children = attrNode.children
43
45
  ? attrNode.children.map(function (childNode) {
44
- return createAttributesConfig(metadata, childNode, entityTypeUri, createAttributeConfig, parents.concat(attrNode.label));
46
+ return createAttributesConfig(metadata, childNode, entityTypeUri, parents.concat(attrNode));
45
47
  })
46
48
  : [];
47
- if (children.length)
49
+ if (children.length) {
48
50
  resConfig.children = children;
51
+ }
49
52
  return resConfig;
50
53
  };
51
54
  var getAttributeSelectorItems = function (attributeTypes, entityType, metadata) {
52
55
  if (entityType === void 0) { entityType = {}; }
53
56
  return (0, mdm_sdk_1.getAttributesTreeFromAttributes)(attributeTypes, metadata).map(function (attrNode) {
54
57
  var entityTypeUri = (0, mdm_sdk_1.isSpecialAttribute)(attrNode) ? null : entityType.uri;
55
- return createAttributesConfig(metadata, attrNode, entityTypeUri, createAttributeItem);
58
+ return createAttributesConfig(metadata, attrNode, entityTypeUri);
56
59
  });
57
60
  };
58
61
  exports.getAttributeSelectorItems = getAttributeSelectorItems;
package/cjs/components/QueryBuilderRow/QueryBuilderRow.js CHANGED
@@ -48,7 +48,7 @@ var QueryBuilderRow = function (_a) {
48
48
  var _b;
49
49
  var _c = _a.classes, classes = _c === void 0 ? {} : _c, rowData = _a.rowData, previousRowData = _a.previousRowData, _d = _a.LogicOperatorComponent, LogicOperatorComponent = _d === void 0 ? ReadOnlyLogicOperator_1.default : _d, AttributeSelectorComponent = _a.AttributeSelectorComponent, _e = _a.FilterSelectorComponent, FilterSelectorComponent = _e === void 0 ? ReadOnlyFilter_1.default : _e, ValuesEditorComponent = _a.ValuesEditorComponent, ActionsComponent = _a.ActionsComponent, filterSelectorRef = _a.filterSelectorRef, _f = _a.attributeSelectorProps, attributeSelectorProps = _f === void 0 ? {} : _f, rowContext = __rest(_a, ["classes", "rowData", "previousRowData", "LogicOperatorComponent", "AttributeSelectorComponent", "FilterSelectorComponent", "ValuesEditorComponent", "ActionsComponent", "filterSelectorRef", "attributeSelectorProps"]);
50
50
  var styles = (0, styles_1.default)();
51
- return (react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.row, classes.root) },
51
+ return (react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.row, classes.root), "data-reltio-id": "query-builder-row" },
52
52
  react_1.default.createElement(LogicOperatorComponent, { className: classes.logicOperatorContainer, rowContext: rowContext, rowData: previousRowData }),
53
53
  react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.rowItem, classes.attributeSelectorContainer) },
54
54
  react_1.default.createElement(AttributeSelectorComponent, { attributeSelectorProps: attributeSelectorProps, rowContext: rowContext, rowData: rowData })),
package/esm/components/AttributesFiltersBuilder/components/FilterSelector/FilterSelector.js CHANGED
@@ -7,9 +7,10 @@ import SimpleDropDownSelector from '../../../SimpleDropDownSelector/SimpleDropDo
7
7
  import { findValue } from '../../helpers';
8
8
  import useStyles from './styles';
9
9
  var FilterSelector = function (_a) {
10
+ var _b;
10
11
  var rowData = _a.rowData, rowContext = _a.rowContext, textFieldInputRef = _a.textFieldInputRef, optionsProp = _a.options;
11
12
  var styles = useStyles();
12
- var _b = rowData || {}, _c = _b.attribute, _d = _c === void 0 ? {} : _c, _e = _d.attrType, attrType = _e === void 0 ? {} : _e, _f = _d.fieldName, fieldName = _f === void 0 ? null : _f, filter = _b.filter, id = _b.id;
13
+ var _c = rowData || {}, _d = _c.attribute, _e = _d === void 0 ? {} : _d, _f = _e.attrType, attrType = _f === void 0 ? {} : _f, _g = _e.fieldName, fieldName = _g === void 0 ? null : _g, filter = _c.filter, id = _c.id;
13
14
  var changeFilter = rowContext.changeFilter;
14
15
  var options = optionsProp ||
15
16
  (attrType &&
@@ -28,6 +29,6 @@ var FilterSelector = function (_a) {
28
29
  onChangeFilter(options[0]);
29
30
  }
30
31
  }, [fieldName, filter, onChangeFilter, options]);
31
- return (React.createElement(SimpleDropDownSelector, { label: "", height: 40, isDisabled: !options, placeholder: i18n.text('Equals'), value: findValue(options, filter), options: options, onChange: onChangeFilter, className: styles.dropDownSelector, textFieldInputRef: textFieldInputRef }));
32
+ return (React.createElement(SimpleDropDownSelector, { label: "", height: 40, isDisabled: !options, placeholder: i18n.text('Equals'), value: findValue(options, filter), options: options, onChange: onChangeFilter, className: styles.dropDownSelector, textFieldInputRef: textFieldInputRef, TextFieldProps: { inputProps: (_b = {}, _b['data-reltio-id'] = 'filter-selector', _b) } }));
32
33
  };
33
34
  export default memo(FilterSelector);
package/esm/components/AttributesFiltersBuilder/components/ValuesEditor/ValuesEditor.js CHANGED
@@ -31,6 +31,6 @@ var ValuesEditor = function (_a) {
31
31
  };
32
32
  changeFilter(newFilter, id);
33
33
  }, [changeFilter, id, fieldName, filter]);
34
- return (React.createElement("div", { className: styles.valuesEditor }, (rowData === null || rowData === void 0 ? void 0 : rowData.attribute) && canFilterAcceptValues && (React.createElement(FilterValueEditor, { filter: editorFilter, onChange: changeValue, dataTypeDefinition: filterValueDataTypeDefinition, fullWidth: true, TextFieldProps: TextFieldProps, color: "primary", classes: editorClasses, orientation: "horizontal" }))));
34
+ return (React.createElement("div", { className: styles.valuesEditor }, (rowData === null || rowData === void 0 ? void 0 : rowData.attribute) && canFilterAcceptValues && (React.createElement(FilterValueEditor, { "data-reltio-id": "filter-value-editor", filter: editorFilter, onChange: changeValue, dataTypeDefinition: filterValueDataTypeDefinition, fullWidth: true, TextFieldProps: TextFieldProps, color: "primary", classes: editorClasses, orientation: "horizontal" }))));
35
35
  };
36
36
  export default memo(ValuesEditor);
package/esm/components/AttributesFiltersBuilder/helpers.js CHANGED
@@ -19,6 +19,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
19
19
  return to.concat(ar || Array.prototype.slice.call(from));
20
20
  };
21
21
  import { getAttributesTreeFromAttributes, attributeUriToSearchUri, isSpecialAttribute, getBaseUri, getEntityTypeLabel } from '@reltio/mdm-sdk';
22
+ import { chain, prop } from 'ramda';
22
23
  var createAttributeItem = function (metadata, attrType, entityTypeUri, parents) {
23
24
  var entityTypeLabel = getEntityTypeLabel(metadata, { type: entityTypeUri });
24
25
  var title = attrType.label || attrType.name;
@@ -28,28 +29,30 @@ var createAttributeItem = function (metadata, attrType, entityTypeUri, parents)
28
29
  }
29
30
  : {
30
31
  entityTypeUri: entityTypeUri,
31
- pathToTitle: Array.isArray(parents) ? __spreadArray(__spreadArray([entityTypeLabel], parents, true), [title], false) : [entityTypeLabel, title],
32
- fieldName: attributeUriToSearchUri(attrType.uri)
32
+ pathToTitle: Array.isArray(parents)
33
+ ? __spreadArray(__spreadArray([entityTypeLabel], chain(prop('label'), parents), true), [title], false) : [entityTypeLabel, title],
34
+ fieldName: attributeUriToSearchUri(attrType.uri, parents)
33
35
  };
34
36
  return __assign({ attrType: attrType, title: title }, attributeProps);
35
37
  };
36
- var createAttributesConfig = function (metadata, attrNode, entityTypeUri, createAttributeConfig, parents) {
38
+ var createAttributesConfig = function (metadata, attrNode, entityTypeUri, parents) {
37
39
  if (parents === void 0) { parents = []; }
38
- var resConfig = __assign(__assign({}, createAttributeConfig(metadata, attrNode, entityTypeUri, parents)), { uri: attrNode.uri });
40
+ var resConfig = __assign(__assign({}, createAttributeItem(metadata, attrNode, entityTypeUri, parents)), { uri: attrNode.uri });
39
41
  var children = attrNode.children
40
42
  ? attrNode.children.map(function (childNode) {
41
- return createAttributesConfig(metadata, childNode, entityTypeUri, createAttributeConfig, parents.concat(attrNode.label));
43
+ return createAttributesConfig(metadata, childNode, entityTypeUri, parents.concat(attrNode));
42
44
  })
43
45
  : [];
44
- if (children.length)
46
+ if (children.length) {
45
47
  resConfig.children = children;
48
+ }
46
49
  return resConfig;
47
50
  };
48
51
  export var getAttributeSelectorItems = function (attributeTypes, entityType, metadata) {
49
52
  if (entityType === void 0) { entityType = {}; }
50
53
  return getAttributesTreeFromAttributes(attributeTypes, metadata).map(function (attrNode) {
51
54
  var entityTypeUri = isSpecialAttribute(attrNode) ? null : entityType.uri;
52
- return createAttributesConfig(metadata, attrNode, entityTypeUri, createAttributeItem);
55
+ return createAttributesConfig(metadata, attrNode, entityTypeUri);
53
56
  });
54
57
  };
55
58
  var findAttributeSelectorItem = function (fieldName, attributesGroup) {
package/esm/components/QueryBuilderRow/QueryBuilderRow.js CHANGED
@@ -20,7 +20,7 @@ var QueryBuilderRow = function (_a) {
20
20
  var _b;
21
21
  var _c = _a.classes, classes = _c === void 0 ? {} : _c, rowData = _a.rowData, previousRowData = _a.previousRowData, _d = _a.LogicOperatorComponent, LogicOperatorComponent = _d === void 0 ? ReadOnlyLogicOperator : _d, AttributeSelectorComponent = _a.AttributeSelectorComponent, _e = _a.FilterSelectorComponent, FilterSelectorComponent = _e === void 0 ? ReadOnlyFilter : _e, ValuesEditorComponent = _a.ValuesEditorComponent, ActionsComponent = _a.ActionsComponent, filterSelectorRef = _a.filterSelectorRef, _f = _a.attributeSelectorProps, attributeSelectorProps = _f === void 0 ? {} : _f, rowContext = __rest(_a, ["classes", "rowData", "previousRowData", "LogicOperatorComponent", "AttributeSelectorComponent", "FilterSelectorComponent", "ValuesEditorComponent", "ActionsComponent", "filterSelectorRef", "attributeSelectorProps"]);
22
22
  var styles = useStyles();
23
- return (React.createElement("div", { className: classnames(styles.row, classes.root) },
23
+ return (React.createElement("div", { className: classnames(styles.row, classes.root), "data-reltio-id": "query-builder-row" },
24
24
  React.createElement(LogicOperatorComponent, { className: classes.logicOperatorContainer, rowContext: rowContext, rowData: previousRowData }),
25
25
  React.createElement("div", { className: classnames(styles.rowItem, classes.attributeSelectorContainer) },
26
26
  React.createElement(AttributeSelectorComponent, { attributeSelectorProps: attributeSelectorProps, rowContext: rowContext, rowData: rowData })),
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@reltio/components",
3
- "version": "1.4.1564",
3
+ "version": "1.4.1565-hf",
4
4
  "license": "SEE LICENSE IN LICENSE FILE",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
7
7
  "dependencies": {
8
8
  "@date-io/moment": "^1.3.5",
9
9
  "@react-google-maps/api": "2.7.0",
10
- "@reltio/mdm-module": "^1.4.1564",
11
- "@reltio/mdm-sdk": "^1.4.1564",
10
+ "@reltio/mdm-module": "^1.4.1565-hf",
11
+ "@reltio/mdm-sdk": "^1.4.1565-hf",
12
12
  "classnames": "^2.2.5",
13
13
  "d3-cloud": "^1.2.5",
14
14
  "d3-geo": "^2.0.1",