@reltio/components 1.4.2228 → 1.4.2230

package/AttributesFiltersBuilder/AttributesFiltersBuilder.js

@@ -20,9 +20,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import React, { useCallback, useRef, useMemo, memo } from 'react';
 import { always, evolve } from 'ramda';
-import { SearchOperator, findClosestCommonAncestor, getEntityType } from '@reltio/mdm-sdk';
+import { SearchOperator, findClosestCommonAncestor, findRegularAttribute, getBaseUri, getEntityType } from '@reltio/mdm-sdk';
 import { EmptyStub } from '../EmptyStub';
-import { getAttributeSelectorItems, getOperationalTypeUriFromAttrTypes } from '../helpers/attributesSelector';
+import { getAttributeSelectorItems } from '../helpers/attributesSelector';
 import { getRowsDataFromFilters } from './helpers';
 import { AttributesFilterSelector } from '../AttributesFilterSelector';
 import { RowActions } from './components/RowActions';
@@ -51,12 +51,13 @@ var AttributesFiltersBuilder = function (_a) {
     var currentEntityType = useMemo(function () {
         var entityTypesUris = attributesTypesGroups.map(function (_a) {
             var attributeTypes = _a.attributeTypes;
-            return getOperationalTypeUriFromAttrTypes(attributeTypes);
+            var regularAttribute = findRegularAttribute(attributeTypes);
+            return regularAttribute ? getBaseUri(regularAttribute.uri) : null;
         });
         var closestEntityTypeAncestorUri = findClosestCommonAncestor(metadata, entityTypesUris);
         return getEntityType(metadata, closestEntityTypeAncestorUri);
     }, [attributesTypesGroups, metadata]);
-    var attributeSelectorItemsGroups = useMemo(function () { return getAttributeSelectorItems(metadata, attributesTypesGroups, attributesTypesGroupFilter); }, [attributesTypesGroups, metadata]);
+    var attributeSelectorItemsGroups = useMemo(function () { return getAttributeSelectorItems(metadata, attributesTypesGroups, attributesTypesGroupFilter); }, [metadata, attributesTypesGroups]);
     var rowsData = useMemo(function () { return (filters.length ? getRowsDataFromFilters(filters, attributeSelectorItemsGroups) : []); }, [attributeSelectorItemsGroups, filters]);
     var _f = useFilterAutoFocus(rowsData), attributeFilterRef = _f.attributeFilterRef, lastAttributesCountRef = _f.lastAttributesCountRef;
     attributesCountRef.current = rowsData.length;

package/AttributesFiltersBuilder/helpers.js

@@ -14,10 +14,15 @@ var findAttributeSelectorItem = function (fieldName, attributesGroup) {
             }
         };
         findAttribute(fieldName, attributesGroupItem.attributes);
+        if (attrGroup) {
+            return "break";
+        }
     };
     for (var _i = 0, attributesGroup_1 = attributesGroup; _i < attributesGroup_1.length; _i++) {
         var attributesGroupItem = attributesGroup_1[_i];
-        _loop_1(attributesGroupItem);
+        var state_1 = _loop_1(attributesGroupItem);
+        if (state_1 === "break")
+            break;
     }
     return attrGroup;
 };

package/FacetsSelector/FacetsSelector.d.ts

@@ -7,7 +7,7 @@ type Props = {
     selectedFacetsFieldNames: string[];
     onOpen: () => void;
     onClose: () => void;
-    onFacetToggle: (item: FacetConfig, selected: boolean) => void;
+    onFacetToggle: (item: FacetConfig, selected: boolean, groupId?: string) => void;
 };
 export declare const FacetsSelector: ({ open, data, selectedFacetsFieldNames, onOpen, onClose, onFacetToggle }: Props) => React.JSX.Element;
 export default FacetsSelector;

package/FacetsSelector/FacetsSelector.js

@@ -18,7 +18,7 @@ export var FacetsSelector = function (_a) {
     }, [onClose]);
     var handleListItemClick = useCallback(function (facetConfig, checked, groupId) {
         setLastFacetClicked({ facetConfig: facetConfig, groupId: groupId });
-        onFacetToggle(facetConfig, checked);
+        onFacetToggle(facetConfig, checked, groupId);
     }, [onFacetToggle]);
     var handleOpen = useCallback(function () {
         showSearchInput();

package/cjs/AttributesFiltersBuilder/AttributesFiltersBuilder.js

@@ -79,12 +79,13 @@ var AttributesFiltersBuilder = function (_a) {
     var currentEntityType = (0, react_1.useMemo)(function () {
         var entityTypesUris = attributesTypesGroups.map(function (_a) {
             var attributeTypes = _a.attributeTypes;
-            return (0, attributesSelector_1.getOperationalTypeUriFromAttrTypes)(attributeTypes);
+            var regularAttribute = (0, mdm_sdk_1.findRegularAttribute)(attributeTypes);
+            return regularAttribute ? (0, mdm_sdk_1.getBaseUri)(regularAttribute.uri) : null;
         });
         var closestEntityTypeAncestorUri = (0, mdm_sdk_1.findClosestCommonAncestor)(metadata, entityTypesUris);
         return (0, mdm_sdk_1.getEntityType)(metadata, closestEntityTypeAncestorUri);
     }, [attributesTypesGroups, metadata]);
-    var attributeSelectorItemsGroups = (0, react_1.useMemo)(function () { return (0, attributesSelector_1.getAttributeSelectorItems)(metadata, attributesTypesGroups, attributesTypesGroupFilter); }, [attributesTypesGroups, metadata]);
+    var attributeSelectorItemsGroups = (0, react_1.useMemo)(function () { return (0, attributesSelector_1.getAttributeSelectorItems)(metadata, attributesTypesGroups, attributesTypesGroupFilter); }, [metadata, attributesTypesGroups]);
     var rowsData = (0, react_1.useMemo)(function () { return (filters.length ? (0, helpers_1.getRowsDataFromFilters)(filters, attributeSelectorItemsGroups) : []); }, [attributeSelectorItemsGroups, filters]);
     var _f = (0, useFilterAutoFocus_1.useFilterAutoFocus)(rowsData), attributeFilterRef = _f.attributeFilterRef, lastAttributesCountRef = _f.lastAttributesCountRef;
     attributesCountRef.current = rowsData.length;

package/cjs/AttributesFiltersBuilder/helpers.js

@@ -17,10 +17,15 @@ var findAttributeSelectorItem = function (fieldName, attributesGroup) {
             }
         };
         findAttribute(fieldName, attributesGroupItem.attributes);
+        if (attrGroup) {
+            return "break";
+        }
     };
     for (var _i = 0, attributesGroup_1 = attributesGroup; _i < attributesGroup_1.length; _i++) {
         var attributesGroupItem = attributesGroup_1[_i];
-        _loop_1(attributesGroupItem);
+        var state_1 = _loop_1(attributesGroupItem);
+        if (state_1 === "break")
+            break;
     }
     return attrGroup;
 };

package/cjs/FacetsSelector/FacetsSelector.d.ts

@@ -7,7 +7,7 @@ type Props = {
     selectedFacetsFieldNames: string[];
     onOpen: () => void;
     onClose: () => void;
-    onFacetToggle: (item: FacetConfig, selected: boolean) => void;
+    onFacetToggle: (item: FacetConfig, selected: boolean, groupId?: string) => void;
 };
 export declare const FacetsSelector: ({ open, data, selectedFacetsFieldNames, onOpen, onClose, onFacetToggle }: Props) => React.JSX.Element;
 export default FacetsSelector;

package/cjs/FacetsSelector/FacetsSelector.js

@@ -47,7 +47,7 @@ var FacetsSelector = function (_a) {
     }, [onClose]);
     var handleListItemClick = (0, react_1.useCallback)(function (facetConfig, checked, groupId) {
         setLastFacetClicked({ facetConfig: facetConfig, groupId: groupId });
-        onFacetToggle(facetConfig, checked);
+        onFacetToggle(facetConfig, checked, groupId);
     }, [onFacetToggle]);
     var handleOpen = (0, react_1.useCallback)(function () {
         showSearchInput();

package/cjs/helpers/attributesSelector.d.ts

@@ -1,4 +1,3 @@
-import { AttributesTypesGroup, AttributeType, Metadata } from '@reltio/mdm-sdk';
+import { AttributesTypesGroup, Metadata } from '@reltio/mdm-sdk';
 import { AttributeSelectorItemsGroup } from '../types';
-export declare const getOperationalTypeUriFromAttrTypes: (attributeTypes: AttributeType[]) => any;
-export declare const getAttributeSelectorItems: (metadata: Metadata, attributesTypesGroups: AttributesTypesGroup[], attributesTypesGroupFilter: (attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
+export declare const getAttributeSelectorItems: (metadata: Metadata, attributesTypesGroups: AttributesTypesGroup[], attributesTypesGroupFilter?: (attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];

package/cjs/helpers/attributesSelector.js

@@ -20,33 +20,38 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAttributeSelectorItems = exports.getOperationalTypeUriFromAttrTypes = void 0;
+exports.getAttributeSelectorItems = void 0;
 var ramda_1 = require("ramda");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
-var createAttributeItem = function (metadata, attrType, operationalTypeUri, parents) {
+var createAttributeItem = function (metadata, attrType, groupId, parents) {
     var title = attrType.label || attrType.name;
     if ((0, mdm_sdk_1.isSpecialAttribute)(attrType)) {
-        return { attrType: attrType, title: title, fieldName: attrType.name };
+        return {
+            attrType: attrType,
+            title: title,
+            fieldName: attrType.name,
+            groupId: groupId
+        };
     }
-    if ((0, mdm_sdk_1.isInteractionTypeUri)(operationalTypeUri)) {
-        return { attrType: attrType, title: title, fieldName: (0, mdm_sdk_1.attributeUriToSearchUri)(attrType.uri, parents) };
+    if ((0, mdm_sdk_1.isInteractionTypeUri)(groupId)) {
+        return { attrType: attrType, title: title, fieldName: (0, mdm_sdk_1.attributeUriToSearchUri)(attrType.uri, parents), groupId: groupId };
     }
-    var entityTypeLabel = (0, mdm_sdk_1.getEntityTypeLabel)(metadata, { type: operationalTypeUri });
+    var entityTypeLabel = (0, mdm_sdk_1.getEntityTypeLabel)(metadata, { type: groupId });
     return {
         attrType: attrType,
         title: title,
-        entityTypeUri: operationalTypeUri,
+        groupId: groupId,
         pathToTitle: Array.isArray(parents)
             ? __spreadArray(__spreadArray([entityTypeLabel], (0, ramda_1.chain)((0, ramda_1.prop)('label'), parents), true), [title], false) : [entityTypeLabel, title],
         fieldName: (0, mdm_sdk_1.attributeUriToSearchUri)(attrType.uri, parents)
     };
 };
-var createAttributesConfig = function (metadata, attrNode, operationalTypeUri, parents) {
+var createAttributesConfig = function (metadata, attrNode, groupId, parents) {
     if (parents === void 0) { parents = []; }
-    var resConfig = __assign(__assign({}, createAttributeItem(metadata, attrNode, operationalTypeUri, parents)), { uri: attrNode.uri });
+    var resConfig = __assign(__assign({}, createAttributeItem(metadata, attrNode, groupId, parents)), { uri: attrNode.uri });
     var children = attrNode.children
         ? attrNode.children.map(function (childNode) {
-            return createAttributesConfig(metadata, childNode, operationalTypeUri, parents.concat(attrNode));
+            return createAttributesConfig(metadata, childNode, groupId, parents.concat(attrNode));
         })
         : [];
     if (children.length) {
@@ -54,21 +59,14 @@ var createAttributesConfig = function (metadata, attrNode, operationalTypeUri, p
     }
     return resConfig;
 };
-var getOperationalTypeUriFromAttrTypes = function (attributeTypes) {
-    var regularAttribute = (0, mdm_sdk_1.findRegularAttribute)(attributeTypes);
-    return regularAttribute ? (0, mdm_sdk_1.getBaseUri)(regularAttribute.uri) : null;
-};
-exports.getOperationalTypeUriFromAttrTypes = getOperationalTypeUriFromAttrTypes;
 var getAttributeSelectorItems = function (metadata, attributesTypesGroups, attributesTypesGroupFilter) {
     var attributeSelectorItemsGroup = attributesTypesGroups.map(function (_a) {
         var id = _a.id, title = _a.title, attributeTypes = _a.attributeTypes;
-        var operationalTypeUri = (0, exports.getOperationalTypeUriFromAttrTypes)(attributeTypes);
         return {
             id: id,
             title: title,
             attributes: (0, mdm_sdk_1.getAttributesTreeFromAttributes)(attributeTypes, metadata).map(function (attrNode) {
-                var uri = (0, mdm_sdk_1.isSpecialAttribute)(attrNode) ? null : operationalTypeUri;
-                return createAttributesConfig(metadata, attrNode, uri);
+                return createAttributesConfig(metadata, attrNode, id);
             })
         };
     });

package/cjs/types/index.d.ts

@@ -45,6 +45,7 @@ export type AttributeSelectorItem = {
     entityTypeUri?: string;
     fieldName: string;
     groupName?: string;
+    groupId?: string;
     title: string;
     uri?: string;
     children?: AttributeSelectorItem[];

package/helpers/attributesSelector.d.ts

@@ -1,4 +1,3 @@
-import { AttributesTypesGroup, AttributeType, Metadata } from '@reltio/mdm-sdk';
+import { AttributesTypesGroup, Metadata } from '@reltio/mdm-sdk';
 import { AttributeSelectorItemsGroup } from '../types';
-export declare const getOperationalTypeUriFromAttrTypes: (attributeTypes: AttributeType[]) => any;
-export declare const getAttributeSelectorItems: (metadata: Metadata, attributesTypesGroups: AttributesTypesGroup[], attributesTypesGroupFilter: (attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];
+export declare const getAttributeSelectorItems: (metadata: Metadata, attributesTypesGroups: AttributesTypesGroup[], attributesTypesGroupFilter?: (attributeSelectorItemsGroup: AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[]) => AttributeSelectorItemsGroup[];

package/helpers/attributesSelector.js

@@ -19,31 +19,36 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { chain, prop } from 'ramda';
-import { attributeUriToSearchUri, findRegularAttribute, getAttributesTreeFromAttributes, getBaseUri, getEntityTypeLabel, isInteractionTypeUri, isSpecialAttribute } from '@reltio/mdm-sdk';
-var createAttributeItem = function (metadata, attrType, operationalTypeUri, parents) {
+import { attributeUriToSearchUri, getAttributesTreeFromAttributes, getEntityTypeLabel, isInteractionTypeUri, isSpecialAttribute } from '@reltio/mdm-sdk';
+var createAttributeItem = function (metadata, attrType, groupId, parents) {
     var title = attrType.label || attrType.name;
     if (isSpecialAttribute(attrType)) {
-        return { attrType: attrType, title: title, fieldName: attrType.name };
+        return {
+            attrType: attrType,
+            title: title,
+            fieldName: attrType.name,
+            groupId: groupId
+        };
     }
-    if (isInteractionTypeUri(operationalTypeUri)) {
-        return { attrType: attrType, title: title, fieldName: attributeUriToSearchUri(attrType.uri, parents) };
+    if (isInteractionTypeUri(groupId)) {
+        return { attrType: attrType, title: title, fieldName: attributeUriToSearchUri(attrType.uri, parents), groupId: groupId };
     }
-    var entityTypeLabel = getEntityTypeLabel(metadata, { type: operationalTypeUri });
+    var entityTypeLabel = getEntityTypeLabel(metadata, { type: groupId });
     return {
         attrType: attrType,
         title: title,
-        entityTypeUri: operationalTypeUri,
+        groupId: groupId,
         pathToTitle: Array.isArray(parents)
             ? __spreadArray(__spreadArray([entityTypeLabel], chain(prop('label'), parents), true), [title], false) : [entityTypeLabel, title],
         fieldName: attributeUriToSearchUri(attrType.uri, parents)
     };
 };
-var createAttributesConfig = function (metadata, attrNode, operationalTypeUri, parents) {
+var createAttributesConfig = function (metadata, attrNode, groupId, parents) {
     if (parents === void 0) { parents = []; }
-    var resConfig = __assign(__assign({}, createAttributeItem(metadata, attrNode, operationalTypeUri, parents)), { uri: attrNode.uri });
+    var resConfig = __assign(__assign({}, createAttributeItem(metadata, attrNode, groupId, parents)), { uri: attrNode.uri });
     var children = attrNode.children
         ? attrNode.children.map(function (childNode) {
-            return createAttributesConfig(metadata, childNode, operationalTypeUri, parents.concat(attrNode));
+            return createAttributesConfig(metadata, childNode, groupId, parents.concat(attrNode));
         })
         : [];
     if (children.length) {
@@ -51,20 +56,14 @@ var createAttributesConfig = function (metadata, attrNode, operationalTypeUri, p
     }
     return resConfig;
 };
-export var getOperationalTypeUriFromAttrTypes = function (attributeTypes) {
-    var regularAttribute = findRegularAttribute(attributeTypes);
-    return regularAttribute ? getBaseUri(regularAttribute.uri) : null;
-};
 export var getAttributeSelectorItems = function (metadata, attributesTypesGroups, attributesTypesGroupFilter) {
     var attributeSelectorItemsGroup = attributesTypesGroups.map(function (_a) {
         var id = _a.id, title = _a.title, attributeTypes = _a.attributeTypes;
-        var operationalTypeUri = getOperationalTypeUriFromAttrTypes(attributeTypes);
         return {
             id: id,
             title: title,
             attributes: getAttributesTreeFromAttributes(attributeTypes, metadata).map(function (attrNode) {
-                var uri = isSpecialAttribute(attrNode) ? null : operationalTypeUri;
-                return createAttributesConfig(metadata, attrNode, uri);
+                return createAttributesConfig(metadata, attrNode, id);
             })
         };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2228",
+  "version": "1.4.2230",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./index.js",
@@ -31,7 +31,7 @@
     "react-mentions": "^4.3.0",
     "react-number-format": "^4.9.2",
     "react-resizable-panels": "^2.0.20",
-    "react-router-dom": "^6.2.1",
+    "react-router-dom": "^6.30.2",
     "react-select": "^5.8.0",
     "react-simple-maps": "^3.0.0",
     "react-virtualized": "^9.22.5",

package/types/index.d.ts

@@ -45,6 +45,7 @@ export type AttributeSelectorItem = {
     entityTypeUri?: string;
     fieldName: string;
     groupName?: string;
+    groupId?: string;
     title: string;
     uri?: string;
     children?: AttributeSelectorItem[];