#1074 fix bugs in FilterBar

vuu-ui/packages/vuu-filters/src/filter-bar/useFilterBar.ts

@@ -252,43 +252,40 @@ export const useFilterBar = ({
     [deleteFilter, editPillLabel, filters, focusFilterClause]
   );
 
+  const addIfNewElseUpdate = useCallback(
+    (edited: Filter, existing: Filter | undefined) => {
+      if (existing === undefined) {
+        const idx = onAddFilter(edited);
+        editPillLabel(idx);
+        return idx;
+      } else {
+        return onChangeFilter(existing, edited);
+      }
+    },
+    [editPillLabel, onAddFilter, onChangeFilter]
+  );
+
   const handleMenuAction = useCallback<MenuActionHandler>(
     ({ menuId }) => {
       switch (menuId) {
         case "apply-save": {
-          // TODO save these into state together
-          const isNewFilter = editingFilter.current === undefined;
-          const newFilter = editFilter as Filter;
-          const changeHandler = isNewFilter ? onAddFilter : onChangeFilter;
-          const indexOfNewFilter = changeHandler(newFilter);
-
-          if (isNewFilter) {
-            editPillLabel(indexOfNewFilter);
-          }
-
+          const editedFilter = editFilter as Filter;
+          const idx = addIfNewElseUpdate(editedFilter, editingFilter.current);
+          setActiveFilterIndex(appendIfNotPresent(idx));
           setEditFilter(undefined);
-
-          setActiveFilterIndex((indices) =>
-            indices.includes(indexOfNewFilter)
-              ? indices
-              : indices.concat(indexOfNewFilter)
-          );
-
+          editingFilter.current = undefined;
           setShowMenu(false);
           return true;
         }
-
         case "and-clause": {
           const newFilter = addClause(
             editFilter as Filter,
             EMPTY_FILTER_CLAUSE
           );
-          console.log({ newFilter });
           setEditFilter(newFilter);
           setShowMenu(false);
           return true;
         }
-
         case "or-clause":
           setEditFilter((filter) =>
             addClause(filter as Filter, {}, { combineWith: "or" })
@@ -299,7 +296,7 @@ export const useFilterBar = ({
           return false;
       }
     },
-    [editFilter, editPillLabel, onAddFilter, onChangeFilter]
+    [editFilter, addIfNewElseUpdate]
   );
 
   useEffect(() => {
@@ -471,3 +468,6 @@ export const useFilterBar = ({
     showMenu,
   };
 };
+
+const appendIfNotPresent = (n: number) => (ns: number[]) =>
+  ns.includes(n) ? ns : ns.concat(n);

vuu-ui/packages/vuu-filters/src/filter-bar/useFilters.ts

@@ -167,12 +167,12 @@ export const useFilters = ({
   );
 
   const handleChangeFilter = useCallback(
-    (filter: Filter) => {
+    (oldFilter: Filter, newFilter: Filter) => {
       let index = -1;
       const newFilters = filters.map((f, i) => {
-        if (f === filter) {
+        if (f === oldFilter) {
           index = i;
-          return filter;
+          return newFilter;
         } else {
           return f;
         }

vuu-ui/packages/vuu-filters/src/filter-clause/TextInput.tsx

@@ -58,25 +58,15 @@ export const TextInput = forwardRef(function TextInput(
   const getSuggestions = suggestionProvider();
 
   const handleSingleValueSelectionChange = useCallback<SingleSelectionHandler>(
-    (evt, value) => onInputComplete(value),
+    (_, value) => onInputComplete(value),
     [onInputComplete]
   );
 
   const handleMultiValueSelectionChange = useCallback<MultiSelectionHandler>(
-    (evt, value) => {
-      if (value.length === 1) {
-        onInputComplete(value[0]);
-      } else if (value.length > 1) {
-        onInputComplete(value);
-      }
-    },
+    (_, values) => onInputComplete(values),
     [onInputComplete]
   );
 
-  useEffect(() => {
-    // setValueInputValue("");
-  }, [column]);
-
   useEffect(() => {
     if (table) {
       const params: TypeaheadParams = valueInputValue
@@ -130,7 +120,6 @@ export const TextInput = forwardRef(function TextInput(
     }
     switch (operator) {
       case "in":
-        //TODO multiselect
         return (
           <ExpandoCombobox
             InputProps={InputProps}

vuu-ui/packages/vuu-ui-controls/src/date-picker/types.ts

@@ -1,9 +1,4 @@
-import {
-  CalendarDate,
-  CalendarDateTime,
-  DateValue,
-  ZonedDateTime,
-} from "@internationalized/date";
+import { DateValue } from "@internationalized/date";
 import { CalendarProps } from "../calendar/Calendar";
 import { RangeSelectionValueType } from "../calendar";