@alfresco/adf-content-services 8.4.0-18835979785 → 8.4.0-18836034786

package/fesm2022/adf-content-services.mjs

@@ -4672,6 +4672,10 @@ class SearchHeaderQueryBuilderService extends BaseQueryBuilderService {
         }
         return foundCategory;
     }
+    getOperatorForFilterId(id) {
+        const foundCategory = this.categories?.find((category) => category.id === id);
+        return foundCategory?.component?.settings?.operator;
+    }
     setCurrentRootFolderId(currentFolderId) {
         const alreadyAddedFilter = this.filterQueries.find((filterQueries) => filterQueries.query.includes(currentFolderId));
         if (alreadyAddedFilter !== undefined) {
@@ -4767,6 +4771,8 @@ class SearchTextComponent {
     }
     reset(updateContext = true) {
         this.value = '';
+        this.context.filterRawParams[this.id] = undefined;
+        this.context.queryFragments[this.id] = '';
         this.updateQuery(null, updateContext);
     }
     onChangedHandler(event) {
@@ -4777,7 +4783,9 @@ class SearchTextComponent {
         }
     }
     updateQuery(value, updateContext = true) {
-        this.context.filterRawParams[this.id] = value;
+        if (value !== null) {
+            this.context.filterRawParams[this.id] = value;
+        }
         this.displayValue$.next(value);
         if (this.context && this.settings && this.settings.field) {
             this.context.queryFragments[this.id] = value ? `${this.settings.field}:'${this.getSearchPrefix()}${value}${this.getSearchSuffix()}'` : '';
@@ -5405,8 +5413,7 @@ class SearchCheckListComponent {
             }
         }
         this.context.populateFilters
-            .asObservable()
-            .pipe(map((filtersQueries) => filtersQueries[this.id]), takeUntilDestroyed(this.destroyRef))
+            .pipe(map((filtersQueries) => filtersQueries[this.id]), filter((filterQuery) => filterQuery !== undefined), takeUntilDestroyed(this.destroyRef))
             .subscribe((filterQuery) => {
             if (filterQuery) {
                 filterQuery.forEach((value) => {
@@ -5473,8 +5480,8 @@ class SearchCheckListComponent {
         return this.getCheckedValues();
     }
     setValue(value) {
-        this.options.items.filter((item) => value.includes(item.value)).map((item) => (item.checked = true));
-        this.submitValues();
+        this.options.items.forEach((item) => (item.checked = value.includes(item.value)));
+        this.isActive = true;
     }
     getCheckedValues() {
         return this.options.items.filter((option) => option.checked).map((option) => option.value);
@@ -8063,7 +8070,7 @@ class SearchFilterContainerComponent {
     }
     ngOnInit() {
         this.category = this.searchFilterQueryBuilder.getCategoryForColumn(this.col.key);
-        this.initialValue = this.value?.[this.col.key] ? this.value[this.col.key] : undefined;
+        this.initialValue = this.value?.[this.category?.id];
     }
     onKeyPressed(event, menuTrigger) {
         if (event.key === 'Enter' && this.widgetContainer.selector !== 'check-list') {
@@ -8073,7 +8080,7 @@ class SearchFilterContainerComponent {
     }
     onApply() {
         if (this.widgetContainer.hasValueSelected()) {
-            this.searchFilterQueryBuilder.setActiveFilter(this.category.columnKey, this.widgetContainer.getCurrentValue());
+            this.searchFilterQueryBuilder.setActiveFilter(this.category.id, this.widgetContainer.getCurrentValue());
             this.filterChange.emit();
             this.widgetContainer.applyInnerWidget();
         }
@@ -8087,7 +8094,7 @@ class SearchFilterContainerComponent {
     }
     resetSearchFilter() {
         this.widgetContainer.resetInnerWidget();
-        this.searchFilterQueryBuilder.removeActiveFilter(this.category.columnKey);
+        this.searchFilterQueryBuilder.removeActiveFilter(this.category.id);
         this.filterChange.emit();
     }
     getTooltipTranslation(columnTitle) {
@@ -8097,7 +8104,7 @@ class SearchFilterContainerComponent {
         return this.translationService.instant('SEARCH.SEARCH_HEADER.FILTER_BY', { category: this.translationService.instant(columnTitle) });
     }
     isActive() {
-        return this.searchFilterQueryBuilder.getActiveFilters().findIndex((f) => f.key === this.category.columnKey) > -1;
+        return this.searchFilterQueryBuilder.getActiveFilters().findIndex((f) => f.key === this.category.id) > -1;
     }
     onMenuOpen() {
         if (this.filterContainer && !this.focusTrap) {
@@ -8211,12 +8218,17 @@ class FilterHeaderComponent {
         }
     }
     initSearchHeader(currentFolderId) {
-        this.searchFilterQueryBuilder.setCurrentRootFolderId(currentFolderId);
         if (this.value) {
-            Object.keys(this.value).forEach((columnKey) => {
-                this.searchFilterQueryBuilder.setActiveFilter(columnKey, this.value[columnKey]);
+            Object.keys(this.value).forEach((key) => {
+                this.searchFilterQueryBuilder.setActiveFilter(key, this.value[key]);
+                const operator = this.searchFilterQueryBuilder.getOperatorForFilterId(key) || 'OR';
+                this.searchFilterQueryBuilder.filterRawParams[key] = this.value[key];
+                this.searchFilterQueryBuilder.queryFragments[key] = Array.isArray(this.value[key])
+                    ? this.value[key].join(` ${operator} `)
+                    : this.value[key];
             });
         }
+        this.searchFilterQueryBuilder.setCurrentRootFolderId(currentFolderId);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.6", ngImport: i0, type: FilterHeaderComponent, deps: [{ token: ADF_DOCUMENT_PARENT_COMPONENT }, { token: SearchHeaderQueryBuilderService }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.6", type: FilterHeaderComponent, isStandalone: true, selector: "adf-filter-header", inputs: { value: "value", currentFolderId: "currentFolderId" }, outputs: { filterSelection: "filterSelection" }, usesOnChanges: true, ngImport: i0, template: "<div *ngIf=\"isFilterServiceActive\">\n    <adf-header-filter-template>\n        <ng-template let-col>\n            <adf-search-filter-container [col]=\"col\"\n                                         [value]=\"value\"\n                                         (filterChange)=\"onFilterSelectionChange()\" />\n        </ng-template>\n    </adf-header-filter-template>\n</div>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: HeaderFilterTemplateDirective, selector: "adf-header-filter-template" }, { kind: "component", type: SearchFilterContainerComponent, selector: "adf-search-filter-container", inputs: ["col", "value"], outputs: ["filterChange"] }] }); }
@@ -8555,7 +8567,7 @@ class DocumentListComponent extends DataTableSchema {
             }
         }
         if (this.currentFolderId && changes['currentFolderId']?.currentValue !== changes['currentFolderId']?.previousValue) {
-            this.loadFolder();
+            !this.filterValue && this.loadFolder();
         }
         if (this.data) {
             if (changes.node?.currentValue) {
@@ -8743,7 +8755,6 @@ class DocumentListComponent extends DataTableSchema {
                 this.preserveExistingSelection();
             }
             this.onPreselectNodes();
-            this.setLoadingState(false);
             this.onDataReady(nodePaging);
         }
     }
@@ -8918,6 +8929,7 @@ class DocumentListComponent extends DataTableSchema {
     onDataReady(nodePaging) {
         this.ready.emit(nodePaging);
         this.pagination.next(nodePaging.list.pagination);
+        this.setLoadingState(false);
     }
     updatePagination(requestPaginationModel) {
         this._pagination.maxItems = requestPaginationModel.maxItems;