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

Merge branch 'VM/RED-7980' into 'master'

Browse Source 
RED-7980 - fixed "Pending annotation not displayed"

Closes RED-7980

See merge request redactmanager/red-ui!351
This commit is contained in:
Dan Percic 2024-03-20 13:45:44 +01:00
commit e2c108332f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,6 @@ export class AnnotationWrapper implements IListable {
static fromData(
logEntry: IEntityLogEntry,
allLogEntries: IEntityLogEntry[],
dictionary: Dictionary,
changeLogType: ChangeType,
legalBasisList: ILegalBasis[],

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

@ -230,13 +230,14 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
if (entry.state === EntryStates.PENDING) {
const originalAnnotation = this.#findOriginalAnnotation(annotations, entry);
entry.oldState = originalAnnotation.entry.state;
originalAnnotation.pending = true;
if (originalAnnotation) {
entry.oldState = originalAnnotation.entry.state;
originalAnnotation.pending = true;
}
}
const annotation = AnnotationWrapper.fromData(
entry,
entityLog.entityLogEntry,
dictionary,
changeType,
entityLog.legalBasis ?? [],