Revert "Redirect on workspace stop" (#19323)

Author: svenefftinge

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 = async (status?: WorkspaceStatus) => {
+        const reconcile = (status?: WorkspaceStatus) => {
             const info = this.parseInfo(status ?? this.workspace.status!);
             this.latestInfo = info;
             const oldInstanceID = this.instanceID;
@@ -231,15 +231,6 @@ 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(info);
-            }
-
             this.sendInfoUpdate(this.latestInfo);
         };
         reconcile();
@@ -264,37 +255,6 @@ export class IDEFrontendService implements IDEFrontendDashboardService.IServer {
         };
     }
 
-    private async redirectToCustomUrl(info: IDEFrontendDashboardService.Info) {
-        const isDataOps = await getExperimentsClient().getValueAsync("dataops", false, {
-            user: { id: this.user!.id },
-            gitpodHost: gitpodHostUrl.toString(),
-        });
-        const dataOpsRedirectUrl = await getExperimentsClient().getValueAsync("dataops_redirect_url", "undefined", {
-            user: { id: this.user!.id },
-            gitpodHost: gitpodHostUrl.toString(),
-        });
-
-        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/supervisor/frontend/src/index.ts

@@ -63,8 +63,8 @@ IDEWebSocket.install();
 const ideService = IDEFrontendService.create();
 const loadingIDE = new Promise((resolve) => window.addEventListener("DOMContentLoaded", resolve, { once: true }));
 const toStop = new DisposableCollection();
-let willRedirect = false;
 
+document.body.style.visibility = "hidden";
 LoadingFrame.load().then(async (loading) => {
     const frontendDashboardServiceClient = loading.frontendDashboardServiceClient;
     await frontendDashboardServiceClient.initialize();
@@ -73,10 +73,6 @@ LoadingFrame.load().then(async (loading) => {
         return;
     }
 
-    frontendDashboardServiceClient.onWillRedirect(() => {
-        willRedirect = true;
-    });
-
     document.title = frontendDashboardServiceClient.latestInfo.workspaceDescription ?? "gitpod";
     window.gitpod.loggedUserID = frontendDashboardServiceClient.latestInfo.loggedUserId;
     window.gitpod.openDesktopIDE = frontendDashboardServiceClient.openDesktopIDE.bind(frontendDashboardServiceClient);
@@ -163,11 +159,11 @@ LoadingFrame.load().then(async (loading) => {
         };
         const updateCurrentFrame = () => {
             const newCurrent = nextFrame();
-            if (current === newCurrent || willRedirect) {
+            if (current === newCurrent) {
                 return;
             }
-            current.classList.toggle("hidden", true);
-            newCurrent.classList.toggle("hidden", false);
+            current.style.visibility = "hidden";
+            newCurrent.style.visibility = "visible";
             if (current === document.body) {
                 while (document.body.firstChild && document.body.firstChild !== newCurrent) {
                     document.body.removeChild(document.body.firstChild);

components/supervisor/frontend/src/shared/frontend-dashboard-service.ts

@@ -21,9 +21,6 @@ export class FrontendDashboardServiceClient implements IDEFrontendDashboardServi
     private readonly onOpenBrowserIDEEmitter = new Emitter<void>();
     readonly onOpenBrowserIDE = this.onOpenBrowserIDEEmitter.event;
 
-    private readonly onWillRedirectEmitter = new Emitter<void>();
-    readonly onWillRedirect = this.onWillRedirectEmitter.event;
-
     private resolveInit!: () => void;
     private initPromise = new Promise<void>((resolve) => (this.resolveInit = resolve));
 
@@ -53,7 +50,6 @@ export class FrontendDashboardServiceClient implements IDEFrontendDashboardServi
                 this.onDidChangeEmitter.fire(this.latestInfo);
             }
             if (IDEFrontendDashboardService.isRelocateEventData(event.data)) {
-                this.onWillRedirectEmitter.fire();
                 window.location.href = event.data.url;
             }
             if (IDEFrontendDashboardService.isOpenBrowserIDE(event.data)) {

components/supervisor/frontend/src/shared/index.css

@@ -15,8 +15,3 @@
   border: 0px;
   overflow: hidden;
 }
-
-.gitpod-frame.hidden {
-  width: 0px;
-  height: 0px;
-}

components/supervisor/frontend/src/shared/loading-frame.ts

@@ -14,6 +14,7 @@ export function load(): Promise<{
     return new Promise((resolve) => {
         const frame = document.createElement("iframe");
         frame.src = startUrl.toString();
+        frame.style.visibility = "visible";
         frame.className = "gitpod-frame loading";
         document.body.prepend(frame);