Skip to content

Commit fcc5385

Browse files
committed
[supervisor/frontend] Fix workspace title generation
Tool: gitpod/catfood.gitpod.cloud
1 parent 2e7e3b2 commit fcc5385

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

components/dashboard/src/start/StartWorkspace.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function parseParameters(search?: string): { notFound?: boolean } {
8888

8989
export interface StartWorkspaceState {
9090
/**
91-
* This is set to the istanceId we started (think we started on).
91+
* This is set to the instanceId we started (think we started on).
9292
* We only receive updates for this particular instance, or none if not set.
9393
*/
9494
startedInstanceId?: string;

components/supervisor/frontend/src/index.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ window.addEventListener("error", (event) => {
4747

4848
require("../src/shared/index.css");
4949

50-
import { WorkspaceInstancePhase } from "@gitpod/gitpod-protocol";
50+
import { Workspace, WorkspaceInstancePhase } from "@gitpod/gitpod-protocol";
5151
import { DisposableCollection } from "@gitpod/gitpod-protocol/lib/util/disposable";
5252
import * as heartBeat from "./ide/heart-beat";
5353
import * as IDEFrontendService from "./ide/ide-frontend-service-impl";
@@ -78,7 +78,10 @@ LoadingFrame.load().then(async (loading) => {
7878
willRedirect = true;
7979
});
8080

81-
document.title = frontendDashboardServiceClient.latestInfo.workspaceDescription ?? "gitpod";
81+
document.title =
82+
Workspace.fromWorkspaceName(frontendDashboardServiceClient.latestInfo.workspaceDescription) ??
83+
frontendDashboardServiceClient.latestInfo.workspaceDescription ??
84+
"gitpod";
8285
window.gitpod.loggedUserID = frontendDashboardServiceClient.latestInfo.loggedUserId;
8386
window.gitpod.openDesktopIDE = frontendDashboardServiceClient.openDesktopIDE.bind(frontendDashboardServiceClient);
8487
window.gitpod.decrypt = frontendDashboardServiceClient.decrypt.bind(frontendDashboardServiceClient);

components/supervisor/frontend/webpack.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ module.exports = {
4040
stream: require.resolve("stream-browserify"),
4141
url: require.resolve("url"),
4242
util: require.resolve("util"),
43+
net: false,
44+
path: false,
45+
fs: false,
46+
os: false,
4347
},
4448
},
4549
devtool: "source-map",

components/ws-manager-bridge/leeway.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

5-
FROM node:18.17.1-slim as builder
5+
FROM node:18.17.1-slim AS builder
66
COPY components-ws-manager-bridge--app /installer/
77

88
WORKDIR /app

0 commit comments

Comments
 (0)