info and protocols

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

@@ -1,9 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { InfoComponent } from './info/info.component';
+import { ProtocolsComponent } from './protocols/protocols.component';
 
 const routes: Routes = [
-  {path:"info", component:InfoComponent}
+  { path:"info"                   , component:InfoComponent},
+  { path:"adv_resources/protocol" , component:ProtocolsComponent}
 ];
 
 @NgModule({

frontends/dnet-is-application/src/app/app.component.css

@@ -0,0 +1,18 @@
+.sidenav-container {
+    height: 100%;
+  }
+  
+ .sidenav {
+    width: 400px;
+ }
+  
+ .sidenav .mat-toolbar {
+    background: inherit;
+ }
+  
+ .mat-toolbar.mat-primary {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+ }
+  

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

@@ -1,5 +1,27 @@
-<app-main-container></app-main-container>
+<mat-sidenav-container class="sidenav-container">
-
+    <mat-sidenav #drawer class="sidenav" fixedInViewport
+        [attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
+        [mode]="(isHandset$ | async) ? 'over' : 'side'"
+        [opened]="(isHandset$ | async) === false">
+      <mat-toolbar>Menu</mat-toolbar>
+      <app-main-menu-tree></app-main-menu-tree>
+    </mat-sidenav>
+    <mat-sidenav-content>
+      <mat-toolbar color="primary">
+        <button
+          type="button"
+          aria-label="Toggle sidenav"
+          mat-icon-button
+          (click)="drawer.toggle()"
+          *ngIf="isHandset$ | async">
+          <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
+        </button>
+        <span>{{title}}</span>
+      </mat-toolbar>
     
+      <!-- The routed views render in the <router-outlet>-->
+      <router-outlet></router-outlet>
     
+    </mat-sidenav-content>
+  </mat-sidenav-container>
   

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

@@ -1,8 +1,44 @@
-import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { LayoutModule } from '@angular/cdk/layout';
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from '@angular/material/list';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatToolbarModule } from '@angular/material/toolbar';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
+
+  let component: AppComponent;
+  let fixture: ComponentFixture<AppComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [AppComponent],
+      imports: [
+        NoopAnimationsModule,
+        LayoutModule,
+        MatButtonModule,
+        MatIconModule,
+        MatListModule,
+        MatSidenavModule,
+        MatToolbarModule,
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AppComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should compile', () => {
+    expect(component).toBeTruthy();
+  });
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
@@ -33,3 +69,6 @@ describe('AppComponent', () => {
     expect(compiled.querySelector('.content span')?.textContent).toContain('dnet-is-application app is running!');
   });
 });
+
+
+

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

@@ -1,5 +1,8 @@
 import { Component } from '@angular/core';
 import { TitleStrategy } from '@angular/router';
+import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
+import { Observable } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
 
 @Component({
   selector: 'app-root',
@@ -7,6 +10,14 @@ import { TitleStrategy } from '@angular/router';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = 'dnet-is-application';
+  title = 'D-NET Information Service Application';
+  
+  isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
+  .pipe(
+    map(result => result.matches),
+    shareReplay()
+  );
+
+  constructor(private breakpointObserver: BreakpointObserver) {}
 
 }

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

@@ -14,24 +14,22 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
-import {FlatTreeControl} from '@angular/cdk/tree';
+import { MatTreeModule} from '@angular/material/tree';
-import {MatTree, MatTreeFlatDataSource, MatTreeFlattener, MatTreeNode, MatTreeModule} from '@angular/material/tree';
-import { MainContainerComponent } from './main-container/main-container.component';
 import { MainMenuTreeComponent } from './main-menu-tree/main-menu-tree.component';
 import { MatBadgeModule } from '@angular/material/badge';
 import { MatCardModule } from '@angular/material/card';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input'
 import { MatTableModule } from '@angular/material/table';
-
+import { ProtocolsComponent } from './protocols/protocols.component';
 
 @NgModule({
   declarations: [
     AppComponent,
     InfoComponent,
     DatafilterPipe,
-    MainContainerComponent,
+    MainMenuTreeComponent,
-    MainMenuTreeComponent
+    ProtocolsComponent
   ],
   imports: [
     BrowserModule,

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

@@ -1,18 +1,17 @@
-<div class="infoPage">
+<mat-card>
-
-  <h1>Container Info </h1>
-
-  <mat-form-field>
-      <mat-label>Filter</mat-label>
-      <input matInput (keyup)="applyFilter($event)" placeholder="Filter..." #input>
-  </mat-form-field>
-
-  <ng-container *ngFor="let section of kvDatasources">
-    <mat-card *ngIf="section.datasource.filteredData.length > 0">
   <mat-card-header>
-          <mat-card-title>{{section.name}}</mat-card-title>
+    <mat-card-title>Container Info</mat-card-title>
   </mat-card-header>
   <mat-card-content>
+    
+    <mat-form-field style="margin-top: 3em; width: 100%;">
+      <mat-label>Filter</mat-label>
+      <input matInput (keyup)="applyFilter($event)" placeholder="Filter..." #input />
+    </mat-form-field>
+
+    <div *ngFor="let section of kvDatasources">
+      <div style="margin-top: 3em;" *ngIf="section.datasource.filteredData.length > 0">
+        <h3>{{section.name}}</h3>
         <table mat-table [dataSource]="section.datasource" class="mat-elevation-z8">
 
           <ng-container matColumnDef="k">
@@ -29,18 +28,15 @@
 
           <!-- Row shown when there is no matching data. -->
           <tr class="mat-row" *matNoDataRow>
-            <td class="mat-cell" colspan="4">No data matching the filter "{{input.value}}"</td>
+            <td class="mat-cell" colspan="2">No data matching the filter "{{input.value}}"</td>
           </tr>
         </table>
-      </mat-card-content>
+      </div>
-    </mat-card>
+    </div>
-  </ng-container>
 
-  <mat-card *ngIf="moduleDatasource.filteredData.length > 0">
+
-    <mat-card-header>
+      <div style="margin-top: 3em;" *ngIf="moduleDatasource.filteredData.length > 0">
-        <mat-card-title>Modules</mat-card-title>
+        <h3>Modules</h3>
-    </mat-card-header>
-    <mat-card-content>
         <table mat-table [dataSource]="moduleDatasource" class="mat-elevation-z8">
 
           <ng-container matColumnDef="group">
@@ -71,9 +67,14 @@
             <td class="mat-cell" colspan="4">No data matching the filter "{{input.value}}"</td>
           </tr>
         </table>
+      </div>
+
   </mat-card-content>
 </mat-card>
-</div>
+
+
+
+
 
 
 
@@ -119,5 +120,3 @@
     </mat-card>
 </ng-container>
 -->
-
-

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

@@ -16,7 +16,7 @@ export interface Module {
 
 export interface KeyValueDatasource {
   name: string;
-  datasource: MatTableDataSource<any[]>;
+  datasource: MatTableDataSource<any>;
 }
 
 
@@ -26,7 +26,6 @@ export interface KeyValueDatasource {
   styleUrls: ['./info.component.css']
 })
 export class InfoComponent {
-  infoFilter?:string;
   
   kvDatasources:KeyValueDatasource[] = [];
   moduleDatasource:MatTableDataSource<Module[]> = new MatTableDataSource<Module[]>([]); 
@@ -59,17 +58,4 @@ export class InfoComponent {
     this.moduleDatasource.filter = filterValue;
   }
 
-  getFilteredInfo(data:any[]) {
-    if (this.infoFilter) {
-      return data.filter(obj => {
-        return Object.keys(obj).reduce((acc, curr) => {            
-            return acc || obj[curr].toString().toLowerCase().includes(this.infoFilter);
-        }, false);
-      })
-    }
-    else
-    return data
-    
-  }
-
 }

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

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { ResourceType } from './model/controller.model';
+import { ResourceType,Protocol } from './model/controller.model';
 import { Observable, Observer } from 'rxjs';
+
 @Injectable({
   providedIn: 'root'
 })
@@ -18,5 +19,8 @@ export class ISCommonService {
     return this.client.get<any[]>("/ajax/info/");
   }
 
+  loadProtocols():Observable<Protocol[]> {
+    return this.client.get<any[]>("/ajax/protocols/");
+  }
 
 }

frontends/dnet-is-application/src/app/main-container/main-container.component.css

@@ -1,17 +0,0 @@
-.sidenav-container {
-  height: 100%;
-}
-
-.sidenav {
-  width: 400px;
-}
-
-.sidenav .mat-toolbar {
-  background: inherit;
-}
-
-.mat-toolbar.mat-primary {
-  position: sticky;
-  top: 0;
-  z-index: 1;
-}

frontends/dnet-is-application/src/app/main-container/main-container.component.html

@@ -1,26 +0,0 @@
-<mat-sidenav-container class="sidenav-container">
-  <mat-sidenav #drawer class="sidenav" fixedInViewport
-      [attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
-      [mode]="(isHandset$ | async) ? 'over' : 'side'"
-      [opened]="(isHandset$ | async) === false">
-    <mat-toolbar>Menu</mat-toolbar>
-    <app-main-menu-tree></app-main-menu-tree>
-  </mat-sidenav>
-  <mat-sidenav-content>
-    <mat-toolbar color="primary">
-      <button
-        type="button"
-        aria-label="Toggle sidenav"
-        mat-icon-button
-        (click)="drawer.toggle()"
-        *ngIf="isHandset$ | async">
-        <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
-      </button>
-      <span>dnet-is-application</span>
-    </mat-toolbar>
-  
-    <!-- The routed views render in the <router-outlet>-->
-    <router-outlet></router-outlet>
-  
-  </mat-sidenav-content>
-</mat-sidenav-container>

frontends/dnet-is-application/src/app/main-container/main-container.component.spec.ts

@@ -1,40 +0,0 @@
-import { LayoutModule } from '@angular/cdk/layout';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
-import { MatListModule } from '@angular/material/list';
-import { MatSidenavModule } from '@angular/material/sidenav';
-import { MatToolbarModule } from '@angular/material/toolbar';
-
-import { MainContainerComponent } from './main-container.component';
-
-describe('MainContainerComponent', () => {
-  let component: MainContainerComponent;
-  let fixture: ComponentFixture<MainContainerComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [MainContainerComponent],
-      imports: [
-        NoopAnimationsModule,
-        LayoutModule,
-        MatButtonModule,
-        MatIconModule,
-        MatListModule,
-        MatSidenavModule,
-        MatToolbarModule,
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MainContainerComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should compile', () => {
-    expect(component).toBeTruthy();
-  });
-});

frontends/dnet-is-application/src/app/main-container/main-container.component.ts

@@ -1,21 +0,0 @@
-import { Component } from '@angular/core';
-import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
-import { Observable } from 'rxjs';
-import { map, shareReplay } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-main-container',
-  templateUrl: './main-container.component.html',
-  styleUrls: ['./main-container.component.css']
-})
-export class MainContainerComponent {
-
-  isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
-    .pipe(
-      map(result => result.matches),
-      shareReplay()
-    );
-
-  constructor(private breakpointObserver: BreakpointObserver) {}
-
-}

frontends/dnet-is-application/src/app/main-menu-tree/main-menu-tree.component.ts

@@ -56,8 +56,10 @@ export class MainMenuTreeComponent {
             badge: resType.count.toString()
           }
           if (resType.simple) {
+            item.route = '/resources/' + resType.id;
             simpleResources.push(item)
           } else {
+            item.route = '/adv_resources/' + resType.id;
             advancedResources.push(item)
           }
         })

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

@@ -6,3 +6,15 @@ export interface ResourceType{
     simple:boolean	
 }
 
+export interface ProtocolParams {
+    name:string
+    label:string
+    type:string
+    optional:boolean
+    hasSelFunction:boolean
+}
+
+export interface Protocol {
+    id: string
+    params: ProtocolParams[]
+}

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

@@ -0,0 +1,51 @@
+<mat-card>
+    <mat-card-header>
+        <mat-card-title>Harvesting Protocols</mat-card-title>
+    </mat-card-header>
+    <mat-card-content>
+        <div style="margin-top: 20px;" *ngFor="let prot of protDatasources">
+            <h3>{{prot.protocol}}</h3>
+
+            <table mat-table [dataSource]="prot.datasource" class="mat-elevation-z8">
+
+                <ng-container matColumnDef="name">
+                    <th mat-header-cell *matHeaderCellDef> Name </th>
+                    <td mat-cell *matCellDef="let element"> {{element.name}} </td>
+                </ng-container>
+
+                <ng-container matColumnDef="label">
+                    <th mat-header-cell *matHeaderCellDef> Label </th>
+                    <td mat-cell *matCellDef="let element"> {{element.label}} </td>
+                </ng-container>
+
+                <ng-container matColumnDef="type">
+                    <th mat-header-cell *matHeaderCellDef> Type </th>
+                    <td mat-cell *matCellDef="let element"> {{element.type}} </td>
+                </ng-container>
+
+                <ng-container matColumnDef="optional">
+                    <th mat-header-cell *matHeaderCellDef> Required </th>
+                    <td mat-cell *matCellDef="let element">
+                        <mat-icon fontIcon="check" *ngIf="!element.optional"></mat-icon>
+                    </td>
+                </ng-container>
+
+                <ng-container matColumnDef="hasSelFunction">
+                    <th mat-header-cell *matHeaderCellDef> Has Sel Function </th>
+                    <td mat-cell *matCellDef="let element">
+                        <mat-icon fontIcon="check" *ngIf="element.hasSelFunction"></mat-icon>
+                    </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">No parameters</td>
+                </tr>
+            </table>
+        </div>
+    </mat-card-content>
+
+</mat-card>

frontends/dnet-is-application/src/app/protocols/protocols.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProtocolsComponent } from './protocols.component';
+
+describe('ProtocolsComponent', () => {
+  let component: ProtocolsComponent;
+  let fixture: ComponentFixture<ProtocolsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ProtocolsComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(ProtocolsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,35 @@
+import { Component } from '@angular/core';
+import { ISCommonService } from '../iscommon.service';
+import { MatTableDataSource } from '@angular/material/table';
+import { Protocol, ProtocolParams } from '../model/controller.model';
+
+export interface ProtocolDatasource {
+  protocol: string;
+  datasource: MatTableDataSource<ProtocolParams>;
+}
+
+@Component({
+  selector: 'app-protocols',
+  templateUrl: './protocols.component.html',
+  styleUrls: ['./protocols.component.css']
+})
+export class ProtocolsComponent {
+  protDatasources:ProtocolDatasource[] = [];
+  colums : string[] = ['name', 'label', 'type', 'optional', 'hasSelFunction'];
+
+  constructor(public service:ISCommonService)  {
+    this.service.loadProtocols().subscribe({
+      next:(data:Protocol[]) => {
+        data.forEach(p => {
+          this.protDatasources.push({
+            protocol   : p.id,
+            datasource : new MatTableDataSource(p.params)
+         });
+        })
+      },
+      error:error => console.log(error),
+      complete:() => console.log("Completed")
+    })
+  }
+
+}