Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

update filter, sorting and search services

Browse Source
This commit is contained in:
Dan Percic 2021-07-12 00:29:05 +03:00
parent 13d8a7da04
commit 204cdc7787
11 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
View File

@ -9,7 +9,7 @@ import { LoadingService } from '../../../../services/loading.service';
import { FilterService } from '../../../shared/services/filter.service';
import { SearchService } from '../../../shared/services/search.service';
import { ScreenStateService } from '../../../shared/services/screen-state.service';
import { SortingService } from '../../../../services/sorting.service';
import { ScreenNames, SortingService } from '../../../../services/sorting.service';
@Component({
templateUrl: './default-colors-screen.component.html',
@ -35,7 +35,7 @@ export class DefaultColorsScreenComponent
protected readonly _injector: Injector
) {
super(_injector);
this._sortingService.screenName = 'default-colors';
this._sortingService.setScreenName(ScreenNames.DEFAULT_COLORS);
_appStateService.activateDossierTemplate(_activatedRoute.snapshot.params.dossierTemplateId);
}

4
apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
View File

@ -14,7 +14,7 @@ import { LoadingService } from '../../../../services/loading.service';
import { FilterService } from '../../../shared/services/filter.service';
import { SearchService } from '../../../shared/services/search.service';
import { ScreenStateService } from '../../../shared/services/screen-state.service';
import { SortingService } from '../../../../services/sorting.service';
import { ScreenNames, SortingService } from '../../../../services/sorting.service';
const toChartConfig = (dict: TypeValueWrapper): DoughnutChartConfig => ({
value: dict.entries ? dict.entries.length : 0,
@ -48,7 +48,7 @@ export class DictionaryListingScreenComponent
) {
super(_injector);
_loadingService.start();
this._sortingService.screenName = 'dictionary-listing';
this._sortingService.setScreenName(ScreenNames.DOSSIER_LISTING);
_appStateService.activateDossierTemplate(_activatedRoute.snapshot.params.dossierTemplateId);
}

4
apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
View File

@ -10,7 +10,7 @@ import { DossierTemplateControllerService } from '@redaction/red-ui-http';
import { FilterService } from '../../../shared/services/filter.service';
import { SearchService } from '../../../shared/services/search.service';
import { ScreenStateService } from '../../../shared/services/screen-state.service';
import { SortingService } from '../../../../services/sorting.service';
import { ScreenNames, SortingService } from '../../../../services/sorting.service';
@Component({
templateUrl: './dossier-templates-listing-screen.component.html',
@ -34,7 +34,7 @@ export class DossierTemplatesListingScreenComponent
readonly userPreferenceService: UserPreferenceService
) {
super(_injector);
this._sortingService.screenName = 'dossier-templates-listing';
this._sortingService.setScreenName(ScreenNames.DOSSIER_TEMPLATES_LISTING);
}
ngOnInit(): void {

4
apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
View File

@ -9,7 +9,7 @@ import { LoadingService } from '../../../../services/loading.service';
import { FilterService } from '../../../shared/services/filter.service';
import { SearchService } from '../../../shared/services/search.service';
import { ScreenStateService } from '../../../shared/services/screen-state.service';
import { SortingService } from '../../../../services/sorting.service';
import { ScreenNames, SortingService } from '../../../../services/sorting.service';
@Component({
templateUrl: './file-attributes-listing-screen.component.html',
@ -33,7 +33,7 @@ export class FileAttributesListingScreenComponent extends BaseListingComponent<F
protected readonly _injector: Injector
) {
super(_injector);
this._sortingService.screenName = 'file-attributes-listing';
this._sortingService.setScreenName(ScreenNames.FILE_ATTRIBUTES_LISTING);
this._appStateService.activateDossierTemplate(
_activatedRoute.snapshot.params.dossierTemplateId
);

10
apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
View File

@ -10,7 +10,7 @@ import { TranslateService } from '@ngx-translate/core';
import { FilterService } from '../../../shared/services/filter.service';
import { SearchService } from '../../../shared/services/search.service';
import { ScreenStateService } from '../../../shared/services/screen-state.service';
import { SortingService } from '../../../../services/sorting.service';
import { ScreenNames, SortingService } from '../../../../services/sorting.service';
@Component({
templateUrl: './trash-screen.component.html',
@ -36,12 +36,18 @@ export class TrashScreenComponent extends BaseListingComponent<Dossier> implemen
private readonly _translateService: TranslateService
) {
super(_injector);
this._sortingService.screenName = 'dossier-listing';
this._sortingService.setScreenName(ScreenNames.DOSSIER_LISTING);
this._searchService.setSearchKey('dossierName');
this._screenStateService.setSelectionKey('dossierId');
}
async ngOnInit(): Promise<void> {
this._loadingService.start();
await this.loadDossierTemplatesData();
this._filterService.setFilters(this._filters);
this._filterService.filterEntities();
this._loadingService.stop();
}

11
apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts
View File

@ -83,14 +83,13 @@ export class DossierListingScreenComponent
protected readonly _injector: Injector
) {
super(_injector);
this._sortingService.screenName = ScreenNames.DOSSIER_LISTING;
this._sortingService.setScreenName(ScreenNames.DOSSIER_LISTING);
this._searchService.setSearchKey('name');
this._appStateService.reset();
this._searchService.searchKey = 'name';
this._loadEntitiesFromState();
}
get activeDossiersCount(): number {
console.log('active dossiers');
return this._screenStateService.entities.filter(
p => p.dossier.status === Dossier.StatusEnum.ACTIVE
).length;
@ -216,9 +215,11 @@ export class DossierListingScreenComponent
private _calculateData() {
this._computeAllFilters();
this._filterService.filters = this._filters;
this._filterService.preFilter = () => this._preFilter();
this._filterService.setFilters(this._filters);
this._filterService.setPreFilters(() => this._preFilter());
this._filterService.filterEntities();
this.dossiersChartData = [
{ value: this.activeDossiersCount, color: 'ACTIVE', label: 'active' },
{ value: this.inactiveDossiersCount, color: 'DELETED', label: 'archived' }

4
apps/red-ui/src/app/modules/dossier/screens/dossier-overview-screen/dossier-overview-screen.component.ts
View File

@ -43,7 +43,7 @@ import { ActionConfig } from '@shared/components/page-header/models/action-confi
import { FilterService } from '../../../shared/services/filter.service';
import { SearchService } from '../../../shared/services/search.service';
import { ScreenStateService } from '../../../shared/services/screen-state.service';
import { SortingService } from '../../../../services/sorting.service';
import { ScreenNames, SortingService } from '../../../../services/sorting.service';
@Component({
templateUrl: './dossier-overview-screen.component.html',
@ -98,7 +98,7 @@ export class DossierOverviewScreenComponent
protected readonly _injector: Injector
) {
super(_injector);
this._sortingService.screenName = 'dossier-overview';
this._sortingService.setScreenName(ScreenNames.DOSSIER_OVERVIEW);
this._loadEntitiesFromState();
}

29
apps/red-ui/src/app/modules/shared/services/filter.service.ts
View File

@ -8,8 +8,8 @@ import { SearchService } from '@shared/services/search.service';
@Injectable()
export class FilterService<T> {
showResetFilters = false;
preFilter: () => void;
filters: FilterWrapper[];
_preFilter: () => void;
_filters: FilterWrapper[];
constructor(
private readonly _screenStateService: ScreenStateService<T>,
@ -17,8 +17,21 @@ export class FilterService<T> {
private readonly _changeDetector: ChangeDetectorRef
) {}
setFilters(value: FilterWrapper[]) {
this._filters = value;
}
setPreFilters(value: () => void) {
this._preFilter = value;
}
get filters(): FilterWrapper[] {
if (this._filters === undefined || this._filters === null) throw new Error('Unset filters');
return this._filters;
}
filtersChanged(filters?: { [key: string]: FilterModel[] } | FilterModel[]): void {
console.log(filters);
if (filters instanceof Array) this.showResetFilters = !!filters.find(f => f.checked);
else
for (const key of Object.keys(filters ?? {})) {
@ -31,16 +44,16 @@ export class FilterService<T> {
}
filterEntities(): void {
if (this.preFilter) this.preFilter();
this._screenStateService.setFilteredEntities(
getFilteredEntities(this._screenStateService.entities, this.filters)
);
if (this._preFilter) this._preFilter();
const filtered = getFilteredEntities(this._screenStateService.entities, this.filters);
this._screenStateService.setFilteredEntities(filtered);
this._searchService.executeSearchImmediately();
this._changeDetector.detectChanges();
}
reset(): void {
// this._quickFilters.deactivateFilters();
this.showResetFilters = false;
this.filtersChanged();
}

12
apps/red-ui/src/app/modules/shared/services/screen-state.service.ts
View File

@ -8,7 +8,7 @@ export class ScreenStateService<T> {
displayedEntities$ = new BehaviorSubject<T[]>([]);
selectedEntitiesIds: string[] = [];
private _selectionKey: string;
private _setSelectionKey: string;
get entities(): T[] {
return Object.values(this.entities$.getValue());
}
@ -40,8 +40,8 @@ export class ScreenStateService<T> {
this.displayedEntities$.next(newEntities);
}
set selectionKey(value: string) {
this._selectionKey = value;
setSelectionKey(value: string) {
this._setSelectionKey = value;
}
get areAllEntitiesSelected() {
@ -79,7 +79,7 @@ export class ScreenStateService<T> {
}
updateSelection() {
if (this._selectionKey) {
if (this._setSelectionKey) {
this.selectedEntitiesIds = this.displayedEntities
.map(entity => entity[this._getSelectionKey])
.filter(id => this.selectedEntitiesIds.includes(id));
@ -94,8 +94,8 @@ export class ScreenStateService<T> {
}
private get _getSelectionKey(): string {
if (!this._selectionKey) throw new Error('Not implemented');
if (!this._setSelectionKey) throw new Error('Not implemented');
return this._selectionKey;
return this._setSelectionKey;
}
}

10
apps/red-ui/src/app/modules/shared/services/search.service.ts
View File

@ -6,7 +6,7 @@ import { FormBuilder } from '@angular/forms';
@Injectable()
export class SearchService<T> {
private _searchValue = '';
private _searchKey: string;
private _setSearchKey: string;
readonly searchForm = this._formBuilder.group({
query: ['']
@ -36,8 +36,8 @@ export class SearchService<T> {
this._screenStateService.updateSelection();
}
set searchKey(value: string) {
this._searchKey = value;
setSearchKey(value: string) {
this._setSearchKey = value;
}
get searchValue(): string {
@ -49,9 +49,9 @@ export class SearchService<T> {
}
private get _getSearchKey(): string {
if (!this._searchKey) throw new Error('Not implemented');
if (!this._setSearchKey) throw new Error('Not implemented');
return this._searchKey;
return this._setSearchKey;
}
protected _searchField(entity: T): string {

6
apps/red-ui/src/app/services/sorting.service.ts
View File

@ -25,7 +25,7 @@ export enum ScreenNames {
DOSSIER_LISTING = 'dossier-listing',
DOSSIER_OVERVIEW = 'dossier-overview',
DICTIONARY_LISTING = 'dictionary-listing',
DICTIONARY_TEMPLATES_LISTING = 'dossier-templates-listing',
DOSSIER_TEMPLATES_LISTING = 'dossier-templates-listing',
DEFAULT_COLORS = 'default-colors',
FILE_ATTRIBUTES_LISTING = 'file-attributes-listing',
DOSSIER_ATTRIBUTES_LISTING = 'dossier-attributes-listing'
@ -38,13 +38,13 @@ export class SortingService {
[ScreenNames.DOSSIER_LISTING]: { column: 'dossier.dossierName', order: SortingOrders.ASC },
[ScreenNames.DOSSIER_OVERVIEW]: { column: 'filename', order: SortingOrders.ASC },
[ScreenNames.DICTIONARY_LISTING]: { column: 'label', order: SortingOrders.ASC },
[ScreenNames.DICTIONARY_TEMPLATES_LISTING]: { column: 'name', order: SortingOrders.ASC },
[ScreenNames.DOSSIER_TEMPLATES_LISTING]: { column: 'name', order: SortingOrders.ASC },
[ScreenNames.DEFAULT_COLORS]: { column: 'key', order: SortingOrders.ASC },
[ScreenNames.FILE_ATTRIBUTES_LISTING]: { column: 'label', order: SortingOrders.ASC },
[ScreenNames.DOSSIER_ATTRIBUTES_LISTING]: { column: 'label', order: 'asc' }
};
set screenName(value: string) {
setScreenName(value: string) {
this._currentScreenName = value;
}