ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5011 from tsiegleauq/NoCdOnDestroy

Browse Source 
Fix change detecting dead views
This commit is contained in:
Emanuel Schütze 2019-09-12 16:27:08 +02:00 committed by GitHub
commit 15b90579ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 73 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
client/src/app/shared/components/list-view-table/list-view-table.component.ts
View File

@ -4,6 +4,7 @@ import {
Component,
EventEmitter,
Input,
OnDestroy,
OnInit,
Output,
ViewChild,
@ -81,7 +82,7 @@ export interface ColumnRestriction {
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None
})
export class ListViewTableComponent<V extends BaseViewModel, M extends BaseModel> implements OnInit {
export class ListViewTableComponent<V extends BaseViewModel, M extends BaseModel> implements OnInit, OnDestroy {
/**
* Declare the table
*/
@ -243,7 +244,9 @@ export class ListViewTableComponent<V extends BaseViewModel, M extends BaseModel
* @returns the repositories `viewModelListObservable`
*/
private get viewModelListObservable(): Observable<V[]> {
return this.repo.getViewModelListObservable();
if (this.repo) {
return this.repo.getViewModelListObservable();
}
}
/**
@ -296,24 +299,27 @@ export class ListViewTableComponent<V extends BaseViewModel, M extends BaseModel
this.dataSource = createDS<V>()
.onTrigger(() => {
let listObservable: Observable<V[]>;
if (this.filterService && this.sortService) {
// filtering and sorting
this.filterService.initFilters(this.viewModelListObservable);
this.sortService.initSorting(this.filterService.outputObservable);
listObservable = this.sortService.outputObservable;
} else if (this.filterService) {
// only filter service
this.filterService.initFilters(this.viewModelListObservable);
listObservable = this.filterService.outputObservable;
} else if (this.sortService) {
// only sorting
this.sortService.initSorting(this.viewModelListObservable);
listObservable = this.sortService.outputObservable;
} else {
// none of both
listObservable = this.viewModelListObservable;
if (this.repo && this.viewModelListObservable) {
if (this.filterService && this.sortService) {
// filtering and sorting
this.filterService.initFilters(this.viewModelListObservable);
this.sortService.initSorting(this.filterService.outputObservable);
listObservable = this.sortService.outputObservable;
} else if (this.filterService) {
// only filter service
this.filterService.initFilters(this.viewModelListObservable);
listObservable = this.filterService.outputObservable;
} else if (this.sortService) {
// only sorting
this.sortService.initSorting(this.viewModelListObservable);
listObservable = this.sortService.outputObservable;
} else {
// none of both
listObservable = this.viewModelListObservable;
}
}
return listObservable;
return listObservable ? listObservable : [];
})
.create();
@ -394,6 +400,13 @@ export class ListViewTableComponent<V extends BaseViewModel, M extends BaseModel
}
}
/**
* Stop the change detection
*/
public ngOnDestroy(): void {
this.cd.detach();
}
/**
* Receive manual view updates
*/

1
client/src/app/shared/components/meta-text-block/meta-text-block.component.ts
View File

@ -102,6 +102,7 @@ export class MetaTextBlockComponent extends BaseComponent implements OnInit, OnD
this.contentSubscription.unsubscribe();
this.contentSubscription = null;
}
this.cd.detach();
}
/**

11
client/src/app/shared/components/preview/preview.component.ts
View File

@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy } from '@angular/core';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { SearchProperty } from 'app/core/ui-services/search.service';
@ -11,7 +11,7 @@ import { Searchable } from 'app/site/base/searchable';
styleUrls: ['./preview.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class PreviewComponent {
export class PreviewComponent implements OnDestroy {
/**
* Sets the view-model, whose properties are displayed.
*
@ -50,6 +50,13 @@ export class PreviewComponent {
*/
public constructor(private sanitizer: DomSanitizer, private cd: ChangeDetectorRef) {}
/**
* detach the change detection
*/
public ngOnDestroy(): void {
this.cd.detach();
}
/**
* Function to sanitize any text to show html.
*

2
client/src/app/shared/components/progress-snack-bar/progress-snack-bar.component.ts
View File

@ -125,5 +125,7 @@ export class ProgressSnackBarComponent implements OnInit, OnDestroy {
this.progressModeSubscription.unsubscribe();
this.progressModeSubscription = null;
}
this.cd.detach();
}
}

2
client/src/app/shared/components/sort-filter-bar/filter-menu/filter-menu.component.html
View File

@ -1,7 +1,7 @@
<div class="filter-menu-content-wrapper">
<mat-accordion (keyup)="checkKeyEvent($event)">
<mat-expansion-panel *ngFor="let filter of service.filterDefinitions">
<mat-expansion-panel-header *ngIf="filter.options && filter.options.length">
<mat-expansion-panel-header *ngIf="filter && filter.options && filter.options.length">
<mat-panel-title>
<span>{{ service.getFilterName(filter) | translate }}</span>
<mat-basic-chip disableRipple class="lightblue filter-count" *ngIf="filter.count">

11
client/src/app/shared/components/sort-filter-bar/filter-menu/filter-menu.component.ts
View File

@ -1,4 +1,4 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core';
import { BaseFilterListService, OsFilterOption } from 'app/core/ui-services/base-filter-list.service';
import { BaseViewModel } from 'app/site/base/base-view-model';
@ -20,7 +20,7 @@ import { BaseViewModel } from 'app/site/base/base-view-model';
styleUrls: ['./filter-menu.component.scss'],
encapsulation: ViewEncapsulation.None
})
export class FilterMenuComponent implements OnInit {
export class FilterMenuComponent implements OnInit, OnDestroy {
/**
* An event emitter to submit a desire to close this component
* TODO: Might be an easier way to do this
@ -50,6 +50,13 @@ export class FilterMenuComponent implements OnInit {
}
}
/**
*
*/
public ngOnDestroy(): void {
this.dismissed.unsubscribe();
}
/**
* Tests for escape key (to colose the sidebar)
* @param event

1
client/src/app/site/common/components/global-spinner/global-spinner.component.ts
View File

@ -75,5 +75,6 @@ export class GlobalSpinnerComponent implements OnInit, OnDestroy {
this.isVisible = false;
}
this.spinnerSubscription = null;
this.cd.detach();
}
}

19
client/src/app/site/config/components/config-field/config-field.component.ts
View File

@ -1,4 +1,12 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
Input,
OnDestroy,
OnInit,
ViewEncapsulation
} from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { Title } from '@angular/platform-browser';
@ -28,7 +36,7 @@ import { ViewConfig } from '../../models/view-config';
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None // to style the date and time pickers
})
export class ConfigFieldComponent extends BaseComponent implements OnInit {
export class ConfigFieldComponent extends BaseComponent implements OnInit, OnDestroy {
public configItem: ViewConfig;
/**
@ -147,6 +155,13 @@ export class ConfigFieldComponent extends BaseComponent implements OnInit {
});
}
/**
* Stops the change detection
*/
public ngOnDestroy(): void {
this.cd.detach();
}
/**
* Helper function to split a unix timestamp into a date as a moment object and a time string in the form of HH:SS
*

1
client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.ts
View File

@ -243,6 +243,7 @@ export class MediafileListComponent extends BaseListViewComponent<ViewMediafile>
public ngOnDestroy(): void {
super.ngOnDestroy();
this.clearSubscriptions();
this.cd.detach();
}
/**