fix: update route

PnX-SI · Jan 22, 2025 · 5342af3 · 5342af3
1 parent a53ddd6
commit 5342af3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/frontend/app/components/monitoring-lists/monitoring-lists.component.html b/frontend/app/components/monitoring-lists/monitoring-lists.component.html
@@ -50,7 +50,7 @@
                 *ngIf="this.canImport"
                 color="primary"
                 class="btn-action uppercase float-right"
-                [routerLink]="['/import']"
+                [routerLink]="[importRoute]"
                 [queryParams]="this.getImportQueryParams()"
               >
                 Importer

diff --git a/frontend/app/components/monitoring-lists/monitoring-lists.component.ts b/frontend/app/components/monitoring-lists/monitoring-lists.component.ts
@@ -66,7 +66,7 @@ export class MonitoringListComponent implements OnInit {
 
     // get user cruved
     const currentModule = this._moduleService.currentModule;
-    const userCruved = currentModule.module_objects.MONITORINGS_SITES.cruved;
+    const userCruved = this._cruvedStore.cruved[this.obj.moduleCode].module_objects.MONITORINGS_SITES.cruved;
 
     let cruvedImport: any = {};
     if (this._cruvedStore.cruved.IMPORT) {
@@ -75,6 +75,10 @@ export class MonitoringListComponent implements OnInit {
     this.canImport = cruvedImport.C > 0 && userCruved.C > 0;
   }
 
+  get importRoute(): string {
+    return `/import/${this.obj.moduleCode}/process/upload`
+  }
+
   initDataTable() {
     for (const key of Object.keys(this.obj.children)) {
       this.queyParamsNewObject[key] = {};
@@ -147,22 +151,18 @@ export class MonitoringListComponent implements OnInit {
   getImportQueryParams() {
     if ('observation' in this.obj.children) {
       return {
-        id_module: this.obj.properties['id_module'],
         id_base_site: this.obj.properties['id_base_site'], // todo: is it useful ?
         id_dataset: this.obj.properties['id_dataset'], // todo: is it useful ?
         id_base_visit: this.obj.properties['id_base_visit'],
       };
     }
     if ('visit' in this.obj.children) {
       return {
-        id_module: this.obj.parents['module'].properties['id_module'],
         id_base_site: this.obj.properties['id_base_site'],
       };
     }
     if ('site' in this.obj.children) {
-      return {
-        id_module: this.obj.properties['id_module'],
-      };
+      return {};
     }
     return {};
   }