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

RED-2533: Remove status filter from workflow view

Browse Source
This commit is contained in:
Adina Țeudan 2021-10-25 16:12:02 +03:00
parent b8f14d29fd
commit 155bca1079
5 changed files with 58 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,10 +132,12 @@ export class UserListingScreenComponent extends ListingComponent<User> implement
}),
);
this.filterService.addFilterGroup({
slug: 'roleFilters',
filters: roleFilters,
checker: userTypeChecker,
});
this.filterService.addFilterGroups([
{
slug: 'roleFilters',
filters: roleFilters,
checker: userTypeChecker,
},
]);
}
}

43
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
View File

@ -1,5 +1,15 @@
import { Injectable, TemplateRef } from '@angular/core';
import { IFilterGroup, INestedFilter, keyChecker, LoadingService, NestedFilter, TableColumnConfig, WorkflowConfig } from '@iqser/common-ui';
import {
IFilterGroup,
INestedFilter,
keyChecker,
ListingMode,
ListingModes,
LoadingService,
NestedFilter,
TableColumnConfig,
WorkflowConfig,
} from '@iqser/common-ui';
import { File } from '@models/file/file';
import { fileStatusTranslations } from '../../translations/file-status-translations';
import { FileStatus, FileStatuses, IFileAttributeConfig } from '@redaction/red-ui-http';
@ -122,6 +132,7 @@ export class ConfigService {
filterGroups(
entities: File[],
listingMode: ListingMode,
fileAttributeConfigs: IFileAttributeConfig[],
needsWorkFilterTemplate: TemplateRef<unknown>,
checkedRequiredFilters: () => NestedFilter[],
@ -181,21 +192,23 @@ export class ConfigService {
});
});
const statusFilters = [...allDistinctFileStatuses].map(
status =>
new NestedFilter({
id: status,
label: this._translateService.instant(fileStatusTranslations[status]),
}),
);
if (listingMode === ListingModes.table) {
const statusFilters = [...allDistinctFileStatuses].map(
status =>
new NestedFilter({
id: status,
label: this._translateService.instant(fileStatusTranslations[status]),
}),
);
filterGroups.push({
slug: 'statusFilters',
label: this._translateService.instant('filters.status'),
icon: 'red:status',
filters: statusFilters.sort((a, b) => StatusSorter[a.id] - StatusSorter[b.id]),
checker: keyChecker('status'),
});
filterGroups.push({
slug: 'statusFilters',
label: this._translateService.instant('filters.status'),
icon: 'red:status',
filters: statusFilters.sort((a, b) => StatusSorter[a.id] - StatusSorter[b.id]),
checker: keyChecker('status'),
});
}
const peopleFilters: NestedFilter[] = [];
if (allDistinctPeople.has(undefined) || allDistinctPeople.has(null)) {

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

@ -159,6 +159,10 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
this.calculateData();
});
this.addSubscription = this.listingMode$.subscribe(() => {
this._computeAllFilters();
});
// this.addSubscription = this._appStateService.fileChanged$.subscribe(() => {
// this.calculateData();
// });
@ -316,11 +320,12 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
const filterGroups = this._configService.filterGroups(
this.entitiesService.all,
this.listingMode,
this._fileAttributeConfigs,
this._needsWorkFilterTemplate,
() => this.checkedRequiredFilters,
() => this.checkedNotRequiredFilters,
);
this.filterService.addFilterGroups(filterGroups);
this.filterService.addFilterGroups(filterGroups, true);
}
}

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

@ -76,20 +76,22 @@ export class SearchScreenComponent extends ListingComponent<ListItem> implements
super(_injector);
this.searchService.skip = true;
this.filterService.addFilterGroup({
slug: 'dossiers',
label: this._translateService.instant('search-screen.filters.by-dossier'),
filterceptionPlaceholder: this._translateService.instant('search-screen.filters.search-placeholder'),
icon: 'red:folder',
filters: this._dossiersService.all.map(
dossier =>
new NestedFilter({
id: dossier.id,
label: dossier.dossierName,
}),
),
checker: keyChecker('dossierId'),
});
this.filterService.addFilterGroups([
{
slug: 'dossiers',
label: this._translateService.instant('search-screen.filters.by-dossier'),
filterceptionPlaceholder: this._translateService.instant('search-screen.filters.search-placeholder'),
icon: 'red:folder',
filters: this._dossiersService.all.map(
dossier =>
new NestedFilter({
id: dossier.id,
label: dossier.dossierName,
}),
),
checker: keyChecker('dossierId'),
},
]);
this.addSubscription = _activatedRoute.queryParamMap
.pipe(map(value => ({ query: value.get('query'), dossierId: value.get('dossierId') })))

2
libs/common-ui

@ -1 +1 @@
Subproject commit 9461df16f71186ea40b365622900b03d7f7bb387
Subproject commit defdc2af4e226ca8bb17df6c4d1cdd85130cfce5