Merge branch 'master' of git@gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot.git

dmp-admin/src/app/app.module.ts

@@ -23,6 +23,7 @@ import { ResearcherService } from './services/researcher-service';
 import { OrganisationService } from './services/organisation-service';
 import { DmpProfileService } from './services/dmpprofile-service';
 import { RegistryService } from './services/registry-service';
+import { DatarepoService } from './services/datarepo-service';
 import { Toolbox } from './services/toolbox';
 
 import { DataFilterPipe }   from './pipes/data-filter.pipe';
@@ -33,6 +34,7 @@ import { ProjectTableFilterPipe } from './pipes/project-table-filter.pipe';
 import { RegistryTableFilterPipe } from './pipes/registry-table-filter.pipe';
 import { OrganisationTableFilterPipe } from './pipes/organisation-table-filter.pipe';
 import { ResearcherTableFilterPipe } from './pipes/researcher-table-filter.pipe';
+import { DatarepoTableFilterPipe } from './pipes/datarepo-table-filter.pipe';
 
 
 import { GooggleSignInComponent } from './login/googgle-sign-in/googgle-sign-in.component';
@@ -53,6 +55,7 @@ import { OrganisationEditorComponent } from './managers/organisation-editor/orga
 import { RegistryEditorComponent } from './managers/registry-editor/registry-editor.component';
 import { ServiceEditorComponent } from './managers/service-editor/service-editor.component';
 import { ResearcherEditorComponent } from './managers/researcher-editor/researcher-editor.component';
+import { DatareposEditorComponent } from './managers/datarepos-editor/datarepos-editor.component';
 
 
 
@@ -66,6 +69,7 @@ import { ResearcherEditorComponent } from './managers/researcher-editor/research
     RegistryTableFilterPipe,
     ServiceTableFilterPipe,
     ResearcherTableFilterPipe,
+    DatarepoTableFilterPipe,
     
     AppComponent,
     GooggleSignInComponent,
@@ -82,7 +86,8 @@ import { ResearcherEditorComponent } from './managers/researcher-editor/research
     RegistryEditorComponent,
     ServiceEditorComponent,
     MainSignInComponent,
-    ResearcherEditorComponent
+    ResearcherEditorComponent,
+    DatareposEditorComponent
   ],
   imports: [
     BrowserModule,
@@ -97,7 +102,7 @@ import { ResearcherEditorComponent } from './managers/researcher-editor/research
     AppRouting
   ],
   providers: [ DatasetsServiceService, TokenService, DmpsServiceService, ResearcherService,
-              DialogService, DatasetProfileService, ProjectService, OrganisationService, 
+              DialogService, DatasetProfileService, ProjectService, OrganisationService, DatarepoService,
               DmpProfileService, RegistryService, ServiceService, NativeLoginService, HttpModule, Toolbox, HttpClient, RestBase],
   bootstrap: [AppComponent]
 })

dmp-admin/src/app/datasets-viewer/datasets-viewer.component.ts

@@ -112,6 +112,7 @@ export class DatasetsViewerComponent implements OnInit, AfterViewInit {
 
 
 
+  
   onFocusOutProfileWin($event, value:string) {
     this.nullSafeProfile();
     if(this.haveChanges){
@@ -121,7 +122,7 @@ export class DatasetsViewerComponent implements OnInit, AfterViewInit {
         //create profile and  a) assign it on data[] and on current profile b) assign it to dataset
         this.datasetProfileService.setDatasetProfile(this.profile).subscribe((resp) => {
           
-          /*
+          
           console.log("SERVICE RESPONSE: ");
           console.log(resp);
           console.log(resp.json());
@@ -141,13 +142,31 @@ export class DatasetsViewerComponent implements OnInit, AfterViewInit {
               simple_notifier("success",null,"Updated profile element");
             });
           });
-*/
+
           simple_notifier("success",null,"Updated profile element");
         });
       }
       else{
         //this.getDatasetFromDataArray()
 
+        console.log("this.profile")
+        console.log(this.profile)
+
+        console.log(this.profile)
+        this.profile.dataset = {"id": this.profile.dataset};
+
+
+        this.datasetProfileService.setDatasetProfile(this.profile).subscribe( 
+          response => {
+            simple_notifier("success",null,"Saved DMP Profile");
+            console.log(response);
+          },
+          err => {
+            simple_notifier("danger",null,"Could not save DMP Profile");
+            console.log(err);
+          }
+        );
+
       }
       
     }

dmp-admin/src/app/main-window/main-window.component.html

@@ -23,11 +23,11 @@
                       <li [ngClass]="{true:'active'}[currentlySelected=='dmpprofiles']" (click)="setActive('dmpprofiles')" [routerLink]="['/dmpprofiles']">DMP profiles</li>
                     </ul>
     
-                    <li data-toggle="collapse" data-target="#data-repositories" class="collapsed">
+                    <li data-toggle="collapse" data-target="#manage-repositories" class="collapsed">
                         <a style="cursor:pointer"><i class="fa fa-database"></i> Manage Data Repositories <span class="arrow"></span></a>
                     </li>
-                    <ul class="sub-menu collapse" id="data-repositories">
+                    <ul class="sub-menu collapse" id="manage-repositories">
-                      <li>Data Repositories</li>
+                      <li [ngClass]="{true:'active'}[currentlySelected=='datarepos']" (click)="setActive('datarepos')" [routerLink]="['/datarepos']">Data Repositories</li>
                       <li>Non-assigned repositories</li>
                     </ul>
 

dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.css

@@ -0,0 +1,33 @@
+.invisible {
+    display:none;
+}
+
+.visible {
+    display:block;
+}
+
+tr.hover:hover > * {
+    background-color: #eeeeee;
+}
+
+.editor-container{
+    padding-top: 10px;
+    padding-right: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+}
+
+.button-150px {
+    max-width: 150px;
+}
+
+.ng-template{
+    text-align: right;
+}
+
+.grayout-empty-table {
+    opacity: 0.6; /* Real browsers */
+    filter: alpha(opacity = 60); /* MSIE */
+    text-align: center; 
+    vertical-align: middle;
+}

dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.html

@@ -0,0 +1,122 @@
+
+<div class="editor-container container">
+    
+      <div [ngClass]="{true:'visible', false:'invisible'}[tableVisible]">
+        <table class="table table-striped" [mfData]="tableData | datarepoTableFilter : filterQuery" #mf="mfDataTable" [mfRowsOnPage]="rowsOnPage" [(mfSortBy)]="sortBy" [(mfSortOrder)]="sortOrder">
+          <thead>
+              <tr>
+                  <th colspan="1">
+                      <input class="form-control" [(ngModel)]="filterQuery" placeholder='Filter'/>
+                  </th>
+                  <th>
+                      <button class="btn btn-default" (click)="refreshTable($event)">
+                          <span class="glyphicon glyphicon-refresh"></span>
+                        </button>
+                  </th>
+              </tr>
+              <tr>
+                <th [ngClass]="{true:'visible', false:'invisible'}[showIDs]"><mfDefaultSorter by="id">ID</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="label">Label</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="abbreviation">Abbreviation</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="reference">Reference</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="uri">Uri</mfDefaultSorter></th>
+                <th><mfDefaultSorter by="definition">Definition</mfDefaultSorter></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr class="grayout-empty-table" *ngIf="!mf.data[0]" [contextMenu]="basicMenu" [contextMenuSubject]="datarepo"> <td colspan="5">No elements</td></tr>
+                
+              <tr *ngFor="let datarepo of mf.data" class="hover" [contextMenu]="basicMenu" [contextMenuSubject]="datarepo">
+                <td [ngClass]="{true:'visible', false:'invisible'}[showIDs]">{{datarepo.id}}</td>
+                <td>{{datarepo?.label}}</td>
+                <td>{{datarepo?.abbreviation}}</td>
+                <td>{{datarepo?.reference}}</td>
+                <td>{{datarepo?.uri}}</td>
+                <td>{{datarepo?.definition}}</td>
+              </tr>
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td colspan="5">
+                        <mfBootstrapPaginator [rowsOnPageSet]="[10,20,40]"></mfBootstrapPaginator>
+                    </td>
+                </tr>
+                </tfoot>
+        </table>
+      </div>
+    
+      <!-- this is the dmp editor -->
+      <div [ngClass]="{true:'visible', false:'invisible'}[editorVisible]">
+    
+        <div> <!-- form container -->
+            <div style="display:block;">
+              <button (click)="switchToTable()" class="btn btn-lg btn-success pull-right" style="max-width:120px;">
+                  <span class="glyphicon glyphicon-arrow-left"></span> Go back
+              </button>
+            </div>
+            <form [formGroup]="datarepoEditorForm" novalidate style="display:block;">
+                <div class="form-group" [ngClass]="{null:'invisible'}[editingDatarepo?.id]">
+                  <label class="center-block">ID: {{editingDatarepo?.id}}
+                    <input class="form-control invisible" formControlName="id" [ngModel]="editingDatarepo?.id">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Label:
+                    <input class="form-control" formControlName="label" [ngModel]="editingDatarepo?.label" (ngModelChange)="editingDatarepo.label=$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Abbreviation:
+                    <input class="form-control" formControlName="abbreviation" [ngModel]="editingDatarepo?.abbreviation" (ngModelChange)="editingDatarepo.abbreviation=$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Reference:
+                    <input class="form-control" formControlName="reference" [ngModel]="editingDatarepo?.reference" (ngModelChange)="editingDatarepo.reference$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Uri:
+                    <input class="form-control" formControlName="uri" [ngModel]="editingDatarepo?.uri" (ngModelChange)="editingDatarepo.uri$event">
+                  </label>
+                </div>
+                <div class="form-group">
+                  <label class="center-block">Definition:
+                    <input class="form-control" formControlName="definition" [ngModel]="editingDatarepo?.definition" (ngModelChange)="editingDatarepo.definition$event">
+                  </label>
+                </div>
+                <div class="form-group" style="width:540px;">
+                  <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
+                </div>
+            </form>
+            <!--
+            <p>Form value: {{ datarepoEditorForm.value | json }}</p>
+            -->
+        </div>
+        
+      </div>
+      
+    </div>
+    
+    
+    
+    <context-menu>
+        <ng-template contextMenuItem [subMenu]="manage"> 
+            <span></span>Manage data repositories
+        </ng-template>
+        <context-menu #manage>
+            <ng-template contextMenuItem (execute)="newDatarepo($event?.item)"> 
+                <span class="glyphicon glyphicon-plus"></span>Create data repository
+            </ng-template>
+            <ng-template contextMenuItem (execute)="editDatarepo($event?.item?.id)"> 
+                <span class="glyphicon glyphicon-pencil"></span>Edit this data repository
+            </ng-template>
+            <ng-template contextMenuItem (execute)="delete($event?.item?.id)">
+                <span class="glyphicon glyphicon-trash red"></span> Delete this
+            </ng-template>
+        </context-menu>
+        <ng-template contextMenuItem> 
+            <span></span>Show full tree connections
+        </ng-template>
+    </context-menu>
+    

dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DatareposEditorComponent } from './datarepos-editor.component';
+
+describe('DatareposEditorComponent', () => {
+  let component: DatareposEditorComponent;
+  let fixture: ComponentFixture<DatareposEditorComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DatareposEditorComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DatareposEditorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should be created', () => {
+    expect(component).toBeTruthy();
+  });
+});

dmp-admin/src/app/managers/datarepos-editor/datarepos-editor.component.ts

@@ -0,0 +1,137 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { DatarepoService } from '../../services/datarepo-service';
+import { ContextMenuComponent } from 'ngx-contextmenu';
+import { ReactiveFormsModule } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+
+import '../../../assets/custom.js';
+declare function simple_notifier(type: string, title: string, message:string): any;
+
+@Component({
+  selector: 'app-datarepos-editor',
+  templateUrl: './datarepos-editor.component.html',
+  styleUrls: ['./datarepos-editor.component.css']
+})
+export class DatareposEditorComponent implements OnInit {
+
+  constructor(private datarepoService : DatarepoService,  private fb: FormBuilder) {
+
+  }
+
+  //whole dmp data model
+  tableData : any[] = new Array();
+  
+  //datarepos editor data model
+  editingDatarepo: any = {};
+  datarepoEditorForm : any;
+
+  //required by the table
+  public filterQuery = "";
+  public rowsOnPage = 10;
+  //public sortBy = "email";
+  public sortOrder = "asc";
+
+  //visibility rules for containers
+  tableVisible: boolean = true;
+  editorVisible: boolean = false;
+
+
+  // for tableIds
+  showIDs : boolean = false;
+
+
+
+  ngOnInit() {
+    this.getAllDatarepos(false);
+    this.createDatareposEditorForm();
+  }
+
+  createDatareposEditorForm(){
+    this.datarepoEditorForm = this.fb.group({
+      id: null,
+      label: ['', Validators.required ],
+      abbreviation: '',
+      reference: '',
+      uri: '',
+      definition: ''
+    });
+
+  }
+
+  switchToTable(){
+    this.tableVisible = true;
+    this.editorVisible = false;
+  }
+
+  switchToEditor(datarepoID){
+
+    this.tableVisible = false;
+    this.editorVisible = true;
+    if(datarepoID == null){
+      this.editingDatarepo = {id: null, label: "", abbreviation: "", reference: "", uri: "", definition: "" };
+    }
+    else{
+      this.editingDatarepo = this.tableData.filter((datarepo) => datarepo.id === datarepoID)[0];
+    }
+  }
+
+
+  getAllDatarepos(showNotification : boolean){
+    this.datarepoService.getAllDatarepos().subscribe( (data) => {
+      this.tableData = data;
+      if(showNotification)
+        simple_notifier("info",null,"Refreshed the table");
+    });
+  }
+
+
+  editDatarepo(datarepo){
+    this.switchToEditor(datarepo);
+  }
+
+  newDatarepo(){
+    this.switchToEditor(null);
+  }
+
+
+
+  save(mouseEvent){
+    this.datarepoService.create(this.datarepoEditorForm.value).subscribe( 
+      response => {
+        simple_notifier("success",null,"Saved data repository");
+        this.getAllDatarepos(false);
+        this.switchToTable();
+      },
+      err => {
+        simple_notifier("danger",null,"Could not save data repository");
+      }
+    );
+  }
+
+  delete(datarepo){
+    this.datarepoService.delete(datarepo).subscribe(
+      (response) => {
+        simple_notifier("success",null,"Deleted data repository");
+        this.getAllDatarepos(false);
+        this.switchToTable();
+      },
+      (err) => {
+        simple_notifier("danger",null,"Could not delete data repository");
+      }
+    )
+  }
+
+
+
+  refreshTable($event){
+    this.getAllDatarepos(true);
+  }
+
+
+  @ViewChild(ContextMenuComponent) public basicMenu: ContextMenuComponent;
+
+
+
+
+
+}

dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.html

@@ -102,7 +102,9 @@
               <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
             </div>
         </form>
+        <!--
         <p>Form value: {{ dmpEditorForm.value | json }}</p>
+        -->
     </div>
 
   </div>

dmp-admin/src/app/managers/dmp-editor/dmp-editor.component.ts

@@ -125,6 +125,7 @@ export class DmpEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved dmp");
         this.getAllDmps(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save dmp");

dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.html

@@ -67,7 +67,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ dmpProfileEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>

dmp-admin/src/app/managers/dmp-profile-editor/dmp-profile-editor.component.ts

@@ -100,6 +100,7 @@ export class DmpProfileEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved DMP Profile");
         this.getAllDmpProfiles(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save DMP Profile");

dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.html

@@ -89,7 +89,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ organisationEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>

dmp-admin/src/app/managers/organisation-editor/organisation-editor.component.ts

@@ -100,6 +100,7 @@ export class OrganisationEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved organisation");
         this.getAllOrganisations(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save organisation");
@@ -111,7 +112,7 @@ export class OrganisationEditorComponent implements OnInit {
     this.organisationService.delete(organisation).subscribe(
       (response) => {
         simple_notifier("success",null,"Deleted organisation");
-        this.refreshTable(false);
+        this.getAllOrganisations(false);
         this.switchToTable();
       },
       (err) => {

dmp-admin/src/app/managers/project-editor/project-editor.component.html

@@ -88,7 +88,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ projectEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>

dmp-admin/src/app/managers/project-editor/project-editor.component.ts

@@ -104,6 +104,7 @@ export class ProjectEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved project");
         this.getAllProjects(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save project");

dmp-admin/src/app/managers/registry-editor/registry-editor.component.html

@@ -88,7 +88,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ registryEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>

dmp-admin/src/app/managers/registry-editor/registry-editor.component.ts

@@ -102,6 +102,8 @@ export class RegistryEditorComponent implements OnInit {
     this.registryService.create(this.registryEditorForm.value).subscribe( 
       response => {
         simple_notifier("success",null,"Saved registry");
+        this.getAllRegistries(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save registry");
@@ -113,8 +115,8 @@ export class RegistryEditorComponent implements OnInit {
     this.registryService.delete(registry).subscribe(
       (response) => {
         simple_notifier("success",null,"Deleted registry");
+        this.getAllRegistries(false);
         this.switchToTable();
-        this.refreshTable(false);
       },
       (err) => {
         simple_notifier("danger",null,"Could not delete registry");

dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.html

@@ -89,7 +89,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ researcherEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>

dmp-admin/src/app/managers/researcher-editor/researcher-editor.component.ts

@@ -100,6 +100,7 @@ export class ResearcherEditorComponent implements OnInit {
       response => {
         simple_notifier("success",null,"Saved resercher");
         this.getAllResearchers(false);
+        this.switchToTable();
       },
       err => {
         simple_notifier("danger",null,"Could not save researcher");

dmp-admin/src/app/managers/service-editor/service-editor.component.html

@@ -89,7 +89,9 @@
                   <button style="float:right;" type="submit" (click)="save($event, $data, $form)"class="btn btn-success">Save</button>
                 </div>
             </form>
+            <!--
             <p>Form value: {{ serviceEditorForm.value | json }}</p>
+            -->
         </div>
         
       </div>

dmp-admin/src/app/pipes/datarepo-table-filter.pipe.ts

@@ -0,0 +1,29 @@
+import * as _ from "lodash";
+import {Pipe, PipeTransform} from "@angular/core";
+
+@Pipe({
+    name: "datarepoTableFilter"
+})
+export class DatarepoTableFilterPipe implements PipeTransform {
+
+    transform(array: any[], query: string): any {
+        
+        if (query) {
+
+            return _.filter(array, row => {
+                if (row.uri == null) row.uri = "";
+                if (row.label == null) row.label = "";
+                if (row.id == null) row.id = "";
+                return (
+                    
+                    row.label.indexOf(query) > -1 ||
+
+                    //row.version == query ||
+                    row.id.indexOf(query) > -1
+                )
+            });
+            
+        }
+        return array;
+    }
+}

dmp-admin/src/app/routes.ts

@@ -11,6 +11,7 @@ import { ServiceEditorComponent } from './managers/service-editor/service-editor
 import { RegistryEditorComponent } from './managers/registry-editor/registry-editor.component';
 import { OrganisationEditorComponent } from './managers/organisation-editor/organisation-editor.component';
 import { ResearcherEditorComponent } from './managers/researcher-editor/researcher-editor.component';
+import { DatareposEditorComponent } from './managers/datarepos-editor/datarepos-editor.component';
 
 
 import { MainWindowComponent } from './main-window/main-window.component';
@@ -29,6 +30,10 @@ export const routes: Routes = [
     path: 'datasets', 
     component: DatasetsViewerComponent 
   },
+  { 
+    path: 'datarepos', 
+    component: DatareposEditorComponent 
+  },
   {
     path: 'datasets/profile',
     component: ProfileEditorComponent

dmp-admin/src/app/services/datarepo-service.ts

@@ -0,0 +1,46 @@
+import { Component, Input, OnInit, AfterViewChecked, ViewChild } from '@angular/core';
+import { HttpClient , HttpHeaders, HttpParams} from '@angular/common/http';
+import { TokenService, TokenProvider } from './login/token.service'
+import { Injectable } from '@angular/core';
+import { Toolbox } from '../services/toolbox';
+import {RestBase} from './rest-base';
+import 'rxjs/Rx';
+
+
+@Injectable()
+export class DatarepoService implements OnInit {
+
+
+  constructor(public restBase: RestBase) {
+  }
+
+  ngOnInit(){
+
+  }
+
+  getDatarepoIdsLabels() {
+    return this.restBase.get("datarepo/listAllLabelIDs");
+  }
+
+  getDatarepoIds(){
+    return this.restBase.get("datarepos");
+  }
+  
+  getAllDatarepos(){
+    return this.restBase.get("datarepo/getAll");
+  }
+
+  create(datarepo){
+    return this.restBase.post("datarepo/create", datarepo);
+  }
+
+  
+  delete(datarepoID){
+    var datarepo = {"id": datarepoID};
+    return this.restBase.post("datarepo/delete", datarepo);
+  } 
+
+
+}
+
+

dmp-admin/src/app/services/dataset-profile.service.ts

@@ -19,12 +19,12 @@ export class DatasetProfileService implements OnInit {
   
 
   getDatasetProfileById(datasetProfileID){
-    return this.restBase.get("datasetprofile/"+datasetProfileID)
+    return this.restBase.get("datasetprofile/"+datasetProfileID);
-        .map((response: Response) => response.json());
+        //.map((response: Response) => response.json());
   }
 
   setDatasetProfile(datasetProfile){
-    return this.restBase.post("setDatasetProfile", datasetProfile);
+    return this.restBase.post("datasetprofile/set", datasetProfile);
   }
 
   

dmp-backend/package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

dmp-db-scema/DataManagementPlanDB.sql

@@ -25,7 +25,10 @@ drop table if exists "Registry" cascade;
 drop table if exists "DatasetService" cascade;
 drop table if exists "DatasetRegistry" cascade;
 drop table if exists "DatasetDataRepository" cascade;
-drop table if exists "UserInfo" cascade;
+DROP table if exists "UserDMP" cascade;
+DROP table if exists "UserInfo" cascade;
+DROP table if exists "UserAuth" cascade;
+
 
 
 -- CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
@@ -447,12 +450,13 @@ ALTER TABLE ONLY "DatasetService"
     ADD CONSTRAINT "DatasetServiceServiceReference" FOREIGN KEY ("Service") REFERENCES "Service"("ID");
 
 
+DROP table if exists "UserDMP";
 DROP table if exists "UserInfo";
+DROP table if exists "UserAuth";
 
 CREATE TABLE "UserInfo" (
-    "autoid" uuid  DEFAULT uuid_generate_v4() NOT NULL,
+    "id" uuid  DEFAULT uuid_generate_v4() UNIQUE NOT NULL,
-    "identification" character varying(500) NOT NULL,
+    "email" character varying(250) UNIQUE NOT NULL,
-    "email" character varying(250) NOT NULL,
     "authorization_level" smallint NOT NULL,
     "usertype" smallint NOT NULL,
     "authentication" uuid,
@@ -461,15 +465,13 @@ CREATE TABLE "UserInfo" (
     "created" timestamp,
     "lastloggedin" timestamp,
     "additionalinfo" xml,
-    PRIMARY KEY (identification, email)
+    PRIMARY KEY (id)
 );
 
 COMMENT ON COLUMN "UserInfo"."authorization_level" IS 'This stores the authorization level of the user: 0 admin, 1 user, being able to be extended furthermore';
 COMMENT ON COLUMN "UserInfo"."usertype" IS 'This stores the type of user: 0 -> internal, 1 external';
 
 
-DROP table if exists "UserAuth";
-
 CREATE TABLE "UserAuth" (
     "id" uuid  DEFAULT uuid_generate_v4() NOT NULL UNIQUE,
     "username" character varying(200) NOT NULL,
@@ -483,8 +485,21 @@ ALTER TABLE "UserInfo" ADD CONSTRAINT fkey_userinfo_userauth FOREIGN KEY ("authe
 
 COMMENT ON COLUMN "UserAuth"."password" IS 'This field stores a password hash';
 
+
+create table "UserDMP" (
+   "id" uuid  DEFAULT uuid_generate_v4() NOT NULL,
+   "user" uuid NOT NULL,
+   "dmp" uuid NOT NUll,
+   "role" integer
+);
+
+ALTER TABLE "UserDMP" ADD CONSTRAINT fkey_userdmp_user FOREIGN KEY ("user") REFERENCES "UserInfo"("id");
+ALTER TABLE "UserDMP" ADD CONSTRAINT fkey_userdmp_dmp FOREIGN KEY ("dmp") REFERENCES "DMP"("ID");
+
+
 ALTER TABLE "UserInfo" OWNER TO dmptool;
 ALTER TABLE "UserAuth" OWNER TO dmptool;
+ALTER TABLE "UserDMP" OWNER TO dmptool;
 
 
 

dmp-frontend/src/app/form/dynamic-form.component.ts

@@ -53,6 +53,7 @@ export class DynamicFormComponent implements OnInit {
 
 
     this.serverService.getData().subscribe( 
+      
       response => {
 
         console.log("response");
@@ -60,6 +61,12 @@ export class DynamicFormComponent implements OnInit {
         
         const data = response;
 
+        console.log("data.dataset--BEFORE")
+        console.log(response.dataset.profile.definition)
+        console.log(response.dataset.profile.ruleset.definition)
+        console.log(response.dataset.profile.viewstyle.definition)
+
+
         //replace the xmls {model,view,rule} definitions with json -- https://github.com/abdmob/x2js library
         data.dataset.profile.definition = this.xml2jsonOBJ.xml_str2json(data.dataset.profile.definition);
         data.dataset.profile.ruleset.definition = this.xml2jsonOBJ.xml_str2json(data.dataset.profile.ruleset.definition);
@@ -68,6 +75,12 @@ export class DynamicFormComponent implements OnInit {
         
         console.log("this.serverService.getFields");
 
+        console.log("data.dataset")
+        console.log(data.dataset.profile.definition)
+        console.log(data.dataset.profile.ruleset.definition)
+        console.log(data.dataset.profile.viewstyle.definition)
+
+        
         this.dataModel = new DataModel();
         this.dataModel = this.dataModelService.getDataModel(data);