fix(context): load default context when context is invalid

infra-geo-ouverte · Jun 4, 2020 · 42d7baf · 42d7baf
1 parent e308859
commit 42d7baf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/packages/context/src/lib/context-manager/shared/context.service.ts b/packages/context/src/lib/context-manager/shared/context.service.ts
@@ -47,6 +47,14 @@ export class ContextService {
   // to track the current tools
   private tools: Tool[];
 
+  get defaultContextUri(): string {
+    return this._defaultContextUri || this.options.defaultContextUri;
+  }
+  set defaultContextUri(uri: string) {
+    this._defaultContextUri = uri;
+  }
+  private _defaultContextUri: string;
+
   constructor(
     private http: HttpClient,
     private authService: AuthService,
@@ -275,17 +283,17 @@ export class ContextService {
       if (!direct && this.baseUrl && this.authService.authenticated) {
         this.getDefault().subscribe(
           (_context: DetailedContext) => {
-            this.options.defaultContextUri = _context.uri;
+            this.defaultContextUri = _context.uri;
             this.addContextToList(_context);
             this.setContext(_context);
           },
           () => {
             this.defaultContextId$.next(undefined);
-            this.loadContext(this.options.defaultContextUri);
+            this.loadContext(this.defaultContextUri);
           }
         );
       } else {
-        this.loadContext(this.options.defaultContextUri);
+        this.loadContext(this.defaultContextUri);
       }
     };
 
@@ -294,7 +302,7 @@ export class ContextService {
         const contextParam = params[this.route.options.contextKey as string];
         let direct = false;
         if (contextParam) {
-          this.options.defaultContextUri = contextParam;
+          this.defaultContextUri = contextParam;
           direct = true;
         }
         loadFct(direct);
@@ -318,6 +326,9 @@ export class ContextService {
       },
       err => {
         contexts$$.unsubscribe();
+        if (uri !== this.options.defaultContextUri) {
+          this.loadContext(this.options.defaultContextUri);
+        }
       }
     );
   }

diff --git a/packages/context/src/locale/en.context.json b/packages/context/src/locale/en.context.json
@@ -42,7 +42,7 @@
           "uriRequired": "ID required"
         },
         "invalid": {
-          "text": "Context '{{value}}' is invalid",
+          "text": "Context '{{value}}' is invalid. The default context was loaded.",
           "title": "Invalid context"
         },
         "managePermissions": "Manage permissions context",

diff --git a/packages/context/src/locale/fr.context.json b/packages/context/src/locale/fr.context.json
@@ -42,7 +42,7 @@
           "uriRequired": "L'identifiant est obligatoire"
         },
         "invalid": {
-          "text": "Le contexte \"{{value}}\" est invalide",
+          "text": "Le contexte \"{{value}}\" est invalide. Le contexte par défaut a été chargé.",
           "title": "Contexte invalide"
         },
         "managePermissions": "Gérer les permissions du contexte",