strapi-plugin-copy-any-component 1.0.4 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-copy-any-component",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "A powerful Strapi plugin that allows you to copy and reorder components (sections) between pages using an intuitive drag-and-drop interface. Works with any content type and dynamic zone - no code required!",
   "keywords": [
     "strapi",
@@ -21,6 +21,7 @@
   },
   "main": "./strapi-server.js",
   "exports": {
+    "./package.json": "./package.json",
     "./strapi-admin": "./strapi-admin.js",
     "./strapi-server": "./strapi-server.js"
   },
@@ -44,9 +45,9 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "@strapi/strapi": ">=5.0.0",
-    "@strapi/design-system": ">=2.0.0",
-    "@strapi/icons": ">=2.0.0",
+    "@strapi/strapi": "^5.0.0",
+    "@strapi/design-system": "^2.0.0-rc.1 || ^2.0.0",
+    "@strapi/icons": "^2.0.0-rc.1 || ^2.0.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

package/strapi-server.js

@@ -207,17 +207,38 @@ const controller = ({ strapi }) => ({
       const contentType = pluginConfig.contentType || 'api::page.page';
       const dynamicZoneField = pluginConfig.dynamicZoneField || 'sections';
       
-      const pages = await strapi.entityService.findMany(contentType, {
-        populate: [dynamicZoneField],
-      });
+      // Content type'ın kind'ını kontrol et
+      const contentTypeModel = strapi.contentTypes[contentType];
+      const isSingleType = contentTypeModel?.kind === 'singleType';
+      
+      let pages;
+      if (isSingleType) {
+        // SingleType için findOne kullan
+        try {
+          const page = await strapi.entityService.findOne(contentType, {
+            populate: [dynamicZoneField],
+          });
+          pages = page ? [page] : [];
+        } catch (error) {
+          // Eğer singleType henüz oluşturulmamışsa boş array döndür
+          pages = [];
+        }
+      } else {
+        // CollectionType için findMany kullan
+        pages = await strapi.entityService.findMany(contentType, {
+          populate: [dynamicZoneField],
+        });
+      }
+      
       const formattedPages = pages.map((page) => ({
         ...page,
         documentId: page.documentId || page.id,
       }));
       ctx.body = { data: formattedPages };
     } catch (error) {
+      strapi.log.error("Error in getPages:", error);
       ctx.status = 500;
-      ctx.body = { error: error.message };
+      ctx.body = { error: error.message || "Unknown error" };
     }
   },
 
@@ -229,30 +250,49 @@ const controller = ({ strapi }) => ({
     const contentType = pluginConfig.contentType || 'api::page.page';
     const dynamicZoneField = pluginConfig.dynamicZoneField || 'sections';
     
+    // Content type'ın kind'ını kontrol et
+    const contentTypeModel = strapi.contentTypes[contentType];
+    const isSingleType = contentTypeModel?.kind === 'singleType';
+    
     let page;
-    const numericId = parseInt(pageId);
-    if (!isNaN(numericId)) {
-      try {
-        page = await strapi.entityService.findOne(contentType, numericId, {
-          populate: [dynamicZoneField],
-        });
-      } catch (error) {
-        // Try with documentId
-      }
-    }
     
-    if (!page) {
+    if (isSingleType) {
+      // SingleType için direkt findOne kullan (ID gerekmez)
       try {
-        const pages = await strapi.entityService.findMany(contentType, {
-          filters: { documentId: pageId },
+        page = await strapi.entityService.findOne(contentType, {
           populate: [dynamicZoneField],
         });
-        page = pages[0];
-      } catch (err) {
+      } catch (error) {
         ctx.status = 404;
         ctx.body = { error: "Page not found: " + pageId, data: null };
         return;
       }
+    } else {
+      // CollectionType için documentId ile bul
+      const numericId = parseInt(pageId);
+      if (!isNaN(numericId)) {
+        try {
+          page = await strapi.entityService.findOne(contentType, numericId, {
+            populate: [dynamicZoneField],
+          });
+        } catch (error) {
+          // Try with documentId
+        }
+      }
+      
+      if (!page) {
+        try {
+          const pages = await strapi.entityService.findMany(contentType, {
+            filters: { documentId: pageId },
+            populate: [dynamicZoneField],
+          });
+          page = pages[0];
+        } catch (err) {
+          ctx.status = 404;
+          ctx.body = { error: "Page not found: " + pageId, data: null };
+          return;
+        }
+      }
     }
     
     if (!page) {
@@ -307,7 +347,23 @@ const controller = ({ strapi }) => ({
     const contentType = pluginConfig.contentType || 'api::page.page';
     const dynamicZoneField = pluginConfig.dynamicZoneField || 'sections';
     
+    // Content type'ın kind'ını kontrol et
+    const contentTypeModel = strapi.contentTypes[contentType];
+    const isSingleType = contentTypeModel?.kind === 'singleType';
+    
     const findPage = async (id) => {
+      if (isSingleType) {
+        // SingleType için direkt findOne kullan
+        try {
+          return await strapi.entityService.findOne(contentType, {
+            populate: [dynamicZoneField],
+          });
+        } catch (error) {
+          return null;
+        }
+      }
+      
+      // CollectionType için documentId ile bul
       const numericId = parseInt(id);
       if (!isNaN(numericId)) {
         try {
@@ -436,7 +492,23 @@ const controller = ({ strapi }) => ({
     const contentType = pluginConfig.contentType || 'api::page.page';
     const dynamicZoneField = pluginConfig.dynamicZoneField || 'sections';
     
+    // Content type'ın kind'ını kontrol et
+    const contentTypeModel = strapi.contentTypes[contentType];
+    const isSingleType = contentTypeModel?.kind === 'singleType';
+    
     const findPage = async (id) => {
+      if (isSingleType) {
+        // SingleType için direkt findOne kullan
+        try {
+          return await strapi.entityService.findOne(contentType, {
+            populate: [dynamicZoneField],
+          });
+        } catch (error) {
+          return null;
+        }
+      }
+      
+      // CollectionType için documentId ile bul
       const numericId = parseInt(id);
       if (!isNaN(numericId)) {
         try {
@@ -495,45 +567,18 @@ const controller = ({ strapi }) => ({
     const pluginConfig = strapi.config.get('plugin::copy-any-component') || {};
     const contentType = pluginConfig.contentType || 'api::page.page';
     
-    const findPage = async (id) => {
-      const numericId = parseInt(id);
-      if (!isNaN(numericId)) {
-        try {
-          return await strapi.entityService.findOne(contentType, numericId);
-        } catch (error) {
-          // Try with documentId
-        }
-      }
-      
-      try {
-        const pages = await strapi.entityService.findMany(contentType, {
-          filters: { documentId: id },
-        });
-        return pages[0];
-      } catch (err) {
-        return null;
-      }
-    };
-    
-    const page = await findPage(pageId);
-    
-    if (!page) {
-      ctx.status = 404;
-      ctx.body = { error: "Page not found: " + pageId, data: null };
-      return;
-    }
-
     try {
       // Strapi 5'te documentService kullanılıyor
+      // pageId zaten documentId string'i (frontend'den gönderiliyor)
       const documentService = strapi.documents(contentType);
-      const publishedPage = await documentService.publish(page.documentId || page.id);
+      const publishedPage = await documentService.publish(pageId);
 
       ctx.body = {
         error: null,
         data: {
           pageId: publishedPage.id,
           documentId: publishedPage.documentId,
-          pageTitle: publishedPage.title,
+          pageTitle: publishedPage.title || publishedPage.attributes?.title,
           publishedAt: publishedPage.publishedAt,
         },
       };