Skip to content
This repository has been archived by the owner on Feb 1, 2021. It is now read-only.

Clean up branding #112

Merged
merged 1 commit into from
Jan 11, 2021
Merged

Clean up branding #112

merged 1 commit into from
Jan 11, 2021

Conversation

sleshchenko
Copy link
Collaborator

What does this PR do?

It cleans up unused parts from branding.
In addition, it removes a couple of hardcoded values that should be read from branding.

For reference, which values are overridden by CRW and RHChe

@github-actions
Copy link

github-actions bot commented Jan 8, 2021

Code coverage diff between base branch:master and head branch: cleanUpBranding

File % Stmts % Branch % Funcs % Lines
total 44.62 44.66 31.29 31.26 43.16 43.21 44.36 44.4
src/Layout/Header/Tools/index.tsx 83.02 82.86 55.56 55.88 80.65 80.65 83.65 83.5
src/services/cheWorkspaceClient/index.ts 31.15 31.67 11.11 11.11 18.75 20 28.81 29.31

@github-actions
Copy link

github-actions bot commented Jan 8, 2021

Code coverage diff between base branch:master and head branch: cleanUpBranding

File % Stmts % Branch % Funcs % Lines
total 44.59 44.62 31.29 31.26 43.03 43.08 44.33 44.37
src/Layout/Header/Tools/index.tsx 83.02 82.86 55.56 55.88 80.65 80.65 83.65 83.5
src/services/cheWorkspaceClient/index.ts 29.51 30 11.11 11.11 12.5 13.33 27.12 27.59

src/Layout/Header/Tools/__tests__/index.spec.tsx Outdated Show resolved Hide resolved
updateRestApiClient(): void {
const baseUrl = this.baseUrl;
const headers = this.token ? { Authorization: `Bearer ${this.token}` } : {};
this._restApiClient = WorkspaceClient.getRestApi({ baseUrl, headers });
}

async updateJsonRpcMasterApi(): Promise<void> {
let jsonRpcApiLocation = this.originLocation.replace('http', 'ws') + this.websocketContext;
let jsonRpcApiLocation = this.originLocation.replace('http', 'ws') + '/api/websocket';
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

websocketContext should not be defined on the Dashboard side, it more should be on WorkspaceClient level. @akurinnoy and I think that it's OK to hard-code this value on WorkspaceClient side, in the same way as there is like /api/workspace and all related methods paths.

But due to backward compatibility reasons, it's done quickly in this way. Later it can be really fully moved to Che Workspace Client.

@che-bot
Copy link

che-bot commented Jan 8, 2021

❌ E2E dashboard-next tests failed ❗

See Details

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

Signed-off-by: Sergii Leshchenko <sleshche@redhat.com>
@github-actions
Copy link

Code coverage diff between base branch:master and head branch: cleanUpBranding

File % Stmts % Branch % Funcs % Lines
total 44.59 44.62 31.29 31.26 43.03 43.08 44.33 44.37
src/Layout/Header/Tools/index.tsx 83.02 82.86 55.56 55.88 80.65 80.65 83.65 83.5
src/services/cheWorkspaceClient/index.ts 29.51 30 11.11 11.11 12.5 13.33 27.12 27.59

@github-actions
Copy link

Code coverage diff between base branch:master and head branch: cleanUpBranding

File % Stmts % Branch % Funcs % Lines
total 44.59 44.66 31.29 31.26 43.03 43.21 44.33 44.4
src/Layout/Header/Tools/index.tsx 83.02 82.86 55.56 55.88 80.65 80.65 83.65 83.5
src/services/cheWorkspaceClient/index.ts 29.51 31.67 11.11 11.11 12.5 20 27.12 29.31

@che-bot
Copy link

che-bot commented Jan 11, 2021

❌ E2E dashboard-next tests failed ❗

See Details

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

@sleshchenko sleshchenko merged commit 1340888 into master Jan 11, 2021
@sleshchenko sleshchenko deleted the cleanUpBranding branch January 11, 2021 10:18
akurinnoy added a commit to akurinnoy/che-dashboard-next that referenced this pull request Jan 15, 2021
…or#112)

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants