feat(wip) : manage map

- keep trying to send geometry to "objForm" object (FormGroup)

Reviewed-by: andriacap

.gitlab-ci.yml

@@ -0,0 +1,129 @@
+image: debian:latest
+
+before_script:
+  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+  - mkdir -p ~/.ssh
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
+  - chmod 700 ~/.ssh/id_rsa
+  - eval "$(ssh-agent -s)"
+  - ssh-add ~/.ssh/id_rsa
+  - ssh-keyscan -t rsa gitlab.com > ~/.ssh/known_hosts
+  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+  - chmod 644 ~/.ssh/known_hosts
+
+variables:
+    SERVEUR: '${SSH_USER}@${VM_IPADDRESS}'
+# .dependencies_cache:
+#   cache:
+#     key:
+#       files:
+#         - package-lock.json
+#     paths:
+#       - .nvm
+
+stages:
+  - setup
+  - dependencies
+  - build
+  - reload_service
+
+pull_git_stage:
+  stage: setup
+  script:
+    - |
+      ssh ${SERVEUR} -p 3022 <<'ENDSSH'
+      whoami &&                                                                
+      cd /home/geonatureadmin/geonature/contrib/gn_module_monitoring/ &&
+      git fetch gitl-ac-ssh deploy && 
+      git pull &&
+      exit
+      ENDSSH
+    - ssh ${SERVEUR} -p 3022 "ls -al && pwd"
+    - ls -al
+    - pwd
+  # extends: .dependencies_cache
+  # artifacts:
+  #   expire_in: 20 mins
+  #   paths:
+  #     - node_modules
+  tags:
+    - node
+  only:
+    - deploy
+
+dependencies_stage:
+  stage: dependencies
+  variables:
+    PATH_GEONATURE_FRONTEND: '/home/geonatureadmin/geonature/frontend'
+  script:
+    - |
+      ssh ${SERVEUR} -p 3022 <<'ENDSSH'
+      export NVM_DIR="$HOME/.nvm" && . "$NVM_DIR/nvm.sh" --no-use &&                                                                 
+      cd /home/geonatureadmin/geonature/frontend &&
+      ls -al &&
+      echo $NVM_DIR &&
+      nvm use && npm ci &&
+      exit
+      ENDSSH
+    - ssh ${SERVEUR} -p 3022 "ls -al && pwd"
+    - ls -al
+    - pwd
+  tags:
+    - node
+  rules:
+    - if: $CI_COMMIT_BRANCH == "deploy"
+      changes:
+        - ./frontend/package.json
+
+
+build_stage:
+  stage: build
+  variables:
+    PATH_GEONATURE_FRONTEND: '/home/geonatureadmin/geonature/frontend'
+  script:
+    - |
+      ssh ${SERVEUR} -p 3022 <<'ENDSSH'
+      export NVM_DIR="$HOME/.nvm" && . "$NVM_DIR/nvm.sh" --no-use &&                                                                   
+      cd /home/geonatureadmin/geonature/frontend &&
+      ls -al &&
+      echo $NVM_DIR &&
+      nvm use && npm run build &&
+      exit
+      ENDSSH
+    - ssh ${SERVEUR} -p 3022 "ls -al && pwd"
+    - ls -al
+    - pwd
+  tags:
+    - node
+  rules:
+    - if: $CI_COMMIT_BRANCH == "deploy"
+      when: always
+
+relooad_backend_stage:
+  stage: reload_service
+  variables:
+    SERVICE_GEONATURE: 'geonature.service'
+  script:
+    - |
+      ssh ${SERVEUR} -p 3022 <<'ENDSSH'                                                                    
+      sudo systemctl restart geonature.service &&
+      exit
+      ENDSSH
+    - ssh ${SERVEUR} -p 3022 "ls -al && pwd"
+    - ls -al
+    - pwd
+  tags:
+    - node
+  only:
+    - deploy
+
+# deploy_stage:
+#   stage: deploy
+#   script:
+#     - which rsync || ( apt update -y && apt install rsync -y )
+#     - ls -la
+#     - /sbin/ip route|awk '/default/ { print $3 }'
+#     - echo ${SERVEUR}
+#     # - /usr/bin/rsync -r ./web/dist/ ${SERVEUR}:${CHEMIN}. --exclude-from="exclude.build"
+#   only:
+#     - deploy

backend/gn_module_monitoring/routes/monitoring.py

@@ -127,7 +127,7 @@ def create_or_update_object_api_sites_sites_group(module_code, object_type, id=N
     else:
         module = {"id_module": "generic"}
         # TODO : A enlever une fois que le post_data contiendra geometry et type depuis le front
-        if object_type == "site":
+        if object_type == "site" and not 'geometry' in post_data:
             post_data["geometry"] = {"type": "Point", "coordinates": [2.5, 50]}
             post_data["type"] = "Feature"
     # on rajoute id_module s'il n'est pas renseigné par défaut ??

frontend/app/components/draw-form/draw-form.component.ts

@@ -6,10 +6,11 @@ import {
   EventEmitter,
   ViewEncapsulation,
 } from "@angular/core";
-import { FormControl, FormGroup } from "@angular/forms";
+import { FormControl } from "@angular/forms";
 
 import { leafletDrawOptions } from "./leaflet-draw.options";
 import { CustomMarkerIcon } from "@geonature_common/map/marker/marker.component";
+import { FormService } from "../../services/form.service";
 
 @Component({
   selector: "pnx-draw-form",
@@ -37,7 +38,7 @@ export class DrawFormComponent implements OnInit {
 
   @Input() bEdit;
 
-  constructor() {}
+  constructor(private _formService: FormService) {}
 
   ngOnInit() {
     // choix du type de geometrie
@@ -105,7 +106,18 @@ export class DrawFormComponent implements OnInit {
   // suivi composant => formControl
   bindGeojsonForm(geojson) {
     this.geojson = geojson;
-    this.parentFormControl.setValue(geojson.geometry);
+    if (!this.parentFormControl){
+        this._formService.currentFormMap.subscribe((dataForm) => {
+          if('geometry' in dataForm.frmGp.controls){
+            this.parentFormControl = dataForm.frmGp.controls['geometry'] as FormControl
+            this.parentFormControl.setValue(geojson.geometry);
+          }
+          })
+        }
+    else {
+      this.parentFormControl.setValue(geojson.geometry);
+    }
+
   }
 
   ngOnChanges(changes) {

frontend/app/components/monitoring-form-g/monitoring-form.component-g.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { tap, mergeMap, map } from 'rxjs/operators';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { tap, mergeMap, map, take } from 'rxjs/operators';
 import { ActivatedRoute } from '@angular/router';
 import { Router } from '@angular/router';
 import { DynamicFormService } from '@geonature_common/form/dynamic-form-generator/dynamic-form.service';
@@ -86,6 +86,7 @@ export class MonitoringFormComponentG implements OnInit {
         }),
         mergeMap((frmCtrl) => {
           return this.apiService.getConfig().pipe(
+            take(1),
             map((prop) => {
               return { frmCtrl, prop: prop };
             })
@@ -158,9 +159,11 @@ export class MonitoringFormComponentG implements OnInit {
         this.objForm.addControl('patch_update', this._formBuilder.control(0));
                 // set geometry
         if (this.obj.config['geometry_type']) {
-                  this.objForm.addControl('geometry', this._formBuilder.control('', Validators.required));
+          let frmCtrlGeom ={frmCtrl:this._formBuilder.control('', Validators.required),frmName:'geometry'}
+          this.addGeomFormCtrl(frmCtrlGeom)
+          this._formService.changeFormMapObj({frmGp:this.objForm,bEdit:true, obj: this.obj})
         }
-        this._formService.changeFormMapObj({frmGp:this.objForm,bEdit:true, objForm: this.obj})
+
         this.initForm();
       });
   }
@@ -411,6 +414,10 @@ export class MonitoringFormComponentG implements OnInit {
     // this.dataForm = rest
     this.dataForm = this.objForm.value;
     const change = this._configService.change(this.obj.moduleCode, this.obj.objectType);
+    // if('geometry' in this.objForm.controls){
+    //   this._formService.changeFormMapObj({frmGp:this.objForm,bEdit:true, obj: this.obj})
+    // }
+
     if (!change) {
       return;
     }
@@ -445,6 +452,14 @@ export class MonitoringFormComponentG implements OnInit {
     this.extraForm = frmCtrl;
   }
 
+  addGeomFormCtrl(frmCtrl:{frmCtrl :FormControl,frmName:string}){
+    if (frmCtrl.frmName in this.objForm.controls) {
+      this.objForm.setControl(frmCtrl.frmName, frmCtrl.frmCtrl);
+    } else {
+      this.objForm.addControl(frmCtrl.frmName, frmCtrl.frmCtrl);
+    }
+  }
+
   checkValidExtraFormCtrl() {
     if (
       this.extraForm.frmName in this.objForm.controls &&

frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts

@@ -22,15 +22,11 @@ export class MonitoringMapListComponent {
   displayMap: boolean = true;
   siteSiteGroup: SiteSiteGroup | null = null;
   apiService: ApiGeomService;
-  constructor( private _objService: ObjectService,private _formService: FormService,private _configService: ConfigJsonService) {}
+  constructor(private _formService: FormService,) {}
 
-  initObj(prop) {
-        // this.apiService.getConfig().subscribe(prop => this.obj['properties'] = prop)
-        this.obj['properties'] = prop;
-    }
   onActivate(component) {
     this._formService.currentFormMap.subscribe(formMapObj => {
-      this.obj = formMapObj.objForm
+      this.obj = formMapObj.obj
       this.bEdit = formMapObj.bEdit
       this.objForm = formMapObj.frmGp
     })

frontend/app/interfaces/object.ts

@@ -37,4 +37,4 @@ export type IBreadCrumb = {
 }
 
 
-export type IFormMap = { frmGp : FormGroup; bEdit: boolean, objForm: any  };
+export type IFormMap = { frmGp : FormGroup; bEdit: boolean, obj: any  };

frontend/app/services/form.service.ts

@@ -6,7 +6,7 @@ import { ISite, ISitesGroup } from '../interfaces/geom';
 import { JsonData } from '../types/jsondata';
 import { Utils } from '../utils/utils';
 import { MonitoringObjectService } from './monitoring-object.service';
-import { FormControl } from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { IExtraForm, IFormMap } from '../interfaces/object';
 
 
@@ -23,10 +23,11 @@ export class FormService {
   moduleCode: string;
   objecType: string;
 
-  private formMap = new ReplaySubject<IFormMap>(1);
+  frmrGrp: FormGroup = this._formBuilder.group({});
+  private formMap = new BehaviorSubject<IFormMap>({frmGp:this.frmrGrp ,bEdit:true,obj:{}});
   currentFormMap = this.formMap.asObservable();
 
-  constructor(private _objService: MonitoringObjectService) {}
+  constructor(private _objService: MonitoringObjectService, private _formBuilder: FormBuilder) {}
 
 
   changeDataSub(
@@ -74,9 +75,11 @@ export class FormService {
       concatMap((formValues_in) => {
         const formValues = Utils.copy(formValues_in);
         // geometry
-        // if (this.config["geometry_type"]) {
-        //   formValues["geometry"] = this.geometry; // copy???
-        // }
+        if (obj.config["geometry_type"]) {
+          // TODO: change null by the geometry load from the object (if edit) or null if create
+          // formValues["geometry"] = this.geometry; // copy???
+          formValues["geometry"] = null ; // copy???
+        }
         return of(formValues);
       })
     );
@@ -132,10 +135,10 @@ export class FormService {
     // };
 
     // TODO: A voir q'il faut remettre
-    // if (this.config["geometry_type"]) {
-    //   postData["geometry"] = formValue["geometry"];
-    //   postData["type"] = "Feature";
-    // }
+    if (obj.config["geometry_type"]) {
+      postData["geometry"] = formValue["geometry"];
+      postData["type"] = "Feature";
+    }
     return postData;
   }
 }