Merge pull request #307 from eclipse/development

Release 1.4.2
eclipse-che4z · Feb 14, 2023 · c4cfe24 · c4cfe24
2 parents 9b6f225 + 7f9afc2
commit c4cfe24
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 You can find all notable changes to Explorer for Endevor in this document.
 
+## [1.4.2] &ndash; 2023-02-14
+
+### Fixed
+
+- Fixed an issue with the up-the-map view which showed an incomplete list of the elements if the same element name is used for different types.
+
 ## [1.4.1] &ndash; 2023-01-26
 
 ### Fixed

diff --git a/packages/explorer-for-endevor/package.json b/packages/explorer-for-endevor/package.json
@@ -3,7 +3,7 @@
   "displayName": "Explorer for Endevor",
   "description": "Extension that modernizes the way you interact with Endevor inventory locations and elements",
   "author": "Broadcom",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "publisher": "BroadcomMFD",
   "homepage": "https://github.com/eclipse/che-che4z-explorer-for-endevor",
   "repository": {

diff --git a/packages/explorer-for-endevor/src/store/__tests__/store-test.ts b/packages/explorer-for-endevor/src/store/__tests__/store-test.ts
@@ -2568,27 +2568,49 @@ describe('store getters', () => {
         element: elementInPlace,
         lastRefreshTimestamp: Date.now(),
       };
-      const upTheMapLocation: SubSystemMapPath = {
+      const upTheMapFirstLocation: SubSystemMapPath = {
         ...inPlaceLocation,
         stageNumber: '2',
       };
-      const elementUpTheMap: Element = {
+      const elementUpTheMapOne: Element = {
         configuration: 'TEST',
-        ...upTheMapLocation,
+        ...upTheMapFirstLocation,
         type: elementInPlace.type,
         name: elementInPlace.name,
         lastActionCcid: 'LAST-CCID',
       };
-      const cachedUpTheMapElementVersion = {
-        element: elementUpTheMap,
+      const elementUpTheMapTwo: Element = {
+        configuration: 'TEST',
+        ...upTheMapFirstLocation,
+        type: elementInPlace.type,
+        name: 'ELM2',
+        lastActionCcid: 'LAST-CCID',
+      };
+      const elementUpTheMapThree: Element = {
+        configuration: 'TEST',
+        ...upTheMapFirstLocation,
+        type: 'TYPE2',
+        name: elementUpTheMapTwo.name,
+        lastActionCcid: 'LAST-CCID',
+      };
+      const cachedUpTheMapElementOneVersion = {
+        element: elementUpTheMapOne,
+        lastRefreshTimestamp: Date.now(),
+      };
+      const cachedUpTheMapElementTwoVersion = {
+        element: elementUpTheMapTwo,
+        lastRefreshTimestamp: Date.now(),
+      };
+      const cachedUpTheMapElementThreeVersion = {
+        element: elementUpTheMapThree,
         lastRefreshTimestamp: Date.now(),
       };
       storeState.caches = {
         [toServiceLocationCompositeKey(serviceId)(inventoryLocationId)]: {
           endevorMap: {
             value: {
               [toSubsystemMapPathId(inPlaceLocation)]: [
-                toSubsystemMapPathId(upTheMapLocation),
+                toSubsystemMapPathId(upTheMapFirstLocation),
               ],
             },
             cacheVersion: EndevorCacheVersion.OUTDATED,
@@ -2602,12 +2624,18 @@ describe('store getters', () => {
                 )]: cachedInPlaceElementVersion,
               },
             },
-            [toSubsystemMapPathId(upTheMapLocation)]: {
+            [toSubsystemMapPathId(upTheMapFirstLocation)]: {
               cacheVersion: EndevorCacheVersion.OUTDATED,
               elements: {
                 [toElementCompositeKey(serviceId)(inventoryLocationId)(
-                  elementUpTheMap
-                )]: cachedUpTheMapElementVersion,
+                  elementUpTheMapOne
+                )]: cachedUpTheMapElementOneVersion,
+                [toElementCompositeKey(serviceId)(inventoryLocationId)(
+                  elementUpTheMapTwo
+                )]: cachedUpTheMapElementTwoVersion,
+                [toElementCompositeKey(serviceId)(inventoryLocationId)(
+                  elementUpTheMapThree
+                )]: cachedUpTheMapElementThreeVersion,
               },
             },
           },
@@ -2620,7 +2648,11 @@ describe('store getters', () => {
       // assert
       expect(
         actualElements?.elementsPerRoute[toSubsystemMapPathId(inPlaceLocation)]
-      ).toEqual([cachedInPlaceElementVersion]);
+      ).toEqual([
+        cachedInPlaceElementVersion,
+        cachedUpTheMapElementTwoVersion,
+        cachedUpTheMapElementThreeVersion,
+      ]);
     });
     it('should return elements from several independent routes', () => {
       // arrange

diff --git a/packages/explorer-for-endevor/src/store/store.ts b/packages/explorer-for-endevor/src/store/store.ts
@@ -2518,7 +2518,9 @@ export const getFirstFoundElements =
             const elementsInLocation = Object.values(locationData.elements);
             const elementsInRoute = acc[inPlaceLocation] ?? {};
             elementsInLocation.forEach((element) => {
-              elementsInRoute[element.element.name] = element;
+              elementsInRoute[
+                `${element.element.type}/${element.element.name}`
+              ] = element;
             });
             acc[inPlaceLocation] = elementsInRoute;
             return;