fix (menu) external_url enabled again

PnX-SI · Jul 18, 2024 · 56152a6 · 56152a6
1 parent 95d9b15
commit 56152a6
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 20 deletions.
diff --git a/backend/geonature/core/gn_commons/routes.py b/backend/geonature/core/gn_commons/routes.py
@@ -88,10 +88,10 @@ def list_modules():
         }
         if any(module_dict["cruved"].values()):
             module_allowed = True
-        if module.active_frontend:
-            module_dict["module_url"] = module.module_path
-        else:
-            module_dict["module_url"] = module.module_external_url
+        module_dict["module_external_url"] = (
+            "" if module.active_frontend else module.module_external_url
+        )
+        module_dict["module_url"] = module.module_path if module.active_frontend else ""
         module_dict["module_objects"] = {}
         # get cruved for each object
         for obj_dict in module_dict["objects"]:

diff --git a/frontend/src/app/components/sidenav-items/sidenav-items.component.html b/frontend/src/app/components/sidenav-items/sidenav-items.component.html
@@ -27,24 +27,42 @@
       <span class="module-name">{{ home_page.module_label }}</span>
     </mat-list-item>
   </a>
+  <ng-container *ngFor="let module of moduleService.getDisplayedModules(); let index = index">
+    <a
+      *ngIf="module.active_frontend; else"
+      [routerLink]="module.module_url"
+      [attr.data-qa]="'gn-sidenav-link-' + module.module_code"
+      [target]="module.module_target"
+    >
+      <mat-list-item
+        class="sidenav-item"
+        (click)="_sidenavService.toggleSideNav()"
+      >
+        <i
+          class="fa {{ module.module_picto }} picto"
+          aria-hidden="true"
+        ></i>
+        <span class="module-name">{{ module.module_label }}</span>
+      </mat-list-item>
+    </a>
 
-  <a
-    *ngFor="let module of moduleService.getDisplayedModules(); let index = index"
-    [routerLink]="module.module_url"
-    [attr.data-qa]="'gn-sidenav-link-' + module.module_code"
-    [target]="module.module_target"
-  >
-    <mat-list-item
-      class="sidenav-item"
-      (click)="_sidenavService.toggleSideNav()"
+    <a
+      *ngIf="!module.active_frontend"
+      href="{{ module.module_external_url }}"
+      [attr.data-qa]="'gn-sidenav-link-' + module.module_code"
     >
-      <i
-        class="fa {{ module.module_picto }} picto"
-        aria-hidden="true"
-      ></i>
-      <span class="module-name">{{ module.module_label }}</span>
-    </mat-list-item>
-  </a>
+      <mat-list-item
+        class="sidenav-item"
+        (click)="_sidenavService.toggleSideNav()"
+      >
+        <i
+          class="fa {{ module.module_picto }} picto"
+          aria-hidden="true"
+        ></i>
+        <span class="module-name">{{ module.module_label }}</span>
+      </mat-list-item>
+    </a>
+  </ng-container>
 </mat-nav-list>
 
 <div class="navbar-footer">
@@ -74,3 +92,20 @@
     </a>
   </p>
 </div>
+
+<ng-template
+  #menuLink
+  let-picto
+  let-label
+>
+  <mat-list-item
+    class="sidenav-item"
+    (click)="_sidenavService.toggleSideNav()"
+  >
+    <i
+      class="fa {{ picto }} picto"
+      aria-hidden="true"
+    ></i>
+    <span class="module-name">{{ label }}</span>
+  </mat-list-item>
+</ng-template>
diff --git a/frontend/src/app/models/module.model.ts b/frontend/src/app/models/module.model.ts
@@ -5,4 +5,5 @@ export interface Module {
   module_path: string;
   module_doc_url?: string;
   module_url?: string;
+  module_external_url?: string;
 }