@addsign/moje-agenda-shared-lib 1.0.40 → 1.0.42

package/dist/components/datatable/DataTableServer.d.ts

@@ -11,11 +11,12 @@ interface DataTableServerProps<T> {
     rowAction?: (item: T) => void;
     bulkAction?: (items: T[]) => JSX.Element;
     filters?: object;
+    selectedItemKey?: string;
 }
 type DataTableInternalItems = {
     _isHighlighted?: boolean;
     id: string;
 };
 export declare const resetAllDataTablePaging: () => void;
-declare function DataTableServer<T extends DataTableInternalItems>({ id, url, columns, title, subtitle, allowSearch, showHeader, rowAction, bulkAction, filters, }: DataTableServerProps<T>): import("react/jsx-runtime").JSX.Element;
+declare function DataTableServer<T extends DataTableInternalItems>({ id, url, columns, title, subtitle, allowSearch, showHeader, rowAction, bulkAction, filters, selectedItemKey, }: DataTableServerProps<T>): import("react/jsx-runtime").JSX.Element;
 export default DataTableServer;

package/dist/components/datatable/DataTableServer.js

@@ -21702,7 +21702,8 @@ function DataTableServer({
   showHeader = true,
   rowAction,
   bulkAction,
-  filters
+  filters,
+  selectedItemKey = "id"
 }) {
   var _a, _b, _c;
   const [itemsPerPageLocal, setItemsPerPageLocal] = useState();
@@ -21759,9 +21760,18 @@ function DataTableServer({
       if (currentPage === void 0)
         return;
       setIsLoading(true);
+      const filteredMergedFilters = Object.entries(mergedFilters).reduce(
+        (acc, [key, value]) => {
+          if (value !== null && value !== "") {
+            acc[key] = value;
+          }
+          return acc;
+        },
+        {}
+      );
       federationContext.apiClient.get(url, {
         params: {
-          ...mergedFilters,
+          ...filteredMergedFilters,
           pageSize: itemsPerPageLocal,
           page: currentPage,
           sortBy: sortConfig == null ? void 0 : sortConfig.sortParam,
@@ -21891,9 +21901,11 @@ function DataTableServer({
   };
   const handleSelectItem = (item) => {
     setSelectedItems((prevSelectedItems) => {
-      if (prevSelectedItems.find((selectedItem) => selectedItem.id === item.id)) {
+      if (prevSelectedItems.find(
+        (selectedItem) => selectedItem[selectedItemKey] === item[selectedItemKey]
+      )) {
         return prevSelectedItems.filter(
-          (selectedItem) => selectedItem.id !== item.id
+          (selectedItem) => selectedItem[selectedItemKey] !== item[selectedItemKey]
         );
       } else {
         return [...prevSelectedItems, item];
@@ -21907,9 +21919,14 @@ function DataTableServer({
       setSelectedItems(data.content);
     }
   };
-  const isSelected = (item) => {
-    return selectedItems.some((selectedItem) => selectedItem.id === item.id);
-  };
+  const isSelected = useCallback(
+    (item) => {
+      return selectedItems.some(
+        (selectedItem) => selectedItem[selectedItemKey] === item[selectedItemKey]
+      );
+    },
+    [selectedItems, selectedItemKey]
+  );
   const nextPage = () => {
     setCurrentPage((currentPage || 0) + 1);
   };
@@ -22218,7 +22235,7 @@ function DataTableServer({
             data.content.map((item, rowIndex) => /* @__PURE__ */ jsxs(
               "tr",
               {
-                className: `${item._isHighlighted ? "bg-gray-200" : ""} hover:bg-gray-100 border-gray-200 border-b text-sm`,
+                className: `${item._isHighlighted || isSelected(item) ? "bg-gray-50" : ""} hover:bg-gray-100 border-gray-200 border-b text-sm`,
                 children: [
                   bulkAction && /* @__PURE__ */ jsx("td", { className: "w-[20px] h-[52px] hover:bg-gray-200 font-medium text-xs text-center text-gray-600 cursor-pointer", children: /* @__PURE__ */ jsx("label", { className: "w-full h-full flex items-center justify-center cursor-pointer px-2", children: /* @__PURE__ */ jsx(
                     "input",