[KON-567] FE Loading-Spinner von AG-Grid abschalten
sonar work
Signed-off-by: Dimitrios Chalepakis <dimitrios.chalepakis@pta.de>
diff --git a/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html b/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html
index 2b255df..e28f612 100644
--- a/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html
+++ b/src/app/pages/admin/address-types/address-types-list/address-types-list.component.html
@@ -30,10 +30,12 @@
[rowSelection]="'single'"
[frameworkComponents]="frameworkComponents"
[rowData]="sandbox.addressTypes$ | async"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
+ <app-spinner [isRunning]="sandbox.addressTypesloading$ | async"></app-spinner>
+
<div *ngIf="sandbox.displayForm" class="address-types-details">
<app-address-types-details></app-address-types-details>
</div>
diff --git a/src/app/pages/admin/address-types/address-types.sandbox.ts b/src/app/pages/admin/address-types/address-types.sandbox.ts
index 6993ce2..a1135c4 100644
--- a/src/app/pages/admin/address-types/address-types.sandbox.ts
+++ b/src/app/pages/admin/address-types/address-types.sandbox.ts
@@ -29,8 +29,8 @@
@Injectable()
export class AddressTypesSandbox extends BaseSandbox {
-
- public addressTypes$= this.appState$.select(store.getAddressTypesData);
+ public addressTypes$ = this.appState$.select(store.getAddressTypesData);
+ public addressTypesloading$ = this.appState$.select(store.getAddressTypesLoading);
public formState$ = this.appState$.select(store.getAddressTypesDetails);
public currentFormState: FormGroupState<AddressType>;
public displayForm: boolean = false;
@@ -57,22 +57,20 @@
}
public loadAddressType(id: string): void {
- this.appState$.dispatch(
- addressTypesActions.loadAddressType({ payload: id })
- );
+ this.appState$.dispatch(addressTypesActions.loadAddressType({ payload: id }));
}
public deleteAddressType(id: string): void {
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
- modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
- modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
- modalRef.result.then(() => {
- this.appState$.dispatch(
- addressTypesActions.deleteAddressType({ payload: id })
- );
+ modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
+ modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
+ modalRef.result.then(
+ () => {
+ this.appState$.dispatch(addressTypesActions.deleteAddressType({ payload: id }));
this.clear();
- }, () => {
- });
+ },
+ () => {}
+ );
}
public cancel(): void {
@@ -80,22 +78,19 @@
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
modalRef.componentInstance.title = 'ConfirmDialog.Action.edit';
modalRef.componentInstance.body = 'ConfirmDialog.Content';
- modalRef.result.then(() => {
- this.clear();
- }, () => {
- });
+ modalRef.result.then(
+ () => {
+ this.clear();
+ },
+ () => {}
+ );
} else {
this.clear();
}
}
- clear(): void {
- this.appState$.dispatch(
- new SetValueAction(
- addressTypesFormReducer.FORM_ID,
- addressTypesFormReducer.INITIAL_STATE.value
- )
- );
+ clear(): void {
+ this.appState$.dispatch(new SetValueAction(addressTypesFormReducer.FORM_ID, addressTypesFormReducer.INITIAL_STATE.value));
this.appState$.dispatch(new ResetAction(addressTypesFormReducer.FORM_ID));
this.displayForm = false;
}
@@ -104,29 +99,18 @@
if (this.currentFormState.isValid) {
this.appState$.dispatch(
addressTypesActions.saveAddressType({
- payload: new AddressType(this.currentFormState.value)
+ payload: new AddressType(this.currentFormState.value),
})
);
- this.actionsSubject
- .pipe(
- ofType(addressTypesActions.saveAddressTypeSuccess),
- takeUntil(this._endSubscriptions$)
- )
- .subscribe(() => {
- this.clear();
- });
+ this.actionsSubject.pipe(ofType(addressTypesActions.saveAddressTypeSuccess), takeUntil(this._endSubscriptions$)).subscribe(() => {
+ this.clear();
+ });
} else {
- this.utilService.displayNotification(
- 'MandatoryFieldError',
- 'error'
- );
+ this.utilService.displayNotification('MandatoryFieldError', 'error');
}
}
public registerEvents(): void {
- this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe(
- (formState: FormGroupState<AddressType>) =>
- (this.currentFormState = formState)
- )
+ this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe((formState: FormGroupState<AddressType>) => (this.currentFormState = formState));
}
}
diff --git a/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html b/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html
index 22af646..8bdb24d 100644
--- a/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html
+++ b/src/app/pages/admin/communication-types/communication-types-list/communication-types-list.component.html
@@ -29,10 +29,12 @@
[rowSelection]="'single'"
[frameworkComponents]="frameworkComponents"
[rowData]="communicationTypesSandbox.communicationTypes$ | async"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
+ <app-spinner [isRunning]="communicationTypesSandbox.communicationTypesLoading$ | async"></app-spinner>
+
<div *ngIf="communicationTypesSandbox.displayForm" class="communication-types-details">
<app-communication-types-details></app-communication-types-details>
</div>
diff --git a/src/app/pages/admin/communication-types/communication-types.sandbox.ts b/src/app/pages/admin/communication-types/communication-types.sandbox.ts
index abf11bc..a5a0fac 100644
--- a/src/app/pages/admin/communication-types/communication-types.sandbox.ts
+++ b/src/app/pages/admin/communication-types/communication-types.sandbox.ts
@@ -1,4 +1,4 @@
- /********************************************************************************
+/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
@@ -29,8 +29,8 @@
@Injectable()
export class CommunicationTypesSandbox extends BaseSandbox {
-
- public communicationTypes$= this.appState$.select(store.getCommunicationTypesData);
+ public communicationTypes$ = this.appState$.select(store.getCommunicationTypesData);
+ public communicationTypesLoading$ = this.appState$.select(store.getCommunicationTypesLoading);
public formState$ = this.appState$.select(store.getCommunicationTypesDetails);
public currentFormState: FormGroupState<CommunicationType>;
@@ -60,22 +60,20 @@
}
public loadCommunicationType(id: string): void {
- this.appState$.dispatch(
- communicationTypesActions.loadCommunicationType({ payload: id })
- );
+ this.appState$.dispatch(communicationTypesActions.loadCommunicationType({ payload: id }));
}
public deleteCommunicationType(id: string): void {
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
- modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
- modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
- modalRef.result.then(() => {
- this.appState$.dispatch(
- communicationTypesActions.deleteCommunicationType({ payload: id })
- );
+ modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
+ modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
+ modalRef.result.then(
+ () => {
+ this.appState$.dispatch(communicationTypesActions.deleteCommunicationType({ payload: id }));
this.clear();
- }, () => {
- });
+ },
+ () => {}
+ );
}
public cancel(): void {
@@ -83,22 +81,19 @@
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
modalRef.componentInstance.title = 'ConfirmDialog.Action.edit';
modalRef.componentInstance.body = 'ConfirmDialog.Content';
- modalRef.result.then(() => {
- this.clear();
- }, () => {
- });
+ modalRef.result.then(
+ () => {
+ this.clear();
+ },
+ () => {}
+ );
} else {
this.clear();
}
}
clear(): void {
- this.appState$.dispatch(
- new SetValueAction(
- communicationTypesFormReducer.FORM_ID,
- communicationTypesFormReducer.INITIAL_STATE.value
- )
- );
+ this.appState$.dispatch(new SetValueAction(communicationTypesFormReducer.FORM_ID, communicationTypesFormReducer.INITIAL_STATE.value));
this.appState$.dispatch(new ResetAction(communicationTypesFormReducer.FORM_ID));
this.displayForm = false;
}
@@ -107,30 +102,18 @@
if (this.currentFormState.isValid) {
this.appState$.dispatch(
communicationTypesActions.saveCommunicationType({
- payload: new CommunicationType (this.currentFormState.value)
+ payload: new CommunicationType(this.currentFormState.value),
})
);
- this.actionsSubject
- .pipe(
- ofType(communicationTypesActions.saveCommunicationTypeSuccess),
- takeUntil(this._endSubscriptions$)
- )
- .subscribe(() => {
- this.clear();
- });
+ this.actionsSubject.pipe(ofType(communicationTypesActions.saveCommunicationTypeSuccess), takeUntil(this._endSubscriptions$)).subscribe(() => {
+ this.clear();
+ });
} else {
- this.utilService.displayNotification(
- 'MandatoryFieldError',
- 'error'
- );
+ this.utilService.displayNotification('MandatoryFieldError', 'error');
}
}
public registerEvents(): void {
-
- this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe(
- (formState: FormGroupState<CommunicationType>) =>
- (this.currentFormState = formState)
- )
+ this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe((formState: FormGroupState<CommunicationType>) => (this.currentFormState = formState));
}
}
diff --git a/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html b/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html
index 18eb933..fee3794 100644
--- a/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html
+++ b/src/app/pages/admin/person-types/person-types-list/person-types-list.component.html
@@ -29,10 +29,12 @@
[rowSelection]="'single'"
[frameworkComponents]="frameworkComponents"
[rowData]="sandbox.personTypes$ | async"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
+ <app-spinner [isRunning]="sandbox.personTypesLoading$ | async"></app-spinner>
+
<div *ngIf="sandbox.displayForm" class="person-types-details">
<app-person-types-details></app-person-types-details>
</div>
diff --git a/src/app/pages/admin/person-types/person-types.sandbox.ts b/src/app/pages/admin/person-types/person-types.sandbox.ts
index 77909dd..e93711e 100644
--- a/src/app/pages/admin/person-types/person-types.sandbox.ts
+++ b/src/app/pages/admin/person-types/person-types.sandbox.ts
@@ -1,4 +1,4 @@
- /********************************************************************************
+/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
@@ -29,8 +29,8 @@
@Injectable()
export class PersonTypesSandbox extends BaseSandbox {
-
public personTypes$ = this.appState$.select(store.getPersonTypesData);
+ public personTypesLoading$ = this.appState$.select(store.getPersonTypesLoading);
public formState$ = this.appState$.select(store.getPersonTypesDetails);
public currentFormState: FormGroupState<PersonType>;
public displayForm: boolean = false;
@@ -57,22 +57,20 @@
}
public loadPersonType(id: string): void {
- this.appState$.dispatch(
- personTypesActions.loadPersonType({ payload: id })
- );
+ this.appState$.dispatch(personTypesActions.loadPersonType({ payload: id }));
}
public deletePersonType(id: string): void {
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
- modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
- modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
- modalRef.result.then(() => {
- this.appState$.dispatch(
- personTypesActions.deletePersonType({ payload: id })
- );
+ modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
+ modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
+ modalRef.result.then(
+ () => {
+ this.appState$.dispatch(personTypesActions.deletePersonType({ payload: id }));
this.clear();
- }, () => {
- });
+ },
+ () => {}
+ );
}
public cancel(): void {
@@ -80,22 +78,19 @@
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
modalRef.componentInstance.title = 'ConfirmDialog.Action.edit';
modalRef.componentInstance.body = 'ConfirmDialog.Content';
- modalRef.result.then(() => {
- this.clear();
- }, () => {
- });
+ modalRef.result.then(
+ () => {
+ this.clear();
+ },
+ () => {}
+ );
} else {
this.clear();
}
}
clear(): void {
- this.appState$.dispatch(
- new SetValueAction(
- personTypesFormReducer.FORM_ID,
- personTypesFormReducer.INITIAL_STATE.value
- )
- );
+ this.appState$.dispatch(new SetValueAction(personTypesFormReducer.FORM_ID, personTypesFormReducer.INITIAL_STATE.value));
this.appState$.dispatch(new ResetAction(personTypesFormReducer.FORM_ID));
this.displayForm = false;
}
@@ -104,29 +99,18 @@
if (this.currentFormState.isValid) {
this.appState$.dispatch(
personTypesActions.savePersonType({
- payload: new PersonType(this.currentFormState.value)
+ payload: new PersonType(this.currentFormState.value),
})
);
- this.actionsSubject
- .pipe(
- ofType(personTypesActions.savePersonTypeSuccess),
- takeUntil(this._endSubscriptions$)
- )
- .subscribe(() => {
- this.clear();
- });
+ this.actionsSubject.pipe(ofType(personTypesActions.savePersonTypeSuccess), takeUntil(this._endSubscriptions$)).subscribe(() => {
+ this.clear();
+ });
} else {
- this.utilService.displayNotification(
- 'MandatoryFieldError',
- 'error'
- );
+ this.utilService.displayNotification('MandatoryFieldError', 'error');
}
}
public registerEvents(): void {
- this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe(
- (formState: FormGroupState<PersonType>) =>
- (this.currentFormState = formState)
- )
+ this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe((formState: FormGroupState<PersonType>) => (this.currentFormState = formState));
}
}
diff --git a/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html b/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html
index 9e58212..40f6300 100644
--- a/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html
+++ b/src/app/pages/admin/salutations/salutations-list/salutations-list.component.html
@@ -29,10 +29,12 @@
[rowSelection]="'single'"
[frameworkComponents]="frameworkComponents"
[rowData]="salutationsSandbox.salutations$ | async"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
+ <app-spinner [isRunning]="salutationsSandbox.salutationsLoading$ | async"></app-spinner>
+
<div *ngIf="salutationsSandbox.displayForm" class="salutations-details">
<app-salutations-details></app-salutations-details>
</div>
diff --git a/src/app/pages/admin/salutations/salutations.sandbox.ts b/src/app/pages/admin/salutations/salutations.sandbox.ts
index 49e1db4..12940f3 100644
--- a/src/app/pages/admin/salutations/salutations.sandbox.ts
+++ b/src/app/pages/admin/salutations/salutations.sandbox.ts
@@ -1,4 +1,4 @@
- /********************************************************************************
+/********************************************************************************
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
@@ -29,8 +29,8 @@
@Injectable()
export class SalutationsSandbox extends BaseSandbox {
-
public salutations$ = this.appState$.select(store.getSalutationsData);
+ public salutationsLoading$ = this.appState$.select(store.getSalutationsLoading);
public formState$ = this.appState$.select(store.getSalutationDetails);
public currentFormState: FormGroupState<Salutation>;
@@ -58,22 +58,20 @@
}
public loadSalutation(id: string): void {
- this.appState$.dispatch(
- salutationsActions.loadSalutation({ payload: id })
- );
+ this.appState$.dispatch(salutationsActions.loadSalutation({ payload: id }));
}
public deleteSalutation(id: string): void {
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
- modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
- modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
- modalRef.result.then(() => {
- this.appState$.dispatch(
- salutationsActions.deleteSalutation({ payload: id })
- );
+ modalRef.componentInstance.title = 'ConfirmDialog.Action.delete';
+ modalRef.componentInstance.body = 'ConfirmDialog.Deletion';
+ modalRef.result.then(
+ () => {
+ this.appState$.dispatch(salutationsActions.deleteSalutation({ payload: id }));
this.clear();
- }, () => {
- });
+ },
+ () => {}
+ );
}
public cancel(): void {
@@ -81,22 +79,19 @@
const modalRef = this.modalService.open(SafetyQueryDialogComponent);
modalRef.componentInstance.title = 'ConfirmDialog.Action.edit';
modalRef.componentInstance.body = 'ConfirmDialog.Content';
- modalRef.result.then(() => {
- this.clear();
- }, () => {
- });
+ modalRef.result.then(
+ () => {
+ this.clear();
+ },
+ () => {}
+ );
} else {
this.clear();
}
}
clear(): void {
- this.appState$.dispatch(
- new SetValueAction(
- salutationFormReducer.FORM_ID,
- salutationFormReducer.INITIAL_STATE.value
- )
- );
+ this.appState$.dispatch(new SetValueAction(salutationFormReducer.FORM_ID, salutationFormReducer.INITIAL_STATE.value));
this.appState$.dispatch(new ResetAction(salutationFormReducer.FORM_ID));
this.displayForm = false;
}
@@ -105,30 +100,18 @@
if (this.currentFormState.isValid) {
this.appState$.dispatch(
salutationsActions.saveSalutation({
- payload: new Salutation(this.currentFormState.value)
+ payload: new Salutation(this.currentFormState.value),
})
);
- this.actionsSubject
- .pipe(
- ofType(salutationsActions.saveSalutationSuccess),
- takeUntil(this._endSubscriptions$)
- )
- .subscribe(() => {
- this.clear();
- });
+ this.actionsSubject.pipe(ofType(salutationsActions.saveSalutationSuccess), takeUntil(this._endSubscriptions$)).subscribe(() => {
+ this.clear();
+ });
} else {
- this.utilService.displayNotification(
- 'MandatoryFieldError',
- 'error'
- );
+ this.utilService.displayNotification('MandatoryFieldError', 'error');
}
}
public registerEvents(): void {
-
- this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe(
- (formState: FormGroupState<Salutation>) =>
- (this.currentFormState = formState)
- )
+ this.formState$.pipe(takeUntil(this._endSubscriptions$)).subscribe((formState: FormGroupState<Salutation>) => (this.currentFormState = formState));
}
}
diff --git a/src/app/pages/company/company-details/address-list/address-list.component.html b/src/app/pages/company/company-details/address-list/address-list.component.html
index 292b048..5f1306e 100644
--- a/src/app/pages/company/company-details/address-list/address-list.component.html
+++ b/src/app/pages/company/company-details/address-list/address-list.component.html
@@ -26,8 +26,8 @@
[rowData]="companyDetailsSandBox.addressList$ | async"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
<app-spinner [isRunning]="companyDetailsSandBox.addressListLoading$ | async"></app-spinner>
diff --git a/src/app/pages/company/company-details/communications-data-list/communications-data-list.component.html b/src/app/pages/company/company-details/communications-data-list/communications-data-list.component.html
index a0488f5..cc3afdf 100644
--- a/src/app/pages/company/company-details/communications-data-list/communications-data-list.component.html
+++ b/src/app/pages/company/company-details/communications-data-list/communications-data-list.component.html
@@ -26,8 +26,8 @@
[rowData]="companyDetailsSandBox.communicationsDataList$ | async"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
<app-spinner [isRunning]="companyDetailsSandBox.communicationsDataListLoading$ | async"></app-spinner>
diff --git a/src/app/pages/company/company-details/company-details.sandbox.ts b/src/app/pages/company/company-details/company-details.sandbox.ts
index 89d8ba4..ea725e0 100644
--- a/src/app/pages/company/company-details/company-details.sandbox.ts
+++ b/src/app/pages/company/company-details/company-details.sandbox.ts
@@ -49,6 +49,7 @@
public isCurrentAddressMainAddress = false;
public companyContactId: string;
public contactPersonsList$: Observable<Array<ContactPerson>> = this.appState$.select(store.getCompanyContactPersonsData);
+ public contactPersonsListLoading$: Observable<boolean> = this.appState$.select(store.getCompanyContactPersonsLoading);
private _communicationTypes: Array<CommunicationType> = new Array<CommunicationType>();
diff --git a/src/app/pages/company/company-details/contact-person-list/contact-person-list.component.html b/src/app/pages/company/company-details/contact-person-list/contact-person-list.component.html
index 63cf3eb..93ba2c1 100644
--- a/src/app/pages/company/company-details/contact-person-list/contact-person-list.component.html
+++ b/src/app/pages/company/company-details/contact-person-list/contact-person-list.component.html
@@ -26,7 +26,8 @@
[rowData]="companyDetailsSandBox.contactPersonsList$ | async"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
+<app-spinner [isRunning]="companyDetailsSandBox.contactPersonsListLoading$ | async"></app-spinner>
diff --git a/src/app/pages/contacts/contacts-list/contacts-list.component.html b/src/app/pages/contacts/contacts-list/contacts-list.component.html
index e72b9c0..4c300f4 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list.component.html
+++ b/src/app/pages/contacts/contacts-list/contacts-list.component.html
@@ -26,7 +26,12 @@
(keyup)="setModifiedContactsSearchText($event.target.value); searchContacts($event)"
/>
- <select [required]="false" type="text" class="form-control item" (change)="setModifiedContactsContactTypeId($event.target.value);searchContacts($event);">
+ <select
+ [required]="false"
+ type="text"
+ class="form-control item"
+ (change)="setModifiedContactsContactTypeId($event.target.value); searchContacts($event)"
+ >
<option value="{{ INTERNAL_PERSON }}">{{ 'Contacts.InternalContact' | translate }}</option>
<option value="{{ EXTERNAL_PERSON }}">{{ 'Contacts.ExternalContact' | translate }}</option>
<option value="{{ COMPANY }}">{{ 'Contacts.Company' | translate }}</option>
@@ -77,7 +82,6 @@
[gridOptions]="gridOptions"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
diff --git a/src/app/pages/logout/loggedout/loggedout.component.html b/src/app/pages/logout/loggedout/loggedout.component.html
index 570c83a..1d94b5a 100644
--- a/src/app/pages/logout/loggedout/loggedout.component.html
+++ b/src/app/pages/logout/loggedout/loggedout.component.html
@@ -13,7 +13,7 @@
<div class="logout-outer">
<div class="logout-inner">
- <img src="assets/img/logo_openkonsequenz.png" />
+ <img src="assets/img/logo_openkonsequenz.png" alt="openkonsequenz-logo" />
<div>
<h2>{{ 'Logout.Loggedout' | translate }}</h2>
<h4>{{ 'Logout.PortalNewLogin' | translate }}</h4>
diff --git a/src/app/pages/logout/logout/logout.component.html b/src/app/pages/logout/logout/logout.component.html
index 33d505c..c99e969 100644
--- a/src/app/pages/logout/logout/logout.component.html
+++ b/src/app/pages/logout/logout/logout.component.html
@@ -14,7 +14,7 @@
<div class="logout-outer">
<div class="logout-inner">
<div class="center">
- <img src="assets/img/logo_openkonsequenz.png" />
+ <img src="assets/img/logo_openkonsequenz.png" alt="openkonsequenz-logo" />
<h3>{{ 'Logout.SubmitLogout' | translate }}</h3>
</div>
<div class="center-margin">
diff --git a/src/app/pages/persons/external-person/external-person-details/address-list/address-list.component.html b/src/app/pages/persons/external-person/external-person-details/address-list/address-list.component.html
index 268498a..a5da327 100644
--- a/src/app/pages/persons/external-person/external-person-details/address-list/address-list.component.html
+++ b/src/app/pages/persons/external-person/external-person-details/address-list/address-list.component.html
@@ -26,8 +26,8 @@
[rowData]="externalPersonDetailsSandBox.addressList$ | async"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
<app-spinner [isRunning]="externalPersonDetailsSandBox.addressListLoading$ | async"></app-spinner>
diff --git a/src/app/pages/persons/external-person/external-person-details/communications-data-list/communications-data-list.component.html b/src/app/pages/persons/external-person/external-person-details/communications-data-list/communications-data-list.component.html
index 7a207f7..24b04bb 100644
--- a/src/app/pages/persons/external-person/external-person-details/communications-data-list/communications-data-list.component.html
+++ b/src/app/pages/persons/external-person/external-person-details/communications-data-list/communications-data-list.component.html
@@ -26,8 +26,8 @@
[rowData]="externalPersonDetailsSandBox.communicationsDataList$ | async"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
<app-spinner [isRunning]="externalPersonDetailsSandBox.communicationsDataListLoading$ | async"></app-spinner>
diff --git a/src/app/pages/persons/internal-person/internal-person-details/address-list/address-list.component.html b/src/app/pages/persons/internal-person/internal-person-details/address-list/address-list.component.html
index 454452e..8560fe5 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/address-list/address-list.component.html
+++ b/src/app/pages/persons/internal-person/internal-person-details/address-list/address-list.component.html
@@ -26,7 +26,6 @@
[rowData]="internalPersonDetailsSandBox.addressList$ | async"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
diff --git a/src/app/pages/persons/internal-person/internal-person-details/communications-data-list/communications-data-list.component.html b/src/app/pages/persons/internal-person/internal-person-details/communications-data-list/communications-data-list.component.html
index 4a9b8c4..9ab8038 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/communications-data-list/communications-data-list.component.html
+++ b/src/app/pages/persons/internal-person/internal-person-details/communications-data-list/communications-data-list.component.html
@@ -26,8 +26,8 @@
[rowData]="internalPersonDetailsSandBox.communicationsDataList$ | async"
[columnDefs]="columnDefinition"
[rowSelection]="'single'"
- [overlayLoadingTemplate]="loadingTemplate"
[overlayNoRowsTemplate]="noRowsTemplate"
>
</ag-grid-angular>
+
<app-spinner [isRunning]="internalPersonDetailsSandBox.communicationsDataListLoading$ | async"></app-spinner>
diff --git a/src/app/shared/components/base-components/base.list.ts b/src/app/shared/components/base-components/base.list.ts
index cb98130..70db84b 100644
--- a/src/app/shared/components/base-components/base.list.ts
+++ b/src/app/shared/components/base-components/base.list.ts
@@ -22,12 +22,12 @@
context: {
eventSubject: this.events$,
},
+ suppressLoadingOverlay: true,
};
protected pageSize: number = 3;
constructor() {
- this.loadingTemplate = `<span class="ag-overlay-loading-center">Daten werden geladen...</span>`;
this.noRowsTemplate = `<span>Keine Einträge</span>`;
}
}
