feat(interactive-tour): add config + handling error no configtourFile (…

…#746) Co-authored-by: Josée Martel <[email protected]>
infra-geo-ouverte · Oct 14, 2020 · eff4335 · eff4335
1 parent 78f781a
commit eff4335
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/demo/src/environments/environment.ts b/demo/src/environments/environment.ts
@@ -34,7 +34,8 @@ export const environment: Environment = {
       prefix: './locale/'
     },
     interactiveTour: {
-      tourInMobile: true
+      tourInMobile: true,
+      activateInteractiveTour: true
     },
     importExport: {
       url: '/apis/ogre',

diff --git a/packages/common/src/lib/interactive-tour/interactive-tour.loader.ts b/packages/common/src/lib/interactive-tour/interactive-tour.loader.ts
@@ -12,11 +12,20 @@ export class InteractiveTourLoader {
 
   constructor(private http: HttpClient, private configService: ConfigService) {
     this.jsonURL = this.getPathToConfigFile();
-    this.allToursOptions = this.getJSON().subscribe((data) => {
-      this.allToursOptions = data;
-    });
   }
 
+   public loadConfigTour() {
+      this.getJSON()
+        .subscribe(
+          (data) => {
+            this.allToursOptions = data;
+          },
+          (err) => {
+            throw new Error('Problem with Interactive tour configuration file: interactiveTour.json not find. Check if the file and is path is set correctly.');
+          }
+        );
+   }
+
   public getPathToConfigFile(): string {
     return (
       this.configService.getConfig('interactiveTour.pathToConfigFile') ||

diff --git a/packages/common/src/lib/interactive-tour/interactive-tour.service.ts b/packages/common/src/lib/interactive-tour/interactive-tour.service.ts
@@ -21,7 +21,20 @@ export class InteractiveTourService {
     private languageService: LanguageService,
     private interactiveTourLoader: InteractiveTourLoader,
     private shepherdService: ShepherdService
-  ) {}
+  ) {
+    if (this.isAppHaveTour()) {
+      this.interactiveTourLoader.loadConfigTour();
+    }
+  }
+
+  public isAppHaveTour() {
+    const haveTour = this.configService.getConfig('interactiveTour.activateInteractiveTour')
+    if (haveTour === undefined) {
+      return true;
+    } else {
+      return haveTour;
+    }
+  }
 
   public isToolHaveTourConfig(toolName: string): boolean {
     const checkTourActiveOptions = this.interactiveTourLoader.getTourOptionData(