From 2e49a892cbece4ee5ea4ac321c24951cf962a904 Mon Sep 17 00:00:00 2001 From: Piotr Date: Wed, 8 May 2024 15:50:16 +0200 Subject: [PATCH] remove list rest tasks from slice (#316) --- frontend/src/components/SideBar.tsx | 10 +-------- frontend/src/slices/tasksSlice.ts | 32 +---------------------------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/frontend/src/components/SideBar.tsx b/frontend/src/components/SideBar.tsx index 1e22ded..bded8fc 100644 --- a/frontend/src/components/SideBar.tsx +++ b/frontend/src/components/SideBar.tsx @@ -2,7 +2,7 @@ import React, { useContext } from "react"; import { useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { listRestTasks, scrapeSlidesHash } from "../slices/tasksSlice"; +import { scrapeSlidesHash } from "../slices/tasksSlice"; import CheckboxWidget from "../widgets/Checkbox"; import NumericWidget from "../widgets/Numeric"; import RangeWidget from "../widgets/Range"; @@ -53,7 +53,6 @@ import { import ButtonWidget from "../widgets/Button"; import RunButton from "./RunButton"; import BlockUi from "react-block-ui"; -import { getSiteId } from "../slices/sitesSlice"; type SideBarProps = { notebookTitle: string; @@ -100,7 +99,6 @@ export default function SideBar({ const workerState = useSelector(getWorkerState); const widgetsInitialized = useSelector(getWidgetsInitialized); const urlValuesUsed = useSelector(getUrlValuesUsed); - const siteId = useSelector(getSiteId); const ws = useContext(WebSocketContext); const runNb = () => { @@ -133,12 +131,6 @@ export default function SideBar({ } }; - useEffect(() => { - if (siteId !== undefined && notebookId !== undefined) { - dispatch(listRestTasks(siteId, notebookId)); - } - }, [dispatch, notebookId, siteId]); - useEffect(() => { if (widgetsInitialized && urlValuesUsed) { execNb(); diff --git a/frontend/src/slices/tasksSlice.ts b/frontend/src/slices/tasksSlice.ts index 00e547a..3eead79 100644 --- a/frontend/src/slices/tasksSlice.ts +++ b/frontend/src/slices/tasksSlice.ts @@ -21,16 +21,6 @@ export interface ITask { result: string; } -export interface IRestTask { - id: number; - state: "CREATED" | "RECEIVED" | "DONE" | "ERROR"; - params: string; - response: string; - session_id: string; - created_at: Date; - updated_at: Date; -} - const initialState = { currentTask: {} as ITask, historicTask: {} as ITask, @@ -40,7 +30,6 @@ const initialState = { exportToPDFJobId: '', exportToPDFCounter: 0, executionHistory: [] as ITask[], - restTasks: [] as IRestTask[], }; const tasksSlice = createSlice({ @@ -84,9 +73,6 @@ const tasksSlice = createSlice({ }, clearExecutionHistory(state) { state.executionHistory = []; - }, - setRestTasks(state, action: PayloadAction) { - state.restTasks = action.payload; } }, }); @@ -105,8 +91,7 @@ export const { increaseExportToPDFCounter, stopPDFExport, setExecutionHistory, - clearExecutionHistory, - setRestTasks + clearExecutionHistory } = tasksSlice.actions; export const getShowCurrent = (state: RootState) => state.tasks.showCurrent; @@ -117,7 +102,6 @@ export const getExportingToPDF = (state: RootState) => state.tasks.exportingToPD export const getExportToPDFJobId = (state: RootState) => state.tasks.exportToPDFJobId; export const getExportToPDFCounter = (state: RootState) => state.tasks.exportToPDFCounter; export const getExecutionHistory = (state: RootState) => state.tasks.executionHistory; -export const getRestTasks = (state: RootState) => state.tasks.restTasks; export const fetchCurrentTask = (notebookId: number) => @@ -265,17 +249,3 @@ export const fetchExecutionHistory = }; - -export const listRestTasks = - (siteId: number, notebookId: number) => - async (dispatch: Dispatch) => { - try { - dispatch(setRestTasks([])); - const url = `/api/v1/${siteId}/${notebookId}/list-rest-tasks/`; - const { data } = await axios.get(url); - dispatch(setRestTasks(data)); - } catch (error) { - dispatch(setRestTasks([])); - } - }; -