Fix: do not call refresh before embedded table was initialized.

pull/6929/head
Wieland Lindenthal 6 years ago
parent 29ab45004e
commit 56a8e3d649
  1. 9
      frontend/src/app/components/wp-table/embedded/wp-embedded-base.component.ts
  2. 2
      frontend/src/app/components/wp-table/embedded/wp-embedded-table.component.ts

@ -22,6 +22,8 @@ export abstract class WorkPackageEmbeddedBaseComponent implements OnInit, AfterV
public configuration:WorkPackageTableConfiguration; public configuration:WorkPackageTableConfiguration;
public error:string|null = null; public error:string|null = null;
private initialized:boolean = false;
readonly QueryDm:QueryDmService = this.injector.get(QueryDmService); readonly QueryDm:QueryDmService = this.injector.get(QueryDmService);
readonly tableState:TableState = this.injector.get(TableState); readonly tableState:TableState = this.injector.get(TableState);
readonly I18n:I18nService = this.injector.get(I18nService); readonly I18n:I18nService = this.injector.get(I18nService);
@ -37,6 +39,7 @@ export abstract class WorkPackageEmbeddedBaseComponent implements OnInit, AfterV
this.configuration = new WorkPackageTableConfiguration(this.providedConfiguration); this.configuration = new WorkPackageTableConfiguration(this.providedConfiguration);
// Set embedded status in configuration // Set embedded status in configuration
this.configuration.isEmbedded = true; this.configuration.isEmbedded = true;
this.initialized = true;
} }
ngAfterViewInit():void { ngAfterViewInit():void {
@ -55,7 +58,9 @@ export abstract class WorkPackageEmbeddedBaseComponent implements OnInit, AfterV
} }
ngOnChanges(changes:SimpleChanges) { ngOnChanges(changes:SimpleChanges) {
this.refresh(); if (this.initialized) {
this.refresh(this.initialLoadingIndicator);
}
} }
get projectIdentifier() { get projectIdentifier() {
@ -100,7 +105,7 @@ export abstract class WorkPackageEmbeddedBaseComponent implements OnInit, AfterV
protected abstract loadQuery(visible:boolean):Promise<any>; protected abstract loadQuery(visible:boolean):Promise<any>;
protected get queryProjectScope() { protected get queryProjectScope() {
if (!(this.configuration && this.configuration.projectContext)) { if (!this.configuration.projectContext) {
return undefined; return undefined;
} else { } else {
return this.projectIdentifier; return this.projectIdentifier;

@ -135,7 +135,7 @@ export class WorkPackageEmbeddedTableComponent extends WorkPackageEmbeddedBaseCo
// HACK: Decrease loading time of queries when results are not needed. // HACK: Decrease loading time of queries when results are not needed.
// We should allow the backend to disable results embedding instead. // We should allow the backend to disable results embedding instead.
if (!(this.configuration && this.configuration.tableVisible)) { if (!this.configuration.tableVisible) {
this.queryProps.pageSize = 1; this.queryProps.pageSize = 1;
} }

Loading…
Cancel
Save