move "workflowUserAccess" from DashboardResource.scala to WorkflowRes…

…ource
Texera · Jan 10, 2025 · 7873603 · 7873603
1 parent fa71a10
commit 7873603
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DashboardResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/DashboardResource.scala
@@ -202,19 +202,4 @@ class DashboardResource {
 
     userIdToInfoMap
   }
-
-  // todo: move this function to WorkflowResource.scala
-  @GET
-  @Path("/workflowUserAccess")
-  def workflowUserAccess(
-      @QueryParam("wid") wid: UInteger
-  ): util.List[UInteger] = {
-    val records = context
-      .select(WORKFLOW_USER_ACCESS.UID)
-      .from(WORKFLOW_USER_ACCESS)
-      .where(WORKFLOW_USER_ACCESS.WID.eq(wid))
-      .fetch()
-
-    records.getValues(WORKFLOW_USER_ACCESS.UID)
-  }
 }
diff --git a/...main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala b/...main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala
@@ -15,6 +15,7 @@ import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{
   WorkflowUserAccessDao
 }
 import edu.uci.ics.texera.dao.jooq.generated.tables.pojos._
+import edu.uci.ics.texera.web.resource.dashboard.SearchQueryBuilder.context
 import edu.uci.ics.texera.web.resource.dashboard.hub.workflow.HubWorkflowResource.recordUserActivity
 import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowAccessResource.hasReadAccess
 import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowResource._
@@ -590,4 +591,18 @@ class WorkflowResource extends LazyLogging {
       "Private"
     }
   }
+
+  @GET
+  @Path("/workflowUserAccess")
+  def workflowUserAccess(
+      @QueryParam("wid") wid: UInteger
+  ): util.List[UInteger] = {
+    val records = context
+      .select(WORKFLOW_USER_ACCESS.UID)
+      .from(WORKFLOW_USER_ACCESS)
+      .where(WORKFLOW_USER_ACCESS.WID.eq(wid))
+      .fetch()
+
+    records.getValues(WORKFLOW_USER_ACCESS.UID)
+  }
 }
diff --git a/core/gui/src/app/common/service/workflow-persist/workflow-persist.service.ts b/core/gui/src/app/common/service/workflow-persist/workflow-persist.service.ts
@@ -20,6 +20,7 @@ export const WORKFLOW_UPDATENAME_URL = WORKFLOW_BASE_URL + "/update/name";
 export const WORKFLOW_UPDATEDESCRIPTION_URL = WORKFLOW_BASE_URL + "/update/description";
 export const WORKFLOW_OWNER_URL = WORKFLOW_BASE_URL + "/user-workflow-owners";
 export const WORKFLOW_ID_URL = WORKFLOW_BASE_URL + "/user-workflow-ids";
+export const WORKFLOW_GET_OWNERS_URL = WORKFLOW_BASE_URL + "/workflowUserAccess";
 
 export const DEFAULT_WORKFLOW_NAME = "Untitled workflow";
 export const WORKFLOW_PUBLIC_URL = WORKFLOW_BASE_URL + "/public";
@@ -204,4 +205,8 @@ export class WorkflowPersistService {
   public retrieveWorkflowIDs(): Observable<number[]> {
     return this.http.get<number[]>(`${AppSettings.getApiEndpoint()}/${WORKFLOW_ID_URL}`);
   }
+
+  public getWorkflowOwners(wid: number): Observable<number[]> {
+    return this.http.get<number[]>(`${AppSettings.getApiEndpoint()}/${WORKFLOW_GET_OWNERS_URL}?wid=${wid}`);
+  }
 }
diff --git a/core/gui/src/app/dashboard/component/user/list-item/list-item.component.ts b/core/gui/src/app/dashboard/component/user/list-item/list-item.component.ts
@@ -19,7 +19,6 @@ import {
   WorkflowPersistService,
 } from "src/app/common/service/workflow-persist/workflow-persist.service";
 import { firstValueFrom } from "rxjs";
-import { SearchService } from "../../../service/user/search.service";
 import { HubWorkflowDetailComponent } from "../../../../hub/component/workflow/detail/hub-workflow-detail.component";
 import { HubWorkflowService } from "../../../../hub/service/workflow/hub-workflow.service";
 import { DownloadService } from "src/app/dashboard/service/user/download/download.service";
@@ -77,7 +76,6 @@ export class ListItemComponent implements OnInit, OnChanges {
   refresh = new EventEmitter<void>();
 
   constructor(
-    private searchService: SearchService,
     private modalService: NzModalService,
     private workflowPersistService: WorkflowPersistService,
     private datasetService: DatasetService,
@@ -92,7 +90,7 @@ export class ListItemComponent implements OnInit, OnChanges {
     if (this.entry.type === "workflow") {
       if (typeof this.entry.id === "number") {
         this.disableDelete = !this.entry.workflow.isOwner;
-        this.searchService
+        this.workflowPersistService
           .getWorkflowOwners(this.entry.id)
           .pipe(untilDestroyed(this))
           .subscribe((data: number[]) => {

diff --git a/core/gui/src/app/dashboard/service/user/search.service.ts b/core/gui/src/app/dashboard/service/user/search.service.ts
@@ -10,7 +10,6 @@ import { UserInfo } from "../../type/dashboard-entry";
 const DASHBOARD_SEARCH_URL = "dashboard/search";
 const DASHBOARD_PUBLIC_SEARCH_URL = "dashboard/publicSearch";
 const DASHBOARD_USER_INFO_URL = "dashboard/resultsOwnersInfo";
-const DASHBOARD_GET_OWNERS_URL = "dashboard/workflowUserAccess";
 
 @Injectable({
   providedIn: "root",
@@ -62,8 +61,4 @@ export class SearchService {
       `${AppSettings.getApiEndpoint()}/${DASHBOARD_USER_INFO_URL}?${queryString}`
     );
   }
-
-  public getWorkflowOwners(wid: number): Observable<number[]> {
-    return this.http.get<number[]>(`${AppSettings.getApiEndpoint()}/${DASHBOARD_GET_OWNERS_URL}?wid=${wid}`);
-  }
 }