[new-workspace] Fix recent repositories for BBS – EXP-411 (#18497)

* [new-workspace] Fix recent repositories for BBS

* fixup remove log

* fixup test

Author: AlexTugarev

components/gitpod-protocol/src/protocol.ts

@@ -855,20 +855,6 @@ export type WorkspaceSoftDeletion = "user" | "gc";
 export type WorkspaceType = "regular" | "prebuild";
 
 export namespace Workspace {
-    export function getFullRepositoryName(ws: Workspace): string | undefined {
-        if (CommitContext.is(ws.context)) {
-            return ws.context.repository.owner + "/" + ws.context.repository.name;
-        }
-        return undefined;
-    }
-
-    export function getFullRepositoryUrl(ws: Workspace): string | undefined {
-        if (CommitContext.is(ws.context)) {
-            return `https://${ws.context.repository.host}/${getFullRepositoryName(ws)}`;
-        }
-        return undefined;
-    }
-
     export function getPullRequestNumber(ws: Workspace): number | undefined {
         if (PullRequestContext.is(ws.context)) {
             return ws.context.nr;

components/server/src/bitbucket-server/bitbucket-server-repository-provider.spec.ts

@@ -122,6 +122,13 @@ class TestBitbucketServerRepositoryProvider {
             author: "Alex Tugarev",
         });
     }
+
+    @test async test_getUserRepos_ok() {
+        const result = await this.service.getUserRepos(this.user);
+        expect(result).to.contain(
+            "https://7990-alextugarev-bbs-6v0gqcpgvj7.ws-eu102.gitpod.io/scm/~alex.tugarev/user.repo.git",
+        );
+    }
 }
 
 module.exports = new TestBitbucketServerRepositoryProvider();

components/server/src/bitbucket-server/bitbucket-server-repository-provider.ts

@@ -147,13 +147,15 @@ export class BitbucketServerRepositoryProvider implements RepositoryProvider {
     async getUserRepos(user: User): Promise<string[]> {
         try {
             const repos = await this.api.getRepos(user, { limit: 1000, permission: "REPO_READ" });
+            const result: string[] = [];
+            (repos.values || []).forEach((r) => {
+                const cloneUrl = r.links.clone.find((u) => u.name === "http")?.href;
+                if (cloneUrl) {
+                    result.push(cloneUrl.replace("http://", "https://"));
+                }
+            });
 
-            return (repos.values || [])
-                .map((r) => {
-                    const cloneUrl = r.links.clone.find((u) => u.name === "http")?.href!;
-                    return cloneUrl;
-                })
-                .filter((u) => !!u);
+            return result;
         } catch (error) {
             log.error("BitbucketServerRepositoryProvider.getUserRepos", error);
             return [];

components/server/src/workspace/gitpod-server-impl.ts

@@ -1788,7 +1788,13 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             })
                 .then((workspaces) => {
                     workspaces.forEach((ws) => {
-                        const repoUrl = Workspace.getFullRepositoryUrl(ws.workspace);
+                        let repoUrl;
+                        if (CommitContext.is(ws.workspace.context)) {
+                            repoUrl = ws.workspace.context?.repository?.cloneUrl?.replace(/\.git$/, "");
+                        }
+                        if (!repoUrl) {
+                            repoUrl = ws.workspace.contextURL;
+                        }
                         if (repoUrl) {
                             const lastUse = WorkspaceInfo.lastActiveISODate(ws);
                             suggestions.push({ url: repoUrl, lastUse, priority: 10 });