feat: return to moderation view after changing event

farscrl · Nov 9, 2023 · 6606bcd · 6606bcd
1 parent 2607716
commit 6606bcd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/app/moderator-area/pages/moderator-events/moderator-events.component.ts b/src/app/moderator-area/pages/moderator-events/moderator-events.component.ts
@@ -116,7 +116,10 @@ export class ModeratorEventsComponent implements OnInit {
 
     edit(event: Event) {
         this.router.navigateByUrl('/user/event-form', {
-            state: {event},
+            state: {
+                event,
+                returnToModeratorView: true,
+            },
         });
     }
 

diff --git a/src/app/user-area/pages/new-event/new-event.component.ts b/src/app/user-area/pages/new-event/new-event.component.ts
@@ -38,6 +38,7 @@ export class NewEventComponent implements OnInit {
 
     private eventToChangeId?: string;
     private eventToChange?: EventDto;
+    private returnToModeratorView = false;
 
     constructor(
         private authService: AuthenticationService,
@@ -54,6 +55,11 @@ export class NewEventComponent implements OnInit {
             if (event) {
                 this.eventToChangeId = event.id;
             }
+
+            const returnToModeratorView = navigation.extras.state['returnToModeratorView'];
+            if (returnToModeratorView) {
+                this.returnToModeratorView = true;
+            }
         }
     }
 
@@ -92,7 +98,11 @@ export class NewEventComponent implements OnInit {
                     "Ti has memorisà cun success l'occurrenza «" + event.title + "»."
                 );
 
-                this.router.navigateByUrl('/user/events');
+                if (this.returnToModeratorView) {
+                    this.router.navigateByUrl('/moderator/events');
+                } else {
+                    this.router.navigateByUrl('/user/events');
+                }
             });
         } else {
             this.eventsService.createEvent(event).subscribe(event => {
@@ -103,7 +113,11 @@ export class NewEventComponent implements OnInit {
                 );
 
                 if (this.isLoggedIn) {
-                    this.router.navigateByUrl('/user/events');
+                    if (this.returnToModeratorView) {
+                        this.router.navigateByUrl('/moderator/events');
+                    } else {
+                        this.router.navigateByUrl('/user/events');
+                    }
                 } else {
                     this.router.navigateByUrl('/');
                 }