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

RED-4347: back to skipped when suggestion declined

Browse Source
This commit is contained in:
Dan Percic 2022-06-23 21:15:51 +03:00
parent c7dbd82b66
commit 3091361fba
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/red-ui/src/app/models/file/annotation.wrapper.ts
View File

@ -415,13 +415,24 @@ export class AnnotationWrapper implements IListable, Record<string, unknown> {
}
break;
case ManualRedactionType.REMOVE_FROM_DICTIONARY:
switch (lastManualChange.annotationStatus) {
case LogEntryStatus.APPROVED:
return SuperTypes.Skipped;
case LogEntryStatus.DECLINED:
return SuperTypes.Redaction;
case LogEntryStatus.REQUESTED:
return SuperTypes.SuggestionRemoveDictionary;
if (redactionLogEntry.redacted) {
switch (lastManualChange.annotationStatus) {
case LogEntryStatus.APPROVED:
return SuperTypes.Skipped;
case LogEntryStatus.DECLINED:
return SuperTypes.Redaction;
case LogEntryStatus.REQUESTED:
return SuperTypes.SuggestionRemoveDictionary;
}
} else {
switch (lastManualChange.annotationStatus) {
case LogEntryStatus.APPROVED:
return SuperTypes.Redaction;
case LogEntryStatus.DECLINED:
return SuperTypes.Skipped;
case LogEntryStatus.REQUESTED:
return SuperTypes.SuggestionRemoveDictionary;
}
}
break;
case ManualRedactionType.FORCE_REDACT:
@ -454,9 +465,8 @@ export class AnnotationWrapper implements IListable, Record<string, unknown> {
return SuperTypes.Redaction;
} else if (redactionLogEntry.hint) {
return SuperTypes.Hint;
} else {
return isHintDictionary ? SuperTypes.IgnoredHint : SuperTypes.Skipped;
}
return isHintDictionary ? SuperTypes.IgnoredHint : SuperTypes.Skipped;
}
case LogEntryStatus.REQUESTED:
return SuperTypes.SuggestionRecategorizeImage;
@ -481,9 +491,9 @@ export class AnnotationWrapper implements IListable, Record<string, unknown> {
return redactionLogEntry.type === 'manual' ? SuperTypes.ManualRedaction : SuperTypes.Redaction;
} else if (redactionLogEntry.hint) {
return SuperTypes.Hint;
} else {
return isHintDictionary ? SuperTypes.IgnoredHint : SuperTypes.Skipped;
}
return isHintDictionary ? SuperTypes.IgnoredHint : SuperTypes.Skipped;
case LogEntryStatus.REQUESTED:
return SuperTypes.SuggestionResize;
}

5
apps/red-ui/src/app/modules/file-preview/services/annotation-actions.service.ts
View File

@ -370,10 +370,7 @@ export class AnnotationActionsService {
type: 'actionButton',
img: this._convertPath('/assets/icons/general/close.svg'),
title: this._translateService.instant('annotation-actions.reject-suggestion'),
onClick: () =>
this._ngZone.run(() => {
this.rejectSuggestion(null, annotations);
}),
onClick: () => this._ngZone.run(() => this.rejectSuggestion(null, annotations)),
});
}