From 81d7dfd9593ca2afc00f7479bb9b099d57bb2714 Mon Sep 17 00:00:00 2001 From: Grace Chia Date: Thu, 9 Apr 2026 22:59:22 -0700 Subject: [PATCH 1/2] refactor: move shared computing unit types and services --- .../computing-unit-actions.service.ts | 14 +++++++------- .../workflow-computing-unit-managing.service.ts | 4 ++-- .../computing-unit-status.service.ts | 14 +++++++------- .../mock-computing-unit-status.service.ts | 2 +- .../type}/computing-unit-connection.interface.ts | 0 .../type}/workflow-computing-unit.ts | 0 .../src/app/common/util/computing-unit.util.ts | 2 +- .../user-computing-unit-list-item.component.ts | 8 ++++---- .../user-computing-unit.component.spec.ts | 6 +++--- .../user-computing-unit.component.ts | 8 ++++---- .../service/user/download/download.service.ts | 2 +- frontend/src/app/dashboard/type/dashboard-entry.ts | 2 +- frontend/src/app/dashboard/type/type-predicates.ts | 2 +- .../time-travel/time-travel.component.spec.ts | 4 ++-- .../app/workspace/component/menu/menu.component.ts | 6 +++--- .../computing-unit-selection.component.spec.ts | 4 ++-- .../computing-unit-selection.component.ts | 8 ++++---- .../operator-property-edit-frame.component.spec.ts | 4 ++-- .../property-editor.component.spec.ts | 4 ++-- .../result-exportation.component.ts | 4 ++-- .../console-frame/console-frame.component.spec.ts | 4 ++-- .../error-frame/error-frame.component.spec.ts | 4 ++-- .../result-panel/result-panel.component.spec.ts | 4 ++-- .../workflow-editor.component.spec.ts | 4 ++-- .../execute-workflow.service.spec.ts | 4 ++-- .../execute-workflow/execute-workflow.service.ts | 2 +- .../operator-menu/operator-menu.service.spec.ts | 4 ++-- .../workflow-result-export.service.ts | 2 +- 28 files changed, 63 insertions(+), 63 deletions(-) rename frontend/src/app/{dashboard/service/user => common/service/computing-unit}/computing-unit-actions/computing-unit-actions.service.ts (85%) rename frontend/src/app/{workspace/service/workflow-computing-unit => common/service/computing-unit/computing-unit-managing}/workflow-computing-unit-managing.service.ts (98%) rename frontend/src/app/{workspace/service => common/service/computing-unit}/computing-unit-status/computing-unit-status.service.ts (93%) rename frontend/src/app/{workspace/service => common/service/computing-unit}/computing-unit-status/mock-computing-unit-status.service.ts (94%) rename frontend/src/app/{workspace/types => common/type}/computing-unit-connection.interface.ts (100%) rename frontend/src/app/{workspace/types => common/type}/workflow-computing-unit.ts (100%) diff --git a/frontend/src/app/dashboard/service/user/computing-unit-actions/computing-unit-actions.service.ts b/frontend/src/app/common/service/computing-unit/computing-unit-actions/computing-unit-actions.service.ts similarity index 85% rename from frontend/src/app/dashboard/service/user/computing-unit-actions/computing-unit-actions.service.ts rename to frontend/src/app/common/service/computing-unit/computing-unit-actions/computing-unit-actions.service.ts index 883c0c03ee4..756b8b6b41d 100644 --- a/frontend/src/app/dashboard/service/user/computing-unit-actions/computing-unit-actions.service.ts +++ b/frontend/src/app/common/service/computing-unit/computing-unit-actions/computing-unit-actions.service.ts @@ -20,16 +20,16 @@ import { Injectable } from "@angular/core"; import { Observable } from "rxjs"; import { NzModalService } from "ng-zorro-antd/modal"; -import { ShareAccessComponent } from "../../../component/user/share-access/share-access.component"; -import { WorkflowComputingUnitManagingService } from "../../../../workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service"; +import { ShareAccessComponent } from "../../../../dashboard/component/user/share-access/share-access.component"; +import { WorkflowComputingUnitManagingService } from "../computing-unit-managing/workflow-computing-unit-managing.service"; import { DashboardWorkflowComputingUnit, WorkflowComputingUnitType, -} from "../../../../workspace/types/workflow-computing-unit"; -import { NotificationService } from "../../../../common/service/notification/notification.service"; -import { unitTypeMessageTemplate } from "../../../../common/util/computing-unit.util"; -import { ComputingUnitStatusService } from "../../../../workspace/service/computing-unit-status/computing-unit-status.service"; -import { extractErrorMessage } from "../../../../common/util/error"; +} from "../../../type/workflow-computing-unit"; +import { NotificationService } from "../../notification/notification.service"; +import { unitTypeMessageTemplate } from "../../../util/computing-unit.util"; +import { ComputingUnitStatusService } from "../computing-unit-status/computing-unit-status.service"; +import { extractErrorMessage } from "../../../util/error"; export interface StartComputingUnitRequest { type: WorkflowComputingUnitType; diff --git a/frontend/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts b/frontend/src/app/common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service.ts similarity index 98% rename from frontend/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts rename to frontend/src/app/common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service.ts index a1dbb0c97cb..58768bb346d 100644 --- a/frontend/src/app/workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service.ts +++ b/frontend/src/app/common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service.ts @@ -20,13 +20,13 @@ import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; import { Observable } from "rxjs"; -import { AppSettings } from "../../../common/app-setting"; +import { AppSettings } from "../../../app-setting"; import { DashboardWorkflowComputingUnit, WorkflowComputingUnit, WorkflowComputingUnitResourceLimit, WorkflowComputingUnitType, -} from "../../types/workflow-computing-unit"; +} from "../../../type/workflow-computing-unit"; import { map } from "rxjs/operators"; export const COMPUTING_UNIT_BASE_URL = "computing-unit"; diff --git a/frontend/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts b/frontend/src/app/common/service/computing-unit/computing-unit-status/computing-unit-status.service.ts similarity index 93% rename from frontend/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts rename to frontend/src/app/common/service/computing-unit/computing-unit-status/computing-unit-status.service.ts index 06bd0d4071b..81e83e49c9e 100644 --- a/frontend/src/app/workspace/service/computing-unit-status/computing-unit-status.service.ts +++ b/frontend/src/app/common/service/computing-unit/computing-unit-status/computing-unit-status.service.ts @@ -20,14 +20,14 @@ import { Injectable, OnDestroy } from "@angular/core"; import { BehaviorSubject, interval, Observable, of, Subject, Subscription } from "rxjs"; import { catchError, distinctUntilChanged, filter, map, switchMap, take, tap } from "rxjs/operators"; -import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit"; -import { WorkflowComputingUnitManagingService } from "../workflow-computing-unit/workflow-computing-unit-managing.service"; -import { WorkflowWebsocketService } from "../workflow-websocket/workflow-websocket.service"; +import { DashboardWorkflowComputingUnit } from "../../../type/workflow-computing-unit"; +import { WorkflowComputingUnitManagingService } from "../computing-unit-managing/workflow-computing-unit-managing.service"; +import { WorkflowWebsocketService } from "../../../../workspace/service/workflow-websocket/workflow-websocket.service"; import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; -import { ComputingUnitState } from "../../types/computing-unit-connection.interface"; -import { isDefined } from "../../../common/util/predicate"; -import { WorkflowStatusService } from "../workflow-status/workflow-status.service"; -import { UserService } from "../../../common/service/user/user.service"; +import { ComputingUnitState } from "../../../type/computing-unit-connection.interface"; +import { isDefined } from "../../../util/predicate"; +import { WorkflowStatusService } from "../../../../workspace/service/workflow-status/workflow-status.service"; +import { UserService } from "../../user/user.service"; /** * Service that manages and provides access to computing unit status information diff --git a/frontend/src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service.ts b/frontend/src/app/common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service.ts similarity index 94% rename from frontend/src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service.ts rename to frontend/src/app/common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service.ts index 26be199ebdd..d6b47dd3089 100644 --- a/frontend/src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service.ts +++ b/frontend/src/app/common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service.ts @@ -18,7 +18,7 @@ */ import { Injectable } from "@angular/core"; -import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit } from "../../../type/workflow-computing-unit"; import { Observable, of } from "rxjs"; @Injectable() diff --git a/frontend/src/app/workspace/types/computing-unit-connection.interface.ts b/frontend/src/app/common/type/computing-unit-connection.interface.ts similarity index 100% rename from frontend/src/app/workspace/types/computing-unit-connection.interface.ts rename to frontend/src/app/common/type/computing-unit-connection.interface.ts diff --git a/frontend/src/app/workspace/types/workflow-computing-unit.ts b/frontend/src/app/common/type/workflow-computing-unit.ts similarity index 100% rename from frontend/src/app/workspace/types/workflow-computing-unit.ts rename to frontend/src/app/common/type/workflow-computing-unit.ts diff --git a/frontend/src/app/common/util/computing-unit.util.ts b/frontend/src/app/common/util/computing-unit.util.ts index 3edc0c56389..9f3890594a4 100644 --- a/frontend/src/app/common/util/computing-unit.util.ts +++ b/frontend/src/app/common/util/computing-unit.util.ts @@ -19,7 +19,7 @@ import { Component, inject } from "@angular/core"; import { NZ_MODAL_DATA } from "ng-zorro-antd/modal"; -import { DashboardWorkflowComputingUnit } from "../../workspace/types/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit } from "../type/workflow-computing-unit"; @Component({ template: ` diff --git a/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit-list-item/user-computing-unit-list-item.component.ts b/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit-list-item/user-computing-unit-list-item.component.ts index 46ba5dc0850..54c1967c46c 100644 --- a/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit-list-item/user-computing-unit-list-item.component.ts +++ b/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit-list-item/user-computing-unit-list-item.component.ts @@ -27,7 +27,7 @@ import { ViewChild, ElementRef, } from "@angular/core"; -import { ComputingUnitStatusService } from "../../../../../workspace/service/computing-unit-status/computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; import { extractErrorMessage } from "../../../../../common/util/error"; import { NotificationService } from "../../../../../common/service/notification/notification.service"; import { NzModalService } from "ng-zorro-antd/modal"; @@ -35,8 +35,8 @@ import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; import { DashboardWorkflowComputingUnit, WorkflowComputingUnit, -} from "../../../../../workspace/types/workflow-computing-unit"; -import { WorkflowComputingUnitManagingService } from "../../../../../workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service"; +} from "../../../../../common/type/workflow-computing-unit"; +import { WorkflowComputingUnitManagingService } from "../../../../../common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service"; import { ComputingUnitMetadataComponent, parseResourceUnit, @@ -53,7 +53,7 @@ import { getComputingUnitCpuLimitUnit, } from "../../../../../common/util/computing-unit.util"; import { GuiConfigService } from "../../../../../common/service/gui-config.service"; -import { ComputingUnitActionsService } from "../../../../service/user/computing-unit-actions/computing-unit-actions.service"; +import { ComputingUnitActionsService } from "../../../../../common/service/computing-unit/computing-unit-actions/computing-unit-actions.service"; @UntilDestroy() @Component({ diff --git a/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.spec.ts b/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.spec.ts index 53b6ecca1c3..f88f07a6a01 100644 --- a/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.spec.ts +++ b/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.spec.ts @@ -25,9 +25,9 @@ import { HttpClient } from "@angular/common/http"; import { UserService } from "../../../../common/service/user/user.service"; import { StubUserService } from "../../../../common/service/user/stub-user.service"; import { commonTestProviders } from "../../../../common/testing/test-utils"; -import { WorkflowComputingUnitManagingService } from "../../../../workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service"; -import { ComputingUnitStatusService } from "../../../../workspace/service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../../../workspace/service/computing-unit-status/mock-computing-unit-status.service"; +import { WorkflowComputingUnitManagingService } from "../../../../common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service"; +import { ComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; describe("UserComputingUnitComponent", () => { let component: UserComputingUnitComponent; diff --git a/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.ts b/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.ts index d96f33ca414..9e5ef31dd35 100644 --- a/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.ts +++ b/frontend/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.ts @@ -18,18 +18,18 @@ */ import { Component, Input, OnInit } from "@angular/core"; -import { ComputingUnitStatusService } from "../../../../workspace/service/computing-unit-status/computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; import { DashboardEntry } from "../../../type/dashboard-entry"; import { DashboardWorkflowComputingUnit, WorkflowComputingUnitType, -} from "../../../../workspace/types/workflow-computing-unit"; +} from "../../../../common/type/workflow-computing-unit"; import { extractErrorMessage } from "../../../../common/util/error"; import { NotificationService } from "../../../../common/service/notification/notification.service"; import { NzModalService } from "ng-zorro-antd/modal"; import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; import { UserService } from "../../../../common/service/user/user.service"; -import { WorkflowComputingUnitManagingService } from "../../../../workspace/service/workflow-computing-unit/workflow-computing-unit-managing.service"; +import { WorkflowComputingUnitManagingService } from "../../../../common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service"; import { parseResourceUnit, parseResourceNumber, @@ -38,7 +38,7 @@ import { isComputingUnitShmTooLarge, getJvmMemorySliderConfig, } from "../../../../common/util/computing-unit.util"; -import { ComputingUnitActionsService } from "../../../service/user/computing-unit-actions/computing-unit-actions.service"; +import { ComputingUnitActionsService } from "../../../../common/service/computing-unit/computing-unit-actions/computing-unit-actions.service"; @UntilDestroy() @Component({ diff --git a/frontend/src/app/dashboard/service/user/download/download.service.ts b/frontend/src/app/dashboard/service/user/download/download.service.ts index 53333e744d5..0e202e0c26c 100644 --- a/frontend/src/app/dashboard/service/user/download/download.service.ts +++ b/frontend/src/app/dashboard/service/user/download/download.service.ts @@ -28,7 +28,7 @@ import * as JSZip from "jszip"; import { Workflow } from "../../../../common/type/workflow"; import { HttpClient, HttpResponse } from "@angular/common/http"; import { WORKFLOW_EXECUTIONS_API_BASE_URL } from "../workflow-executions/workflow-executions.service"; -import { DashboardWorkflowComputingUnit } from "../../../../workspace/types/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit } from "../../../../common/type/workflow-computing-unit"; import { TOKEN_KEY } from "../../../../common/service/user/auth.service"; var contentDisposition = require("content-disposition"); diff --git a/frontend/src/app/dashboard/type/dashboard-entry.ts b/frontend/src/app/dashboard/type/dashboard-entry.ts index 735249d64c8..b2949b080df 100644 --- a/frontend/src/app/dashboard/type/dashboard-entry.ts +++ b/frontend/src/app/dashboard/type/dashboard-entry.ts @@ -21,7 +21,7 @@ import { DashboardFile } from "./dashboard-file.interface"; import { DashboardWorkflow } from "./dashboard-workflow.interface"; import { DashboardProject } from "./dashboard-project.interface"; import { DashboardDataset } from "./dashboard-dataset.interface"; -import { DashboardWorkflowComputingUnit } from "../../workspace/types/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit } from "../../common/type/workflow-computing-unit"; import { isDashboardDataset, isDashboardFile, diff --git a/frontend/src/app/dashboard/type/type-predicates.ts b/frontend/src/app/dashboard/type/type-predicates.ts index 0ed825feb49..ae4217d79e9 100644 --- a/frontend/src/app/dashboard/type/type-predicates.ts +++ b/frontend/src/app/dashboard/type/type-predicates.ts @@ -21,7 +21,7 @@ import { DashboardWorkflow } from "./dashboard-workflow.interface"; import { DashboardProject } from "./dashboard-project.interface"; import { DashboardFile } from "./dashboard-file.interface"; import { DashboardDataset } from "./dashboard-dataset.interface"; -import { DashboardWorkflowComputingUnit } from "../../workspace/types/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit } from "../../common/type/workflow-computing-unit"; export function isDashboardWorkflow(value: any): value is DashboardWorkflow { return value && typeof value.workflow === "object"; diff --git a/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts b/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts index 1dd517ddf4d..f9b7eb0ba7a 100644 --- a/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts +++ b/frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts @@ -25,8 +25,8 @@ import { FormlyModule } from "@ngx-formly/core"; import { TEXERA_FORMLY_CONFIG } from "../../../../common/formly/formly-config"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { TimeTravelComponent } from "./time-travel.component"; -import { ComputingUnitStatusService } from "../../../service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../../service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../../common/testing/test-utils"; describe("VersionsListDisplayComponent", () => { diff --git a/frontend/src/app/workspace/component/menu/menu.component.ts b/frontend/src/app/workspace/component/menu/menu.component.ts index 2a13a286139..492b315cfb3 100644 --- a/frontend/src/app/workspace/component/menu/menu.component.ts +++ b/frontend/src/app/workspace/component/menu/menu.component.ts @@ -51,11 +51,11 @@ import { ReportGenerationService } from "../../service/report-generation/report- import { ShareAccessComponent } from "src/app/dashboard/component/user/share-access/share-access.component"; import { PanelService } from "../../service/panel/panel.service"; import { DASHBOARD_USER_WORKFLOW } from "../../../app-routing.constant"; -import { ComputingUnitStatusService } from "../../service/computing-unit-status/computing-unit-status.service"; -import { ComputingUnitState } from "../../types/computing-unit-connection.interface"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { ComputingUnitState } from "../../../common/type/computing-unit-connection.interface"; import { ComputingUnitSelectionComponent } from "../power-button/computing-unit-selection.component"; import { GuiConfigService } from "../../../common/service/gui-config.service"; -import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit } from "../../../common/type/workflow-computing-unit"; import { Privilege } from "../../../dashboard/type/share-access.interface"; import { MarkdownDescriptionComponent } from "../../../dashboard/component/user/markdown-description/markdown-description.component"; diff --git a/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts index 47567edb284..0b22b720652 100644 --- a/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts +++ b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts @@ -26,8 +26,8 @@ import { NzIconModule } from "ng-zorro-antd/icon"; import { ActivatedRoute, ActivatedRouteSnapshot, convertToParamMap, Data, Params, UrlSegment } from "@angular/router"; import { NzDropDownModule } from "ng-zorro-antd/dropdown"; import { NzModalModule, NzModalService } from "ng-zorro-antd/modal"; -import { ComputingUnitStatusService } from "../../service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../common/testing/test-utils"; describe("PowerButtonComponent", () => { diff --git a/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts index c868cac284e..b6323dd4869 100644 --- a/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts +++ b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts @@ -19,21 +19,21 @@ import { ChangeDetectorRef, Component, OnInit } from "@angular/core"; import { take } from "rxjs/operators"; -import { WorkflowComputingUnitManagingService } from "../../service/workflow-computing-unit/workflow-computing-unit-managing.service"; -import { DashboardWorkflowComputingUnit, WorkflowComputingUnitType } from "../../types/workflow-computing-unit"; +import { WorkflowComputingUnitManagingService } from "../../../common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service"; +import { DashboardWorkflowComputingUnit, WorkflowComputingUnitType } from "../../../common/type/workflow-computing-unit"; import { NotificationService } from "../../../common/service/notification/notification.service"; import { DEFAULT_WORKFLOW, WorkflowActionService } from "../../service/workflow-graph/model/workflow-action.service"; import { isDefined } from "../../../common/util/predicate"; import { UntilDestroy, untilDestroyed } from "@ngneat/until-destroy"; import { extractErrorMessage } from "../../../common/util/error"; -import { ComputingUnitStatusService } from "../../service/computing-unit-status/computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; import { NzModalService } from "ng-zorro-antd/modal"; import { WorkflowExecutionsService } from "../../../dashboard/service/user/workflow-executions/workflow-executions.service"; import { WorkflowExecutionsEntry } from "../../../dashboard/type/workflow-executions-entry"; import { ExecutionState } from "../../types/execute-workflow.interface"; import { ShareAccessComponent } from "../../../dashboard/component/user/share-access/share-access.component"; import { GuiConfigService } from "../../../common/service/gui-config.service"; -import { ComputingUnitActionsService } from "../../../dashboard/service/user/computing-unit-actions/computing-unit-actions.service"; +import { ComputingUnitActionsService } from "../../../common/service/computing-unit/computing-unit-actions/computing-unit-actions.service"; import { ComputingUnitMetadataComponent, parseResourceUnit, diff --git a/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts b/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts index 01ffc78e2d2..16d6a1c3f13 100644 --- a/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts +++ b/frontend/src/app/workspace/component/property-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts @@ -47,8 +47,8 @@ import { cloneDeep } from "lodash-es"; import Ajv from "ajv"; import { COLLAB_DEBOUNCE_TIME_MS } from "../../../../common/formly/collab-wrapper/collab-wrapper/collab-wrapper.component"; import { FormlyNgZorroAntdModule } from "@ngx-formly/ng-zorro-antd"; -import { ComputingUnitStatusService } from "../../../service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../../service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../../common/testing/test-utils"; const { marbles } = configure({ run: false }); diff --git a/frontend/src/app/workspace/component/property-editor/property-editor.component.spec.ts b/frontend/src/app/workspace/component/property-editor/property-editor.component.spec.ts index f2a9a414aa0..04032f619b7 100644 --- a/frontend/src/app/workspace/component/property-editor/property-editor.component.spec.ts +++ b/frontend/src/app/workspace/component/property-editor/property-editor.component.spec.ts @@ -29,8 +29,8 @@ import { OperatorPropertyEditFrameComponent } from "./operator-property-edit-fra import { HttpClientTestingModule } from "@angular/common/http/testing"; import { OperatorMetadataService } from "../../service/operator-metadata/operator-metadata.service"; import { StubOperatorMetadataService } from "../../service/operator-metadata/stub-operator-metadata.service"; -import { ComputingUnitStatusService } from "../../service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../common/testing/test-utils"; describe("PropertyEditorComponent", () => { diff --git a/frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts b/frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts index 2f75c8788f1..36ce3b10421 100644 --- a/frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts +++ b/frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts @@ -28,8 +28,8 @@ import { DatasetService } from "../../../dashboard/service/user/dataset/dataset. import { NZ_MODAL_DATA, NzModalRef, NzModalService } from "ng-zorro-antd/modal"; import { WorkflowActionService } from "../../service/workflow-graph/model/workflow-action.service"; import { WorkflowResultService } from "../../service/workflow-result/workflow-result.service"; -import { ComputingUnitStatusService } from "../../service/computing-unit-status/computing-unit-status.service"; -import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { DashboardWorkflowComputingUnit } from "../../../common/type/workflow-computing-unit"; import { UserDatasetVersionCreatorComponent } from "../../../dashboard/component/user/user-dataset/user-dataset-explorer/user-dataset-version-creator/user-dataset-version-creator.component"; @UntilDestroy() diff --git a/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts b/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts index e16a737d9fb..72363eeaaae 100644 --- a/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts +++ b/frontend/src/app/workspace/component/result-panel/console-frame/console-frame.component.spec.ts @@ -24,8 +24,8 @@ import { OperatorMetadataService } from "../../../service/operator-metadata/oper import { StubOperatorMetadataService } from "../../../service/operator-metadata/stub-operator-metadata.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { NzDropDownModule } from "ng-zorro-antd/dropdown"; -import { ComputingUnitStatusService } from "../../../service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../../service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../../common/testing/test-utils"; describe("ConsoleFrameComponent", () => { diff --git a/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts b/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts index 3499d0c22cd..b85ff8722b4 100644 --- a/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts +++ b/frontend/src/app/workspace/component/result-panel/error-frame/error-frame.component.spec.ts @@ -24,8 +24,8 @@ import { OperatorMetadataService } from "../../../service/operator-metadata/oper import { StubOperatorMetadataService } from "../../../service/operator-metadata/stub-operator-metadata.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { NzDropDownModule } from "ng-zorro-antd/dropdown"; -import { ComputingUnitStatusService } from "src/app/workspace/service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "src/app/workspace/service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../../common/testing/test-utils"; describe("ConsoleFrameComponent", () => { diff --git a/frontend/src/app/workspace/component/result-panel/result-panel.component.spec.ts b/frontend/src/app/workspace/component/result-panel/result-panel.component.spec.ts index e2ffd9dffe3..18487a265b9 100644 --- a/frontend/src/app/workspace/component/result-panel/result-panel.component.spec.ts +++ b/frontend/src/app/workspace/component/result-panel/result-panel.component.spec.ts @@ -29,8 +29,8 @@ import { HttpClientTestingModule } from "@angular/common/http/testing"; import { NzModalModule } from "ng-zorro-antd/modal"; import { ExecutionState } from "../../types/execute-workflow.interface"; import { mockPoint, mockResultPredicate } from "../../service/workflow-graph/model/mock-workflow-data"; -import { ComputingUnitStatusService } from "../../service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../common/testing/test-utils"; describe("ResultPanelComponent", () => { diff --git a/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts index 161d217fd86..289facbbd6f 100644 --- a/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts +++ b/frontend/src/app/workspace/component/workflow-editor/workflow-editor.component.spec.ts @@ -56,8 +56,8 @@ import { RouterTestingModule } from "@angular/router/testing"; import { createYTypeFromObject } from "../../types/shared-editing.interface"; import * as jQuery from "jquery"; import { ContextMenuComponent } from "./context-menu/context-menu/context-menu.component"; -import { ComputingUnitStatusService } from "../../service/computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../../service/computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../common/testing/test-utils"; describe("WorkflowEditorComponent", () => { diff --git a/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts index 469d19c610a..90848cc17bc 100644 --- a/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts +++ b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.spec.ts @@ -35,12 +35,12 @@ import { WorkflowUtilService } from "../workflow-graph/util/workflow-util.servic import { WorkflowSnapshotService } from "../../../dashboard/service/user/workflow-snapshot/workflow-snapshot.service"; import { DOCUMENT } from "@angular/common"; import { WorkflowSettings } from "src/app/common/type/workflow"; -import { ComputingUnitStatusService } from "../computing-unit-status/computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; import { AuthService } from "src/app/common/service/user/auth.service"; import { StubAuthService } from "src/app/common/service/user/stub-auth.service"; import { UserService } from "src/app/common/service/user/user.service"; import { StubUserService } from "src/app/common/service/user/stub-user.service"; -import { MockComputingUnitStatusService } from "../computing-unit-status/mock-computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../common/testing/test-utils"; class StubHttpClient { diff --git a/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.ts b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.ts index cbddc01a660..4c2eb0ebbcd 100644 --- a/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.ts +++ b/frontend/src/app/workspace/service/execute-workflow/execute-workflow.service.ts @@ -47,7 +47,7 @@ import { WorkflowStatusService } from "../workflow-status/workflow-status.servic import { intersection } from "../../../common/util/set"; import { WorkflowSettings } from "../../../common/type/workflow"; import { DOCUMENT } from "@angular/common"; -import { ComputingUnitStatusService } from "../computing-unit-status/computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; // TODO: change this declaration export const FORM_DEBOUNCE_TIME_MS = 150; diff --git a/frontend/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts b/frontend/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts index c791c6fb71e..8b4f3c9b5aa 100644 --- a/frontend/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts +++ b/frontend/src/app/workspace/service/operator-menu/operator-menu.service.spec.ts @@ -23,8 +23,8 @@ import { StubOperatorMetadataService } from "../operator-metadata/stub-operator- import { OperatorMenuService } from "./operator-menu.service"; import { HttpClientModule } from "@angular/common/http"; -import { ComputingUnitStatusService } from "../computing-unit-status/computing-unit-status.service"; -import { MockComputingUnitStatusService } from "../computing-unit-status/mock-computing-unit-status.service"; +import { ComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/computing-unit-status.service"; +import { MockComputingUnitStatusService } from "../../../common/service/computing-unit/computing-unit-status/mock-computing-unit-status.service"; import { commonTestProviders } from "../../../common/testing/test-utils"; describe("OperatorMenuService", () => { diff --git a/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts b/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts index 3fde39774f5..ce3a6db6d91 100644 --- a/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts +++ b/frontend/src/app/workspace/service/workflow-result-export/workflow-result-export.service.ts @@ -28,7 +28,7 @@ import { catchError, filter, map, take } from "rxjs/operators"; import { WorkflowResultService } from "../workflow-result/workflow-result.service"; import { DownloadService, ExportWorkflowJsonResponse } from "../../../dashboard/service/user/download/download.service"; import { HttpResponse } from "@angular/common/http"; -import { DashboardWorkflowComputingUnit } from "../../types/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit } from "../../../common/type/workflow-computing-unit"; import { GuiConfigService } from "../../../common/service/gui-config.service"; /** From 3adf13a786948004be77070b430b5a537febc781 Mon Sep 17 00:00:00 2001 From: Grace Chia Date: Fri, 10 Apr 2026 17:29:17 -0700 Subject: [PATCH 2/2] style: add prettier formatting --- .../computing-unit-actions/computing-unit-actions.service.ts | 5 +---- .../power-button/computing-unit-selection.component.ts | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/common/service/computing-unit/computing-unit-actions/computing-unit-actions.service.ts b/frontend/src/app/common/service/computing-unit/computing-unit-actions/computing-unit-actions.service.ts index 756b8b6b41d..c047498e435 100644 --- a/frontend/src/app/common/service/computing-unit/computing-unit-actions/computing-unit-actions.service.ts +++ b/frontend/src/app/common/service/computing-unit/computing-unit-actions/computing-unit-actions.service.ts @@ -22,10 +22,7 @@ import { Observable } from "rxjs"; import { NzModalService } from "ng-zorro-antd/modal"; import { ShareAccessComponent } from "../../../../dashboard/component/user/share-access/share-access.component"; import { WorkflowComputingUnitManagingService } from "../computing-unit-managing/workflow-computing-unit-managing.service"; -import { - DashboardWorkflowComputingUnit, - WorkflowComputingUnitType, -} from "../../../type/workflow-computing-unit"; +import { DashboardWorkflowComputingUnit, WorkflowComputingUnitType } from "../../../type/workflow-computing-unit"; import { NotificationService } from "../../notification/notification.service"; import { unitTypeMessageTemplate } from "../../../util/computing-unit.util"; import { ComputingUnitStatusService } from "../computing-unit-status/computing-unit-status.service"; diff --git a/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts index b6323dd4869..bd6cfda7d73 100644 --- a/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts +++ b/frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts @@ -20,7 +20,10 @@ import { ChangeDetectorRef, Component, OnInit } from "@angular/core"; import { take } from "rxjs/operators"; import { WorkflowComputingUnitManagingService } from "../../../common/service/computing-unit/computing-unit-managing/workflow-computing-unit-managing.service"; -import { DashboardWorkflowComputingUnit, WorkflowComputingUnitType } from "../../../common/type/workflow-computing-unit"; +import { + DashboardWorkflowComputingUnit, + WorkflowComputingUnitType, +} from "../../../common/type/workflow-computing-unit"; import { NotificationService } from "../../../common/service/notification/notification.service"; import { DEFAULT_WORKFLOW, WorkflowActionService } from "../../service/workflow-graph/model/workflow-action.service"; import { isDefined } from "../../../common/util/predicate";