Address feedback

Author: jeanp413

components/dashboard/src/service/service.tsx

@@ -221,7 +221,7 @@ export class IDEFrontendService implements IDEFrontendDashboardService.IServer {
         this.workspace = workspaceResponse.workspace!;
         this.user = user;
         this.ideCredentials = ideCredentials;
-        const reconcile = (status?: WorkspaceStatus) => {
+        const reconcile = async (status?: WorkspaceStatus) => {
             const info = this.parseInfo(status ?? this.workspace.status!);
             this.latestInfo = info;
             const oldInstanceID = this.instanceID;
@@ -231,6 +231,15 @@ export class IDEFrontendService implements IDEFrontendDashboardService.IServer {
             if (info.instanceId && oldInstanceID !== info.instanceId) {
                 this.auth();
             }
+
+            // Redirect to custom url
+            if (
+                (info.statusPhase === "stopping" || info.statusPhase === "stopped") &&
+                info.workspaceType === "regular"
+            ) {
+                await this.redirectToCustomUrl();
+            }
+
             this.sendInfoUpdate(this.latestInfo);
         };
         reconcile();
@@ -252,10 +261,40 @@ export class IDEFrontendService implements IDEFrontendDashboardService.IServer {
             workspaceType: this.workspace.spec?.type === WorkspaceSpec_WorkspaceType.PREBUILD ? "prebuild" : "regular",
             credentialsToken: this.ideCredentials,
             ownerId: this.workspace.metadata?.ownerId ?? "",
-            contextUrl: this.workspace.metadata?.originalContextUrl ?? "",
         };
     }
 
+    private async redirectToCustomUrl() {
+        const isDataOps = await getExperimentsClient().getValueAsync("dataops", false, {
+            user: { id: this.user!.id },
+            gitpodHost: window.location.host,
+        });
+        const dataOpsRedirectUrl = await getExperimentsClient().getValueAsync("dataops_redirect_url", "undefined", {
+            user: { id: this.user!.id },
+            gitpodHost: window.location.host,
+        });
+
+        if (!isDataOps) {
+            return;
+        }
+
+        try {
+            const params: Record<string, string> = { workspaceID: info.workspaceID };
+            let redirectURL: string;
+            if (dataOpsRedirectUrl === "undefined") {
+                redirectURL = this.workspace.metadata?.originalContextUrl ?? "";
+            } else {
+                redirectURL = dataOpsRedirectUrl;
+                params.contextURL = this.workspace.metadata?.originalContextUrl ?? "";
+            }
+            const url = new URL(redirectURL);
+            url.search = new URLSearchParams(params).toString();
+            this.relocate(url.toString());
+        } catch {
+            console.error("Invalid redirect URL");
+        }
+    }
+
     // implements
 
     private async auth() {

components/gitpod-protocol/src/frontend-dashboard-service.ts

@@ -51,7 +51,6 @@ export namespace IDEFrontendDashboardService {
         workspaceDescription: string;
         workspaceType: string;
         credentialsToken: string;
-        contextUrl: string;
     }
 
     export interface SetStateData {

components/supervisor/frontend/package.json

@@ -12,8 +12,7 @@
     "stream-browserify": "^2.0.1",
     "url": "^0.11.1",
     "util": "^0.11.1",
-    "uuid": "8.3.2",
-    "configcat-js": "^6.0.0"
+    "uuid": "8.3.2"
   },
   "devDependencies": {
     "@types/sharedworker": "^0.0.29",

components/supervisor/frontend/src/experiments/client.ts

@@ -49,23 +49,20 @@ require("../src/shared/index.css");
 
 import { WorkspaceInstancePhase } from "@gitpod/gitpod-protocol";
 import { DisposableCollection } from "@gitpod/gitpod-protocol/lib/util/disposable";
-import { IDEFrontendDashboardService } from "@gitpod/gitpod-protocol/lib/frontend-dashboard-service";
 import * as heartBeat from "./ide/heart-beat";
 import * as IDEFrontendService from "./ide/ide-frontend-service-impl";
 import * as IDEWorker from "./ide/ide-worker";
 import * as IDEWebSocket from "./ide/ide-web-socket";
 import { SupervisorServiceClient } from "./ide/supervisor-service-client";
 import * as LoadingFrame from "./shared/loading-frame";
 import { workspaceUrl } from "./shared/urls";
-import { getExperimentsClient } from "./experiments/client";
 
 window.gitpod = {} as any;
 IDEWorker.install();
 IDEWebSocket.install();
 const ideService = IDEFrontendService.create();
 const loadingIDE = new Promise((resolve) => window.addEventListener("DOMContentLoaded", resolve, { once: true }));
 const toStop = new DisposableCollection();
-const experimentsClient = getExperimentsClient();
 
 document.body.style.visibility = "hidden";
 LoadingFrame.load().then(async (loading) => {
@@ -287,7 +284,6 @@ LoadingFrame.load().then(async (loading) => {
             IDEWebSocket.connectWorkspace(),
             frontendDashboardServiceClient.onInfoUpdate((status) => {
                 if (status.statusPhase === "stopping" || status.statusPhase === "stopped") {
-                    maybeRedirectToCustomUrl(frontendDashboardServiceClient.latestInfo);
                     toStop.dispose();
                 }
             }),
@@ -299,32 +295,3 @@ LoadingFrame.load().then(async (loading) => {
         //#endregion
     })();
 });
-
-async function maybeRedirectToCustomUrl(info: IDEFrontendDashboardService.Info) {
-    const isDataOps = await experimentsClient.getValueAsync("dataops", false, {
-        user: { id: info.loggedUserId },
-    });
-    const dataOpsRedirectUrl = await experimentsClient.getValueAsync("dataops_redirect_url", "undefined", {
-        user: { id: info.loggedUserId },
-    });
-
-    if (!isDataOps) {
-        return;
-    }
-
-    try {
-        const params: Record<string, string> = { workspaceID: info.workspaceID };
-        let redirectURL: string;
-        if (dataOpsRedirectUrl === "undefined") {
-            redirectURL = info.contextUrl;
-        } else {
-            redirectURL = dataOpsRedirectUrl;
-            params.contextURL = info.contextUrl;
-        }
-        const url = new URL(redirectURL);
-        url.search = new URLSearchParams(params).toString();
-        window.location.href = url.toString();
-    } catch {
-        console.error("Invalid redirect URL");
-    }
-}