feat: TT-138 add scopes (#221)

* feat(permision): add user permissions to the application

* feat(scopes): add ceatedBy with task cancellability condition

* fix(scopes): New task disabled if no access

* fix(scopes): remove package manager line

* fix(scopes): quick fixed

* fix(refactor): change userScope functions

Author: safeamiiir

aqueductcore/frontend/src/API/graphql/queries/tasks/getAllTasks.tsx

@@ -14,8 +14,8 @@ export const GET_ALL_TASKS = gql`
         stdOut
         stdErr
         taskId
+        createdBy
         experiment {
-          createdBy
           uuid  
           title
           eid

aqueductcore/frontend/src/API/graphql/queries/tasks/getTask.tsx

@@ -14,8 +14,8 @@ export const GET_TASK = gql`
         stdOut
         stdErr
         taskId
+        createdBy
         experiment {
-          createdBy
           uuid  
           title
           eid

aqueductcore/frontend/src/__mocks__/TasksDataMock.ts

@@ -7,7 +7,7 @@ export const TasksDataMock: TaskType[] = [
         "extensionName": "Mock extension name-0",
         "actionName": "Mock action name-0",
         "taskStatus": TaskStatus.Failure,
-        // "username": "Tom-0",
+        "createdBy": "Tom-0",
         "receivedAt": "2023-12-01T23:59:00.000999",
         "resultCode": 1,
         "stdOut": "Some text 2",
@@ -23,7 +23,7 @@ export const TasksDataMock: TaskType[] = [
         "extensionName": "Mock extension name-0",
         "actionName": "Mock action name-1",
         "taskStatus": TaskStatus.Pending,
-        // "username": "Tom-0",
+        "createdBy": "Tom-0",
         "receivedAt": "2023-12-02T23:59:01.000999",
         "resultCode": null,
         "stdOut": null,
@@ -39,7 +39,7 @@ export const TasksDataMock: TaskType[] = [
         "extensionName": "Mock extension name-0",
         "actionName": "Mock action name-2",
         "taskStatus": TaskStatus.Received,
-        // "username": "Tom-0",
+        "createdBy": "Tom-0",
         "receivedAt": "2023-12-03T23:59:02.000999",
         "resultCode": null,
         "stdOut": null,

aqueductcore/frontend/src/__mocks__/mutations/extension/cancelTask.tsx

@@ -14,7 +14,9 @@ export const cancelTask_mock = {
             result: {
                 data: {
                     "cancelTask": {
-                        "resultCode": TaskStatus.Revoked,
+                        "taskId": "id-0",
+                        "taskStatus": TaskStatus.Revoked,
+                        "resultCode": 0,
                         "__typename": "CancelTaskResult"
                     }
                 }
@@ -30,7 +32,9 @@ export const cancelTask_mock = {
             result: {
                 data: {
                     "cancelTask": {
-                        "resultCode": TaskStatus.Revoked,
+                        "taskId": "id-1",
+                        "taskStatus": TaskStatus.Revoked,
+                        "resultCode": 0,
                         "__typename": "CancelTaskResult"
                     }
                 }

aqueductcore/frontend/src/__tests__/Extensions.test.tsx

@@ -28,8 +28,8 @@ test("render page extensions with no error", async () => {
 });
 
 test("list of extension in the dropdown when clicked", async () => {
-    const { findByTitle, findByText } = render(<ExtensionIncludedComponent />)
-    const extensionOpenModalButton = await findByTitle("extensions")
+    const { findByText } = render(<ExtensionIncludedComponent />)
+    const extensionOpenModalButton = await findByText("New Task")
     await userEvent.click(extensionOpenModalButton)
 
     // Check extensions to be listed in the dropdown
@@ -41,8 +41,8 @@ test("list of extension in the dropdown when clicked", async () => {
 
 test("author's name in the modal", async () => {
 
-    const { findByTitle, findByText } = render(<ExtensionIncludedComponent />)
-    const extensionOpenModalButton = await findByTitle("extensions")
+    const { findByText } = render(<ExtensionIncludedComponent />)
+    const extensionOpenModalButton = await findByText("New Task")
     await userEvent.click(extensionOpenModalButton)
 
     const first_extension = await findByText(ExtensionsDataMock[0].name);
@@ -54,8 +54,8 @@ test("author's name in the modal", async () => {
 
 test("list of actions in the extension", async () => {
 
-    const { findByTitle, findByText } = render(<ExtensionIncludedComponent />)
-    const extensionOpenModalButton = await findByTitle("extensions")
+    const { findByText } = render(<ExtensionIncludedComponent />)
+    const extensionOpenModalButton = await findByText("New Task")
     await userEvent.click(extensionOpenModalButton)
 
     const first_extension = await findByText(ExtensionsDataMock[0].name);
@@ -70,8 +70,8 @@ test("list of actions in the extension", async () => {
 
 test("click the other action and params should be updated", async () => {
 
-    const { findByTitle, findByText } = render(<ExtensionIncludedComponent />)
-    const extensionOpenModalButton = await findByTitle("extensions")
+    const { findByText } = render(<ExtensionIncludedComponent />)
+    const extensionOpenModalButton = await findByText("New Task")
     await userEvent.click(extensionOpenModalButton)
 
     const first_extension = await findByText(ExtensionsDataMock[0].name);
@@ -91,8 +91,8 @@ test("click the other action and params should be updated", async () => {
 
 test("data is persistence when switching between functions", async () => {
 
-    const { findByTitle, findByText } = render(<ExtensionIncludedComponent />)
-    const extensionOpenModalButton = await findByTitle("extensions")
+    const { findByText } = render(<ExtensionIncludedComponent />)
+    const extensionOpenModalButton = await findByText("New Task")
     await userEvent.click(extensionOpenModalButton)
 
     const firstActionName = ExtensionsDataMock[0].actions[0].name
@@ -128,7 +128,7 @@ test("data is persistence when switching between functions", async () => {
 test.skip("submit the form and success modal", async () => {
 
     const { findByTitle, findByText } = render(<ExtensionIncludedComponent />)
-    const extensionOpenModalButton = await findByTitle("extensions")
+    const extensionOpenModalButton = await findByText("New Task")
     await userEvent.click(extensionOpenModalButton)
 
     const first_extension = await findByText(ExtensionsDataMock[0].name);

aqueductcore/frontend/src/components/organisms/ExtensionsList/ExtensionsList.test.tsx

@@ -13,12 +13,12 @@ test("renders ExtensionsList", () => {
 });
 
 test("open extension list", async () => {
-    const { getByTitle, findByText } = render(
+    const { getByText, findByText } = render(
         <AppContextAQDMock>
             <ExtensionsList />
         </AppContextAQDMock>);
 
-    const extensions_button = getByTitle('extensions')
+    const extensions_button = getByText('New Task')
     await userEvent.click(extensions_button)
     const extension_1 = await findByText(ExtensionsDataMock[0].name)
     const extension_2 = await findByText(ExtensionsDataMock[1].name)

aqueductcore/frontend/src/components/organisms/ExtensionsList/index.tsx

@@ -6,12 +6,15 @@ import MenuItem from '@mui/material/MenuItem';
 import Popper from '@mui/material/Popper';
 import { useRef, useState } from 'react';
 import Paper from '@mui/material/Paper';
+import { Tooltip } from '@mui/material';
 import Grow from '@mui/material/Grow';
 import toast from 'react-hot-toast';
 
 import { BorderedButtonWithIcon } from 'components/atoms/sharedStyledComponents/BorderedButtonWithIcon';
 import { useGetAllExtensions } from 'API/graphql/queries/extension/getAllExtensions';
+import { useGetCurrentUserInfo } from 'API/graphql/queries/user/getUserInformation';
 import ExtensionModal from 'components/organisms/ExtensionModal';
+import { isUserAbleToCreateTask } from 'helper/auth/userScope';
 
 function ExtensionsList() {
 
@@ -21,6 +24,7 @@ function ExtensionsList() {
     const handleCloseExtensionModal = () => setIsExtensionOpen(false);
     const [open, setOpen] = useState(false);
     const anchorRef = useRef<HTMLDivElement>(null);
+    const { data: userInfo } = useGetCurrentUserInfo()
 
     const { data, error } = useGetAllExtensions()
     const extensions = data?.extensions
@@ -55,26 +59,32 @@ function ExtensionsList() {
         setOpen(false);
     };
 
+    const isTaskExecutable = Boolean(userInfo && isUserAbleToCreateTask(userInfo.getCurrentUserInfo))
+
     return (
         <>
             <div
                 ref={anchorRef}
             >
-                <BorderedButtonWithIcon
-                    size="small"
-                    aria-controls={open ? 'split-button-menu' : undefined}
-                    aria-expanded={open ? 'true' : undefined}
-                    aria-label="select merge strategy"
-                    aria-haspopup="menu"
-                    onClick={handleToggle}
-                    color="neutral"
-                    variant="outlined"
-                    startIcon={<AutoAwesomeIcon />}
-                    endIcon={<ArrowDropDownIcon />}
-                    title='extensions'
-                >
-                    New Job
-                </BorderedButtonWithIcon>
+                <Tooltip title={!isTaskExecutable ? "User has no permission to run a task in this experiment." : "extensions"}>
+                    <span>
+                        <BorderedButtonWithIcon
+                            size="small"
+                            aria-controls={open ? 'split-button-menu' : undefined}
+                            aria-expanded={open ? 'true' : undefined}
+                            aria-label="select merge strategy"
+                            aria-haspopup="menu"
+                            onClick={handleToggle}
+                            color="neutral"
+                            variant="outlined"
+                            startIcon={<AutoAwesomeIcon />}
+                            endIcon={<ArrowDropDownIcon />}
+                            disabled={!isTaskExecutable}
+                        >
+                            New Task
+                        </BorderedButtonWithIcon>
+                    </span>
+                </Tooltip>
             </div>
             {extensions?.length ? <Popper
                 sx={{

aqueductcore/frontend/src/components/organisms/JobDetailsModal/index.tsx

@@ -5,11 +5,13 @@ import { ReactNode, useState } from "react";
 import toast from "react-hot-toast";
 
 import JobExtensionStatus from "components/molecules/JobListTableCells/JobExtensionStatus";
+import { useGetCurrentUserInfo } from "API/graphql/queries/user/getUserInformation";
 import { useCancelTask } from "API/graphql/mutations/extension/cancelTask";
 import ConfirmActionModal from "components/organisms/ConfirmActionModal";
 import ActionParameters from "components/molecules/ActionParameters";
 import { TaskStatus } from "types/graphql/__GENERATED__/graphql";
 import { useGetTask } from "API/graphql/queries/tasks/getTask";
+import { isUserAbleToCancelTask } from "helper/auth/userScope";
 import LogViewer from "components/molecules/LogViewer";
 import { Loading } from "components/atoms/Loading";
 import { dateFormatter } from "helper/formatters";
@@ -143,7 +145,8 @@ function JobDetailsModal({ isOpen, handleClose, taskId }: JobDetailsModalProps)
     const [value, setValue] = useState(0);
     const { mutate: mutateCancelTask, loading: loadingCancelTask } = useCancelTask();
     const [isConfirmationModalOpen, setIsConfirmationModalOpen] = useState<boolean>(false);
-    
+    const { data: userInfo } = useGetCurrentUserInfo()
+
     const closeConfirmationModal = () => {
         setIsConfirmationModalOpen(false);
     }
@@ -173,6 +176,8 @@ function JobDetailsModal({ isOpen, handleClose, taskId }: JobDetailsModalProps)
                 toast.success("Task cancelled successfully", {
                     id: "task_cancelled",
                 });
+                // TODO: if service workers are down, it shows success! which is wrong, and it should be:
+                // TODO: Task is not cancelled successfully, it might because celery workers are not up and running
                 await client.refetchQueries({
                     include: "active",
                 });
@@ -185,8 +190,9 @@ function JobDetailsModal({ isOpen, handleClose, taskId }: JobDetailsModalProps)
         });
     }
     const task = data?.task
-    const isTaskCancelleable = task?.taskStatus == TaskStatus.Pending || task?.taskStatus == TaskStatus.Received || task?.taskStatus == TaskStatus.Started;
-
+    const isTaskCancellableByUser = Boolean(userInfo && task && isUserAbleToCancelTask(userInfo.getCurrentUserInfo, task.createdBy))
+    const isTaskInCancellableState = task && [TaskStatus.Pending, TaskStatus.Received, TaskStatus.Started].includes(task?.taskStatus)
+    const isTaskCancellable = isTaskCancellableByUser && isTaskInCancellableState
     if (loading) return <Loading isGlobal />
     if (!task) return <></>
 
@@ -283,7 +289,7 @@ function JobDetailsModal({ isOpen, handleClose, taskId }: JobDetailsModalProps)
                             </List>
                         </Grid>
                         <Grid item>
-                            {isTaskCancelleable ? loadingCancelTask ? <div>loding</div>: <CancelTaskButton
+                            {isTaskCancellable ? loadingCancelTask ? <div>loading</div> : <CancelTaskButton
                                 variant="outlined"
                                 size="small"
                                 color="error"

aqueductcore/frontend/src/components/organisms/JobListInExperimentDetails/index.tsx

@@ -40,10 +40,10 @@ export const JobsListColumns: readonly JobsListColumnsType[] = [
             />
         ),
     },
-    // {
-    //   id: "experiment",
-    //   label: "User",
-    // },
+    {
+        id: "createdBy",
+        label: "User",
+    },
     {
         id: "receivedAt",
         label: "submission Time",

aqueductcore/frontend/src/helper/auth/userScope.tsx

@@ -16,10 +16,11 @@ const defined_scopes = {
 }
 
 export function isUserAbleToEditExperiment(userInfo: UserInfo, createdBy: ExperimentData['createdBy']) {
-    for (const item of userInfo.scopes) {
+    const isExperimentOwner = userInfo.username === createdBy
+    for (const scope of userInfo.scopes) {
         if (
-            item === defined_scopes.EXPERIMENT_EDIT_ALL ||
-            item === defined_scopes.EXPERIMENT_EDIT_OWN && userInfo.username === createdBy
+            scope === defined_scopes.EXPERIMENT_EDIT_ALL ||
+            (scope === defined_scopes.EXPERIMENT_EDIT_OWN && isExperimentOwner)
         ) {
             return true
         }
@@ -28,10 +29,33 @@ export function isUserAbleToEditExperiment(userInfo: UserInfo, createdBy: Experi
 }
 
 export function isUserAbleToDeleteExperiment(userInfo: UserInfo, createdBy: ExperimentData['createdBy']) {
-    for (const item of userInfo.scopes) {
+    const isExperimentOwner = userInfo.username === createdBy
+    for (const scope of userInfo.scopes) {
         if (
-            item === defined_scopes.EXPERIMENT_DELETE_ALL ||
-            item === defined_scopes.EXPERIMENT_DELETE_OWN && userInfo.username === createdBy
+            scope === defined_scopes.EXPERIMENT_DELETE_ALL ||
+            (scope === defined_scopes.EXPERIMENT_DELETE_OWN && isExperimentOwner)
+        ) {
+            return true
+        }
+    }
+    return false
+}
+
+export function isUserAbleToCreateTask(userInfo: UserInfo) {
+    for (const scope of userInfo.scopes) {
+        if (scope === defined_scopes.JOB_CREATE) {
+            return true
+        }
+    }
+    return false
+}
+
+export function isUserAbleToCancelTask(userInfo: UserInfo, createdBy: ExperimentData['createdBy']) {
+    const isExperimentOwner = userInfo.username === createdBy
+    for (const scope of userInfo.scopes) {
+        if (
+            scope === defined_scopes.JOB_CANCEL_OWN ||
+            (scope === defined_scopes.JOB_CANCEL_ALL && isExperimentOwner)
         ) {
             return true
         }