From 7f7148c85938fa417f6edc63a5bb67d323fe09e0 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 30 Jul 2024 11:13:59 +0300 Subject: [PATCH 1/3] RED-9571: fixed initials-avatar not updating in some cases. --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 9df87dc21..9bbaecb7e 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9df87dc218ea8090159059a7bad184aaaeba8854 +Subproject commit 9bbaecb7e566afe2efb8dbce73dce6eb5373801b From ed8eb4840ed464218d5aadd455de0998596f8c70 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 30 Jul 2024 14:14:58 +0300 Subject: [PATCH 2/3] RED-9433: added auto line-break for checkbox label overflow. --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 9bbaecb7e..fb4b58a49 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9bbaecb7e566afe2efb8dbce73dce6eb5373801b +Subproject commit fb4b58a4968846e899f4e5aa33c75109302e4b4f From 9b197811d13665c629abe3593cf5153dd1ada674 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 30 Jul 2024 15:07:57 +0300 Subject: [PATCH 3/3] RED-8748 - updated filtering when a component is selected --- ...le-structured-component-value.component.ts | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts index 971b6aa6e..51bf95b54 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts @@ -6,7 +6,7 @@ import { MatIcon } from '@angular/material/icon'; import { FilterService } from '@common-ui/filtering'; import { CircleButtonComponent, IconButtonComponent, IconButtonTypes, IqserDialog } from '@iqser/common-ui'; 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'; @Component({ @@ -152,8 +152,15 @@ export class EditableStructuredComponentValueComponent implements OnInit { #setWorkloadFilters() { this._filtersService.deactivateFilters({ primaryFiltersSlug: 'primaryFilters' }); - const filterSet = this.#setFilter(this.entryLabel); - if (!filterSet) { + const uniqueLabels = this.#getUniqueReferencesLabels(this.entry.componentValues); + let setFilterCount = 0; + for (const label of uniqueLabels) { + const setFilter = this.#setFilter(label); + if (setFilter) { + setFilterCount++; + } + } + if (!setFilterCount) { this.#setFilter('no-annotations-filter'); } } @@ -161,7 +168,7 @@ export class EditableStructuredComponentValueComponent implements OnInit { #setFilter(label: string) { const filterGroup = this._filtersService.getGroup('primaryFilters'); 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) { this._filtersService.filterCheckboxClicked({ nestedFilter, filterGroup, primaryFiltersSlug: 'primaryFilters' }); return true; @@ -169,6 +176,17 @@ export class EditableStructuredComponentValueComponent implements OnInit { } } + #getUniqueReferencesLabels(values: IComponentValue[]) { + const labels: Set = 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() { setTimeout(() => { for (let i = 0; i < this.entry.componentValues.length; i++) {