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

Merge branch 'RED-8684' into 'master'

Browse Source 
RED-8684: removed deleted types warning for readonly files.

See merge request redactmanager/red-ui!332
This commit is contained in:
Dan Percic 2024-03-06 16:10:38 +01:00
commit 7cd8d1d546
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,8 +179,8 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
async #convertData(entityLog: IEntityLog) {
const file = this._state.file();
const annotations: AnnotationWrapper[] = [];
const dictionaries = this._state.dictionaries;
const defaultColors = this._defaultColorsService.find(this._state.dossierTemplateId);
let dictionaries = this._state.dictionaries;
let checkDictionary = true;
for (const entry of entityLog.entityLogEntry) {
@ -213,10 +213,13 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
let dictionary = dictionaries.find(dict => dict.type === entry.type);
if (!dictionary && checkDictionary) {
const dictionaryRequest = this._dictionaryService.loadDictionaryDataForDossierTemplate(this._state.dossierTemplateId);
await firstValueFrom(dictionaryRequest);
checkDictionary = false;
const dictionaryRequest = this._dictionaryService.loadDictionaryDataForDossierTemplate(
this._state.dossierTemplateId,
this._state.isReadonly(),
);
dictionaries = await firstValueFrom(dictionaryRequest);
dictionary = dictionaries.find(dict => dict.type === entry.type);
checkDictionary = false;
}
if (!dictionary) {

14
apps/red-ui/src/app/services/entity-services/dictionary.service.ts
View File

@ -48,8 +48,14 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
);
}
getAllDictionaries(dossierTemplateId: string, dossierId?: string) {
const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined;
getAllDictionaries(dossierTemplateId: string, readOnly = false, dossierId?: string) {
const queryParams = [];
if (dossierId) {
queryParams.push({ key: 'dossierId', value: dossierId });
}
if (readOnly) {
queryParams.push({ key: 'includeDeleted', value: true });
}
return this._getOne<{ types: IDictionary[] }>(['type', dossierTemplateId], this._defaultModelPath, queryParams);
}
@ -237,8 +243,8 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
return forkJoin(observables);
}
loadDictionaryDataForDossierTemplate(dossierTemplateId: string): Observable<Dictionary[]> {
return this.getAllDictionaries(dossierTemplateId).pipe(
loadDictionaryDataForDossierTemplate(dossierTemplateId: string, readOnlyFile = false): Observable<Dictionary[]> {
return this.getAllDictionaries(dossierTemplateId, readOnlyFile).pipe(
map(typesResponse => typesResponse.types.map(type => new Dictionary(type))),
map(dictionaries => {
let manualTypeExists = false;