@trackunit/filters-filter-bar 0.0.238 → 0.0.240

package/index.cjs.js

@@ -1038,13 +1038,28 @@ const useFilterBar = ({ name, onValuesChange, filterBarDefinition, initialState,
         const storedFilters = localStorage.getItem(`filter-${name}`);
         if (storedFilters && storedFilters !== "undefined") {
             const loadedFilterBarConfig = JSON.parse(storedFilters);
-            if (validateFilter(loadedFilterBarConfig, Object.values(filterBarDefinition))) {
+            if (validateFilter(loadedFilterBarConfig, sharedUtils.objectValues(filterBarDefinition))) {
                 initialFilterBarConfig = loadedFilterBarConfig;
             }
         }
-        if (initialFilterBarConfig === undefined) {
-            initialFilterBarConfig = createInitialState(name, Object.values(filterBarDefinition), initialState || {}, setValue);
+        //WHY WE NEED THIS?
+        //For filters that are not visible and we want to set the default value to the initial state.
+        //To do this for a changing default value as in customers and sites we would need to recreate the initialFilterBarConfig every time the default value changes.
+        //This mean that filterbars that have this functionality wouldn't be able to save the state of the filterbar.
+        //Another option would be to create a new filterbar for each customer or site. This also has its drawbacks. Would raise it with the frontend community.
+        const hasNonVisibleDefaultValues = sharedUtils.objectValues(filterBarDefinition).some(key => {
+            var _a;
+            return key.showInStarredMenu &&
+                !key.showInStarredMenu() &&
+                key.showInFilterBar &&
+                !key.showInFilterBar() &&
+                ((_a = key.defaultValue) === null || _a === void 0 ? void 0 : _a.toString) &&
+                key.defaultValue.toString().length > 0;
+        });
+        if (initialFilterBarConfig === undefined || hasNonVisibleDefaultValues) {
+            initialFilterBarConfig = createInitialState(name, sharedUtils.objectValues(filterBarDefinition), initialState || {}, setValue);
         }
+        // eslint-disable-next-line local-rules/prefer-custom-object-keys
         Object.keys(initialFilterBarConfig.values).forEach(key => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             initialFilterBarConfig.setters[`set${capitalize(key)}`] = (callback) => setValue(key, callback);
@@ -1104,7 +1119,7 @@ const useFilterBar = ({ name, onValuesChange, filterBarDefinition, initialState,
     const filterMapActions = react.useMemo(() => {
         // Reset an individual filter to its initial state
         const resetIndividualFilterToInitialState = (key) => {
-            const tmpInitialState = createInitialState(name, Object.values(filterBarDefinition), initialState || {}, setValue);
+            const tmpInitialState = createInitialState(name, sharedUtils.objectValues(filterBarDefinition), initialState || {}, setValue);
             setFilterBarConfig(prevState => {
                 return Object.assign(Object.assign({}, prevState), { values: Object.assign(Object.assign({}, prevState.values), { [key]: tmpInitialState.values[key] }) });
             });
@@ -1226,7 +1241,7 @@ const useFilterBar = ({ name, onValuesChange, filterBarDefinition, initialState,
             // Reset filters to initial state
             resetFiltersToInitialState() {
                 setFilterBarConfig(prevState => {
-                    return Object.assign(Object.assign({}, prevState), { values: createInitialState(name, Object.values(filterBarDefinition), initialState || {}, setValue).values });
+                    return Object.assign(Object.assign({}, prevState), { values: createInitialState(name, sharedUtils.objectValues(filterBarDefinition), initialState || {}, setValue).values });
                 });
             },
             resetIndividualFilterToInitialState,

package/index.esm.js

@@ -3,7 +3,7 @@ import { registerTranslations, useNamespaceTranslation } from '@trackunit/i18n-l
 import { twMerge } from 'tailwind-merge';
 import { cvaMerge } from '@trackunit/css-class-variance-utilities';
 import { Button, Popover, PopoverTrigger, IconButton, Icon, PopoverContent, MenuList, Text, StarButton, useResize, Collapse, DayRangePicker } from '@trackunit/react-components';
-import { truthy, capitalize as capitalize$1, nonNullable } from '@trackunit/shared-utils';
+import { truthy, capitalize as capitalize$1, nonNullable, objectValues } from '@trackunit/shared-utils';
 import { useMemo, useState, Fragment as Fragment$1, useCallback, useEffect, useRef } from 'react';
 import { Filter as Filter$1, FilterBody, RadioFilterItem, CheckBoxFilterItem, FilterHeader as FilterHeader$1, FilterFooter } from '@trackunit/react-filter-components';
 import { useAnalytics, useTextSearch } from '@trackunit/react-core-hooks';
@@ -1030,13 +1030,28 @@ const useFilterBar = ({ name, onValuesChange, filterBarDefinition, initialState,
         const storedFilters = localStorage.getItem(`filter-${name}`);
         if (storedFilters && storedFilters !== "undefined") {
             const loadedFilterBarConfig = JSON.parse(storedFilters);
-            if (validateFilter(loadedFilterBarConfig, Object.values(filterBarDefinition))) {
+            if (validateFilter(loadedFilterBarConfig, objectValues(filterBarDefinition))) {
                 initialFilterBarConfig = loadedFilterBarConfig;
             }
         }
-        if (initialFilterBarConfig === undefined) {
-            initialFilterBarConfig = createInitialState(name, Object.values(filterBarDefinition), initialState || {}, setValue);
+        //WHY WE NEED THIS?
+        //For filters that are not visible and we want to set the default value to the initial state.
+        //To do this for a changing default value as in customers and sites we would need to recreate the initialFilterBarConfig every time the default value changes.
+        //This mean that filterbars that have this functionality wouldn't be able to save the state of the filterbar.
+        //Another option would be to create a new filterbar for each customer or site. This also has its drawbacks. Would raise it with the frontend community.
+        const hasNonVisibleDefaultValues = objectValues(filterBarDefinition).some(key => {
+            var _a;
+            return key.showInStarredMenu &&
+                !key.showInStarredMenu() &&
+                key.showInFilterBar &&
+                !key.showInFilterBar() &&
+                ((_a = key.defaultValue) === null || _a === void 0 ? void 0 : _a.toString) &&
+                key.defaultValue.toString().length > 0;
+        });
+        if (initialFilterBarConfig === undefined || hasNonVisibleDefaultValues) {
+            initialFilterBarConfig = createInitialState(name, objectValues(filterBarDefinition), initialState || {}, setValue);
         }
+        // eslint-disable-next-line local-rules/prefer-custom-object-keys
         Object.keys(initialFilterBarConfig.values).forEach(key => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             initialFilterBarConfig.setters[`set${capitalize(key)}`] = (callback) => setValue(key, callback);
@@ -1096,7 +1111,7 @@ const useFilterBar = ({ name, onValuesChange, filterBarDefinition, initialState,
     const filterMapActions = useMemo(() => {
         // Reset an individual filter to its initial state
         const resetIndividualFilterToInitialState = (key) => {
-            const tmpInitialState = createInitialState(name, Object.values(filterBarDefinition), initialState || {}, setValue);
+            const tmpInitialState = createInitialState(name, objectValues(filterBarDefinition), initialState || {}, setValue);
             setFilterBarConfig(prevState => {
                 return Object.assign(Object.assign({}, prevState), { values: Object.assign(Object.assign({}, prevState.values), { [key]: tmpInitialState.values[key] }) });
             });
@@ -1218,7 +1233,7 @@ const useFilterBar = ({ name, onValuesChange, filterBarDefinition, initialState,
             // Reset filters to initial state
             resetFiltersToInitialState() {
                 setFilterBarConfig(prevState => {
-                    return Object.assign(Object.assign({}, prevState), { values: createInitialState(name, Object.values(filterBarDefinition), initialState || {}, setValue).values });
+                    return Object.assign(Object.assign({}, prevState), { values: createInitialState(name, objectValues(filterBarDefinition), initialState || {}, setValue).values });
                 });
             },
             resetIndividualFilterToInitialState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-filter-bar",
-  "version": "0.0.238",
+  "version": "0.0.240",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {