From 2d58c600ad28b07772c97fc16bac5d6c4ce8bc0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= <rudolfs@osins.org>
Date: Wed, 12 Apr 2023 07:06:01 +0200
Subject: [PATCH] Don't show port in clone URL if it is the default port
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
---
 src/views/projects/CloneButton.svelte | 17 ++++++++++++-----
 tests/e2e/clipboard.spec.ts           |  4 ++--
 tests/e2e/project.spec.ts             |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/projects/CloneButton.svelte b/src/views/projects/CloneButton.svelte
index e0d46b6f7..ed70b33ed 100644
--- a/src/views/projects/CloneButton.svelte
+++ b/src/views/projects/CloneButton.svelte
@@ -1,19 +1,26 @@
 <script lang="ts">
   import type { BaseUrl } from "@httpd-client";
 
-  import Clipboard from "@app/components/Clipboard.svelte";
-  import Floating from "@app/components/Floating.svelte";
   import { closeFocused } from "@app/components/Floating.svelte";
   import { parseRepositoryId } from "@app/lib/utils";
+  import { config } from "@app/lib/config";
+
+  import Clipboard from "@app/components/Clipboard.svelte";
+  import Floating from "@app/components/Floating.svelte";
 
   export let baseUrl: BaseUrl;
   export let id: string;
   export let name: string;
 
   $: radCloneUrl = `rad clone ${id}`;
-  $: gitCloneUrl = `git clone ${baseUrl.scheme}://${baseUrl.hostname}:${
-    baseUrl.port
-  }/${parseRepositoryId(id)?.pubkey ?? id}.git ${name}`;
+  $: portFragment =
+    baseUrl.scheme === config.seeds.defaultHttpdScheme &&
+    baseUrl.port === config.seeds.defaultHttpdPort
+      ? ""
+      : `:${baseUrl.port}`;
+  $: gitCloneUrl = `git clone ${baseUrl.scheme}://${
+    baseUrl.hostname
+  }${portFragment}/${parseRepositoryId(id)?.pubkey ?? id}.git ${name}`;
 </script>
 
 <style>
diff --git a/tests/e2e/clipboard.spec.ts b/tests/e2e/clipboard.spec.ts
index cb226dea4..e69710c94 100644
--- a/tests/e2e/clipboard.spec.ts
+++ b/tests/e2e/clipboard.spec.ts
@@ -55,7 +55,7 @@ test("copy to clipboard", async ({ page, browserName, context }) => {
     await page.getByText("Clone").click();
     await page
       .locator(
-        `text=git clone http://127.0.0.1:8080/${rid
+        `text=git clone http://127.0.0.1/${rid
           .replace("rad:", "")
           .substring(0, 10)}`,
       )
@@ -66,7 +66,7 @@ test("copy to clipboard", async ({ page, browserName, context }) => {
       .locator(".clipboard")
       .click();
     await expectClipboard(
-      `git clone http://127.0.0.1:8080/${rid.replace(
+      `git clone http://127.0.0.1/${rid.replace(
         "rad:",
         "",
       )}.git source-browsing`,
diff --git a/tests/e2e/project.spec.ts b/tests/e2e/project.spec.ts
index 497df5967..c81d547d3 100644
--- a/tests/e2e/project.spec.ts
+++ b/tests/e2e/project.spec.ts
@@ -250,7 +250,7 @@ test("clone modal", async ({ page }) => {
   await page.getByText("Clone").click();
   await expect(page.locator(`text=rad clone ${rid}`)).toBeVisible();
   await expect(
-    page.locator(`text=http://127.0.0.1:8080/${rid.replace("rad:", "")}.git`),
+    page.locator(`text=http://127.0.0.1/${rid.replace("rad:", "")}.git`),
   ).toBeVisible();
 });