@addsign/moje-agenda-shared-lib 1.0.1 → 1.0.2

package/dist/assets/tailwind.css

@@ -1315,6 +1315,10 @@ video {
 .\!bg-danger {
   background-color: var(--color-danger) !important;
 }
+.\!bg-gray-100 {
+  --tw-bg-opacity: 1 !important;
+  background-color: rgb(243 244 246 / var(--tw-bg-opacity)) !important;
+}
 .\!bg-primary {
   background-color: var(--color-primary) !important;
 }

package/dist/components/datatable/DataTableServer.js

@@ -1,5 +1,5 @@
 import { jsx, Fragment, jsxs } from "react/jsx-runtime";
-import { useState, useEffect, useCallback } from "react";
+import { useState, useMemo, useEffect, useCallback } from "react";
 import '../../assets/tailwind.css';/* empty css                      */
 import Button from "../Button.js";
 import { e as MdOutlineFilterAlt, f as MdOutlineFilterAltOff, g as MdSearch, d as MdClose, h as MdArrowBack, i as MdArrowForward, j as MdArrowUpward, k as MdArrowDownward } from "../../index-BMFehNPK.js";
@@ -21703,7 +21703,9 @@ function DataTableServer({
   const [selectedItems, setSelectedItems] = useState([]);
   const [fulltextSearch, setFulltextSearch] = useState("");
   const [filterOptions, setFilterOptions] = useState({});
-  const [columnFilters, setColumnFilters] = useState();
+  const [columnFilters, setColumnFilters] = useState(
+    {}
+  );
   const [showColFilters, setShowColFilters] = useState();
   const [sortConfig, setSortConfig] = useState(null);
   const createDataPageable = (response, itemsPerPage) => {
@@ -21721,6 +21723,9 @@ function DataTableServer({
     };
   };
   const [reloadData, setReloadData] = useState(false);
+  const mergedFilters = useMemo(() => {
+    return { ...columnFilters, ...filters };
+  }, [columnFilters, filters]);
   useEffect(() => {
     setReloadData(true);
   }, [
@@ -21743,8 +21748,7 @@ function DataTableServer({
       setIsLoading(true);
       federationContext.apiClient.get(url, {
         params: {
-          ...filters,
-          ...showColFilters ? columnFilters : {},
+          ...mergedFilters,
           pageSize: itemsPerPageLocal,
           page: currentPage,
           sortBy: sortConfig == null ? void 0 : sortConfig.sortParam,
@@ -21798,11 +21802,6 @@ function DataTableServer({
         setShowColFilters(storageObject.showColFilters);
         setCurrentPage(storageObject.currentPage || 0);
         setSortConfig(null);
-        console.log(
-          "%clibcomponentsdatatableDataTableServer.tsx:204 storageObject",
-          "color: #007acc;",
-          storageObject
-        );
         setItemsPerPageLocal(storageObject.itemsPerPage || 10);
       }
     }
@@ -22094,12 +22093,13 @@ function DataTableServer({
                                 ),
                                 type: filterType,
                                 options: filterOptions[String(filterParam)] || [],
-                                value: (columnFilters == null ? void 0 : columnFilters[String(filterParam)]) || "",
+                                value: (mergedFilters == null ? void 0 : mergedFilters[String(filterParam)]) || "",
                                 clearable: true,
                                 className: " px-0",
                                 placeholder: "Filtr",
                                 rounded: true
-                              }
+                              },
+                              JSON.stringify(mergedFilters)
                             ) : filterType === "dateRange" ? /* @__PURE__ */ jsx(
                               DateRangeField,
                               {
@@ -22112,14 +22112,15 @@ function DataTableServer({
                                 type: filterType,
                                 options: filterOptions[String(filterParam)] || [],
                                 value: {
-                                  startDate: (columnFilters == null ? void 0 : columnFilters[String(filterParam)]) || "",
-                                  endDate: (columnFilters == null ? void 0 : columnFilters[String(filterParam2)]) || ""
+                                  startDate: (mergedFilters == null ? void 0 : mergedFilters[String(filterParam)]) || "",
+                                  endDate: (mergedFilters == null ? void 0 : mergedFilters[String(filterParam2)]) || ""
                                 },
                                 clearable: true,
                                 className: " px-0 py-0 ",
                                 placeholder: "Filtr",
                                 rounded: true
-                              }
+                              },
+                              JSON.stringify(mergedFilters)
                             ) : /* @__PURE__ */ jsx(
                               InputField,
                               {
@@ -22129,13 +22130,15 @@ function DataTableServer({
                                   e.target.value
                                 ),
                                 type: filterType,
-                                value: (columnFilters == null ? void 0 : columnFilters[String(filterParam)]) || "",
+                                value: (mergedFilters == null ? void 0 : mergedFilters[String(filterParam)]) || "",
+                                disabled: !!(filters == null ? void 0 : filters[String(filterParam)]),
                                 clearable: true,
                                 className: " min-w-[100px] px-0 ",
                                 rounded: true,
                                 placeholder: "Filtr",
                                 debounceTimeout: 1e3
-                              }
+                              },
+                              JSON.stringify(mergedFilters)
                             )
                           }
                         )