Start workspace from default devfile on private repository SSH url

Author: vinokurig

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/__tests__/index.spec.tsx

@@ -13,7 +13,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { FACTORY_LINK_ATTR } from '@eclipse-che/common';
-import { AlertVariant } from '@patternfly/react-core';
 import { cleanup, screen, waitFor } from '@testing-library/react';
 import userEvent, { UserEvent } from '@testing-library/user-event';
 import React from 'react';
@@ -695,31 +694,6 @@ describe('Creating steps, fetching a devfile', () => {
     const protocol = 'http://';
     const factoryUrl = 'git@github.com:user/repository-name.git';
     const emptyStore = new MockStoreBuilder().build();
-    const sshPrivateRepoAllertItem = expect.objectContaining({
-      title: 'Warning',
-      variant: AlertVariant.warning,
-      children: (
-        <ExpandableWarning
-          textBefore="Devfile resolve from a privatre repositry via an SSH url is not supported."
-          errorMessage="Could not reach devfile"
-          textAfter="Apply a Personal Access Token to fetch the devfile.yaml content."
-        />
-      ),
-      actionCallbacks: [
-        expect.objectContaining({
-          title: 'Continue with default devfile',
-          callback: expect.any(Function),
-        }),
-        expect.objectContaining({
-          title: 'Reload',
-          callback: expect.any(Function),
-        }),
-        expect.objectContaining({
-          title: 'Open Documentation page',
-          callback: expect.any(Function),
-        }),
-      ],
-    });
 
     let spyWindowLocation: jest.SpyInstance;
     let location: Location;
@@ -771,32 +745,32 @@ describe('Creating steps, fetching a devfile', () => {
       expect(mockOnError).not.toHaveBeenCalled();
     });
 
-    it('should show warning on SSH url', async () => {
+    it('should use default devfile on private SSH url', async () => {
       searchParams = new URLSearchParams({
         [FACTORY_URL_ATTR]: 'git@github.com:user/repository.git',
       });
 
       renderComponent(emptyStore, searchParams, location);
 
       await jest.advanceTimersByTimeAsync(MIN_STEP_DURATION_MS);
-      await waitFor(() => expect(mockOnNextStep).not.toHaveBeenCalled);
+      await waitFor(() => expect(mockOnNextStep).toHaveBeenCalled());
 
       expect(mockOpenOAuthPage).not.toHaveBeenCalled();
-      expect(mockOnError).toHaveBeenCalledWith(sshPrivateRepoAllertItem);
+      expect(mockOnError).not.toHaveBeenCalled();
     });
 
-    it('should show warning on bitbucket-server SSH url', async () => {
+    it('should use default devfile on bitbucket-server SSH url', async () => {
       searchParams = new URLSearchParams({
         [FACTORY_URL_ATTR]: 'ssh://git@bitbucket-server.com/~user/repository.git',
       });
 
       renderComponent(emptyStore, searchParams, location);
 
       await jest.advanceTimersByTimeAsync(MIN_STEP_DURATION_MS);
-      await waitFor(() => expect(mockOnNextStep).not.toHaveBeenCalled);
+      await waitFor(() => expect(mockOnNextStep).toHaveBeenCalled);
 
       expect(mockOpenOAuthPage).not.toHaveBeenCalled();
-      expect(mockOnError).toHaveBeenCalledWith(sshPrivateRepoAllertItem);
+      expect(mockOnError).not.toHaveBeenCalled();
     });
   });
 });

packages/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/index.tsx

@@ -53,13 +53,6 @@ export class UnsupportedGitProviderError extends Error {
   }
 }
 
-export class SSHPrivateRepositoryUrlError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = 'UnsupportedGitProviderError';
-  }
-}
-
 const RELOADS_LIMIT = 2;
 type ReloadsInfo = {
   [url: string]: number;
@@ -188,10 +181,6 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
     this.clearStepError();
   }
 
-  protected handleOpenDocumentationPage(): void {
-    window.open(this.props.branding.docs.startWorkspaceFromGit, '_blank');
-  }
-
   protected handleTimeout(): void {
     const timeoutError = new Error(
       `Devfile hasn't been resolved in the last ${TIMEOUT_TO_RESOLVE_SEC} seconds.`,
@@ -235,7 +224,8 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
       ) {
         // check if the source url is an SSH url
         if (this.sshPattern.test(sourceUrl)) {
-          throw new SSHPrivateRepositoryUrlError(errorMessage);
+          this.setState({ useDefaultDevfile: true });
+          return true;
         } else {
           throw new UnsupportedGitProviderError(errorMessage);
         }
@@ -383,34 +373,6 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
         ],
       };
     }
-    if (error instanceof SSHPrivateRepositoryUrlError) {
-      return {
-        key,
-        title: 'Warning',
-        variant: AlertVariant.warning,
-        children: (
-          <ExpandableWarning
-            textBefore="Devfile resolve from a privatre repositry via an SSH url is not supported."
-            errorMessage={helpers.errors.getMessage(error)}
-            textAfter="Apply a Personal Access Token to fetch the devfile.yaml content."
-          />
-        ),
-        actionCallbacks: [
-          {
-            title: 'Continue with default devfile',
-            callback: () => this.handleDefaultDevfile(key),
-          },
-          {
-            title: 'Reload',
-            callback: () => this.handleRestart(key),
-          },
-          {
-            title: 'Open Documentation page',
-            callback: () => this.handleOpenDocumentationPage(),
-          },
-        ],
-      };
-    }
     return {
       key,
       title: 'Failed to create the workspace',