Skip to content

Commit dbaf7ba

Browse files
AlexTugarevsvenefftinge
AlexTugarev
authored and
svenefftinge
committed
applying changes from review
1 parent 86e4dc4 commit dbaf7ba

File tree

9 files changed

+22
-55
lines changed

9 files changed

+22
-55
lines changed

‎components/dashboard/BUILD.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ scripts:
4444
script: |-
4545
trap "kill 0" EXIT
4646
export NODE_OPTIONS='--max-old-space-size=3192'
47-
yarn run webpack-dev-server --mode=development &
47+
yarn start &
4848
4949
telepresence --swap-deployment dashboard \
5050
--method inject-tcp \
51-
--expose 13001:80 \
52-
--run socat TCP-LISTEN:13001,reuseaddr,fork TCP:localhost:3001
51+
--expose 13000:80 \
52+
--run socat TCP-LISTEN:13000,reuseaddr,fork TCP:localhost:3000

‎components/dashboard/public/index.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
work correctly both with client-side routing and a non-root public URL.
2525
Learn how to configure a non-root public URL by running `npm run build`.
2626
-->
27-
<script>
28-
let previewEnvUrl = "%REACT_APP_PREVIEW_URL%";
29-
if (!previewEnvUrl.includes("REACT_APP_")) {
30-
window.PREVIEW_URL = previewEnvUrl;
31-
}
32-
</script>
3327
<title>React App</title>
3428
</head>
3529
<body>

‎components/dashboard/src/App.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Menu from './components/Menu';
33
import { BrowserRouter, Route, Switch } from "react-router-dom";
44
import { Workspaces } from './workspaces/Workspaces';
55
import { Login } from './Login';
6-
import { UserContext } from './contexts';
7-
import { gitpodService, service } from './service/service';
6+
import { UserContext } from './user-context';
7+
import { gitpodService } from './service/service';
88

99
const Notifications = React.lazy(() => import('./account/Notifications'));
1010
const Profile = React.lazy(() => import('./account/Profile'));
@@ -23,7 +23,7 @@ function App() {
2323
useEffect(() => {
2424
(async () => {
2525
try {
26-
const user = await service.getOrLoadUser();
26+
const user = await gitpodService.server.getLoggedInUser();
2727
setUser(user);
2828
} catch (error) {
2929
console.log(error);

‎components/dashboard/src/Login.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { AuthProviderInfo } from "@gitpod/gitpod-protocol";
22
import { useContext, useEffect, useState } from "react";
33
import Modal from "./components/Modal";
4-
import { UserContext } from "./contexts";
5-
import { gitpodHostUrl, reconnect, service } from "./service/service";
4+
import { UserContext } from "./user-context";
5+
import { gitpodHostUrl, reconnect, gitpodService } from "./service/service";
66

77
export function Login() {
88
const { setUser } = useContext(UserContext);
@@ -11,7 +11,7 @@ export function Login() {
1111

1212
useEffect(() => {
1313
(async () => {
14-
setAuthProviders(await service.getAuthProviders());
14+
setAuthProviders(await gitpodService.server.getAuthProviders());
1515
})();
1616

1717
window.addEventListener("message", (event) => {
@@ -26,7 +26,7 @@ export function Login() {
2626
}
2727
(async () => {
2828
reconnect();
29-
const user = await service.reloadUser();
29+
const user = await gitpodService.server.getLoggedInUser();
3030
setUser(user);
3131
})();
3232
}
@@ -46,7 +46,7 @@ export function Login() {
4646
<div>
4747
<ol>
4848
{authProviders.map(ap => {
49-
return (<li>
49+
return (<li key={ap.host}>
5050
<h2><a href="#" onClick={() => openLogin(ap.host)}>Continue with {ap.host}</a></h2>
5151
</li>);
5252
})}

‎components/dashboard/src/account/Profile.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { User } from "@gitpod/gitpod-protocol";
22
import { useContext, useState } from "react";
33
import Modal from "../components/Modal";
44
import { SettingsPage } from "../components/SettingsPage";
5-
import { UserContext } from "../contexts";
5+
import { UserContext } from "../user-context";
66
import accountMenu from "./account-menu";
77

88
export default function Profile() {

‎components/dashboard/src/components/Menu.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useContext } from "react";
22
import { Link } from "react-router-dom";
3-
import { UserContext } from "../contexts";
3+
import { UserContext } from "../user-context";
44

55
interface Entry {
66
title: string, link: string

‎components/dashboard/src/index.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
33
import App from './App';
4-
import { AppProvider } from './contexts';
5-
import { service } from './service/service';
4+
import { UserContextProvider } from './user-context';
65

76
import "./tailwind.output.css"
87

9-
service.getOrLoadUser().then(user => console.log(user.name));
10-
118
ReactDOM.render(
129
<React.StrictMode>
13-
<AppProvider>
10+
<UserContextProvider>
1411
<App />
15-
</AppProvider>
12+
</UserContextProvider>
1613
</React.StrictMode>,
1714
document.getElementById('root')
1815
);

‎components/dashboard/src/service/service.ts‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
* See License-AGPL.txt in the project root for license information.
55
*/
66

7-
import { GitpodClient, GitpodServer, GitpodServerPath, GitpodService, GitpodServiceImpl, User } from '@gitpod/gitpod-protocol';
7+
import { GitpodClient, GitpodServer, GitpodServerPath, GitpodService, GitpodServiceImpl } from '@gitpod/gitpod-protocol';
88
import { WebSocketConnectionProvider } from '@gitpod/gitpod-protocol/lib/messaging/browser/connection';
99
import { createWindowMessageConnection } from '@gitpod/gitpod-protocol/lib/messaging/browser/window-connection';
1010
import { JsonRpcProxy, JsonRpcProxyFactory } from '@gitpod/gitpod-protocol/lib/messaging/proxy-factory';
1111
import { GitpodHostUrl } from '@gitpod/gitpod-protocol/lib/util/gitpod-host-url';
1212
import { log } from '@gitpod/gitpod-protocol/lib/util/logging';
1313

14-
export const gitpodHostUrl = new GitpodHostUrl((window as any).PREVIEW_URL || window.location.toString());
14+
// export const gitpodHostUrl = new GitpodHostUrl("https://at-react.staging.gitpod-dev.com/");
15+
export const gitpodHostUrl = new GitpodHostUrl(window.location.toString());
1516

1617
function createGitpodService<C extends GitpodClient, S extends GitpodServer>() {
1718
let proxy: JsonRpcProxy<S>;
@@ -43,37 +44,12 @@ function createGitpodService<C extends GitpodClient, S extends GitpodServer>() {
4344
}
4445

4546

46-
47-
export class AppService {
48-
constructor(protected gitpodService: GitpodService) {
49-
}
50-
51-
protected userPromise: Promise<User> | undefined;
52-
async getOrLoadUser() {
53-
if (!this.userPromise) {
54-
this.userPromise = this.gitpodService.server.getLoggedInUser();
55-
}
56-
return this.userPromise;
57-
}
58-
async reloadUser() {
59-
this.userPromise = undefined;
60-
return this.getOrLoadUser();
61-
}
62-
63-
async getAuthProviders() {
64-
return this.gitpodService.server.getAuthProviders();
65-
}
66-
67-
}
68-
6947
let gitpodService: GitpodService;
70-
let service: AppService;
7148

7249
const reconnect = () => {
7350
gitpodService = createGitpodService();
74-
service = new AppService(gitpodService);
7551
}
7652

7753
reconnect();
7854

79-
export { service, gitpodService, reconnect };
55+
export { gitpodService, reconnect };

components/dashboard/src/contexts.tsx renamed to components/dashboard/src/user-context.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const UserContext = createContext<{
99
});
1010

1111

12-
const AppProvider: React.FC = ({ children }) => {
12+
const UserContextProvider: React.FC = ({ children }) => {
1313
const [user, setUser] = useState<User | undefined>(undefined);
1414

1515
return (
@@ -19,4 +19,4 @@ const AppProvider: React.FC = ({ children }) => {
1919
)
2020
}
2121

22-
export { UserContext, AppProvider };
22+
export { UserContext, UserContextProvider };

0 commit comments

Comments
 (0)