strapi-plugin-bulk-updater 1.3.1 → 1.3.6

package/dist/_chunks/{BulkUpdater-DowSmA56.mjs → BulkUpdater-D812YfOE.mjs}

@@ -1,9 +1,96 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import React__default, { useState, useEffect, useMemo, useRef } from "react";
 import { useFetchClient, useNotification } from "@strapi/strapi/admin";
-import { Box, Flex, Typography, Button, SingleSelect, SingleSelectOption, Checkbox, Badge, Alert, Table, Thead, Tr, Th, Tbody, Td, Loader, TextInput, ComboboxOption, Field, Combobox } from "@strapi/design-system";
-import { ArrowClockwise, Download, Upload, Check, Eye, Play } from "@strapi/icons";
+import { Box, Flex, Typography, Button, SingleSelect, SingleSelectOption, Badge, Checkbox, Alert, Table, Thead, Tr, Th, Tbody, Td, Loader, TextInput, ComboboxOption, Field, Combobox } from "@strapi/design-system";
+import { ArrowClockwise, Download, Upload, Check, Eye, Play, Cog } from "@strapi/icons";
 import { V as ValidationRulesTab } from "./ValidationRulesTab-Dt53h-Ke.mjs";
+function parseCsvRows(csvText) {
+  if (!csvText) return [];
+  let text = csvText;
+  if (text.charCodeAt(0) === 65279) {
+    text = text.slice(1);
+  }
+  const rows = [];
+  let currentRow = [];
+  let currentCell = "";
+  let inQuotes = false;
+  let cellIsQuoted = false;
+  for (let i = 0; i < text.length; i++) {
+    const char = text[i];
+    const nextChar = text[i + 1];
+    if (inQuotes) {
+      if (char === '"') {
+        if (nextChar === '"') {
+          currentCell += '"';
+          i++;
+        } else {
+          inQuotes = false;
+        }
+      } else {
+        currentCell += char;
+      }
+    } else {
+      if (char === '"' && !cellIsQuoted && currentCell.trim() === "") {
+        inQuotes = true;
+        cellIsQuoted = true;
+        currentCell = "";
+      } else if (char === ",") {
+        currentRow.push(cellIsQuoted ? currentCell : currentCell.trim());
+        currentCell = "";
+        cellIsQuoted = false;
+      } else if (char === "\r") {
+        if (nextChar === "\n") {
+          i++;
+        }
+        currentRow.push(cellIsQuoted ? currentCell : currentCell.trim());
+        if (currentRow.length > 1 || currentRow.length === 1 && currentRow[0] !== "") {
+          rows.push(currentRow);
+        }
+        currentRow = [];
+        currentCell = "";
+        cellIsQuoted = false;
+      } else if (char === "\n") {
+        currentRow.push(cellIsQuoted ? currentCell : currentCell.trim());
+        if (currentRow.length > 1 || currentRow.length === 1 && currentRow[0] !== "") {
+          rows.push(currentRow);
+        }
+        currentRow = [];
+        currentCell = "";
+        cellIsQuoted = false;
+      } else {
+        if (!(cellIsQuoted && !inQuotes && (char === " " || char === "	"))) {
+          currentCell += char;
+        }
+      }
+    }
+  }
+  if (currentCell !== "" || cellIsQuoted || currentRow.length > 0) {
+    currentRow.push(cellIsQuoted ? currentCell : currentCell.trim());
+    if (currentRow.length > 1 || currentRow.length === 1 && currentRow[0] !== "") {
+      rows.push(currentRow);
+    }
+  }
+  return rows;
+}
+function parseCsv(csvText) {
+  const rows = parseCsvRows(csvText);
+  if (rows.length < 2) return [];
+  const headers = rows[0].map((h) => h.trim());
+  const records = [];
+  for (let i = 1; i < rows.length; i++) {
+    const row = rows[i];
+    const record = {};
+    headers.forEach((h, idx) => {
+      let val = row[idx] !== void 0 ? row[idx] : "";
+      if (typeof val === "string" && /^'[=+@-]/.test(val)) {
+        val = val.substring(1);
+      }
+      record[h] = val;
+    });
+    records.push(record);
+  }
+  return records;
+}
 function CsvManagerTab() {
   const { get, post } = useFetchClient();
   const { toggleNotification } = useNotification();
@@ -135,20 +222,8 @@ function CsvManagerTab() {
       const text = event.target?.result;
       setCsvRawText(text);
       try {
-        const lines = text.split(/\r?\n/).filter((l) => l.trim().length > 0);
-        if (lines.length > 0) {
-          const headers = lines[0].split(",").map((h) => h.replace(/^"|"$/g, "").trim());
-          const previewRows = [];
-          for (let i = 1; i < Math.min(lines.length, 6); i++) {
-            const vals = lines[i].split(",").map((v) => v.replace(/^"|"$/g, "").trim());
-            const row = {};
-            headers.forEach((h, idx) => {
-              row[h] = vals[idx] || "";
-            });
-            previewRows.push(row);
-          }
-          setParsedPreview(previewRows);
-        }
+        const records = parseCsv(text);
+        setParsedPreview(records.slice(0, 10));
       } catch (err) {
         setParsedPreview([]);
       }
@@ -278,53 +353,20 @@ function CsvManagerTab() {
     /* @__PURE__ */ jsxs(Box, { padding: 5, background: "neutral100", hasRadius: true, children: [
       /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h3", fontWeight: "bold", marginBottom: 2, children: "2. Import & Batch Override CSV" }),
       /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", marginBottom: 4, children: "Upload an updated CSV file to bulk update existing records or insert new records." }),
-      /* @__PURE__ */ jsxs(Flex, { gap: 6, marginBottom: 4, wrap: "wrap", children: [
+      /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", marginBottom: 4, wrap: "wrap", gap: 4, children: [
         /* @__PURE__ */ jsxs(Box, { children: [
-          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral800", marginBottom: 2, children: "Operation Mode" }),
-          /* @__PURE__ */ jsxs(Flex, { gap: 4, wrap: "wrap", children: [
-            /* @__PURE__ */ jsxs("label", { style: { display: "flex", alignItems: "center", gap: 6, cursor: "pointer" }, children: [
-              /* @__PURE__ */ jsx(
-                "input",
-                {
-                  type: "radio",
-                  name: "importMode",
-                  value: "auto",
-                  checked: importMode === "auto",
-                  onChange: () => setImportMode("auto")
-                }
-              ),
-              /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: importMode === "auto" ? "bold" : "normal", children: "Smart Auto-Detect (Auto-updates matching documentId, creates new if missing)" })
-            ] }),
-            /* @__PURE__ */ jsxs("label", { style: { display: "flex", alignItems: "center", gap: 6, cursor: "pointer" }, children: [
-              /* @__PURE__ */ jsx(
-                "input",
-                {
-                  type: "radio",
-                  name: "importMode",
-                  value: "update",
-                  checked: importMode === "update",
-                  onChange: () => setImportMode("update")
-                }
-              ),
-              /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: importMode === "update" ? "bold" : "normal", children: "Update Existing Only (Requires documentId)" })
-            ] }),
-            /* @__PURE__ */ jsxs("label", { style: { display: "flex", alignItems: "center", gap: 6, cursor: "pointer" }, children: [
-              /* @__PURE__ */ jsx(
-                "input",
-                {
-                  type: "radio",
-                  name: "importMode",
-                  value: "create_or_override",
-                  checked: importMode === "create_or_override",
-                  onChange: () => setImportMode("create_or_override")
-                }
-              ),
-              /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: importMode === "create_or_override" ? "bold" : "normal", children: "Add / Override (Inserts new or replaces existing)" })
+          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral800", marginBottom: 1, display: "block", children: "Operation Mode" }),
+          /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
+            /* @__PURE__ */ jsx(Badge, { backgroundColor: "primary100", textColor: "primary700", children: "⚡ Smart Auto-Detect" }),
+            /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
+              "Automatically updates matching records by ",
+              /* @__PURE__ */ jsx("code", { children: "documentId" }),
+              " and creates new entries when ID is omitted."
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs(Box, { style: { marginLeft: "auto" }, children: [
-          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral800", marginBottom: 2, children: "Publish Options" }),
+        /* @__PURE__ */ jsxs(Box, { children: [
+          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral800", marginBottom: 1, display: "block", children: "Publish Options" }),
           /* @__PURE__ */ jsx(
             Checkbox,
             {
@@ -392,8 +434,8 @@ function CsvManagerTab() {
           missingDocIdCount > 0 && /* @__PURE__ */ jsx(Box, { marginBottom: 3, children: /* @__PURE__ */ jsx(
             Alert,
             {
-              variant: importMode === "update" ? "warning" : "default",
-              title: importMode === "update" ? "Warning: Missing Document IDs" : "Smart Auto-Detect Active",
+              variant: "default",
+              title: "Smart Auto-Detect Active",
               children: /* @__PURE__ */ jsxs(Typography, { variant: "omega", children: [
                 missingDocIdCount,
                 " row",
@@ -402,23 +444,40 @@ function CsvManagerTab() {
                 /* @__PURE__ */ jsx("code", { children: "documentId" }),
                 ".",
                 " ",
-                importMode === "auto" ? "Because no documentId is provided, the engine will automatically treat them as new entries and generate new database IDs for them." : importMode === "update" ? 'In "Update Existing Only" mode, rows without a documentId will be skipped. Switch to "Smart Auto-Detect" to automatically create them as new entries.' : "These will be created as new entries."
+                "Because no documentId is provided, the engine will automatically treat them as new entries and generate new database IDs for them."
               ] })
             }
           ) }),
-          /* @__PURE__ */ jsxs(Table, { colCount: headers.length + 1, rowCount: parsedPreview.length + 1, children: [
+          /* @__PURE__ */ jsx(Box, { style: { overflowX: "auto", maxWidth: "100%", border: "1px solid #e0e0e0", borderRadius: 4 }, children: /* @__PURE__ */ jsxs(Table, { colCount: headers.length + 1, rowCount: parsedPreview.length + 1, children: [
             /* @__PURE__ */ jsx(Thead, { children: /* @__PURE__ */ jsxs(Tr, { children: [
-              /* @__PURE__ */ jsx(Th, { style: { width: 140 }, children: /* @__PURE__ */ jsx(Typography, { variant: "sigma", children: "Detected Action" }) }),
-              headers.map((h) => /* @__PURE__ */ jsx(Th, { children: /* @__PURE__ */ jsx(Typography, { variant: "sigma", children: h }) }, h))
+              /* @__PURE__ */ jsx(Th, { style: { width: 150, minWidth: 150 }, children: /* @__PURE__ */ jsx(Typography, { variant: "sigma", children: "Detected Action" }) }),
+              headers.map((h) => /* @__PURE__ */ jsx(Th, { style: { minWidth: 160 }, children: /* @__PURE__ */ jsx(Typography, { variant: "sigma", children: h }) }, h))
             ] }) }),
             /* @__PURE__ */ jsx(Tbody, { children: parsedPreview.map((row, rIdx) => {
               const hasDocId = !!(row.documentId || row.id || "").trim();
               return /* @__PURE__ */ jsxs(Tr, { children: [
                 /* @__PURE__ */ jsx(Td, { children: hasDocId ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "primary100", textColor: "primary700", children: "🔄 Match / Update" }) : /* @__PURE__ */ jsx(Badge, { backgroundColor: "warning100", textColor: "warning700", children: "➕ New Entry" }) }),
-                headers.map((h) => /* @__PURE__ */ jsx(Td, { children: (h === "documentId" || h === "id") && !row[h]?.trim() ? /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "warning700", fontWeight: "bold", children: "(Auto-generate ID)" }) : /* @__PURE__ */ jsx(Typography, { variant: "omega", children: row[h] || "-" }) }, h))
+                headers.map((h) => /* @__PURE__ */ jsx(Td, { style: { verticalAlign: "top", maxWidth: 300 }, children: (h === "documentId" || h === "id") && !row[h]?.trim() ? /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "warning700", fontWeight: "bold", children: "(Auto-generate ID)" }) : /* @__PURE__ */ jsx(
+                  Typography,
+                  {
+                    variant: "omega",
+                    style: {
+                      display: "-webkit-box",
+                      WebkitLineClamp: 3,
+                      WebkitBoxOrient: "vertical",
+                      overflow: "hidden",
+                      textOverflow: "ellipsis",
+                      whiteSpace: "pre-wrap",
+                      wordBreak: "break-word",
+                      maxHeight: 65
+                    },
+                    title: row[h] || "",
+                    children: row[h] || "-"
+                  }
+                ) }, h))
               ] }, rIdx);
             }) })
-          ] }),
+          ] }) }),
           /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", marginTop: 4, children: /* @__PURE__ */ jsx(
             Button,
             {
@@ -427,7 +486,7 @@ function CsvManagerTab() {
               startIcon: /* @__PURE__ */ jsx(Check, {}),
               onClick: handleExecuteImport,
               loading: importing,
-              children: importMode === "auto" ? "Execute Smart Import (Auto-Detect)" : importMode === "update" ? "Execute Bulk Update" : "Execute Add / Override"
+              children: "Execute Smart Import (Auto-Detect)"
             }
           ) })
         ] });
@@ -1685,6 +1744,16 @@ const BulkUpdater = () => {
   const [bulkExporting, setBulkExporting] = useState(false);
   const MODELS_CACHE_KEY = "strapi_bulk_updater_models_cache";
   const LAST_ATTR_KEY = "strapi_bulk_updater_last_attr";
+  const LAST_COLLECTION_KEY = "strapi_bulk_updater_last_collection";
+  const getInitialCollectionUid = () => {
+    try {
+      const stored = localStorage.getItem(LAST_COLLECTION_KEY);
+      if (stored) return stored;
+    } catch {
+    }
+    return "";
+  };
+  const [selectedCollectionUid, setSelectedCollectionUid] = useState(getInitialCollectionUid);
   const getInitialAttribute = () => {
     try {
       const stored = localStorage.getItem(LAST_ATTR_KEY);
@@ -1743,7 +1812,7 @@ const BulkUpdater = () => {
   const [filterOperator, setFilterOperator] = useState("none");
   const [filterQuery, setFilterQuery] = useState("");
   const [entrySearch, setEntrySearch] = useState("");
-  const isFilterActive = Boolean(searchAttribute && searchAttribute !== selectedAttribute) || filterOperator !== "none" && (["empty", "not_empty"].includes(filterOperator) || Boolean(filterQuery.trim())) || Boolean(entrySearch.trim());
+  const isFilterActive = Boolean(searchAttribute && searchAttribute !== selectedAttribute) || filterOperator !== "none" && (["empty", "not_empty"].includes(filterOperator) || Boolean(filterQuery.trim())) || Boolean(entrySearch.trim()) || Boolean(useRegex && regexPattern.trim());
   const [lastResults, setLastResults] = useState(null);
   const [updateSummary, setUpdateSummary] = useState(null);
   const [collectionPages, setCollectionPages] = useState({});
@@ -1756,6 +1825,7 @@ const BulkUpdater = () => {
   const [collectionSorts, setCollectionSorts] = useState({});
   const [collectionColumnVisibility, setCollectionColumnVisibility] = useState({});
   const [openColumnPickerUid, setOpenColumnPickerUid] = useState(null);
+  const [columnSearchTerm, setColumnSearchTerm] = useState("");
   const toggleColumn = (colUid, colKey, availableCols) => {
     setCollectionColumnVisibility((prev) => {
       const current = prev[colUid] || availableCols.filter((c) => c.defaultVisible).map((c) => c.key);
@@ -1826,12 +1896,29 @@ const BulkUpdater = () => {
     if (data.attributesMeta) {
       setAttributesMeta(data.attributesMeta);
     }
+    let resolvedColUid = selectedCollectionUid;
+    let storedCol = null;
+    try {
+      storedCol = localStorage.getItem(LAST_COLLECTION_KEY);
+    } catch {
+    }
+    if (!resolvedColUid || !cols.some((c) => c.uid === resolvedColUid)) {
+      resolvedColUid = storedCol && cols.some((c) => c.uid === storedCol) ? storedCol : cols[0]?.uid || "";
+    }
+    setSelectedCollectionUid(resolvedColUid);
+    try {
+      if (resolvedColUid) localStorage.setItem(LAST_COLLECTION_KEY, resolvedColUid);
+    } catch {
+    }
+    const activeCol = cols.find((c) => c.uid === resolvedColUid) || cols[0];
+    const activeAttrs = activeCol?.attributes || [];
+    setAttributes(activeAttrs);
     let storedAttr = null;
     try {
       storedAttr = localStorage.getItem(LAST_ATTR_KEY);
     } catch {
     }
-    const resolvedAttr = storedAttr && attrs.includes(storedAttr) ? storedAttr : selectedAttribute && attrs.includes(selectedAttribute) ? selectedAttribute : "";
+    const resolvedAttr = storedAttr && activeAttrs.includes(storedAttr) ? storedAttr : selectedAttribute && activeAttrs.includes(selectedAttribute) ? selectedAttribute : activeAttrs[0] || "";
     setSelectedAttribute(resolvedAttr);
     if (resolvedAttr && data.relationsMeta && data.relationsMeta[resolvedAttr]) {
       fetchRelationOptions(data.relationsMeta[resolvedAttr].targetUid);
@@ -2014,36 +2101,60 @@ const BulkUpdater = () => {
       return;
     }
     const timer = setTimeout(() => {
-      if (collections.length > 0) {
-        const isFilterActiveNow = Boolean(searchAttribute && searchAttribute !== selectedAttribute) || filterOperator !== "none" && (["empty", "not_empty"].includes(filterOperator) || Boolean(filterQuery.trim())) || Boolean(entrySearch.trim());
+      if (selectedCollectionUid) {
+        const isFilterActiveNow = Boolean(searchAttribute && searchAttribute !== selectedAttribute) || filterOperator !== "none" && (["empty", "not_empty"].includes(filterOperator) || Boolean(filterQuery.trim())) || Boolean(entrySearch.trim()) || Boolean(useRegex && regexPattern.trim());
         if (isFilterActiveNow) {
           setSelectedEntries({});
         }
-        const targetSearchAttr = searchAttribute || selectedAttribute;
-        const targetCols = collections.filter((col) => {
-          if (visibleTypeUids[col.uid] === false) return false;
-          if (filterOperator !== "none" && targetSearchAttr && !col.attributes.includes(targetSearchAttr)) return false;
-          return true;
-        });
-        targetCols.forEach((col) => {
-          loadCollectionPage(
-            col.uid,
-            1,
-            void 0,
-            void 0,
-            void 0,
-            filterOperator,
-            filterQuery,
-            entrySearch,
-            true,
-            searchAttribute
-          );
-        });
+        loadCollectionPage(
+          selectedCollectionUid,
+          1,
+          void 0,
+          void 0,
+          void 0,
+          filterOperator,
+          filterQuery,
+          entrySearch,
+          true,
+          searchAttribute
+        );
       }
     }, 350);
     return () => clearTimeout(timer);
-  }, [searchAttribute, filterOperator, filterQuery, entrySearch]);
+  }, [selectedCollectionUid, searchAttribute, filterOperator, filterQuery, entrySearch, useRegex, regexPattern]);
   const KEY_SEP = "@@@";
+  const selectedCol = useMemo(() => {
+    if (!collections.length) return null;
+    return collections.find((c) => c.uid === selectedCollectionUid) || collections[0] || null;
+  }, [collections, selectedCollectionUid]);
+  const handleCollectionChange = (newUid) => {
+    if (newUid === selectedCollectionUid) return;
+    setSelectedCollectionUid(newUid);
+    try {
+      localStorage.setItem(LAST_COLLECTION_KEY, newUid);
+    } catch {
+    }
+    setSelectedEntries({});
+    setSearchAttribute("");
+    setSearchAttributeSearch("");
+    const targetCol = collections.find((c) => c.uid === newUid);
+    const colAttrs = targetCol?.attributes || [];
+    setAttributes(colAttrs);
+    if (!colAttrs.includes(selectedAttribute)) {
+      const newAttr = colAttrs[0] || "";
+      setSelectedAttribute(newAttr);
+      try {
+        localStorage.setItem(LAST_ATTR_KEY, newAttr);
+      } catch {
+      }
+      if (newAttr && relationsMeta[newAttr]) {
+        fetchRelationOptions(relationsMeta[newAttr].targetUid);
+      } else {
+        setSelectedRelationDocId("");
+      }
+    }
+    loadCollectionPage(newUid, 1, void 0, void 0, void 0, filterOperator, filterQuery, entrySearch, true, "");
+  };
   const handleAttributeChange = (newAttr) => {
     if (newAttr !== selectedAttribute) {
       setSelectedAttribute(newAttr);
@@ -2066,56 +2177,23 @@ const BulkUpdater = () => {
       } else {
         setRelationOptions([]);
       }
-      if (newAttr) {
-        const collectionsToLoad = collections.filter(
-          (col) => visibleTypeUids[col.uid] !== false && col.attributes.includes(newAttr) && (!collectionPages[col.uid]?.entries || collectionPages[col.uid].entries.length === 0)
-        );
-        collectionsToLoad.forEach((col) => {
-          loadCollectionPage(col.uid, 1);
-        });
+      if (newAttr && selectedCollectionUid) {
+        loadCollectionPage(selectedCollectionUid, 1);
       }
     }
   };
-  const filteredCollections = collections.filter(
-    (c) => visibleTypeUids[c.uid] !== false && (!collectionSearch.trim() || c.displayName.toLowerCase().includes(collectionSearch.toLowerCase().trim()) || c.uid.toLowerCase().includes(collectionSearch.toLowerCase().trim()))
-  );
-  const supportedCollections = useMemo(() => {
-    return collections.filter((c) => c.attributes.includes(selectedAttribute));
-  }, [collections, selectedAttribute]);
-  const unsupportedCollections = useMemo(() => {
-    return collections.filter((c) => !c.attributes.includes(selectedAttribute));
-  }, [collections, selectedAttribute]);
-  const handleFocusOnlySupported = () => {
-    const newVis = {};
-    collections.forEach((c) => {
-      newVis[c.uid] = c.attributes.includes(selectedAttribute);
-    });
-    setVisibleTypeUids(newVis);
-    toggleNotification({
-      type: "info",
-      message: `Workspace focused: Showing ${supportedCollections.length} of ${collections.length} collections supporting "${selectedAttribute}".`
-    });
-  };
-  const handleShowAllTypes = () => {
-    const newVis = {};
-    collections.forEach((c) => {
-      newVis[c.uid] = true;
-    });
-    setVisibleTypeUids(newVis);
-  };
-  const handleHideAllTypes = () => {
-    const newVis = {};
-    collections.forEach((c) => {
-      newVis[c.uid] = false;
-    });
-    setVisibleTypeUids(newVis);
-  };
+  const filteredCollections = useMemo(() => {
+    return selectedCol ? [selectedCol] : [];
+  }, [selectedCol]);
   const [attributeSearch, setAttributeSearch] = useState("");
   const [searchAttributeSearch, setSearchAttributeSearch] = useState("");
   const getAttrDepth = (attr) => attributesMeta[attr]?.depth ?? (attr.includes(".") ? attr.split(".").length - 1 : 0);
+  const availableColAttributes = useMemo(() => {
+    return selectedCol?.attributes || attributes || [];
+  }, [selectedCol, attributes]);
   const depthFilteredAttributes = useMemo(() => {
-    return attributes.filter((attr) => getAttrDepth(attr) <= componentDepth);
-  }, [attributes, componentDepth, attributesMeta]);
+    return availableColAttributes.filter((attr) => getAttrDepth(attr) <= componentDepth);
+  }, [availableColAttributes, componentDepth, attributesMeta]);
   const filteredAttributes = useMemo(() => {
     if (!attributeSearch.trim()) {
       return depthFilteredAttributes;
@@ -2224,15 +2302,6 @@ const BulkUpdater = () => {
       });
     }
   };
-  const handleGlobalPageSizeChange = (newSize) => {
-    const capped = Math.min(500, Math.max(1, newSize));
-    setDefaultPageSize(capped);
-    collections.forEach((col) => {
-      if (!col.isSingleType) {
-        loadCollectionPage(col.uid, 1, capped);
-      }
-    });
-  };
   const handleCollectionPageSizeChange = (colUid, newSize) => {
     const capped = Math.min(500, Math.max(1, newSize));
     loadCollectionPage(colUid, 1, capped);
@@ -2257,6 +2326,16 @@ const BulkUpdater = () => {
     }));
   };
   const entryMatchesFilter = (entry, attr) => {
+    if (useRegex && regexPattern.trim()) {
+      try {
+        const regex = new RegExp(regexPattern, "i");
+        const targetSearchVal = formatDisplayValue(getNestedValue(entry, attr));
+        if (!regex.test(targetSearchVal)) {
+          return false;
+        }
+      } catch {
+      }
+    }
     if (filterOperator === "none") return true;
     const val = getNestedValue(entry, attr);
     const displayStr = formatDisplayValue(val);
@@ -2319,6 +2398,7 @@ const BulkUpdater = () => {
     setFilterOperator("none");
     setFilterQuery("");
     setEntrySearch("");
+    setRegexPattern("");
     setSelectedEntries({});
     collections.forEach((col) => {
       loadCollectionPage(col.uid, 1, void 0, void 0, void 0, "none", "", "", false, "");
@@ -3107,41 +3187,79 @@ const BulkUpdater = () => {
             ] })
           }
         ) : activeTab === "editor" ? /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsxs(
+          /* @__PURE__ */ jsx(
             Box,
             {
-              padding: 6,
+              padding: 4,
               background: "neutral0",
               shadow: "filterShadow",
               hasRadius: true,
-              marginBottom: 6,
+              marginBottom: 5,
               style: { width: "100%", maxWidth: "100%", minWidth: 0, boxSizing: "border-box" },
-              children: [
-                /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", marginBottom: 4, wrap: "wrap", gap: 3, children: [
-                  /* @__PURE__ */ jsxs(Box, { children: [
-                    /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", fontWeight: "semiBold", children: "1. Configure Attribute Update" }),
-                    /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Select the target attribute to update across collections." })
-                  ] }),
-                  /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
-                    /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral700", fontWeight: "bold", children: "Component Nesting Depth:" }),
-                    [1, 2, 3, 4, 5].map((lvl) => /* @__PURE__ */ jsxs(
-                      Button,
+              children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 3, children: [
+                /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "center", wrap: "wrap", style: { flex: 1, minWidth: 280 }, children: [
+                  /* @__PURE__ */ jsx(Box, { style: { width: 340, minWidth: 260 }, children: /* @__PURE__ */ jsxs(Field.Root, { children: [
+                    /* @__PURE__ */ jsx(Field.Label, { children: "Target Collection Type" }),
+                    /* @__PURE__ */ jsx(
+                      Combobox,
                       {
-                        variant: componentDepth === lvl ? "default" : "tertiary",
-                        size: "S",
-                        onClick: () => handleComponentDepthChange(lvl),
-                        title: `Discover nested component attributes up to Level ${lvl}`,
-                        children: [
-                          "Level ",
-                          lvl
-                        ]
+                        autocomplete: "none",
+                        placeholder: "Select Collection Type...",
+                        value: selectedCollectionUid || void 0,
+                        onChange: (val) => {
+                          if (val && typeof val === "string") {
+                            handleCollectionChange(val);
+                          }
+                        },
+                        children: collections.map((col) => /* @__PURE__ */ jsx(ComboboxOption, { value: col.uid, textValue: `${col.displayName} (${col.uid})`, children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", style: { width: "100%" }, children: [
+                          /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: col.displayName }),
+                          /* @__PURE__ */ jsx(Flex, { gap: 1, alignItems: "center", children: col.isSingleType ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "secondary100", textColor: "secondary700", size: "S", children: "Single" }) : /* @__PURE__ */ jsx(Badge, { backgroundColor: "neutral150", textColor: "neutral700", size: "S", children: col.totalEntries !== void 0 ? `${col.totalEntries} entries` : "" }) })
+                        ] }) }, col.uid))
                       },
-                      `depth_cfg_${lvl}`
-                    ))
+                      `top-col-${selectedCollectionUid}`
+                    )
+                  ] }) }),
+                  selectedCol && /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", style: { paddingTop: 20 }, children: [
+                    /* @__PURE__ */ jsx(Badge, { backgroundColor: "primary100", textColor: "primary700", children: selectedCol.isSingleType ? "SINGLE TYPE" : "COLLECTION" }),
+                    /* @__PURE__ */ jsx(Badge, { backgroundColor: "neutral150", textColor: "neutral700", children: selectedCol.isSingleType ? "1 single entry" : `${collectionPages[selectedCol.uid]?.total ?? selectedCol.totalEntries ?? selectedCol.entries?.length ?? 0} records` })
                   ] })
                 ] }),
-                /* @__PURE__ */ jsxs(Flex, { gap: 4, alignItems: "flex-end", wrap: "wrap", children: [
-                  /* @__PURE__ */ jsx(Box, { style: { minWidth: 280, flex: 1, maxWidth: 440 }, children: /* @__PURE__ */ jsxs(Field.Root, { children: [
+                /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
+                  /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral700", fontWeight: "bold", children: "Component Nesting Depth:" }),
+                  [1, 2, 3, 4, 5].map((lvl) => /* @__PURE__ */ jsxs(
+                    Button,
+                    {
+                      variant: componentDepth === lvl ? "default" : "tertiary",
+                      size: "S",
+                      onClick: () => handleComponentDepthChange(lvl),
+                      title: `Discover nested component attributes up to Level ${lvl}`,
+                      children: [
+                        "Level ",
+                        lvl
+                      ]
+                    },
+                    `depth_cfg_${lvl}`
+                  ))
+                ] })
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxs(
+            Box,
+            {
+              padding: 6,
+              background: "neutral0",
+              shadow: "filterShadow",
+              hasRadius: true,
+              marginBottom: 6,
+              style: { width: "100%", maxWidth: "100%", minWidth: 0, boxSizing: "border-box" },
+              children: [
+                /* @__PURE__ */ jsx(Flex, { justifyContent: "space-between", alignItems: "center", marginBottom: 4, wrap: "wrap", gap: 3, children: /* @__PURE__ */ jsxs(Box, { children: [
+                  /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", fontWeight: "semiBold", children: "1. Configure Attribute Update" }),
+                  /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Select the target attribute to update and configure the replacement value." })
+                ] }) }),
+                /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "flex-end", wrap: "wrap", children: [
+                  /* @__PURE__ */ jsx(Box, { style: { width: 280, minWidth: 230 }, children: /* @__PURE__ */ jsxs(Field.Root, { children: [
                     /* @__PURE__ */ jsx(Field.Label, { children: "Attribute to Update" }),
                     /* @__PURE__ */ jsx(
                       Combobox,
@@ -3171,7 +3289,8 @@ const BulkUpdater = () => {
                           }
                         },
                         children: memoizedComboboxOptions
-                      }
+                      },
+                      `update-attr-${selectedCollectionUid}-${selectedAttribute}`
                     )
                   ] }) }),
                   /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 340 }, children: relationsMeta[selectedAttribute] ? /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, style: { width: "100%" }, children: [
@@ -3340,103 +3459,24 @@ const BulkUpdater = () => {
                   ] }),
                   /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: publishOnApproval ? "When enabled, entries will be published live immediately upon batch execution for draft-enabled content types." : "When disabled, entries will be saved as draft versions without publishing to live visitors." })
                 ] }) }),
-                /* @__PURE__ */ jsx(Box, { marginTop: 4, padding: 4, background: "neutral100", hasRadius: true, children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 3, children: [
-                  /* @__PURE__ */ jsx(Flex, { gap: 2, alignItems: "center", children: /* @__PURE__ */ jsx(
-                    Checkbox,
-                    {
-                      checked: useRegex,
-                      onCheckedChange: (checked) => setUseRegex(Boolean(checked)),
-                      children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: "Enable Regex Find & Replace" })
-                    }
-                  ) }),
-                  useRegex && /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 240 }, children: /* @__PURE__ */ jsx(
-                    TextInput,
-                    {
-                      placeholder: "Regex pattern (e.g. \\b(OldName)\\b)...",
-                      value: regexPattern,
-                      onChange: (e) => setRegexPattern(e.target.value)
-                    }
-                  ) })
-                ] }) }),
-                selectedAttribute && /* @__PURE__ */ jsxs(Box, { marginTop: 4, padding: 4, background: "neutral100", hasRadius: true, style: { border: "1px solid #eaeaef" }, children: [
-                  /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 3, children: [
-                    /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
-                      /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: "Attribute Info:" }),
-                      /* @__PURE__ */ jsxs(Typography, { variant: "pi", children: [
-                        "Targeting attribute ",
-                        /* @__PURE__ */ jsx("strong", { children: /* @__PURE__ */ jsx("code", { children: selectedAttribute }) })
-                      ] }),
-                      /* @__PURE__ */ jsxs(Badge, { backgroundColor: "success100", textColor: "success700", children: [
-                        "✓ Supported in ",
-                        supportedCollections.length,
-                        " of ",
-                        collections.length,
-                        " Collections"
-                      ] }),
-                      unsupportedCollections.length > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "neutral200", textColor: "neutral700", children: [
-                        "— Not in schema: ",
-                        unsupportedCollections.length
-                      ] })
-                    ] }),
-                    /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
-                      /* @__PURE__ */ jsxs(
-                        Button,
-                        {
-                          variant: "secondary",
-                          size: "S",
-                          onClick: handleFocusOnlySupported,
-                          children: [
-                            "Focus Workspace: Show Supported Only (",
-                            supportedCollections.length,
-                            ")"
-                          ]
-                        }
-                      ),
-                      /* @__PURE__ */ jsx(
-                        Button,
-                        {
-                          variant: "tertiary",
-                          size: "S",
-                          onClick: () => setAttributeInfoExpanded((prev) => !prev),
-                          children: attributeInfoExpanded ? "Hide Schema Breakdown ▲" : "Inspect Breakdown ▼"
-                        }
-                      )
-                    ] })
+                selectedCol && selectedAttribute && /* @__PURE__ */ jsx(Box, { marginTop: 4, padding: 3, background: "neutral100", hasRadius: true, style: { border: "1px solid #eaeaef" }, children: /* @__PURE__ */ jsx(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 3, children: /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
+                  /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: "Target Selection:" }),
+                  /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
+                    "Collection: ",
+                    selectedCol.displayName
                   ] }),
-                  attributeInfoExpanded && /* @__PURE__ */ jsxs(Box, { marginTop: 3, paddingTop: 3, style: { borderTop: "1px solid #dcdce4" }, children: [
-                    /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", marginBottom: 3, wrap: "wrap", gap: 2, children: [
-                      /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Showing collection types schema compatibility. Type to filter:" }),
-                      /* @__PURE__ */ jsx(Box, { style: { width: 220 }, children: /* @__PURE__ */ jsx(
-                        TextInput,
-                        {
-                          placeholder: "Filter collection name...",
-                          size: "S",
-                          value: attributeInfoSearch,
-                          onChange: (e) => setAttributeInfoSearch(e.target.value)
-                        }
-                      ) })
-                    ] }),
-                    /* @__PURE__ */ jsx(Flex, { wrap: "wrap", gap: 2, alignItems: "center", style: { maxHeight: 180, overflowY: "auto" }, children: collections.filter(
-                      (c) => !attributeInfoSearch.trim() || c.displayName.toLowerCase().includes(attributeInfoSearch.toLowerCase().trim()) || c.uid.toLowerCase().includes(attributeInfoSearch.toLowerCase().trim())
-                    ).map((c) => {
-                      const hasAttr = c.attributes.includes(selectedAttribute);
-                      return /* @__PURE__ */ jsxs(
-                        Badge,
-                        {
-                          backgroundColor: hasAttr ? "success100" : "neutral200",
-                          textColor: hasAttr ? "success700" : "neutral600",
-                          size: "S",
-                          children: [
-                            c.displayName,
-                            ": ",
-                            hasAttr ? "✓ Supported" : "— Not in schema"
-                          ]
-                        },
-                        c.uid
-                      );
-                    }) })
-                  ] })
-                ] })
+                  /* @__PURE__ */ jsxs(Badge, { backgroundColor: "secondary100", textColor: "secondary700", children: [
+                    "Attribute: ",
+                    selectedAttribute,
+                    " ",
+                    attributesMeta[selectedAttribute]?.type ? `(${attributesMeta[selectedAttribute].type})` : ""
+                  ] }),
+                  attributesMeta[selectedAttribute]?.depth ? /* @__PURE__ */ jsxs(Badge, { backgroundColor: "neutral200", textColor: "neutral700", children: [
+                    "Nesting Level: L",
+                    attributesMeta[selectedAttribute].depth
+                  ] }) : null,
+                  selectedCol.draftAndPublish ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "success100", textColor: "success700", children: "Draft & Publish Enabled" }) : /* @__PURE__ */ jsx(Badge, { backgroundColor: "warning100", textColor: "warning700", children: "Direct Publish Only" })
+                ] }) }) })
               ]
             }
           ),
@@ -3453,7 +3493,11 @@ const BulkUpdater = () => {
                 /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", marginBottom: 4, wrap: "wrap", gap: 3, children: [
                   /* @__PURE__ */ jsxs(Box, { children: [
                     /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", fontWeight: "semiBold", children: "2. Select Targets" }),
-                    /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Pick entire collection types or individual entries to apply the update to." })
+                    /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
+                      "Search and select entries to apply the update to within ",
+                      selectedCol ? selectedCol.displayName : "the selected collection",
+                      "."
+                    ] })
                   ] }),
                   /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
                     /* @__PURE__ */ jsx(Button, { variant: "secondary", size: "S", onClick: selectAll, children: "Select All" }),
@@ -3485,27 +3529,7 @@ const BulkUpdater = () => {
                             selectedAttribute
                           ] })
                         ] }),
-                        /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
-                          /* @__PURE__ */ jsxs(Flex, { gap: 1, alignItems: "center", children: [
-                            /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Depth:" }),
-                            [1, 2, 3, 4, 5].map((lvl) => /* @__PURE__ */ jsxs(
-                              Button,
-                              {
-                                variant: componentDepth === lvl ? "default" : "tertiary",
-                                size: "S",
-                                onClick: () => handleComponentDepthChange(lvl),
-                                title: `Show component attributes up to Level ${lvl}`,
-                                style: { minWidth: 26, padding: "2px 6px" },
-                                children: [
-                                  "L",
-                                  lvl
-                                ]
-                              },
-                              `s2_depth_${lvl}`
-                            ))
-                          ] }),
-                          isFilterActive && /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "S", onClick: clearFilter, children: "Clear Search & 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: 280, minWidth: 230 }, children: /* @__PURE__ */ jsxs(Field.Root, { children: [
@@ -3536,7 +3560,8 @@ const BulkUpdater = () => {
                                 }
                               },
                               children: memoizedSearchComboboxOptions
-                            }
+                            },
+                            `search-attr-${selectedCollectionUid}-${searchAttribute}`
                           )
                         ] }) }),
                         /* @__PURE__ */ jsx(Box, { style: { width: 200, minWidth: 170 }, children: /* @__PURE__ */ jsxs(
@@ -3596,164 +3621,48 @@ const BulkUpdater = () => {
                           )
                         ] })
                       ] }),
-                      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." }) })
-                    ] })
-                  }
-                ),
-                collections.length > 0 && /* @__PURE__ */ jsxs(
-                  Box,
-                  {
-                    padding: 4,
-                    background: "neutral100",
-                    hasRadius: true,
-                    marginBottom: 4,
-                    style: { width: "100%", maxWidth: "100%", boxSizing: "border-box", border: "1px solid #eaeaef" },
-                    children: [
-                      /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 3, marginBottom: 3, children: [
-                        /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
-                          /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: "bold", children: "Filter Visible Content Types:" }),
-                          /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
-                            filteredCollections.length,
-                            " of ",
-                            collections.length,
-                            " visible"
+                      /* @__PURE__ */ jsxs(Box, { marginTop: 3, paddingTop: 3, style: { borderTop: "1px solid #dcdce4" }, children: [
+                        /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 3, children: [
+                          /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
+                            /* @__PURE__ */ jsx(
+                              Checkbox,
+                              {
+                                checked: useRegex,
+                                onCheckedChange: (checked) => setUseRegex(Boolean(checked)),
+                                children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: "Enable Regex Search & Replace" })
+                              }
+                            ),
+                            /* @__PURE__ */ jsx(
+                              Badge,
+                              {
+                                backgroundColor: useRegex ? "secondary100" : "neutral200",
+                                textColor: useRegex ? "secondary700" : "neutral600",
+                                size: "S",
+                                children: useRegex ? "REGEX SEARCH ACTIVE" : "REGEX OFF"
+                              }
+                            )
                           ] }),
-                          /* @__PURE__ */ jsxs(Badge, { backgroundColor: "success100", textColor: "success700", children: [
-                            supportedCollections.filter((c) => visibleTypeUids[c.uid] !== false).length,
-                            " of ",
-                            supportedCollections.length,
-                            " supported visible"
-                          ] })
-                        ] }),
-                        /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", wrap: "wrap", children: [
-                          /* @__PURE__ */ jsx(Box, { style: { width: 220 }, children: /* @__PURE__ */ jsx(
+                          useRegex && /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 260 }, children: /* @__PURE__ */ jsx(
                             TextInput,
                             {
-                              placeholder: "Search types...",
-                              size: "S",
-                              value: typeVisibilitySearch,
-                              onChange: (e) => setTypeVisibilitySearch(e.target.value)
-                            }
-                          ) }),
-                          /* @__PURE__ */ jsxs(
-                            Button,
-                            {
-                              variant: "secondary",
-                              size: "S",
-                              onClick: handleFocusOnlySupported,
-                              children: [
-                                "Show Supported Only (",
-                                supportedCollections.length,
-                                ")"
-                              ]
-                            }
-                          ),
-                          /* @__PURE__ */ jsx(
-                            Button,
-                            {
-                              variant: "tertiary",
-                              size: "S",
-                              onClick: handleShowAllTypes,
-                              children: "Show All"
+                              placeholder: `Regex pattern to search in "${effectiveSearchAttribute || "target"}" (e.g. \\b(OldName)\\b)...`,
+                              value: regexPattern,
+                              onChange: (e) => setRegexPattern(e.target.value)
                             }
-                          ),
-                          /* @__PURE__ */ jsx(
-                            Button,
-                            {
-                              variant: "tertiary",
-                              size: "S",
-                              onClick: handleHideAllTypes,
-                              children: "Hide All"
-                            }
-                          )
+                          ) })
+                        ] }),
+                        useRegex && /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", marginTop: 1, children: [
+                          "Searches ",
+                          effectiveSearchAttribute ? /* @__PURE__ */ jsx("strong", { children: effectiveSearchAttribute }) : "target entries",
+                          " for text matching this regular expression pattern. Matches will be substituted with the Replacement Value configured in Section 1."
                         ] })
                       ] }),
-                      /* @__PURE__ */ jsx(
-                        Box,
-                        {
-                          style: {
-                            maxHeight: 220,
-                            overflowY: "auto",
-                            padding: 8,
-                            background: "#ffffff",
-                            borderRadius: 4,
-                            border: "1px solid #dcdce4",
-                            display: "grid",
-                            gridTemplateColumns: "repeat(auto-fill, minmax(260px, 1fr))",
-                            gap: 8
-                          },
-                          children: collections.filter(
-                            (col) => !typeVisibilitySearch.trim() || col.displayName.toLowerCase().includes(typeVisibilitySearch.toLowerCase().trim()) || col.uid.toLowerCase().includes(typeVisibilitySearch.toLowerCase().trim())
-                          ).map((col) => {
-                            const isVisible = visibleTypeUids[col.uid] !== false;
-                            const hasAttr = selectedAttribute ? col.attributes.includes(selectedAttribute) : false;
-                            return /* @__PURE__ */ jsx(
-                              Box,
-                              {
-                                padding: 2,
-                                paddingLeft: 3,
-                                paddingRight: 3,
-                                background: isVisible ? "#f0f0ff" : "#f6f6f9",
-                                hasRadius: true,
-                                style: {
-                                  border: isVisible ? "1px solid #4945ff" : "1px solid #eaeaef",
-                                  transition: "all 0.15s ease"
-                                },
-                                children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", gap: 2, children: [
-                                  /* @__PURE__ */ jsx(
-                                    Checkbox,
-                                    {
-                                      checked: isVisible,
-                                      onCheckedChange: (checked) => setVisibleTypeUids((prev) => ({ ...prev, [col.uid]: Boolean(checked) })),
-                                      children: /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: isVisible ? "bold" : "regular", children: col.displayName })
-                                    }
-                                  ),
-                                  /* @__PURE__ */ jsxs(Flex, { gap: 1, alignItems: "center", children: [
-                                    col.isSingleType ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "secondary100", textColor: "secondary700", size: "S", children: "Single" }) : null,
-                                    hasAttr ? /* @__PURE__ */ jsx(Badge, { backgroundColor: "success100", textColor: "success700", size: "S", children: "✓ Supports" }) : /* @__PURE__ */ jsx(Badge, { backgroundColor: "neutral150", textColor: "neutral600", size: "S", children: "—" })
-                                  ] })
-                                ] })
-                              },
-                              col.uid
-                            );
-                          })
-                        }
-                      )
-                    ]
+                      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." }) })
+                    ] })
                   }
                 ),
-                /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", marginBottom: 4, wrap: "wrap", gap: 3, children: [
-                  collections.length > 1 && /* @__PURE__ */ jsx(Box, { style: { flex: 1, maxWidth: 360, minWidth: 220 }, children: /* @__PURE__ */ jsx(
-                    TextInput,
-                    {
-                      label: "Search Content Types",
-                      placeholder: "Search by name or UID...",
-                      value: collectionSearch,
-                      onChange: (e) => setCollectionSearch(e.target.value)
-                    }
-                  ) }),
-                  /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", style: { marginLeft: "auto" }, children: [
-                    /* @__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",
-                        value: String(defaultPageSize),
-                        onChange: (val) => handleGlobalPageSizeChange(Number(val)),
-                        children: [
-                          /* @__PURE__ */ jsx(SingleSelectOption, { value: "5", children: "5 / page" }),
-                          /* @__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: "250", children: "250 / page" }),
-                          /* @__PURE__ */ jsx(SingleSelectOption, { value: "500", children: "500 / page" })
-                        ]
-                      }
-                    ) })
-                  ] })
-                ] }),
-                filteredCollections.length === 0 ? /* @__PURE__ */ jsx(Box, { padding: 6, background: "neutral100", hasRadius: true, style: { textAlign: "center" }, children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "No content types match the visibility or search filters." }) }) : filteredCollections.map((col) => {
+                !selectedCol ? /* @__PURE__ */ jsx(Box, { padding: 6, background: "neutral100", hasRadius: true, style: { textAlign: "center" }, children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Please select a collection type above to display entries." }) }) : (() => {
+                  const col = selectedCol;
                   const pageState = collectionPages[col.uid];
                   const entries = pageState ? pageState.entries : col.entries || [];
                   const totalEntries = pageState ? pageState.total : col.totalEntries !== void 0 ? col.totalEntries : entries.length;
@@ -3842,21 +3751,174 @@ const BulkUpdater = () => {
                                 }
                               ) })
                             ] }),
-                            /* @__PURE__ */ jsxs(
-                              Button,
-                              {
-                                variant: openColumnPickerUid === col.uid ? "secondary" : "tertiary",
-                                size: "S",
-                                onClick: () => setOpenColumnPickerUid(openColumnPickerUid === col.uid ? null : col.uid),
-                                children: [
-                                  "Columns (",
-                                  activeColumns.filter((c) => !c.isPermanent).length,
-                                  "/",
-                                  availableColumns.filter((c) => !c.isPermanent).length,
-                                  ")"
-                                ]
-                              }
-                            ),
+                            /* @__PURE__ */ jsxs(Box, { style: { position: "relative", display: "inline-block" }, children: [
+                              /* @__PURE__ */ jsxs(
+                                Button,
+                                {
+                                  variant: openColumnPickerUid === col.uid ? "secondary" : "tertiary",
+                                  size: "S",
+                                  startIcon: /* @__PURE__ */ jsx(Cog, {}),
+                                  onClick: () => {
+                                    setOpenColumnPickerUid(openColumnPickerUid === col.uid ? null : col.uid);
+                                    setColumnSearchTerm("");
+                                  },
+                                  children: [
+                                    "Columns (",
+                                    activeColumns.filter((c) => !c.isPermanent).length,
+                                    "/",
+                                    availableColumns.filter((c) => !c.isPermanent).length,
+                                    ")"
+                                  ]
+                                }
+                              ),
+                              openColumnPickerUid === col.uid && /* @__PURE__ */ jsxs(
+                                Box,
+                                {
+                                  style: {
+                                    position: "absolute",
+                                    top: "calc(100% + 6px)",
+                                    right: 0,
+                                    zIndex: 200,
+                                    width: 320,
+                                    maxHeight: 420,
+                                    background: "#ffffff",
+                                    borderRadius: 8,
+                                    boxShadow: "0 10px 25px rgba(33, 33, 52, 0.18)",
+                                    border: "1px solid #dcdce4",
+                                    padding: 12,
+                                    display: "flex",
+                                    flexDirection: "column",
+                                    gap: 8
+                                  },
+                                  children: [
+                                    /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", children: [
+                                      /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: "Configure Columns" }),
+                                      /* @__PURE__ */ jsx(
+                                        Button,
+                                        {
+                                          variant: "ghost",
+                                          size: "S",
+                                          onClick: () => setOpenColumnPickerUid(null),
+                                          style: { padding: "2px 6px", height: "auto", minWidth: "unset" },
+                                          children: "✕"
+                                        }
+                                      )
+                                    ] }),
+                                    /* @__PURE__ */ jsx(
+                                      TextInput,
+                                      {
+                                        size: "S",
+                                        placeholder: "Search columns...",
+                                        value: columnSearchTerm,
+                                        onChange: (e) => setColumnSearchTerm(e.target.value)
+                                      }
+                                    ),
+                                    /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", style: { borderBottom: "1px solid #f0f0f5", paddingBottom: 6 }, children: [
+                                      /* @__PURE__ */ jsx(
+                                        Button,
+                                        {
+                                          variant: "ghost",
+                                          size: "S",
+                                          onClick: () => showAllColumns(col.uid, availableColumns),
+                                          style: { fontSize: 11, padding: 0 },
+                                          children: "Show All"
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsx(
+                                        Button,
+                                        {
+                                          variant: "ghost",
+                                          size: "S",
+                                          onClick: () => {
+                                            setCollectionColumnVisibility((prev) => ({
+                                              ...prev,
+                                              [col.uid]: []
+                                            }));
+                                          },
+                                          style: { fontSize: 11, padding: 0 },
+                                          children: "Hide All"
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsx(
+                                        Button,
+                                        {
+                                          variant: "ghost",
+                                          size: "S",
+                                          onClick: () => resetDefaultColumns(col.uid, availableColumns),
+                                          style: { fontSize: 11, padding: 0 },
+                                          children: "Reset"
+                                        }
+                                      )
+                                    ] }),
+                                    /* @__PURE__ */ jsx(
+                                      Box,
+                                      {
+                                        style: {
+                                          maxHeight: 250,
+                                          overflowY: "auto",
+                                          display: "flex",
+                                          flexDirection: "column",
+                                          gap: 4
+                                        },
+                                        children: availableColumns.filter((c) => {
+                                          if (!columnSearchTerm.trim()) return true;
+                                          const term = columnSearchTerm.toLowerCase().trim();
+                                          return c.label.toLowerCase().includes(term) || c.key.toLowerCase().includes(term);
+                                        }).map((c) => {
+                                          const isChecked = activeColumns.some((ac) => ac.key === c.key);
+                                          const isNested = c.key.includes(".");
+                                          const depth = isNested ? c.key.split(".").length - 1 : 0;
+                                          return /* @__PURE__ */ jsxs(
+                                            Flex,
+                                            {
+                                              justifyContent: "space-between",
+                                              alignItems: "center",
+                                              style: {
+                                                padding: "4px 6px",
+                                                borderRadius: 4,
+                                                background: isChecked ? "#f0f0ff" : "transparent"
+                                              },
+                                              children: [
+                                                /* @__PURE__ */ jsx(Box, { style: { minWidth: 0, flex: 1, overflow: "hidden" }, children: /* @__PURE__ */ jsx(
+                                                  Checkbox,
+                                                  {
+                                                    checked: isChecked,
+                                                    disabled: c.isPermanent,
+                                                    onCheckedChange: () => {
+                                                      if (!c.isPermanent) {
+                                                        toggleColumn(col.uid, c.key, availableColumns);
+                                                      }
+                                                    },
+                                                    children: /* @__PURE__ */ jsx(
+                                                      Typography,
+                                                      {
+                                                        variant: "pi",
+                                                        ellipsis: true,
+                                                        style: {
+                                                          color: c.isPermanent ? "#8e8ea9" : "#272833",
+                                                          fontWeight: isChecked ? 600 : 400
+                                                        },
+                                                        title: c.key,
+                                                        children: c.label
+                                                      }
+                                                    )
+                                                  }
+                                                ) }),
+                                                c.isPermanent ? /* @__PURE__ */ jsx(Badge, { size: "S", backgroundColor: "neutral150", textColor: "neutral700", children: "Fixed" }) : depth > 0 ? /* @__PURE__ */ jsxs(Badge, { size: "S", backgroundColor: "secondary100", textColor: "secondary700", children: [
+                                                  "L",
+                                                  depth
+                                                ] }) : null
+                                              ]
+                                            },
+                                            c.key
+                                          );
+                                        })
+                                      }
+                                    )
+                                  ]
+                                }
+                              )
+                            ] }),
                             /* @__PURE__ */ jsx(
                               Button,
                               {
@@ -3914,66 +3976,6 @@ const BulkUpdater = () => {
                             /* @__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(
-                          Box,
-                          {
-                            padding: 3,
-                            marginBottom: 3,
-                            background: "neutral100",
-                            hasRadius: true,
-                            borderColor: "neutral200",
-                            style: { border: "1px solid #dcdce4" },
-                            children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", wrap: "wrap", gap: 3, children: [
-                              /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "center", wrap: "wrap", children: [
-                                /* @__PURE__ */ jsxs(Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral700", children: [
-                                  "Columns for ",
-                                  col.displayName,
-                                  ":"
-                                ] }),
-                                availableColumns.filter((c) => !c.isPermanent).map((c) => {
-                                  const isChecked = activeColumns.some((ac) => ac.key === c.key);
-                                  return /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(
-                                    Checkbox,
-                                    {
-                                      checked: isChecked,
-                                      onCheckedChange: () => toggleColumn(col.uid, c.key, availableColumns),
-                                      children: /* @__PURE__ */ jsx(Typography, { variant: "pi", children: c.label })
-                                    }
-                                  ) }, c.key);
-                                })
-                              ] }),
-                              /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
-                                /* @__PURE__ */ jsx(
-                                  Button,
-                                  {
-                                    variant: "tertiary",
-                                    size: "S",
-                                    onClick: () => showAllColumns(col.uid, availableColumns),
-                                    children: "Show All"
-                                  }
-                                ),
-                                /* @__PURE__ */ jsx(
-                                  Button,
-                                  {
-                                    variant: "tertiary",
-                                    size: "S",
-                                    onClick: () => resetDefaultColumns(col.uid, availableColumns),
-                                    children: "Reset"
-                                  }
-                                ),
-                                /* @__PURE__ */ jsx(
-                                  Button,
-                                  {
-                                    variant: "ghost",
-                                    size: "S",
-                                    onClick: () => setOpenColumnPickerUid(null),
-                                    children: "Close"
-                                  }
-                                )
-                              ] })
-                            ] })
-                          }
-                        ),
                         /* @__PURE__ */ jsx(Box, { className: "bulk-updater-table-container", style: { width: "100%", maxWidth: "100%", minWidth: 0, overflowX: "auto" }, children: /* @__PURE__ */ jsxs(Table, { colCount: activeColumns.length, rowCount: visibleEntries.length + 1, style: { width: "100%" }, children: [
                           /* @__PURE__ */ jsx(Thead, { children: /* @__PURE__ */ jsx(Tr, { children: activeColumns.map(
                             (colDef) => renderHeaderCell(colDef, col, currentSort, selectedAttribute, searchAttribute, handleHeaderSortClick)
@@ -4085,7 +4087,7 @@ const BulkUpdater = () => {
                     },
                     col.uid
                   );
-                })
+                })()
               ]
             }
           ),
@@ -4970,4 +4972,4 @@ export {
   getAvailableColumnsForCollection,
   getNestedValue
 };
-//# sourceMappingURL=BulkUpdater-DowSmA56.mjs.map
+//# sourceMappingURL=BulkUpdater-D812YfOE.mjs.map