Merge branch 'develop' into release/0.8.0

Author: janniclas

build.sbt

@@ -4,7 +4,9 @@ name := "delphi-management"
 
 organization := "de.upb"
 
-version := "0.8.0"
+
+version := "0.9.0-SNAPSHOT"
+
 
 scalaVersion := "2.12.4"
 

client/package-lock.json

@@ -24,6 +24,7 @@
     "@ng-bootstrap/ng-bootstrap": "^4.0.1",
     "bootstrap": "^4.1.3",
     "core-js": "^2.6.2",
+    "cytoscape": "^3.3.2",
     "font-awesome": "^4.7.0",
     "hammerjs": "^2.0.8",
     "jquery": "^3.3.1",
@@ -37,6 +38,7 @@
     "@angular/cli": "^7.2.2",
     "@angular/compiler-cli": "^7.2.1",
     "@angular/language-service": "^7.2.1",
+    "@types/cytoscape": "^3.2.9",
     "@types/jasmine": "^3.3.5",
     "@types/jasminewd2": "^2.0.6",
     "@types/node": "^10.12.18",

client/package.json

@@ -21,7 +21,7 @@ import {CustomHttpUrlEncodingCodec} from '../encoder';
 import {Instance} from '../../model/models/instance';
 import {SysInfo} from '../../model/models/sysInfo';
 import { Inject, Injectable, Optional } from '@angular/core';
-import { HttpClient, HttpHeaders, HttpParams, HttpEvent } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { Configuration } from '../configuration';
 import {

client/src/app/api/api/api.service.ts

@@ -33,4 +33,5 @@
       <app-statuscard></app-statuscard>
     </div>
   </div>
+  <button type="button" class="btn btn-primary" routerLink="/dashboard/graphView" routerLinkActive="active">Go To Graph View</button>
 </div>

client/src/app/dashboard/dashboard-overview/dashboard-overview.component.html

@@ -26,6 +26,7 @@ import {UserManagementComponent} from './user-management/user-management.compone
 import {WebApiComponent} from './webapi/web-api.component';
 import {UserProfileComponent} from './user-profile/user-profile.component';
 import {HelpComponent} from '../help/help.component';
+import { GraphViewComponent } from './graph-view/graph-view/graph-view.component';
 
 
 const dashboardRoutes: Routes = [
@@ -60,6 +61,10 @@ const dashboardRoutes: Routes = [
       {
         path: 'help',
         component: HelpComponent
+      },
+      {
+        path: 'graphView',
+        component: GraphViewComponent
       }
     ]
   }];

client/src/app/dashboard/dashboard-routing.module.spec.ts

@@ -38,6 +38,7 @@ import { AddDialogComponent } from './add-dialog/add-dialog.component';
 import {ApiModule} from '../api/api.module';
 import {ModelModule} from '../model/model.module';
 import { MaterialModule } from '../material-module/material.module';
+import { GraphViewModule } from './graph-view/graph-view.module';
 
 
 @NgModule({
@@ -51,7 +52,8 @@ import { MaterialModule } from '../material-module/material.module';
     DashboardRoutingModule,
     DashboardRoutingModule,
     ApiModule,
-    ModelModule
+    ModelModule,
+    GraphViewModule
   ],
   declarations: [
     DashboardCardComponent,

client/src/app/dashboard/dashboard-routing.module.ts

@@ -0,0 +1,17 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {GraphViewComponent} from './graph-view/graph-view.component';
+import {GraphViewService} from './graph-view.service';
+import {ModelModule} from '../../model/model.module';
+
+@NgModule({
+  declarations: [GraphViewComponent],
+  imports: [
+    CommonModule,
+    ModelModule
+  ],
+  exports: [GraphViewComponent],
+  providers: [GraphViewService]
+})
+export class GraphViewModule {
+}

client/src/app/dashboard/dashboard.module.ts

@@ -0,0 +1,15 @@
+import {TestBed} from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import {GraphViewService} from './graph-view.service';
+
+describe('GraphViewService', () => {
+  beforeEach(() => TestBed.configureTestingModule({
+    imports: [HttpClientTestingModule],
+    providers: [GraphViewService]
+  }));
+
+  it('should be created', () => {
+    const service: GraphViewService = TestBed.get(GraphViewService);
+    expect(service).toBeTruthy();
+  });
+});