Merge pull request #37 from cloudiator/development

Development

Author: Florian Lappe

.gitignore

@@ -21,7 +21,7 @@
 
 # IDE - VSCode
 .vscode/*
-!.vscode/settings.json
+.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
@@ -43,4 +43,3 @@ Thumbs.db
 # documentation
 /documentation
 
-package-lock.json

package-lock.json

@@ -6,7 +6,7 @@
     "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",
+    "travis-test": "ng test --watch=false --environment=prod --browsers=ChromeHeadlessNoSandbox --reporters=progress,kjhtml --source-map=false",
     "lint": "ng lint",
     "e2e": "ng e2e",
     "compodoc": "npx compodoc",
@@ -22,7 +22,7 @@
     "@angular/core": "^8.1.1",
     "@angular/flex-layout": "^8.0.0-beta.26",
     "@angular/forms": "^8.1.1",
-    "@angular/http": "*",
+    "@angular/http": "7.2.15",
     "@angular/platform-browser": "^8.1.1",
     "@angular/platform-browser-dynamic": "^8.1.1",
     "@angular/pwa": "^0.801.1",
@@ -33,15 +33,19 @@
     "bulma-badge": "^2.0.0",
     "bulma-checkradio": "^2.1.1",
     "bulma-divider": "^2.0.1",
-    "cloudiator-rest-api": "1.4.0",
+    "cloudiator-rest-api": "1.5.0",
     "core-js": "^2.6.5",
     "cytoscape": "^3.8.1",
     "file-saver": "^2.0.1",
     "hammerjs": "^2.0.8",
+    "lodash": "^4.17.15",
     "node-sass": "^4.12.0",
     "rxjs": "^6.4.0",
     "sass-loader": "^7.1.0",
     "webpack": "^4.35.3",
+    "xterm": "^4.1.0",
+    "xterm-addon-attach": "^0.3.0",
+    "xterm-addon-fit": "^0.2.1",
     "zone.js": "^0.8.29"
   },
   "devDependencies": {
@@ -50,8 +54,10 @@
     "@angular/compiler-cli": "^8.1.1",
     "@angular/language-service": "^8.1.1",
     "@compodoc/compodoc": "^1.1.10",
+    "@types/cytoscape": "^3.8.1",
     "@types/jasmine": "^2.8.16",
     "@types/jasminewd2": "^2.0.6",
+    "@types/lodash": "^4.14.138",
     "@types/node": "^10.14.12",
     "bulma": "^0.7.4",
     "codelyzer": "^4.5.0",
@@ -68,6 +74,6 @@
     "protractor": "^5.4.2",
     "ts-node": "^7.0.1",
     "tslint": "^5.18.0",
-    "typescript": "<3.5.0"
+    "typescript": " >=3.4.0 <3.6.0"
   }
 }

package.json

@@ -1,10 +1,15 @@
 import {NgModule} from '@angular/core';
 import {OverlayModule} from '@angular/cdk/overlay';
-import {ToastComponent} from './dialogs/toast/toast.component';
+import {
+  ToastComponent,
+  ConfirmNewCloudDialogComponent,
+  DeleteCloudDialogComponent,
+  DeleteScheduleDialogComponent,
+  ScheduleDiagnosticDialogComponent
+} from './dialogs';
 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';
+import { SshConsoleDialogComponent } from './dialogs/ssh-console-dialog/ssh-console-dialog.component';
 
 /**
  * Main Module handling App DIalogs and Toasts.
@@ -13,7 +18,10 @@ import {DeleteCloudDialogComponent} from './dialogs/delete-cloud-dialog/delete-c
   declarations: [
     ToastComponent,
     ConfirmNewCloudDialogComponent,
-    DeleteCloudDialogComponent
+    DeleteCloudDialogComponent,
+    DeleteScheduleDialogComponent,
+    ScheduleDiagnosticDialogComponent,
+    SshConsoleDialogComponent
   ],
   imports: [
     OverlayModule
@@ -25,7 +33,10 @@ import {DeleteCloudDialogComponent} from './dialogs/delete-cloud-dialog/delete-c
   entryComponents: [
     ToastComponent,
     ConfirmNewCloudDialogComponent,
-    DeleteCloudDialogComponent
+    DeleteCloudDialogComponent,
+    DeleteScheduleDialogComponent,
+    ScheduleDiagnosticDialogComponent,
+    SshConsoleDialogComponent
   ]
 })
 export class AppDialogModule {

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

@@ -0,0 +1,16 @@
+<div class="modal is-active">
+  <div class="modal-background" (click)="onClose()"></div>
+  <div class="modal-card">
+    <header class="modal-card-head">
+      <p class="modal-card-title">Delete {{scheduleName}}</p>
+      <button class="delete" aria-label="close" (click)="onClose()"></button>
+    </header>
+    <section class="modal-card-body">
+      <div>Do you really want to delete this Schedule?</div>
+    </section>
+    <footer class="modal-card-foot">
+      <button class="button is-danger" (click)="onClose(true)">Delete</button>
+      <button class="button" (click)="onClose()">Cancel</button>
+    </footer>
+  </div>
+</div>

src/app/app-dialog/dialogs/delete-schedule-dialog/delete-schedule-dialog.component.html

@@ -0,0 +1,31 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteScheduleDialogComponent } from './delete-schedule-dialog.component';
+import {DialogRef} from '../../model/dialogRef';
+import {DIALOG_DATA} from '../../services/dialog.service';
+
+describe('DeleteScheduleDialogComponent', () => {
+  let component: DeleteScheduleDialogComponent;
+  let fixture: ComponentFixture<DeleteScheduleDialogComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DeleteScheduleDialogComponent ],
+      providers: [
+        {provide: DialogRef, useVale: {}},
+        { provide: DIALOG_DATA, useValue: {}}
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DeleteScheduleDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/app-dialog/dialogs/delete-schedule-dialog/delete-schedule-dialog.component.scss

@@ -0,0 +1,24 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {DialogRef} from '../../model/dialogRef';
+import {DIALOG_DATA} from '../../services/dialog.service';
+
+@Component({
+  selector: 'app-delete-schedule-dialog',
+  templateUrl: './delete-schedule-dialog.component.html',
+  styleUrls: ['./delete-schedule-dialog.component.scss']
+})
+export class DeleteScheduleDialogComponent implements OnInit {
+
+  public scheduleName: string;
+
+  constructor(public dialogRef: DialogRef,
+              @Inject(DIALOG_DATA) public data: any) { }
+
+  ngOnInit() {
+    this.scheduleName = this.data.scheduleName;
+  }
+
+  public onClose(result = false) {
+    this.dialogRef.close(result);
+  }
+}

src/app/app-dialog/dialogs/delete-schedule-dialog/delete-schedule-dialog.component.spec.ts

@@ -0,0 +1,15 @@
+import {ConfirmNewCloudDialogComponent} from './confirm-new-cloud-dialog/confirm-new-cloud-dialog.component';
+import {DeleteCloudDialogComponent} from './delete-cloud-dialog/delete-cloud-dialog.component';
+import {DeleteScheduleDialogComponent} from './delete-schedule-dialog/delete-schedule-dialog.component';
+import {ScheduleDiagnosticDialogComponent} from './schedule-diagnostic-dialog/schedule-diagnostic-dialog.component';
+import {ToastComponent} from './toast/toast.component';
+import {SshConsoleDialogComponent} from './ssh-console-dialog/ssh-console-dialog.component';
+
+export {
+  ConfirmNewCloudDialogComponent,
+  DeleteScheduleDialogComponent,
+  DeleteCloudDialogComponent,
+  ScheduleDiagnosticDialogComponent,
+  ToastComponent,
+  SshConsoleDialogComponent
+};

src/app/app-dialog/dialogs/delete-schedule-dialog/delete-schedule-dialog.component.ts

@@ -0,0 +1,15 @@
+<div class="modal is-active">
+  <div class="modal-background" (click)="onClose()"></div>
+  <div class="modal-card">
+    <header class="modal-card-head">
+      <p class="modal-card-title">Diagnostic {{data.task}}</p>
+      <button class="delete" aria-label="close" (click)="onClose()"></button>
+    </header>
+    <section class="modal-card-body">
+      <div>{{data.diagnostic}}</div>
+    </section>
+    <footer class="modal-card-foot">
+    </footer>
+  </div>
+</div>
+