Merge branch 'devel' into chore/cb-5333/update-npm-dependencies

dbeaver · Aug 6, 2024 · 2fcd658 · 2fcd658
2 parents a3c8dc6 + ffee7a1
commit 2fcd658
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/webapp/packages/plugin-data-import/src/DataImportService.ts b/webapp/packages/plugin-data-import/src/DataImportService.ts
@@ -41,9 +41,15 @@ export class DataImportService {
   async importData(connectionId: string, contextId: string, projectId: string, resultsId: string, processorId: string, file: File) {
     const abortController = new AbortController();
     let cancelImplementation: (() => void | Promise<void>) | null;
+    let isCancelled = false;
 
     function cancel() {
-      cancelImplementation?.();
+      if (!cancelImplementation) {
+        return;
+      }
+
+      cancelImplementation();
+      isCancelled = true;
     }
 
     const { controller, notification } = this.notificationService.processNotification(
@@ -65,6 +71,10 @@ export class DataImportService {
         processorId,
         file,
         event => {
+          if (isCancelled) {
+            return;
+          }
+
           if (event.total !== undefined) {
             const percentCompleted = getProgressPercent(event.loaded, event.total);
 

diff --git a/webapp/packages/plugin-data-import/src/locales/fr.ts b/webapp/packages/plugin-data-import/src/locales/fr.ts
@@ -9,6 +9,6 @@ export default [
   ['plugin_data_import_title', 'Importation de données'],
   ['plugin_data_import_process_title', 'Importation des données...'],
   ['plugin_data_import_process_success', 'Données importées avec succès'],
-  ['plugin_data_import_process_fail', 'Échec de l\'importation des données'],
+  ['plugin_data_import_process_fail', "Échec de l'importation des données"],
   ['plugin_data_import_process_file_processing_step_message', 'Fichier téléchargé, en cours de traitement...'],
 ];