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

Merge remote-tracking branch 'origin/master' into RED-9747

Browse Source
This commit is contained in:
Dan Percic 2024-07-30 16:21:46 +03:00
commit 30c1f8628b
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts
View File

@ -6,7 +6,7 @@ import { MatIcon } from '@angular/material/icon';
import { FilterService } from '@common-ui/filtering'; import { FilterService } from '@common-ui/filtering';
import { CircleButtonComponent, IconButtonComponent, IconButtonTypes, IqserDialog } from '@iqser/common-ui'; import { CircleButtonComponent, IconButtonComponent, IconButtonTypes, IqserDialog } from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { IComponentLogEntry } from '@red/domain'; import { IComponentLogEntry, IComponentValue } from '@red/domain';
import { RevertValueDialogComponent } from '../../dialogs/docu-mine/revert-value-dialog/revert-value-dialog.component'; import { RevertValueDialogComponent } from '../../dialogs/docu-mine/revert-value-dialog/revert-value-dialog.component';
@Component({ @Component({
@ -152,8 +152,15 @@ export class EditableStructuredComponentValueComponent implements OnInit {
#setWorkloadFilters() { #setWorkloadFilters() {
this._filtersService.deactivateFilters({ primaryFiltersSlug: 'primaryFilters' }); this._filtersService.deactivateFilters({ primaryFiltersSlug: 'primaryFilters' });
const filterSet = this.#setFilter(this.entryLabel); const uniqueLabels = this.#getUniqueReferencesLabels(this.entry.componentValues);
if (!filterSet) { let setFilterCount = 0;
for (const label of uniqueLabels) {
const setFilter = this.#setFilter(label);
if (setFilter) {
setFilterCount++;
}
}
if (!setFilterCount) {
this.#setFilter('no-annotations-filter'); this.#setFilter('no-annotations-filter');
} }
} }
@ -161,7 +168,7 @@ export class EditableStructuredComponentValueComponent implements OnInit {
#setFilter(label: string) { #setFilter(label: string) {
const filterGroup = this._filtersService.getGroup('primaryFilters'); const filterGroup = this._filtersService.getGroup('primaryFilters');
for (const filter of filterGroup.filters) { for (const filter of filterGroup.filters) {
const nestedFilter = filter.children.find(f => f.label === label); const nestedFilter = filter.children.find(f => f.label.toLowerCase() === label);
if (nestedFilter) { if (nestedFilter) {
this._filtersService.filterCheckboxClicked({ nestedFilter, filterGroup, primaryFiltersSlug: 'primaryFilters' }); this._filtersService.filterCheckboxClicked({ nestedFilter, filterGroup, primaryFiltersSlug: 'primaryFilters' });
return true; return true;
@ -169,6 +176,17 @@ export class EditableStructuredComponentValueComponent implements OnInit {
} }
} }
#getUniqueReferencesLabels(values: IComponentValue[]) {
const labels: Set<string> = new Set();
for (const value of values) {
for (const reference of value.entityReferences) {
const label = reference.type?.replace(/_/g, ' ')?.toLowerCase();
labels.add(label);
}
}
return labels;
}
#updateTextAreaHeight() { #updateTextAreaHeight() {
setTimeout(() => { setTimeout(() => {
for (let i = 0; i < this.entry.componentValues.length; i++) { for (let i = 0; i < this.entry.componentValues.length; i++) {

2
libs/common-ui

@ -1 +1 @@
Subproject commit 9df87dc218ea8090159059a7bad184aaaeba8854 Subproject commit fb4b58a4968846e899f4e5aa33c75109302e4b4f