fix: Code refactoring

Signed-off-by: Oleksii Orel <[email protected]>
eclipse-che · Aug 2, 2023 · 9edb086 · 9edb086
1 parent bd384a3
commit 9edb086
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 131 deletions.
diff --git a/...ontend/src/components/WorkspaceProgress/CommonSteps/CheckRunningWorkspacesLimit/index.tsx b/...ontend/src/components/WorkspaceProgress/CommonSteps/CheckRunningWorkspacesLimit/index.tsx
@@ -17,8 +17,6 @@ import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { ToggleBarsContext } from '../../../../contexts/ToggleBars';
 import { WorkspaceParams } from '../../../../Routes/routes';
-import { delay } from '../../../../services/helpers/delay';
-import { DisposableCollection } from '../../../../services/helpers/disposable';
 import { findTargetWorkspace } from '../../../../services/helpers/factoryFlow/findTargetWorkspace';
 import { buildHomeLocation, buildIdeLoaderLocation } from '../../../../services/helpers/location';
 import { AlertItem, DevWorkspaceStatus, LoaderTab } from '../../../../services/helpers/types';
@@ -33,7 +31,7 @@ import {
   selectAllWorkspaces,
   selectRunningWorkspaces,
 } from '../../../../store/Workspaces/selectors';
-import { MIN_STEP_DURATION_MS, TIMEOUT_TO_STOP_SEC } from '../../const';
+import { TIMEOUT_TO_STOP_SEC } from '../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../ProgressStep';
 import { ProgressStepTitle } from '../../StepTitle';
 import { TimeLimit } from '../../TimeLimit';
@@ -53,8 +51,6 @@ class CommonStepCheckRunningWorkspacesLimit extends ProgressStep<Props, State> {
   static contextType = ToggleBarsContext;
   readonly context: React.ContextType<typeof ToggleBarsContext>;
 
-  protected readonly toDispose = new DisposableCollection();
-
   constructor(props: Props) {
     super(props);
 
@@ -69,8 +65,6 @@ class CommonStepCheckRunningWorkspacesLimit extends ProgressStep<Props, State> {
   }
 
   public async componentDidUpdate() {
-    this.toDispose.dispose();
-
     this.init();
   }
 
@@ -130,8 +124,6 @@ class CommonStepCheckRunningWorkspacesLimit extends ProgressStep<Props, State> {
    * The resolved boolean indicates whether to go to the next step or not
    */
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
-
     const { runningWorkspacesLimit } = this.props;
     const { shouldStop, redundantWorkspaceUID } = this.state;
 

diff --git a/...dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/index.tsx b/...dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Devfile/index.tsx
@@ -17,8 +17,6 @@ import isEqual from 'lodash/isEqual';
 import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import devfileApi from '../../../../../services/devfileApi';
-import { delay } from '../../../../../services/helpers/delay';
-import { DisposableCollection } from '../../../../../services/helpers/disposable';
 import {
   buildFactoryParams,
   FactoryParams,
@@ -38,7 +36,7 @@ import * as WorkspacesStore from '../../../../../store/Workspaces';
 import { selectDevWorkspaceWarnings } from '../../../../../store/Workspaces/devWorkspaces/selectors';
 import { selectAllWorkspaces } from '../../../../../store/Workspaces/selectors';
 import ExpandableWarning from '../../../../ExpandableWarning';
-import { MIN_STEP_DURATION_MS, TIMEOUT_TO_CREATE_SEC } from '../../../const';
+import { TIMEOUT_TO_CREATE_SEC } from '../../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../../ProgressStep';
 import { ProgressStepTitle } from '../../../StepTitle';
 import { TimeLimit } from '../../../TimeLimit';
@@ -68,7 +66,6 @@ export type State = ProgressStepState & {
 
 class CreatingStepApplyDevfile extends ProgressStep<Props, State> {
   protected readonly name = 'Applying devfile';
-  protected readonly toDispose = new DisposableCollection();
 
   constructor(props: Props) {
     super(props);
@@ -85,8 +82,6 @@ class CreatingStepApplyDevfile extends ProgressStep<Props, State> {
   }
 
   public componentDidUpdate() {
-    this.toDispose.dispose();
-
     this.init();
   }
 
@@ -207,8 +202,6 @@ class CreatingStepApplyDevfile extends ProgressStep<Props, State> {
   }
 
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
-
     const { factoryResolverConverted, factoryResolver, defaultDevfile } = this.props;
     const { shouldCreate, devfile, warning, continueWithDefaultDevfile } = this.state;
 

diff --git a/...shboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Resources/index.tsx b/...shboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Apply/Resources/index.tsx
@@ -15,8 +15,6 @@ import { AlertVariant } from '@patternfly/react-core';
 import { isEqual } from 'lodash';
 import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
-import { delay } from '../../../../../services/helpers/delay';
-import { DisposableCollection } from '../../../../../services/helpers/disposable';
 import {
   buildFactoryParams,
   FactoryParams,
@@ -39,7 +37,7 @@ import * as WorkspacesStore from '../../../../../store/Workspaces';
 import * as DevWorkspacesStore from '../../../../../store/Workspaces/devWorkspaces';
 import { selectDevWorkspaceWarnings } from '../../../../../store/Workspaces/devWorkspaces/selectors';
 import { selectAllWorkspaces } from '../../../../../store/Workspaces/selectors';
-import { MIN_STEP_DURATION_MS, TIMEOUT_TO_CREATE_SEC } from '../../../const';
+import { TIMEOUT_TO_CREATE_SEC } from '../../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../../ProgressStep';
 import { ProgressStepTitle } from '../../../StepTitle';
 import { TimeLimit } from '../../../TimeLimit';
@@ -59,7 +57,6 @@ export type State = ProgressStepState & {
 
 class CreatingStepApplyResources extends ProgressStep<Props, State> {
   protected readonly name = 'Applying resources';
-  protected readonly toDispose = new DisposableCollection();
 
   constructor(props: Props) {
     super(props);
@@ -76,8 +73,6 @@ class CreatingStepApplyResources extends ProgressStep<Props, State> {
   }
 
   public componentDidUpdate() {
-    this.toDispose.dispose();
-
     this.init();
   }
 
@@ -172,8 +167,6 @@ class CreatingStepApplyResources extends ProgressStep<Props, State> {
   }
 
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
-
     const { devWorkspaceResources } = this.props;
     const { factoryParams, shouldCreate, resources, warning } = this.state;
     const { cheEditor, factoryId, sourceUrl, storageType, policiesCreate } = factoryParams;

diff --git a/...frontend/src/components/WorkspaceProgress/CreatingSteps/CheckExistingWorkspaces/index.tsx b/...frontend/src/components/WorkspaceProgress/CreatingSteps/CheckExistingWorkspaces/index.tsx
@@ -15,7 +15,6 @@ import { AlertVariant } from '@patternfly/react-core';
 import { isEqual } from 'lodash';
 import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
-import { delay } from '../../../../services/helpers/delay';
 import {
   buildFactoryParams,
   FactoryParams,
@@ -30,17 +29,9 @@ import {
   selectFactoryResolverConverted,
 } from '../../../../store/FactoryResolver/selectors';
 import { selectAllWorkspaces } from '../../../../store/Workspaces/selectors';
-import { MIN_STEP_DURATION_MS } from '../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../ProgressStep';
 import { ProgressStepTitle } from '../../StepTitle';
 
-export class WorkspacesNameConflictError extends Error {
-  constructor(message: string | undefined) {
-    super(message);
-    this.name = 'RunningWorkspacesExceededError';
-  }
-}
-
 export type Props = MappedProps &
   ProgressStepProps & {
     searchParams: URLSearchParams;
@@ -71,8 +62,6 @@ class CreatingStepCheckExistingWorkspaces extends ProgressStep<Props, State> {
   }
 
   public componentDidUpdate() {
-    this.toDispose.dispose();
-
     this.init();
   }
 
@@ -140,8 +129,6 @@ class CreatingStepCheckExistingWorkspaces extends ProgressStep<Props, State> {
   }
 
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
-
     const { devWorkspaceResources, factoryResolver, factoryResolverConverted } = this.props;
     const { factoryParams, shouldCreate } = this.state;
 

diff --git a/...shboard-frontend/src/components/WorkspaceProgress/CreatingSteps/CreateWorkspace/index.tsx b/...shboard-frontend/src/components/WorkspaceProgress/CreatingSteps/CreateWorkspace/index.tsx
@@ -11,14 +11,11 @@
  */
 
 import React from 'react';
-import { delay } from '../../../../services/helpers/delay';
-import { DisposableCollection } from '../../../../services/helpers/disposable';
 import {
   buildFactoryParams,
   FactoryParams,
 } from '../../../../services/helpers/factoryFlow/buildFactoryParams';
 import { AlertItem } from '../../../../services/helpers/types';
-import { MIN_STEP_DURATION_MS } from '../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../ProgressStep';
 import { ProgressStepTitle } from '../../StepTitle';
 
@@ -31,7 +28,6 @@ export type State = ProgressStepState & {
 
 export default class CreatingStepCreateWorkspace extends ProgressStep<Props, State> {
   protected readonly name = 'Creating a workspace';
-  protected readonly toDispose = new DisposableCollection();
 
   constructor(props: Props) {
     super(props);
@@ -47,7 +43,6 @@ export default class CreatingStepCreateWorkspace extends ProgressStep<Props, Sta
   }
 
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
     return true;
   }
 

diff --git a/...dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/index.tsx b/...dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Devfile/index.tsx
@@ -19,8 +19,6 @@ import {
   buildFactoryParams,
   FactoryParams,
 } from '../../../../../services/helpers/factoryFlow/buildFactoryParams';
-import { delay } from '../../../../../services/helpers/delay';
-import { DisposableCollection } from '../../../../../services/helpers/disposable';
 import { getEnvironment, isDevEnvironment } from '../../../../../services/helpers/environment';
 import { AlertItem } from '../../../../../services/helpers/types';
 import OAuthService, { isOAuthResponse } from '../../../../../services/oauth';
@@ -33,7 +31,7 @@ import {
 } from '../../../../../store/FactoryResolver/selectors';
 import { selectAllWorkspaces } from '../../../../../store/Workspaces/selectors';
 import ExpandableWarning from '../../../../ExpandableWarning';
-import { MIN_STEP_DURATION_MS, TIMEOUT_TO_RESOLVE_SEC } from '../../../const';
+import { TIMEOUT_TO_RESOLVE_SEC } from '../../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../../ProgressStep';
 import { ProgressStepTitle } from '../../../StepTitle';
 import { TimeLimit } from '../../../TimeLimit';
@@ -70,7 +68,6 @@ export type State = ProgressStepState & {
 
 class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
   protected readonly name = 'Looking for devfile';
-  protected readonly toDispose = new DisposableCollection();
 
   constructor(props: Props) {
     super(props);
@@ -88,8 +85,6 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
   }
 
   public componentDidUpdate() {
-    this.toDispose.dispose();
-
     this.init();
   }
 
@@ -182,8 +177,6 @@ class CreatingStepFetchDevfile extends ProgressStep<Props, State> {
   }
 
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
-
     const { factoryParams, shouldResolve, useDefaultDevfile } = this.state;
     const { factoryResolver, factoryResolverConverted } = this.props;
     const { sourceUrl } = factoryParams;

diff --git a/...shboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Resources/index.tsx b/...shboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Fetch/Resources/index.tsx
@@ -19,14 +19,12 @@ import {
   buildFactoryParams,
   FactoryParams,
 } from '../../../../../services/helpers/factoryFlow/buildFactoryParams';
-import { delay } from '../../../../../services/helpers/delay';
-import { DisposableCollection } from '../../../../../services/helpers/disposable';
 import { AlertItem } from '../../../../../services/helpers/types';
 import { AppState } from '../../../../../store';
 import * as DevfileRegistriesStore from '../../../../../store/DevfileRegistries';
 import { selectDevWorkspaceResources } from '../../../../../store/DevfileRegistries/selectors';
 import { selectAllWorkspaces } from '../../../../../store/Workspaces/selectors';
-import { MIN_STEP_DURATION_MS, TIMEOUT_TO_RESOLVE_SEC } from '../../../const';
+import { TIMEOUT_TO_RESOLVE_SEC } from '../../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../../ProgressStep';
 import { ProgressStepTitle } from '../../../StepTitle';
 import { TimeLimit } from '../../../TimeLimit';
@@ -42,7 +40,6 @@ export type State = ProgressStepState & {
 
 class CreatingStepFetchResources extends ProgressStep<Props, State> {
   protected readonly name = 'Fetching pre-built resources';
-  protected readonly toDispose = new DisposableCollection();
 
   constructor(props: Props) {
     super(props);
@@ -59,8 +56,6 @@ class CreatingStepFetchResources extends ProgressStep<Props, State> {
   }
 
   public componentDidUpdate() {
-    this.toDispose.dispose();
-
     this.init();
   }
 
@@ -136,8 +131,6 @@ class CreatingStepFetchResources extends ProgressStep<Props, State> {
   }
 
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
-
     const { devWorkspaceResources } = this.props;
     const { factoryParams, shouldResolve } = this.state;
     const { sourceUrl } = factoryParams;

diff --git a/...es/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Initialize/index.tsx b/...es/dashboard-frontend/src/components/WorkspaceProgress/CreatingSteps/Initialize/index.tsx
@@ -22,14 +22,11 @@ import {
   FactoryParams,
   PoliciesCreate,
 } from '../../../../services/helpers/factoryFlow/buildFactoryParams';
-import { delay } from '../../../../services/helpers/delay';
-import { DisposableCollection } from '../../../../services/helpers/disposable';
 import { AlertItem } from '../../../../services/helpers/types';
 import { AppState } from '../../../../store';
 import { selectAllWorkspacesLimit } from '../../../../store/ClusterConfig/selectors';
 import { selectInfrastructureNamespaces } from '../../../../store/InfrastructureNamespaces/selectors';
 import { selectAllWorkspaces } from '../../../../store/Workspaces/selectors';
-import { MIN_STEP_DURATION_MS } from '../../const';
 import { ProgressStep, ProgressStepProps, ProgressStepState } from '../../ProgressStep';
 import { ProgressStepTitle } from '../../StepTitle';
 
@@ -43,7 +40,6 @@ export type State = ProgressStepState & {
 
 class CreatingStepInitialize extends ProgressStep<Props, State> {
   protected readonly name = 'Initializing';
-  protected readonly toDispose = new DisposableCollection();
 
   constructor(props: Props) {
     super(props);
@@ -71,8 +67,6 @@ class CreatingStepInitialize extends ProgressStep<Props, State> {
   }
 
   public componentDidUpdate() {
-    this.toDispose.dispose();
-
     this.init();
   }
 
@@ -91,8 +85,6 @@ class CreatingStepInitialize extends ProgressStep<Props, State> {
   }
 
   protected async runStep(): Promise<boolean> {
-    await delay(MIN_STEP_DURATION_MS);
-
     const { useDevworkspaceResources, sourceUrl, errorCode, policiesCreate, remotes } =
       this.state.factoryParams;