created a standalone material module which imports all material moduls to cleanup the import structure of the other modules.

sneaked in some code cleanup (removed unused exports, removed outcommented code etc)

Author: janniclas

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

@@ -16,23 +16,19 @@
  * limitations under the License.
  */
 
-import { TestBed, async,fakeAsync, inject } from '@angular/core/testing';
+import { TestBed, async, inject } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { ApiService } from './api.service';
 import { HttpClientModule } from '@angular/common/http';
 
 describe('ApiService', () => {
 
-  let service, http;
-
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, HttpClientModule],
       providers: [ApiService],
     });
 
-    service = TestBed.get(ApiService);
-    http = TestBed.get(HttpTestingController);
   });
 
 

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

@@ -98,7 +98,7 @@ export class SocketService {
        */
       const registeredEvents = Object.keys(this.observers);
 
-      let publishEventName;
+      let publishEventName: EventType;
       /**
        * Map all numbers changed event to global registry event
        */

client/src/app/dashboard/add-dialog/add-dialog.component.ts

@@ -1,5 +1,5 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
+import { Component, OnInit } from '@angular/core';
+import { MatDialogRef } from '@angular/material';
 import { FormControl, Validators } from '@angular/forms';
 import { ApiService} from '../../api/api/api.service';
 

client/src/app/dashboard/crawler/crawler.component.ts

@@ -32,7 +32,6 @@ export class CrawlerComponent implements OnInit {
   compType: string;
 
   constructor(private apiService: ApiService) {
-  
   }
 
   ngOnInit() {
@@ -42,7 +41,7 @@ export class CrawlerComponent implements OnInit {
     this.apiService.getInstances(ComponentTypeEnum.Crawler).subscribe((result: Array<Instance>) => {
       this.tableData = result;
     }, err => {
-      console.log('error receiving data for crawler');
+      console.log('error receiving data for crawler', err);
     });
   }
 

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

@@ -25,11 +25,9 @@ <h5 class="card-title custom_title">{{title}}</h5>
     </div>
       <div class="text-center">
       <button type="button" class="btn btn-primary custom_btn" routerLink={{route}} routerLinkActive="active">View Details</button>
-      <!--<button type="button" class="btn btn-secondary custom_btn">Logs/Statistics</button>-->
     </div>
     <hr>
     <div class="text-center">
       <p class="card-text">Number of Instances: {{numberOfInstances}}</p>
-      <!--<p class="card-text">Number of failed Instances: {{numberOfFailedInstances}}</p>-->
-    </div>
     </div>
+</div>

client/src/app/dashboard/dashboard-card/dashboard-card.component.spec.ts

@@ -15,8 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 import { async, TestBed, inject } from '@angular/core/testing';
 import { Location } from '@angular/common';
 import { Router } from '@angular/router';
@@ -36,8 +34,6 @@ import { ApiService } from 'src/app/api/api/api.service';
 
 
 describe('component: DashboardCardComponent', () => {
-  let location;
-  let router;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -53,13 +49,11 @@ describe('component: DashboardCardComponent', () => {
   });
 
   beforeEach(inject([Router, Location], (_router: Router, _location: Location) => {
-    location = _location;
-    router = _router;
   }));
 
 
   it(`should create`, async(inject([HttpTestingController, ApiService],
-    (httpClient: HttpTestingController, apiService: ApiService) => {
+    (apiService: ApiService) => {
       expect(apiService).toBeTruthy();
   })));
 });

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

@@ -19,18 +19,18 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col-md-3 col-sm-4">
-    <app-dashboard-card route="crawler" componentType={{crawler}} title="Crawler" img="../assets/images/crawler.png"></app-dashboard-card>
+      <app-dashboard-card route="crawler" componentType={{crawler}} title="Crawler" img="../assets/images/crawler.png"></app-dashboard-card>
     </div>
     <div class="col-md-3 col-sm-4">
-    <app-dashboard-card route="webApi" componentType={{webApi}} title="Web API" img="../assets/images/webapi.png"></app-dashboard-card>
+      <app-dashboard-card route="webApi" componentType={{webApi}} title="Web API" img="../assets/images/webapi.png"></app-dashboard-card>
     </div>
     <div class="col-md-3 col-sm-4">
-    <app-dashboard-card route="webapp" componentType={{webApp}} title="Web APP" img="../assets/images/webapp.png"></app-dashboard-card>
+      <app-dashboard-card route="webapp" componentType={{webApp}} title="Web APP" img="../assets/images/webapp.png"></app-dashboard-card>
     </div>
-    <div class="col-md-1 col-sm-4">
+      <div class="col-md-1 col-sm-4">
     </div>
     <div class="col-md-2 col-sm-4">
-    <app-statuscard></app-statuscard>
+      <app-statuscard></app-statuscard>
+    </div>
   </div>
 </div>
-</div>

client/src/app/dashboard/dashboard.component.spec.ts

@@ -16,18 +16,17 @@
  * limitations under the License.
  */
 
-import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
+import { async, TestBed, inject } from '@angular/core/testing';
 import { Location } from '@angular/common';
-import { Router, RouterOutlet } from '@angular/router';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { HeaderComponent } from './header/header.component';
 import { DashboardComponent } from './dashboard.component';
-import {HttpClientModule} from '@angular/common/http';
 
 
 describe('component: DashboardComponent', () => {
 
-  let location, router;
+  let location: Location, router: Router;
 
 
   beforeEach(() => {

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

@@ -21,8 +21,6 @@ import { DashboardModule } from './dashboard.module';
 describe('DashboardModule', () => {
   let dashboardModule: DashboardModule;
 
-
-
   beforeEach(() => {
     dashboardModule = new DashboardModule();
   });

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

@@ -19,15 +19,8 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import { MatButtonModule, MatMenuModule, MatTableModule, MatPaginatorModule} from '@angular/material';
-import { MatIconModule} from '@angular/material/icon';
-import { MatCheckboxModule} from '@angular/material/checkbox';
-import { MatDialogModule} from '@angular/material/dialog';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatFormFieldModule} from '@angular/material/form-field';
-import { MatInputModule} from '@angular/material/input';
-import { MatTooltipModule} from '@angular/material/tooltip';
 import { DashboardRoutingModule } from './dashboard-routing.module';
 import { DashboardCardComponent } from './dashboard-card/dashboard-card.component';
 import { DashboardComponent } from './dashboard.component';
@@ -43,25 +36,17 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
 import { DeleteDialogComponent } from './delete-dialog/delete-dialog.component';
 import { AddDialogComponent } from './add-dialog/add-dialog.component';
 import {ApiModule} from '../api/api.module';
+import { MaterialModule } from '../material-module/material.module';
 
 
 @NgModule({
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
-    MatButtonModule,
-    MatMenuModule,
-    MatIconModule,
-    MatTableModule,
-    MatPaginatorModule,
-    MatCheckboxModule,
-    MatDialogModule,
+    MaterialModule,
     CommonModule,
     FormsModule,
     ReactiveFormsModule,
-    MatFormFieldModule,
-    MatInputModule,
-    MatTooltipModule,
     DashboardRoutingModule,
     DashboardRoutingModule,
     ApiModule