strapi-plugin-bulk-updater 1.4.6 → 1.4.9

package/dist/server/index.js

@@ -668,7 +668,7 @@ const csvController = ({ strapi }) => ({
   },
   async importCsv(ctx) {
     try {
-      const { uid, csvText, mode, publish } = ctx.request.body;
+      const { uid, csvText, mode, publish, publishStrategy, unreviewedConsent } = ctx.request.body;
       if (!uid) {
         ctx.status = 400;
         ctx.body = { success: false, error: "Target collection UID is required." };
@@ -683,6 +683,8 @@ const csvController = ({ strapi }) => ({
       const result = await csvService2.importCsv(uid, csvText, {
         mode: mode === "update" ? "update" : mode === "create_or_override" ? "create_or_override" : "auto",
         publish: publish !== false,
+        publishStrategy: publishStrategy === "all" ? "all" : "safe",
+        unreviewedConsent: Boolean(unreviewedConsent),
         user: ctx.state.user
       });
       ctx.body = result;
@@ -693,7 +695,7 @@ const csvController = ({ strapi }) => ({
   },
   async importChunk(ctx) {
     try {
-      const { uid, rows, batchId, isFirstChunk, isLastChunk, startRowNumber, mode, publish } = ctx.request.body;
+      const { uid, rows, batchId, isFirstChunk, isLastChunk, startRowNumber, mode, publish, publishStrategy, unreviewedConsent } = ctx.request.body;
       if (!uid) {
         ctx.status = 400;
         ctx.body = { success: false, error: "Target collection UID is required." };
@@ -712,6 +714,8 @@ const csvController = ({ strapi }) => ({
         startRowNumber: typeof startRowNumber === "number" ? startRowNumber : void 0,
         mode: mode === "update" ? "update" : mode === "create_or_override" ? "create_or_override" : "auto",
         publish: publish !== false,
+        publishStrategy: publishStrategy === "all" ? "all" : "safe",
+        unreviewedConsent: Boolean(unreviewedConsent),
         user: ctx.state.user
       });
       ctx.body = result;
@@ -745,7 +749,7 @@ const csvController = ({ strapi }) => ({
   },
   async submitBatch(ctx) {
     try {
-      const { uid, rows, executionMode, makerNotes, forceImmediate, mode, publish } = ctx.request.body;
+      const { uid, rows, executionMode, makerNotes, forceImmediate, mode, publish, publishStrategy, unreviewedConsent, unreviewedCount } = ctx.request.body;
       if (!uid) {
         ctx.status = 400;
         ctx.body = { success: false, error: "Target collection UID is required." };
@@ -763,6 +767,9 @@ const csvController = ({ strapi }) => ({
         forceImmediate: Boolean(forceImmediate),
         mode: mode === "update" ? "update" : mode === "create_or_override" ? "create_or_override" : "auto",
         publish: publish !== false,
+        publishStrategy: publishStrategy === "all" ? "all" : "safe",
+        unreviewedConsent: Boolean(unreviewedConsent),
+        unreviewedCount: typeof unreviewedCount === "number" ? unreviewedCount : 0,
         user: ctx.state.user
       });
       ctx.body = result;
@@ -920,6 +927,60 @@ const modelsCache = /* @__PURE__ */ new Map();
 const MAX_QUERY_CACHE_SIZE = 500;
 const CACHE_TTL_MS = 60 * 1e3;
 let staticSchemaCache = null;
+function formatEntryRecord(entry) {
+  if (!entry || typeof entry !== "object") return entry;
+  const formatted = {
+    id: entry.id,
+    documentId: entry.documentId,
+    ...entry
+  };
+  if (entry.updatedAt !== void 0 && formatted.updated_at === void 0) {
+    formatted.updated_at = entry.updatedAt;
+  }
+  if (entry.updated_at !== void 0 && formatted.updatedAt === void 0) {
+    formatted.updatedAt = entry.updated_at;
+  }
+  if (entry.createdAt !== void 0 && formatted.created_at === void 0) {
+    formatted.created_at = entry.createdAt;
+  }
+  if (entry.created_at !== void 0 && formatted.createdAt === void 0) {
+    formatted.createdAt = entry.created_at;
+  }
+  if (entry.publishedAt !== void 0 && formatted.published_at === void 0) {
+    formatted.published_at = entry.publishedAt;
+  }
+  if (entry.published_at !== void 0 && formatted.publishedAt === void 0) {
+    formatted.publishedAt = entry.published_at;
+  }
+  return formatted;
+}
+function resolveContentTypeField(contentType, field) {
+  if (!field) return null;
+  const attrs = contentType?.attributes || {};
+  if (attrs[field]) return field;
+  if (field === "updated_at" || field === "updatedAt") {
+    return attrs["updated_at"] ? "updated_at" : "updatedAt";
+  }
+  if (field === "created_at" || field === "createdAt") {
+    return attrs["created_at"] ? "created_at" : "createdAt";
+  }
+  if (field === "published_at" || field === "publishedAt") {
+    return attrs["published_at"] ? "published_at" : "publishedAt";
+  }
+  if (field === "id" || field === "documentId") {
+    return field;
+  }
+  const camel = field.replace(/_([a-z0-9])/g, (_, l) => l.toUpperCase());
+  if (attrs[camel]) return camel;
+  const snake = field.replace(/([A-Z])/g, "_$1").toLowerCase();
+  if (attrs[snake]) return snake;
+  const lower = field.toLowerCase().replace(/_/g, "");
+  const matched = Object.keys(attrs).find(
+    (k) => k.toLowerCase().replace(/_/g, "") === lower
+  );
+  if (matched) return matched;
+  return null;
+}
 function buildDeepPopulate$1(attributes, allComponents, depth = 0) {
   if (depth > 5) return void 0;
   const populate = {};
@@ -1352,7 +1413,9 @@ async function executeBatchInternal(strapi, {
   selectedCollections = [],
   isRegex = false,
   regexPattern = "",
-  publishOnApproval = true
+  publishOnApproval = true,
+  publishStrategy = "safe",
+  unreviewedConsent = false
 }, currentUser, existingBatchId) {
   if (!attribute) {
     throw new Error("Attribute name is required.");
@@ -1405,6 +1468,8 @@ async function executeBatchInternal(strapi, {
     failedCount: 0,
     isLive: false,
     publishOnApproval: Boolean(publishOnApproval),
+    publishStrategy,
+    unreviewedConsent,
     results: []
   };
   batchJobsMap.set(batchId, jobState);
@@ -1478,7 +1543,9 @@ async function executeBatchInternal(strapi, {
               }
             });
             const isDraftAndPublishComp = Boolean(contentType?.options?.draftAndPublish);
-            if (publishOnApproval && isDraftAndPublishComp) {
+            const isApprovedComp = isDraftAndPublishComp && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
+            const shouldPublishComp = isDraftAndPublishComp && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedComp);
+            if (shouldPublishComp) {
               try {
                 await strapi.documents(target.uid).publish({
                   documentId: target.documentId
@@ -1492,7 +1559,7 @@ async function executeBatchInternal(strapi, {
               uid: target.uid,
               documentId: target.documentId,
               userId: currentUser?.id,
-              statusOverride: publishOnApproval && isDraftAndPublishComp ? "published" : void 0
+              statusOverride: shouldPublishComp ? "published" : isDraftAndPublishComp ? "draft" : void 0
             });
             const dzDiffs = isRootDz && affectedMatches.length > 0 ? affectedMatches.map((m) => ({
               index: m.index,
@@ -1575,7 +1642,9 @@ async function executeBatchInternal(strapi, {
               }
             });
             const isDraftAndPublishRel = Boolean(contentType?.options?.draftAndPublish);
-            if (publishOnApproval && isDraftAndPublishRel) {
+            const isApprovedRel = isDraftAndPublishRel && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
+            const shouldPublishRel = isDraftAndPublishRel && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedRel);
+            if (shouldPublishRel) {
               try {
                 await strapi.documents(target.uid).publish({
                   documentId: target.documentId
@@ -1592,7 +1661,7 @@ async function executeBatchInternal(strapi, {
               uid: target.uid,
               documentId: target.documentId,
               userId: currentUser?.id,
-              statusOverride: publishOnApproval && isDraftAndPublishRel ? "published" : void 0
+              statusOverride: shouldPublishRel ? "published" : isDraftAndPublishRel ? "draft" : void 0
             });
             return {
               uid: target.uid,
@@ -1618,7 +1687,9 @@ async function executeBatchInternal(strapi, {
             }
           });
           const isDraftAndPublishScalar = Boolean(contentType?.options?.draftAndPublish);
-          if (publishOnApproval && isDraftAndPublishScalar) {
+          const isApprovedScalar = isDraftAndPublishScalar && Boolean(currentEntry?.publishedAt) && currentEntry?.status !== "modified";
+          const shouldPublishScalar = isDraftAndPublishScalar && Boolean(publishOnApproval) && (publishStrategy === "all" ? true : isApprovedScalar);
+          if (shouldPublishScalar) {
             try {
               await strapi.documents(target.uid).publish({
                 documentId: target.documentId
@@ -1631,7 +1702,7 @@ async function executeBatchInternal(strapi, {
             uid: target.uid,
             documentId: target.documentId,
             userId: currentUser?.id,
-            statusOverride: publishOnApproval && isDraftAndPublishScalar ? "published" : void 0
+            statusOverride: shouldPublishScalar ? "published" : isDraftAndPublishScalar ? "draft" : void 0
           });
           return {
             uid: target.uid,
@@ -1718,7 +1789,9 @@ async function executeBatchInternal(strapi, {
     updatedCount,
     skippedCount,
     totalTargets: targetsMap.size,
-    publishOnApproval
+    publishOnApproval,
+    publishStrategy,
+    unreviewedConsent
   };
   await strapi.plugin("bulk-updater").service("audit").recordBatch(
     batchSummary,
@@ -1741,7 +1814,8 @@ async function executeBatchInternal(strapi, {
 }
 async function executePublishBatchInternal(strapi, {
   selectedEntries = [],
-  selectedCollections = []
+  selectedCollections = [],
+  unreviewedConsent = false
 }, currentUser, existingBatchId) {
   const targetsMap = /* @__PURE__ */ new Map();
   for (const colUid of selectedCollections) {
@@ -1786,6 +1860,7 @@ async function executePublishBatchInternal(strapi, {
     failedCount: 0,
     isLive: false,
     publishOnApproval: true,
+    unreviewedConsent,
     results: []
   };
   batchJobsMap.set(batchId, jobState);
@@ -1883,7 +1958,8 @@ async function executePublishBatchInternal(strapi, {
     updatedCount: publishedCount,
     skippedCount,
     totalTargets: targetsMap.size,
-    publishOnApproval: true
+    publishOnApproval: true,
+    unreviewedConsent
   };
   await strapi.plugin("bulk-updater").service("audit").recordBatch(
     batchSummary,
@@ -2142,11 +2218,7 @@ const bulkUpdaterService = ({ strapi }) => {
               entries = [];
               totalCount = 0;
             }
-            const formattedEntries = (entries || []).map((entry) => ({
-              id: entry.id,
-              documentId: entry.documentId,
-              ...entry
-            }));
+            const formattedEntries = (entries || []).map(formatEntryRecord);
             modelsCache.set(uid, {
               signature,
               totalCount,
@@ -2235,21 +2307,26 @@ const bulkUpdaterService = ({ strapi }) => {
       let isNestedAttr = false;
       let isRootDz = false;
       let parts = [];
+      let resolvedFilterAttr = targetFilterAttr;
       if (targetFilterAttr) {
-        const parsed = parseDynamicZonePath(targetFilterAttr);
-        if (parsed.rootKey && contentType.attributes?.[parsed.rootKey]?.type === "dynamiczone") {
-          isRootDz = true;
+        const resolvedField = resolveContentTypeField(contentType, targetFilterAttr);
+        if (resolvedField) {
+          resolvedFilterAttr = resolvedField;
           colHasAttribute = true;
-          isNestedAttr = true;
-          parts = parsed.cleanPath.split(".");
-        } else if (targetFilterAttr.includes(".") || targetFilterAttr.includes("[")) {
-          isNestedAttr = isDeepComponentField(contentType, strapi.components, targetFilterAttr);
-          if (isNestedAttr) {
+        } else {
+          const parsed = parseDynamicZonePath(targetFilterAttr);
+          if (parsed.rootKey && contentType.attributes?.[parsed.rootKey]?.type === "dynamiczone") {
+            isRootDz = true;
             colHasAttribute = true;
+            isNestedAttr = true;
             parts = parsed.cleanPath.split(".");
+          } else if (targetFilterAttr.includes(".") || targetFilterAttr.includes("[")) {
+            isNestedAttr = isDeepComponentField(contentType, strapi.components, targetFilterAttr);
+            if (isNestedAttr) {
+              colHasAttribute = true;
+              parts = parsed.cleanPath.split(".");
+            }
           }
-        } else if (attrs[targetFilterAttr]) {
-          colHasAttribute = true;
         }
       }
       const normOp = (filterOperator || "").toLowerCase().replace(/_/g, "");
@@ -2273,9 +2350,44 @@ const bulkUpdaterService = ({ strapi }) => {
         }
         let condition = void 0;
         const q = (filterQuery || "").trim();
-        const targetAttrSchema = isNestedAttr ? getLeafAttributeSchema(contentType, strapi.components, targetFilterAttr) : attrs[targetFilterAttr];
+        const targetAttrSchema = isNestedAttr ? getLeafAttributeSchema(contentType, strapi.components, targetFilterAttr) : attrs[resolvedFilterAttr];
+        const isRelation = targetAttrSchema?.type === "relation";
         const isStringLike = ["string", "text", "email", "richtext", "uid"].includes(targetAttrSchema?.type);
-        if (normOp === "empty") {
+        if (isRelation) {
+          const targetUid = targetAttrSchema?.target;
+          const targetContentType = targetUid ? strapi.contentTypes[targetUid] : void 0;
+          const targetAttrs = targetContentType?.attributes || {};
+          const targetStringAttrs = Object.keys(targetAttrs).filter(
+            (k) => ["string", "text", "email", "uid"].includes(targetAttrs[k]?.type)
+          );
+          if (normOp === "empty") {
+            condition = { documentId: { $null: true } };
+          } else if (normOp === "notempty") {
+            condition = { documentId: { $notNull: true } };
+          } else if (q !== "") {
+            const orConditions = [];
+            targetStringAttrs.slice(0, 5).forEach((k) => {
+              if (normOp === "equals") {
+                orConditions.push({ [k]: { $eqi: q } });
+              } else if (normOp === "startswith") {
+                orConditions.push({ [k]: { $startsWithi: q } });
+              } else if (normOp === "endswith") {
+                orConditions.push({ [k]: { $endsWithi: q } });
+              } else if (normOp === "notequals") {
+                orConditions.push({ [k]: { $ne: q } });
+              } else if (normOp === "notcontains") {
+                orConditions.push({ [k]: { $notContainsi: q } });
+              } else {
+                orConditions.push({ [k]: { $containsi: q } });
+              }
+            });
+            orConditions.push({ documentId: { $eq: q } });
+            if (/^\d+$/.test(q)) {
+              orConditions.push({ id: { $eq: Number(q) } });
+            }
+            condition = orConditions.length === 1 ? orConditions[0] : { $or: orConditions };
+          }
+        } else if (normOp === "empty") {
           condition = isStringLike ? { $or: [{ $null: true }, { $eq: "" }] } : { $null: true };
         } else if (normOp === "notempty") {
           condition = isStringLike ? { $and: [{ $notNull: true }, { $ne: "" }] } : { $notNull: true };
@@ -2311,13 +2423,13 @@ const bulkUpdaterService = ({ strapi }) => {
           } else {
             if (normOp === "empty" && isStringLike) {
               filters.$or = [
-                { [targetFilterAttr]: { $null: true } },
-                { [targetFilterAttr]: { $eq: "" } }
+                { [resolvedFilterAttr]: { $null: true } },
+                { [resolvedFilterAttr]: { $eq: "" } }
               ];
             } else if (normOp === "notempty" && isStringLike) {
-              filters[targetFilterAttr] = { $notNull: true, $ne: "" };
+              filters[resolvedFilterAttr] = { $notNull: true, $ne: "" };
             } else {
-              filters[targetFilterAttr] = condition;
+              filters[resolvedFilterAttr] = condition;
             }
           }
         }
@@ -2359,7 +2471,7 @@ const bulkUpdaterService = ({ strapi }) => {
           displayName: contentType.info?.displayName || uid,
           isSingleType: true,
           draftAndPublish: Boolean(contentType.options?.draftAndPublish),
-          entries: singleDoc ? [singleDoc] : [],
+          entries: singleDoc ? [formatEntryRecord(singleDoc)] : [],
           pagination: {
             page: 1,
             pageSize: 1,
@@ -2376,8 +2488,13 @@ const bulkUpdaterService = ({ strapi }) => {
           } else {
             sortClause["createdAt"] = "desc";
           }
-        } else if (sortField && contentType.attributes?.[sortField]) {
-          sortClause[sortField] = sortOrder;
+        } else if (sortField) {
+          const resolvedField = resolveContentTypeField(contentType, sortField);
+          if (resolvedField) {
+            sortClause[resolvedField] = sortOrder;
+          } else {
+            sortClause["createdAt"] = "desc";
+          }
         } else {
           sortClause["createdAt"] = "desc";
         }
@@ -2395,14 +2512,30 @@ const bulkUpdaterService = ({ strapi }) => {
           const passesDzFilter = (entry) => {
             const matches = getAllNestedValues(entry, targetFilterAttr);
             if (normOp === "empty") {
-              return matches.length === 0 || matches.every((m) => m.value === void 0 || m.value === null || String(m.value).trim() === "");
+              return matches.length === 0 || matches.every((m) => {
+                const v = m.value;
+                if (v === void 0 || v === null) return true;
+                if (Array.isArray(v)) return v.length === 0;
+                if (typeof v === "object") return Object.keys(v).length === 0;
+                return String(v).trim() === "";
+              });
             }
             if (normOp === "notempty") {
-              return matches.some((m) => m.value !== void 0 && m.value !== null && String(m.value).trim() !== "");
+              return matches.some((m) => {
+                const v = m.value;
+                if (v === void 0 || v === null) return false;
+                if (Array.isArray(v)) return v.length > 0;
+                if (typeof v === "object") return Object.keys(v).length > 0;
+                return String(v).trim() !== "";
+              });
             }
-            return matches.some((m) => {
-              if (m.value === void 0 || m.value === null) return false;
-              const valStr = String(m.value).toLowerCase();
+            const testSingleValue = (v) => {
+              if (v === void 0 || v === null) return false;
+              if (Array.isArray(v)) return v.some(testSingleValue);
+              if (typeof v === "object") {
+                return testSingleValue(v.name) || testSingleValue(v.title) || testSingleValue(v.email) || testSingleValue(v.username) || testSingleValue(v.documentId) || testSingleValue(v.id) || testSingleValue(v.slug);
+              }
+              const valStr = String(v).toLowerCase();
               switch (normOp) {
                 case "equals":
                   return valStr === qVal;
@@ -2419,7 +2552,8 @@ const bulkUpdaterService = ({ strapi }) => {
                 default:
                   return true;
               }
-            });
+            };
+            return matches.some((m) => testSingleValue(m.value));
           };
           const matchedEntries = (rawEntries || []).filter(passesDzFilter);
           const totalEntries = matchedEntries.length;
@@ -2429,11 +2563,7 @@ const bulkUpdaterService = ({ strapi }) => {
             displayName: contentType.info?.displayName || uid,
             isSingleType: false,
             draftAndPublish: Boolean(contentType.options?.draftAndPublish),
-            entries: paginatedEntries.map((entry) => ({
-              id: entry.id,
-              documentId: entry.documentId,
-              ...entry
-            })),
+            entries: paginatedEntries.map(formatEntryRecord),
             pagination: {
               page: currentPage,
               pageSize: limit,
@@ -2462,11 +2592,7 @@ const bulkUpdaterService = ({ strapi }) => {
             displayName: contentType.info?.displayName || uid,
             isSingleType: false,
             draftAndPublish: Boolean(contentType.options?.draftAndPublish),
-            entries: (entries || []).map((entry) => ({
-              id: entry.id,
-              documentId: entry.documentId,
-              ...entry
-            })),
+            entries: (entries || []).map(formatEntryRecord),
             pagination: {
               page: currentPage,
               pageSize: limit,
@@ -2810,7 +2936,10 @@ const bulkUpdaterService = ({ strapi }) => {
       executionMode = "immediate",
       makerNotes = "",
       forceImmediate = false,
-      publishOnApproval = true
+      publishOnApproval = true,
+      publishStrategy = "safe",
+      unreviewedConsent = false,
+      unreviewedCount = 0
     }, currentUser) {
       if (!attribute) {
         throw new Error("Attribute name is required.");
@@ -2833,13 +2962,16 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent, unreviewedCount },
           summary: {
             attribute,
             value,
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval
+            publishOnApproval,
+            publishStrategy,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "pending_approval",
           executionMode: "maker_checker",
@@ -2861,6 +2993,9 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: Boolean(publishOnApproval),
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -2889,13 +3024,16 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent, unreviewedCount },
           summary: {
             attribute,
             value,
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval
+            publishOnApproval,
+            publishStrategy,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -2919,6 +3057,9 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: Boolean(publishOnApproval),
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -2948,13 +3089,16 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+          payload: { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent, unreviewedCount },
           summary: {
             attribute,
             value,
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval
+            publishOnApproval,
+            publishStrategy,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -2978,6 +3122,9 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: Boolean(publishOnApproval),
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount,
           policyMessage,
           makerNotes: "Automatically queued due to peak business hours restriction.",
           results: []
@@ -2994,7 +3141,7 @@ const bulkUpdaterService = ({ strapi }) => {
       }
       return await executeBatchInternal(
         strapi,
-        { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval },
+        { attribute, value, selectedEntries, selectedCollections, isRegex, regexPattern, publishOnApproval, publishStrategy, unreviewedConsent },
         currentUser
       );
     },
@@ -3006,7 +3153,9 @@ const bulkUpdaterService = ({ strapi }) => {
       selectedCollections = [],
       executionMode = "immediate",
       makerNotes = "",
-      forceImmediate = false
+      forceImmediate = false,
+      unreviewedConsent = false,
+      unreviewedCount = 0
     }, currentUser) {
       const executionConfig = getExecutionWindowConfig(strapi);
       const { isBusinessHours, policyMessage } = checkBusinessHours(executionConfig);
@@ -3026,13 +3175,15 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true },
+          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true, unreviewedConsent, unreviewedCount },
           summary: {
             attribute: "(publish)",
             value: "published",
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval: true
+            publishOnApproval: true,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "pending_approval",
           executionMode: "maker_checker",
@@ -3054,6 +3205,8 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: true,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -3082,13 +3235,15 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true },
+          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true, unreviewedConsent, unreviewedCount },
           summary: {
             attribute: "(publish)",
             value: "published",
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval: true
+            publishOnApproval: true,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -3112,6 +3267,8 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: true,
+          unreviewedConsent,
+          unreviewedCount,
           makerNotes,
           results: []
         });
@@ -3141,13 +3298,15 @@ const bulkUpdaterService = ({ strapi }) => {
             lastname: currentUser.lastname,
             username: currentUser.username
           } : { email: "admin@system.local" },
-          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true },
+          payload: { action: "publish", attribute: "(publish)", value: "published", selectedEntries, selectedCollections, publishOnApproval: true, unreviewedConsent, unreviewedCount },
           summary: {
             attribute: "(publish)",
             value: "published",
             totalTargets: summary.totalTargets,
             collectionBreakdown: summary.collectionBreakdown,
-            publishOnApproval: true
+            publishOnApproval: true,
+            unreviewedConsent,
+            unreviewedCount
           },
           status: "queued_offpeak",
           executionMode: "queue_offpeak",
@@ -3171,6 +3330,8 @@ const bulkUpdaterService = ({ strapi }) => {
           failedCount: 0,
           isLive: false,
           publishOnApproval: true,
+          unreviewedConsent,
+          unreviewedCount,
           policyMessage,
           makerNotes: "Automatically queued due to peak business hours restriction.",
           results: []
@@ -3187,7 +3348,7 @@ const bulkUpdaterService = ({ strapi }) => {
       }
       return await executePublishBatchInternal(
         strapi,
-        { selectedEntries, selectedCollections },
+        { selectedEntries, selectedCollections, unreviewedConsent },
         currentUser
       );
     },
@@ -3721,7 +3882,9 @@ const auditService = ({ strapi }) => ({
         value: batchSummary.value,
         updatedCount: batchSummary.updatedCount,
         skippedCount: batchSummary.skippedCount,
-        totalTargets: batchSummary.totalTargets
+        totalTargets: batchSummary.totalTargets,
+        publishStrategy: batchSummary.publishStrategy,
+        unreviewedConsent: batchSummary.unreviewedConsent
       },
       user
     );
@@ -3744,6 +3907,9 @@ const auditService = ({ strapi }) => ({
           updatedCount: batchSummary.updatedCount,
           skippedCount: batchSummary.skippedCount,
           totalTargets: batchSummary.totalTargets,
+          publishOnApproval: batchSummary.publishOnApproval,
+          publishStrategy: batchSummary.publishStrategy,
+          unreviewedConsent: batchSummary.unreviewedConsent,
           diffs: results,
           isRolledBack: false,
           rolledBackAt: null,
@@ -4740,7 +4906,23 @@ function getNestedExportValue(entry, path) {
         return String(item);
       }).filter(Boolean).join("; ");
     }
-    current = current[part];
+    if (current && typeof current === "object") {
+      if (current[part] !== void 0) {
+        current = current[part];
+      } else {
+        const camel = part.replace(/_([a-z0-9])/g, (_, l) => l.toUpperCase());
+        const snake = part.replace(/([A-Z])/g, "_$1").toLowerCase();
+        if (current[camel] !== void 0) {
+          current = current[camel];
+        } else if (current[snake] !== void 0) {
+          current = current[snake];
+        } else {
+          current = void 0;
+        }
+      }
+    } else {
+      current = void 0;
+    }
   }
   if (current === null || current === void 0) return "";
   if (typeof current === "object" && current.url) {
@@ -4810,7 +4992,8 @@ async function findExistingDocument(strapi, uid, targetDocId, docLocale) {
 }
 async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
   const attrs = ct.attributes || {};
-  const { mode = "auto", publish = true, user } = options;
+  const { mode = "auto", publish = true, publishStrategy = "safe", user } = options;
+  const isDraftAndPublish = Boolean(ct.options?.draftAndPublish);
   const stats = {
     total: rows.length,
     created: 0,
@@ -5025,7 +5208,9 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
         };
         if (rowLocale) updateArgs.locale = rowLocale;
         await strapi.documents(uid).update(updateArgs);
-        if (publish && ct.options?.draftAndPublish) {
+        const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
+        const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+        if (shouldPublish) {
           try {
             const pubArgs = { documentId: resolvedDocId };
             if (rowLocale) pubArgs.locale = rowLocale;
@@ -5039,7 +5224,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             uid,
             documentId: resolvedDocId,
             userId: user?.id,
-            statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
+            statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
           });
         } catch {
         }
@@ -5078,7 +5263,9 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           };
           if (rowLocale) updateArgs.locale = rowLocale;
           await strapi.documents(uid).update(updateArgs);
-          if (publish && ct.options?.draftAndPublish) {
+          const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
+          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+          if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
               if (rowLocale) pubArgs.locale = rowLocale;
@@ -5092,7 +5279,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
               uid,
               documentId: resolvedDocId,
               userId: user?.id,
-              statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
+              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
             });
           } catch {
           }
@@ -5118,7 +5305,8 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
         if (rowLocale) createArgs.locale = rowLocale;
         const created = await strapi.documents(uid).create(createArgs);
         const newDocId = created?.documentId || docId;
-        if (publish && ct.options?.draftAndPublish && newDocId) {
+        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : false);
+        if (shouldPublishNew && newDocId) {
           try {
             const pubArgs = { documentId: newDocId };
             if (rowLocale) pubArgs.locale = rowLocale;
@@ -5132,7 +5320,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             uid,
             documentId: newDocId,
             userId: user?.id,
-            statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
+            statusOverride: shouldPublishNew ? "published" : isDraftAndPublish ? "draft" : void 0
           });
         } catch {
         }
@@ -5172,7 +5360,9 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
           };
           if (rowLocale) updateArgs.locale = rowLocale;
           await strapi.documents(uid).update(updateArgs);
-          if (publish && ct.options?.draftAndPublish) {
+          const isApproved = isDraftAndPublish && Boolean(existing?.publishedAt) && existing?.status !== "modified";
+          const shouldPublish = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : isApproved);
+          if (shouldPublish) {
             try {
               const pubArgs = { documentId: resolvedDocId };
               if (rowLocale) pubArgs.locale = rowLocale;
@@ -5186,7 +5376,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
               uid,
               documentId: resolvedDocId,
               userId: user?.id,
-              statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
+              statusOverride: shouldPublish ? "published" : isDraftAndPublish ? "draft" : void 0
             });
           } catch {
           }
@@ -5212,7 +5402,8 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
         if (rowLocale) createArgs.locale = rowLocale;
         const created = await strapi.documents(uid).create(createArgs);
         const newDocId = created?.documentId || docId;
-        if (publish && ct.options?.draftAndPublish && newDocId) {
+        const shouldPublishNew = isDraftAndPublish && Boolean(publish) && (publishStrategy === "all" ? true : false);
+        if (shouldPublishNew && newDocId) {
           try {
             const pubArgs = { documentId: newDocId };
             if (rowLocale) pubArgs.locale = rowLocale;
@@ -5226,7 +5417,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
             uid,
             documentId: newDocId,
             userId: user?.id,
-            statusOverride: publish && ct.options?.draftAndPublish ? "published" : void 0
+            statusOverride: shouldPublishNew ? "published" : isDraftAndPublish ? "draft" : void 0
           });
         } catch {
         }
@@ -5258,7 +5449,7 @@ async function processCsvRows(strapi, ct, uid, rows, startRowNumber, options) {
   }
   return stats;
 }
-async function recordCsvAuditLog(strapi, ct, uid, batchId, stats, user) {
+async function recordCsvAuditLog(strapi, ct, uid, batchId, stats, user, publishOnApproval, publishStrategy, unreviewedConsent) {
   if (stats.updated === 0 && stats.created === 0) return;
   try {
     const auditService2 = strapi.plugin("bulk-updater").service("audit");
@@ -5302,7 +5493,14 @@ async function recordCsvAuditLog(strapi, ct, uid, batchId, stats, user) {
       firstname: userName || "Admin"
     };
     if (typeof auditService2.recordBatch === "function") {
-      await auditService2.recordBatch(batchSummary, stats.diffs, userObj);
+      await auditService2.recordBatch(
+        batchSummary,
+        stats.diffs,
+        userObj,
+        publishOnApproval,
+        publishStrategy,
+        unreviewedConsent
+      );
     } else if (typeof auditService2.logOperation === "function") {
       await auditService2.logOperation({
         ...batchSummary,
@@ -5629,7 +5827,9 @@ const csvService = ({ strapi }) => ({
         skipped: 0,
         newWithoutDocId: 0,
         errors: [],
-        diffs: []
+        diffs: [],
+        publishStrategy: options.publishStrategy,
+        unreviewedConsent: options.unreviewedConsent
       };
       csvImportSessions.set(batchId, session);
     }
@@ -5643,7 +5843,17 @@ const csvService = ({ strapi }) => ({
     session.errors.push(...chunkStats.errors);
     session.diffs.push(...chunkStats.diffs);
     if (options.isLastChunk) {
-      await recordCsvAuditLog(strapi, ct, uid, batchId, session, options.user);
+      await recordCsvAuditLog(
+        strapi,
+        ct,
+        uid,
+        batchId,
+        session,
+        options.user,
+        options.publish !== false,
+        session.publishStrategy || options.publishStrategy,
+        session.unreviewedConsent ?? options.unreviewedConsent
+      );
       try {
         const bulkService = strapi.plugin("bulk-updater").service("bulkUpdater");
         if (bulkService && bulkService.invalidateCollectionCache) {
@@ -5697,7 +5907,17 @@ const csvService = ({ strapi }) => ({
       }
     } catch {
     }
-    await recordCsvAuditLog(strapi, ct, uid, batchId, stats, options.user);
+    await recordCsvAuditLog(
+      strapi,
+      ct,
+      uid,
+      batchId,
+      stats,
+      options.user,
+      options.publish !== false,
+      options.publishStrategy,
+      options.unreviewedConsent
+    );
     return {
       success: true,
       batchId,
@@ -5717,7 +5937,17 @@ const csvService = ({ strapi }) => ({
       ...options,
       user: effectiveUser
     });
-    await recordCsvAuditLog(strapi, ct, uid, batchId, stats, effectiveUser);
+    await recordCsvAuditLog(
+      strapi,
+      ct,
+      uid,
+      batchId,
+      stats,
+      effectiveUser,
+      options.publish !== false,
+      options.publishStrategy,
+      options.unreviewedConsent
+    );
     try {
       const bulkService = strapi.plugin("bulk-updater").service("bulkUpdater");
       if (bulkService && bulkService.invalidateCollectionCache) {
@@ -5755,6 +5985,15 @@ const csvService = ({ strapi }) => ({
     let validRows = 0;
     let estimatedUpdates = 0;
     let estimatedCreates = 0;
+    const isDraftAndPublish = Boolean(ct.options?.draftAndPublish);
+    const lifecycleStats = {
+      isDraftAndPublish,
+      totalChecked: 0,
+      published: 0,
+      modified: 0,
+      draft: 0,
+      unreviewedCount: 0
+    };
     const errors = [];
     const warnings = [];
     for (let i = 0; i < rows.length; i++) {
@@ -5767,6 +6006,19 @@ const csvService = ({ strapi }) => ({
       if (docId) {
         existing = await findExistingDocument(strapi, uid, docId, rowLocale);
       }
+      if (existing && isDraftAndPublish) {
+        lifecycleStats.totalChecked++;
+        const isApproved = Boolean(existing.publishedAt) && existing.status !== "modified";
+        if (isApproved) {
+          lifecycleStats.published++;
+        } else if (existing.status === "modified") {
+          lifecycleStats.modified++;
+          lifecycleStats.unreviewedCount++;
+        } else {
+          lifecycleStats.draft++;
+          lifecycleStats.unreviewedCount++;
+        }
+      }
       if (mode === "update") {
         if (!docId) {
           errors.push({
@@ -5885,6 +6137,7 @@ const csvService = ({ strapi }) => ({
       validRows,
       estimatedUpdates,
       estimatedCreates,
+      lifecycleStats,
       hasErrors: errors.length > 0,
       hasWarnings: warnings.length > 0,
       errors: errors.slice(0, 100),
@@ -5910,6 +6163,9 @@ const csvService = ({ strapi }) => ({
       forceImmediate = false,
       mode = "auto",
       publish = true,
+      publishStrategy = "safe",
+      unreviewedConsent = false,
+      unreviewedCount = 0,
       user
     } = options;
     const executionConfig = getExecutionWindowConfig(strapi);
@@ -5934,22 +6190,33 @@ const csvService = ({ strapi }) => ({
           options: {
             mode,
             publish,
+            publishStrategy,
+            unreviewedConsent,
             user
           },
           attribute: `CSV Import: ${collectionDisplayName}`,
           value: `${rows.length} rows (${mode} mode)`,
-          publishOnApproval: publish
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
         },
         summary: {
           attribute: `CSV Import: ${collectionDisplayName}`,
           value: `${rows.length} rows (${mode} mode)`,
           totalTargets: rows.length,
           collectionBreakdown: { [collectionDisplayName]: rows.length },
-          publishOnApproval: publish
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
         },
         status: "pending_approval",
         executionMode: "maker_checker",
-        makerNotes
+        makerNotes,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount
       };
       registerPendingBatch(batch, {
         id: batchId,
@@ -5966,6 +6233,9 @@ const csvService = ({ strapi }) => ({
         failedCount: 0,
         isLive: false,
         publishOnApproval: publish,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount,
         makerNotes,
         results: []
       });
@@ -5997,23 +6267,34 @@ const csvService = ({ strapi }) => ({
           options: {
             mode,
             publish,
+            publishStrategy,
+            unreviewedConsent,
             user
           },
           attribute: `CSV Import: ${collectionDisplayName}`,
           value: `${rows.length} rows (${mode} mode)`,
-          publishOnApproval: publish
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
         },
         summary: {
           attribute: `CSV Import: ${collectionDisplayName}`,
           value: `${rows.length} rows (${mode} mode)`,
           totalTargets: rows.length,
           collectionBreakdown: { [collectionDisplayName]: rows.length },
-          publishOnApproval: publish
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
         },
         status: "queued_offpeak",
         executionMode: "queue_offpeak",
         scheduledFor: executionConfig.offPeakStartTime,
-        makerNotes
+        makerNotes,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount
       };
       registerPendingBatch(batch, {
         id: batchId,
@@ -6031,6 +6312,9 @@ const csvService = ({ strapi }) => ({
         failedCount: 0,
         isLive: false,
         publishOnApproval: publish,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount,
         makerNotes,
         results: []
       });
@@ -6063,23 +6347,34 @@ const csvService = ({ strapi }) => ({
           options: {
             mode,
             publish,
+            publishStrategy,
+            unreviewedConsent,
             user
           },
           attribute: `CSV Import: ${collectionDisplayName}`,
           value: `${rows.length} rows (${mode} mode)`,
-          publishOnApproval: publish
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
         },
         summary: {
           attribute: `CSV Import: ${collectionDisplayName}`,
           value: `${rows.length} rows (${mode} mode)`,
           totalTargets: rows.length,
           collectionBreakdown: { [collectionDisplayName]: rows.length },
-          publishOnApproval: publish
+          publishOnApproval: publish,
+          publishStrategy,
+          unreviewedConsent,
+          unreviewedCount
         },
         status: "queued_offpeak",
         executionMode: "queue_offpeak",
         scheduledFor: executionConfig.offPeakStartTime,
-        makerNotes: "Automatically queued due to peak business hours restriction."
+        makerNotes: "Automatically queued due to peak business hours restriction.",
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount
       };
       registerPendingBatch(batch, {
         id: batchId,
@@ -6097,6 +6392,9 @@ const csvService = ({ strapi }) => ({
         failedCount: 0,
         isLive: false,
         publishOnApproval: publish,
+        publishStrategy,
+        unreviewedConsent,
+        unreviewedCount,
         policyMessage,
         makerNotes: "Automatically queued due to peak business hours restriction.",
         results: []