abort and search

src/components/manifest/ManifestForm.jsx

@@ -59,6 +59,7 @@ class ManifestForm extends PureComponent {
     this.handleSave = this.handleSave.bind(this);
     this.handlePdfUpload = this.handlePdfUpload.bind(this);
     this.handleClosePdfDialog = this.handleClosePdfDialog.bind(this);
+    this.handleAbortParse = this.handleAbortParse.bind(this);
   }
 
   componentDidMount() {
@@ -78,6 +79,10 @@ class ManifestForm extends PureComponent {
 
   componentWillUnmount() {
     this._cancelled = true;
+    if (this._parseAbortController) {
+      this._parseAbortController.abort();
+      this._parseAbortController = null;
+    }
   }
 
   async loadPartiesOnly() {
@@ -210,15 +215,21 @@ class ManifestForm extends PureComponent {
 
   async handlePdfUpload(file) {
     if (!file || this.state.pdfUploading) return;
+    if (this._parseAbortController) {
+      this._parseAbortController.abort();
+    }
+    const abortController = new AbortController();
+    this._parseAbortController = abortController;
+
     this.setState({
       pdfUploading: true,
       pdfDialogOpen: true,
       pdfFileName: file.name,
-      pdfDialogData: { streaming: true, messages: [], result: null, error: null },
+      pdfDialogData: { streaming: true, messages: [], result: null, error: null, aborted: false },
     });
 
     const appendMessage = (msg) => {
-      if (this._cancelled) return;
+      if (this._cancelled || abortController.signal.aborted) return;
       this.setState((prev) => ({
         pdfDialogData: {
           ...prev.pdfDialogData,
@@ -231,8 +242,8 @@ class ManifestForm extends PureComponent {
       const gen = this.context?.delivery?.parsePdfSse;
       if (!gen) throw new Error('parsePdfSse nicht verfügbar.');
 
-      for await (const { event, data } of this.context.delivery.parsePdfSse(file)) {
-        if (this._cancelled) return;
+      for await (const { event, data } of this.context.delivery.parsePdfSse(file, { signal: abortController.signal })) {
+        if (this._cancelled || abortController.signal.aborted) return;
         switch (event) {
           case 'status':
             appendMessage({ type: 'status', text: data.message ?? String(data) });
@@ -267,6 +278,17 @@ class ManifestForm extends PureComponent {
       }
     } catch (err) {
       if (this._cancelled) return;
+      if (abortController.signal.aborted || err.name === 'AbortError') {
+        this.setState((prev) => ({
+          pdfDialogData: {
+            ...prev.pdfDialogData,
+            streaming: false,
+            aborted: true,
+            error: 'Analyse abgebrochen.',
+          },
+        }));
+        return;
+      }
       notifyError(err);
       this.setState((prev) => ({
         pdfDialogData: {
@@ -276,6 +298,9 @@ class ManifestForm extends PureComponent {
         },
       }));
     } finally {
+      if (this._parseAbortController === abortController) {
+        this._parseAbortController = null;
+      }
       if (!this._cancelled) {
         this.setState((prev) => ({
           pdfUploading: false,
@@ -287,9 +312,30 @@ class ManifestForm extends PureComponent {
     }
   }
 
+  handleAbortParse() {
+    if (this._parseAbortController) {
+      this._parseAbortController.abort();
+      this._parseAbortController = null;
+    }
+    this.setState((prev) => ({
+      pdfUploading: false,
+      pdfDialogData: prev.pdfDialogData
+        ? {
+            ...prev.pdfDialogData,
+            streaming: false,
+            aborted: true,
+            error: 'Analyse abgebrochen.',
+          }
+        : null,
+    }));
+  }
 
   handleClosePdfDialog() {
-    this.setState({ pdfDialogOpen: false });
+    if (this._parseAbortController) {
+      this._parseAbortController.abort();
+      this._parseAbortController = null;
+    }
+    this.setState({ pdfDialogOpen: false, pdfUploading: false });
   }
 
   async handleSave() {
@@ -454,6 +500,7 @@ class ManifestForm extends PureComponent {
           filename={pdfFileName}
           data={pdfDialogData}
           onClose={this.handleClosePdfDialog}
+          onAbort={this.handleAbortParse}
         />
       </>
     );