Merge pull request #311 from eclipse-che4z/development

Release 1.4.3

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 You can find all notable changes to Explorer for Endevor in this document.
 
+## [1.4.3] – 2023-03-22
+
+### Fixed
+
+- Fixed an issue with retrieval of the remote elements for conflict resolution.
+
 ## [1.4.2] – 2023-02-14
 
 ### Fixed

packages/endevor/endevor.ts

@@ -1509,15 +1509,18 @@ export const retrieveElementWithFingerprint =
   (logger: Logger) =>
   (progressReporter: ProgressReporter) =>
   (service: Service) =>
-  ({
-    configuration,
-    environment,
-    stageNumber,
-    system,
-    subSystem,
-    type,
-    name,
-  }: ElementMapPath): retrieveElementWithFingerprint =>
+  (
+    {
+      configuration,
+      environment,
+      stageNumber,
+      system,
+      subSystem,
+      type,
+      name,
+    }: ElementMapPath,
+    searchUpTheMap?: boolean
+  ): retrieveElementWithFingerprint =>
   async (
     signoutChangeControlValue?: ActionChangeControlValue,
     overrideSignOut?: OverrideSignOut
@@ -1533,6 +1536,7 @@ export const retrieveElementWithFingerprint =
       signout: isDefined(signoutChangeControlValue),
       ccid: signoutChangeControlValue?.ccid,
       comment: signoutChangeControlValue?.comment,
+      search: searchUpTheMap,
     };
     const session = toSecuredEndevorSession(logger)(service);
     progressReporter.report({ increment: 30 });
@@ -1626,6 +1630,21 @@ export const retrieveElementWithoutSignout =
     return elementContent.content;
   };
 
+export const retrieveElementWithFingerprintFirstFound =
+  (logger: Logger) =>
+  (progress: ProgressReporter) =>
+  (service: Service) =>
+  async (element: ElementMapPath): Promise<ElementWithFingerprint | Error> => {
+    const elementContent = await retrieveElementWithFingerprint(logger)(
+      progress
+    )(service)(element, true)();
+    if (isError(elementContent)) {
+      const error = elementContent;
+      return error;
+    }
+    return elementContent;
+  };
+
 export const retrieveElementWithSignout =
   (logger: Logger) =>
   (progress: ProgressReporter) =>

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.2",
+  "version": "1.4.3",
   "publisher": "BroadcomMFD",
   "homepage": "https://github.com/eclipse/che-che4z-explorer-for-endevor",
   "repository": {

packages/explorer-for-endevor/src/commands/compareElementWithRemoteVersion.ts

@@ -26,7 +26,7 @@ import {
 import { saveFileIntoWorkspaceFolder } from '@local/vscode-wrapper/workspace';
 import * as path from 'path';
 import { Uri } from 'vscode';
-import { retrieveElementWithFingerprint } from '../endevor';
+import { retrieveElementWithFingerprintFirstFound } from '../endevor';
 import { reporter } from '../globals';
 import { toComparedElementUri } from '../uri/comparedElementUri';
 import { isError } from '../utils';
@@ -135,9 +135,9 @@ const retrieveRemoteVersionIntoFolder =
     const remoteElementVersion = await withNotificationProgress(
       `Retrieving a remote version of the element ${element.name}...`
     )((progressReporter) => {
-      return retrieveElementWithFingerprint(progressReporter)(service)(
-        element
-      )();
+      return retrieveElementWithFingerprintFirstFound(progressReporter)(
+        service
+      )(element);
     });
     if (isError(remoteElementVersion)) {
       const error = remoteElementVersion;

packages/explorer-for-endevor/src/endevor.ts

@@ -56,6 +56,8 @@ export const retrieveElementWithDependenciesWithSignout =
   endevor.retrieveElementWithDependenciesWithSignout(logger);
 export const retrieveElementWithFingerprint =
   endevor.retrieveElementWithFingerprint(logger);
+export const retrieveElementWithFingerprintFirstFound =
+  endevor.retrieveElementWithFingerprintFirstFound(logger);
 export const printElement = endevor.printElement(logger);
 export const printListing = endevor.printListing(logger);
 export const updateElement = endevor.updateElement(logger);