[KON-3] code review
Signed-off-by: Dimitrios Chalepakis <dimitrios.chalepakis@pta.de>
diff --git a/i18n/logout.de.json b/i18n/logout.de.json
index 4c0c050..3911c07 100644
--- a/i18n/logout.de.json
+++ b/i18n/logout.de.json
@@ -1,7 +1,7 @@
{
"Logout": {
- "YouAreLoggedout": "Sie wurden ausgeloggt ...",
- "PortalNewLogin": "Über das Portal können Sie sich erneut einloggen",
+ "Loggedout": "Sie wurden ausgeloggt ...",
+ "PortalNewLogin": "Über das Portal können Sie sich erneut einloggen.",
"CloseTab": "Browser-Tab schließen",
"SubmitLogout": "Wollen Sie sich abmelden?"
}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 867220a..6b980b2 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -13,7 +13,7 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { PageNotFoundComponent } from '@shared/components/pageNotFound/pageNotFound.component';
-import { LogoutPageComponent } from '@app/pages/logout/logout/logout.component';
+import { LogoutPageComponent } from '@pages/logout/logout/logout.component';
import { LoggedoutPageComponent } from '@pages/logout/loggedout/loggedout.component';
const appRoutes: Routes = [
diff --git a/src/app/pages/logout/loggedout/loggedout.component.html b/src/app/pages/logout/loggedout/loggedout.component.html
index bb50e53..570c83a 100644
--- a/src/app/pages/logout/loggedout/loggedout.component.html
+++ b/src/app/pages/logout/loggedout/loggedout.component.html
@@ -15,7 +15,7 @@
<div class="logout-inner">
<img src="assets/img/logo_openkonsequenz.png" />
<div>
- <h2>{{ 'Logout.YouAreLoggedout' | translate }}</h2>
+ <h2>{{ 'Logout.Loggedout' | translate }}</h2>
<h4>{{ 'Logout.PortalNewLogin' | translate }}</h4>
<button #tabCloseBtn style="margin-top: 10%" type="button" class="btn btn-primary" onclick="window.close()">{{ 'Logout.CloseTab' | translate }}</button>
</div>
diff --git a/src/app/pages/persons/external-person/external-person.resolver.ts b/src/app/pages/persons/external-person/external-person.resolver.ts
index fbe9519..14cb900 100644
--- a/src/app/pages/persons/external-person/external-person.resolver.ts
+++ b/src/app/pages/persons/external-person/external-person.resolver.ts
@@ -1,5 +1,3 @@
-import { AddressTypesSandbox } from './../../admin/address-types/address-types.sandbox';
-import { PersonTypesSandbox } from '@pages/admin/person-types/person-types.sandbox';
/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
@@ -17,15 +15,17 @@
import { Injectable } from '@angular/core';
import { SalutationsSandbox } from '@pages/admin/salutations/salutations.sandbox';
import { CommunicationTypesSandbox } from '@pages/admin/communication-types/communication-types.sandbox';
+import { AddressTypesSandbox } from '@pages/admin/address-types/address-types.sandbox';
+import { PersonTypesSandbox } from '@pages/admin/person-types/person-types.sandbox';
@Injectable()
export class ExternalPersonResolver implements Resolve<any> {
constructor(
- private externalPersonSandbox: ExternalPersonDetailsSandBox,
- private salutationsSandbox: SalutationsSandbox,
- private communicationTypesSandbox: CommunicationTypesSandbox,
- private personTypesSandbox: PersonTypesSandbox,
- private addressTypesSandbox: AddressTypesSandbox
+ private _externalPersonSandbox: ExternalPersonDetailsSandBox,
+ private _salutationsSandbox: SalutationsSandbox,
+ private _communicationTypesSandbox: CommunicationTypesSandbox,
+ private _personTypesSandbox: PersonTypesSandbox,
+ private _addressTypesSandbox: AddressTypesSandbox
) {}
/**
@@ -34,18 +34,18 @@
public resolve(route: ActivatedRouteSnapshot): void {
const contactId: string = route.params['contactId'];
if (contactId && contactId !== 'new') {
- this.externalPersonSandbox.loadExternalPerson(contactId);
- this.externalPersonSandbox.loadExternalPersonAddresses(contactId);
- this.externalPersonSandbox.loadCommunicationsData(contactId);
+ this._externalPersonSandbox.loadExternalPerson(contactId);
+ this._externalPersonSandbox.loadExternalPersonAddresses(contactId);
+ this._externalPersonSandbox.loadCommunicationsData(contactId);
} else {
- this.externalPersonSandbox.newExternalPerson();
+ this._externalPersonSandbox.newExternalPerson();
}
- this.salutationsSandbox.loadSalutations();
- this.personTypesSandbox.loadPersonTypes();
- this.communicationTypesSandbox.loadCommunicationTypes();
- this.addressTypesSandbox.loadAddressTypes();
- this.externalPersonSandbox.isAddressDataDetailViewVisible = false;
- this.externalPersonSandbox.isCommunicationsDataDetailViewVisible = false;
+ this._salutationsSandbox.loadSalutations();
+ this._personTypesSandbox.loadPersonTypes();
+ this._communicationTypesSandbox.loadCommunicationTypes();
+ this._addressTypesSandbox.loadAddressTypes();
+ this._externalPersonSandbox.isAddressDataDetailViewVisible = false;
+ this._externalPersonSandbox.isCommunicationsDataDetailViewVisible = false;
}
}
diff --git a/src/app/pages/persons/internal-person/internal-person.resolver.ts b/src/app/pages/persons/internal-person/internal-person.resolver.ts
index 671a81a..2f02b3d 100644
--- a/src/app/pages/persons/internal-person/internal-person.resolver.ts
+++ b/src/app/pages/persons/internal-person/internal-person.resolver.ts
@@ -21,11 +21,11 @@
@Injectable()
export class InternalPersonResolver implements Resolve<any> {
constructor(
- private internalPersonSandbox: InternalPersonDetailsSandBox,
- private salutationsSandbox: SalutationsSandbox,
- private communicationTypesSandbox: CommunicationTypesSandbox,
- private personTypesSandbox: PersonTypesSandbox,
- private addressTypesSandbox: AddressTypesSandbox
+ private _internalPersonSandbox: InternalPersonDetailsSandBox,
+ private _salutationsSandbox: SalutationsSandbox,
+ private _communicationTypesSandbox: CommunicationTypesSandbox,
+ private _personTypesSandbox: PersonTypesSandbox,
+ private _addressTypesSandbox: AddressTypesSandbox
) {}
/**
@@ -34,17 +34,17 @@
public resolve(route: ActivatedRouteSnapshot): void {
const contactId: string = route.params['contactId'];
if (contactId && contactId !== 'new') {
- this.internalPersonSandbox.loadInternalPerson(contactId);
- this.internalPersonSandbox.loadCommunicationsData(contactId);
- this.internalPersonSandbox.loadInternalPersonAddresses(contactId);
+ this._internalPersonSandbox.loadInternalPerson(contactId);
+ this._internalPersonSandbox.loadCommunicationsData(contactId);
+ this._internalPersonSandbox.loadInternalPersonAddresses(contactId);
} else {
- this.internalPersonSandbox.newInternalPerson();
+ this._internalPersonSandbox.newInternalPerson();
}
- this.salutationsSandbox.loadSalutations();
- this.personTypesSandbox.loadPersonTypes();
- this.communicationTypesSandbox.loadCommunicationTypes();
- this.addressTypesSandbox.loadAddressTypes();
- this.internalPersonSandbox.isCommunicationsDataDetailViewVisible = false;
+ this._salutationsSandbox.loadSalutations();
+ this._personTypesSandbox.loadPersonTypes();
+ this._communicationTypesSandbox.loadCommunicationTypes();
+ this._addressTypesSandbox.loadAddressTypes();
+ this._internalPersonSandbox.isCommunicationsDataDetailViewVisible = false;
}
}
diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts
index 10109a4..ee7469d 100644
--- a/src/app/shared/components/index.ts
+++ b/src/app/shared/components/index.ts
@@ -1,4 +1,3 @@
-import { ExpandableComponent } from './expandable/expandable.component';
/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
@@ -29,6 +28,7 @@
import { LoadingPlaceholderComponent } from '@shared/components/loadingPlaceholder/loadingPlaceholder.component';
import { VersionInfo } from '@shared/components/version-info/version-info.component';
import { AngularFontAwesomeModule } from 'angular-font-awesome';
+import { ExpandableComponent } from '@shared/components/expandable/expandable.component';
export const COMPONENTS = [
SpinnerComponent,
diff --git a/src/app/shared/store/effects/logout/logout.effect.ts b/src/app/shared/store/effects/logout/logout.effect.ts
index dcff7a2..4f9254b 100644
--- a/src/app/shared/store/effects/logout/logout.effect.ts
+++ b/src/app/shared/store/effects/logout/logout.effect.ts
@@ -23,11 +23,11 @@
@Injectable()
export class LogoutEffects {
logout$: any = createEffect(() =>
- this.actions$.pipe(
+ this._actions$.pipe(
ofType(logoutActions.logout),
map(action => action['payload']),
switchMap(() => {
- return this.logoutApiClient.logout().pipe(
+ return this._logoutApiClient.logout().pipe(
map(response => logoutActions.logoutSuccess({ payload: response })),
catchError(error => of(logoutActions.logoutFail({ payload: error })))
);
@@ -35,5 +35,5 @@
)
);
- constructor(private actions$: Actions, private logoutApiClient: LogoutApiClient) {}
+ constructor(private _actions$: Actions, private _logoutApiClient: LogoutApiClient) {}
}
