From 15439b4b27b033ae5947c6c40dbf0ea28f9e8891 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 20 Nov 2023 14:24:29 +0000
Subject: [PATCH] hide import-success message, closes #3464

Closes #3464

Merge request studip/studip!2363
---
 .../CoursewareStructuralElementDialogImport.vue  |  8 ++++++--
 .../unit/CoursewareShelfDialogImport.vue         | 16 ++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue b/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue
index ba940a6dbca..60b404ef461 100644
--- a/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue
+++ b/resources/vue/components/courseware/structural-element/CoursewareStructuralElementDialogImport.vue
@@ -23,7 +23,7 @@
             </label>
             </form>
             <div role="status" aria-live="polite">
-                <courseware-companion-box 
+                <courseware-companion-box
                     v-show="importDone && importErrors.length === 0"
                     :msgCompanion="$gettext('Import erfolgreich!')"
                     mood="special"
@@ -111,6 +111,10 @@ export default {
             return this.importFilesProgress === 100;
         },
         importDone() {
+            if (!this.importZipFile) {
+                this.setImportFilesProgress(0);
+                this.setImportStructuresProgress(0);
+            }
             return (this.importFilesProgress === 100 && this.importStructuresProgress === 100);
         }
     },
@@ -197,4 +201,4 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/vue/components/courseware/unit/CoursewareShelfDialogImport.vue b/resources/vue/components/courseware/unit/CoursewareShelfDialogImport.vue
index 8717aabf00d..b557dff6b40 100644
--- a/resources/vue/components/courseware/unit/CoursewareShelfDialogImport.vue
+++ b/resources/vue/components/courseware/unit/CoursewareShelfDialogImport.vue
@@ -66,7 +66,7 @@
                         <textarea v-model="modifiedData.description" :placeholder="loadedDescription" required />
                     </label>
                 </form>
-                <courseware-companion-box 
+                <courseware-companion-box
                     v-else
                     :msgCompanion="$gettext('Bitte wählen Sie ein Import-Archiv aus.')"
                     mood="unsure"
@@ -82,7 +82,7 @@
         >
             <template v-slot:dialogContent>
                 <div role="status" aria-live="polite">
-                    <courseware-companion-box 
+                    <courseware-companion-box
                         v-show="importDone && importErrors.length === 0"
                         :msgCompanion="$gettext('Import erfolgreich!')"
                         mood="special"
@@ -183,7 +183,7 @@ export default {
             importStructuresProgress: 'importStructuresProgress',
             importErrors: 'importErrors',
             lastCreateCoursewareUnit: 'courseware-units/lastCreated',
-            
+
         }),
         colors() {
             return this.mixinColors.filter(color => color.darkmode);
@@ -192,6 +192,10 @@ export default {
             return this.importFilesProgress === 100;
         },
         importDone() {
+            if (!this.importZipFile) {
+                this.setImportFilesProgress(0);
+                this.setImportStructuresProgress(0);
+            }
             return this.importFilesProgress === 100 && this.importStructuresProgress === 100;
         },
         hasValidFile() {
@@ -216,7 +220,7 @@ export default {
         }),
         setImport(event) {
             this.importZipFile = event.target.files[0];
-            this.loadZipData(); 
+            this.loadZipData();
         },
 
         async loadZipData() {
@@ -240,7 +244,7 @@ export default {
                     this.archiveErrors.push(this.$gettext('Beim laden des Archivs ist ein Fehler aufgetreten. Vermutlich ist das Archiv beschädigt.'));
                     filesError = true;
                 }
-                
+
                 if (this.zip) {
                     if (this.zip.file('courseware.json') === null) {
                         this.archiveErrors.push(this.$gettext('Das Archiv enthält keine courseware.json Datei.'));
@@ -370,4 +374,4 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
-- 
GitLab