OZG-5977 clear uploaded files in service

alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts

@@ -306,6 +306,10 @@ describe('WiedervorlageService', () => {
   });
 
   describe('proceedAfterRecieveCommand', () => {
+    beforeEach(() => {
+      service.clearUploadedFiles = jest.fn();
+    });
+
     it('should set reload on wiedervorlageList', () => {
       service.proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), null);
 
@@ -326,6 +330,12 @@ describe('WiedervorlageService', () => {
 
       expect(snackbarService.show).toHaveBeenCalledWith(commandResourceWithEffectedResourceLink, snackbarMessage);
     });
+
+    it('should clear uploaded files', () => {
+      service.proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), null);
+
+      expect(service.clearUploadedFiles).toHaveBeenCalled();
+    });
   });
 
   describe('order actions', () => {
@@ -337,6 +347,7 @@ describe('WiedervorlageService', () => {
       (<any>service).loadAndSetWiedervorlageByUrl = jest.fn();
 
       service.wiedervorlage$.next(createStateResource(wiedervorlageResource));
+      service.clearUploadedFiles = jest.fn();
     });
 
     describe('wiedervorlage erledigen', () => {
@@ -363,6 +374,12 @@ describe('WiedervorlageService', () => {
           `Die Wiedervorlage ${wiedervorlageResource.betreff} wurde erledigt`,
         );
       });
+
+      it('should clear uploaded files', () => {
+        service.erledigen();
+
+        expect(service.clearUploadedFiles).toHaveBeenCalled();
+      });
     });
 
     describe('wiedervorlage wiedereroeffnen', () => {
@@ -389,6 +406,12 @@ describe('WiedervorlageService', () => {
           `Die Wiedervorlage ${wiedervorlageResource.betreff} wurde wiedereröffnet`,
         );
       });
+
+      it('should clear uploaded files', () => {
+        service.wiedereroeffnen();
+
+        expect(service.clearUploadedFiles).toHaveBeenCalled();
+      });
     });
   });
 
@@ -437,14 +460,6 @@ describe('WiedervorlageService', () => {
 
         expect((<any>service).forceWiedervorlageReload).toHaveBeenCalled();
       });
-
-      it('should clear attachments', () => {
-        service.clearUploadedFiles = jest.fn();
-
-        service.onNavigation({});
-
-        expect(service.clearUploadedFiles).toHaveBeenCalled();
-      });
     });
 
     describe('to vorgang list', () => {
@@ -453,14 +468,6 @@ describe('WiedervorlageService', () => {
 
         expect(service.clearWiedervorlagenList).toHaveBeenCalled();
       });
-
-      it('should clear attachments', () => {
-        service.clearUploadedFiles = jest.fn();
-
-        service.onNavigation({});
-
-        expect(service.clearUploadedFiles).toHaveBeenCalled();
-      });
     });
   });
 

alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts

@@ -156,12 +156,10 @@ export class WiedervorlageService implements OnDestroy {
       this.setWiedervorlageListReload();
       this.forceWiedervorlageReload();
       this.submitInProgress$.next(createEmptyStateResource<CommandResource>());
-      this.clearUploadedFiles();
     }
     if (NavigationService.isVorgangListPage(params)) {
       this.clearWiedervorlagenList();
       this.submitInProgress$.next(createEmptyStateResource<CommandResource>());
-      this.clearUploadedFiles();
     }
   }
 
@@ -258,6 +256,7 @@ export class WiedervorlageService implements OnDestroy {
       this.submitInProgress$.next(createStateResource(commandStateResource.resource));
       this.snackbarService.show(commandStateResource.resource, message);
       this.setWiedervorlageListReload();
+      this.clearUploadedFiles();
     } else if (hasStateResourceError(commandStateResource)) {
       this.submitInProgress$.next(createStateResource(commandStateResource.resource));
     }
@@ -303,6 +302,7 @@ export class WiedervorlageService implements OnDestroy {
             this.buildMessage(snackBarMessage, this.wiedervorlage$.value.resource),
           );
           commandStateSubj.next(commandStateResource);
+          this.clearUploadedFiles();
           commandSubscription.unsubscribe();
         }
       });

alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.spec.ts

@@ -101,11 +101,5 @@ describe('SubmitWiedervorlageButtonComponent', () => {
 
       expect(navigationService.navigateRelativeTo).toHaveBeenCalledWith('../../', activatedRoute);
     });
-
-    it('should clear uploaded files', () => {
-      component._navigateIfCommandIsDone(commandWithError);
-
-      expect(wiedervorlageService.clearUploadedFiles).toHaveBeenCalled();
-    });
   });
 });

alfa-client/libs/wiedervorlage/src/lib/submit-wiedervorlage-button/submit-wiedervorlage-button.component.ts

@@ -58,7 +58,6 @@ export class SubmitWiedervorlageButtonComponent {
 
   _navigateIfCommandIsDone(command: StateResource<CommandResource>): void {
     if (!command.loading && isDone(command.resource)) {
-      this.wiedervorlageService.clearUploadedFiles();
       this.navigateToVorgangDetailPage();
     }
   }