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

RED-3366: File updates filter only for current user

Browse Source
This commit is contained in:
Adina Țeudan 2022-02-09 10:05:59 +02:00
parent ea1fb34fa7
commit 44aa8249ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ export class ConfigService {
if (file.hasSuggestions) { if (file.hasSuggestions) {
allDistinctNeedsWork.add('suggestion'); allDistinctNeedsWork.add('suggestion');
} }
if (file.hasUpdates) { if (file.hasUpdates && file.assignee === this._userService.currentUser.id && !file.isApproved) {
allDistinctNeedsWork.add('updated'); allDistinctNeedsWork.add('updated');
} }
if (file.hasImages) { if (file.hasImages) {
@ -277,7 +277,7 @@ export class ConfigService {
icon: 'red:needs-work', icon: 'red:needs-work',
filterTemplate: needsWorkFilterTemplate, filterTemplate: needsWorkFilterTemplate,
filters: needsWorkFilters.sort(RedactionFilterSorter.byKey), filters: needsWorkFilters.sort(RedactionFilterSorter.byKey),
checker: annotationFilterChecker, checker: (file: File, filter: INestedFilter) => annotationFilterChecker(file, filter, this._userService.currentUser.id),
matchAll: true, matchAll: true,
}); });

4
apps/red-ui/src/app/utils/filter-utils.ts
View File

@ -44,7 +44,7 @@ export function handleFilterDelta(oldFilters: INestedFilter[], newFilters: INest
}); });
} }
export const annotationFilterChecker = (file: File, filter: INestedFilter) => { export const annotationFilterChecker = (file: File, filter: INestedFilter, currentUserId: string) => {
switch (filter.id) { switch (filter.id) {
case 'analysis': { case 'analysis': {
return file.analysisRequired; return file.analysisRequired;
@ -62,7 +62,7 @@ export const annotationFilterChecker = (file: File, filter: INestedFilter) => {
return file.hasNone; return file.hasNone;
} }
case 'updated': { case 'updated': {
return file.hasUpdates; return file.hasUpdates && file.assignee === currentUserId && !file.isApproved;
} }
case 'image': { case 'image': {
return file.hasImages; return file.hasImages;