Merge branch 'feat/restrict-ml-processing-jobs' of https://github.com/RolnickLab/antenna into feat/restrict-ml-processing-jobs

Author: mohamedelabbas1996

ui/src/data-services/models/capture-details.ts

@@ -1,3 +1,4 @@
+import { UserPermission } from 'utils/user/types'
 import { Capture, ServerCapture } from './capture'
 import { Job } from './job'
 
@@ -69,4 +70,8 @@ export class CaptureDetails extends Capture {
   get url(): string {
     return this._capture.url
   }
+
+  get userPermissions(): UserPermission[] {
+    return this._capture.user_permissions
+  }
 }

ui/src/data-services/models/job.ts

@@ -45,7 +45,7 @@ export class Job {
 
   get canCancel(): boolean {
     return (
-      this._job.user_permissions.includes(UserPermission.Cancel) &&
+      this._job.user_permissions.includes(UserPermission.Run) &&
       (this.status.code === 'STARTED' || this.status.code === 'PENDING')
     )
   }
@@ -63,7 +63,7 @@ export class Job {
 
   get canRetry(): boolean {
     return (
-      this._job.user_permissions.includes(UserPermission.Retry) &&
+      this._job.user_permissions.includes(UserPermission.Run) &&
       this.status.code !== 'CREATED' &&
       this.status.code !== 'STARTED' &&
       this.status.code !== 'PENDING'

ui/src/pages/session-details/playback/capture-details/capture-job/process-now.tsx

@@ -1,11 +1,11 @@
 import { useCreateJob } from 'data-services/hooks/jobs/useCreateJob'
-import { useProjectDetails } from 'data-services/hooks/projects/useProjectDetails'
 import { CaptureDetails } from 'data-services/models/capture-details'
 import { Tooltip } from 'design-system/components/tooltip/tooltip'
 import { CheckIcon, Loader2Icon } from 'lucide-react'
 import { Button } from 'nova-ui-kit'
 import { useParams } from 'react-router-dom'
 import { STRING, translate } from 'utils/language'
+import { UserPermission } from 'utils/user/types'
 
 export const ProcessNow = ({
   capture,
@@ -15,14 +15,16 @@ export const ProcessNow = ({
   pipelineId?: string
 }) => {
   const { projectId } = useParams()
-  const { project } = useProjectDetails(projectId as string, true)
   const { createJob, isLoading, isSuccess } = useCreateJob()
+  const canProcess = capture?.userPermissions.includes(
+    UserPermission.RunSingleImage
+  )
   const disabled =
-    !capture || capture.hasJobInProgress || !pipelineId || !project?.canUpdate
+    !capture || capture.hasJobInProgress || !pipelineId || !canProcess
 
   // @TODO: hasJobInProgress, replace with if pipeline is healthy/available
 
-  const tooltipContent = project?.canUpdate
+  const tooltipContent = canProcess
     ? translate(STRING.MESSAGE_PROCESS_NOW_TOOLTIP)
     : translate(STRING.MESSAGE_PERMISSIONS_MISSING)
 

ui/src/utils/user/types.ts

@@ -11,14 +11,13 @@ export type UserInfo = {
 }
 
 export enum UserPermission {
-  Cancel = 'cancel', // Custom job permission
   Create = 'create',
   Delete = 'delete',
   Populate = 'populate', // Custom collection permission
-  Retry = 'retry', // Custom job permission
   Run = 'run', // Custom job permission
+  RunSingleImage = 'run_single_image', // Custom job permission
   Star = 'star',
-  Update = 'update', // Custom capture permission
+  Update = 'update',
 }
 
 export interface UserContextValues {