@reltio/components 1.4.2006 → 1.4.2008

package/cjs/hooks/useMarkers/referenceHelpers.js

@@ -60,6 +60,29 @@ exports.getPointsFromReference = void 0;
 var ramda_1 = require("ramda");
 var mdm_sdk_1 = require("@reltio/mdm-sdk");
 var helpers_1 = require("./helpers");
+var createCachedDecodeAddress = function (maxCacheSize) {
+    if (maxCacheSize === void 0) { maxCacheSize = 500; }
+    var cache = new Map();
+    return function (_a) {
+        var servicesPath = _a.servicesPath, address = _a.address;
+        if (cache.has(address)) {
+            var cached = cache.get(address);
+            // maintain LRU cache - move recently used item to the end of the queue
+            cache.delete(address);
+            cache.set(address, cached);
+            return cached;
+        }
+        var promise = (0, mdm_sdk_1.decodeAddress)({ servicesPath: servicesPath, address: address });
+        cache.set(address, promise);
+        promise.catch(function () { return cache.delete(address); });
+        if (cache.size > maxCacheSize) {
+            // maintain LRU cache - remove the oldest (first) item
+            cache.delete(cache.keys().next().value);
+        }
+        return promise;
+    };
+};
+var cachedDecodeAddress = createCachedDecodeAddress();
 var getGeoLocation = function (servicesPath, entity, attributes, metadata, refAttribute, name) { return __awaiter(void 0, void 0, void 0, function () {
     var entityType, results, geoLocation, results, response, _a;
     var _b;
@@ -98,7 +121,7 @@ var getGeoLocation = function (servicesPath, entity, attributes, metadata, refAt
                 _c.label = 1;
             case 1:
                 _c.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, (0, mdm_sdk_1.decodeAddress)({ servicesPath: servicesPath, address: refAttribute.label })];
+                return [4 /*yield*/, cachedDecodeAddress({ servicesPath: servicesPath, address: refAttribute.label })];
             case 2:
                 response = _c.sent();
                 return [2 /*return*/, response.location];
@@ -162,7 +185,7 @@ var getPointsFromReference = function (servicesPath_1, metadata_1) {
                             return getGeoLocation(servicesPath, entity, pointSource, metadata, refAttribute, name)
                                 .then(function (points) {
                                 if (!points && entity.label) {
-                                    return (0, mdm_sdk_1.decodeAddress)({ servicesPath: servicesPath, address: entity.label })
+                                    return cachedDecodeAddress({ servicesPath: servicesPath, address: entity.label })
                                         .then(function (response) { return response.location; })
                                         .catch(function () { return null; });
                                 }

package/cjs/hooks/useMarkers/referenceHelpers.test.js

@@ -338,6 +338,15 @@ describe('from reference strategy test', function () {
                     expect(points[0].entity).toEqual(entities[0]);
                     expect(points[0].label).toBe('label');
                     expect(points[0].point).toEqual({ lat: 321, lng: 123 });
+                    expect(mdm_sdk_1.decodeAddress).toHaveBeenCalledTimes(1);
+                    return [4 /*yield*/, (0, referenceHelpers_1.getPointsFromReference)(servicesPath, defaultMetadata, entities)];
+                case 2:
+                    points = _a.sent();
+                    expect(points[0].id).toBe('entities/111');
+                    expect(points[0].entity).toEqual(entities[0]);
+                    expect(points[0].label).toBe('label');
+                    expect(points[0].point).toEqual({ lat: 321, lng: 123 });
+                    expect(mdm_sdk_1.decodeAddress).toHaveBeenCalledTimes(1);
                     return [2 /*return*/];
             }
         });
@@ -479,7 +488,7 @@ describe('from reference strategy test', function () {
             switch (_a.label) {
                 case 0:
                     metadata = (0, ramda_1.assocPath)(['entityTypes', 0, 'attributes', 0, 'attributes', 0, 'masking'], { regex: '***' }, defaultMetadata);
-                    return [4 /*yield*/, (0, referenceHelpers_1.getPointsFromReference)(servicesPath, metadata, defaultEntities)];
+                    return [4 /*yield*/, (0, referenceHelpers_1.getPointsFromReference)(servicesPath, metadata, defaultEntities.map(function (entity) { return (__assign(__assign({}, entity), { label: '***' })); }))];
                 case 1:
                     points = _a.sent();
                     expect(points).toEqual([]);

package/features/graph/DataModelGraph/hooks/useFakeCenterNode.test.js

@@ -31,5 +31,6 @@ describe('useFakeCenterNode tests', function () {
             jest.advanceTimersByTime(1000);
         });
         expect(graph.hasNode(FAKE_CENTER_NODE_ID)).toBe(false);
+        jest.useRealTimers();
     });
 });

package/hooks/useMarkers/referenceHelpers.js

@@ -57,6 +57,29 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { identity, flatten } from 'ramda';
 import { decodeAddress, getEntityType, wrapInArrayIfNeeded, hasMaskingByUris } from '@reltio/mdm-sdk';
 import { getPointsFromAttributes, isSet } from './helpers';
+var createCachedDecodeAddress = function (maxCacheSize) {
+    if (maxCacheSize === void 0) { maxCacheSize = 500; }
+    var cache = new Map();
+    return function (_a) {
+        var servicesPath = _a.servicesPath, address = _a.address;
+        if (cache.has(address)) {
+            var cached = cache.get(address);
+            // maintain LRU cache - move recently used item to the end of the queue
+            cache.delete(address);
+            cache.set(address, cached);
+            return cached;
+        }
+        var promise = decodeAddress({ servicesPath: servicesPath, address: address });
+        cache.set(address, promise);
+        promise.catch(function () { return cache.delete(address); });
+        if (cache.size > maxCacheSize) {
+            // maintain LRU cache - remove the oldest (first) item
+            cache.delete(cache.keys().next().value);
+        }
+        return promise;
+    };
+};
+var cachedDecodeAddress = createCachedDecodeAddress();
 var getGeoLocation = function (servicesPath, entity, attributes, metadata, refAttribute, name) { return __awaiter(void 0, void 0, void 0, function () {
     var entityType, results, geoLocation, results, response, _a;
     var _b;
@@ -95,7 +118,7 @@ var getGeoLocation = function (servicesPath, entity, attributes, metadata, refAt
                 _c.label = 1;
             case 1:
                 _c.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, decodeAddress({ servicesPath: servicesPath, address: refAttribute.label })];
+                return [4 /*yield*/, cachedDecodeAddress({ servicesPath: servicesPath, address: refAttribute.label })];
             case 2:
                 response = _c.sent();
                 return [2 /*return*/, response.location];
@@ -159,7 +182,7 @@ export var getPointsFromReference = function (servicesPath_1, metadata_1) {
                             return getGeoLocation(servicesPath, entity, pointSource, metadata, refAttribute, name)
                                 .then(function (points) {
                                 if (!points && entity.label) {
-                                    return decodeAddress({ servicesPath: servicesPath, address: entity.label })
+                                    return cachedDecodeAddress({ servicesPath: servicesPath, address: entity.label })
                                         .then(function (response) { return response.location; })
                                         .catch(function () { return null; });
                                 }

package/hooks/useMarkers/referenceHelpers.test.js

@@ -336,6 +336,15 @@ describe('from reference strategy test', function () {
                     expect(points[0].entity).toEqual(entities[0]);
                     expect(points[0].label).toBe('label');
                     expect(points[0].point).toEqual({ lat: 321, lng: 123 });
+                    expect(decodeAddress).toHaveBeenCalledTimes(1);
+                    return [4 /*yield*/, getPointsFromReference(servicesPath, defaultMetadata, entities)];
+                case 2:
+                    points = _a.sent();
+                    expect(points[0].id).toBe('entities/111');
+                    expect(points[0].entity).toEqual(entities[0]);
+                    expect(points[0].label).toBe('label');
+                    expect(points[0].point).toEqual({ lat: 321, lng: 123 });
+                    expect(decodeAddress).toHaveBeenCalledTimes(1);
                     return [2 /*return*/];
             }
         });
@@ -477,7 +486,7 @@ describe('from reference strategy test', function () {
             switch (_a.label) {
                 case 0:
                     metadata = assocPath(['entityTypes', 0, 'attributes', 0, 'attributes', 0, 'masking'], { regex: '***' }, defaultMetadata);
-                    return [4 /*yield*/, getPointsFromReference(servicesPath, metadata, defaultEntities)];
+                    return [4 /*yield*/, getPointsFromReference(servicesPath, metadata, defaultEntities.map(function (entity) { return (__assign(__assign({}, entity), { label: '***' })); }))];
                 case 1:
                     points = _a.sent();
                     expect(points).toEqual([]);

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.2006",
+  "version": "1.4.2008",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "dependencies": {
     "@fluentui/react-context-selector": "^9.1.26",
-    "@react-google-maps/api": "2.7.0",
+    "@googlemaps/markerclusterer": "^2.5.3",
     "@react-sigma/core": "3.4.0",
     "@reltio/mdm-sdk": "^1.4.1893",
+    "@vis.gl/react-google-maps": "^1.3.0",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",
     "d3-hierarchy": "^2.0.0",