From 40844cf07e8637ee7b13b53cf1a5dd5bc9158f6d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 9 Jul 2021 13:51:21 +0200
Subject: [PATCH] Client: clean up some sonar issues
---
.../apps/goofy/src/app/app.component.ts | 4 +--
.../goofy/src/environments/environment.ts | 3 ---
.../command-shared/src/lib/command.service.ts | 2 +-
.../src/lib/environment.model.ts | 4 +--
.../src/lib/forwarding.model.ts | 2 +-
.../vorgang-forward.formservice.ts | 2 +-
.../src/lib/kommentar.service.ts | 26 +++++++++----------
.../lib/navigation/navigation.component.ts | 10 +++----
.../libs/tech-shared/src/lib/tech.util.ts | 3 +--
.../lib/validation/tech.validation.util.ts | 4 +--
.../validation-error.component.ts | 4 +--
.../vorgang-detail-area.component.ts | 5 ++--
.../antragsteller/antragsteller.component.ts | 13 +++++-----
.../src/lib/vorgang-command.service.ts | 4 +--
14 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/goofy-client/apps/goofy/src/app/app.component.ts b/goofy-client/apps/goofy/src/app/app.component.ts
index 9f5575128d..fd2a515aef 100644
--- a/goofy-client/apps/goofy/src/app/app.component.ts
+++ b/goofy-client/apps/goofy/src/app/app.component.ts
@@ -49,7 +49,7 @@ export class AppComponent implements OnInit {
}
private buildConfiguration(): AuthConfig {
- const authConfig: AuthConfig = {
+ return {
// Url of the Identity Provider
issuer: this.envConfig.authServer + '/realms/' + this.envConfig.realm,
@@ -68,8 +68,6 @@ export class AppComponent implements OnInit {
scope: 'openid profile email',
requireHttps: false
};
-
- return authConfig;
}
}
diff --git a/goofy-client/apps/goofy/src/environments/environment.ts b/goofy-client/apps/goofy/src/environments/environment.ts
index 01d182c9ea..8acdf29e56 100644
--- a/goofy-client/apps/goofy/src/environments/environment.ts
+++ b/goofy-client/apps/goofy/src/environments/environment.ts
@@ -2,9 +2,6 @@
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
-import { isFakeMousedownFromScreenReader } from '@angular/cdk/a11y';
-import { Environment } from 'libs/environment-shared/src/lib/environment.model';
-
export const environment = {
production: false,
environmentUrl: null
diff --git a/goofy-client/libs/command-shared/src/lib/command.service.ts b/goofy-client/libs/command-shared/src/lib/command.service.ts
index bc43c69fd3..9d1a2cec8d 100644
--- a/goofy-client/libs/command-shared/src/lib/command.service.ts
+++ b/goofy-client/libs/command-shared/src/lib/command.service.ts
@@ -16,7 +16,7 @@ export class CommandService {
public createCommand(resource: Resource, linkRel: string, command: CreateCommand): Observable<StateResource<CommandResource>> {
return this.repository.createCommand(resource, linkRel, command).pipe(
- mergeMap(command => this.startPolling(command)),
+ mergeMap(createdCommand => this.startPolling(createdCommand)),
catchError(apiError => of(createErrorStateResource(apiError))) //TODO only status code 422
);
}
diff --git a/goofy-client/libs/environment-shared/src/lib/environment.model.ts b/goofy-client/libs/environment-shared/src/lib/environment.model.ts
index 7362d346ed..39f6efbc62 100644
--- a/goofy-client/libs/environment-shared/src/lib/environment.model.ts
+++ b/goofy-client/libs/environment-shared/src/lib/environment.model.ts
@@ -3,6 +3,6 @@ import { ResourceUri } from '@ngxp/rest/lib/resource.model';
export interface Environment {
production: boolean,
remoteHost: ResourceUri,
- authServer: String,
- realm: String
+ authServer: string,
+ realm: string
}
\ No newline at end of file
diff --git a/goofy-client/libs/forwarding-shared/src/lib/forwarding.model.ts b/goofy-client/libs/forwarding-shared/src/lib/forwarding.model.ts
index 451bd6d066..2cbeb42f6a 100644
--- a/goofy-client/libs/forwarding-shared/src/lib/forwarding.model.ts
+++ b/goofy-client/libs/forwarding-shared/src/lib/forwarding.model.ts
@@ -10,6 +10,6 @@ export interface Forwarding {
createdByName: string;
}
-export interface ForwardingResource extends Forwarding, Resource { };
+export interface ForwardingResource extends Forwarding, Resource { }
export interface ForwardingListResource extends ListResource { }
\ No newline at end of file
diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts
index ac2b91a6f7..d18e35eb33 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts
@@ -25,7 +25,7 @@ export class VorgangForwardFormService extends AbstractFormService {
}
protected initForm(): FormGroup {
- return this.form = this.formBuilder.group({
+ return this.formBuilder.group({
[VorgangForwardFormService.FIELD_EMAIL]: new FormControl(),
[VorgangForwardFormService.FIELD_PASSWORD]: new FormControl()
})
diff --git a/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts b/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts
index 13af8dc5e4..481898de03 100644
--- a/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts
+++ b/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts
@@ -1,15 +1,15 @@
-import { Injectable } from "@angular/core";
-import { Params } from "@angular/router";
-import { CommandResource, CommandService, CreateCommand, isDone } from "@goofy-client/command-shared";
-import { createEmptyStateResource, createStateResource, doIfLoadingRequired, NavigationService, StateResource } from "@goofy-client/tech-shared";
-import { VorgangResource, VorgangService } from "@goofy-client/vorgang-shared";
-import { Resource } from "@ngxp/rest";
-import { isNil } from "lodash";
-import { BehaviorSubject, Observable, Subscription } from "rxjs";
-import { startWith, tap } from "rxjs/operators";
-import { KommentarLinkRel, KommentarListLinkRel } from "./kommentar.linkrel";
-import { CreateKommentarCommand, Kommentar, KommentarListResource, KommentarOrder, KommentarResource } from "./kommentar.model";
-import { KommentarRepository } from "./kommentar.repository";
+import { Injectable } from '@angular/core';
+import { Params } from '@angular/router';
+import { CommandResource, CommandService, CreateCommand, isDone } from '@goofy-client/command-shared';
+import { createEmptyStateResource, createStateResource, doIfLoadingRequired, NavigationService, StateResource } from '@goofy-client/tech-shared';
+import { VorgangResource, VorgangService } from '@goofy-client/vorgang-shared';
+import { Resource } from '@ngxp/rest';
+import { isNil } from 'lodash';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { startWith, tap } from 'rxjs/operators';
+import { KommentarLinkRel, KommentarListLinkRel } from './kommentar.linkrel';
+import { CreateKommentarCommand, Kommentar, KommentarListResource, KommentarOrder, KommentarResource } from './kommentar.model';
+import { KommentarRepository } from './kommentar.repository';
@Injectable({ providedIn: 'root' })
export class KommentarService {
@@ -99,7 +99,7 @@ export class KommentarService {
createKommentarCommand(resource: Resource, linkRel: string, command: CreateCommand): Observable<StateResource<CommandResource>> {
return this.commandService.createCommand(resource, linkRel, command).pipe(
- tap((command: StateResource<CommandResource>) => this.afterCreateOrEditKommentar(command)),
+ tap((createdCommand: StateResource<CommandResource>) => this.afterCreateOrEditKommentar(createdCommand)),
startWith(createEmptyStateResource<CommandResource>(true)));
}
diff --git a/goofy-client/libs/navigation/src/lib/navigation/navigation.component.ts b/goofy-client/libs/navigation/src/lib/navigation/navigation.component.ts
index f9102704cc..b571a2502e 100644
--- a/goofy-client/libs/navigation/src/lib/navigation/navigation.component.ts
+++ b/goofy-client/libs/navigation/src/lib/navigation/navigation.component.ts
@@ -3,15 +3,15 @@ import { AppService } from '@goofy-client/app-shared';
import { Observable } from 'rxjs';
@Component({
- selector: 'goofy-client-navigation',
- templateUrl: './navigation.component.html',
- styleUrls: ['./navigation.component.scss']
+ selector: 'goofy-client-navigation',
+ templateUrl: './navigation.component.html',
+ styleUrls: ['./navigation.component.scss']
})
export class NavigationComponent {
navigationCollapse$: Observable<boolean>;
constructor(private appService: AppService) {
- this.navigationCollapse$ = this.appService.getNavigationCollapse();
- }
+ this.navigationCollapse$ = this.appService.getNavigationCollapse();
+ }
}
\ No newline at end of file
diff --git a/goofy-client/libs/tech-shared/src/lib/tech.util.ts b/goofy-client/libs/tech-shared/src/lib/tech.util.ts
index fbeceafe61..752bdc9dfa 100644
--- a/goofy-client/libs/tech-shared/src/lib/tech.util.ts
+++ b/goofy-client/libs/tech-shared/src/lib/tech.util.ts
@@ -1,8 +1,7 @@
export function getBaseUrl(): string {
const { protocol, host, } = window.location;
const basePath = `${protocol}//${host}`;
- const url = basePath.endsWith('/') ? `${basePath}` : `${basePath}/`;
- return url;
+ return basePath.endsWith('/') ? `${basePath}` : `${basePath}/`;
}
export function isEmptyObject(obj: any): boolean {
diff --git a/goofy-client/libs/tech-shared/src/lib/validation/tech.validation.util.ts b/goofy-client/libs/tech-shared/src/lib/validation/tech.validation.util.ts
index 1df12b160a..da5debcc61 100644
--- a/goofy-client/libs/tech-shared/src/lib/validation/tech.validation.util.ts
+++ b/goofy-client/libs/tech-shared/src/lib/validation/tech.validation.util.ts
@@ -8,14 +8,14 @@ export function isValidationError(issue: Issue): boolean {
return issue.messageCode.includes('javax.validation.constraints')
}
-export function setValidationError(form: FormGroup, issue: Issue, pathPrefix?: String) {
+export function setValidationError(form: FormGroup, issue: Issue, pathPrefix?: string) {
const control = getControlForIssue(form, issue, pathPrefix);
control.setErrors({ [issue.messageCode]: issue });
control.markAsTouched();
}
-export function getControlForIssue(form: FormGroup, issue: Issue, pathPrefix?: String): AbstractControl {
+export function getControlForIssue(form: FormGroup, issue: Issue, pathPrefix?: string): AbstractControl {
const fieldPath = pathPrefix ? issue.field.substr(pathPrefix.length + 1) : issue.field;
let curControl: AbstractControl = form;
diff --git a/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts b/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts
index be60d46feb..3c56c96b8f 100644
--- a/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/validation-error/validation-error.component.ts
@@ -11,9 +11,7 @@ export class ValidationErrorComponent {
@Input() label: string;
@Input() issues: Issue[];
- constructor() { }
-
message(issue: Issue): string {
return getMessageForIssue(this.label, issue);
}
-}
+}
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.ts
index 95bde62642..e91d474427 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-area.component.ts
@@ -10,8 +10,7 @@ import { VorgangHeaderLinkRel, VorgangWithEingangLinkRel, VorgangWithEingangReso
export class VorgangDetailAreaComponent {
@Input() vorgangStateResource: StateResource<VorgangWithEingangResource>;
+
readonly linkRel = VorgangHeaderLinkRel;
readonly vorgangWithEingangLinkRel = VorgangWithEingangLinkRel;
-
- constructor() {}
-}
+}
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/antragsteller/antragsteller.component.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/antragsteller/antragsteller.component.ts
index dd7822a7ef..379d3f0327 100644
--- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/antragsteller/antragsteller.component.ts
+++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-area/vorgang-detail-body/antragsteller/antragsteller.component.ts
@@ -1,13 +1,12 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
import { Antragsteller } from '@goofy-client/vorgang-shared';
@Component({
- selector: 'goofy-client-antragsteller',
- templateUrl: './antragsteller.component.html',
- styleUrls: ['../form-data-table/form-data-table.component.scss']
+ selector: 'goofy-client-antragsteller',
+ templateUrl: './antragsteller.component.html',
+ styleUrls: ['../form-data-table/form-data-table.component.scss']
})
export class AntragstellerComponent {
- @Input() antragsteller: Antragsteller;
-
-}
+ @Input() antragsteller: Antragsteller;
+}
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts
index 14c3e004a8..c32748bfc7 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang-command.service.ts
@@ -129,8 +129,8 @@ export class VorgangCommandService {
private handleRevokeCommand(commandResource: CommandResource): void {
this.revokeCommand$.next(createEmptyStateResource(true));
- const subscription: Subscription = this.commandService.revokeCommand(commandResource).subscribe(commandResource => {
- this.proceedWithRevokeCommand(commandResource);
+ const subscription: Subscription = this.commandService.revokeCommand(commandResource).subscribe(command => {
+ this.proceedWithRevokeCommand(command);
subscription.unsubscribe();
});
}
--
GitLab