vocabulary terms

frontends/dnet-is-application/src/app/app.module.ts

@@ -29,7 +29,7 @@ import { MatSortModule } from '@angular/material/sort';
 import { ResourcesComponent, ResContentDialog, ResCreateNewDialog, ResMetadataDialog } from './resources/resources.component'
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { ContextsComponent, ContextViewerComponent, ContextParamsDialog } from './contexts/contexts.component';
-import { VocabulariesComponent, VocabularyEditorComponent, VocDialog } from './vocabularies/vocabularies.component';
+import { VocabulariesComponent, VocabularyEditorComponent, VocDialog, VocTermDialog } from './vocabularies/vocabularies.component';
 
 @NgModule({
   declarations: [
@@ -50,7 +50,8 @@ import { VocabulariesComponent, VocabularyEditorComponent, VocDialog } from './v
     ContextParamsDialog,
     VocabulariesComponent,
     VocabularyEditorComponent,
-    VocDialog
+    VocDialog,
+    VocTermDialog
   ],
   imports: [
     BrowserModule,

frontends/dnet-is-application/src/app/is.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { ResourceType, Protocol, WfHistoryEntry, SimpleResource, Context, ContextNode, Vocabulary } from './model/controller.model';
+import { ResourceType, Protocol, WfHistoryEntry, SimpleResource, Context, ContextNode, Vocabulary, VocabularyTerm } from './model/controller.model';
 import { Observable, Observer } from 'rxjs';
 import { FormGroup } from '@angular/forms';
 import { MatSnackBar } from '@angular/material/snack-bar';
@@ -140,13 +140,34 @@ export class ISService {
     });
   }
 
+  loadVocabulary(vocId:string, onSuccess: Function): void {
+    this.client.get<Vocabulary>('./ajax/vocs/' + encodeURIComponent(vocId)).subscribe({
+      next: data => onSuccess(data),
+      error: error => this.showError(error)
+    });
+  }
+
+  loadVocabularyTerms(vocId:string, onSuccess: Function): void {
+    this.client.get<VocabularyTerm[]>('./ajax/vocs/' + encodeURIComponent(vocId) + '/terms').subscribe({
+      next: data => onSuccess(data),
+      error: error => this.showError(error)
+    });
+  }
+
   saveVocabulary(voc:Vocabulary, onSuccess: Function, relatedForm?: FormGroup): void {
     this.client.post<void>('./ajax/vocs/', voc).subscribe({
       next: data => onSuccess(data),
       error: error => this.showError(error, relatedForm)
     });
   }
-  
+
+  saveVocabularyTerm(vocId:string, term:VocabularyTerm, onSuccess: Function, relatedForm?: FormGroup): void {
+    this.client.post<void>('./ajax/vocs/' + encodeURIComponent(vocId) + '/terms', term).subscribe({
+      next: data => onSuccess(data),
+      error: error => this.showError(error, relatedForm)
+    });
+  }
+
   deleteVocabulary(vocId:string, onSuccess: Function): void {
     this.client.delete<void>('./ajax/vocs/' + encodeURIComponent(vocId)).subscribe({
       next: data => onSuccess(data),
@@ -154,6 +175,17 @@ export class ISService {
     });
   }
 
+  deleteVocabularyTerm(vocId:string, termCode:string, onSuccess: Function): void {
+    this.client.delete<void>('./ajax/vocs/' 
+      + encodeURIComponent(vocId) 
+      + '/terms/' 
+      + encodeURIComponent(termCode)
+    ).subscribe({
+      next: data => onSuccess(data),
+      error: error => this.showError(error)
+    });
+  }
+
   private showError(error: any, form?: FormGroup) {
     const msg = this.errorMessage(error);
     if (form) {

frontends/dnet-is-application/src/app/model/controller.model.ts

@@ -1,9 +1,9 @@
 export interface ResourceType {
-    id:string
+    id: string
-    name:string
+    name: string
-    contentType:string
+    contentType: string
-	count:number
+    count: number
-    simple:boolean	
+    simple: boolean
 }
 
 export interface KeyValue {
@@ -19,11 +19,11 @@ export interface Module {
 }
 
 export interface ProtocolParams {
-    name:string
+    name: string
-    label:string
+    label: string
-    type:string
+    type: string
-    optional:boolean
+    optional: boolean
-    hasSelFunction:boolean
+    hasSelFunction: boolean
 }
 
 export interface Protocol {
@@ -41,7 +41,7 @@ export interface WfHistoryEntry {
     dsId?: string,
     dsName?: string,
     dsApi?: string,
-    details: Map<string,string>
+    details: Map<string, string>
 }
 
 export interface SimpleResource {
@@ -81,4 +81,17 @@ export interface Vocabulary {
     id: string,
     name: string,
     description?: string
-}
+}
+
+export interface VocabularyTermSynonym {
+    term: string,
+    encoding: string
+}
+
+export interface VocabularyTerm {
+    code: string,
+    vocabulary: string,
+    name: string,
+    encoding: string,
+    synonyms: VocabularyTermSynonym[]
+}

frontends/dnet-is-application/src/app/vocabularies/voc-term-dialog.html

@@ -0,0 +1 @@
+XXXXXX

frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.html

@@ -30,7 +30,7 @@
     <th mat-header-cell *matHeaderCellDef style="text-align: right;"></th>
     <td mat-cell *matCellDef="let element" class="table-buttons">
         <button mat-stroked-button color="primary" (click)="editVocabularyDialog(element)">edit</button>
-        <button mat-stroked-button color="warn" (click)="deleteVocabularyDialog(element)">delete</button>
+        <button mat-stroked-button color="warn" (click)="deleteVocabulary(element)">delete</button>
     </td>
   </ng-container>
 

frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts

@@ -1,4 +1,4 @@
-import { Component, Inject,AfterViewInit, OnInit, ViewChild } from '@angular/core';
+import { Component, Inject, AfterViewInit, OnInit, ViewChild } from '@angular/core';
 import { ISService } from '../is.service';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatSort, Sort } from '@angular/material/sort';
@@ -7,22 +7,23 @@ import { ActivatedRoute, Params } from '@angular/router';
 import { Observable, combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { KeyValue, ContextParam } from '../model/controller.model';
+import { VocabularyTerm } from '../model/controller.model';
 import { FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
+import { EmitterVisitorContext } from '@angular/compiler';
 
 @Component({
   selector: 'app-vocabularies',
   templateUrl: './vocabularies.component.html',
   styleUrls: ['./vocabularies.component.css']
 })
-export class VocabulariesComponent {
+export class VocabulariesComponent implements OnInit, AfterViewInit {
   vocsDatasource: MatTableDataSource<Vocabulary> = new MatTableDataSource<Vocabulary>([]);
 
   colums: string[] = ['id', 'name', 'description', 'buttons'];
 
   @ViewChild(MatSort) sort: MatSort | undefined
 
-  constructor(public service: ISService, public route: ActivatedRoute, public dialog: MatDialog)  {
+  constructor(public service: ISService, public route: ActivatedRoute, public dialog: MatDialog) {
   }
 
   ngOnInit() {
@@ -30,7 +31,7 @@ export class VocabulariesComponent {
   }
 
   ngAfterViewInit() {
-    if(this.sort) this.vocsDatasource.sort = this.sort;
+    if (this.sort) this.vocsDatasource.sort = this.sort;
   }
 
   reload() {
@@ -41,11 +42,11 @@ export class VocabulariesComponent {
     const filterValue = (event.target as HTMLInputElement).value.trim().toLowerCase();
     this.vocsDatasource.filter = filterValue;
   }
-  
+
   newVocabularyDialog(): void {
-        const dialogRef = this.dialog.open(VocDialog, {
+    const dialogRef = this.dialog.open(VocDialog, {
-          data: { id: '', name: '', description: '' },
+      data: { id: '', name: '', description: '' },
-          width: '80%'
+      width: '80%'
     });
 
     dialogRef.afterClosed().subscribe(result => {
@@ -64,12 +65,11 @@ export class VocabulariesComponent {
     });
   }
 
-  deleteVocabularyDialog(vocabulary: Vocabulary): void {
+  deleteVocabulary(vocabulary: Vocabulary): void {
     if (confirm("Are you sure?")) {
-      this.service.deleteVocabulary(vocabulary.id , (data:void) => this.reload());
+      this.service.deleteVocabulary(vocabulary.id, (data: void) => this.reload());
     }
   }
-    
 
 }
 
@@ -78,7 +78,71 @@ export class VocabulariesComponent {
   templateUrl: './vocabulary-editor.component.html',
   styleUrls: ['./vocabularies.component.css']
 })
-export class VocabularyEditorComponent {
+export class VocabularyEditorComponent implements OnInit, AfterViewInit {
+
+  voc?: Vocabulary
+
+  termsDatasource: MatTableDataSource<VocabularyTerm> = new MatTableDataSource<VocabularyTerm>([]);
+  colums: string[] = ['code', 'name', 'encoding', 'synonyms', 'buttons'];
+
+  @ViewChild(MatSort) sort: MatSort | undefined
+
+  constructor(public service: ISService, public route: ActivatedRoute, public dialog: MatDialog) {
+  }
+
+  ngOnInit() {
+    this.reload();
+  }
+
+  ngAfterViewInit() {
+    if (this.sort) this.termsDatasource.sort = this.sort;
+  }
+
+  reload() {
+    this.route.queryParams.subscribe((params) => {
+      this.service.loadVocabulary(params['id'], (data: Vocabulary) => this.voc = data);
+      this.service.loadVocabularyTerms(params['id'], (data: VocabularyTerm[]) => this.termsDatasource.data = data);
+    });
+  }
+
+  applyFilter(event: Event) {
+    const filterValue = (event.target as HTMLInputElement).value.trim().toLowerCase();
+    this.termsDatasource.filter = filterValue;
+  }
+
+  newVocabularyTermDialog(): void {
+    if (this.voc?.id) {
+      const dialogRef = this.dialog.open(VocTermDialog, {
+        data: { vocabulary: this.voc.id, code: '', name: '', encoding: '', synonyms: []},
+        width: '80%'
+      });
+
+      dialogRef.afterClosed().subscribe(result => {
+        if (result) this.reload();
+      });
+    }
+
+  }
+
+  editVocabularyTermDialog(term: VocabularyTerm): void {
+    const dialogRef = this.dialog.open(VocTermDialog, {
+      data: term,
+      width: '80%'
+    });
+
+    dialogRef.afterClosed().subscribe(result => {
+      if (result) this.reload();
+    });
+  }
+
+  deleteVocabularyTerm(term: VocabularyTerm): void {
+    if (confirm("Are you sure?") && this.voc?.id && term.code) {
+      this.service.deleteVocabularyTerm(this.voc.id, term.code, (data: void) => this.reload());
+    }
+  }
+
+
+
 }
 
 @Component({
@@ -88,22 +152,50 @@ export class VocabularyEditorComponent {
 })
 export class VocDialog {
   vocForm = new FormGroup({
-    id:  new FormControl(''),
+    id: new FormControl(''),
-    name:  new FormControl(''),
+    name: new FormControl(''),
-    description : new FormControl('')
+    description: new FormControl('')
   });
 
-  constructor(public dialogRef: MatDialogRef<VocDialog>,  @Inject(MAT_DIALOG_DATA) public data: any, public service: ISService) {
+  constructor(public dialogRef: MatDialogRef<VocDialog>, @Inject(MAT_DIALOG_DATA) public data: any, public service: ISService) {
     this.vocForm.get('id')?.setValue(data.id);
     this.vocForm.get('name')?.setValue(data.name);
     this.vocForm.get('description')?.setValue(data.description);
   }
-  
+
-  onSubmit():void {
+  onSubmit(): void {
     const voc = Object.assign({}, this.data, this.vocForm.value);
     this.service.saveVocabulary(voc, (data: void) => this.dialogRef.close(1), this.vocForm);
   }
 
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}
+
+@Component({
+  selector: 'voc-term-dialog',
+  templateUrl: 'voc-term-dialog.html',
+  styleUrls: ['vocabularies.component.css']
+})
+export class VocTermDialog {
+  termForm = new FormGroup({
+    code: new FormControl(''),
+    name: new FormControl(''),
+    encoding: new FormControl('')
+  });
+
+  constructor(public dialogRef: MatDialogRef<VocDialog>, @Inject(MAT_DIALOG_DATA) public data: any, public service: ISService) {
+    this.termForm.get('code')?.setValue(data.id);
+    this.termForm.get('name')?.setValue(data.name);
+    this.termForm.get('encoding')?.setValue(data.encoding);
+  }
+
+  onSubmit(): void {
+    const term = Object.assign({}, this.data, this.termForm.value);
+    this.service.saveVocabularyTerm(term.vocabulary, term, (data: void) => this.dialogRef.close(1), this.termForm);
+  }
+
   onNoClick(): void {
     this.dialogRef.close();
   }

frontends/dnet-is-application/src/app/vocabularies/vocabulary-editor.component.html

@@ -1 +1,61 @@
-VOC EDITOR
+<h2>Vocabulary Editor</h2>
+
+<p>
+    <b>Vocabulary ID: </b>{{voc?.id}}<br />
+    <b>Vocabulary Name: </b>{{voc?.name}}<br />
+    <b>Description: </b>{{voc?.description}}
+</p>
+
+<p>
+    <a mat-stroked-button color="primary" [routerLink]="['/adv_resources/vocabulary']">return to vocabulary list</a>
+    <button mat-stroked-button color="primary" (click)="newVocabularyTermDialog()">create a new term</button>
+    <a mat-stroked-button color="primary" href="/api/vocs/{{voc?.id}}/terms" target="_blank">Download</a>
+</p>
+
+<mat-form-field style="width: 100%; margin-top: 10px;">
+  <mat-label>Filter</mat-label>
+  <input matInput (keyup)="applyFilter($event)" placeholder="Filter..." #input />
+</mat-form-field>
+
+<table mat-table [dataSource]="termsDatasource" matSort class="mat-elevation-z8">
+
+  <ng-container matColumnDef="code">
+    <th mat-header-cell *matHeaderCellDef style="width: 15%;" mat-sort-header sortActionDescription="Sort by Code"> Code </th>
+    <td mat-cell *matCellDef="let element"><b>{{element.code}}</b></td>
+  </ng-container>
+
+  <ng-container matColumnDef="name">
+    <th mat-header-cell *matHeaderCellDef style="width: 15%;" mat-sort-header sortActionDescription="Sort by Name"> Name </th>
+    <td mat-cell *matCellDef="let element"> {{element.name}} </td>
+  </ng-container>
+
+  <ng-container matColumnDef="encoding">
+    <th mat-header-cell *matHeaderCellDef style="width: 10%;" mat-sort-header sortActionDescription="Sort by Encoding"> Encoding </th>
+    <td mat-cell *matCellDef="let element">{{element.encoding}}</td>
+  </ng-container>
+
+  <ng-container matColumnDef="synonyms">
+    <th mat-header-cell *matHeaderCellDef style="width: 40%;" mat-sort-header sortActionDescription="Sort by Synonyms"> Description </th>
+    <td mat-cell *matCellDef="let element" style="font-size: 0,7em;">
+        <span *ngFor="let s of element.synonyms" class="badge-label badge-info"> 
+            {{s.term}}
+        </span>
+    </td>
+  </ng-container>
+
+  <ng-container matColumnDef="buttons">
+    <th mat-header-cell *matHeaderCellDef style="text-align: right;"></th>
+    <td mat-cell *matCellDef="let element" class="table-buttons">
+        <button mat-stroked-button color="primary" (click)="editVocabularyTermDialog(element)">edit</button>
+        <button mat-stroked-button color="warn" (click)="deleteVocabularyTerm(element)">delete</button>
+    </td>
+  </ng-container>
+
+  <tr mat-header-row *matHeaderRowDef="colums"></tr>
+  <tr mat-row *matRowDef="let row; columns: colums;"></tr>
+
+  <!-- Row shown when there is no matching data. -->
+  <tr class="mat-row" *matNoDataRow>
+    <td class="mat-cell" colspan="5" style="padding: 0 16px;">No data matching the filter "{{input.value}}"</td>
+  </tr>
+</table>