strapi-plugin-bulk-updater 1.4.6 → 1.4.9

package/dist/_chunks/{BulkUpdater-CMkPdA9_.mjs → BulkUpdater-CHdA0546.mjs}

@@ -162,6 +162,8 @@ function CsvManagerTab() {
   const [showConfirmModal, setShowConfirmModal] = useState(false);
   const [makerNotesInput, setMakerNotesInput] = useState("");
   const [submittingBatch, setSubmittingBatch] = useState(false);
+  const [publishStrategy, setPublishStrategy] = useState("safe");
+  const [unreviewedConsent, setUnreviewedConsent] = useState(false);
   useEffect(() => {
     fetchInitialData();
   }, []);
@@ -333,7 +335,9 @@ function CsvManagerTab() {
           isLastChunk: isLast,
           startRowNumber,
           mode: importMode,
-          publish: publishOnImport
+          publish: publishOnImport,
+          publishStrategy,
+          unreviewedConsent
         });
         if (!res.data || !res.data.success) {
           throw new Error(res.data?.error || `Chunk ${chunkIdx + 1} failed to process`);
@@ -437,7 +441,10 @@ function CsvManagerTab() {
         makerNotes: makerNotesInput,
         forceImmediate,
         mode: importMode,
-        publish: publishOnImport
+        publish: publishOnImport,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount: preflightReport?.lifecycleStats?.unreviewedCount || 0
       });
       setShowConfirmModal(false);
       if (res.data && res.data.pending) {
@@ -846,7 +853,11 @@ function CsvManagerTab() {
                   variant: "default",
                   size: "L",
                   startIcon: /* @__PURE__ */ jsx(Check, {}),
-                  onClick: () => setShowConfirmModal(true),
+                  onClick: () => {
+                    setPublishStrategy("safe");
+                    setUnreviewedConsent(false);
+                    setShowConfirmModal(true);
+                  },
                   loading: importing || submittingBatch,
                   children: [
                     "Review & Import (",
@@ -1119,6 +1130,27 @@ function CsvManagerTab() {
                         ] })
                       ] })
                     ] }),
+                    preflightReport?.lifecycleStats && preflightReport.lifecycleStats.isDraftAndPublish && /* @__PURE__ */ jsxs(Box, { marginBottom: 4, padding: 3, background: "neutral100", hasRadius: true, style: { border: "1px solid rgba(120, 120, 150, 0.15)" }, children: [
+                      /* @__PURE__ */ jsxs(Typography, { variant: "sigma", textColor: "neutral600", marginBottom: 2, display: "block", children: [
+                        "LIFECYCLE STATUS BREAKDOWN (",
+                        preflightReport.lifecycleStats.totalChecked,
+                        " Existing Records)"
+                      ] }),
+                      /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", children: [
+                        /* @__PURE__ */ jsxs(Badge, { backgroundColor: "success100", textColor: "success700", children: [
+                          "✓ Published / Approved: ",
+                          preflightReport.lifecycleStats.published
+                        ] }),
+                        preflightReport.lifecycleStats.modified > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
+                          "📝 Modified (Unreviewed Revisions): ",
+                          preflightReport.lifecycleStats.modified
+                        ] }),
+                        preflightReport.lifecycleStats.draft > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "neutral200", textColor: "neutral800", children: [
+                          "📄 Draft (Never Published): ",
+                          preflightReport.lifecycleStats.draft
+                        ] })
+                      ] })
+                    ] }),
                     /* @__PURE__ */ jsx(Box, { padding: 4, hasRadius: true, marginBottom: 4, background: executionWindow?.isBusinessHours ? "warning100" : "success100", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 1, children: [
                       /* @__PURE__ */ jsx(Flex, { gap: 2, alignItems: "center", children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: executionWindow?.isBusinessHours ? "warning700" : "success700", children: executionWindow?.isBusinessHours ? "⏰ Peak Business Hours Restriction Active" : "✅ Server Off-Peak Window Active" }) }),
                       /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: executionWindow?.isBusinessHours ? "warning700" : "success700", children: executionWindow?.policyMessage || (executionWindow?.isBusinessHours ? "Server policy restricts bulk operations during peak business hours (09:00 - 18:00). Direct execution is paused to preserve API throughput." : "Currently outside peak business hours. Direct execution is permitted.") })
@@ -1146,6 +1178,125 @@ function CsvManagerTab() {
                         ] })
                       }
                     ),
+                    publishOnImport && (preflightReport?.lifecycleStats?.unreviewedCount ?? 0) > 0 && /* @__PURE__ */ jsxs(
+                      Box,
+                      {
+                        padding: 4,
+                        background: "neutral100",
+                        hasRadius: true,
+                        marginBottom: 4,
+                        style: { border: "1px solid #d9d8ff" },
+                        children: [
+                          /* @__PURE__ */ jsx(Typography, { variant: "sigma", textColor: "neutral600", marginBottom: 3, display: "block", children: "PUBLISHING STRATEGY & GOVERNANCE CONSENT" }),
+                          /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 3, children: [
+                            /* @__PURE__ */ jsx(
+                              Box,
+                              {
+                                padding: 3,
+                                hasRadius: true,
+                                style: {
+                                  border: publishStrategy === "safe" ? "2px solid #4945ff" : "1px solid #eaeaef",
+                                  backgroundColor: publishStrategy === "safe" ? "#f0f0ff" : "#ffffff",
+                                  cursor: "pointer"
+                                },
+                                onClick: () => {
+                                  setPublishStrategy("safe");
+                                  setUnreviewedConsent(false);
+                                },
+                                children: /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "flex-start", children: [
+                                  /* @__PURE__ */ jsx(
+                                    "input",
+                                    {
+                                      type: "radio",
+                                      id: "csv-strategy-safe",
+                                      name: "csvPublishStrategy",
+                                      checked: publishStrategy === "safe",
+                                      onChange: () => {
+                                        setPublishStrategy("safe");
+                                        setUnreviewedConsent(false);
+                                      },
+                                      style: { marginTop: 3 }
+                                    }
+                                  ),
+                                  /* @__PURE__ */ jsxs(Box, { children: [
+                                    /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", display: "block", children: "🛡️ Safe Publishing (Recommended)" }),
+                                    /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
+                                      "Only publish records that are already approved & live (",
+                                      preflightReport?.lifecycleStats?.published ?? 0,
+                                      " record",
+                                      (preflightReport?.lifecycleStats?.published ?? 0) === 1 ? "" : "s",
+                                      "). The ",
+                                      preflightReport?.lifecycleStats?.unreviewedCount ?? 0,
+                                      " unreviewed or draft record(s) will receive the CSV update in Draft mode without publishing unreviewed draft revisions to visitors."
+                                    ] })
+                                  ] })
+                                ] })
+                              }
+                            ),
+                            /* @__PURE__ */ jsx(
+                              Box,
+                              {
+                                padding: 3,
+                                hasRadius: true,
+                                style: {
+                                  border: publishStrategy === "all" ? "2px solid #d02b20" : "1px solid #eaeaef",
+                                  backgroundColor: publishStrategy === "all" ? "#fff5f5" : "#ffffff",
+                                  cursor: "pointer"
+                                },
+                                onClick: () => setPublishStrategy("all"),
+                                children: /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "flex-start", children: [
+                                  /* @__PURE__ */ jsx(
+                                    "input",
+                                    {
+                                      type: "radio",
+                                      id: "csv-strategy-all",
+                                      name: "csvPublishStrategy",
+                                      checked: publishStrategy === "all",
+                                      onChange: () => setPublishStrategy("all"),
+                                      style: { marginTop: 3 }
+                                    }
+                                  ),
+                                  /* @__PURE__ */ jsxs(Box, { children: [
+                                    /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "danger700", display: "block", children: "⚠️ Publish All Imported Records (Includes Unreviewed Drafts)" }),
+                                    /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
+                                      "Publish all affected records live to production immediately, pushing all pending unreviewed draft edits in the ",
+                                      preflightReport?.lifecycleStats?.unreviewedCount ?? 0,
+                                      " draft/modified record(s) live."
+                                    ] })
+                                  ] })
+                                ] })
+                              }
+                            ),
+                            publishStrategy === "all" && /* @__PURE__ */ jsx(
+                              Box,
+                              {
+                                padding: 3,
+                                background: "danger100",
+                                hasRadius: true,
+                                style: { border: "1px solid #f5c0b8" },
+                                children: /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "flex-start", children: [
+                                  /* @__PURE__ */ jsx(
+                                    Checkbox,
+                                    {
+                                      checked: unreviewedConsent,
+                                      onValueChange: (checked) => setUnreviewedConsent(Boolean(checked))
+                                    }
+                                  ),
+                                  /* @__PURE__ */ jsxs(Box, { style: { cursor: "pointer" }, onClick: () => setUnreviewedConsent(!unreviewedConsent), children: [
+                                    /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "danger700", display: "block", children: "Mandatory Risk Consent Required" }),
+                                    /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "danger700", children: [
+                                      "I understand and explicitly consent that ",
+                                      preflightReport?.lifecycleStats?.unreviewedCount ?? 0,
+                                      " record(s) with unreviewed draft revisions or saved draft states will be published live to production visitors."
+                                    ] })
+                                  ] })
+                                ] })
+                              }
+                            )
+                          ] })
+                        ]
+                      }
+                    ),
                     /* @__PURE__ */ jsx(Box, { marginBottom: 2, children: /* @__PURE__ */ jsx(
                       TextInput,
                       {
@@ -1159,71 +1310,78 @@ function CsvManagerTab() {
                   ]
                 }
               ),
-              /* @__PURE__ */ jsx(
-                Box,
-                {
-                  padding: 4,
-                  background: "neutral100",
-                  style: {
-                    borderTop: "1px solid rgba(120, 120, 150, 0.2)",
-                    flexShrink: 0,
-                    position: "sticky",
-                    bottom: 0,
-                    zIndex: 20,
-                    boxShadow: "0 -4px 16px rgba(0, 0, 0, 0.08)"
-                  },
-                  children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", gap: 3, style: { width: "100%" }, children: [
-                    /* @__PURE__ */ jsx(Button, { variant: "tertiary", size: "M", onClick: () => setShowConfirmModal(false), children: "Cancel" }),
-                    /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", justifyContent: "flex-end", alignItems: "center", children: [
-                      /* @__PURE__ */ jsx(
-                        Button,
-                        {
-                          variant: executionWindow?.isBusinessHours ? "default" : "secondary",
-                          size: "M",
-                          onClick: () => submitBatchWithMode("maker_checker"),
-                          loading: submittingBatch,
-                          children: "Submit for Checker Approval"
-                        }
-                      ),
-                      executionWindow?.isBusinessHours ? /* @__PURE__ */ jsxs(Fragment, { children: [
-                        /* @__PURE__ */ jsxs(
+              (() => {
+                const isConsentRequired = publishOnImport && (preflightReport?.lifecycleStats?.unreviewedCount ?? 0) > 0 && publishStrategy === "all" && !unreviewedConsent;
+                return /* @__PURE__ */ jsx(
+                  Box,
+                  {
+                    padding: 4,
+                    background: "neutral100",
+                    style: {
+                      borderTop: "1px solid rgba(120, 120, 150, 0.2)",
+                      flexShrink: 0,
+                      position: "sticky",
+                      bottom: 0,
+                      zIndex: 20,
+                      boxShadow: "0 -4px 16px rgba(0, 0, 0, 0.08)"
+                    },
+                    children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", gap: 3, style: { width: "100%" }, children: [
+                      /* @__PURE__ */ jsx(Button, { variant: "tertiary", size: "M", onClick: () => setShowConfirmModal(false), children: "Cancel" }),
+                      /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", justifyContent: "flex-end", alignItems: "center", children: [
+                        /* @__PURE__ */ jsx(
                           Button,
                           {
-                            variant: "secondary",
+                            variant: executionWindow?.isBusinessHours ? "default" : "secondary",
                             size: "M",
-                            onClick: () => submitBatchWithMode("queue_offpeak"),
+                            onClick: () => submitBatchWithMode("maker_checker"),
                             loading: submittingBatch,
-                            children: [
-                              "Queue for Off-Peak (",
-                              executionWindow?.offPeakStartTime || "18:00",
-                              ")"
-                            ]
+                            disabled: isConsentRequired,
+                            children: "Submit for Checker Approval"
                           }
                         ),
-                        /* @__PURE__ */ jsx(
+                        executionWindow?.isBusinessHours ? /* @__PURE__ */ jsxs(Fragment, { children: [
+                          /* @__PURE__ */ jsxs(
+                            Button,
+                            {
+                              variant: "secondary",
+                              size: "M",
+                              onClick: () => submitBatchWithMode("queue_offpeak"),
+                              loading: submittingBatch,
+                              disabled: isConsentRequired,
+                              children: [
+                                "Queue for Off-Peak (",
+                                executionWindow?.offPeakStartTime || "18:00",
+                                ")"
+                              ]
+                            }
+                          ),
+                          /* @__PURE__ */ jsx(
+                            Button,
+                            {
+                              variant: "danger-light",
+                              size: "S",
+                              onClick: () => submitBatchWithMode("immediate", true),
+                              loading: importing,
+                              disabled: isConsentRequired,
+                              children: "Force Run Now"
+                            }
+                          )
+                        ] }) : /* @__PURE__ */ jsx(
                           Button,
                           {
-                            variant: "danger-light",
-                            size: "S",
-                            onClick: () => submitBatchWithMode("immediate", true),
+                            variant: "default",
+                            size: "M",
+                            onClick: () => submitBatchWithMode("immediate"),
                             loading: importing,
-                            children: "Force Run Now"
+                            disabled: isConsentRequired,
+                            children: "Confirm & Execute Now"
                           }
                         )
-                      ] }) : /* @__PURE__ */ jsx(
-                        Button,
-                        {
-                          variant: "default",
-                          size: "M",
-                          onClick: () => submitBatchWithMode("immediate"),
-                          loading: importing,
-                          children: "Confirm & Execute Now"
-                        }
-                      )
+                      ] })
                     ] })
-                  ] })
-                }
-              )
+                  }
+                );
+              })()
             ]
           }
         )
@@ -1861,7 +2019,8 @@ const BulkUpdatePreviewModal = ({
   previewData,
   attribute,
   targetValueDisplay,
-  publishOnApproval = true
+  publishOnApproval = true,
+  lifecycleStats
 }) => {
   const [filterTab, setFilterTab] = useState("all");
   const [searchQuery, setSearchQuery] = useState("");
@@ -1964,6 +2123,17 @@ const BulkUpdatePreviewModal = ({
                   /* @__PURE__ */ jsx(Typography, { variant: "delta", fontWeight: "semiBold", children: "Inspecting Target Records..." }),
                   /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Computing proposed diffs and verifying against database schema." })
                 ] }) }) : !previewData ? /* @__PURE__ */ jsx(Box, { padding: 6, style: { textAlign: "center" }, children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", children: "No preview data available." }) }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+                  publishOnApproval && lifecycleStats && lifecycleStats.unreviewedCount > 0 && /* @__PURE__ */ jsx(Box, { marginBottom: 4, padding: 3, background: "warning100", hasRadius: true, style: { border: "1px solid #f5c0b8" }, children: /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
+                    /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: "warning700", children: "⚠️ Safe Publishing Active:" }),
+                    /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "warning700", children: [
+                      lifecycleStats.unreviewedCount,
+                      " target record(s) contain unreviewed draft changes (",
+                      lifecycleStats.draft,
+                      " Draft, ",
+                      lifecycleStats.modified,
+                      " Modified). By default, these will be updated as drafts without publishing unreviewed revisions to production visitors."
+                    ] })
+                  ] }) }),
                   /* @__PURE__ */ jsxs(Flex, { gap: 3, marginBottom: 4, wrap: "wrap", children: [
                     /* @__PURE__ */ jsxs(
                       Box,
@@ -2216,7 +2386,7 @@ function getAllNestedValues(obj, path, availableAttributes) {
   const parsed = parseDynamicZonePath(path);
   const parts = parsed.cleanPath.split(".");
   const [head, ...tail] = parts;
-  const rootTarget = obj[head];
+  const rootTarget = getPropertyValue(obj, head);
   if (Array.isArray(rootTarget)) {
     const results = [];
     rootTarget.forEach((item, idx) => {
@@ -2251,6 +2421,27 @@ function getAllNestedValues(obj, path, availableAttributes) {
   }
   return [];
 }
+function getPropertyValue(target, key) {
+  if (!target || typeof target !== "object" || !key) return void 0;
+  if (target[key] !== void 0 && target[key] !== null) return target[key];
+  const camelKey = key.replace(/_([a-z0-9])/g, (_, letter) => letter.toUpperCase());
+  if (target[camelKey] !== void 0 && target[camelKey] !== null) return target[camelKey];
+  const snakeKey = key.replace(/([A-Z])/g, "_$1").toLowerCase();
+  if (target[snakeKey] !== void 0 && target[snakeKey] !== null) return target[snakeKey];
+  const lowerKey = key.toLowerCase();
+  const lowerNoUnderscore = lowerKey.replace(/_/g, "");
+  const matchedKey = Object.keys(target).find((k) => {
+    const kLower = k.toLowerCase();
+    return kLower === lowerKey || kLower.replace(/_/g, "") === lowerNoUnderscore;
+  });
+  if (matchedKey && target[matchedKey] !== void 0 && target[matchedKey] !== null) {
+    return target[matchedKey];
+  }
+  if (key in target) return target[key];
+  if (camelKey in target) return target[camelKey];
+  if (snakeKey in target) return target[snakeKey];
+  return void 0;
+}
 function getNestedValue(obj, path) {
   if (!obj || !path) return void 0;
   const parsed = parseDynamicZonePath(path);
@@ -2267,12 +2458,12 @@ function getNestedValue(obj, path) {
         const item = current[idx];
         if (parsed.targetIndex !== void 0 && idx !== parsed.targetIndex) continue;
         if (parsed.targetComponentUid && item?.__component !== parsed.targetComponentUid) continue;
-        const found = extract(item?.[head], tail);
+        const found = extract(getPropertyValue(item, head), tail);
         if (found !== void 0 && found !== null) return found;
       }
       return void 0;
     }
-    return extract(current[head], tail);
+    return extract(getPropertyValue(current, head), tail);
   }
   return extract(obj, parts);
 }
@@ -2297,24 +2488,59 @@ function getAvailableColumnsForCollection(col, selectedAttribute, searchAttribut
       return;
     }
     let formattedLabel = attr;
-    const bracketMatch = attr.match(/^([^.[]+)\[([^\]]+)\]\.(.+)$/);
-    if (bracketMatch) {
-      const root = bracketMatch[1].charAt(0).toUpperCase() + bracketMatch[1].slice(1);
-      const comp = formatComponentName(bracketMatch[2]);
-      const sub = bracketMatch[3].split(".").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(" > ");
-      formattedLabel = `${root} [${comp}] > ${sub}`;
-    } else if (attr.includes(".")) {
-      formattedLabel = attr.split(".").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(" > ");
+    if (attr === "updated_at" || attr === "updatedAt") {
+      formattedLabel = "Updated At";
+    } else if (attr === "created_at" || attr === "createdAt") {
+      formattedLabel = "Created At";
+    } else if (attr === "published_at" || attr === "publishedAt") {
+      formattedLabel = "Published At";
     } else {
-      formattedLabel = attr.charAt(0).toUpperCase() + attr.slice(1);
+      const bracketMatch = attr.match(/^([^.[]+)\[([^\]]+)\]\.(.+)$/);
+      if (bracketMatch) {
+        const root = bracketMatch[1].charAt(0).toUpperCase() + bracketMatch[1].slice(1);
+        const comp = formatComponentName(bracketMatch[2]);
+        const sub = bracketMatch[3].split(".").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(" > ");
+        formattedLabel = `${root} [${comp}] > ${sub}`;
+      } else if (attr.includes(".")) {
+        formattedLabel = attr.split(".").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(" > ");
+      } else {
+        formattedLabel = attr.replace(/_/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
+      }
     }
     cols.push({
       key: `attr_${attr}`,
       label: formattedLabel,
       sortable: !col.isSingleType,
-      defaultVisible: ["department", "email", "location"].includes(attr)
+      defaultVisible: ["department", "email", "location", "updated_at", "updatedAt"].includes(attr)
     });
   });
+  const hasUpdatedAt = candidateAttrs.some((a) => a === "updatedAt" || a === "updated_at");
+  const hasCreatedAt = candidateAttrs.some((a) => a === "createdAt" || a === "created_at");
+  const hasPublishedAt = candidateAttrs.some((a) => a === "publishedAt" || a === "published_at");
+  if (!hasUpdatedAt) {
+    cols.push({
+      key: "attr_updatedAt",
+      label: "Updated At",
+      sortable: !col.isSingleType,
+      defaultVisible: false
+    });
+  }
+  if (!hasCreatedAt) {
+    cols.push({
+      key: "attr_createdAt",
+      label: "Created At",
+      sortable: !col.isSingleType,
+      defaultVisible: false
+    });
+  }
+  if (!hasPublishedAt && col.draftAndPublish) {
+    cols.push({
+      key: "attr_publishedAt",
+      label: "Published At",
+      sortable: !col.isSingleType,
+      defaultVisible: false
+    });
+  }
   if (searchAttribute && searchAttribute !== selectedAttribute) {
     let formattedSearchLabel = searchAttribute;
     const bracketMatch = searchAttribute.match(/^([^.[]+)\[([^\]]+)\]\.(.+)$/);
@@ -2360,11 +2586,136 @@ function getAvailableColumnsForCollection(col, selectedAttribute, searchAttribut
   });
   return cols;
 }
+function getActiveSortLabel(currentSort, col) {
+  const f = currentSort.field;
+  const o = currentSort.order;
+  const dir = o === "asc" ? "▲" : "▼";
+  if (f === "updatedAt" || f === "updated_at") {
+    return `Updated: ${o === "desc" ? "Newest" : "Oldest"} ${dir}`;
+  }
+  if (f === "createdAt" || f === "created_at") {
+    return `Created: ${o === "desc" ? "Newest" : "Oldest"} ${dir}`;
+  }
+  if (f === "publishedAt" || f === "published_at") {
+    return `Published: ${o === "desc" ? "Newest" : "Oldest"} ${dir}`;
+  }
+  if (f === "id") {
+    return `ID: ${o === "desc" ? "Highest" : "Lowest"} ${dir}`;
+  }
+  let attrLabel = f;
+  if (f.includes(".")) {
+    attrLabel = f.split(".").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(" > ");
+  } else {
+    attrLabel = f.replace(/_/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
+  }
+  return `${attrLabel} (${o === "asc" ? "A → Z" : "Z → A"} ${dir})`;
+}
+function getSortOptionsForCollection(col, selectedAttribute, searchAttribute) {
+  const options = [];
+  const hasCustomUpdatedAt = col.attributes?.includes("updated_at");
+  const updatedField = hasCustomUpdatedAt ? "updated_at" : "updatedAt";
+  options.push({
+    field: updatedField,
+    order: "desc",
+    label: "Updated At (Newest First ↓)",
+    columnLabel: "Updated At",
+    group: "timestamps"
+  });
+  options.push({
+    field: updatedField,
+    order: "asc",
+    label: "Updated At (Oldest First ↑)",
+    columnLabel: "Updated At",
+    group: "timestamps"
+  });
+  const hasCustomCreatedAt = col.attributes?.includes("created_at");
+  const createdField = hasCustomCreatedAt ? "created_at" : "createdAt";
+  options.push({
+    field: createdField,
+    order: "desc",
+    label: "Created At (Newest First ↓)",
+    columnLabel: "Created At",
+    group: "timestamps"
+  });
+  options.push({
+    field: createdField,
+    order: "asc",
+    label: "Created At (Oldest First ↑)",
+    columnLabel: "Created At",
+    group: "timestamps"
+  });
+  if (col.draftAndPublish) {
+    const hasCustomPublishedAt = col.attributes?.includes("published_at");
+    const publishedField = hasCustomPublishedAt ? "published_at" : "publishedAt";
+    options.push({
+      field: publishedField,
+      order: "desc",
+      label: "Published At (Newest First ↓)",
+      columnLabel: "Published At",
+      group: "timestamps"
+    });
+    options.push({
+      field: publishedField,
+      order: "asc",
+      label: "Published At (Oldest First ↑)",
+      columnLabel: "Published At",
+      group: "timestamps"
+    });
+  }
+  options.push({
+    field: "id",
+    order: "desc",
+    label: "Entry ID (Highest First ↓)",
+    columnLabel: "ID",
+    group: "system"
+  });
+  options.push({
+    field: "id",
+    order: "asc",
+    label: "Entry ID (Lowest First ↑)",
+    columnLabel: "ID",
+    group: "system"
+  });
+  const systemKeywords = [
+    "createdat",
+    "created_at",
+    "updatedat",
+    "updated_at",
+    "publishedat",
+    "published_at",
+    "id",
+    "documentid"
+  ];
+  const attrs = (col.attributes || []).filter((a) => !systemKeywords.includes(a.toLowerCase()));
+  attrs.forEach((attr) => {
+    let formattedLabel = attr;
+    if (attr.includes(".")) {
+      formattedLabel = attr.split(".").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join(" > ");
+    } else {
+      formattedLabel = attr.replace(/_/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
+    }
+    options.push({
+      field: attr,
+      order: "asc",
+      label: `${formattedLabel} (A → Z / Lowest ↑)`,
+      columnLabel: formattedLabel,
+      group: "attributes"
+    });
+    options.push({
+      field: attr,
+      order: "desc",
+      label: `${formattedLabel} (Z → A / Highest ↓)`,
+      columnLabel: formattedLabel,
+      group: "attributes"
+    });
+  });
+  return options;
+}
 function renderHeaderCell(colDef, col, currentSort, selectedAttribute, searchAttribute, onSort) {
   if (colDef.key === "select") {
     return /* @__PURE__ */ jsx(Th, { style: { width: 48 }, children: /* @__PURE__ */ jsx(Typography, { variant: "sigma", children: "Select" }) }, "select");
   }
-  const isCurrentSorted = colDef.key === "identifier" && (currentSort.field === "name" || currentSort.field === "title") || colDef.key === "search_attr" && currentSort.field === searchAttribute || colDef.key === "target_attr" && currentSort.field === selectedAttribute || colDef.key.startsWith("attr_") && currentSort.field === colDef.key.replace("attr_", "");
+  const isCurrentSorted = colDef.key === "identifier" && (currentSort.field === "name" || currentSort.field === "title" || currentSort.field === "id") || colDef.key === "search_attr" && currentSort.field === searchAttribute || colDef.key === "target_attr" && currentSort.field === selectedAttribute || colDef.key.startsWith("attr_") && (currentSort.field === colDef.key.replace("attr_", "") || currentSort.field === "updatedAt" && colDef.key === "attr_updated_at" || currentSort.field === "updated_at" && colDef.key === "attr_updatedAt" || currentSort.field === "createdAt" && colDef.key === "attr_created_at" || currentSort.field === "created_at" && colDef.key === "attr_createdAt" || currentSort.field === "publishedAt" && colDef.key === "attr_published_at" || currentSort.field === "published_at" && colDef.key === "attr_publishedAt");
   const sortArrow = isCurrentSorted ? currentSort.order === "asc" ? "▲" : "▼" : "⇅";
   const handleClick = () => {
     if (!colDef.sortable) return;
@@ -2396,6 +2747,15 @@ function formatDisplayValue(val) {
   if (val === void 0 || val === null || val === "") {
     return "(empty / not set)";
   }
+  if (val instanceof Date) {
+    return isNaN(val.getTime()) ? "(invalid date)" : val.toLocaleString();
+  }
+  if (typeof val === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(val)) {
+    const d = new Date(val);
+    if (!isNaN(d.getTime())) {
+      return d.toLocaleString();
+    }
+  }
   if (Array.isArray(val)) {
     if (val.length === 0) return "(empty / unlinked)";
     return val.map(
@@ -2696,9 +3056,11 @@ const BulkUpdater = () => {
   const [pendingBatchesLoading, setPendingBatchesLoading] = useState(false);
   const [approvingBatchId, setApprovingBatchId] = useState(null);
   const [rejectingBatchId, setRejectingBatchId] = useState(null);
-  const [executingNowBatchId, setExecutingNowBatchId] = useState(null);
   const [makerNotesInput, setMakerNotesInput] = useState("");
   const [publishOnApproval, setPublishOnApproval] = useState(true);
+  const [publishStrategy, setPublishStrategy] = useState("safe");
+  const [unreviewedConsent, setUnreviewedConsent] = useState(false);
+  const [publishConsent, setPublishConsent] = useState(false);
   const [showProcessingDashboard, setShowProcessingDashboard] = useState(false);
   const [dashboardBatchId, setDashboardBatchId] = useState("");
   const [dashboardJob, setDashboardJob] = useState(null);
@@ -2775,10 +3137,32 @@ const BulkUpdater = () => {
     } catch {
     }
   };
+  const [searchRelationOptions, setSearchRelationOptions] = useState([]);
+  const [searchRelationOptionsLoading, setSearchRelationOptionsLoading] = useState(false);
+  const fetchSearchRelationOptions = async (targetUid) => {
+    try {
+      setSearchRelationOptionsLoading(true);
+      const res = await get(`/bulk-updater/relation-options?targetUid=${encodeURIComponent(targetUid)}`);
+      if (res.data && res.data.success) {
+        setSearchRelationOptions(res.data.options || []);
+      }
+    } catch {
+      setSearchRelationOptions([]);
+    } finally {
+      setSearchRelationOptionsLoading(false);
+    }
+  };
   const [searchAttribute, setSearchAttribute] = useState("");
   const [searchAttributeInput, setSearchAttributeInput] = useState("");
   const [attributesMeta, setAttributesMeta] = useState({});
   const effectiveSearchAttribute = searchAttribute || selectedAttribute;
+  useEffect(() => {
+    if (effectiveSearchAttribute && relationsMeta[effectiveSearchAttribute]) {
+      fetchSearchRelationOptions(relationsMeta[effectiveSearchAttribute].targetUid);
+    } else {
+      setSearchRelationOptions([]);
+    }
+  }, [effectiveSearchAttribute, relationsMeta]);
   const [filterOperator, setFilterOperator] = useState("none");
   const [filterQuery, setFilterQuery] = useState("");
   const [entrySearch, setEntrySearch] = useState("");
@@ -2797,6 +3181,8 @@ const BulkUpdater = () => {
   const [collectionColumnVisibility, setCollectionColumnVisibility] = useState({});
   const [openColumnPickerUid, setOpenColumnPickerUid] = useState(null);
   const [columnSearchTerm, setColumnSearchTerm] = useState("");
+  const [openSortPickerUid, setOpenSortPickerUid] = useState(null);
+  const [sortSearchTerm, setSortSearchTerm] = useState("");
   const toggleColumn = (colUid, colKey, availableCols) => {
     setCollectionColumnVisibility((prev) => {
       const current = prev[colUid] || availableCols.filter((c) => c.defaultVisible).map((c) => c.key);
@@ -3329,21 +3715,45 @@ const BulkUpdater = () => {
     }
     const checkMatch = (val) => {
       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) {
-        case "empty":
-          return isValEmpty;
-        case "not_empty":
-          return !isValEmpty;
-        case "equals":
-          return !isValEmpty && displayStr.trim().toLowerCase() === filterQuery.trim().toLowerCase();
-        case "contains":
-          return !isValEmpty && displayStr.toLowerCase().includes(filterQuery.trim().toLowerCase());
-        case "starts_with":
-          return !isValEmpty && displayStr.trim().toLowerCase().startsWith(filterQuery.trim().toLowerCase());
-        default:
-          return true;
+      const isValEmpty = val === void 0 || val === null || Array.isArray(val) && val.length === 0 || displayStr.trim() === "" || displayStr.trim().toLowerCase() === "(not set)" || displayStr.trim().toLowerCase() === "(empty / not set)" || displayStr.trim().toLowerCase() === "(empty / unlinked)";
+      if (filterOperator === "empty") return isValEmpty;
+      if (filterOperator === "not_empty") return !isValEmpty;
+      if (isValEmpty) return false;
+      const q = filterQuery.trim().toLowerCase();
+      if (!q) return true;
+      const testString = (str) => {
+        if (str === void 0 || str === null) return false;
+        const s = String(str).trim().toLowerCase();
+        switch (filterOperator) {
+          case "equals":
+            return s === q;
+          case "contains":
+            return s.includes(q);
+          case "starts_with":
+            return s.startsWith(q);
+          default:
+            return true;
+        }
+      };
+      const testEntityObject = (obj) => {
+        if (!obj || typeof obj !== "object") return false;
+        if (testString(obj.name)) return true;
+        if (testString(obj.title)) return true;
+        if (testString(obj.email)) return true;
+        if (testString(obj.username)) return true;
+        if (testString(obj.documentId)) return true;
+        if (testString(String(obj.id))) return true;
+        if (testString(obj.slug)) return true;
+        if (testString(formatDisplayValue(obj))) return true;
+        return false;
+      };
+      if (Array.isArray(val)) {
+        return val.some((item) => typeof item === "object" ? testEntityObject(item) : testString(item));
       }
+      if (typeof val === "object" && val !== null) {
+        if (testEntityObject(val)) return true;
+      }
+      return testString(displayStr);
     };
     if (filterOperator === "empty") {
       return matches.every((m) => checkMatch(m.value));
@@ -3455,6 +3865,40 @@ const BulkUpdater = () => {
     });
     return breakdown;
   };
+  const selectedLifecycleStats = useMemo(() => {
+    let published = 0;
+    let modified = 0;
+    let draft = 0;
+    let pendingReview = 0;
+    Object.keys(selectedEntries).forEach((key) => {
+      if (!selectedEntries[key]) return;
+      const parts = key.split(KEY_SEP);
+      if (parts.length !== 2) return;
+      const [uid, docId] = parts;
+      const col = collections.find((c) => c.uid === uid) || null;
+      const entry = collectionPages[uid]?.entries?.find((e) => e.documentId === docId || String(e.id) === docId) || col?.entries?.find((e) => e.documentId === docId || String(e.id) === docId);
+      if (col && col.draftAndPublish === false) {
+        published++;
+      } else if (entry) {
+        const { status } = getEntryLifecycleStatus(entry, col, pendingBatches);
+        if (status === "published") published++;
+        else if (status === "modified") modified++;
+        else if (status === "draft") draft++;
+        else if (status === "pending_review") pendingReview++;
+      } else {
+        draft++;
+      }
+    });
+    const unreviewedCount = draft + modified + pendingReview;
+    return {
+      published,
+      modified,
+      draft,
+      pendingReview,
+      unreviewedCount,
+      total: published + modified + draft + pendingReview
+    };
+  }, [selectedEntries, collections, collectionPages, pendingBatches]);
   const handleOpenConfirmModal = () => {
     if (!selectedAttribute) {
       toggleNotification({
@@ -3471,6 +3915,8 @@ const BulkUpdater = () => {
       });
       return;
     }
+    setPublishStrategy("safe");
+    setUnreviewedConsent(false);
     setShowConfirmModal(true);
   };
   const handleOpenPreviewModal = async () => {
@@ -3565,6 +4011,9 @@ const BulkUpdater = () => {
         failedCount: 0,
         isLive: false,
         publishOnApproval,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount: selectedLifecycleStats.unreviewedCount,
         results: []
       });
       const payload = {
@@ -3576,7 +4025,10 @@ const BulkUpdater = () => {
         executionMode,
         makerNotes: makerNotesInput,
         forceImmediate,
-        publishOnApproval
+        publishOnApproval,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount: selectedLifecycleStats.unreviewedCount
       };
       const res = await post("/bulk-updater/batch-update", payload);
       setIsSubmittingBatch(false);
@@ -3744,6 +4196,7 @@ const BulkUpdater = () => {
       });
       return;
     }
+    setPublishConsent(false);
     setShowPublishConfirmModal(true);
   };
   const executeBatchPublish = async (executionMode, forceImmediate = false) => {
@@ -3778,13 +4231,17 @@ const BulkUpdater = () => {
         failedCount: 0,
         isLive: true,
         publishOnApproval: true,
+        unreviewedConsent: publishConsent,
+        unreviewedCount: selectedLifecycleStats.unreviewedCount,
         results: []
       });
       const payload = {
         selectedEntries: targets,
         executionMode,
         makerNotes: publishMakerNotesInput,
-        forceImmediate
+        forceImmediate,
+        unreviewedConsent: publishConsent,
+        unreviewedCount: selectedLifecycleStats.unreviewedCount
       };
       const res = await post("/bulk-updater/batch-publish", payload);
       setIsSubmittingBatch(false);
@@ -4365,7 +4822,27 @@ const BulkUpdater = () => {
                             ]
                           }
                         ) }),
-                        (filterOperator === "equals" || filterOperator === "contains" || filterOperator === "starts_with") && /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 180 }, children: /* @__PURE__ */ jsx(
+                        (filterOperator === "equals" || filterOperator === "contains" || filterOperator === "starts_with") && /* @__PURE__ */ jsx(Box, { style: { flex: 1, minWidth: 200 }, children: effectiveSearchAttribute && relationsMeta[effectiveSearchAttribute] ? /* @__PURE__ */ jsxs(Field.Root, { children: [
+                          /* @__PURE__ */ jsx(Field.Label, { children: `Target ${relationsMeta[effectiveSearchAttribute].targetDisplayName} Relation` }),
+                          /* @__PURE__ */ jsx(
+                            Combobox,
+                            {
+                              autocomplete: { type: "list", filter: "contains" },
+                              placeholder: searchRelationOptionsLoading ? "Loading entities..." : `Search & pick ${relationsMeta[effectiveSearchAttribute].targetDisplayName} or type text...`,
+                              value: filterQuery,
+                              onClear: () => setFilterQuery(""),
+                              onChange: (val) => {
+                                if (typeof val === "string") {
+                                  setFilterQuery(val);
+                                }
+                              },
+                              onInputChange: (e) => {
+                                setFilterQuery(e.target.value);
+                              },
+                              children: searchRelationOptions.map((opt) => /* @__PURE__ */ jsx(ComboboxOption, { value: opt.label, textValue: opt.label, children: opt.label }, opt.documentId))
+                            }
+                          )
+                        ] }) : /* @__PURE__ */ jsx(
                           TextInput,
                           {
                             label: effectiveSearchAttribute ? `Value for "${effectiveSearchAttribute}"` : "Value to match",
@@ -4515,41 +4992,127 @@ const BulkUpdater = () => {
                             ) : null
                           ] }),
                           /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "center", wrap: "wrap", children: [
-                            !col.isSingleType && /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "center", children: [
-                              /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: "Sort:" }),
-                              /* @__PURE__ */ jsx(Box, { style: { width: 190 }, children: /* @__PURE__ */ jsxs(
-                                SingleSelect,
+                            !col.isSingleType && /* @__PURE__ */ jsxs(Box, { style: { position: "relative", display: "inline-block" }, children: [
+                              /* @__PURE__ */ jsx(
+                                Button,
                                 {
+                                  variant: openSortPickerUid === col.uid ? "secondary" : "tertiary",
                                   size: "S",
-                                  value: `${currentSort.field}:${currentSort.order}`,
-                                  onChange: (val) => {
-                                    const [f, o] = String(val).split(":");
-                                    handleCollectionSortChange(col.uid, f, o);
+                                  onClick: () => {
+                                    setOpenSortPickerUid(openSortPickerUid === col.uid ? null : col.uid);
+                                    setSortSearchTerm("");
+                                    if (openColumnPickerUid === col.uid) setOpenColumnPickerUid(null);
+                                  },
+                                  children: /* @__PURE__ */ jsxs(Flex, { gap: 1, alignItems: "center", children: [
+                                    /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", fontWeight: "bold", children: "Sort:" }),
+                                    /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "semiBold", children: getActiveSortLabel(currentSort) })
+                                  ] })
+                                }
+                              ),
+                              openSortPickerUid === col.uid && /* @__PURE__ */ jsxs(
+                                Box,
+                                {
+                                  style: {
+                                    position: "absolute",
+                                    top: "calc(100% + 6px)",
+                                    left: 0,
+                                    zIndex: 220,
+                                    width: 330,
+                                    maxHeight: 440,
+                                    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__ */ jsx(SingleSelectOption, { value: "createdAt:desc", children: "Created: Newest" }),
-                                    /* @__PURE__ */ jsx(SingleSelectOption, { value: "createdAt:asc", children: "Created: Oldest" }),
-                                    hasAttr && /* @__PURE__ */ jsxs(Fragment, { children: [
-                                      /* @__PURE__ */ jsxs(SingleSelectOption, { value: `${selectedAttribute}:asc`, children: [
-                                        selectedAttribute,
-                                        " (A → Z)"
-                                      ] }),
-                                      /* @__PURE__ */ jsxs(SingleSelectOption, { value: `${selectedAttribute}:desc`, children: [
-                                        selectedAttribute,
-                                        " (Z → A)"
-                                      ] })
-                                    ] }),
-                                    col.attributes.includes("name") && /* @__PURE__ */ jsxs(Fragment, { children: [
-                                      /* @__PURE__ */ jsx(SingleSelectOption, { value: "name:asc", children: "Name (A → Z)" }),
-                                      /* @__PURE__ */ jsx(SingleSelectOption, { value: "name:desc", children: "Name (Z → A)" })
+                                    /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", children: [
+                                      /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", children: "Sort by Column" }),
+                                      /* @__PURE__ */ jsx(
+                                        Button,
+                                        {
+                                          variant: "ghost",
+                                          size: "S",
+                                          onClick: () => setOpenSortPickerUid(null),
+                                          style: { padding: "2px 6px", height: "auto", minWidth: "unset" },
+                                          children: "✕"
+                                        }
+                                      )
                                     ] }),
-                                    col.attributes.includes("title") && /* @__PURE__ */ jsxs(Fragment, { children: [
-                                      /* @__PURE__ */ jsx(SingleSelectOption, { value: "title:asc", children: "Title (A → Z)" }),
-                                      /* @__PURE__ */ jsx(SingleSelectOption, { value: "title:desc", children: "Title (Z → A)" })
-                                    ] })
+                                    /* @__PURE__ */ jsx(
+                                      TextInput,
+                                      {
+                                        size: "S",
+                                        placeholder: "Search columns to sort...",
+                                        value: sortSearchTerm,
+                                        onChange: (e) => setSortSearchTerm(e.target.value)
+                                      }
+                                    ),
+                                    /* @__PURE__ */ jsx(
+                                      Box,
+                                      {
+                                        style: {
+                                          maxHeight: 320,
+                                          overflowY: "auto",
+                                          display: "flex",
+                                          flexDirection: "column",
+                                          gap: 4
+                                        },
+                                        children: getSortOptionsForCollection(col).filter((opt) => {
+                                          if (!sortSearchTerm.trim()) return true;
+                                          const term = sortSearchTerm.toLowerCase().trim();
+                                          return opt.label.toLowerCase().includes(term) || opt.field.toLowerCase().includes(term);
+                                        }).map((opt) => {
+                                          const isSelected = (currentSort.field === opt.field || currentSort.field === "updatedAt" && opt.field === "updated_at" || currentSort.field === "updated_at" && opt.field === "updatedAt" || currentSort.field === "createdAt" && opt.field === "created_at" || currentSort.field === "created_at" && opt.field === "createdAt") && currentSort.order === opt.order;
+                                          return /* @__PURE__ */ jsxs(
+                                            Box,
+                                            {
+                                              onClick: () => {
+                                                handleCollectionSortChange(col.uid, opt.field, opt.order);
+                                                setOpenSortPickerUid(null);
+                                                setSortSearchTerm("");
+                                              },
+                                              style: {
+                                                padding: "6px 10px",
+                                                borderRadius: 6,
+                                                cursor: "pointer",
+                                                background: isSelected ? "rgba(73, 69, 255, 0.12)" : "transparent",
+                                                border: isSelected ? "1px solid #4945ff" : "1px solid transparent",
+                                                display: "flex",
+                                                alignItems: "center",
+                                                justifyContent: "space-between",
+                                                transition: "background 0.15s ease"
+                                              },
+                                              onMouseEnter: (e) => {
+                                                if (!isSelected) e.currentTarget.style.background = "#f6f6f9";
+                                              },
+                                              onMouseLeave: (e) => {
+                                                if (!isSelected) e.currentTarget.style.background = "transparent";
+                                              },
+                                              children: [
+                                                /* @__PURE__ */ jsx(
+                                                  Typography,
+                                                  {
+                                                    variant: "omega",
+                                                    fontWeight: isSelected ? "bold" : "normal",
+                                                    textColor: isSelected ? "primary700" : "neutral800",
+                                                    children: opt.label
+                                                  }
+                                                ),
+                                                isSelected && /* @__PURE__ */ jsx(Badge, { size: "S", backgroundColor: "primary100", textColor: "primary700", children: "Active" })
+                                              ]
+                                            },
+                                            `${opt.field}:${opt.order}`
+                                          );
+                                        })
+                                      }
+                                    )
                                   ]
                                 }
-                              ) })
+                              )
                             ] }),
                             /* @__PURE__ */ jsxs(Box, { style: { position: "relative", display: "inline-block" }, children: [
                               /* @__PURE__ */ jsxs(
@@ -4561,6 +5124,7 @@ const BulkUpdater = () => {
                                   onClick: () => {
                                     setOpenColumnPickerUid(openColumnPickerUid === col.uid ? null : col.uid);
                                     setColumnSearchTerm("");
+                                    if (openSortPickerUid === col.uid) setOpenSortPickerUid(null);
                                   },
                                   children: [
                                     "Columns (",
@@ -5186,27 +5750,42 @@ const BulkUpdater = () => {
                     )
                   ] })
                 ] }),
-                /* @__PURE__ */ jsx(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", children: [
-                    /* @__PURE__ */ jsx(
-                      Checkbox,
-                      {
-                        checked: publishOnApproval,
-                        onCheckedChange: (checked) => setPublishOnApproval(Boolean(checked)),
-                        children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: "Auto-Publish after Update" })
-                      }
-                    ),
-                    /* @__PURE__ */ jsx(
-                      Badge,
-                      {
-                        backgroundColor: publishOnApproval ? "success100" : "warning100",
-                        textColor: publishOnApproval ? "success700" : "warning700",
-                        children: publishOnApproval ? "✓ LIVE PUBLISH" : "DRAFT ONLY"
-                      }
-                    )
+                /* @__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", children: [
+                      /* @__PURE__ */ jsx(
+                        Checkbox,
+                        {
+                          checked: publishOnApproval,
+                          onCheckedChange: (checked) => setPublishOnApproval(Boolean(checked)),
+                          children: /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", children: "Auto-Publish after Update" })
+                        }
+                      ),
+                      /* @__PURE__ */ jsx(
+                        Badge,
+                        {
+                          backgroundColor: publishOnApproval ? "success100" : "warning100",
+                          textColor: publishOnApproval ? "success700" : "warning700",
+                          children: publishOnApproval ? "✓ LIVE PUBLISH" : "DRAFT ONLY"
+                        }
+                      )
+                    ] }),
+                    /* @__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(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." })
-                ] }) }),
+                  publishOnApproval && selectedLifecycleStats.unreviewedCount > 0 && /* @__PURE__ */ jsx(Box, { marginTop: 3, padding: 3, background: "warning100", hasRadius: true, style: { border: "1px solid #f5c0b8" }, children: /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "flex-start", children: [
+                    /* @__PURE__ */ jsx(Typography, { variant: "pi", fontWeight: "bold", textColor: "warning700", children: "⚠️ Unreviewed Content Alert:" }),
+                    /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "warning700", children: [
+                      selectedLifecycleStats.unreviewedCount,
+                      " of ",
+                      totalSelectedCount,
+                      " selected record(s) contain unreviewed draft changes (",
+                      selectedLifecycleStats.draft,
+                      " Draft, ",
+                      selectedLifecycleStats.modified,
+                      " Modified). Publishing them live will push all unreviewed draft content across all fields to live visitors. You can select safe publishing (recommended) or provide explicit consent at review time."
+                    ] })
+                  ] }) })
+                ] }),
                 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: [
@@ -5392,6 +5971,12 @@ const BulkUpdater = () => {
                             children: batch.summary.publishOnApproval === false ? "DRAFT ONLY" : "AUTO-PUBLISH"
                           }
                         ),
+                        batch.summary.publishStrategy === "safe" && /* @__PURE__ */ jsx(Badge, { backgroundColor: "secondary100", textColor: "secondary700", children: "SAFE PUBLISH" }),
+                        batch.summary.publishStrategy === "all" && /* @__PURE__ */ jsx(Badge, { backgroundColor: "warning100", textColor: "warning700", children: "PUBLISH ALL (CONSENTED)" }),
+                        Boolean(batch.summary.unreviewedCount) && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "neutral150", textColor: "neutral700", children: [
+                          "Unreviewed: ",
+                          batch.summary.unreviewedCount
+                        ] }),
                         /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
                           "• ",
                           batch.summary.totalTargets,
@@ -5539,7 +6124,9 @@ const BulkUpdater = () => {
                             rec.skippedCount > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "warning100", textColor: "warning700", style: { marginLeft: 6 }, children: [
                               rec.skippedCount,
                               " skipped"
-                            ] })
+                            ] }),
+                            rec.publishStrategy === "safe" && /* @__PURE__ */ jsx(Badge, { backgroundColor: "secondary100", textColor: "secondary700", style: { marginLeft: 6 }, children: "Safe Publish" }),
+                            rec.publishStrategy === "all" && /* @__PURE__ */ jsx(Badge, { backgroundColor: "warning100", textColor: "warning700", style: { marginLeft: 6 }, children: "Publish All (Consented)" })
                           ] }),
                           /* @__PURE__ */ jsx(Td, { style: { minWidth: 120 }, children: rec.isRolledBack ? /* @__PURE__ */ jsxs(Box, { children: [
                             /* @__PURE__ */ jsx(Badge, { backgroundColor: "neutral200", textColor: "neutral700", children: "ROLLED BACK" }),
@@ -5758,6 +6345,31 @@ const BulkUpdater = () => {
                             ] })
                           ] })
                         ] }),
+                        /* @__PURE__ */ jsxs(Box, { marginBottom: 4, padding: 3, background: "neutral100", hasRadius: true, style: { border: "1px solid rgba(120, 120, 150, 0.15)" }, children: [
+                          /* @__PURE__ */ jsxs(Typography, { variant: "sigma", textColor: "neutral600", marginBottom: 2, display: "block", children: [
+                            "LIFECYCLE STATUS BREAKDOWN (",
+                            totalSelectedCount,
+                            " Selected)"
+                          ] }),
+                          /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", children: [
+                            /* @__PURE__ */ jsxs(Badge, { backgroundColor: "success100", textColor: "success700", children: [
+                              "✓ Published / Approved: ",
+                              selectedLifecycleStats.published
+                            ] }),
+                            selectedLifecycleStats.modified > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
+                              "📝 Modified (Unreviewed Revisions): ",
+                              selectedLifecycleStats.modified
+                            ] }),
+                            selectedLifecycleStats.draft > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "neutral200", textColor: "neutral800", children: [
+                              "📄 Draft (Never Published): ",
+                              selectedLifecycleStats.draft
+                            ] }),
+                            selectedLifecycleStats.pendingReview > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "warning100", textColor: "warning700", children: [
+                              "⏳ Pending Review: ",
+                              selectedLifecycleStats.pendingReview
+                            ] })
+                          ] })
+                        ] }),
                         /* @__PURE__ */ jsxs(Box, { marginBottom: 4, children: [
                           /* @__PURE__ */ jsx(Typography, { variant: "sigma", textColor: "neutral600", marginBottom: 2, display: "block", children: "COLLECTION BREAKDOWN" }),
                           /* @__PURE__ */ jsx(Flex, { direction: "column", gap: 1, children: Object.entries(getSelectedBreakdown()).map(([name, count]) => /* @__PURE__ */ jsxs(
@@ -5808,6 +6420,128 @@ const BulkUpdater = () => {
                             ] })
                           }
                         ),
+                        publishOnApproval && selectedLifecycleStats.unreviewedCount > 0 && /* @__PURE__ */ jsxs(
+                          Box,
+                          {
+                            padding: 4,
+                            background: "neutral100",
+                            hasRadius: true,
+                            marginBottom: 4,
+                            style: { border: "1px solid #d9d8ff" },
+                            children: [
+                              /* @__PURE__ */ jsx(Typography, { variant: "sigma", textColor: "neutral600", marginBottom: 3, display: "block", children: "PUBLISHING STRATEGY & GOVERNANCE CONSENT" }),
+                              /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 3, children: [
+                                /* @__PURE__ */ jsx(
+                                  Box,
+                                  {
+                                    padding: 3,
+                                    hasRadius: true,
+                                    style: {
+                                      border: publishStrategy === "safe" ? "2px solid #4945ff" : "1px solid #eaeaef",
+                                      backgroundColor: publishStrategy === "safe" ? "#f0f0ff" : "#ffffff",
+                                      cursor: "pointer"
+                                    },
+                                    onClick: () => {
+                                      setPublishStrategy("safe");
+                                      setUnreviewedConsent(false);
+                                    },
+                                    children: /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "flex-start", children: [
+                                      /* @__PURE__ */ jsx(
+                                        "input",
+                                        {
+                                          type: "radio",
+                                          id: "strategy-safe",
+                                          name: "publishStrategy",
+                                          checked: publishStrategy === "safe",
+                                          onChange: () => {
+                                            setPublishStrategy("safe");
+                                            setUnreviewedConsent(false);
+                                          },
+                                          style: { marginTop: 3 }
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsxs(Box, { children: [
+                                        /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", display: "block", children: "🛡️ Safe Publishing (Recommended)" }),
+                                        /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
+                                          "Only publish records that are already approved & live (",
+                                          selectedLifecycleStats.published,
+                                          " record",
+                                          selectedLifecycleStats.published === 1 ? "" : "s",
+                                          "). The ",
+                                          selectedLifecycleStats.unreviewedCount,
+                                          " unreviewed or draft record(s) will receive the bulk update in Draft mode without publishing unreviewed draft revisions to visitors."
+                                        ] })
+                                      ] })
+                                    ] })
+                                  }
+                                ),
+                                /* @__PURE__ */ jsx(
+                                  Box,
+                                  {
+                                    padding: 3,
+                                    hasRadius: true,
+                                    style: {
+                                      border: publishStrategy === "all" ? "2px solid #d02b20" : "1px solid #eaeaef",
+                                      backgroundColor: publishStrategy === "all" ? "#fff5f5" : "#ffffff",
+                                      cursor: "pointer"
+                                    },
+                                    onClick: () => setPublishStrategy("all"),
+                                    children: /* @__PURE__ */ jsxs(Flex, { gap: 2, alignItems: "flex-start", children: [
+                                      /* @__PURE__ */ jsx(
+                                        "input",
+                                        {
+                                          type: "radio",
+                                          id: "strategy-all",
+                                          name: "publishStrategy",
+                                          checked: publishStrategy === "all",
+                                          onChange: () => setPublishStrategy("all"),
+                                          style: { marginTop: 3 }
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsxs(Box, { children: [
+                                        /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "danger700", display: "block", children: "⚠️ Publish All Selected Records (Includes Unreviewed Drafts)" }),
+                                        /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
+                                          "Publish all ",
+                                          totalSelectedCount,
+                                          " records live to production immediately, pushing all pending unreviewed draft edits in the ",
+                                          selectedLifecycleStats.unreviewedCount,
+                                          " draft/modified record(s) live."
+                                        ] })
+                                      ] })
+                                    ] })
+                                  }
+                                ),
+                                publishStrategy === "all" && /* @__PURE__ */ jsx(
+                                  Box,
+                                  {
+                                    padding: 3,
+                                    background: "danger100",
+                                    hasRadius: true,
+                                    style: { border: "1px solid #f5c0b8" },
+                                    children: /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "flex-start", children: [
+                                      /* @__PURE__ */ jsx(
+                                        Checkbox,
+                                        {
+                                          name: "unreviewedConsent",
+                                          checked: unreviewedConsent,
+                                          onCheckedChange: (checked) => setUnreviewedConsent(Boolean(checked))
+                                        }
+                                      ),
+                                      /* @__PURE__ */ jsxs(Box, { style: { cursor: "pointer" }, onClick: () => setUnreviewedConsent(!unreviewedConsent), children: [
+                                        /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "danger700", display: "block", children: "Mandatory Risk Consent Required" }),
+                                        /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "danger700", children: [
+                                          "I understand and explicitly consent that ",
+                                          selectedLifecycleStats.unreviewedCount,
+                                          " record(s) with unreviewed draft revisions or saved draft states will be published live to production visitors."
+                                        ] })
+                                      ] })
+                                    ] })
+                                  }
+                                )
+                              ] })
+                            ]
+                          }
+                        ),
                         /* @__PURE__ */ jsx(Box, { marginBottom: 2, children: /* @__PURE__ */ jsx(
                           TextInput,
                           {
@@ -5834,54 +6568,61 @@ const BulkUpdater = () => {
                         zIndex: 20,
                         boxShadow: "0 -4px 16px rgba(0, 0, 0, 0.08)"
                       },
-                      children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", gap: 3, style: { width: "100%" }, children: [
-                        /* @__PURE__ */ jsx(Button, { variant: "tertiary", size: "M", onClick: () => setShowConfirmModal(false), children: "Cancel" }),
-                        /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", justifyContent: "flex-end", alignItems: "center", children: [
-                          /* @__PURE__ */ jsx(
-                            Button,
-                            {
-                              variant: executionWindow?.isBusinessHours ? "default" : "secondary",
-                              size: "M",
-                              onClick: () => executeBatchWithMode("maker_checker"),
-                              loading: updating,
-                              children: "Submit for Checker Approval"
-                            }
-                          ),
-                          executionWindow?.isBusinessHours ? /* @__PURE__ */ jsxs(Fragment, { children: [
-                            /* @__PURE__ */ jsxs(
+                      children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 2, style: { width: "100%" }, children: [
+                        publishOnApproval && selectedLifecycleStats.unreviewedCount > 0 && publishStrategy === "all" && !unreviewedConsent && /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "danger700", fontWeight: "bold", children: "⚠️ Explicit consent is required before publishing records with unreviewed draft revisions." }),
+                        /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", gap: 3, style: { width: "100%" }, children: [
+                          /* @__PURE__ */ jsx(Button, { variant: "tertiary", size: "M", onClick: () => setShowConfirmModal(false), children: "Cancel" }),
+                          /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", justifyContent: "flex-end", alignItems: "center", children: [
+                            /* @__PURE__ */ jsx(
                               Button,
                               {
-                                variant: "secondary",
+                                variant: executionWindow?.isBusinessHours ? "default" : "secondary",
                                 size: "M",
-                                onClick: () => executeBatchWithMode("queue_offpeak"),
+                                onClick: () => executeBatchWithMode("maker_checker"),
                                 loading: updating,
-                                children: [
-                                  "Queue for Off-Peak (",
-                                  executionWindow?.offPeakStartTime || "18:00",
-                                  ")"
-                                ]
+                                disabled: updating || publishOnApproval && selectedLifecycleStats.unreviewedCount > 0 && publishStrategy === "all" && !unreviewedConsent,
+                                children: "Submit for Checker Approval"
                               }
                             ),
-                            /* @__PURE__ */ jsx(
+                            executionWindow?.isBusinessHours ? /* @__PURE__ */ jsxs(Fragment, { children: [
+                              /* @__PURE__ */ jsxs(
+                                Button,
+                                {
+                                  variant: "secondary",
+                                  size: "M",
+                                  onClick: () => executeBatchWithMode("queue_offpeak"),
+                                  loading: updating,
+                                  disabled: updating || publishOnApproval && selectedLifecycleStats.unreviewedCount > 0 && publishStrategy === "all" && !unreviewedConsent,
+                                  children: [
+                                    "Queue for Off-Peak (",
+                                    executionWindow?.offPeakStartTime || "18:00",
+                                    ")"
+                                  ]
+                                }
+                              ),
+                              /* @__PURE__ */ jsx(
+                                Button,
+                                {
+                                  variant: "danger-light",
+                                  size: "S",
+                                  onClick: () => executeBatchWithMode("immediate", true),
+                                  loading: updating,
+                                  disabled: updating || publishOnApproval && selectedLifecycleStats.unreviewedCount > 0 && publishStrategy === "all" && !unreviewedConsent,
+                                  children: "Force Run Now"
+                                }
+                              )
+                            ] }) : /* @__PURE__ */ jsx(
                               Button,
                               {
-                                variant: "danger-light",
-                                size: "S",
-                                onClick: () => executeBatchWithMode("immediate", true),
+                                variant: "default",
+                                size: "M",
+                                onClick: () => executeBatchWithMode("immediate"),
                                 loading: updating,
-                                children: "Force Run Now"
+                                disabled: updating || publishOnApproval && selectedLifecycleStats.unreviewedCount > 0 && publishStrategy === "all" && !unreviewedConsent,
+                                children: "Confirm & Execute Now"
                               }
                             )
-                          ] }) : /* @__PURE__ */ jsx(
-                            Button,
-                            {
-                              variant: "default",
-                              size: "M",
-                              onClick: () => executeBatchWithMode("immediate"),
-                              loading: updating,
-                              children: "Confirm & Execute Now"
-                            }
-                          )
+                          ] })
                         ] })
                       ] })
                     }
@@ -5956,6 +6697,27 @@ const BulkUpdater = () => {
                         gap: 16
                       },
                       children: [
+                        /* @__PURE__ */ jsxs(Box, { padding: 3, background: "neutral100", hasRadius: true, style: { border: "1px solid #eaeaef" }, children: [
+                          /* @__PURE__ */ jsxs(Typography, { variant: "sigma", textColor: "neutral600", marginBottom: 2, display: "block", children: [
+                            "LIFECYCLE STATUS BREAKDOWN (",
+                            totalSelectedCount,
+                            " Selected)"
+                          ] }),
+                          /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", children: [
+                            /* @__PURE__ */ jsxs(Badge, { backgroundColor: "success100", textColor: "success700", children: [
+                              "✓ Published: ",
+                              selectedLifecycleStats.published
+                            ] }),
+                            selectedLifecycleStats.modified > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "primary100", textColor: "primary700", children: [
+                              "📝 Modified (Unreviewed Revisions): ",
+                              selectedLifecycleStats.modified
+                            ] }),
+                            selectedLifecycleStats.draft > 0 && /* @__PURE__ */ jsxs(Badge, { backgroundColor: "neutral200", textColor: "neutral800", children: [
+                              "📄 Draft (Never Published): ",
+                              selectedLifecycleStats.draft
+                            ] })
+                          ] })
+                        ] }),
                         /* @__PURE__ */ jsxs(Box, { padding: 4, background: "neutral100", hasRadius: true, style: { border: "1px solid #eaeaef" }, children: [
                           /* @__PURE__ */ jsx(Typography, { variant: "omega", fontWeight: "bold", children: "Collection Breakdown:" }),
                           /* @__PURE__ */ jsx(Box, { marginTop: 2, children: collections.filter(
@@ -5994,6 +6756,37 @@ const BulkUpdater = () => {
                             );
                           }) })
                         ] }),
+                        selectedLifecycleStats.unreviewedCount > 0 && /* @__PURE__ */ jsx(
+                          Box,
+                          {
+                            padding: 4,
+                            background: "danger100",
+                            hasRadius: true,
+                            style: { border: "1px solid #f5c0b8" },
+                            children: /* @__PURE__ */ jsxs(Flex, { gap: 3, alignItems: "flex-start", children: [
+                              /* @__PURE__ */ jsx(
+                                Checkbox,
+                                {
+                                  name: "publishConsent",
+                                  checked: publishConsent,
+                                  onCheckedChange: (checked) => setPublishConsent(Boolean(checked))
+                                }
+                              ),
+                              /* @__PURE__ */ jsxs(Box, { style: { cursor: "pointer" }, onClick: () => setPublishConsent(!publishConsent), children: [
+                                /* @__PURE__ */ jsx(Typography, { fontWeight: "bold", textColor: "danger700", display: "block", children: "Mandatory Risk Consent Required" }),
+                                /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "danger700", children: [
+                                  "I understand and explicitly consent that ",
+                                  selectedLifecycleStats.unreviewedCount,
+                                  " record(s) contain unreviewed draft changes (",
+                                  selectedLifecycleStats.draft,
+                                  " Draft, ",
+                                  selectedLifecycleStats.modified,
+                                  " Modified) and will be published live to production visitors."
+                                ] })
+                              ] })
+                            ] })
+                          }
+                        ),
                         executionWindow?.isBusinessHours && /* @__PURE__ */ jsxs(
                           Box,
                           {
@@ -6038,54 +6831,61 @@ const BulkUpdater = () => {
                         flexShrink: 0,
                         boxShadow: "0 -4px 16px rgba(0, 0, 0, 0.08)"
                       },
-                      children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", gap: 3, style: { width: "100%" }, children: [
-                        /* @__PURE__ */ jsx(Button, { variant: "tertiary", size: "M", onClick: () => setShowPublishConfirmModal(false), children: "Cancel" }),
-                        /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", justifyContent: "flex-end", alignItems: "center", children: [
-                          /* @__PURE__ */ jsx(
-                            Button,
-                            {
-                              variant: executionWindow?.isBusinessHours ? "default" : "secondary",
-                              size: "M",
-                              onClick: () => executeBatchPublish("maker_checker"),
-                              loading: publishing,
-                              children: "Submit for Checker Approval"
-                            }
-                          ),
-                          executionWindow?.isBusinessHours ? /* @__PURE__ */ jsxs(Fragment, { children: [
-                            /* @__PURE__ */ jsxs(
+                      children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 2, style: { width: "100%" }, children: [
+                        selectedLifecycleStats.unreviewedCount > 0 && !publishConsent && /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "danger700", fontWeight: "bold", children: "⚠️ Please check the mandatory consent box above to confirm publishing unreviewed draft records." }),
+                        /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", alignItems: "center", gap: 3, style: { width: "100%" }, children: [
+                          /* @__PURE__ */ jsx(Button, { variant: "tertiary", size: "M", onClick: () => setShowPublishConfirmModal(false), children: "Cancel" }),
+                          /* @__PURE__ */ jsxs(Flex, { gap: 2, wrap: "wrap", justifyContent: "flex-end", alignItems: "center", children: [
+                            /* @__PURE__ */ jsx(
                               Button,
                               {
-                                variant: "secondary",
+                                variant: executionWindow?.isBusinessHours ? "default" : "secondary",
                                 size: "M",
-                                onClick: () => executeBatchPublish("queue_offpeak"),
+                                onClick: () => executeBatchPublish("maker_checker"),
                                 loading: publishing,
-                                children: [
-                                  "Queue for Off-Peak (",
-                                  executionWindow?.offPeakStartTime || "18:00",
-                                  ")"
-                                ]
+                                disabled: publishing || selectedLifecycleStats.unreviewedCount > 0 && !publishConsent,
+                                children: "Submit for Checker Approval"
                               }
                             ),
-                            /* @__PURE__ */ jsx(
+                            executionWindow?.isBusinessHours ? /* @__PURE__ */ jsxs(Fragment, { children: [
+                              /* @__PURE__ */ jsxs(
+                                Button,
+                                {
+                                  variant: "secondary",
+                                  size: "M",
+                                  onClick: () => executeBatchPublish("queue_offpeak"),
+                                  loading: publishing,
+                                  disabled: publishing || selectedLifecycleStats.unreviewedCount > 0 && !publishConsent,
+                                  children: [
+                                    "Queue for Off-Peak (",
+                                    executionWindow?.offPeakStartTime || "18:00",
+                                    ")"
+                                  ]
+                                }
+                              ),
+                              /* @__PURE__ */ jsx(
+                                Button,
+                                {
+                                  variant: "danger-light",
+                                  size: "S",
+                                  onClick: () => executeBatchPublish("immediate", true),
+                                  loading: publishing,
+                                  disabled: publishing || selectedLifecycleStats.unreviewedCount > 0 && !publishConsent,
+                                  children: "Force Publish Now"
+                                }
+                              )
+                            ] }) : /* @__PURE__ */ jsx(
                               Button,
                               {
-                                variant: "danger-light",
-                                size: "S",
-                                onClick: () => executeBatchPublish("immediate", true),
+                                variant: "default",
+                                size: "M",
+                                onClick: () => executeBatchPublish("immediate"),
                                 loading: publishing,
-                                children: "Force Publish Now"
+                                disabled: publishing || selectedLifecycleStats.unreviewedCount > 0 && !publishConsent,
+                                children: "Confirm & Publish Now"
                               }
                             )
-                          ] }) : /* @__PURE__ */ jsx(
-                            Button,
-                            {
-                              variant: "default",
-                              size: "M",
-                              onClick: () => executeBatchPublish("immediate"),
-                              loading: publishing,
-                              children: "Confirm & Publish Now"
-                            }
-                          )
+                          ] })
                         ] })
                       ] })
                     }
@@ -6108,6 +6908,7 @@ const BulkUpdater = () => {
             previewData,
             attribute: selectedAttribute,
             publishOnApproval,
+            lifecycleStats: selectedLifecycleStats,
             targetValueDisplay: relationsMeta[selectedAttribute] ? selectedRelationDocId === "__clear__" ? "Clear / Unlink Relation" : relationOptions.find((o) => o.documentId === selectedRelationDocId)?.label || selectedRelationDocId || "(none)" : useRegex ? `Replace /${regexPattern}/g with "${attributeValue}"` : attributeValue
           }
         ),
@@ -6129,10 +6930,13 @@ export {
   BulkUpdater as default,
   formatComponentName,
   formatDisplayValue,
+  getActiveSortLabel,
   getAllNestedValues,
   getAvailableColumnsForCollection,
   getEntryLifecycleStatus,
   getNestedValue,
+  getPropertyValue,
+  getSortOptionsForCollection,
   parseDynamicZonePath
 };
-//# sourceMappingURL=BulkUpdater-CMkPdA9_.mjs.map
+//# sourceMappingURL=BulkUpdater-CHdA0546.mjs.map