strapi-plugin-bulk-updater 1.5.8 → 1.5.9

package/dist/_chunks/{BulkUpdater-ezjrkUaf.js → BulkUpdater-C0uR_ORS.js}

@@ -140,12 +140,99 @@ function extractDocId(row) {
   }
   return "";
 }
+function getEntryLifecycleStatus(entry, col, pendingBatches = []) {
+  const isPendingApproval = pendingBatches.some((b) => {
+    if (b.status !== "pending_approval") return false;
+    const targets = b.payload?.selectedEntries || [];
+    return targets.some((t) => entry.documentId && t.documentId === entry.documentId || String(t.documentId) === String(entry.id));
+  });
+  if (isPendingApproval) {
+    return {
+      status: "pending_review",
+      label: "Pending Review",
+      badgeColor: "warning100",
+      textColor: "warning700"
+    };
+  }
+  if (col && col.draftAndPublish === false) {
+    return {
+      status: "published",
+      label: "Published",
+      badgeColor: "success100",
+      textColor: "success700"
+    };
+  }
+  if (entry.status === "modified") {
+    return {
+      status: "modified",
+      label: "Modified",
+      badgeColor: "primary100",
+      textColor: "primary700"
+    };
+  }
+  if (entry.status === "draft") {
+    return {
+      status: "draft",
+      label: "Draft",
+      badgeColor: "neutral150",
+      textColor: "neutral700"
+    };
+  }
+  if (entry.status === "published") {
+    return {
+      status: "published",
+      label: "Published",
+      badgeColor: "success100",
+      textColor: "success700"
+    };
+  }
+  if (entry.status === "unknown") {
+    return {
+      status: "unknown",
+      label: "Unknown",
+      badgeColor: "neutral200",
+      textColor: "neutral600"
+    };
+  }
+  if (!entry.documentId && !entry.id && !entry.slug) {
+    return {
+      status: "unknown",
+      label: "Unknown",
+      badgeColor: "neutral200",
+      textColor: "neutral600"
+    };
+  }
+  if (entry.publishedAt) {
+    if (entry.updatedAt && new Date(entry.updatedAt).getTime() > new Date(entry.publishedAt).getTime()) {
+      return {
+        status: "modified",
+        label: "Modified",
+        badgeColor: "primary100",
+        textColor: "primary700"
+      };
+    }
+    return {
+      status: "published",
+      label: "Published",
+      badgeColor: "success100",
+      textColor: "success700"
+    };
+  }
+  return {
+    status: "draft",
+    label: "Draft",
+    badgeColor: "neutral150",
+    textColor: "neutral700"
+  };
+}
 function CsvManagerTab() {
   const { get, post } = admin.useFetchClient();
   const { toggleNotification } = admin.useNotification();
   const [collections, setCollections] = React.useState([]);
   const [loadingCollections, setLoadingCollections] = React.useState(true);
   const [selectedUid, setSelectedUid] = React.useState("");
+  const [collectionEntries, setCollectionEntries] = React.useState([]);
+  const [pendingBatches, setPendingBatches] = React.useState([]);
   const [exportLimit, setExportLimit] = React.useState(0);
   const [exportOnlyViolations, setExportOnlyViolations] = React.useState(false);
   const [rules, setRules] = React.useState([]);
@@ -174,17 +261,25 @@ function CsvManagerTab() {
   const fetchInitialData = async () => {
     try {
       setLoadingCollections(true);
-      const [modelsRes, rulesRes] = await Promise.all([
+      const [modelsRes, rulesRes, batchesRes] = await Promise.all([
         get("/bulk-updater/models"),
-        get("/bulk-updater/validation-rules")
+        get("/bulk-updater/validation-rules"),
+        get("/bulk-updater/pending-batches").catch(() => ({ data: { batches: [] } }))
       ]);
       if (modelsRes.data?.executionWindow) {
         setExecutionWindow(modelsRes.data.executionWindow);
       }
+      if (batchesRes.data?.batches) {
+        setPendingBatches(batchesRes.data.batches);
+      }
+      let loadedCollections = [];
       if (modelsRes.data?.collections) {
-        setCollections(modelsRes.data.collections);
-        if (modelsRes.data.collections.length > 0) {
-          setSelectedUid(modelsRes.data.collections[0].uid);
+        loadedCollections = modelsRes.data.collections;
+        setCollections(loadedCollections);
+        if (loadedCollections.length > 0) {
+          const firstUid = loadedCollections[0].uid;
+          setSelectedUid(firstUid);
+          fetchAndEnrichEntries(firstUid, loadedCollections, batchesRes.data?.batches || []);
         }
       }
       if (rulesRes.data?.rules) {
@@ -203,6 +298,67 @@ function CsvManagerTab() {
       setLoadingCollections(false);
     }
   };
+  const fetchAndEnrichEntries = async (colUid, cols = collections, batches = pendingBatches) => {
+    if (!colUid) return [];
+    try {
+      const res = await get(`/bulk-updater/collections/${colUid}/entries?page=1&pageSize=500`);
+      if (res.data && (res.data.success || res.data.entries !== void 0)) {
+        const fetchedEntries = res.data.entries || [];
+        const col = (cols || []).find((c) => c.uid === colUid) || null;
+        const enrichedEntries = fetchedEntries.map((entry) => {
+          if (!entry.status) {
+            const lifecycle = getEntryLifecycleStatus(entry, col, batches);
+            return {
+              ...entry,
+              status: lifecycle.status,
+              publishedAt: entry.publishedAt ?? (lifecycle.status === "published" ? entry.updatedAt || null : null)
+            };
+          }
+          return entry;
+        });
+        setCollectionEntries(enrichedEntries);
+        return enrichedEntries;
+      }
+    } catch (err) {
+      if (ValidationRulesTab.isAbortError(err)) return [];
+    }
+    return [];
+  };
+  const enrichCsvRowsWithLifecycle = (rows, knownEntries = collectionEntries) => {
+    if (!rows || rows.length === 0) return rows;
+    const entryByDocId = /* @__PURE__ */ new Map();
+    for (const e of knownEntries) {
+      if (e.documentId) entryByDocId.set(String(e.documentId), e);
+      if (e.id) entryByDocId.set(String(e.id), e);
+    }
+    return rows.map((row) => {
+      const docId = extractDocId(row);
+      const matched = docId ? entryByDocId.get(docId) : void 0;
+      const existingStatus = row.status || row.Status;
+      const existingPubAt = row.publishedAt || row.published_at;
+      let status = existingStatus;
+      let publishedAt = existingPubAt;
+      if (!status && matched?.status) {
+        status = matched.status;
+      }
+      if (!publishedAt && matched?.publishedAt) {
+        publishedAt = matched.publishedAt;
+      }
+      if (status || publishedAt) {
+        return {
+          ...row,
+          ...status ? { status } : {},
+          ...publishedAt ? { publishedAt } : {}
+        };
+      }
+      return row;
+    });
+  };
+  React.useEffect(() => {
+    if (selectedUid) {
+      fetchAndEnrichEntries(selectedUid);
+    }
+  }, [selectedUid]);
   const handleDownloadTemplate = async () => {
     if (!selectedUid) return;
     try {
@@ -225,6 +381,7 @@ function CsvManagerTab() {
   const handleExportCollection = async () => {
     if (!selectedUid) return;
     try {
+      await fetchAndEnrichEntries(selectedUid);
       const res = await get(`/bulk-updater/csv/export/${selectedUid}?limit=${exportLimit}`);
       const csvStr = res.data?.csvContent || (typeof res.data === "string" ? res.data : "");
       const filename = res.data?.filename || `${selectedUid.split(".").pop()}_export.csv`;
@@ -291,7 +448,8 @@ function CsvManagerTab() {
       setCsvRawText(text);
       try {
         const records = parseCsv(text);
-        setAllParsedRecords(records);
+        const enriched = enrichCsvRowsWithLifecycle(records, collectionEntries);
+        setAllParsedRecords(enriched);
         setPreviewPage(1);
       } catch (err) {
         setAllParsedRecords([]);
@@ -301,7 +459,12 @@ function CsvManagerTab() {
   };
   const handleExecuteImport = async () => {
     if (!selectedUid || allParsedRecords.length === 0) return;
-    const totalRows = allParsedRecords.length;
+    let currentEntries = collectionEntries;
+    if (currentEntries.length === 0) {
+      currentEntries = await fetchAndEnrichEntries(selectedUid);
+    }
+    const enrichedRecords = enrichCsvRowsWithLifecycle(allParsedRecords, currentEntries);
+    const totalRows = enrichedRecords.length;
     const CHUNK_SIZE = 100;
     const totalChunks = Math.ceil(totalRows / CHUNK_SIZE);
     const batchId = `csv_batch_${Date.now()}_${Math.random().toString(36).substring(2, 7)}`;
@@ -327,7 +490,7 @@ function CsvManagerTab() {
       for (let chunkIdx = 0; chunkIdx < totalChunks; chunkIdx++) {
         const startIdx = chunkIdx * CHUNK_SIZE;
         const endIdx = Math.min(startIdx + CHUNK_SIZE, totalRows);
-        const chunkRows = allParsedRecords.slice(startIdx, endIdx);
+        const chunkRows = enrichedRecords.slice(startIdx, endIdx);
         const isFirst = chunkIdx === 0;
         const isLast = chunkIdx === totalChunks - 1;
         const startRowNumber = startIdx + 2;
@@ -395,9 +558,14 @@ function CsvManagerTab() {
     if (!selectedUid || allParsedRecords.length === 0) return;
     try {
       setPreflightLoading(true);
+      let currentEntries = collectionEntries;
+      if (currentEntries.length === 0) {
+        currentEntries = await fetchAndEnrichEntries(selectedUid);
+      }
+      const enrichedRecords = enrichCsvRowsWithLifecycle(allParsedRecords, currentEntries);
       const res = await post("/bulk-updater/csv/validate-preflight", {
         uid: selectedUid,
-        rows: allParsedRecords,
+        rows: enrichedRecords,
         mode: importMode
       });
       if (res.data && res.data.success) {
@@ -438,9 +606,14 @@ function CsvManagerTab() {
     }
     try {
       setSubmittingBatch(true);
+      let currentEntries = collectionEntries;
+      if (currentEntries.length === 0) {
+        currentEntries = await fetchAndEnrichEntries(selectedUid);
+      }
+      const enrichedRecords = enrichCsvRowsWithLifecycle(allParsedRecords, currentEntries);
       const res = await post("/bulk-updater/csv/submit-batch", {
         uid: selectedUid,
-        rows: allParsedRecords,
+        rows: enrichedRecords,
         executionMode,
         makerNotes: makerNotesInput,
         forceImmediate,
@@ -2857,91 +3030,6 @@ const CheckerReviewModal = ({
     }
   );
 };
-function getEntryLifecycleStatus(entry, col, pendingBatches = []) {
-  const isPendingApproval = pendingBatches.some((b) => {
-    if (b.status !== "pending_approval") return false;
-    const targets = b.payload?.selectedEntries || [];
-    return targets.some((t) => entry.documentId && t.documentId === entry.documentId || String(t.documentId) === String(entry.id));
-  });
-  if (isPendingApproval) {
-    return {
-      status: "pending_review",
-      label: "Pending Review",
-      badgeColor: "warning100",
-      textColor: "warning700"
-    };
-  }
-  if (col && col.draftAndPublish === false) {
-    return {
-      status: "published",
-      label: "Published",
-      badgeColor: "success100",
-      textColor: "success700"
-    };
-  }
-  if (entry.status === "modified") {
-    return {
-      status: "modified",
-      label: "Modified",
-      badgeColor: "primary100",
-      textColor: "primary700"
-    };
-  }
-  if (entry.status === "draft") {
-    return {
-      status: "draft",
-      label: "Draft",
-      badgeColor: "neutral150",
-      textColor: "neutral700"
-    };
-  }
-  if (entry.status === "published") {
-    return {
-      status: "published",
-      label: "Published",
-      badgeColor: "success100",
-      textColor: "success700"
-    };
-  }
-  if (entry.status === "unknown") {
-    return {
-      status: "unknown",
-      label: "Unknown",
-      badgeColor: "neutral200",
-      textColor: "neutral600"
-    };
-  }
-  if (!entry.documentId && !entry.id && !entry.slug) {
-    return {
-      status: "unknown",
-      label: "Unknown",
-      badgeColor: "neutral200",
-      textColor: "neutral600"
-    };
-  }
-  if (entry.publishedAt) {
-    if (entry.updatedAt && new Date(entry.updatedAt).getTime() > new Date(entry.publishedAt).getTime()) {
-      return {
-        status: "modified",
-        label: "Modified",
-        badgeColor: "primary100",
-        textColor: "primary700"
-      };
-    }
-    return {
-      status: "published",
-      label: "Published",
-      badgeColor: "success100",
-      textColor: "success700"
-    };
-  }
-  return {
-    status: "draft",
-    label: "Draft",
-    badgeColor: "neutral150",
-    textColor: "neutral700"
-  };
-}
 function parseDynamicZonePath(path) {
   if (!path) return { cleanPath: "", rootKey: "", subPath: "" };
   const bracketMatch = path.match(/^([^.[]+)\[([^\]]+)\]\.(.+)$/);
@@ -7535,4 +7623,4 @@ exports.getNestedValue = getNestedValue;
 exports.getPropertyValue = getPropertyValue;
 exports.getSortOptionsForCollection = getSortOptionsForCollection;
 exports.parseDynamicZonePath = parseDynamicZonePath;
-//# sourceMappingURL=BulkUpdater-ezjrkUaf.js.map
+//# sourceMappingURL=BulkUpdater-C0uR_ORS.js.map