@backstage/integration 1.2.0 → 1.2.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @backstage/integration
 
+## 1.2.1-next.0
+
+### Patch Changes
+
+- 72dfcbc8bf: Gerrit Integration: Handle absolute paths in `resolveUrl` properly.
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/index.cjs.js

@@ -804,43 +804,6 @@ function readGerritIntegrationConfigs(configs) {
   return configs.map(readGerritIntegrationConfig);
 }
 
-const _GerritIntegration = class {
-  constructor(integrationConfig) {
-    this.integrationConfig = integrationConfig;
-  }
-  get type() {
-    return "gerrit";
-  }
-  get title() {
-    return this.integrationConfig.host;
-  }
-  get config() {
-    return this.integrationConfig;
-  }
-  resolveUrl(options) {
-    const { url, base, lineNumber } = options;
-    let updated;
-    if (url) {
-      updated = new URL(url, base);
-    } else {
-      updated = new URL(base);
-    }
-    if (lineNumber) {
-      updated.hash = lineNumber.toString();
-    }
-    return updated.toString();
-  }
-  resolveEditUrl(url) {
-    return url;
-  }
-};
-let GerritIntegration = _GerritIntegration;
-GerritIntegration.factory = ({ config }) => {
-  var _a;
-  const configs = readGerritIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.gerrit")) != null ? _a : []);
-  return basicIntegrations(configs.map((c) => new _GerritIntegration(c)), (i) => i.config.host);
-};
-
 const GERRIT_BODY_PREFIX = ")]}'";
 function parseGerritGitilesUrl(config, url) {
   const urlPath = url.replace(config.gitilesBaseUrl, "");
@@ -862,6 +825,9 @@ function parseGerritGitilesUrl(config, url) {
     project
   };
 }
+function builldGerritGitilesUrl(config, project, branch, filePath) {
+  return `${config.gitilesBaseUrl}/${project}/+/refs/heads/${branch}/${lodash.trimStart(filePath, "/")}`;
+}
 function getAuthenticationPrefix(config) {
   return config.password ? "/a/" : "/";
 }
@@ -903,6 +869,47 @@ async function parseGerritJsonResponse(response) {
   throw new Error(`Gerrit JSON body prefix missing. Found: ${responseBody.slice(0, 10)}`);
 }
 
+const _GerritIntegration = class {
+  constructor(integrationConfig) {
+    this.integrationConfig = integrationConfig;
+  }
+  get type() {
+    return "gerrit";
+  }
+  get title() {
+    return this.integrationConfig.host;
+  }
+  get config() {
+    return this.integrationConfig;
+  }
+  resolveUrl(options) {
+    const { url, base, lineNumber } = options;
+    let updated;
+    if (url.startsWith("/")) {
+      const { branch, project } = parseGerritGitilesUrl(this.config, base);
+      return builldGerritGitilesUrl(this.config, project, branch, url);
+    }
+    if (url) {
+      updated = new URL(url, base);
+    } else {
+      updated = new URL(base);
+    }
+    if (lineNumber) {
+      updated.hash = lineNumber.toString();
+    }
+    return updated.toString();
+  }
+  resolveEditUrl(url) {
+    return url;
+  }
+};
+let GerritIntegration = _GerritIntegration;
+GerritIntegration.factory = ({ config }) => {
+  var _a;
+  const configs = readGerritIntegrationConfigs((_a = config.getOptionalConfigArray("integrations.gerrit")) != null ? _a : []);
+  return basicIntegrations(configs.map((c) => new _GerritIntegration(c)), (i) => i.config.host);
+};
+
 const GITHUB_HOST = "github.com";
 const GITHUB_API_BASE_URL = "https://api.github.com";
 const GITHUB_RAW_BASE_URL = "https://raw.githubusercontent.com";