Skip to content

refactor: move shared computing unit types and services #4358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gracecluvohio wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: move shared computing unit types and services #4358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81d7dfd
refactor: move shared computing unit types and services
gracecluvohio Apr 10, 2026
a180dee
Merge branch 'main' into reorganize-computing-unit-services
chenlica Apr 10, 2026
3adf13a
style: add prettier formatting
gracecluvohio Apr 11, 2026
c2f7a8e
Merge branch 'main' into reorganize-computing-unit-services
kunwp1 Apr 11, 2026
fd431b2
Merge branch 'main' into reorganize-computing-unit-services
chenlica Apr 11, 2026
aa111cc
Merge branch 'main' into reorganize-computing-unit-services
chenlica Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions ...actions/computing-unit-actions.service.ts → ...actions/computing-unit-actions.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,13 @@
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 {
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";
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 { 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;
Expand Down
4 changes: 2 additions & 2 deletions ...rkflow-computing-unit-managing.service.ts → ...rkflow-computing-unit-managing.service.ts
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@kunwp1 kunwp1 Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.../workspace/service/workflow-computing-unit .../common/service/computing-unit/computing-unit-managing

Is there a reason you changed the folder name from workflow-computing-unit to computing-unit-managing?

Copy link
Copy Markdown
Contributor Author

@gracecluvohio gracecluvohio Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just because it's no longer just for workflow, it's also for dashboard. Should I change the name of the file and the component as well?

Copy link
Copy Markdown
Contributor

@kunwp1 kunwp1 Apr 11, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's wait for @bobbai00's input as he is familiar with these codes.

Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
14 changes: 7 additions & 7 deletions ...t-status/computing-unit-status.service.ts → ...t-status/computing-unit-status.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...tus/mock-computing-unit-status.service.ts → ...tus/mock-computing-unit-status.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
0 ...es/computing-unit-connection.interface.ts → ...pe/computing-unit-connection.interface.ts
View file
Open in desktop
File renamed without changes.
0 ...orkspace/types/workflow-computing-unit.ts → ...pp/common/type/workflow-computing-unit.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion frontend/src/app/common/util/computing-unit.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: `
Expand Down
8 changes: 4 additions & 4 deletions ...r-computing-unit/user-computing-unit-list-item/user-computing-unit-list-item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ 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";
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,
Expand All @@ -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({
Expand Down
6 changes: 3 additions & 3 deletions ...rc/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...end/src/app/dashboard/component/user/user-computing-unit/user-computing-unit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/dashboard/service/user/download/download.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/dashboard/type/dashboard-entry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/dashboard/type/type-predicates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/workspace/component/left-panel/time-travel/time-travel.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/workspace/component/menu/menu.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/workspace/component/power-button/computing-unit-selection.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
11 changes: 7 additions & 4 deletions frontend/src/app/workspace/component/power-button/computing-unit-selection.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,24 @@

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,
Expand Down
4 changes: 2 additions & 2 deletions ...operty-editor/operator-property-edit-frame/operator-property-edit-frame.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/workspace/component/property-editor/property-editor.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/workspace/component/result-exportation/result-exportation.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading
Loading