Merge branch 'develop-main' into feature/matlab

# Conflicts: # frontend/src/store/slice/DisplayData/DisplayDataActions.ts
arayabrain · Dec 25, 2023 · 1e0cc3b · 1e0cc3b
2 parents d06c8a1 + df8f768
commit 1e0cc3b
Show file tree

Hide file tree

Showing 51 changed files with 1,285 additions and 1,080 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -33,9 +33,7 @@ const App: FC = () => {
     dispatch(getModeStandalone())
       .unwrap()
       .catch(() => {
-        new Promise((resolve) =>
-          setTimeout(resolve, RETRY_WAIT),
-        ).then(() => {
+        new Promise((resolve) => setTimeout(resolve, RETRY_WAIT)).then(() => {
           getMode()
         })
       })

diff --git a/frontend/src/api/outputs/Outputs.ts b/frontend/src/api/outputs/Outputs.ts
@@ -1,3 +1,4 @@
+import { StatusROI } from "components/Workspace/Visualize/Plot/ImagePlot"
 import { BASE_URL } from "const/API"
 import { PlotMetaData } from "store/slice/DisplayData/DisplayDataType"
 import axios from "utils/axios"
@@ -155,37 +156,70 @@ export async function getHTMLDataApi(
 
 export async function addRoiApi(
   path: string,
+  workspaceId: number,
   data: { posx: number; posy: number; sizex: number; sizey: number },
 ): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
   const response = await axios.post(
-    `${BASE_URL}/outputs/image/${path}/add_roi`,
+    `${BASE_URL}/outputs/image/${path}/add_roi?workspace_id=${workspaceId}`,
     data,
   )
   return response.data
 }
 
 export async function mergeRoiApi(
   path: string,
+  workspaceId: number,
   data: { ids: number[] },
 ): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
   const response = await axios.post(
-    `${BASE_URL}/outputs/image/${path}/merge_roi`,
+    `${BASE_URL}/outputs/image/${path}/merge_roi?workspace_id=${workspaceId}`,
     data,
   )
   return response.data
 }
 
 export async function deleteRoiApi(
   path: string,
+  workspaceId: number,
   data: { ids: number[] },
 ): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
   const response = await axios.post(
-    `${BASE_URL}/outputs/image/${path}/delete_roi`,
+    `${BASE_URL}/outputs/image/${path}/delete_roi?workspace_id=${workspaceId}`,
     data,
   )
   return response.data
 }
 
+export async function commitRoiApi(
+  path: string,
+  workspace_id: number,
+): Promise<boolean> {
+  const response = await axios.post(
+    `${BASE_URL}/outputs/image/${path}/commit_edit?workspace_id=${workspace_id}`,
+  )
+  return response.data
+}
+
+export async function cancelRoiApi(
+  path: string | string[],
+  workspace_id: number,
+): Promise<{ data: HTMLData; meta?: PlotMetaData }> {
+  const response = await axios.post(
+    `${BASE_URL}/outputs/image/${path}/cancel_edit?workspace_id=${workspace_id}`,
+  )
+  return response.data
+}
+
+export async function getStatusRoi(
+  path: string,
+  workspace_id: number,
+): Promise<StatusROI> {
+  const response = await axios.post(
+    `${BASE_URL}/outputs/image/${path}/status?workspace_id=${workspace_id}`,
+  )
+  return response.data
+}
+
 export type LineData = number[][]
 
 export async function getLineDataApi(