From fae3df93c18fa28822c0c6fe0931b392f9e8ef9c Mon Sep 17 00:00:00 2001
From: Giovanni Pellerano <giovanni.pellerano@globaleaks.org>
Date: Fri, 4 Oct 2024 21:52:54 +0200
Subject: [PATCH] Fix issue #4217

---
 client/app/src/app-data.service.ts                          | 2 +-
 .../pages/whistleblower/submission/submission.component.ts  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/app/src/app-data.service.ts b/client/app/src/app-data.service.ts
index cddb6ff361..07fce50694 100644
--- a/client/app/src/app-data.service.ts
+++ b/client/app/src/app-data.service.ts
@@ -7,7 +7,6 @@ import {BehaviorSubject, Observable} from "rxjs";
   providedIn: "root"
 })
 export class AppDataService {
-
   private showLoadingPanelSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   showLoadingPanel$: Observable<boolean> = this.showLoadingPanelSubject.asObservable();
 
@@ -33,6 +32,7 @@ export class AppDataService {
   receivers_by_id: any = {};
   submissionStatuses: any[];
   submission_statuses_by_id: any;
+  context_id = "";
   contexts_by_id: any = {};
   questionnaires_by_id: any = {};
 }
diff --git a/client/app/src/pages/whistleblower/submission/submission.component.ts b/client/app/src/pages/whistleblower/submission/submission.component.ts
index 6ef94223aa..dfaf865240 100644
--- a/client/app/src/pages/whistleblower/submission/submission.component.ts
+++ b/client/app/src/pages/whistleblower/submission/submission.component.ts
@@ -56,7 +56,7 @@ export class SubmissionComponent implements OnInit {
 
   ngOnInit(): void {
     this.route.queryParamMap.subscribe(params => {
-      this.context_id = params.get('context') || "";
+      this.appDataService.context_id = params.get('context') || this.appDataService.context_id;
       this.initializeSubmission();
     });
   }
@@ -116,8 +116,8 @@ export class SubmissionComponent implements OnInit {
 
     this.selectable_contexts = this.appDataService.public.contexts.filter(context => !context.hidden);
 
-    if (this.context_id) {
-      context = this.appDataService.public.contexts.find(context => context.id === this.context_id);
+    if (this.appDataService.context_id) {
+      context = this.appDataService.public.contexts.find(context => context.id === this.appDataService.context_id);
     } else if (this.selectable_contexts.length === 1) {
       context = this.selectable_contexts[0];
     }