aefis-core-ui 2.2.1-rc2 → 2.2.1-rc3

package/dist/index.modern.js

@@ -8095,30 +8095,35 @@ const FilterChips = ({
   if (_filters.length === 0 && _sort.length === 0) return /*#__PURE__*/jsx("div", {
     children: "No filters or sorting criteria selected"
   });
-  const Filters = useMemo(() => /*#__PURE__*/jsx(Fragment, {
-    children: _filters.map(filter => /*#__PURE__*/jsx(Grow, {
-      in: true,
-      children: /*#__PURE__*/jsx("div", {
-        style: {
-          margin: 2,
-          display: "inline-flex"
-        },
-        children: /*#__PURE__*/jsx(BusinessObject, {
-          variant: "chip",
-          size: "small",
-          displayOptions: {
-            hasIcon: filter.type !== "keyword"
+  const Filters = useMemo(() => {
+    return /*#__PURE__*/jsx(Box$1, {
+      sx: {
+        display: "flex"
+      },
+      children: _filters.map(filter => /*#__PURE__*/jsx(Grow, {
+        in: true,
+        children: /*#__PURE__*/jsx("div", {
+          style: {
+            margin: 2,
+            display: "inline-flex"
           },
-          type: filter.type || "businessObject",
-          template: filter.template,
-          data: filter.data,
-          onDelete: () => {
-            onFilterDelete(filter);
-          }
-        }, filter.data.id)
-      })
-    }, `filterPanelFilter-${filter.index}-${filter.id}`))
-  }), [_filters]);
+          children: /*#__PURE__*/jsx(BusinessObject, {
+            variant: "chip",
+            size: "small",
+            displayOptions: {
+              hasIcon: filter.type !== "keyword"
+            },
+            type: "businessObject",
+            template: filter.template,
+            data: filter.data,
+            onDelete: () => {
+              onFilterDelete(filter);
+            }
+          }, filter.data.id)
+        })
+      }, `filterPanelFilter-${filter.index}-${filter.id}`))
+    });
+  }, [_filters]);
   const SortItems = useMemo(() => /*#__PURE__*/jsx(Fragment, {
     children: _sort.map(sortItem => /*#__PURE__*/jsx(Grow, {
       in: true,
@@ -8205,7 +8210,7 @@ const FilterSelection = ({
         children: "Apply All Filters"
       }), /*#__PURE__*/jsx(Button, {
         name: "reset all filters",
-        disabled: !(filters.length > 0),
+        disabled: !(filters.length > 0 || sort.length > 0),
         variant: "contained",
         color: "grey",
         onClick: onResetFilters,
@@ -8387,6 +8392,7 @@ const FilterPanel = props => {
   const [menuPosition, setMenuPosition] = useState(null);
   const [filters, setFilters] = useState([]);
   const [sort, setSort] = useState(sortProp || []);
+  const [panelSearch, setPanelSearch] = useState([]);
   const [pickerFilters, setPickerFilters] = useState([]);
   useEffect(() => {
     const formattedFilters = formatFilters(filtersProp, configuration);
@@ -8418,6 +8424,7 @@ const FilterPanel = props => {
     }
   }, [filters, sort]);
   const removeFilter = filter => {
+    console.log("remove filter ", filter);
     const newFilterArray = filters == null ? void 0 : filters.filter(i => i.index !== filter.index || filter.id !== i.id);
     setFilters(newFilterArray);
     if (!onApplyFilters) {
@@ -8538,6 +8545,8 @@ const FilterPanel = props => {
   const handleResetFilters = () => {
     setPickerFilters([]);
     setFilters([]);
+    setSort([]);
+    setPanelSearch([]);
     if (!onChange && onApplyFilters) {
       onApplyFilters({}, []);
     }
@@ -8546,6 +8555,8 @@ const FilterPanel = props => {
     }
   };
   const handleSearchChange = keyword => {
+    if (panelSearch.includes(keyword)) return;
+    setPanelSearch([...panelSearch, keyword]);
     addFilter({
       index: -1,
       type: "keyword",
@@ -10479,6 +10490,15 @@ const useIsError = status => {
   }, [status]);
   return isError;
 };
+const initialFilterState = {
+  filter: {},
+  searchText: "",
+  filterArray: [],
+  filterCount: 0,
+  sort: [],
+  sortCount: 0,
+  sortQueryParams: null
+};
 const RichDataTable = /*#__PURE__*/forwardRef(function RichDatatable(props, ref) {
   var _props$filterPanelCon, _props$rowActions, _props$dataTableProps, _props$dataTableProps2;
   const didMount = useDidMount();
@@ -10504,15 +10524,8 @@ const RichDataTable = /*#__PURE__*/forwardRef(function RichDatatable(props, ref)
   const [formatDrawerContent, setFormatDrawerContent] = useState(false);
   const [enableTableRowAction, setEnableTableRowAction] = useState(false);
   const [selectedRowCount, setSelectedRowCount] = useState(0);
-  const [filterPanelState, setFilterPanelState] = useState({
-    filter: {},
-    searchText: "",
-    filterArray: [],
-    filterCount: 0,
-    sort: [],
-    sortCount: 0,
-    sortQueryParams: null
-  });
+  const [filterPanelState, setFilterPanelState] = useState(initialFilterState);
+  console.log("filterPanelState ", filterPanelState);
   const {
     info,
     error
@@ -10635,6 +10648,15 @@ const RichDataTable = /*#__PURE__*/forwardRef(function RichDatatable(props, ref)
   };
   const handleFilterChange = (filters, newFilterArray) => {
     props == null ? void 0 : props.onFilterChange == null ? void 0 : props.onFilterChange(filters);
+
+    // TODO: apply better approach by gathering handling of all search and
+    // filter changes with onChange; also send operation type to onChange
+    // events
+    const isReset = newFilterArray.length === 0;
+    if (isReset) {
+      setFilterPanelState(() => _extends({}, initialFilterState));
+      return;
+    }
     setFilterPanelState(prev => _extends({}, prev, {
       filterCount: Object.keys(filters).length,
       filter: filters,
@@ -10729,7 +10751,7 @@ const RichDataTable = /*#__PURE__*/forwardRef(function RichDatatable(props, ref)
       exportOptions: props.exportOptions,
       actions: props.actions && props.actions.length > 0 || props.addAction ? updateActions(props.actions, handleDrawerOpen, enableTableRowAction, selectedRowCount, Add) : undefined,
       onFilterClick: isFilterPanelEnabled ? handleFilterClick : undefined,
-      hasFilters: filterPanelState.filterCount > 0 || filterPanelState.sortCount > 0,
+      hasFilters: filterPanelState.filterCount > 0 || filterPanelState.sortCount > 0 || filterPanelState.searchText,
       disableFilterButton: isFetching
     }, props.titleAndActionHeaderProps)), /*#__PURE__*/jsx(DataTable, _extends({}, props, {
       tableRef: DataTableRef,