change result of stopping notebook

th2-net · Jun 26, 2024 · 81f5aef · 81f5aef
1 parent 59a6ff5
commit 81f5aef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/api/ApiSchema.ts b/src/api/ApiSchema.ts
@@ -113,7 +113,7 @@ export interface JSONViewerApiSchema {
 	getParameters: (path: string) => Promise<NotebookParameters>;
 	getResults: (taskId: string) => Promise<{ status: string; result: string }>;
 	launchNotebook: (path: string, parameters?: Object) => Promise<{ path: string; task_id: string }>;
-	stopNotebook: (taskId: string) => Promise<Object>;
+	stopNotebook: (taskId: string) => Promise<boolean>;
 }
 
 export interface SSESchema {

diff --git a/src/api/JSONViewer.ts b/src/api/JSONViewer.ts
@@ -55,9 +55,10 @@ const JSONViewerHttpApi: JSONViewerApiSchema = {
 			method: 'POST',
 		});
 		if (res.ok) {
-			return res.json();
+			return true;
 		}
-		return {};
+		notificationsStore.handleRequestError(res);
+		return false;
 	},
 };
 

diff --git a/src/components/JSONViewer/NotebookParamsCell.tsx b/src/components/JSONViewer/NotebookParamsCell.tsx
@@ -97,15 +97,17 @@ const NotebookParamsCell = ({ notebook }: { notebook: string }) => {
 
 	const runNotebook = async () => {
 		if (isRunLoading) {
-			setIsRunLoading(false);
-			if (taskId) {
-				api.jsonViewer.stopNotebook(taskId);
-				setTaskId(null);
-			}
 			if (timer) {
 				clearTimeout(timer);
 				setTimer(null);
 			}
+			if (taskId) {
+				const stopAttempt = await api.jsonViewer.stopNotebook(taskId);
+				setTaskId(null);
+				setIsRunLoading(stopAttempt);
+			} else {
+				setIsRunLoading(false);
+			}
 			return;
 		}
 		setIsRunLoading(true);