diff --git a/CHANGELOG.md b/CHANGELOG.md index b0bc4b4a..603cef4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v15.1.0 (2023-12-15) +* **grid** drop unused customMenu directive +* **grid** use suggest for multi filter dropdown +* **suggest** add config input for max selection count + # v15.0.19 (2023-12-20) * **grid** change visibility-manager isDirty$ diff --git a/package-lock.json b/package-lock.json index 22663d43..11f3058a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "angular-components", - "version": "15.0.19", + "version": "15.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "angular-components", - "version": "15.0.19", + "version": "15.1.0", "license": "MIT", "dependencies": { "@angular/animations": "15.2.9", diff --git a/package.json b/package.json index 148f3311..f24995b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-components", - "version": "15.0.19", + "version": "15.1.0", "author": { "name": "UiPath Inc", "url": "https://uipath.com" diff --git a/projects/angular/components/ui-grid/src/managers/filter-manager.ts b/projects/angular/components/ui-grid/src/managers/filter-manager.ts index 40e3e702..c9faeb23 100644 --- a/projects/angular/components/ui-grid/src/managers/filter-manager.ts +++ b/projects/angular/components/ui-grid/src/managers/filter-manager.ts @@ -69,11 +69,15 @@ export class FilterManager { this.filter$, ]).pipe( map(([activeCount, filters]) => { - const activeFilterValueCount = activeCount + filters.filter(f => isArray(f?.value)) - .map(f => (f.value as FilterMultiValue).length - 1) - .reduce((acc, cur) => acc + cur, 0); - - return Math.max(0, activeFilterValueCount); + const activeFilterValueCount = activeCount + filters.reduce((acc, filterModel) => { + const filterValue = filterModel?.value; + if (isArray(filterValue) && filterValue.length > 1) { + return acc + filterValue.length - 1; + } + return acc; + }, 0); + + return activeFilterValueCount; }), ); diff --git a/projects/angular/components/ui-grid/src/ui-grid.component.ts b/projects/angular/components/ui-grid/src/ui-grid.component.ts index d7967d0b..efe4a867 100644 --- a/projects/angular/components/ui-grid/src/ui-grid.component.ts +++ b/projects/angular/components/ui-grid/src/ui-grid.component.ts @@ -1241,7 +1241,7 @@ export class UiGridComponent isFilterApplied(column: UiGridColumnDirective) { const searchableHasValue = column.searchableDropdown?.value != null && - (column.searchableDropdown.value as []).length !== 0; + (!column.searchableDropdown.multiple || (column.searchableDropdown.value as []).length > 0); const dropdownHasValue = (column.dropdown?.value != null && column.dropdown!.value!.value !== column.dropdown!.emptyStateValue) && diff --git a/projects/angular/package.json b/projects/angular/package.json index 76d8e8c7..0bea83da 100644 --- a/projects/angular/package.json +++ b/projects/angular/package.json @@ -1,6 +1,6 @@ { "name": "@uipath/angular", - "version": "15.0.19", + "version": "15.1.0", "license": "MIT", "author": { "name": "UiPath Inc",