Merge pull request #137 from SUSE/merge-upstream

Merge upstream

angular.json

@@ -80,14 +80,6 @@
             "protractorConfig": "./protractor.conf.js",
             "devServerTarget": "stratos:serve"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/test-e2e/tsconfig.e2e.json"
-            ]
-          }
         }
       }
     },
@@ -175,7 +167,8 @@
             "tsConfig": ["src/tsconfig.json"],
             "tslintConfig": "src/frontend/packages/core/tslint.json",
             "files": [
-              "src/frontend/packages/core/src/**/*.ts"
+              "src/frontend/packages/core/src/**/*.ts",
+              "src/frontend/packages/core/src/custom/**/*.ts"
             ]
           }
         }

build/karma.conf.creator.js

@@ -43,13 +43,8 @@ module.exports = function (project) {
       },
       singleRun: process.env.CI_ENV ? true : false,
       files: [{
-          pattern: './src/**/*.spec.ts',
-          watched: false
-        },
-        {
-          pattern: path.join(repoRoot, 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css')
-        }
-      ],
+        pattern: path.join(repoRoot, 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css')
+      }],
       exclude: [
         '**/*-e2e.spec.ts'
       ]

custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts

@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
-import { HelmReleaseService } from '../../../services/helm-release.service';
+import { Component } from '@angular/core';
 import { combineLatest, Observable } from 'rxjs';
-import { deepStrictEqual } from 'assert';
 import { map } from 'rxjs/operators';
 
+import { HelmReleaseService } from '../../../services/helm-release.service';
+
 @Component({
   selector: 'app-helm-release-summary-card',
   templateUrl: './helm-release-summary-card.component.html',
@@ -19,12 +19,12 @@ export class HelmReleaseSummaryCardComponent {
     this.chartName$ = combineLatest(this.helmReleaseService.deployments$, this.helmReleaseService.statefulSets$).pipe(
       map(([deployments, statefulsets]) => {
         if (deployments.length !== 0) {
-          return deployments[0].metadata.labels['chart'];
+          return deployments[0].metadata.labels.chart;
         }
         if (statefulsets.length !== 0) {
-          return statefulsets[0].metadata.labels['chart'];
+          return statefulsets[0].metadata.labels.chart;
         }
       })
     );
-   }
+  }
 }

custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts

@@ -1,15 +1,17 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
+import { AppState } from '../../../../../../store/src/app-state';
+import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
+import {
+  BaseEndpointsDataSource,
+} from '../../../../shared/components/list/list-types/cf-endpoints/base-endpoints-data-source';
 import {
   EndpointCardComponent,
-} from '../../../../shared/components/list/list-types/cf-endpoints/cf-endpoint-card/endpoint-card.component';
+} from '../../../../shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component';
 import { endpointColumns } from '../../../../shared/components/list/list-types/endpoint/endpoints-list-config.service';
 import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types';
-import { AppState } from '../../../../../../store/src/app-state';
-import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
-import { BaseEndpointsDataSource } from '../../../../shared/components/list/list-types/cf-endpoints/base-endpoints-data-source';
 
 @Injectable()
 export class KubernetesEndpointsListConfigService implements IListConfig<EndpointModel> {

custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts

@@ -1,8 +1,9 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { ConditionType, Condition } from '../../../../../store/kube.types';
-import { KubernetesNodeService } from '../../../../../services/kubernetes-node.service';
-import { map, filter } from 'rxjs/operators';
+import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+
+import { KubernetesNodeService } from '../../../../../services/kubernetes-node.service';
+import { Condition, ConditionType } from '../../../../../store/kube.types';
 
 @Component({
   selector: 'app-kubernetes-node-condition',
@@ -20,17 +21,17 @@ export class KubernetesNodeConditionComponent implements OnInit {
   inverse = false;
 
   public titles = {
-    'Ready': 'Ready',
-    'OutOfDisk': 'Out of Disk',
-    'MemoryPressure': 'Memory Pressure',
-    'DiskPressure': 'Disk Pressure'
+    Ready: 'Ready',
+    OutOfDisk: 'Out of Disk',
+    MemoryPressure: 'Memory Pressure',
+    DiskPressure: 'Disk Pressure'
   };
 
   public icons = {
-    'Ready': ['done_outline', 'material-icons'],
-    'OutOfDisk': ['storage', 'material-icons'],
-    'MemoryPressure': ['memory', 'material-icons'],
-    'DiskPressure': ['storage', 'material-icons'],
+    Ready: ['done_outline', 'material-icons'],
+    OutOfDisk: ['storage', 'material-icons'],
+    MemoryPressure: ['memory', 'material-icons'],
+    DiskPressure: ['storage', 'material-icons'],
   };
 
   constructor(

custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts

@@ -5,6 +5,11 @@ import * as moment from 'moment';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { AppState } from '../../../../../store/src/app-state';
+import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
+import { EntityInfo } from '../../../../../store/src/types/api.types';
+import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
+import { IMetricApplication } from '../../../../../store/src/types/metric.types';
 import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
 import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers';
 import { MetricsConfig } from '../../../shared/components/metrics-chart/metrics-chart.component';
@@ -14,11 +19,6 @@ import {
   getMetricsChartConfigBuilder,
 } from '../../../shared/components/metrics-chart/metrics.component.helpers';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
-import { AppState } from '../../../../../store/src/app-state';
-import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
-import { EntityInfo } from '../../../../../store/src/types/api.types';
-import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types';
-import { IMetricApplication } from '../../../../../store/src/types/metric.types';
 import { BaseKubeGuid } from '../kubernetes-page.types';
 import { HelmReleaseService } from '../services/helm-release.service';
 import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
@@ -66,12 +66,12 @@ export class PodMetricsComponent {
     public entityServiceFactory: EntityServiceFactory,
     public kubeEndpointService: KubernetesEndpointService
   ) {
-    this.podName = activatedRoute.snapshot.params['podName'];
+    this.podName = activatedRoute.snapshot.params.podName;
     this.namespaceName = getIdFromRoute(activatedRoute, 'namespaceName');
     const namespace = getIdFromRoute(activatedRoute, 'namespace') ? getIdFromRoute(activatedRoute, 'namespace') : this.namespaceName;
     const chartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>(result => `${result.metric.container_name}`);
     const cpuChartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>
-    (result => !!result.metric.cpu ? `${result.metric.container_name}:${result.metric.cpu}` : `${result.metric.container_name}`);
+      (result => !!result.metric.cpu ? `${result.metric.container_name}:${result.metric.cpu}` : `${result.metric.container_name}`);
     const networkChartConfigBuilder = getMetricsChartConfigBuilder<IMetricApplication>
       (result => `Network Interface: ${result.metric.interface}`);
     this.instanceMetricConfigs = [

custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts

@@ -4,15 +4,15 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, share } from 'rxjs/operators';
 
-import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers';
-import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers';
+import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory';
 import { KubernetesApp, KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types';
 import { GetKubernetesApps, GetKubernetesServices } from '../store/kubernetes.actions';
-import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 import { kubernetesAppsSchemaKey, kubernetesServicesSchemaKey } from '../store/kubernetes.entities';
+import { KubernetesEndpointService } from './kubernetes-endpoint.service';
 
 @Injectable()
 export class HelmReleaseService {
@@ -37,7 +37,7 @@ export class HelmReleaseService {
 
     this.helmRelease$ = getPaginationObservables<KubernetesApp>({
       store: this.store,
-      action: action,
+      action,
       paginationMonitor: this.paginationMonitorFactory.create(
         action.paginationKey,
         entityFactory(kubernetesAppsSchemaKey)
@@ -71,7 +71,7 @@ export class HelmReleaseService {
       filter(p => !!p),
       map(p => {
         return p.filter(r => {
-          return r.metadata.labels['release'] === this.helmReleaseName;
+          return r.metadata.labels.release === this.helmReleaseName;
         });
 
       }),