Merge pull request #12 from cloudiator/development

Development

.gitignore

@@ -7,6 +7,7 @@
 
 # dependencies
 /node_modules
+/node_modules_bak
 
 # IDEs and editors
 /.idea

.travis.yml

@@ -1,5 +1,7 @@
 sudo: required
 language: node_js
+addons:
+  chrome: stable
 node_js:
 - node
 branches:
@@ -8,6 +10,7 @@ branches:
 before_script:
 - npm install -g @angular/cli
 script:
+- npm run travis-test
 - ng build --prod
 after_success:
 - ci/publish_docker.sh

package.json

@@ -6,56 +6,61 @@
     "start": "ng serve",
     "build": "ng build",
     "test": "ng test --browsers=Chrome --source-map=false",
+    "travis-test": "ng test --watch=false --environment=prod --browsers=ChromeHeadlessNoSandbox --reporters=progress,kjhtml",
     "lint": "ng lint",
     "e2e": "ng e2e",
     "compodoc": "npx compodoc",
-    "generate-docs": "compodoc -p tsconfig.json --includes additional_docs/",
+    "generate-docs": "compodoc -p tsconfig.compodoc.json --includes additional_docs/",
     "serve-docs": "compodoc -s tsconfig.json"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.1.9",
-    "@angular/cdk": "^6.4.2",
-    "@angular/common": "^6.1.9",
-    "@angular/compiler": "^6.1.9",
-    "@angular/core": "^6.1.9",
-    "@angular/forms": "^6.1.9",
-    "@angular/http": "^6.1.9",
-    "@angular/platform-browser": "^6.1.9",
-    "@angular/platform-browser-dynamic": "^6.1.9",
-    "@angular/router": "^6.1.9",
-    "@ngrx/store": "^6.0.1",
+    "@angular/animations": "^7.0.1",
+    "@angular/cdk": "^7.0.1",
+    "@angular/common": "^7.0.1",
+    "@angular/compiler": "^7.0.1",
+    "@angular/core": "^7.0.1",
+    "@angular/forms": "^7.0.1",
+    "@angular/http": "^7.0.1",
+    "@angular/platform-browser": "^7.0.1",
+    "@angular/platform-browser-dynamic": "^7.0.1",
+    "@angular/router": "^7.0.1",
+    "@ngrx/store": "^6.1.0",
+    "brace": "^0.11.1",
+    "bulma-badge": "^2.0.0",
     "bulma-checkradio": "^2.1.0",
     "bulma-divider": "^2.0.1",
-    "cloudiator-rest-api": "0.0.2-SNAPSHOT.201810100853",
+    "cloudiator-rest-api": "1.2.1",
     "core-js": "^2.5.4",
+    "cytoscape": "^3.2.20",
+    "file-saver": "^2.0.0-rc.4",
     "rxjs": "^6.3.3",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.8.3",
-    "@angular/cli": "~6.0.8",
-    "@angular/compiler-cli": "^6.1.9",
-    "@angular/language-service": "^6.1.9",
+    "@angular-devkit/build-angular": "^0.10.3",
+    "@angular/cli": "^7.0.3",
+    "@angular/compiler-cli": "^7.0.1",
+    "@angular/language-service": "^7.0.1",
     "@compodoc/compodoc": "^1.1.3",
-    "@types/jasmine": "^2.8.9",
-    "@types/jasminewd2": "^2.0.5",
-    "@types/node": "~8.9.4",
-    "bulma": "^0.7.1",
-    "codelyzer": "~4.2.1",
+    "@types/jasmine": "~2.8.8",
+    "@types/jasminewd2": "~2.0.3",
+    "@types/node": "^10.12.0",
+    "bulma": "^0.7.2",
+    "codelyzer": "^4.5.0",
     "hoek": "^5.0.3",
-    "jasmine-core": "~2.99.1",
+    "jasmine-core": "^2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "^3.0.0",
+    "karma": "~3.0.0",
     "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "^2.0.4",
-    "karma-jasmine": "~1.1.1",
+    "karma-coverage-istanbul-reporter": "^2.0.1",
+    "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-teamcity-reporter": "^1.1.0",
     "protractor": "^5.4.1",
-    "ts-node": "~5.0.1",
-    "tslint": "~5.9.1",
-    "typescript": "~2.7.2"
+    "ts-node": "^7.0.1",
+    "tslint": "^5.11.0",
+    "typescript": "~3.1.3"
   }
 }

src/app/app-dialog/app-dialog.module.ts

@@ -0,0 +1,29 @@
+import {NgModule} from '@angular/core';
+import {OverlayModule} from '@angular/cdk/overlay';
+import {ToastComponent} from './dialogs/toast/toast.component';
+import {DialogService} from './services/dialog.service';
+import {ToastService} from './services/toast.service';
+import {ConfirmNewCloudDialogComponent} from './dialogs/confirm-new-cloud-dialog/confirm-new-cloud-dialog.component';
+import {DeleteCloudDialogComponent} from './dialogs/delete-cloud-dialog/delete-cloud-dialog.component';
+
+@NgModule({
+  declarations: [
+    ToastComponent,
+    ConfirmNewCloudDialogComponent,
+    DeleteCloudDialogComponent
+  ],
+  imports: [
+    OverlayModule
+  ],
+  providers: [
+    DialogService,
+    ToastService
+  ],
+  entryComponents: [
+    ToastComponent,
+    ConfirmNewCloudDialogComponent,
+    DeleteCloudDialogComponent
+  ]
+})
+export class AppDialogModule {
+}

src/app/dialogs/confirm-new-cloud-dialog/confirm-new-cloud-dialog.component.spec.ts → src/app/app-dialog/dialogs/confirm-new-cloud-dialog/confirm-new-cloud-dialog.component.spec.ts

@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ConfirmNewCloudDialogComponent } from './confirm-new-cloud-dialog.component';
-import {DialogRef} from '../../model/dialogRef';
+import {DialogRef} from '../../../model/dialogRef';
 import {DIALOG_DATA} from '../../services/dialog.service';
 
 describe('ConfirmNewCloudDialogComponent', () => {
@@ -11,6 +11,7 @@ describe('ConfirmNewCloudDialogComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [ ConfirmNewCloudDialogComponent ],
+      imports: [],
       providers: [
         {provide: DialogRef, useVale: {}},
         { provide: DIALOG_DATA, useValue: {}}

src/app/dialogs/confirm-new-cloud-dialog/confirm-new-cloud-dialog.component.ts → src/app/app-dialog/dialogs/confirm-new-cloud-dialog/confirm-new-cloud-dialog.component.ts

@@ -1,5 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {DialogRef} from '../../model/dialogRef';
+import {DialogRef} from '../../../model/dialogRef';
 import {DIALOG_DATA} from '../../services/dialog.service';
 
 @Component({

src/app/dialogs/delete-cloud-dialog/delete-cloud-dialog.component.spec.ts → src/app/app-dialog/dialogs/delete-cloud-dialog/delete-cloud-dialog.component.spec.ts

@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DeleteCloudDialogComponent } from './delete-cloud-dialog.component';
-import {DialogRef} from '../../model/dialogRef';
+import {DialogRef} from '../../../model/dialogRef';
 import {DIALOG_DATA} from '../../services/dialog.service';
 
 describe('DeleteCloudDialogComponent', () => {

src/app/dialogs/delete-cloud-dialog/delete-cloud-dialog.component.ts → src/app/app-dialog/dialogs/delete-cloud-dialog/delete-cloud-dialog.component.ts

@@ -1,5 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {DialogRef} from '../../model/dialogRef';
+import {DialogRef} from '../../../model/dialogRef';
 import {DIALOG_DATA} from '../../services/dialog.service';
 
 @Component({

src/app/dialogs/toast/toast.component.spec.ts → src/app/app-dialog/dialogs/toast/toast.component.spec.ts

@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ToastComponent } from './toast.component';
-import {DialogRef} from '../../model/dialogRef';
+import {DialogRef} from '../../../model/dialogRef';
 import {DIALOG_DATA} from '../../services/dialog.service';
 
 describe('ToastComponent', () => {

src/app/dialogs/toast/toast.component.ts → src/app/app-dialog/dialogs/toast/toast.component.ts

@@ -1,7 +1,7 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {DialogRef} from '../../model/dialogRef';
+import {DialogRef} from '../../../model/dialogRef';
 import {DIALOG_DATA} from '../../services/dialog.service';
-import {Toast} from '../../model/toast';
+import {Toast} from '../../../model/toast';
 
 @Component({
   selector: 'app-toast',
@@ -13,7 +13,7 @@ export class ToastComponent implements OnInit {
   toast: Toast;
 
   constructor(public dialogRef: DialogRef,
-              @Inject(DIALOG_DATA) public data: Toast) { }
+              @Inject(DIALOG_DATA)  public data: Toast) { }
 
   ngOnInit() {
     this.toast = this.data;

src/app/services/dialog.service.spec.ts → src/app/app-dialog/services/dialog.service.spec.ts

@@ -1,17 +1,15 @@
 import {TestBed, inject} from '@angular/core/testing';
 
 import {DialogService} from './dialog.service';
-import {Injector} from '@angular/core';
-import {Overlay} from '@angular/cdk/overlay';
+import {AppDialogModule} from '../app-dialog.module';
 
 describe('DialogService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
-        DialogService,
-        Injector,
-        Overlay
-      ]
+      imports: [
+        AppDialogModule
+      ],
+      providers: []
     });
   });
 

src/app/services/dialog.service.ts → src/app/app-dialog/services/dialog.service.ts

@@ -1,7 +1,7 @@
 import {Injectable, InjectionToken, Injector} from '@angular/core';
 import {ComponentType, Overlay, OverlayConfig, OverlayRef} from '@angular/cdk/overlay';
 import {ComponentPortal, PortalInjector} from '@angular/cdk/portal';
-import {DialogRef} from '../model/dialogRef';
+import {DialogRef} from '../../model/dialogRef';
 
 /**
  * Describes the Dialog Configurations that are accessible from outside
@@ -26,9 +26,7 @@ export const DIALOG_DATA = new InjectionToken<any>('DIALOG_DATA');
 /**
  * Service to open modal Dialogs
  */
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class DialogService {
 
   /**

src/app/services/toast.service.spec.ts → src/app/app-dialog/services/toast.service.spec.ts

@@ -1,19 +1,15 @@
 import {TestBed, inject} from '@angular/core/testing';
 
 import {ToastService} from './toast.service';
-import {Overlay} from '@angular/cdk/overlay';
-import {DialogService} from './dialog.service';
-import {Injector} from '@angular/core';
+import {AppDialogModule} from '../app-dialog.module';
 
 describe('ToastService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
-        DialogService,
-        ToastService,
-        Overlay,
-        Injector
-      ]
+      imports: [
+        AppDialogModule
+      ],
+      providers: []
     });
   });
 

src/app/services/toast.service.ts → src/app/app-dialog/services/toast.service.ts

@@ -1,18 +1,16 @@
 import {Injectable} from '@angular/core';
-import {Toast} from '../model/toast';
+import {Toast} from '../../model/toast';
 import {DialogService} from './dialog.service';
 import {ToastComponent} from '../dialogs/toast/toast.component';
-import {DialogRef} from '../model/dialogRef';
+import {DialogRef} from '../../model/dialogRef';
 import {interval, Subscription} from 'rxjs';
-import {environment} from '../../environments/environment';
+import {environment} from '../../../environments/environment';
 
 /**
  * Handler for notifications. Currently only supports one notification at a time.
  */
 
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class ToastService {
 
   private toastRef: DialogRef = null;

src/app/app-routing.module.ts

@@ -6,6 +6,7 @@ import {CloudViewComponent} from './components/clouds/cloud-view/cloud-view.comp
 import {HardwareOverviewComponent} from './components/hardware/hardware-overview/hardware-overview.component';
 import {ImagesOverviewComponent} from './components/images/images-overview/images-overview.component';
 import {LocationsOverviewComponent} from './components/locations/locations-overview/locations-overview.component';
+import {YamlEditorComponent} from './components/editor/yaml-editor/yaml-editor.component';
 
 const routes: Routes = [
 
@@ -19,6 +20,8 @@ const routes: Routes = [
 
   {path: 'locations', component: LocationsOverviewComponent},
 
+  {path: 'editor', component: YamlEditorComponent},
+
   {path: 'clouds', component: CloudOverviewComponent},
   {path: '', component: CloudOverviewComponent},