Fix an error when passing the editor's Devfile link

packages/dashboard-backend/src/routes/api/helpers/getCertificateAuthority.ts

@@ -15,19 +15,12 @@ import path from 'path';
 import * as axios from 'axios';
 import https from 'https';
 
-export interface ICrtConfig {
-  ssCrtPath?: string;
-  publicCrtPath?: string;
-}
-
-const DEFAULT_CHE_SELF_SIGNED_MOUNT_PATH = '/public-certs/che-self-signed';
+const DEFAULT_CHE_SELF_SIGNED_MOUNT_PATH = '/public-certs';
 const CHE_SELF_SIGNED_MOUNT_PATH = process.env.CHE_SELF_SIGNED_MOUNT_PATH;
 
-const certificateAuthority = getCertificateAuthority({
-  publicCrtPath: CHE_SELF_SIGNED_MOUNT_PATH
-    ? CHE_SELF_SIGNED_MOUNT_PATH
-    : DEFAULT_CHE_SELF_SIGNED_MOUNT_PATH,
-});
+const certificateAuthority = getCertificateAuthority(
+  CHE_SELF_SIGNED_MOUNT_PATH ? CHE_SELF_SIGNED_MOUNT_PATH : DEFAULT_CHE_SELF_SIGNED_MOUNT_PATH,
+);
 
 export const axiosInstance = certificateAuthority
   ? axios.default.create({
@@ -37,21 +30,46 @@ export const axiosInstance = certificateAuthority
     })
   : axios.default;
 
-function getCertificateAuthority(config: ICrtConfig): Buffer[] | undefined {
-  const certificateAuthority: Buffer[] = [];
-  if (config.ssCrtPath && fs.existsSync(config.ssCrtPath)) {
-    certificateAuthority.push(fs.readFileSync(config.ssCrtPath));
-  }
+function searchCertificate(
+  certPath: string,
+  certificateAuthority: Buffer[],
+  subdirLevel = 1,
+): void {
+  const maxSubdirQuantity = 10;
+  const maxSubdirLevel = 5;
 
-  if (config.publicCrtPath && fs.existsSync(config.publicCrtPath)) {
-    const publicCertificates = fs.readdirSync(config.publicCrtPath);
+  const tmpPaths: string[] = [];
+  try {
+    const publicCertificates = fs.readdirSync(certPath);
     for (const publicCertificate of publicCertificates) {
-      if (publicCertificate.endsWith('.crt')) {
-        const certPath = path.join(config.publicCrtPath, publicCertificate);
-        certificateAuthority.push(fs.readFileSync(certPath));
+      const newPath = path.join(certPath, publicCertificate);
+      if (fs.lstatSync(newPath).isDirectory()) {
+        if (tmpPaths.length < maxSubdirQuantity) {
+          tmpPaths.push(newPath);
+        }
+      } else {
+        const fullPath = path.join(certPath, publicCertificate);
+        certificateAuthority.push(fs.readFileSync(fullPath));
       }
     }
+  } catch (e) {
+    // no-op
+  }
+
+  if (subdirLevel < maxSubdirLevel) {
+    for (const path of tmpPaths) {
+      searchCertificate(path, certificateAuthority, ++subdirLevel);
+    }
+  }
+}
+
+function getCertificateAuthority(certPath: string): Buffer[] | undefined {
+  if (!fs.existsSync(certPath)) {
+    return undefined;
   }
 
+  const certificateAuthority: Buffer[] = [];
+  searchCertificate(certPath, certificateAuthority);
+
   return certificateAuthority.length > 0 ? certificateAuthority : undefined;
 }

packages/dashboard-frontend/src/containers/Loader/CommonSteps/CheckRunningWorkspacesLimit/__tests__/index.spec.tsx

@@ -203,7 +203,7 @@ describe('Workspace Loader, step CHECK_RUNNING_WORKSPACES_LIMIT', () => {
       await waitFor(() => expect(hasError.textContent).toEqual('true'));
 
       const closeRunningWorkspaceButton = screen.queryByText(
-        `Close running workspace (${runningDevworkspace.metadata.name}) and restart ${targetDevworkspace.metadata.name}`,
+        `Close running workspace (${runningDevworkspace.metadata.name}) and restart`,
       );
       expect(closeRunningWorkspaceButton).not.toBeNull();
 

packages/dashboard-frontend/src/containers/Loader/CommonSteps/CheckRunningWorkspacesLimit/index.tsx

@@ -255,7 +255,7 @@ class StepCheckRunningWorkspacesLimit extends AbstractLoaderStep<Props, State> {
     return findTargetWorkspace(props.allWorkspaces, props.matchParams);
   }
 
-  private getAlertItem(error: unknown, workspace: Workspace | undefined): AlertItem | undefined {
+  private getAlertItem(error: unknown): AlertItem | undefined {
     const { runningWorkspaces } = this.props;
 
     if (error instanceof RunningWorkspacesExceededError) {
@@ -277,7 +277,7 @@ class StepCheckRunningWorkspacesLimit extends AbstractLoaderStep<Props, State> {
         const runningWorkspace = runningWorkspaces[0];
         runningWorkspacesAlertItem.actionCallbacks = [
           {
-            title: `Close running workspace (${runningWorkspace.name}) and restart ${workspace?.name}`,
+            title: `Close running workspace (${runningWorkspace.name}) and restart`,
             callback: () => this.handleStopRedundantWorkspace(runningWorkspace),
           },
           {
@@ -317,7 +317,7 @@ class StepCheckRunningWorkspacesLimit extends AbstractLoaderStep<Props, State> {
     const steps = loaderSteps.values;
     const currentStepId = loaderSteps.get(currentStepIndex).value.id;
 
-    const alertItem = this.getAlertItem(lastError, workspace);
+    const alertItem = this.getAlertItem(lastError);
 
     return (
       <LoaderPage

packages/dashboard-frontend/src/containers/Loader/Factory/Steps/Apply/Devfile/index.tsx

@@ -282,9 +282,12 @@ class StepApplyDevfile extends AbstractLoaderStep<Props, State> {
   }
 
   private async createWorkspaceFromDevfile(devfile: devfileApi.Devfile): Promise<void> {
-    const params = Object.fromEntries(this.props.searchParams);
     const optionalFilesContent = this.props.factoryResolver?.optionalFilesContent || {};
-    await this.props.createWorkspaceFromDevfile(devfile, params, optionalFilesContent);
+    await this.props.createWorkspaceFromDevfile(
+      devfile,
+      this.state.factoryParams,
+      optionalFilesContent,
+    );
   }
 
   private handleCreateWorkspaceError(): void {

packages/dashboard-frontend/src/pages/GetStarted/GetStartedTab/__tests__/GetStartedTab.spec.tsx

@@ -18,7 +18,7 @@ import { SamplesListTab } from '..';
 import { selectWorkspacesSettings } from '../../../../store/Workspaces/Settings/selectors';
 import { BrandingData } from '../../../../services/bootstrap/branding.constant';
 import { selectPvcStrategy } from '../../../../store/ServerConfig/selectors';
-import { api as dashboardBackendApi } from '@eclipse-che/common';
+import { api } from '@eclipse-che/common';
 import devfileApi from '../../../../services/devfileApi';
 
 const onDevfileMock: (
@@ -70,7 +70,7 @@ describe('Samples list tab', () => {
         defaults: {
           pvcStrategy: preferredStorageType,
         },
-      } as dashboardBackendApi.IServerConfig)
+      } as api.IServerConfig)
       .withDevWorkspaces({
         workspaces: [],
       })

packages/dashboard-frontend/src/pages/GetStarted/__tests__/GetStarted.spec.tsx

@@ -93,7 +93,7 @@ describe('Quick Add page', () => {
     devfileButton.click();
 
     expect(createWorkspaceFromDevfileMock).toHaveBeenCalledWith(dummyDevfile, {
-      stackName: 'dummyStackName',
+      factoryId: 'dummyStackName',
     });
   });
 

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

@@ -37,6 +37,7 @@ import { selectWorkspaceByQualifiedName } from '../../store/Workspaces/selectors
 import { selectDefaultNamespace } from '../../store/InfrastructureNamespaces/selectors';
 import getRandomString from '../../services/helpers/random';
 import devfileApi from '../../services/devfileApi';
+import { FactoryParams } from '../../containers/Loader/buildFactoryParams';
 
 const SamplesListTab = React.lazy(() => import('./GetStartedTab'));
 
@@ -116,9 +117,9 @@ export class GetStarted extends React.PureComponent<Props, State> {
       [fileName: string]: string;
     },
   ): Promise<void> {
-    const attr: { [key: string]: string } = {};
+    const attr: Partial<FactoryParams> = {};
     if (stackName) {
-      attr.stackName = stackName;
+      attr.factoryId = stackName;
     }
     if (isCheDevfile(devfile) && !devfile.metadata.name && devfile.metadata.generateName) {
       const name = devfile.metadata.generateName + getRandomString(4).toLowerCase();
@@ -131,7 +132,7 @@ export class GetStarted extends React.PureComponent<Props, State> {
     let workspace: Workspace | undefined;
     try {
       await this.props.createWorkspaceFromDevfile(devfile, attr, optionalFilesContent);
-      this.props.setWorkspaceQualifiedName(namespace, devfile.metadata.name as string);
+      this.props.setWorkspaceQualifiedName(namespace, devfile.metadata.name);
       workspace = this.props.activeWorkspace;
     } catch (e) {
       const errorMessage = common.helpers.errors.getMessage(e);