@nkhang1902/strapi-plugin-export-import-clsx 1.1.13 → 1.1.15

package/admin/src/components/ExportImportButtons/index.jsx

@@ -1,11 +1,22 @@
 import { useState, useRef } from "react";
-import { Button } from "@strapi/design-system";
+import {
+  ModalLayout,
+  ModalHeader,
+  ModalBody,
+  ModalFooter,
+  Typography,
+  Box,
+  Button,
+} from "@strapi/design-system";
 import { Download, Upload } from "@strapi/icons";
 import { useNotification } from "@strapi/strapi/admin";
 
 const ExportImportButtons = (props) => {
   const [isExporting, setIsExporting] = useState(false);
   const [isImporting, setIsImporting] = useState(false);
+  const [showErrorModal, setShowErrorModal] = useState(false);
+  const [importErrors, setImportErrors] = useState([]);
+
   const { toggleNotification } = useNotification();
 
   // Get current content type from props or URL
@@ -184,33 +195,21 @@ const ExportImportButtons = (props) => {
 
       if (response.ok) {
         const result = await response.json();
+        const created = result.summary?.created || result.result.created || 0;
+        const updated = result.summary?.updated || result.result.updated || 0;
 
-        // Create appropriate notification based on results
-        const created = result.summary?.created || result.result.created;
-        const updated = result.summary?.updated || result.result.updated;
-        const errors = result.result.errors?.length || 0;
-
-        const total = created + updated;
+        const errorList = result.result?.errors || [];
 
-        if (errors > 0) {
-          toggleNotification({
-            type: "warning",
-            message: `Import completed with ${errors} error(s). Processed ${total} entries (${created} created, ${updated} updated)`,
-          });
+        if (errorList.length > 0) {
+          setImportErrors(errorList);
+          setShowErrorModal(true);
         } else if (total > 0) {
           toggleNotification({
             type: "success",
             message: `Import completed successfully! Processed ${total} entries (${created} created, ${updated} updated)`,
           });
-        } else {
-          toggleNotification({
-            type: "info",
-            message: "Import completed - no changes were made",
-          });
+          window.location.reload();
         }
-
-        // Reload the page to show new data
-        window.location.reload();
       } else {
         const error = await response.json();
         throw new Error(error.error || "Import failed");
@@ -239,6 +238,7 @@ const ExportImportButtons = (props) => {
   const fileInputRef = useRef(null);
 
   return (
+    <>
     <div
       style={{
         display: "flex",
@@ -276,6 +276,39 @@ const ExportImportButtons = (props) => {
         Import
       </Button>
     </div>
+    {showErrorModal && (
+      <ModalLayout
+        onClose={() => setShowErrorModal(false)}
+        labelledBy="import-errors-title"
+      >
+        <ModalHeader>
+          <Typography id="import-errors-title" fontWeight="bold">
+            Import Errors ({importErrors.length})
+          </Typography>
+        </ModalHeader>
+
+        <ModalBody>
+          <Box padding={4}>
+            {importErrors.map((err, index) => (
+              <Box key={index} paddingBottom={2}>
+                <Typography textColor="danger600">
+                  {index + 1}. {err}
+                </Typography>
+              </Box>
+            ))}
+          </Box>
+        </ModalBody>
+
+        <ModalFooter
+          endActions={
+            <Button onClick={() => setShowErrorModal(false)}>
+              Close
+            </Button>
+          }
+        />
+      </ModalLayout>
+    )}
+    </>
   );
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nkhang1902/strapi-plugin-export-import-clsx",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "A powerful Strapi plugin for exporting and importing data with Excel support and advanced filtering",
   "main": "./strapi-server.js",
   "scripts": {

package/server/services/export-service.js

@@ -287,7 +287,10 @@ module.exports = ({ strapi }) => ({
               for (const key in obj) {
                 const value = obj[key];
 
-                // Skip system keys
+                if (key === "documentId" && ["corporate", "investor", "vip-guest"].includes(contentType.split(".")[1])) {
+                  result["liveLink"] = `${process.env.PREVIEW_URL}/download/live-link?participantId=${value}`;
+                  continue
+                }
                 if (SYSTEM_KEYS.includes(key)) continue;
                 if (customFields.includes(key)) continue;
                 if ([...skipFields, "wishlist", "availableSlot"].includes(key))
@@ -295,7 +298,7 @@ module.exports = ({ strapi }) => ({
 
                 if (componentFields.includes(key)) {
                   for (const subKey in value) {
-                    if (subKey === "id") continue;
+                    if (["id", "createdAt", "updatedAt", "lastUpdate", "passcode"]) continue;
                     result[`${key}_${subKey}`] = value[subKey];
                   }
                   continue;
@@ -349,13 +352,6 @@ module.exports = ({ strapi }) => ({
           }
           return result;
         }
-
-        if (["corporate", "investor", "vip-guest"].includes(contentType.split(".")[1])) {
-          cleanedEntries.forEach((entry) => {
-            entry["liveLink"] = `${process.env.PREVIEW_URL}/download/live-link?participantId=${entry["documentId"]}`;
-          });
-        }
-
         const cleanedFlat = cleanedEntries.map((entry) =>
           flattenForXLSX(entry)
         );