@hestia-earth/ui-components 0.33.2 → 0.33.4

package/fesm2022/hestia-earth-ui-components.mjs

@@ -5684,6 +5684,7 @@ const sortNodes = (values) => values?.length
     ? orderBy(values.filter(Boolean), ['original.aggregated', 'original.site.@id', 'original.cycle.@id', 'original.@id'], ['asc', 'asc', 'asc', 'asc'])
     : [];
 const isAggregated = (id = '') => !!id?.match(/^[a-zA-Z]+[-][a-zA-Z]+[-][\d]{4,}[-][\d]{4,}/g);
+const nodeRequestId = (node, params = {}) => [node['@id'], params?.version].filter(Boolean).join('#');
 const pickHeaderKeys = ['stage', 'maxstage', 'error', 'last-modified'];
 const mergeDataWithHeaders = (data, headers) => ({
     ...data,
@@ -5696,11 +5697,12 @@ class HeNodeStoreService {
         this._nodes = {};
         this._nodes$ = new ReplaySubject(1);
     }
-    findNodeIndex(node) {
+    findNodeIndex(node, params = {}) {
         const nodes = this._nodes?.[node['@type']] || [];
-        return nodes.findIndex(n => n.type === node['@type'] && n.id === node['@id']);
+        return nodes.findIndex(n => n.type === node['@type'] && n.id === nodeRequestId(node, params));
     }
     loadNode(node, params = {}, dataTransform = data => data) {
+        const id = nodeRequestId(node, params);
         const aggregated = 'aggregated' in node ? node.aggregated : isAggregated(node['@id']);
         const dataStates = nodeTypeDataStates(node['@type'], aggregated);
         const index = this._nodesLoadRequests[node['@type']].length;
@@ -5713,11 +5715,11 @@ class HeNodeStoreService {
         ]))), map(values => ({
             index,
             type: node['@type'],
-            id: node['@id'],
+            id,
             ...values
         })));
         this._nodesLoadRequests[node['@type']].push({
-            id: node['@id'],
+            id,
             request
         });
         request.subscribe(data => {
@@ -5738,7 +5740,7 @@ class HeNodeStoreService {
     addNode(node, params = {}, dataTransform) {
         this._nodesLoadRequests[node['@type']] = this._nodesLoadRequests[node['@type']] || [];
         this._nodes[node['@type']] = this._nodes[node['@type']] || [];
-        const existingRequest = this._nodesLoadRequests[node['@type']].find(({ id }) => id === node['@id']);
+        const existingRequest = this._nodesLoadRequests[node['@type']].find(({ id }) => id === nodeRequestId(node, params));
         return existingRequest ? existingRequest.request : this.loadNode(node, params, dataTransform);
     }
     removeNodeByIndex(nodeType, index) {
@@ -5750,8 +5752,8 @@ class HeNodeStoreService {
         this._nodes[nodeType] = nodes;
         this._nodes$.next(this._nodes);
     }
-    removeNode(node) {
-        const index = this.findNodeIndex(node);
+    removeNode(node, params = {}) {
+        const index = this.findNodeIndex(node, params);
         return index >= 0 ? this.removeNodeByIndex(node['@type'], index) : null;
     }
     clearNodes() {