@nkhang1902/strapi-plugin-export-import-clsx 1.5.4 → 1.5.5

package/package.json

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

package/server/controllers/export-controller.js

@@ -7,23 +7,12 @@ module.exports = ({ strapi }) => ({
         .service("export-service");
 
       if (format === "excel") {
-        const buffer = await exportService.exportData(
+        const {buffer, filename} = await exportService.exportData(
           "excel",
           contentType,
           filters,
           mode
         );
-
-        const filename = `${contentType?.split(".")[1]}-export-${new Date().toISOString().split("T")[0]}.xlsx`;
-
-        if (mode === "participant") {
-          const expName = await strapi.documents(contentType).findFirst({
-            select: ["name"],
-            filters
-          })
-          filename = `${expName?.name}-participant-export-${new Date().toISOString().split("T")[0]}.xlsx`;
-        }
-
         ctx.set(
           "Content-Type",
           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
@@ -32,24 +21,16 @@ module.exports = ({ strapi }) => ({
 
         ctx.body = buffer;
       } else {
-        const data = await exportService.exportData(
+        const {data, filename} = await exportService.exportData(
           "json",
           contentType,
           filters,
           mode
         );
-
-        const filename = `${
-          contentType?.replace("api::", "") || "strapi"
-        }-export-${new Date().toISOString().split("T")[0]}.json`;
-
         ctx.set("Content-Type", "application/json");
         ctx.set("Content-Disposition", `attachment; filename="${filename}"`);
 
-        ctx.body = JSON.stringify({
-          filename: filename,
-          data: data,
-        }, null, 2);
+        ctx.body = JSON.stringify(data, null, 2);
       }
     } catch (error) {
       strapi.log.error("Export error:", error);
@@ -64,7 +45,7 @@ module.exports = ({ strapi }) => ({
         .plugin("export-import-clsx")
         .service("export-service");
 
-      const buffer = await exportService.exportSingleEntry(contentType, id);
+      const {buffer, filename} = await exportService.exportSingleEntry(contentType, id);
 
       ctx.set(
         "Content-Type",
@@ -72,9 +53,7 @@ module.exports = ({ strapi }) => ({
       );
       ctx.set(
         "Content-Disposition",
-        `attachment; filename="entry-${id}-${
-          new Date().toISOString().split("T")[0]
-        }.xlsx"`
+        `attachment; filename="${filename}"`
       );
 
       ctx.body = buffer;

package/server/services/export-service.js

@@ -136,12 +136,12 @@ module.exports = ({ strapi }) => ({
     }
 
     if (format === "excel" && mode === "participant") {
-      return this.convertExperienceParticipantsToExcel(entries[0]);
+      return { buffer: this.convertExperienceParticipantsToExcel(entries[0]), filename: `${entries[0].name}-participants-export.xlsx` };
     } else if (format === "excel") {
-      return this.convertToExcel(exportData.data);
+      return { buffer: this.convertToExcel(exportData.data), filename: `${contentType.split(".")[1]}-export${new Date().toISOString().split("T")[0]}.xlsx` };
     }
 
-    return exportData;
+    return { data: exportData, filename: `${contentType.split(".")[1]}-export${new Date().toISOString().split("T")[0]}.json`};
   },
 
   getSearchableFields(contentTypeSchema) {