@trackunit/filters-filter-bar 1.15.15 → 1.16.0

package/index.cjs.js

@@ -348,9 +348,9 @@ const reduceFilterText = (input) => {
  */
 const FilterComponent = ({ filter, filterBarActions, filterState, readOnly = false, visualStyle = "button", className, asIcon, size, }) => {
     const values = filterBarActions.getValuesByKey(filter.filterKey);
-    const valuesLength = values && Array.isArray(values) ? values.length : undefined;
+    const valuesLength = values !== undefined && Array.isArray(values) ? values.length : undefined;
     const getFilterText = () => {
-        if (!values) {
+        if (values === undefined) {
             return undefined;
         }
         if (filter.valueAsText) {
@@ -362,7 +362,7 @@ const FilterComponent = ({ filter, filterBarActions, filterState, readOnly = fal
         else if (filter.type === "valueName") {
             return values.name;
         }
-        return values.toString();
+        return values?.toString();
     };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const setValue = (callback) => {
@@ -763,7 +763,9 @@ const DefaultMinMaxFilter = ({ filterDefinition, filterName, value, setValue, fi
             value: JSON.stringify({ min: realMinValue, max: realMaxValue }),
         });
         setValue(() => {
-            return realMinValue || realMaxValue ? { min: realMinValue, max: realMaxValue } : {};
+            return realMinValue !== undefined || realMaxValue !== undefined
+                ? { min: realMinValue, max: realMaxValue }
+                : {};
         });
     };
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(reactFilterComponents.FilterHeader, { onReset: () => filterBarActions.resetIndividualFilterToInitialState(filterDefinition.filterKey), resetLabel: t("filtersBar.resetFilter"), showReset: filterBarActions.appliedFilterKeys().includes(filterDefinition.filterKey), title: filterDefinition.title }), jsxRuntime.jsxs(reactFilterComponents.FilterBody, { children: [jsxRuntime.jsxs("div", { className: "flex gap-1 px-1 pb-0.5 pt-1", children: [jsxRuntime.jsx(reactFormComponents.NumberField, { addonAfter: unit, className: "w-40", label: t("filtersBar.defaultMinMaxFilters.min"), max: filterDefinition.type === "minMax" ? filterDefinition.maximumNumber : undefined, min: filterDefinition.type === "minMax" ? filterDefinition.minimumNumber : undefined, onChange: e => setMinValue(e.target.value === "" ? undefined : Number(e.target.value)), value: minValue ?? "" }), jsxRuntime.jsx(reactFormComponents.NumberField, { addonAfter: unit, className: "w-40", label: t("filtersBar.defaultMinMaxFilters.max"), max: filterDefinition.type === "minMax" ? filterDefinition.maximumNumber : undefined, min: filterDefinition.type === "minMax" ? filterDefinition.minimumNumber : undefined, onChange: e => setMaxValue(e.target.value === "" ? undefined : Number(e.target.value)), value: maxValue ?? "" })] }), jsxRuntime.jsx(reactFilterComponents.FilterFooter, { children: jsxRuntime.jsx(reactComponents.Button, { onClick: handleApply, size: "small", variant: "primary", children: t("filtersBar.defaultMinMaxFilters.apply") }) })] })] }));
@@ -1134,7 +1136,7 @@ const FilterTableComponent = ({ filterKey, filterBarDefinition, filterBarConfig,
             if (Array.isArray(filterValues)) {
                 return total + filterValues.length;
             }
-            return total + (filterValues ? 1 : 0);
+            return total + (filterValues !== undefined ? 1 : 0);
         }, 0);
     }, [filterBarConfig]);
     if (Array.isArray(filterKey)) {
@@ -1578,17 +1580,13 @@ const isNotRightType = (filterDefinition, foundFilter) => {
  *
  */
 const isMinMaxFilterValue = (value) => {
-    return value
-        ? typeof value === "object" && (Object.keys(value).includes("min") || Object.keys(value).includes("max"))
-        : false;
+    return typeof value === "object" && value !== null && (Object.keys(value).includes("min") || Object.keys(value).includes("max"));
 };
 /**
  *
  */
 const isDateRangeValue = (value) => {
-    return value
-        ? typeof value === "object" && (Object.keys(value).includes("from") || Object.keys(value).includes("to"))
-        : false;
+    return typeof value === "object" && value !== null && (Object.keys(value).includes("from") || Object.keys(value).includes("to"));
 };
 /**
  * {
@@ -1615,7 +1613,7 @@ const isStringArrayFilterValue = (value) => {
  *
  */
 const isBooleanValue = (value) => {
-    return value ? typeof value === "object" && Object.keys(value).includes("booleanValue") : false;
+    return typeof value === "object" && value !== null && Object.keys(value).includes("booleanValue");
 };
 /**
  * Type guard to check if a value is a single ValueName object
@@ -1655,7 +1653,7 @@ const validateFilter = ({ values, filterDefinitions, }) => {
     filterDefinitions.forEach(filterDefinition => {
         const foundFilter = values[filterDefinition.filterKey];
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (foundFilter && hasValue(foundFilter) && isNotRightType(filterDefinition, foundFilter)) {
+        if (foundFilter !== undefined && foundFilter !== null && hasValue(foundFilter) && isNotRightType(filterDefinition, foundFilter)) {
             inBadState = true;
         }
     });
@@ -1681,7 +1679,7 @@ const useIsDefaultValue = () => {
             dequal.dequal(filterValue, filterDefinition?.defaultValue)) {
             return true;
         }
-        if (!filterValue) {
+        if (filterValue === undefined || filterValue === null || filterValue === "" || filterValue === 0) {
             return true;
         }
         if (Array.isArray(filterValue)) {
@@ -2003,7 +2001,7 @@ const useFilterUrlSync = () => {
             return filterValue;
         }
         if (zodSchema._def.typeName === "ZodString") {
-            return filterValue ? filterValue + "" : filterValue;
+            return filterValue !== undefined && filterValue !== null ? filterValue + "" : filterValue;
         }
         if (typeof filterValue === "string") {
             try {
@@ -2019,11 +2017,11 @@ const useFilterUrlSync = () => {
         const loadedValues = {};
         definitions.forEach(filter => {
             const filterValue = search[filter.filterKey];
-            if (filterValue) {
-                const zodSchema = filter.zodSchema || getZodSchema(filter.type);
+            if (filterValue !== undefined && filterValue !== null) {
+                const zodSchema = filter.zodSchema ?? getZodSchema(filter.type);
                 const jsonParsed = getJsonParsedVal(filterValue, zodSchema);
                 const zodParsed = zodSchema.safeParse(jsonParsed);
-                if (zodParsed.success) {
+                if (zodParsed.success === true) {
                     loadedValues[filter.filterKey] = zodParsed.data;
                 }
             }
@@ -2034,7 +2032,7 @@ const useFilterUrlSync = () => {
         const urlObject = {};
         definitions.forEach(filter => {
             const value = values?.[filter.filterKey];
-            if (value) {
+            if (Boolean(value)) {
                 if (setEmptyAndDefaultValues) {
                     urlObject[filter.filterKey] = value;
                 }
@@ -2111,7 +2109,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
                 (typeof searchParams[name] === "string" &&
                     !dequal.dequal(decode(searchParams[name]), typeof search[name] === "string" ? decode(search[name]) : search[name]))) {
                 return requestAnimationFrame(async () => {
-                    const replace = !search[name];
+                    const replace = search[name] === undefined || search[name] === null;
                     await navigate({
                         to: ".",
                         search: (prev) => {
@@ -2152,7 +2150,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
             let currentSearchValueParsed;
             let lastSearchUpdateRefParsed;
             try {
-                currentSearchValueParsed = currentSearchValue ? decode(currentSearchValue) : undefined;
+                currentSearchValueParsed = currentSearchValue !== undefined && currentSearchValue !== null ? decode(currentSearchValue) : undefined;
             }
             catch (_) {
                 // Invalid compressed data, treat as undefined
@@ -2222,7 +2220,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
         if (storedFilters && storedFilters !== "undefined") {
             try {
                 const loadedFilterBarConfigValues = JSON.parse(storedFilters);
-                return loadedFilterBarConfigValues?.values || {};
+                return loadedFilterBarConfigValues?.values ?? {};
             }
             catch (error) {
                 return {};
@@ -2231,9 +2229,9 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
         return {};
     }, [clientSideUserId, name, initialStoredFilters, lastName]);
     const loadFromSearchURL = react.useCallback(() => {
-        let searchParams = search || {};
+        let searchParams = search ?? {};
         const searchParamValue = searchParams[name];
-        if (searchParamValue) {
+        if (searchParamValue !== undefined && searchParamValue !== null) {
             try {
                 searchParams = decode(searchParamValue);
             }
@@ -2251,7 +2249,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
         else {
             const values = loadFromLocalStorage() || {};
             const searchParams = loadFromSearchURL();
-            if (searchParams && sharedUtils.objectKeys(searchParams).length > 0) {
+            if (searchParams !== null && sharedUtils.objectKeys(searchParams).length > 0) {
                 const valuesFromUrl = getFilterValuesFromUrl(filterDefinitions, searchParams);
                 if (sharedUtils.objectKeys(valuesFromUrl).length > 0) {
                     // if there are values from the URL, update ALL filters values based on the searchParams or their defaults
@@ -2549,7 +2547,7 @@ const useSearchParamAsFilter = ({ filterName, search, zodSchema, errorHandler, }
         try {
             const getJsonParsedVal = () => {
                 if (zodSchema._def.typeName === "ZodString") {
-                    return foundParam ? foundParam + "" : foundParam;
+                    return foundParam !== undefined && foundParam !== null ? foundParam + "" : foundParam;
                 }
                 if (typeof search === "string" && typeof foundParam === "string") {
                     return JSON.parse(foundParam);

package/index.esm.js

@@ -346,9 +346,9 @@ const reduceFilterText = (input) => {
  */
 const FilterComponent = ({ filter, filterBarActions, filterState, readOnly = false, visualStyle = "button", className, asIcon, size, }) => {
     const values = filterBarActions.getValuesByKey(filter.filterKey);
-    const valuesLength = values && Array.isArray(values) ? values.length : undefined;
+    const valuesLength = values !== undefined && Array.isArray(values) ? values.length : undefined;
     const getFilterText = () => {
-        if (!values) {
+        if (values === undefined) {
             return undefined;
         }
         if (filter.valueAsText) {
@@ -360,7 +360,7 @@ const FilterComponent = ({ filter, filterBarActions, filterState, readOnly = fal
         else if (filter.type === "valueName") {
             return values.name;
         }
-        return values.toString();
+        return values?.toString();
     };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const setValue = (callback) => {
@@ -761,7 +761,9 @@ const DefaultMinMaxFilter = ({ filterDefinition, filterName, value, setValue, fi
             value: JSON.stringify({ min: realMinValue, max: realMaxValue }),
         });
         setValue(() => {
-            return realMinValue || realMaxValue ? { min: realMinValue, max: realMaxValue } : {};
+            return realMinValue !== undefined || realMaxValue !== undefined
+                ? { min: realMinValue, max: realMaxValue }
+                : {};
         });
     };
     return (jsxs(Fragment, { children: [jsx(FilterHeader$1, { onReset: () => filterBarActions.resetIndividualFilterToInitialState(filterDefinition.filterKey), resetLabel: t("filtersBar.resetFilter"), showReset: filterBarActions.appliedFilterKeys().includes(filterDefinition.filterKey), title: filterDefinition.title }), jsxs(FilterBody, { children: [jsxs("div", { className: "flex gap-1 px-1 pb-0.5 pt-1", children: [jsx(NumberField, { addonAfter: unit, className: "w-40", label: t("filtersBar.defaultMinMaxFilters.min"), max: filterDefinition.type === "minMax" ? filterDefinition.maximumNumber : undefined, min: filterDefinition.type === "minMax" ? filterDefinition.minimumNumber : undefined, onChange: e => setMinValue(e.target.value === "" ? undefined : Number(e.target.value)), value: minValue ?? "" }), jsx(NumberField, { addonAfter: unit, className: "w-40", label: t("filtersBar.defaultMinMaxFilters.max"), max: filterDefinition.type === "minMax" ? filterDefinition.maximumNumber : undefined, min: filterDefinition.type === "minMax" ? filterDefinition.minimumNumber : undefined, onChange: e => setMaxValue(e.target.value === "" ? undefined : Number(e.target.value)), value: maxValue ?? "" })] }), jsx(FilterFooter, { children: jsx(Button, { onClick: handleApply, size: "small", variant: "primary", children: t("filtersBar.defaultMinMaxFilters.apply") }) })] })] }));
@@ -1132,7 +1134,7 @@ const FilterTableComponent = ({ filterKey, filterBarDefinition, filterBarConfig,
             if (Array.isArray(filterValues)) {
                 return total + filterValues.length;
             }
-            return total + (filterValues ? 1 : 0);
+            return total + (filterValues !== undefined ? 1 : 0);
         }, 0);
     }, [filterBarConfig]);
     if (Array.isArray(filterKey)) {
@@ -1576,17 +1578,13 @@ const isNotRightType = (filterDefinition, foundFilter) => {
  *
  */
 const isMinMaxFilterValue = (value) => {
-    return value
-        ? typeof value === "object" && (Object.keys(value).includes("min") || Object.keys(value).includes("max"))
-        : false;
+    return typeof value === "object" && value !== null && (Object.keys(value).includes("min") || Object.keys(value).includes("max"));
 };
 /**
  *
  */
 const isDateRangeValue = (value) => {
-    return value
-        ? typeof value === "object" && (Object.keys(value).includes("from") || Object.keys(value).includes("to"))
-        : false;
+    return typeof value === "object" && value !== null && (Object.keys(value).includes("from") || Object.keys(value).includes("to"));
 };
 /**
  * {
@@ -1613,7 +1611,7 @@ const isStringArrayFilterValue = (value) => {
  *
  */
 const isBooleanValue = (value) => {
-    return value ? typeof value === "object" && Object.keys(value).includes("booleanValue") : false;
+    return typeof value === "object" && value !== null && Object.keys(value).includes("booleanValue");
 };
 /**
  * Type guard to check if a value is a single ValueName object
@@ -1653,7 +1651,7 @@ const validateFilter = ({ values, filterDefinitions, }) => {
     filterDefinitions.forEach(filterDefinition => {
         const foundFilter = values[filterDefinition.filterKey];
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (foundFilter && hasValue(foundFilter) && isNotRightType(filterDefinition, foundFilter)) {
+        if (foundFilter !== undefined && foundFilter !== null && hasValue(foundFilter) && isNotRightType(filterDefinition, foundFilter)) {
             inBadState = true;
         }
     });
@@ -1679,7 +1677,7 @@ const useIsDefaultValue = () => {
             dequal(filterValue, filterDefinition?.defaultValue)) {
             return true;
         }
-        if (!filterValue) {
+        if (filterValue === undefined || filterValue === null || filterValue === "" || filterValue === 0) {
             return true;
         }
         if (Array.isArray(filterValue)) {
@@ -2001,7 +1999,7 @@ const useFilterUrlSync = () => {
             return filterValue;
         }
         if (zodSchema._def.typeName === "ZodString") {
-            return filterValue ? filterValue + "" : filterValue;
+            return filterValue !== undefined && filterValue !== null ? filterValue + "" : filterValue;
         }
         if (typeof filterValue === "string") {
             try {
@@ -2017,11 +2015,11 @@ const useFilterUrlSync = () => {
         const loadedValues = {};
         definitions.forEach(filter => {
             const filterValue = search[filter.filterKey];
-            if (filterValue) {
-                const zodSchema = filter.zodSchema || getZodSchema(filter.type);
+            if (filterValue !== undefined && filterValue !== null) {
+                const zodSchema = filter.zodSchema ?? getZodSchema(filter.type);
                 const jsonParsed = getJsonParsedVal(filterValue, zodSchema);
                 const zodParsed = zodSchema.safeParse(jsonParsed);
-                if (zodParsed.success) {
+                if (zodParsed.success === true) {
                     loadedValues[filter.filterKey] = zodParsed.data;
                 }
             }
@@ -2032,7 +2030,7 @@ const useFilterUrlSync = () => {
         const urlObject = {};
         definitions.forEach(filter => {
             const value = values?.[filter.filterKey];
-            if (value) {
+            if (Boolean(value)) {
                 if (setEmptyAndDefaultValues) {
                     urlObject[filter.filterKey] = value;
                 }
@@ -2109,7 +2107,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
                 (typeof searchParams[name] === "string" &&
                     !dequal(decode(searchParams[name]), typeof search[name] === "string" ? decode(search[name]) : search[name]))) {
                 return requestAnimationFrame(async () => {
-                    const replace = !search[name];
+                    const replace = search[name] === undefined || search[name] === null;
                     await navigate({
                         to: ".",
                         search: (prev) => {
@@ -2150,7 +2148,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
             let currentSearchValueParsed;
             let lastSearchUpdateRefParsed;
             try {
-                currentSearchValueParsed = currentSearchValue ? decode(currentSearchValue) : undefined;
+                currentSearchValueParsed = currentSearchValue !== undefined && currentSearchValue !== null ? decode(currentSearchValue) : undefined;
             }
             catch (_) {
                 // Invalid compressed data, treat as undefined
@@ -2220,7 +2218,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
         if (storedFilters && storedFilters !== "undefined") {
             try {
                 const loadedFilterBarConfigValues = JSON.parse(storedFilters);
-                return loadedFilterBarConfigValues?.values || {};
+                return loadedFilterBarConfigValues?.values ?? {};
             }
             catch (error) {
                 return {};
@@ -2229,9 +2227,9 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
         return {};
     }, [clientSideUserId, name, initialStoredFilters, lastName]);
     const loadFromSearchURL = useCallback(() => {
-        let searchParams = search || {};
+        let searchParams = search ?? {};
         const searchParamValue = searchParams[name];
-        if (searchParamValue) {
+        if (searchParamValue !== undefined && searchParamValue !== null) {
             try {
                 searchParams = decode(searchParamValue);
             }
@@ -2249,7 +2247,7 @@ const useFilterBarPersistence = ({ name, setValue, refreshData, isDefaultValue,
         else {
             const values = loadFromLocalStorage() || {};
             const searchParams = loadFromSearchURL();
-            if (searchParams && objectKeys(searchParams).length > 0) {
+            if (searchParams !== null && objectKeys(searchParams).length > 0) {
                 const valuesFromUrl = getFilterValuesFromUrl(filterDefinitions, searchParams);
                 if (objectKeys(valuesFromUrl).length > 0) {
                     // if there are values from the URL, update ALL filters values based on the searchParams or their defaults
@@ -2547,7 +2545,7 @@ const useSearchParamAsFilter = ({ filterName, search, zodSchema, errorHandler, }
         try {
             const getJsonParsedVal = () => {
                 if (zodSchema._def.typeName === "ZodString") {
-                    return foundParam ? foundParam + "" : foundParam;
+                    return foundParam !== undefined && foundParam !== null ? foundParam + "" : foundParam;
                 }
                 if (typeof search === "string" && typeof foundParam === "string") {
                     return JSON.parse(foundParam);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-filter-bar",
-  "version": "1.15.15",
+  "version": "1.16.0",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -12,15 +12,15 @@
     "tailwind-merge": "^2.0.0",
     "string-ts": "^2.0.0",
     "zod": "^3.23.8",
-    "@trackunit/iris-app-api": "1.14.71",
-    "@trackunit/react-core-hooks": "1.12.56",
-    "@trackunit/react-filter-components": "1.14.15",
-    "@trackunit/react-date-and-time-components": "1.17.15",
+    "@trackunit/iris-app-api": "1.15.0",
+    "@trackunit/react-core-hooks": "1.12.57",
+    "@trackunit/react-filter-components": "1.15.0",
+    "@trackunit/react-date-and-time-components": "1.18.0",
     "@trackunit/shared-utils": "1.13.68",
-    "@trackunit/react-form-components": "1.15.9",
+    "@trackunit/react-form-components": "1.16.0",
     "@trackunit/iris-app-runtime-core-api": "1.12.51",
     "@trackunit/geo-json-utils": "1.11.69",
-    "@trackunit/i18n-library-translation": "1.12.59",
+    "@trackunit/i18n-library-translation": "1.13.0",
     "@trackunit/css-class-variance-utilities": "1.11.68",
     "@trackunit/react-components": "1.18.9",
     "@tanstack/react-router": "1.114.29"

package/src/lib/types/FilterTypes.d.ts

@@ -15,7 +15,7 @@ export type MinMaxFilterValue = {
     min?: number;
     max?: number;
 };
-export type FilterValueType = Array<string> | Array<ValueName> | ValueName | DateRangeValue | MinMaxFilterValue | AreaFilterGeoJsonGeometry | string | number | BooleanValue | undefined;
+export type FilterValueType = Array<string> | Array<ValueName> | ValueName | DateRangeValue | MinMaxFilterValue | AreaFilterGeoJsonGeometry | string | number | BooleanValue | undefined | null;
 export declare type FilterTypes = "boolean" | "string" | "number" | "dateRange" | "area" | "valueNameArray" | "valueName" | "stringArray" | "minMax";
 export type FilterMapActions = {
     toggleArrayValue: (key: string, value: string) => void;