npm - @reltio/components - Versions diffs - 1.4.1432 → 1.4.1434 - Mend

@reltio/components 1.4.1432 → 1.4.1434

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 (15) hide show

package/cjs/components/BasicViewHeader/BasicViewHeader.js CHANGED Viewed

@@ -26,14 +26,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
+var ui_i18n_1 = __importDefault(require("ui-i18n"));
 var Toolbar_1 = __importDefault(require("@material-ui/core/Toolbar"));
 var Typography_1 = __importDefault(require("@material-ui/core/Typography"));
 var styles_1 = require("./styles");
 var BasicViewHeader = function (_a) {
-    var title = _a.title, _b = _a.children, children = _b === void 0 ? null : _b, _c = _a.classes, classes = _c === void 0 ? {} : _c, otherProps = __rest(_a, ["title", "children", "classes"]);
+    var _b = _a.title, title = _b === void 0 ? '' : _b, _c = _a.children, children = _c === void 0 ? null : _c, _d = _a.classes, classes = _d === void 0 ? {} : _d, otherProps = __rest(_a, ["title", "children", "classes"]);
     var styles = (0, styles_1.useStyles)();
     return (react_1.default.createElement(Toolbar_1.default, __assign({ className: classes.root, classes: { root: styles.toolbar } }, otherProps),
-        react_1.default.createElement(Typography_1.default, { className: classes.title, classes: { root: styles.title }, variant: "h6" }, title),
+        react_1.default.createElement(Typography_1.default, { className: classes.title, classes: { root: styles.title }, variant: "h6" }, ui_i18n_1.default.text(title)),
         children));
 };
 exports.default = BasicViewHeader;

package/cjs/components/DateIntervalSelector/DateIntervalSelector.js CHANGED Viewed

@@ -5,20 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var ramda_1 = require("ramda");
-var ui_i18n_1 = __importDefault(require("ui-i18n"));
+var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var capitalize_1 = __importDefault(require("@material-ui/core/utils/capitalize"));
 var TextField_1 = __importDefault(require("@material-ui/core/TextField"));
 var SimpleDropDownSelector_1 = __importDefault(require("../SimpleDropDownSelector/SimpleDropDownSelector"));
 var utils_1 = require("../../core/utils");
 var styles_1 = require("./styles");
-var periods = [
-    ui_i18n_1.default.text('minutes'),
-    ui_i18n_1.default.text('hours'),
-    ui_i18n_1.default.text('days'),
-    ui_i18n_1.default.text('weeks'),
-    ui_i18n_1.default.text('months'),
-    ui_i18n_1.default.text('years')
-];
+var periods = ['minutes', 'hours', 'days', 'weeks', 'months', 'years'];
 var DateIntervalSelector = function (_a) {
     var _b = _a.interval, value = _b[0], unit = _b[1], onChange = _a.onChange, onFocus = _a.onFocus;
     var styles = (0, styles_1.useStyles)();
@@ -31,9 +24,9 @@ var DateIntervalSelector = function (_a) {
     var onUnitChange = (0, ramda_1.pipe)(getIntervalFromUnit, onChange);
     return (react_1.default.createElement("div", { className: styles.root },
         react_1.default.createElement(TextField_1.default, { type: "number", value: value || '', onChange: onNumberChange, inputProps: { min: 1, onFocus: onFocus }, InputProps: { classes: { root: styles.input } }, className: styles.inputNumber }),
-        react_1.default.createElement(SimpleDropDownSelector_1.default, { label: '', placeholder: (0, capitalize_1.default)(unit), className: styles.inputUnit, value: { value: unit, label: (0, capitalize_1.default)(unit) }, options: periods.map(function (value) { return ({
+        react_1.default.createElement(SimpleDropDownSelector_1.default, { label: '', placeholder: (0, capitalize_1.default)(unit), className: styles.inputUnit, value: { value: unit, label: (0, capitalize_1.default)((0, mdm_sdk_1.getIntervalUnitLabel)(unit)) }, options: periods.map(function (value) { return ({
                 value: value,
-                label: (0, capitalize_1.default)(value)
+                label: (0, capitalize_1.default)((0, mdm_sdk_1.getIntervalUnitLabel)(value))
             }); }), onChange: onUnitChange, TextFieldProps: {
                 inputProps: { onFocus: onFocus },
                 InputProps: { classes: { root: styles.input } }

package/cjs/components/ReltioMap/hooks/useFitMapBounds.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export declare const useFitMapBounds: ({ markers, activeOverlay, isSearchOnMapMove, map }: {
+    markers: any;
+    activeOverlay: any;
+    isSearchOnMapMove: any;
+    map: any;
+}) => void;

package/cjs/components/ReltioMap/hooks/useFitMapBounds.js ADDED Viewed

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useFitMapBounds = void 0;
+var react_1 = require("react");
+var hooks_1 = require("../../../hooks");
+var helpers_1 = require("../helpers");
+var useFitMapBounds = function (_a) {
+    var markers = _a.markers, activeOverlay = _a.activeOverlay, isSearchOnMapMove = _a.isSearchOnMapMove, map = _a.map;
+    var apiIsLoaded = Boolean(map && window.google);
+    var prevMarkers = (0, hooks_1.usePrevious)(markers);
+    var prevActiveOverlay = (0, hooks_1.usePrevious)(activeOverlay);
+    var prevApiIsLoaded = (0, hooks_1.usePrevious)(apiIsLoaded);
+    (0, react_1.useEffect)(function () {
+        var activeOverlayChanged = prevActiveOverlay !== activeOverlay;
+        var markersChanged = prevMarkers !== markers;
+        var apiIsLoadedChanged = prevApiIsLoaded !== apiIsLoaded;
+        var shouldUseFitMapBoundsForOverlay = apiIsLoaded && activeOverlay && (activeOverlayChanged || apiIsLoadedChanged);
+        var shouldUseFitMapBoundsForMarkers = apiIsLoaded && !isSearchOnMapMove && markers.length && (markersChanged || apiIsLoadedChanged);
+        if (shouldUseFitMapBoundsForMarkers) {
+            (0, helpers_1.fitMapBoundsForMarkers)(markers, map, activeOverlay);
+        }
+        else if (shouldUseFitMapBoundsForOverlay) {
+            (0, helpers_1.fitMapBoundsForOverlay)(map, activeOverlay);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [apiIsLoaded, markers, activeOverlay]);
+};
+exports.useFitMapBounds = useFitMapBounds;

package/cjs/components/ReltioMap/index.js CHANGED Viewed

@@ -47,39 +47,24 @@ var TopCenterMapControls_1 = require("./MapControls/TopCenterMapControls/TopCent
 var helpers_1 = require("./helpers");
 var EntityMarker_1 = __importDefault(require("./EntityMarker/EntityMarker"));
 var constants_1 = require("../../constants");
+var useFitMapBounds_1 = require("./hooks/useFitMapBounds");
 var styles_1 = require("./styles");
-var hooks_1 = require("../../hooks");
 var ON_MAP_MOVE_DEBOUNCE_INTERVAL = 1000;
 var libraries = ['drawing'];
-var useFitMapBounds = function (_a) {
-    var markers = _a.markers, activeOverlay = _a.activeOverlay, isSearchOnMapMove = _a.isSearchOnMapMove, map = _a.map;
-    var prevMarkers = (0, hooks_1.usePrevious)(markers);
-    var prevActiveOverlay = (0, hooks_1.usePrevious)(activeOverlay);
-    var apiIsLoaded = map && window.google;
-    (0, react_1.useEffect)(function () {
-        if (apiIsLoaded && !isSearchOnMapMove && markers.length && markers !== prevMarkers) {
-            (0, helpers_1.fitMapBoundsForMarkers)(markers, map, activeOverlay);
-        }
-        else if (apiIsLoaded && activeOverlay && activeOverlay !== prevActiveOverlay) {
-            (0, helpers_1.fitMapBoundsForOverlay)(map, activeOverlay);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [map, markers, activeOverlay]);
-};
 var ReltioMap = function (_a) {
-    var _b = _a.markers, markers = _b === void 0 ? [] : _b, mapKey = _a.mapKey, defaultZoom = _a.defaultZoom, defaultCenter = _a.defaultCenter, loadingElement = _a.loadingElement, isSearchOnMapMove = _a.isSearchOnMapMove, isSearchEnabled = _a.isSearchEnabled, activeOverlay = _a.activeOverlay, overlayOptions = _a.overlayOptions, _c = _a.drawingModes, drawingModes = _c === void 0 ? [] : _c, markerClusterer = _a.markerClusterer, markerClustererOptions = _a.markerClustererOptions, mapOptions = _a.mapOptions, mapContainerClassName = _a.mapContainerClassName, onMapBoundsChanged = _a.onMapBoundsChanged, onOverlayUpdated = _a.onOverlayUpdated, onMarkerClicked = _a.onMarkerClicked;
+    var _b = _a.markers, markers = _b === void 0 ? [] : _b, mapKey = _a.mapKey, defaultZoom = _a.defaultZoom, defaultCenter = _a.defaultCenter, loadingElement = _a.loadingElement, isSearchOnMapMove = _a.isSearchOnMapMove, isSearchEnabled = _a.isSearchEnabled, activeOverlay = _a.activeOverlay, _c = _a.overlayOptions, overlayOptions = _c === void 0 ? {} : _c, _d = _a.drawingModes, drawingModes = _d === void 0 ? [] : _d, markerClusterer = _a.markerClusterer, markerClustererOptions = _a.markerClustererOptions, _e = _a.mapOptions, mapOptions = _e === void 0 ? {} : _e, mapContainerClassName = _a.mapContainerClassName, onMapBoundsChanged = _a.onMapBoundsChanged, onOverlayUpdated = _a.onOverlayUpdated, onMarkerClicked = _a.onMarkerClicked;
     var styles = (0, styles_1.useStyles)();
-    var _d = (0, api_1.useJsApiLoader)({
+    var _f = (0, api_1.useJsApiLoader)({
         googleMapsApiKey: mapKey,
         libraries: libraries
-    }), isLoaded = _d.isLoaded, loadError = _d.loadError;
+    }), isLoaded = _f.isLoaded, loadError = _f.loadError;
     var mapMoveEndTimer = (0, react_1.useRef)(null);
-    var _e = (0, react_1.useState)(null), map = _e[0], setMap = _e[1];
-    var _f = (0, react_1.useState)(null), polygon = _f[0], setPolygon = _f[1];
-    var _g = (0, react_1.useState)(null), drawingMode = _g[0], setDrawingMode = _g[1];
-    useFitMapBounds({ markers: markers, activeOverlay: activeOverlay, map: map, isSearchOnMapMove: isSearchOnMapMove });
-    var allOverlayOptions = (0, react_1.useMemo)(function () { return (__assign(__assign({}, constants_1.DEFAULT_OVERLAY_OPTIONS), (overlayOptions || {}))); }, [overlayOptions]);
-    var googleMapOptions = (0, react_1.useMemo)(function () { return (__assign(__assign({}, constants_1.DEFAULT_GOOGLE_MAP_OPTIONS), (mapOptions || {}))); }, [mapOptions]);
+    var _g = (0, react_1.useState)(null), map = _g[0], setMap = _g[1];
+    var _h = (0, react_1.useState)(null), polygon = _h[0], setPolygon = _h[1];
+    var _j = (0, react_1.useState)(null), drawingMode = _j[0], setDrawingMode = _j[1];
+    (0, useFitMapBounds_1.useFitMapBounds)({ markers: markers, activeOverlay: activeOverlay, map: map, isSearchOnMapMove: isSearchOnMapMove });
+    var allOverlayOptions = (0, react_1.useMemo)(function () { return (__assign(__assign({}, constants_1.DEFAULT_OVERLAY_OPTIONS), overlayOptions)); }, [overlayOptions]);
+    var googleMapOptions = (0, react_1.useMemo)(function () { return (__assign(__assign({}, constants_1.DEFAULT_GOOGLE_MAP_OPTIONS), mapOptions)); }, [mapOptions]);
     var handleChangeIsSearchOnMapMove = (0, react_1.useCallback)(function (isSearchOnMapMove) {
         onMapBoundsChanged(isSearchOnMapMove ? (0, helpers_1.getMapBoundsPolygon)(map) : null);
         setDrawingMode(null);
@@ -89,39 +74,39 @@ var ReltioMap = function (_a) {
         clearTimeout(mapMoveEndTimer.current);
     }, []);
     var handleMapMoveEnd = (0, react_1.useCallback)(function () {
-        if (isSearchOnMapMove) {
-            onMapBoundsChanged((0, helpers_1.getMapBoundsPolygon)(map));
-        }
+        if (!isSearchOnMapMove)
+            return;
+        onMapBoundsChanged((0, helpers_1.getMapBoundsPolygon)(map));
     }, [isSearchOnMapMove, map, onMapBoundsChanged]);
     var handleMapIdle = (0, react_1.useCallback)(function () {
-        if (isSearchOnMapMove) {
-            clearTimeout(mapMoveEndTimer.current);
-            mapMoveEndTimer.current = setTimeout(handleMapMoveEnd, ON_MAP_MOVE_DEBOUNCE_INTERVAL);
-        }
+        if (!isSearchOnMapMove)
+            return;
+        clearTimeout(mapMoveEndTimer.current);
+        mapMoveEndTimer.current = setTimeout(handleMapMoveEnd, ON_MAP_MOVE_DEBOUNCE_INTERVAL);
     }, [handleMapMoveEnd, isSearchOnMapMove]);
     var handleOverlayChange = (0, react_1.useCallback)(function (e, propOverlay) {
         var _a;
-        var stateOverlay = propOverlay ||
-            (polygon && {
-                type: constants_1.MAP_DRAWING_MODES.POLYGON,
-                overlay: polygon
-            });
-        if (!(0, ramda_1.isEmpty)(stateOverlay) && typeof onOverlayUpdated === 'function') {
-            var overlay_1 = stateOverlay.overlay, type = stateOverlay.type;
-            var typeActions = (_a = {},
-                _a[constants_1.MAP_DRAWING_MODES.POLYGON] = function () {
-                    return overlay_1
-                        .getPath()
-                        .getArray()
-                        .map(function (latlng) { return [latlng.lat(), latlng.lng()]; });
-                },
-                _a[constants_1.MAP_DRAWING_MODES.CIRCLE] = function () {
-                    return { radius: overlay_1.getRadius() / 1000, center: overlay_1.getCenter() };
-                },
-                _a);
-            var data = typeActions[type] && typeActions[type]();
-            data && onOverlayUpdated({ data: data, type: type });
-        }
+        var _b;
+        var polygonStateOverlay = polygon && { type: constants_1.MAP_DRAWING_MODES.POLYGON, overlay: polygon };
+        var stateOverlay = propOverlay || polygonStateOverlay;
+        if ((0, ramda_1.isEmpty)(stateOverlay) || !onOverlayUpdated)
+            return;
+        var overlay = stateOverlay.overlay, type = stateOverlay.type;
+        var getPolygonLatLngCoordinates = function () {
+            return overlay
+                .getPath()
+                .getArray()
+                .map(function (latlng) { return [latlng.lat(), latlng.lng()]; });
+        };
+        var getCircleParameters = function () { return ({ radius: overlay.getRadius() / 1000, center: overlay.getCenter() }); };
+        var typeActions = (_a = {},
+            _a[constants_1.MAP_DRAWING_MODES.POLYGON] = getPolygonLatLngCoordinates,
+            _a[constants_1.MAP_DRAWING_MODES.CIRCLE] = getCircleParameters,
+            _a);
+        var data = (_b = typeActions[type]) === null || _b === void 0 ? void 0 : _b.call(typeActions);
+        if (!data)
+            return;
+        onOverlayUpdated({ data: data, type: type });
     }, [onOverlayUpdated, polygon]);
     var handleOverlayComplete = (0, react_1.useCallback)(function (type) { return function (overlay) {
         handleOverlayChange(null, { type: type, overlay: overlay });
@@ -145,16 +130,18 @@ var ReltioMap = function (_a) {
     if (!isLoaded) {
         return loadingElement;
     }
+    var shouldRenderDrawingManager = isSearchEnabled && Boolean(drawingModes.length);
+    var shouldRenderRightMapControls = map && isSearchEnabled && Boolean(drawingModes.length);
+    var shouldRenderCenterMapControls = map && isSearchEnabled;
+    var shouldRenderPolygon = !(0, helpers_1.getDrawingMode)(drawingMode) && activeOverlay && (0, ramda_1.propEq)('type', constants_1.MAP_DRAWING_MODES.POLYGON, activeOverlay);
     return (react_1.default.createElement(api_1.GoogleMap, { mapTypeId: window.google.maps.MapTypeId.ROADMAP, options: googleMapOptions, onLoad: setMap, zoom: defaultZoom, center: defaultCenter, onZoomChanged: handleMapMoveStart, onDragStart: handleMapMoveStart, onIdle: handleMapIdle, mapContainerClassName: mapContainerClassName },
-        map && isSearchEnabled && Boolean(drawingModes.length) && (react_1.default.createElement(MapControlContrainer_1.MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_RIGHT, map: map },
+        shouldRenderRightMapControls && (react_1.default.createElement(MapControlContrainer_1.MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_RIGHT, map: map },
             react_1.default.createElement(TopRightMapControls_1.TopRightMapControls, { hasActiveOverlay: !!activeOverlay, drawingModes: drawingModes, drawingMode: drawingMode, onDrawingModeChanged: setDrawingMode, onClearOverlay: handleClearOverlay }))),
-        map && isSearchEnabled && (react_1.default.createElement(MapControlContrainer_1.MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_CENTER, map: map },
+        shouldRenderCenterMapControls && (react_1.default.createElement(MapControlContrainer_1.MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_CENTER, map: map },
             react_1.default.createElement(TopCenterMapControls_1.TopCenterMapControls, { onChangeIsSearchOnMapMove: handleChangeIsSearchOnMapMove, isSearchOnMapMove: isSearchOnMapMove }))),
         markerClusterer ? renderMarkerClusterer(markerClustererOptions) : renderMarkers(),
-        !(0, helpers_1.getDrawingMode)(drawingMode) &&
-            activeOverlay &&
-            (0, ramda_1.propEq)('type', constants_1.MAP_DRAWING_MODES.POLYGON, activeOverlay) && (react_1.default.createElement(api_1.Polygon, { onLoad: setPolygon, path: activeOverlay.path, editable: true, options: allOverlayOptions, onMouseUp: handleOverlayChange, onDragEnd: handleOverlayChange })),
-        isSearchEnabled && Boolean(drawingModes.length) && (react_1.default.createElement(api_1.DrawingManager, { onPolygonComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.POLYGON), onCircleComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.CIRCLE), drawingMode: (0, helpers_1.getDrawingMode)(drawingMode), options: {
+        shouldRenderPolygon && (react_1.default.createElement(api_1.Polygon, { onLoad: setPolygon, path: activeOverlay.path, editable: true, options: allOverlayOptions, onMouseUp: handleOverlayChange, onDragEnd: handleOverlayChange })),
+        shouldRenderDrawingManager && (react_1.default.createElement(api_1.DrawingManager, { onPolygonComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.POLYGON), onCircleComplete: handleOverlayComplete(constants_1.MAP_DRAWING_MODES.CIRCLE), drawingMode: (0, helpers_1.getDrawingMode)(drawingMode), options: {
                 drawingControl: false,
                 circleOptions: allOverlayOptions,
                 polygonOptions: allOverlayOptions

package/cjs/components/activityLog/ActivityLogFilter/helpers.js CHANGED Viewed

@@ -25,9 +25,15 @@ var getFilterLabel = function (filters) {
         };
         switch (date.type) {
             case mdm_sdk_1.DateRangeTypes.WITHIN:
-                return ui_i18n_1.default.text('Within ${amount} ${unit}', { amount: date.period[0], unit: date.period[1] });
+                return ui_i18n_1.default.text('Within ${amount} ${unit}', {
+                    amount: date.period[0],
+                    unit: (0, mdm_sdk_1.getIntervalUnitLabel)(date.period[1])
+                });
             case mdm_sdk_1.DateRangeTypes.AGO:
-                return ui_i18n_1.default.text('More than ${amount} ${unit} ago', { amount: date.period[0], unit: date.period[1] });
+                return ui_i18n_1.default.text('More than ${amount} ${unit} ago', {
+                    amount: date.period[0],
+                    unit: (0, mdm_sdk_1.getIntervalUnitLabel)(date.period[1])
+                });
             case mdm_sdk_1.DateRangeTypes.BETWEEN:
                 return ui_i18n_1.default.text('${startDate} to ${endDate}', {
                     startDate: formatDateValue(date.period[0]),

package/cjs/components/workflow/cards/GenericWorkflowTaskCard/GenericWorkflowTaskCard.js CHANGED Viewed

@@ -61,7 +61,7 @@ var GenericWorkflowTaskCard = function (_a) {
                 react_1.default.createElement(LineDecorator_1.default, { plain: true, first: true, transparent: !isExpanded },
                     react_1.default.createElement("div", { className: styles.mainInfo },
                         react_1.default.createElement("div", { className: styles.title },
-                            react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.caption, styles.flex) }, processDefinitionDisplayName),
+                            react_1.default.createElement("div", { className: (0, classnames_1.default)(styles.caption, styles.flex) }, ui_i18n_1.default.text(processDefinitionDisplayName)),
                             react_1.default.createElement(Flag_1.default, { className: styles.flag }),
                             react_1.default.createElement(Tooltip_1.default, { title: ui_i18n_1.default.text('Due date') },
                                 react_1.default.createElement("span", { className: styles.date }, ui_i18n_1.default.date(dueDate, 'L'))),

package/esm/components/BasicViewHeader/BasicViewHeader.js CHANGED Viewed

@@ -21,14 +21,15 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import React from 'react';
+import i18n from 'ui-i18n';
 import Toolbar from '@material-ui/core/Toolbar';
 import Typography from '@material-ui/core/Typography';
 import { useStyles } from './styles';
 var BasicViewHeader = function (_a) {
-    var title = _a.title, _b = _a.children, children = _b === void 0 ? null : _b, _c = _a.classes, classes = _c === void 0 ? {} : _c, otherProps = __rest(_a, ["title", "children", "classes"]);
+    var _b = _a.title, title = _b === void 0 ? '' : _b, _c = _a.children, children = _c === void 0 ? null : _c, _d = _a.classes, classes = _d === void 0 ? {} : _d, otherProps = __rest(_a, ["title", "children", "classes"]);
     var styles = useStyles();
     return (React.createElement(Toolbar, __assign({ className: classes.root, classes: { root: styles.toolbar } }, otherProps),
-        React.createElement(Typography, { className: classes.title, classes: { root: styles.title }, variant: "h6" }, title),
+        React.createElement(Typography, { className: classes.title, classes: { root: styles.title }, variant: "h6" }, i18n.text(title)),
         children));
 };
 export default BasicViewHeader;

package/esm/components/DateIntervalSelector/DateIntervalSelector.js CHANGED Viewed

@@ -1,19 +1,12 @@
 import React from 'react';
 import { pipe } from 'ramda';
-import i18n from 'ui-i18n';
+import { getIntervalUnitLabel } from '@reltio/mdm-sdk';
 import capitalize from '@material-ui/core/utils/capitalize';
 import TextField from '@material-ui/core/TextField';
 import SimpleDropDownSelector from '../SimpleDropDownSelector/SimpleDropDownSelector';
 import { getValue } from '../../core/utils';
 import { useStyles } from './styles';
-var periods = [
-    i18n.text('minutes'),
-    i18n.text('hours'),
-    i18n.text('days'),
-    i18n.text('weeks'),
-    i18n.text('months'),
-    i18n.text('years')
-];
+var periods = ['minutes', 'hours', 'days', 'weeks', 'months', 'years'];
 var DateIntervalSelector = function (_a) {
     var _b = _a.interval, value = _b[0], unit = _b[1], onChange = _a.onChange, onFocus = _a.onFocus;
     var styles = useStyles();
@@ -26,9 +19,9 @@ var DateIntervalSelector = function (_a) {
     var onUnitChange = pipe(getIntervalFromUnit, onChange);
     return (React.createElement("div", { className: styles.root },
         React.createElement(TextField, { type: "number", value: value || '', onChange: onNumberChange, inputProps: { min: 1, onFocus: onFocus }, InputProps: { classes: { root: styles.input } }, className: styles.inputNumber }),
-        React.createElement(SimpleDropDownSelector, { label: '', placeholder: capitalize(unit), className: styles.inputUnit, value: { value: unit, label: capitalize(unit) }, options: periods.map(function (value) { return ({
+        React.createElement(SimpleDropDownSelector, { label: '', placeholder: capitalize(unit), className: styles.inputUnit, value: { value: unit, label: capitalize(getIntervalUnitLabel(unit)) }, options: periods.map(function (value) { return ({
                 value: value,
-                label: capitalize(value)
+                label: capitalize(getIntervalUnitLabel(value))
             }); }), onChange: onUnitChange, TextFieldProps: {
                 inputProps: { onFocus: onFocus },
                 InputProps: { classes: { root: styles.input } }

package/esm/components/ReltioMap/hooks/useFitMapBounds.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export declare const useFitMapBounds: ({ markers, activeOverlay, isSearchOnMapMove, map }: {
+    markers: any;
+    activeOverlay: any;
+    isSearchOnMapMove: any;
+    map: any;
+}) => void;

package/esm/components/ReltioMap/hooks/useFitMapBounds.js ADDED Viewed

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import { usePrevious } from '../../../hooks';
+import { fitMapBoundsForMarkers, fitMapBoundsForOverlay } from '../helpers';
+export var useFitMapBounds = function (_a) {
+    var markers = _a.markers, activeOverlay = _a.activeOverlay, isSearchOnMapMove = _a.isSearchOnMapMove, map = _a.map;
+    var apiIsLoaded = Boolean(map && window.google);
+    var prevMarkers = usePrevious(markers);
+    var prevActiveOverlay = usePrevious(activeOverlay);
+    var prevApiIsLoaded = usePrevious(apiIsLoaded);
+    useEffect(function () {
+        var activeOverlayChanged = prevActiveOverlay !== activeOverlay;
+        var markersChanged = prevMarkers !== markers;
+        var apiIsLoadedChanged = prevApiIsLoaded !== apiIsLoaded;
+        var shouldUseFitMapBoundsForOverlay = apiIsLoaded && activeOverlay && (activeOverlayChanged || apiIsLoadedChanged);
+        var shouldUseFitMapBoundsForMarkers = apiIsLoaded && !isSearchOnMapMove && markers.length && (markersChanged || apiIsLoadedChanged);
+        if (shouldUseFitMapBoundsForMarkers) {
+            fitMapBoundsForMarkers(markers, map, activeOverlay);
+        }
+        else if (shouldUseFitMapBoundsForOverlay) {
+            fitMapBoundsForOverlay(map, activeOverlay);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [apiIsLoaded, markers, activeOverlay]);
+};

package/esm/components/ReltioMap/index.js CHANGED Viewed

@@ -9,48 +9,33 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { propEq, isEmpty, prop } from 'ramda';
 import { GoogleMap, useJsApiLoader, Polygon, DrawingManager, MarkerClusterer } from '@react-google-maps/api';
 import { MapControlContainer } from './MapControls/MapControlContainer/MapControlContrainer';
 import { TopRightMapControls } from './MapControls/TopRightMapControls/TopRightMapControls';
 import { TopCenterMapControls } from './MapControls/TopCenterMapControls/TopCenterMapControls';
-import { getMapBoundsPolygon, getDrawingMode, fitMapBoundsForMarkers, fitMapBoundsForOverlay } from './helpers';
+import { getMapBoundsPolygon, getDrawingMode } from './helpers';
 import EntityMarker from './EntityMarker/EntityMarker';
 import { DEFAULT_GOOGLE_MAP_OPTIONS, DEFAULT_OVERLAY_OPTIONS, MAP_DRAWING_MODES } from '../../constants';
+import { useFitMapBounds } from './hooks/useFitMapBounds';
 import { useStyles } from './styles';
-import { usePrevious } from '../../hooks';
 var ON_MAP_MOVE_DEBOUNCE_INTERVAL = 1000;
 var libraries = ['drawing'];
-var useFitMapBounds = function (_a) {
-    var markers = _a.markers, activeOverlay = _a.activeOverlay, isSearchOnMapMove = _a.isSearchOnMapMove, map = _a.map;
-    var prevMarkers = usePrevious(markers);
-    var prevActiveOverlay = usePrevious(activeOverlay);
-    var apiIsLoaded = map && window.google;
-    useEffect(function () {
-        if (apiIsLoaded && !isSearchOnMapMove && markers.length && markers !== prevMarkers) {
-            fitMapBoundsForMarkers(markers, map, activeOverlay);
-        }
-        else if (apiIsLoaded && activeOverlay && activeOverlay !== prevActiveOverlay) {
-            fitMapBoundsForOverlay(map, activeOverlay);
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [map, markers, activeOverlay]);
-};
 export var ReltioMap = function (_a) {
-    var _b = _a.markers, markers = _b === void 0 ? [] : _b, mapKey = _a.mapKey, defaultZoom = _a.defaultZoom, defaultCenter = _a.defaultCenter, loadingElement = _a.loadingElement, isSearchOnMapMove = _a.isSearchOnMapMove, isSearchEnabled = _a.isSearchEnabled, activeOverlay = _a.activeOverlay, overlayOptions = _a.overlayOptions, _c = _a.drawingModes, drawingModes = _c === void 0 ? [] : _c, markerClusterer = _a.markerClusterer, markerClustererOptions = _a.markerClustererOptions, mapOptions = _a.mapOptions, mapContainerClassName = _a.mapContainerClassName, onMapBoundsChanged = _a.onMapBoundsChanged, onOverlayUpdated = _a.onOverlayUpdated, onMarkerClicked = _a.onMarkerClicked;
+    var _b = _a.markers, markers = _b === void 0 ? [] : _b, mapKey = _a.mapKey, defaultZoom = _a.defaultZoom, defaultCenter = _a.defaultCenter, loadingElement = _a.loadingElement, isSearchOnMapMove = _a.isSearchOnMapMove, isSearchEnabled = _a.isSearchEnabled, activeOverlay = _a.activeOverlay, _c = _a.overlayOptions, overlayOptions = _c === void 0 ? {} : _c, _d = _a.drawingModes, drawingModes = _d === void 0 ? [] : _d, markerClusterer = _a.markerClusterer, markerClustererOptions = _a.markerClustererOptions, _e = _a.mapOptions, mapOptions = _e === void 0 ? {} : _e, mapContainerClassName = _a.mapContainerClassName, onMapBoundsChanged = _a.onMapBoundsChanged, onOverlayUpdated = _a.onOverlayUpdated, onMarkerClicked = _a.onMarkerClicked;
     var styles = useStyles();
-    var _d = useJsApiLoader({
+    var _f = useJsApiLoader({
         googleMapsApiKey: mapKey,
         libraries: libraries
-    }), isLoaded = _d.isLoaded, loadError = _d.loadError;
+    }), isLoaded = _f.isLoaded, loadError = _f.loadError;
     var mapMoveEndTimer = useRef(null);
-    var _e = useState(null), map = _e[0], setMap = _e[1];
-    var _f = useState(null), polygon = _f[0], setPolygon = _f[1];
-    var _g = useState(null), drawingMode = _g[0], setDrawingMode = _g[1];
+    var _g = useState(null), map = _g[0], setMap = _g[1];
+    var _h = useState(null), polygon = _h[0], setPolygon = _h[1];
+    var _j = useState(null), drawingMode = _j[0], setDrawingMode = _j[1];
     useFitMapBounds({ markers: markers, activeOverlay: activeOverlay, map: map, isSearchOnMapMove: isSearchOnMapMove });
-    var allOverlayOptions = useMemo(function () { return (__assign(__assign({}, DEFAULT_OVERLAY_OPTIONS), (overlayOptions || {}))); }, [overlayOptions]);
-    var googleMapOptions = useMemo(function () { return (__assign(__assign({}, DEFAULT_GOOGLE_MAP_OPTIONS), (mapOptions || {}))); }, [mapOptions]);
+    var allOverlayOptions = useMemo(function () { return (__assign(__assign({}, DEFAULT_OVERLAY_OPTIONS), overlayOptions)); }, [overlayOptions]);
+    var googleMapOptions = useMemo(function () { return (__assign(__assign({}, DEFAULT_GOOGLE_MAP_OPTIONS), mapOptions)); }, [mapOptions]);
     var handleChangeIsSearchOnMapMove = useCallback(function (isSearchOnMapMove) {
         onMapBoundsChanged(isSearchOnMapMove ? getMapBoundsPolygon(map) : null);
         setDrawingMode(null);
@@ -60,39 +45,39 @@ export var ReltioMap = function (_a) {
         clearTimeout(mapMoveEndTimer.current);
     }, []);
     var handleMapMoveEnd = useCallback(function () {
-        if (isSearchOnMapMove) {
-            onMapBoundsChanged(getMapBoundsPolygon(map));
-        }
+        if (!isSearchOnMapMove)
+            return;
+        onMapBoundsChanged(getMapBoundsPolygon(map));
     }, [isSearchOnMapMove, map, onMapBoundsChanged]);
     var handleMapIdle = useCallback(function () {
-        if (isSearchOnMapMove) {
-            clearTimeout(mapMoveEndTimer.current);
-            mapMoveEndTimer.current = setTimeout(handleMapMoveEnd, ON_MAP_MOVE_DEBOUNCE_INTERVAL);
-        }
+        if (!isSearchOnMapMove)
+            return;
+        clearTimeout(mapMoveEndTimer.current);
+        mapMoveEndTimer.current = setTimeout(handleMapMoveEnd, ON_MAP_MOVE_DEBOUNCE_INTERVAL);
     }, [handleMapMoveEnd, isSearchOnMapMove]);
     var handleOverlayChange = useCallback(function (e, propOverlay) {
         var _a;
-        var stateOverlay = propOverlay ||
-            (polygon && {
-                type: MAP_DRAWING_MODES.POLYGON,
-                overlay: polygon
-            });
-        if (!isEmpty(stateOverlay) && typeof onOverlayUpdated === 'function') {
-            var overlay_1 = stateOverlay.overlay, type = stateOverlay.type;
-            var typeActions = (_a = {},
-                _a[MAP_DRAWING_MODES.POLYGON] = function () {
-                    return overlay_1
-                        .getPath()
-                        .getArray()
-                        .map(function (latlng) { return [latlng.lat(), latlng.lng()]; });
-                },
-                _a[MAP_DRAWING_MODES.CIRCLE] = function () {
-                    return { radius: overlay_1.getRadius() / 1000, center: overlay_1.getCenter() };
-                },
-                _a);
-            var data = typeActions[type] && typeActions[type]();
-            data && onOverlayUpdated({ data: data, type: type });
-        }
+        var _b;
+        var polygonStateOverlay = polygon && { type: MAP_DRAWING_MODES.POLYGON, overlay: polygon };
+        var stateOverlay = propOverlay || polygonStateOverlay;
+        if (isEmpty(stateOverlay) || !onOverlayUpdated)
+            return;
+        var overlay = stateOverlay.overlay, type = stateOverlay.type;
+        var getPolygonLatLngCoordinates = function () {
+            return overlay
+                .getPath()
+                .getArray()
+                .map(function (latlng) { return [latlng.lat(), latlng.lng()]; });
+        };
+        var getCircleParameters = function () { return ({ radius: overlay.getRadius() / 1000, center: overlay.getCenter() }); };
+        var typeActions = (_a = {},
+            _a[MAP_DRAWING_MODES.POLYGON] = getPolygonLatLngCoordinates,
+            _a[MAP_DRAWING_MODES.CIRCLE] = getCircleParameters,
+            _a);
+        var data = (_b = typeActions[type]) === null || _b === void 0 ? void 0 : _b.call(typeActions);
+        if (!data)
+            return;
+        onOverlayUpdated({ data: data, type: type });
     }, [onOverlayUpdated, polygon]);
     var handleOverlayComplete = useCallback(function (type) { return function (overlay) {
         handleOverlayChange(null, { type: type, overlay: overlay });
@@ -116,16 +101,18 @@ export var ReltioMap = function (_a) {
     if (!isLoaded) {
         return loadingElement;
     }
+    var shouldRenderDrawingManager = isSearchEnabled && Boolean(drawingModes.length);
+    var shouldRenderRightMapControls = map && isSearchEnabled && Boolean(drawingModes.length);
+    var shouldRenderCenterMapControls = map && isSearchEnabled;
+    var shouldRenderPolygon = !getDrawingMode(drawingMode) && activeOverlay && propEq('type', MAP_DRAWING_MODES.POLYGON, activeOverlay);
     return (React.createElement(GoogleMap, { mapTypeId: window.google.maps.MapTypeId.ROADMAP, options: googleMapOptions, onLoad: setMap, zoom: defaultZoom, center: defaultCenter, onZoomChanged: handleMapMoveStart, onDragStart: handleMapMoveStart, onIdle: handleMapIdle, mapContainerClassName: mapContainerClassName },
-        map && isSearchEnabled && Boolean(drawingModes.length) && (React.createElement(MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_RIGHT, map: map },
+        shouldRenderRightMapControls && (React.createElement(MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_RIGHT, map: map },
             React.createElement(TopRightMapControls, { hasActiveOverlay: !!activeOverlay, drawingModes: drawingModes, drawingMode: drawingMode, onDrawingModeChanged: setDrawingMode, onClearOverlay: handleClearOverlay }))),
-        map && isSearchEnabled && (React.createElement(MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_CENTER, map: map },
+        shouldRenderCenterMapControls && (React.createElement(MapControlContainer, { className: styles.mapControlContainer, position: window.google.maps.ControlPosition.TOP_CENTER, map: map },
             React.createElement(TopCenterMapControls, { onChangeIsSearchOnMapMove: handleChangeIsSearchOnMapMove, isSearchOnMapMove: isSearchOnMapMove }))),
         markerClusterer ? renderMarkerClusterer(markerClustererOptions) : renderMarkers(),
-        !getDrawingMode(drawingMode) &&
-            activeOverlay &&
-            propEq('type', MAP_DRAWING_MODES.POLYGON, activeOverlay) && (React.createElement(Polygon, { onLoad: setPolygon, path: activeOverlay.path, editable: true, options: allOverlayOptions, onMouseUp: handleOverlayChange, onDragEnd: handleOverlayChange })),
-        isSearchEnabled && Boolean(drawingModes.length) && (React.createElement(DrawingManager, { onPolygonComplete: handleOverlayComplete(MAP_DRAWING_MODES.POLYGON), onCircleComplete: handleOverlayComplete(MAP_DRAWING_MODES.CIRCLE), drawingMode: getDrawingMode(drawingMode), options: {
+        shouldRenderPolygon && (React.createElement(Polygon, { onLoad: setPolygon, path: activeOverlay.path, editable: true, options: allOverlayOptions, onMouseUp: handleOverlayChange, onDragEnd: handleOverlayChange })),
+        shouldRenderDrawingManager && (React.createElement(DrawingManager, { onPolygonComplete: handleOverlayComplete(MAP_DRAWING_MODES.POLYGON), onCircleComplete: handleOverlayComplete(MAP_DRAWING_MODES.CIRCLE), drawingMode: getDrawingMode(drawingMode), options: {
                 drawingControl: false,
                 circleOptions: allOverlayOptions,
                 polygonOptions: allOverlayOptions

package/esm/components/activityLog/ActivityLogFilter/helpers.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import i18n from 'ui-i18n';
 import { curry, join, identity, isNil, map, pipe, reject, sortBy, defaultTo, pluck } from 'ramda';
-import { DataTypes, formatDataTypeValue, DateRangeTypes } from '@reltio/mdm-sdk';
+import { DataTypes, formatDataTypeValue, DateRangeTypes, getIntervalUnitLabel } from '@reltio/mdm-sdk';
 import { getActivityLabel } from '../utils/activities';
 export var getFilterLabel = function (filters) {
     var getLabel = curry(function (unit, pluralUnit, values) {
@@ -19,9 +19,15 @@ export var getFilterLabel = function (filters) {
         };
         switch (date.type) {
             case DateRangeTypes.WITHIN:
-                return i18n.text('Within ${amount} ${unit}', { amount: date.period[0], unit: date.period[1] });
+                return i18n.text('Within ${amount} ${unit}', {
+                    amount: date.period[0],
+                    unit: getIntervalUnitLabel(date.period[1])
+                });
             case DateRangeTypes.AGO:
-                return i18n.text('More than ${amount} ${unit} ago', { amount: date.period[0], unit: date.period[1] });
+                return i18n.text('More than ${amount} ${unit} ago', {
+                    amount: date.period[0],
+                    unit: getIntervalUnitLabel(date.period[1])
+                });
             case DateRangeTypes.BETWEEN:
                 return i18n.text('${startDate} to ${endDate}', {
                     startDate: formatDateValue(date.period[0]),

package/esm/components/workflow/cards/GenericWorkflowTaskCard/GenericWorkflowTaskCard.js CHANGED Viewed

@@ -33,7 +33,7 @@ var GenericWorkflowTaskCard = function (_a) {
                 React.createElement(LineDecorator, { plain: true, first: true, transparent: !isExpanded },
                     React.createElement("div", { className: styles.mainInfo },
                         React.createElement("div", { className: styles.title },
-                            React.createElement("div", { className: classnames(styles.caption, styles.flex) }, processDefinitionDisplayName),
+                            React.createElement("div", { className: classnames(styles.caption, styles.flex) }, i18n.text(processDefinitionDisplayName)),
                             React.createElement(FlagIcon, { className: styles.flag }),
                             React.createElement(Tooltip, { title: i18n.text('Due date') },
                                 React.createElement("span", { className: styles.date }, i18n.date(dueDate, 'L'))),

package/package.json CHANGED Viewed

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1432",
+  "version": "1.4.1434",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "dependencies": {
     "@date-io/moment": "^1.3.5",
     "@react-google-maps/api": "2.7.0",
-    "@reltio/mdm-module": "^1.4.1432",
-    "@reltio/mdm-sdk": "^1.4.1432",
+    "@reltio/mdm-module": "^1.4.1434",
+    "@reltio/mdm-sdk": "^1.4.1434",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",