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

Merge branch 'RED-8116' into 'master'

Browse Source 
RED-8116: removed unnecessary multiple dossierTemplate API calls.

See merge request redactmanager/red-ui!247
This commit is contained in:
Dan Percic 2024-01-10 10:56:18 +01:00
commit 08ce6e4dcd
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.html
View File

@ -3,7 +3,7 @@
<div <div
[attr.help-mode-key]="'document_in_editor'" [attr.help-mode-key]="'document_in_editor'"
[class.error]="file.isError" [class.error]="file.isError"
[class.initial-processing]="file.isInitialProcessing || (ctx.ocrByDefault && !file.lastOCRTime)" [class.initial-processing]="file.isInitialProcessing || (ocrByDefault && !file.lastOCRTime)"
[matTooltip]="file.filename" [matTooltip]="file.filename"
class="table-item-title" class="table-item-title"
matTooltipPosition="above" matTooltipPosition="above"

9
apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.ts
View File

@ -8,7 +8,6 @@ import { DossierTemplatesService } from '@services/dossier-templates/dossier-tem
interface FileNameColumnContext { interface FileNameColumnContext {
primaryAttribute: IFileAttributeConfig; primaryAttribute: IFileAttributeConfig;
ocrByDefault: boolean;
} }
@Component({ @Component({
@ -22,6 +21,7 @@ export class FileNameColumnComponent extends ContextComponent<FileNameColumnCont
@Input() file?: File | TrashFile; @Input() file?: File | TrashFile;
@Input() dossier: Dossier; @Input() dossier: Dossier;
@Input() dossierTemplateId: string; @Input() dossierTemplateId: string;
ocrByDefault: boolean;
constructor( constructor(
private readonly _fileAttributeService: FileAttributesService, private readonly _fileAttributeService: FileAttributesService,
@ -32,14 +32,11 @@ export class FileNameColumnComponent extends ContextComponent<FileNameColumnCont
} }
ngOnInit(): void { ngOnInit(): void {
this.ocrByDefault = this._dossierTemplateService.find(this.dossierTemplateId).ocrByDefault;
const primaryAttribute$ = combineLatest([this._fileAttributeService.fileAttributesConfig$, this.#reloadAttribute]).pipe( const primaryAttribute$ = combineLatest([this._fileAttributeService.fileAttributesConfig$, this.#reloadAttribute]).pipe(
map(() => this.#findPrimaryAttribute()), map(() => this.#findPrimaryAttribute()),
); );
const ocrByDefault$ = this._dossierTemplateService.get(this.dossierTemplateId).pipe(map(template => template.ocrByDefault)); super._initContext({ primaryAttribute: primaryAttribute$ });
super._initContext({
primaryAttribute: primaryAttribute$,
ocrByDefault: ocrByDefault$,
});
} }
ngOnChanges(changes: SimpleChanges): void { ngOnChanges(changes: SimpleChanges): void {