strapi-plugin-bulk-updater 1.1.0 → 1.2.3

package/dist/_chunks/{BulkUpdater-BSZP0U18.mjs → BulkUpdater-BYtO2SHc.mjs}

@@ -1,7 +1,7 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import React__default, { useState, useEffect } from "react";
+import React__default, { useState, useEffect, useRef } from "react";
 import { useFetchClient, useNotification } from "@strapi/strapi/admin";
-import { Box, Flex, Typography, Button, SingleSelect, SingleSelectOption, Checkbox, Badge, Table, Thead, Tr, Th, Tbody, Td, Alert, TextInput } from "@strapi/design-system";
+import { Box, Flex, Typography, Button, SingleSelect, SingleSelectOption, Checkbox, Badge, Table, Thead, Tr, Th, Tbody, Td, Alert, Field, Combobox, ComboboxOption, TextInput } from "@strapi/design-system";
 import { ArrowClockwise, Download, Upload, Check, Play } from "@strapi/icons";
 import { V as ValidationRulesTab } from "./ValidationRulesTab-BGcqM9cN.mjs";
 function CsvManagerTab() {
@@ -418,6 +418,11 @@ function CsvManagerTab() {
     ] })
   ] }) });
 }
+function getNestedValue(obj, path) {
+  if (!obj || !path) return void 0;
+  if (!path.includes(".")) return obj[path];
+  return path.split(".").reduce((acc, part) => acc && typeof acc === "object" ? acc[part] : void 0, obj);
+}
 function getAvailableColumnsForCollection(col, selectedAttribute) {
   const cols = [
     {
@@ -438,7 +443,7 @@ function getAvailableColumnsForCollection(col, selectedAttribute) {
     if (attr === "name" || attr === "title" || attr === selectedAttribute) {
       return;
     }
-    const formattedLabel = attr.charAt(0).toUpperCase() + attr.slice(1);
+    const formattedLabel = attr.includes(".") ? attr.split(".").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(" > ") : attr.charAt(0).toUpperCase() + attr.slice(1);
     cols.push({
       key: `attr_${attr}`,
       label: formattedLabel,
@@ -524,7 +529,7 @@ function renderCellContent(colDef, entry, col, selectedAttribute, isMatch, hasAt
       ] });
     }
     case "target_attr": {
-      const val = entry[selectedAttribute];
+      const val = getNestedValue(entry, selectedAttribute);
       const displayStr = formatDisplayValue(val);
       const isUnset = displayStr === "(empty / not set)" || displayStr === "(empty / unlinked)";
       return /* @__PURE__ */ jsx(
@@ -554,7 +559,7 @@ function renderCellContent(colDef, entry, col, selectedAttribute, isMatch, hasAt
     }
     default: {
       const attrName = colDef.key.replace("attr_", "");
-      const rawVal = entry[attrName];
+      const rawVal = getNestedValue(entry, attrName);
       const displayStr = formatDisplayValue(rawVal);
       return /* @__PURE__ */ jsx(
         Typography,
@@ -628,7 +633,8 @@ const BulkUpdater = () => {
   const [regexPattern, setRegexPattern] = useState("");
   const [filterOperator, setFilterOperator] = useState("none");
   const [filterQuery, setFilterQuery] = useState("");
-  const [hideNonMatching, setHideNonMatching] = useState(false);
+  const [entrySearch, setEntrySearch] = useState("");
+  const isFilterActive = filterOperator !== "none" && (["empty", "not_empty"].includes(filterOperator) || Boolean(filterQuery.trim())) || Boolean(entrySearch.trim());
   const [lastResults, setLastResults] = useState(null);
   const [updateSummary, setUpdateSummary] = useState(null);
   const [collectionPages, setCollectionPages] = useState({});
@@ -724,12 +730,15 @@ const BulkUpdater = () => {
       setLoading(false);
     }
   };
-  const loadCollectionPage = async (colUid, targetPage, customPageSize, customSortField, customSortOrder) => {
+  const loadCollectionPage = async (colUid, targetPage, customPageSize, customSortField, customSortOrder, overrideFilterOp, overrideFilterQuery, overrideEntrySearch, autoSelectReturned = true) => {
     const currentPageState = collectionPages[colUid];
     const size = customPageSize || currentPageState?.pageSize || defaultPageSize;
     const currentSort = collectionSorts[colUid] || { field: "createdAt", order: "desc" };
     const sortField = customSortField !== void 0 ? customSortField : currentSort.field;
     const sortOrder = customSortOrder !== void 0 ? customSortOrder : currentSort.order;
+    const op = overrideFilterOp !== void 0 ? overrideFilterOp : filterOperator;
+    const q = overrideFilterQuery !== void 0 ? overrideFilterQuery : filterQuery;
+    const s = overrideEntrySearch !== void 0 ? overrideEntrySearch : entrySearch;
     setCollectionPages((prev) => ({
       ...prev,
       [colUid]: {
@@ -743,16 +752,20 @@ const BulkUpdater = () => {
         pageSize: String(size)
       });
       if (selectedAttribute) params.set("attribute", selectedAttribute);
-      if (filterOperator && filterOperator !== "none") {
-        params.set("filterOperator", filterOperator);
-        if (filterQuery) params.set("filterQuery", filterQuery);
+      if (op && op !== "none") {
+        params.set("filterOperator", op);
+        if (q) params.set("filterQuery", q);
+      }
+      if (s && s.trim()) {
+        params.set("search", s.trim());
       }
       if (sortField) {
         params.set("sortField", sortField);
         params.set("sortOrder", sortOrder);
       }
       const res = await get(`/bulk-updater/collections/${colUid}/entries?${params.toString()}`);
-      if (res.data && res.data.success) {
+      if (res.data && (res.data.success || res.data.entries !== void 0)) {
+        const fetchedEntries = res.data.entries || [];
         setCollectionPages((prev) => ({
           ...prev,
           [colUid]: {
@@ -760,10 +773,20 @@ const BulkUpdater = () => {
             pageSize: res.data.pagination.pageSize,
             total: res.data.pagination.total,
             pageCount: res.data.pagination.pageCount,
-            entries: res.data.entries || [],
+            entries: fetchedEntries,
             loading: false
           }
         }));
+        const isFilterActiveNow = op !== "none" && (["empty", "not_empty"].includes(op) || Boolean(q.trim())) || Boolean(s.trim());
+        if (isFilterActiveNow && autoSelectReturned) {
+          setSelectedEntries((prev) => {
+            const next = { ...prev };
+            fetchedEntries.forEach((e) => {
+              next[`${colUid}${KEY_SEP}${e.documentId}`] = true;
+            });
+            return next;
+          });
+        }
       }
     } catch (err) {
       toggleNotification({
@@ -827,6 +850,35 @@ const BulkUpdater = () => {
       fetchPendingBatches();
     }
   }, [activeTab]);
+  const isInitialFilterMount = useRef(true);
+  useEffect(() => {
+    if (isInitialFilterMount.current) {
+      isInitialFilterMount.current = false;
+      return;
+    }
+    const timer = setTimeout(() => {
+      if (collections.length > 0) {
+        const isFilterActiveNow = filterOperator !== "none" && (["empty", "not_empty"].includes(filterOperator) || Boolean(filterQuery.trim())) || Boolean(entrySearch.trim());
+        if (isFilterActiveNow) {
+          setSelectedEntries({});
+        }
+        collections.forEach((col) => {
+          loadCollectionPage(
+            col.uid,
+            1,
+            void 0,
+            void 0,
+            void 0,
+            filterOperator,
+            filterQuery,
+            entrySearch,
+            true
+          );
+        });
+      }
+    }, 350);
+    return () => clearTimeout(timer);
+  }, [filterOperator, filterQuery, entrySearch]);
   const KEY_SEP = "@@@";
   const handleAttributeChange = (newAttr) => {
     if (newAttr !== selectedAttribute) {
@@ -834,7 +886,7 @@ const BulkUpdater = () => {
       setSelectedEntries({});
       setFilterOperator("none");
       setFilterQuery("");
-      setHideNonMatching(false);
+      setEntrySearch("");
       setSelectedRelationDocId("");
       setAttributeValue("");
       if (relationsMeta[newAttr]) {
@@ -851,7 +903,7 @@ const BulkUpdater = () => {
     (c) => visibleTypeUids[c.uid] !== false && (!collectionSearch.trim() || c.displayName.toLowerCase().includes(collectionSearch.toLowerCase().trim()) || c.uid.toLowerCase().includes(collectionSearch.toLowerCase().trim()))
   );
   const handleGlobalPageSizeChange = (newSize) => {
-    const capped = Math.min(100, Math.max(1, newSize));
+    const capped = Math.min(500, Math.max(1, newSize));
     setDefaultPageSize(capped);
     collections.forEach((col) => {
       if (!col.isSingleType) {
@@ -860,7 +912,7 @@ const BulkUpdater = () => {
     });
   };
   const handleCollectionPageSizeChange = (colUid, newSize) => {
-    const capped = Math.min(100, Math.max(1, newSize));
+    const capped = Math.min(500, Math.max(1, newSize));
     loadCollectionPage(colUid, 1, capped);
   };
   const handleCollectionSortChange = (colUid, field, order) => {
@@ -884,7 +936,7 @@ const BulkUpdater = () => {
   };
   const entryMatchesFilter = (entry, attr) => {
     if (filterOperator === "none") return true;
-    const val = entry[attr];
+    const val = getNestedValue(entry, attr);
     const displayStr = formatDisplayValue(val);
     const isValEmpty = val === void 0 || val === null || displayStr.trim() === "" || displayStr.trim().toLowerCase() === "(not set)" || displayStr.trim().toLowerCase() === "(empty / not set)" || displayStr.trim().toLowerCase() === "(empty / unlinked)";
     switch (filterOperator) {
@@ -904,64 +956,48 @@ const BulkUpdater = () => {
   };
   const getVisibleEntries = (col) => {
     const pageState = collectionPages[col.uid];
-    const entries = pageState ? pageState.entries : col.entries || [];
-    if (!hideNonMatching || filterOperator === "none") {
-      return entries;
-    }
-    return entries.filter((e) => entryMatchesFilter(e, selectedAttribute));
+    return pageState ? pageState.entries : col.entries || [];
   };
   const matchingEntriesCount = React__default.useMemo(() => {
-    if (filterOperator === "none") return 0;
+    if (!isFilterActive) return 0;
     let count = 0;
     filteredCollections.forEach((col) => {
-      if (col.attributes.includes(selectedAttribute)) {
-        const pageState = collectionPages[col.uid];
-        const entries = pageState ? pageState.entries : col.entries || [];
-        entries.forEach((entry) => {
-          if (entryMatchesFilter(entry, selectedAttribute)) {
-            count++;
-          }
-        });
+      const pageState = collectionPages[col.uid];
+      if (pageState) {
+        count += pageState.total;
       }
     });
     return count;
-  }, [filteredCollections, collectionPages, selectedAttribute, filterOperator, filterQuery]);
+  }, [filteredCollections, collectionPages, isFilterActive]);
   const selectAllMatching = () => {
     const updated = { ...selectedEntries };
     filteredCollections.forEach((col) => {
-      if (col.attributes.includes(selectedAttribute)) {
-        const pageState = collectionPages[col.uid];
-        const entries = pageState ? pageState.entries : col.entries || [];
-        entries.forEach((e) => {
-          if (entryMatchesFilter(e, selectedAttribute)) {
-            updated[`${col.uid}${KEY_SEP}${e.documentId}`] = true;
-          }
-        });
-      }
+      const pageState = collectionPages[col.uid];
+      const entries = pageState ? pageState.entries : col.entries || [];
+      entries.forEach((e) => {
+        updated[`${col.uid}${KEY_SEP}${e.documentId}`] = true;
+      });
     });
     setSelectedEntries(updated);
   };
   const deselectAllMatching = () => {
     const updated = { ...selectedEntries };
     filteredCollections.forEach((col) => {
-      if (col.attributes.includes(selectedAttribute)) {
-        const pageState = collectionPages[col.uid];
-        const entries = pageState ? pageState.entries : col.entries || [];
-        entries.forEach((e) => {
-          if (entryMatchesFilter(e, selectedAttribute)) {
-            delete updated[`${col.uid}${KEY_SEP}${e.documentId}`];
-          }
-        });
-      }
+      const pageState = collectionPages[col.uid];
+      const entries = pageState ? pageState.entries : col.entries || [];
+      entries.forEach((e) => {
+        delete updated[`${col.uid}${KEY_SEP}${e.documentId}`];
+      });
     });
     setSelectedEntries(updated);
   };
   const clearFilter = () => {
     setFilterOperator("none");
     setFilterQuery("");
-    setHideNonMatching(false);
+    setEntrySearch("");
+    setSelectedEntries({});
     collections.forEach((col) => {
-      loadCollectionPage(col.uid, 1);
+      loadCollectionPage(col.uid, 1, void 0, void 0, void 0, "none", "", "", false);
     });
   };
   const isCollectionFullySelected = (col) => {
@@ -1083,6 +1119,7 @@ const BulkUpdater = () => {
             message: `Bulk update complete! Batch ID: ${res.data.batchId}. Updated: ${res.data.updatedCount}, Skipped: ${res.data.skippedCount}`
           });
           await fetchModels();
+          await fetchAuditHistory();
         }
       } else {
         toggleNotification({
@@ -1369,7 +1406,7 @@ const BulkUpdater = () => {
                 /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral700", children: [
                   /* @__PURE__ */ jsx("code", { children: latestActiveBatch.batchId }),
                   " (",
-                  latestActiveBatch.recordCount,
+                  latestActiveBatch.updatedCount,
                   " entries updated by ",
                   latestActiveBatch.userEmail,
                   ")"
@@ -1413,23 +1450,34 @@ const BulkUpdater = () => {
               children: [
                 /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", marginBottom: 4, fontWeight: "semiBold", children: "1. Configure Attribute Update" }),
                 /* @__PURE__ */ jsxs(Flex, { gap: 4, alignItems: "flex-end", wrap: "wrap", children: [
-                  /* @__PURE__ */ jsx(Box, { style: { minWidth: 260 }, children: /* @__PURE__ */ jsx(
-                    SingleSelect,
-                    {
-                      label: "Attribute to Update",
-                      placeholder: "Select an attribute...",
-                      value: selectedAttribute,
-                      onChange: (val) => handleAttributeChange(String(val)),
-                      children: attributes.map((attr) => {
-                        const rel = relationsMeta[attr];
-                        return /* @__PURE__ */ jsxs(SingleSelectOption, { value: attr, children: [
-                          attr,
-                          " ",
-                          rel ? `(relation ➔ ${rel.targetDisplayName})` : ""
-                        ] }, attr);
-                      })
-                    }
-                  ) }),
+                  /* @__PURE__ */ jsx(Box, { style: { minWidth: 280, flex: 1, maxWidth: 440 }, children: /* @__PURE__ */ jsxs(Field.Root, { children: [
+                    /* @__PURE__ */ jsx(Field.Label, { children: "Attribute to Update" }),
+                    /* @__PURE__ */ jsx(
+                      Combobox,
+                      {
+                        autocomplete: { type: "list", filter: "contains" },
+                        placeholder: "Search attribute by name or relation...",
+                        value: selectedAttribute,
+                        onChange: (val) => {
+                          if (val && typeof val === "string") {
+                            handleAttributeChange(val);
+                          }
+                        },
+                        children: attributes.map((attr) => {
+                          const rel = relationsMeta[attr];
+                          const cleanParts = attr.includes(".") ? attr.split(".").join(" ") : "";
+                          const labelText = `${attr} ${cleanParts} ${rel ? `relation ${rel.targetDisplayName}` : ""}`.trim();
+                          return /* @__PURE__ */ jsx(ComboboxOption, { value: attr, textValue: labelText, children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", width: "100%", gap: 2, children: [
+                            /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: attr === selectedAttribute ? "bold" : "regular", children: attr }),
+                            rel ? /* @__PURE__ */ jsxs(Badge, { backgroundColor: "secondary100", textColor: "secondary700", size: "S", children: [
+                              "relation ➔ ",
+                              rel.targetDisplayName
+                            ] }) : attr.includes(".") ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "neutral150", textColor: "neutral700", size: "S", children: "component" }) : null
+                          ] }) }, attr);
+                        })
+                      }
+                    )
+                  ] }) }),
                   /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 340 }, children: relationsMeta[selectedAttribute] ? /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, style: { width: "100%" }, children: [
                     /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
                       /* @__PURE__ */ jsxs(Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral700", children: [
@@ -1445,28 +1493,31 @@ const BulkUpdater = () => {
                       relationsMeta[selectedAttribute].isMulti && /* @__PURE__ */ jsx(Badge, { backgroundColor: "primary100", textColor: "primary700", children: "Multi-Relation" })
                     ] }),
                     /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", style: { width: "100%" }, children: [
-                      /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 200 }, children: /* @__PURE__ */ jsxs(
-                        SingleSelect,
-                        {
-                          label: `Choose ${relationsMeta[selectedAttribute].targetDisplayName}`,
-                          placeholder: relationOptionsLoading ? "Loading entities..." : `Pick a ${relationsMeta[selectedAttribute].targetDisplayName}...`,
-                          value: selectedRelationDocId,
-                          onChange: (val) => {
-                            const docId = String(val);
-                            setSelectedRelationDocId(docId);
-                            if (docId === "__clear__") {
-                              setAttributeValue(JSON.stringify({ mode: "clear", label: "(clear relation)" }));
-                            } else {
-                              const opt = relationOptions.find((o) => o.documentId === docId);
-                              setAttributeValue(JSON.stringify({ mode: relationMode, documentIds: [docId], label: opt?.label || docId }));
-                            }
-                          },
-                          children: [
-                            /* @__PURE__ */ jsx(SingleSelectOption, { value: "__clear__", children: "-- Clear / Unlink Relation --" }),
-                            relationOptions.map((opt) => /* @__PURE__ */ jsx(SingleSelectOption, { value: opt.documentId, children: opt.label }, opt.documentId))
-                          ]
-                        }
-                      ) }),
+                      /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 200 }, children: /* @__PURE__ */ jsxs(Field.Root, { children: [
+                        /* @__PURE__ */ jsx(Field.Label, { children: `Choose ${relationsMeta[selectedAttribute].targetDisplayName}` }),
+                        /* @__PURE__ */ jsxs(
+                          Combobox,
+                          {
+                            autocomplete: { type: "list", filter: "contains" },
+                            placeholder: relationOptionsLoading ? "Loading entities..." : `Search & pick ${relationsMeta[selectedAttribute].targetDisplayName}...`,
+                            value: selectedRelationDocId,
+                            onChange: (val) => {
+                              const docId = val ? String(val) : "";
+                              setSelectedRelationDocId(docId);
+                              if (docId === "__clear__") {
+                                setAttributeValue(JSON.stringify({ mode: "clear", label: "(clear relation)" }));
+                              } else {
+                                const opt = relationOptions.find((o) => o.documentId === docId);
+                                setAttributeValue(JSON.stringify({ mode: relationMode, documentIds: [docId], label: opt?.label || docId }));
+                              }
+                            },
+                            children: [
+                              /* @__PURE__ */ jsx(ComboboxOption, { value: "__clear__", textValue: "Clear / Unlink Relation", children: "-- Clear / Unlink Relation --" }),
+                              relationOptions.map((opt) => /* @__PURE__ */ jsx(ComboboxOption, { value: opt.documentId, textValue: opt.label, children: opt.label }, opt.documentId))
+                            ]
+                          }
+                        )
+                      ] }) }),
                       relationsMeta[selectedAttribute].isMulti && /* @__PURE__ */ jsx(Box, { style: { width: 170 }, children: /* @__PURE__ */ jsxs(
                         SingleSelect,
                         {
@@ -1596,24 +1647,25 @@ const BulkUpdater = () => {
                     children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 3, children: [
                       /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 2, children: [
                         /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
-                          /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: "bold", children: "Find Targets by Current Value:" }),
-                          filterOperator !== "none" && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
+                          /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: "bold", children: "Search & Filter Targets:" }),
+                          isFilterActive && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
                             matchingEntriesCount,
                             " matching ",
-                            matchingEntriesCount === 1 ? "entry" : "entries"
+                            matchingEntriesCount === 1 ? "entry" : "entries",
+                            " found in database"
                           ] })
                         ] }),
-                        filterOperator !== "none" && /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "S", onClick: clearFilter, children: "Clear Filter" })
+                        isFilterActive && /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "S", onClick: clearFilter, children: "Clear Search & Filter" })
                       ] }),
                       /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "flex-end", wrap: "wrap", children: [
-                        /* @__PURE__ */ jsx(Box, { style: { width: 240, minWidth: 200 }, children: /* @__PURE__ */ jsxs(
+                        /* @__PURE__ */ jsx(Box, { style: { width: 220, minWidth: 180 }, children: /* @__PURE__ */ jsxs(
                           SingleSelect,
                           {
                             label: `Filter condition for "${selectedAttribute}"`,
                             value: filterOperator,
                             onChange: (val) => setFilterOperator(String(val)),
                             children: [
-                              /* @__PURE__ */ jsx(SingleSelectOption, { value: "none", children: "Show All (No Filter)" }),
+                              /* @__PURE__ */ jsx(SingleSelectOption, { value: "none", children: "Show All (No Attribute Filter)" }),
                               /* @__PURE__ */ jsx(SingleSelectOption, { value: "empty", children: "Is Empty or Null" }),
                               /* @__PURE__ */ jsx(SingleSelectOption, { value: "not_empty", children: "Is Not Empty" }),
                               /* @__PURE__ */ jsx(SingleSelectOption, { value: "equals", children: "Equals Exact Text" }),
@@ -1622,28 +1674,33 @@ const BulkUpdater = () => {
                             ]
                           }
                         ) }),
-                        (filterOperator === "equals" || filterOperator === "contains" || filterOperator === "starts_with") && /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 220 }, children: /* @__PURE__ */ jsx(
+                        (filterOperator === "equals" || filterOperator === "contains" || filterOperator === "starts_with") && /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 200 }, children: /* @__PURE__ */ jsx(
                           TextInput,
                           {
-                            label: "Value to Search",
+                            label: `Value for "${selectedAttribute}"`,
                             placeholder: "Type value to match...",
                             value: filterQuery,
                             onChange: (e) => setFilterQuery(e.target.value)
                           }
                         ) }),
-                        filterOperator !== "none" && /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
-                          /* @__PURE__ */ jsxs(
+                        /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 200 }, children: /* @__PURE__ */ jsx(
+                          TextInput,
+                          {
+                            label: "Full-text Entry Search",
+                            placeholder: "Search title, name, or text across records...",
+                            value: entrySearch,
+                            onChange: (e) => setEntrySearch(e.target.value)
+                          }
+                        ) }),
+                        isFilterActive && /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
+                          /* @__PURE__ */ jsx(
                             Button,
                             {
                               variant: "default",
                               size: "S",
                               onClick: selectAllMatching,
                               disabled: matchingEntriesCount === 0,
-                              children: [
-                                "Select Matching (",
-                                matchingEntriesCount,
-                                ")"
-                              ]
+                              children: "Select All Loaded"
                             }
                           ),
                           /* @__PURE__ */ jsx(
@@ -1653,19 +1710,12 @@ const BulkUpdater = () => {
                               size: "S",
                               onClick: deselectAllMatching,
                               disabled: matchingEntriesCount === 0,
-                              children: "Deselect Matching"
+                              children: "Deselect All Loaded"
                             }
                           )
                         ] })
                       ] }),
-                      filterOperator !== "none" && /* @__PURE__ */ jsx(Flex, { gap: 2, alignItems: "center", marginTop: 1, children: /* @__PURE__ */ jsx(
-                        Checkbox,
-                        {
-                          checked: hideNonMatching,
-                          onCheckedChange: (checked) => setHideNonMatching(Boolean(checked)),
-                          children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral700", children: "Only display matching entries in tables (hide non-matching)" })
-                        }
-                      ) })
+                      isFilterActive && /* @__PURE__ */ jsx(Flex, { gap: 2, alignItems: "center", marginTop: 1, children: /* @__PURE__ */ jsx(Badge, { backgroundColor: "success100", textColor: "success700", size: "S", children: "✓ Filter active: Showing only matching entries. All returned matching records are pre-selected." }) })
                     ] })
                   }
                 ),
@@ -1759,8 +1809,8 @@ const BulkUpdater = () => {
                     }
                   ) }),
                   /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", style: { marginLeft: "auto" }, children: [
-                    /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Default page size (max 100):" }),
-                    /* @__PURE__ */ jsx(Box, { style: { width: 120 }, children: /* @__PURE__ */ jsxs(
+                    /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Default page size (max 500):" }),
+                    /* @__PURE__ */ jsx(Box, { style: { width: 130 }, children: /* @__PURE__ */ jsxs(
                       SingleSelect,
                       {
                         size: "S",
@@ -1771,7 +1821,9 @@ const BulkUpdater = () => {
                           /* @__PURE__ */ jsx(SingleSelectOption, { value: "10", children: "10 / page" }),
                           /* @__PURE__ */ jsx(SingleSelectOption, { value: "25", children: "25 / page" }),
                           /* @__PURE__ */ jsx(SingleSelectOption, { value: "50", children: "50 / page" }),
-                          /* @__PURE__ */ jsx(SingleSelectOption, { value: "100", children: "100 / page" })
+                          /* @__PURE__ */ jsx(SingleSelectOption, { value: "100", children: "100 / page" }),
+                          /* @__PURE__ */ jsx(SingleSelectOption, { value: "250", children: "250 / page" }),
+                          /* @__PURE__ */ jsx(SingleSelectOption, { value: "500", children: "500 / page" })
                         ]
                       }
                     ) })
@@ -1786,7 +1838,7 @@ const BulkUpdater = () => {
                   const pageSize = pageState ? pageState.pageSize : defaultPageSize;
                   const hasAttr = col.attributes.includes(selectedAttribute);
                   const visibleEntries = getVisibleEntries(col);
-                  const matchingColCount = entries.filter((e) => entryMatchesFilter(e, selectedAttribute)).length;
+                  entries.filter((e) => entryMatchesFilter(e, selectedAttribute)).length;
                   const isFullySelected = isCollectionFullySelected(col);
                   const isPartiallySelected = isCollectionPartiallySelected(col);
                   const currentSort = collectionSorts[col.uid] || { field: "createdAt", order: "desc" };
@@ -1895,6 +1947,9 @@ const BulkUpdater = () => {
                                       params.set("filterOperator", filterOperator);
                                       if (filterQuery) params.set("filterQuery", filterQuery);
                                     }
+                                    if (entrySearch && entrySearch.trim()) {
+                                      params.set("search", entrySearch.trim());
+                                    }
                                     const res = await get(`/bulk-updater/csv/export/${col.uid}?${params.toString()}`);
                                     const csvStr = res.data?.csvContent || (typeof res.data === "string" ? res.data : "");
                                     if (!csvStr) {
@@ -1927,7 +1982,7 @@ const BulkUpdater = () => {
                                 children: "Export CSV"
                               }
                             ),
-                            /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral500", children: col.isSingleType ? "1 single entry" : filterOperator !== "none" ? `${matchingColCount} matching of ${totalEntries} entries` : `${totalEntries} entries` })
+                            /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral500", children: col.isSingleType ? "1 single entry" : isFilterActive ? `${totalEntries} matching entries in DB` : `${totalEntries} entries` })
                           ] })
                         ] }),
                         openColumnPickerUid === col.uid && /* @__PURE__ */ jsx(
@@ -1997,7 +2052,7 @@ const BulkUpdater = () => {
                           /* @__PURE__ */ jsx(Tbody, { children: visibleEntries.length === 0 ? /* @__PURE__ */ jsx(Tr, { children: /* @__PURE__ */ jsx(Td, { colSpan: activeColumns.length, children: /* @__PURE__ */ jsx(Box, { padding: 4, style: { textAlign: "center" }, children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral500", children: "No entries in this content type match the active filter criteria." }) }) }) }) : visibleEntries.map((entry) => {
                             const key = `${col.uid}${KEY_SEP}${entry.documentId}`;
                             const isSelected = Boolean(selectedEntries[key]);
-                            const isMatch = filterOperator !== "none" && entryMatchesFilter(entry, selectedAttribute);
+                            const isMatch = isFilterActive;
                             return /* @__PURE__ */ jsx(
                               Tr,
                               {
@@ -2029,11 +2084,12 @@ const BulkUpdater = () => {
                               Math.min(page * pageSize, totalEntries),
                               " of ",
                               totalEntries,
-                              " entries"
+                              " ",
+                              isFilterActive ? "matching entries" : "entries"
                             ] }),
                             /* @__PURE__ */ jsxs(Flex, { gap: 1, alignItems: "center", children: [
                               /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Show:" }),
-                              /* @__PURE__ */ jsx(Box, { style: { width: 80 }, children: /* @__PURE__ */ jsxs(
+                              /* @__PURE__ */ jsx(Box, { style: { width: 85 }, children: /* @__PURE__ */ jsxs(
                                 SingleSelect,
                                 {
                                   size: "S",
@@ -2044,12 +2100,27 @@ const BulkUpdater = () => {
                                     /* @__PURE__ */ jsx(SingleSelectOption, { value: "10", children: "10" }),
                                     /* @__PURE__ */ jsx(SingleSelectOption, { value: "25", children: "25" }),
                                     /* @__PURE__ */ jsx(SingleSelectOption, { value: "50", children: "50" }),
-                                    /* @__PURE__ */ jsx(SingleSelectOption, { value: "100", children: "100" })
+                                    /* @__PURE__ */ jsx(SingleSelectOption, { value: "100", children: "100" }),
+                                    /* @__PURE__ */ jsx(SingleSelectOption, { value: "250", children: "250" }),
+                                    /* @__PURE__ */ jsx(SingleSelectOption, { value: "500", children: "500" })
                                   ]
                                 }
                               ) }),
                               /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral500", children: "per page" })
-                            ] })
+                            ] }),
+                            totalEntries > visibleEntries.length && /* @__PURE__ */ jsxs(
+                              Button,
+                              {
+                                variant: "tertiary",
+                                size: "S",
+                                onClick: () => handleCollectionPageSizeChange(col.uid, Math.min(totalEntries, 500)),
+                                children: [
+                                  "Load all ",
+                                  totalEntries,
+                                  " entries"
+                                ]
+                              }
+                            )
                           ] }),
                           pageCount > 1 && /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
                             /* @__PURE__ */ jsx(
@@ -2707,6 +2778,7 @@ const BulkUpdater = () => {
 export {
   BulkUpdater as default,
   formatDisplayValue,
-  getAvailableColumnsForCollection
+  getAvailableColumnsForCollection,
+  getNestedValue
 };
-//# sourceMappingURL=BulkUpdater-BSZP0U18.mjs.map
+//# sourceMappingURL=BulkUpdater-BYtO2SHc.mjs.map