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

RED-5910: show delta changes for suggestions

Browse Source
This commit is contained in:
Dan Percic 2023-01-18 22:20:37 +02:00
parent 4a9c633f1d
commit c0fa0095c0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts
View File

@ -306,15 +306,16 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
};
}
const viableManualChanges = redactionLogEntry.manualChanges.filter(
change => change.processed && change.annotationStatus === LogEntryStatuses.APPROVED,
);
const visibleStatuses: string[] = [LogEntryStatuses.APPROVED, LogEntryStatuses.REQUESTED];
const viableManualChanges = redactionLogEntry.manualChanges.filter(change => visibleStatuses.includes(change.annotationStatus));
viableManualChanges.sort(chronologicallyBy(x => x.processedDate));
const lastManualChange = viableManualChanges.at(-1);
changeOccurredAfterPageIsViewed = lastManualChange && timestampOf(lastManualChange.processedDate) > viewTime;
const isSuggestion = lastManualChange?.annotationStatus === LogEntryStatuses.REQUESTED;
const processedTime = isSuggestion ? lastManualChange.requestedDate : lastManualChange?.processedDate;
changeOccurredAfterPageIsViewed = processedTime && timestampOf(processedTime) > viewTime;
if (changeOccurredAfterPageIsViewed) {
this.#markPageAsUnseenIfNeeded(viewedPage, lastManualChange.processedDate);
this.#markPageAsUnseenIfNeeded(viewedPage, processedTime);
return {
changeLogType: ChangeTypes.CHANGED,
hidden: false,
@ -328,8 +329,8 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
};
}
#markPageAsUnseenIfNeeded(viewedPage: ViewedPage, dateTime: string) {
const showAsUnseen = timestampOf(viewedPage.viewedTime) < timestampOf(dateTime);
#markPageAsUnseenIfNeeded(viewedPage: ViewedPage, processedTime: string) {
const showAsUnseen = timestampOf(viewedPage.viewedTime) < timestampOf(processedTime);
if (showAsUnseen) {
this._viewedPagesMapService.delete(this._state.fileId, viewedPage);
}

1
libs/red-domain/src/lib/redaction-log/manual-change.ts
View File

@ -3,6 +3,7 @@ import { LogEntryStatus, ManualRedactionType } from './types';
export interface IManualChange {
userId: string;
processedDate: string;
requestedDate: string;
annotationStatus: LogEntryStatus;
manualRedactionType: ManualRedactionType;
propertyChanges: { [key: string]: any };