Added Git Servies tab to the User Preferences #687

olexii4 · 2022-12-12T06:09:27Z

Signed-off-by: Oleksii Orel oorel@redhat.com

What does this PR do?

Added Git Servies tab to the User Preferences.

It depends on eclipse-che/che-workspace-client#87 and eclipse-che/che#21890

What issues does this PR fix or reference?

fixes Add "Git Servies" tab to the User Preferences

Is it tested? How?

Deploy CHE using the dashboard image from this PR.
Added OAuth for GitHub, GitLab, and Bitbucket.
Open User Preferences/Git Servies.
Delete OAuth for GitHub, GitLab, and Bitbucket.

This PR depends on eclipse-che/che-server#408

che-bot · 2022-12-12T06:09:41Z

Click here to review and test in web IDE:

github-actions · 2022-12-12T06:26:09Z

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-687

che-bot · 2022-12-13T12:14:06Z

Click here to review and test in web IDE:

github-actions · 2022-12-13T12:30:09Z

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-687

che-bot · 2022-12-28T16:52:46Z

Click here to review and test in web IDE:

che-bot · 2023-01-03T01:38:23Z

Click here to review and test in web IDE:

akurinnoy · 2023-01-03T14:46:53Z

packages/dashboard-backend/src/devworkspaceClient/services/helpers/retryableExec.ts

@@ -19,6 +20,9 @@ export async function retryableExec<T>(callback: () => Promise<T>, maxAttempt =
      return await callback();
    } catch (e) {
      error = e;


This seems to be a useless variable assignment. Don't you mind getting rid of it?

We need this variable out of the loop because we can have several errors until rejecting the last one.

packages/dashboard-frontend/src/pages/UserPreferences/GitServicesTab/index.tsx

...ashboard-frontend/src/pages/UserPreferences/GitServicesTab/Modals/RevokeGitServicesModal.tsx

packages/dashboard-frontend/src/pages/UserPreferences/GitServicesTab/index.tsx

packages/dashboard-frontend/src/pages/UserPreferences/index.tsx

github-actions · 2023-01-13T17:05:45Z

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-687

codecov · 2023-01-13T18:07:41Z

Codecov Report

Merging #687 (0bbb129) into main (915a51e) will increase coverage by 0.71%.
The diff coverage is 62.17%.

@@            Coverage Diff             @@
##             main     #687      +/-   ##
==========================================
+ Coverage   62.69%   63.41%   +0.71%     
==========================================
  Files         290      288       -2     
  Lines        9004     8585     -419     
  Branches     1453     1349     -104     
==========================================
- Hits         5645     5444     -201     
+ Misses       3118     2918     -200     
+ Partials      241      223      -18

Flag	Coverage Δ
unittests	`63.41% <62.17%> (+0.71%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...d-backend/src/localRun/hooks/authorizationHooks.ts	`8.33% <0.00%> (ø)`
.../dashboard-backend/src/routes/api/devfileSchema.ts	`58.82% <ø> (+0.92%)`	⬆️
...oard-frontend/src/components/EditorTools/index.tsx	`0.00% <ø> (ø)`
...-frontend/src/components/WorkspaceEditor/index.tsx	`0.00% <ø> (ø)`
...frontend/src/containers/WorkspaceDetails/index.tsx	`87.50% <ø> (-1.27%)`	⬇️
...shboard-frontend/src/containers/WorkspacesList.tsx	`92.59% <ø> (+0.48%)`	⬆️
...es/GetStarted/GetStartedTab/SamplesListGallery.tsx	`55.55% <0.00%> (-6.41%)`	⬇️
...s/UserPreferences/ContainerRegistriesTab/index.tsx	`58.33% <ø> (+0.26%)`	⬆️
...board-frontend/src/pages/UserPreferences/index.tsx	`0.00% <0.00%> (ø)`
...WorkspaceDetails/OverviewTab/StorageType/index.tsx	`0.00% <0.00%> (ø)`
... and 60 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

ibuziuk · 2023-01-16T09:58:12Z

packages/dashboard-backend/src/localRun/hooks/authorizationHooks.ts

@@ -15,7 +15,7 @@ import { FastifyInstance } from 'fastify';
 export function addAuthorizationHooks(server: FastifyInstance) {
  server.addHook('onResponse', (request, reply, done) => {
    if (
-      (request.url.startsWith('/api/') || request.url.startsWith('/dashboard/api/')) &&


@olexii4 could you please clarify why do we need this change, as I recall api was added explicitly to prevent some redirection issue

This code is only for a local run.
It removes the local environment variable CLUSTER_ACCESS_TOKEN when a response from '{CHE-Server}/api/' or '/dashboard/api/' has status code '401'.

I added the following changes

(request.url.startsWith('/api/') || request.url.startsWith('/dashboard/api/')) &&

->

request.url.startsWith('/dashboard/api/') &&

because I already have a code that can return status code '401' from CHE-Server API:

{CHE-Server}/api/oauth/token?oauth_provider=...

ibuziuk · 2023-01-16T10:23:31Z

@olexii4 during verification I got the following error when deleting the GitHub Service:

Danger alert:TypeError: gitOauth.map is not a function

    in GitServicesTab (created by Connect(GitServicesTab))
    in Connect(GitServicesTab) (created by UserPreferences)
    in section (created by Context.Consumer)
    in TabContentBase (created by ForwardRef)
    in ForwardRef (created by Tabs)
    in Tabs (created by UserPreferences)
    in UserPreferences (created by Connect(UserPreferences))
    in Connect(UserPreferences) (created by Context.Consumer)
    in Route (created by RoutesComponent)
    in Switch (created by RoutesComponent)
    in RoutesComponent (created by AppComponent)
    in Suspense (created by AppComponent)
    in ErrorBoundary (created by Layout)
    in main (created by Page)
    in div (created by Page)
    in Page (created by Layout)
    in Layout (created by Connect(Layout))
    in Connect(Layout) (created by AppComponent)
    in Router (created by ConnectedRouter)
    in ConnectedRouter (created by Context.Consumer)
    in ConnectedRouterWithContext (created by Connect(ConnectedRouterWithContext))
    in Connect(ConnectedRouterWithContext) (created by AppComponent)
    in AppComponent
    in Provider

...references/GitServicesTab/Modals/__tests__/__snapshots__/RevokeRegistriesModal.spec.tsx.snap

packages/dashboard-frontend/src/store/GitOauthConfig/index.ts

che-bot · 2023-01-16T11:37:55Z

Click here to review and test in web IDE:

github-actions · 2023-01-16T11:53:31Z

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-687

che-bot · 2023-01-16T14:57:42Z

Click here to review and test in web IDE:

olexii4 · 2023-01-16T14:59:15Z

@olexii4 during verification I got the following error when deleting the GitHub Service:

Danger alert:TypeError: gitOauth.map is not a function

    in GitServicesTab (created by Connect(GitServicesTab))
    in Connect(GitServicesTab) (created by UserPreferences)
    in section (created by Context.Consumer)
    in TabContentBase (created by ForwardRef)
    in ForwardRef (created by Tabs)
    in Tabs (created by UserPreferences)
    in UserPreferences (created by Connect(UserPreferences))
    in Connect(UserPreferences) (created by Context.Consumer)
    in Route (created by RoutesComponent)
    in Switch (created by RoutesComponent)
    in RoutesComponent (created by AppComponent)
    in Suspense (created by AppComponent)
    in ErrorBoundary (created by Layout)
    in main (created by Page)
    in div (created by Page)
    in Page (created by Layout)
    in Layout (created by Connect(Layout))
    in Connect(Layout) (created by AppComponent)
    in Router (created by ConnectedRouter)
    in ConnectedRouter (created by Context.Consumer)
    in ConnectedRouterWithContext (created by Connect(ConnectedRouterWithContext))
    in Connect(ConnectedRouterWithContext) (created by AppComponent)
    in AppComponent
    in Provider

@ibuziuk I have fixed it.

github-actions · 2023-01-16T15:13:53Z

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-687

che-bot · 2023-01-16T15:37:34Z

Click here to review and test in web IDE:

che-bot · 2023-01-16T15:41:39Z

Click here to review and test in web IDE:

github-actions · 2023-01-16T15:52:14Z

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-687

github-actions · 2023-01-16T15:58:55Z

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-687

ibuziuk

@olexii4 great job 👍
works like a charm

akurinnoy

LGTM

openshift-ci · 2023-01-17T13:06:12Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: akurinnoy, ibuziuk, olexii4

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

olexii4 requested a review from ibuziuk December 12, 2022 06:09

olexii4 requested a review from akurinnoy as a code owner December 12, 2022 06:09

olexii4 marked this pull request as draft December 12, 2022 11:10

openshift-ci bot added the do-not-merge/work-in-progress label Dec 12, 2022

openshift-merge-robot added the needs-rebase label Dec 12, 2022

olexii4 force-pushed the CHE-21595 branch from 6448752 to 80eec7c Compare December 13, 2022 12:13

openshift-merge-robot removed the needs-rebase label Dec 13, 2022

olexii4 force-pushed the CHE-21595 branch from 80eec7c to 2071656 Compare December 28, 2022 16:52

olexii4 marked this pull request as ready for review December 28, 2022 16:52

openshift-ci bot removed the do-not-merge/work-in-progress label Dec 28, 2022

olexii4 mentioned this pull request Jan 3, 2023

fix: OAuth API eclipse-che/che-workspace-client#96

Merged

olexii4 force-pushed the CHE-21595 branch from 2071656 to ca00326 Compare January 3, 2023 01:38