@webitel/ui-datalist 26.8.15 → 26.8.16

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/ui-datalist",
-	"version": "26.8.15",
+	"version": "26.8.16",
 	"description": "Toolkit for building data lists in webitel ui system",
 	"scripts": {
 		"build:types": "vue-tsc -b tsconfig.build.json",

package/src/modules/filters/components/config/static-view/__tests__/static-filter-field.spec.ts

@@ -113,6 +113,46 @@ describe('StaticFilterField', () => {
 		expect(wrapper.emitted('delete:filter')).toHaveLength(1);
 	});
 
+	it('deletes an applied range filter when both bounds are cleared', () => {
+		filtersManager.addFilter({
+			name: FilterOption.Agent,
+			value: {
+				from: 10,
+				to: 20,
+			},
+		});
+
+		const wrapper = mountField(deletableConfig, filtersManager);
+
+		emitValue(wrapper, {
+			from: null,
+			to: null,
+		});
+
+		expect(wrapper.emitted('delete:filter')).toHaveLength(1);
+		expect(wrapper.emitted('update:filter')).toBeUndefined();
+	});
+
+	it('updates an applied range filter when one bound is left', () => {
+		filtersManager.addFilter({
+			name: FilterOption.Agent,
+			value: {
+				from: 10,
+				to: 20,
+			},
+		});
+
+		const wrapper = mountField(deletableConfig, filtersManager);
+
+		emitValue(wrapper, {
+			from: null,
+			to: 20,
+		});
+
+		expect(wrapper.emitted('delete:filter')).toBeUndefined();
+		expect(wrapper.emitted('update:filter')).toHaveLength(1);
+	});
+
 	it('keeps a notDeletable filter when its field is cleared', () => {
 		filtersManager.addFilter({
 			name: FilterOption.JoinedAt,

package/src/modules/filters/composables/useFilterValueChange.ts

@@ -5,6 +5,15 @@ import type { FilterValue, IFilter } from '../classes/Filter';
 import type { StaticFilterEmits } from '../components/types/Filter.types';
 import type { AnyFilterConfig } from '../modules/filterConfig';
 
+const isEmptyFilterValue = (value: FilterValue) => {
+	if (typeof value === 'boolean') return false;
+	if (isEmpty(value)) return true;
+	if (typeof value !== 'object' || Array.isArray(value)) return false;
+	return Object.values(value).every(
+		(field) => field === null || field === undefined || field === '',
+	);
+};
+
 type StaticFilterEmit = <K extends keyof StaticFilterEmits>(
 	event: K,
 	...args: StaticFilterEmits[K]
@@ -23,7 +32,7 @@ export const useFilterValueChange = ({
 		const currentFilter = toValue(filter);
 		const config = toValue(filterConfig);
 
-		if (isEmpty(value) && typeof value !== 'boolean') {
+		if (isEmptyFilterValue(value)) {
 			if (!currentFilter) return;
 			if (config.notDeletable) return;
 			return emit('delete:filter', currentFilter);

package/src/modules/headers/createTableHeadersStore.ts

@@ -59,7 +59,8 @@ export const tableHeadersStoreBody = ({
 		}: {
 			column: DatalistTableHeader;
 			order: DatalistTableHeader['sort'];
-		}) => `${sortToQueryAdapter(order)}${column.field}`;
+		}) =>
+			`${sortToQueryAdapter(typeof order === 'boolean' ? undefined : order)}${column.field}`;
 
 		const sortedCol = headers.value.find((header) => header.sort);