From c5e8e6ba62cd18755a82d603fe6219a29102f30c Mon Sep 17 00:00:00 2001 From: tillias Date: Fri, 6 Nov 2020 21:38:32 +0100 Subject: [PATCH] Code cleanup and refactoring #86 --- .../create-dependency-dialog.component.scss | 0 .../create-dependency-dialog.component.ts | 1 - .../dependency-dashboard.component.scss | 0 .../dependency-dashboard.component.ts | 13 ++++++------- .../edge-legend/edge-legend.component.scss | 0 .../edge-legend/edge-legend.component.ts | 1 - .../node-legend/graph-legend.component.scss | 0 .../node-legend/graph-legend.component.ts | 1 - .../vertex-legend/vertex-legend.component.scss | 0 .../vertex-legend/vertex-legend.component.ts | 1 - .../impact-analysis-dashboard.component.scss | 0 .../impact-analysis-dashboard.component.ts | 1 - .../impact-analysis-graph.component.scss | 0 .../impact-analysis-graph.component.ts | 7 +++---- .../impact-analysis-legend.component.scss | 0 .../impact-analysis-legend.component.ts | 5 ++--- .../release-graph/release-graph.component.scss | 0 .../release-graph/release-graph.component.ts | 7 +++---- .../release-path-dashboard.component.scss | 0 .../release-path-dashboard.component.ts | 1 - .../release-path/release-path.component.scss | 0 .../release-path/release-path.component.ts | 7 +++---- .../microservice-card.component.scss | 0 .../microservice-card.component.ts | 1 - .../microservice-dashboard.component.scss | 0 .../microservice-dashboard.component.ts | 1 - .../microservice-search.component.scss | 0 .../microservice-search.component.ts | 1 - .../microservice-custom-details.component.scss | 0 .../microservice-custom-details.component.ts | 3 +-- 30 files changed, 18 insertions(+), 33 deletions(-) delete mode 100644 src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.scss delete mode 100644 src/main/webapp/app/dashboard/dependency-dashboard/dependency-dashboard.component.scss delete mode 100644 src/main/webapp/app/dashboard/dependency-dashboard/node-legend/edge-legend/edge-legend.component.scss delete mode 100644 src/main/webapp/app/dashboard/dependency-dashboard/node-legend/graph-legend.component.scss delete mode 100644 src/main/webapp/app/dashboard/dependency-dashboard/node-legend/vertex-legend/vertex-legend.component.scss delete mode 100644 src/main/webapp/app/dashboard/impact-analysis/impact-analysis-dashboard.component.scss delete mode 100644 src/main/webapp/app/dashboard/impact-analysis/impact-analysis-graph/impact-analysis-graph.component.scss delete mode 100644 src/main/webapp/app/dashboard/impact-analysis/impact-analysis-legend/impact-analysis-legend.component.scss delete mode 100644 src/main/webapp/app/dashboard/release-path-dashboard/release-graph/release-graph.component.scss delete mode 100644 src/main/webapp/app/dashboard/release-path-dashboard/release-path-dashboard.component.scss delete mode 100644 src/main/webapp/app/dashboard/release-path-dashboard/release-path/release-path.component.scss delete mode 100644 src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.scss delete mode 100644 src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.scss delete mode 100644 src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.scss delete mode 100644 src/main/webapp/app/entities/microservice/microservice-details/microservice-custom-details.component.scss diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.scss b/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts b/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts index 8152c8a..106599c 100644 --- a/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts +++ b/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts @@ -9,7 +9,6 @@ import { finalize } from 'rxjs/operators'; @Component({ selector: 'jhi-create-dependency-dialog', templateUrl: './create-dependency-dialog.component.html', - styleUrls: ['./create-dependency-dialog.component.scss'], }) export class CreateDependencyDialogComponent implements OnInit { source?: IMicroservice; diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/dependency-dashboard.component.scss b/src/main/webapp/app/dashboard/dependency-dashboard/dependency-dashboard.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/dependency-dashboard.component.ts b/src/main/webapp/app/dashboard/dependency-dashboard/dependency-dashboard.component.ts index e02f5a6..6859c6f 100644 --- a/src/main/webapp/app/dashboard/dependency-dashboard/dependency-dashboard.component.ts +++ b/src/main/webapp/app/dashboard/dependency-dashboard/dependency-dashboard.component.ts @@ -1,22 +1,21 @@ import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { DependencyService } from '../../entities/dependency/dependency.service'; -import { IMicroservice } from '../../shared/model/microservice.model'; -import { EXPERIMENTAL_FEATURE } from '../../app.constants'; +import { DependencyService } from 'app/entities/dependency/dependency.service'; +import { IMicroservice } from 'app/shared/model/microservice.model'; +import { EXPERIMENTAL_FEATURE } from 'app/app.constants'; import { CreateDependencyDialogService } from './create-dependency-dialog/create-dependency-dialog.service'; import { JhiEventManager } from 'ng-jhipster'; import { forkJoin, Subscription } from 'rxjs'; -import { MicroserviceService } from '../../entities/microservice/microservice.service'; +import { MicroserviceService } from 'app/entities/microservice/microservice.service'; import { map } from 'rxjs/operators'; import { ISelectPayload, SelectPayload } from '../../shared/vis/events/VisEvents'; import { DeleteDialogService } from './delete-dialog.service'; import { FilterContext, GraphBuilderService } from './graph-builder.service'; -import { ReleasePathCustomService } from '../../entities/release-path/custom/release-path-custom.service'; -import { VisNetworkService } from '../../shared/vis/vis-network.service'; +import { ReleasePathCustomService } from 'app/entities/release-path/custom/release-path-custom.service'; +import { VisNetworkService } from 'app/shared/vis/vis-network.service'; @Component({ selector: 'jhi-dependency-dashboard', templateUrl: './dependency-dashboard.component.html', - styleUrls: ['./dependency-dashboard.component.scss'], }) export class DependencyDashboardComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild('visNetwork', { static: false }) diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/edge-legend/edge-legend.component.scss b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/edge-legend/edge-legend.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/edge-legend/edge-legend.component.ts b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/edge-legend/edge-legend.component.ts index 9fca96e..a34c5f7 100644 --- a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/edge-legend/edge-legend.component.ts +++ b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/edge-legend/edge-legend.component.ts @@ -7,7 +7,6 @@ import { IDependency } from 'app/shared/model/dependency.model'; @Component({ selector: 'jhi-edge-legend', templateUrl: './edge-legend.component.html', - styleUrls: ['./edge-legend.component.scss'], }) export class EdgeLegendComponent implements OnInit { selection?: ISelectPayload; diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/graph-legend.component.scss b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/graph-legend.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/graph-legend.component.ts b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/graph-legend.component.ts index 641c656..c81a23e 100644 --- a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/graph-legend.component.ts +++ b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/graph-legend.component.ts @@ -4,7 +4,6 @@ import { ISelectPayload } from 'app/shared/vis/events/VisEvents'; @Component({ selector: 'jhi-node-legend', templateUrl: './graph-legend.component.html', - styleUrls: ['./graph-legend.component.scss'], }) export class GraphLegendComponent implements OnInit { @Input() nodeSelection?: ISelectPayload; diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/vertex-legend/vertex-legend.component.scss b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/vertex-legend/vertex-legend.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/vertex-legend/vertex-legend.component.ts b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/vertex-legend/vertex-legend.component.ts index e65c405..2394175 100644 --- a/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/vertex-legend/vertex-legend.component.ts +++ b/src/main/webapp/app/dashboard/dependency-dashboard/node-legend/vertex-legend/vertex-legend.component.ts @@ -7,7 +7,6 @@ import { map } from 'rxjs/operators'; @Component({ selector: 'jhi-vertex-legend', templateUrl: './vertex-legend.component.html', - styleUrls: ['./vertex-legend.component.scss'], }) export class VertexLegendComponent implements OnInit { selection?: ISelectPayload; diff --git a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-dashboard.component.scss b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-dashboard.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-dashboard.component.ts b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-dashboard.component.ts index a3659f3..d3b339c 100644 --- a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-dashboard.component.ts +++ b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-dashboard.component.ts @@ -3,7 +3,6 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'jhi-impact-analysis-dashboard', templateUrl: './impact-analysis-dashboard.component.html', - styleUrls: ['./impact-analysis-dashboard.component.scss'], }) export class ImpactAnalysisDashboardComponent implements OnInit { constructor() {} diff --git a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-graph/impact-analysis-graph.component.scss b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-graph/impact-analysis-graph.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-graph/impact-analysis-graph.component.ts b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-graph/impact-analysis-graph.component.ts index f92629a..fbacd07 100644 --- a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-graph/impact-analysis-graph.component.ts +++ b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-graph/impact-analysis-graph.component.ts @@ -1,14 +1,13 @@ import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { IResult } from '../../../shared/model/impact/analysis/result.model'; -import { VisNetworkService } from '../../../shared/vis/vis-network.service'; +import { IResult } from 'app/shared/model/impact/analysis/result.model'; +import { VisNetworkService } from 'app/shared/vis/vis-network.service'; import { DataSet } from 'vis-data/peer'; -import { NodeColorsService } from '../../release-path-dashboard/node-colors.service'; +import { NodeColorsService } from 'app/dashboard/release-path-dashboard/node-colors.service'; @Component({ selector: 'jhi-impact-analysis-graph', templateUrl: './impact-analysis-graph.component.html', - styleUrls: ['./impact-analysis-graph.component.scss'], }) export class ImpactAnalysisGraphComponent implements OnInit, AfterViewInit { @ViewChild('visNetwork', { static: false }) diff --git a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-legend/impact-analysis-legend.component.scss b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-legend/impact-analysis-legend.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-legend/impact-analysis-legend.component.ts b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-legend/impact-analysis-legend.component.ts index bd6c994..d4b35f6 100644 --- a/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-legend/impact-analysis-legend.component.ts +++ b/src/main/webapp/app/dashboard/impact-analysis/impact-analysis-legend/impact-analysis-legend.component.ts @@ -1,12 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import { IResult } from '../../../shared/model/impact/analysis/result.model'; +import { IResult } from 'app/shared/model/impact/analysis/result.model'; import { ActivatedRoute } from '@angular/router'; -import { IMicroservice } from '../../../shared/model/microservice.model'; +import { IMicroservice } from 'app/shared/model/microservice.model'; @Component({ selector: 'jhi-impact-analysis-legend', templateUrl: './impact-analysis-legend.component.html', - styleUrls: ['./impact-analysis-legend.component.scss'], }) export class ImpactAnalysisLegendComponent implements OnInit { analysisResult?: IResult; diff --git a/src/main/webapp/app/dashboard/release-path-dashboard/release-graph/release-graph.component.scss b/src/main/webapp/app/dashboard/release-path-dashboard/release-graph/release-graph.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/release-path-dashboard/release-graph/release-graph.component.ts b/src/main/webapp/app/dashboard/release-path-dashboard/release-graph/release-graph.component.ts index e8678d3..847898b 100644 --- a/src/main/webapp/app/dashboard/release-path-dashboard/release-graph/release-graph.component.ts +++ b/src/main/webapp/app/dashboard/release-path-dashboard/release-graph/release-graph.component.ts @@ -1,14 +1,13 @@ import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { VisNetworkService } from '../../../shared/vis/vis-network.service'; -import { NodeColorsService } from '../node-colors.service'; -import { IReleasePath } from '../../../shared/model/release-path.model'; +import { VisNetworkService } from 'app/shared/vis/vis-network.service'; +import { NodeColorsService } from 'app/dashboard/release-path-dashboard/node-colors.service'; +import { IReleasePath } from 'app/shared/model/release-path.model'; import { DataSet } from 'vis-data/peer'; @Component({ selector: 'jhi-release-graph', templateUrl: './release-graph.component.html', - styleUrls: ['./release-graph.component.scss'], }) export class ReleaseGraphComponent implements OnInit, AfterViewInit { @ViewChild('visNetwork', { static: false }) diff --git a/src/main/webapp/app/dashboard/release-path-dashboard/release-path-dashboard.component.scss b/src/main/webapp/app/dashboard/release-path-dashboard/release-path-dashboard.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/release-path-dashboard/release-path-dashboard.component.ts b/src/main/webapp/app/dashboard/release-path-dashboard/release-path-dashboard.component.ts index ea639ec..a21ebb1 100644 --- a/src/main/webapp/app/dashboard/release-path-dashboard/release-path-dashboard.component.ts +++ b/src/main/webapp/app/dashboard/release-path-dashboard/release-path-dashboard.component.ts @@ -3,7 +3,6 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'jhi-release-path-dashboard', templateUrl: './release-path-dashboard.component.html', - styleUrls: ['./release-path-dashboard.component.scss'], }) export class ReleasePathDashboardComponent implements OnInit { constructor() {} diff --git a/src/main/webapp/app/dashboard/release-path-dashboard/release-path/release-path.component.scss b/src/main/webapp/app/dashboard/release-path-dashboard/release-path/release-path.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/dashboard/release-path-dashboard/release-path/release-path.component.ts b/src/main/webapp/app/dashboard/release-path-dashboard/release-path/release-path.component.ts index 04165a5..105906e 100644 --- a/src/main/webapp/app/dashboard/release-path-dashboard/release-path/release-path.component.ts +++ b/src/main/webapp/app/dashboard/release-path-dashboard/release-path/release-path.component.ts @@ -1,15 +1,14 @@ import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import { IReleasePath } from '../../../shared/model/release-path.model'; +import { IReleasePath } from 'app/shared/model/release-path.model'; import { ActivatedRoute } from '@angular/router'; -import { VisNetworkService } from '../../../shared/vis/vis-network.service'; +import { VisNetworkService } from 'app/shared/vis/vis-network.service'; import { NodeColorsService } from '../node-colors.service'; import { DataSet } from 'vis-data/peer'; -import { IReleaseGroup } from '../../../shared/model/release-group.model'; +import { IReleaseGroup } from 'app/shared/model/release-group.model'; @Component({ selector: 'jhi-release-path', templateUrl: './release-path.component.html', - styleUrls: ['./release-path.component.scss'], }) export class ReleasePathComponent implements OnInit, AfterViewInit { @ViewChild('visNetwork', { static: false }) diff --git a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.scss b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.ts b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.ts index 8c975b3..323cb2b 100644 --- a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.ts +++ b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.ts @@ -6,7 +6,6 @@ import { EXPERIMENTAL_FEATURE } from 'app/app.constants'; @Component({ selector: 'jhi-microservice-card', templateUrl: './microservice-card.component.html', - styleUrls: ['./microservice-card.component.scss'], }) export class MicroserviceCardComponent implements OnInit { @Input() microservice!: IMicroservice; diff --git a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.scss b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.ts b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.ts index a075568..44c3544 100644 --- a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.ts +++ b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.ts @@ -9,7 +9,6 @@ import { IMicroserviceGroupFilter, MicroserviceGroupFilter } from 'app/shared/mo @Component({ selector: 'jhi-microservice-dashboard', templateUrl: './microservice-dashboard.component.html', - styleUrls: ['./microservice-dashboard.component.scss'], }) export class MicroserviceDashboardComponent implements OnInit, OnDestroy { microservices: IMicroservice[]; diff --git a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.scss b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts index e8ea5a2..758bdd4 100644 --- a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts +++ b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts @@ -8,7 +8,6 @@ import { IMicroserviceGroupFilter } from 'app/shared/model/util/microservice-gro @Component({ selector: 'jhi-microservice-search', templateUrl: './microservice-search.component.html', - styleUrls: ['./microservice-search.component.scss'], }) export class MicroserviceSearchComponent implements OnInit { model: any; diff --git a/src/main/webapp/app/entities/microservice/microservice-details/microservice-custom-details.component.scss b/src/main/webapp/app/entities/microservice/microservice-details/microservice-custom-details.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/webapp/app/entities/microservice/microservice-details/microservice-custom-details.component.ts b/src/main/webapp/app/entities/microservice/microservice-details/microservice-custom-details.component.ts index 3cd3b48..776461e 100644 --- a/src/main/webapp/app/entities/microservice/microservice-details/microservice-custom-details.component.ts +++ b/src/main/webapp/app/entities/microservice/microservice-details/microservice-custom-details.component.ts @@ -1,12 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import { IMicroservice } from '../../../shared/model/microservice.model'; +import { IMicroservice } from 'app/shared/model/microservice.model'; import { JhiDataUtils } from 'ng-jhipster'; import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'jhi-microservice-details', templateUrl: './microservice-custom-details.component.html', - styleUrls: ['./microservice-custom-details.component.scss'], }) export class MicroserviceCustomDetailsComponent implements OnInit { microservice: IMicroservice | null = null;