strapi-plugin-comments 3.0.4 → 3.0.6

package/README.md

@@ -104,7 +104,7 @@ In our minimum support we're following [official Node.js releases timelines](htt
 
 **Supported Strapi versions**:
 
-- Strapi v5.7.0 (recently tested)
+- Strapi v5.8.1 (recently tested)
 - Strapi v5.x
 
 > This plugin is designed for **Strapi v5**. To get support for other Strapi versions, please follow the [versions](#-versions) section.

package/dist/server/index.js

@@ -8185,6 +8185,19 @@ const bootstrap = async ({ strapi: strapi2 }) => {
     }
   ];
   await strapi2.admin.services.permission.actionProvider.registerMany(actions);
+  const commonService2 = getPluginService(strapi2, "common");
+  const enabledCollections = await commonService2.getConfig(CONFIG_PARAMS.ENABLED_COLLECTIONS, []);
+  if (enabledCollections.length) {
+    strapi2.db.lifecycles.subscribe({
+      models: enabledCollections,
+      afterDelete: async (event) => {
+        const uid = event.model.uid;
+        const { documentId, locale } = event.result;
+        const relation = [uid, documentId].join(":");
+        await commonService2.perRemove(relation, locale);
+      }
+    });
+  }
 };
 const defaultPluginConfig = {
   isValidationEnabled: true,
@@ -8886,6 +8899,9 @@ const getCommentRepositorySource = (strapi2) => {
       const isValidationEnabled = await getConfig(strapi2, "isValidationEnabled", false);
       return strapi2.query(modelUid).delete(params).then((result) => result ? shouldValidateObject(isValidationEnabled, commentResultValidator.findOne)(result) : null);
     },
+    async deleteMany(params) {
+      return strapi2.query(modelUid).deleteMany(params);
+    },
     updateMany(params) {
       return strapi2.query(modelUid).updateMany(params);
     },
@@ -9992,7 +10008,7 @@ const clientService = ({ strapi: strapi2 }) => {
       );
       const threadData = await tryCatch(
         async () => {
-          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale }) : null;
+          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale: locale || null }) : null;
         },
         new PluginError2(400, "Thread does not exist")
       );
@@ -10509,6 +10525,15 @@ const commonService = ({ strapi: strapi2 }) => ({
     }
     return content;
   },
+  async perRemove(related, locale) {
+    const defaultLocale = await strapi2.plugin("i18n")?.service("locales").getDefaultLocale() || null;
+    return getCommentRepository(strapi2).deleteMany({
+      where: {
+        related,
+        $or: [{ locale }, defaultLocale === locale ? { locale: { $eq: null } } : null].filter(Boolean)
+      }
+    });
+  },
   registerLifecycleHook() {
   },
   async runLifecycleHook() {

package/dist/server/index.mjs

@@ -8184,6 +8184,19 @@ const bootstrap = async ({ strapi: strapi2 }) => {
     }
   ];
   await strapi2.admin.services.permission.actionProvider.registerMany(actions);
+  const commonService2 = getPluginService(strapi2, "common");
+  const enabledCollections = await commonService2.getConfig(CONFIG_PARAMS.ENABLED_COLLECTIONS, []);
+  if (enabledCollections.length) {
+    strapi2.db.lifecycles.subscribe({
+      models: enabledCollections,
+      afterDelete: async (event) => {
+        const uid = event.model.uid;
+        const { documentId, locale } = event.result;
+        const relation = [uid, documentId].join(":");
+        await commonService2.perRemove(relation, locale);
+      }
+    });
+  }
 };
 const defaultPluginConfig = {
   isValidationEnabled: true,
@@ -8885,6 +8898,9 @@ const getCommentRepositorySource = (strapi2) => {
       const isValidationEnabled = await getConfig(strapi2, "isValidationEnabled", false);
       return strapi2.query(modelUid).delete(params).then((result) => result ? shouldValidateObject(isValidationEnabled, commentResultValidator.findOne)(result) : null);
     },
+    async deleteMany(params) {
+      return strapi2.query(modelUid).deleteMany(params);
+    },
     updateMany(params) {
       return strapi2.query(modelUid).updateMany(params);
     },
@@ -9991,7 +10007,7 @@ const clientService = ({ strapi: strapi2 }) => {
       );
       const threadData = await tryCatch(
         async () => {
-          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale }) : null;
+          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale: locale || null }) : null;
         },
         new PluginError2(400, "Thread does not exist")
       );
@@ -10508,6 +10524,15 @@ const commonService = ({ strapi: strapi2 }) => ({
     }
     return content;
   },
+  async perRemove(related, locale) {
+    const defaultLocale = await strapi2.plugin("i18n")?.service("locales").getDefaultLocale() || null;
+    return getCommentRepository(strapi2).deleteMany({
+      where: {
+        related,
+        $or: [{ locale }, defaultLocale === locale ? { locale: { $eq: null } } : null].filter(Boolean)
+      }
+    });
+  },
   registerLifecycleHook() {
   },
   async runLifecycleHook() {

package/dist/server/src/index.d.ts

@@ -4369,7 +4369,7 @@ declare const _default: {
                         total?: number;
                     };
                 }>;
-                findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+                findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
                     sort?: string;
                     locale?: string;
                     relation?: `${string}::${string}.${string}`;
@@ -5969,6 +5969,7 @@ declare const _default: {
                     };
                 }[T_5], deepLimit?: number): Promise<boolean>;
                 checkBadWords(content: string): Promise<string>;
+                perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
                 registerLifecycleHook(): void;
                 runLifecycleHook(): Promise<void>;
             };
@@ -7706,7 +7707,7 @@ declare const _default: {
                         total?: number;
                     };
                 }>;
-                findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+                findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
                     sort?: string;
                     locale?: string;
                     relation?: `${string}::${string}.${string}`;
@@ -9306,6 +9307,7 @@ declare const _default: {
                     };
                 }[T_5], deepLimit?: number): Promise<boolean>;
                 checkBadWords(content: string): Promise<string>;
+                perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
                 registerLifecycleHook(): void;
                 runLifecycleHook(): Promise<void>;
             };
@@ -10551,7 +10553,7 @@ declare const _default: {
                     total?: number;
                 };
             }>;
-            findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+            findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
                 sort?: string;
                 locale?: string;
                 relation?: `${string}::${string}.${string}`;
@@ -12151,6 +12153,7 @@ declare const _default: {
                 };
             }[T_5], deepLimit?: number): Promise<boolean>;
             checkBadWords(content: string): Promise<string>;
+            perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
             registerLifecycleHook(): void;
             runLifecycleHook(): Promise<void>;
         };

package/dist/server/src/repositories/comment.repository.d.ts

@@ -7,6 +7,7 @@ export declare const getCommentRepositorySource: (strapi: CoreStrapi) => {
     findOne(params: FindOneParams): Promise<CommentResultValidator['findOne'] | null>;
     update(params: Params): Promise<CommentResultValidator['findOne']>;
     delete(params: Params): Promise<CommentResultValidator['findOne'] | null>;
+    deleteMany(params: Params): Promise<import("@strapi/database/dist/types").CountResult>;
     updateMany(params: Params): Promise<import("@strapi/database/dist/types").CountResult>;
     create(params: Pick<Params, 'data' | 'populate'>): Promise<CommentResultValidator['create']>;
 };
@@ -16,6 +17,7 @@ export declare const getCommentRepository: (strapi: CoreStrapi) => {
     findOne(params: FindOneParams): Promise<CommentResultValidator['findOne'] | null>;
     update(params: Params): Promise<CommentResultValidator['findOne']>;
     delete(params: Params): Promise<CommentResultValidator['findOne'] | null>;
+    deleteMany(params: Params): Promise<import("@strapi/database/dist/types").CountResult>;
     updateMany(params: Params): Promise<import("@strapi/database/dist/types").CountResult>;
     create(params: Pick<Params, 'data' | 'populate'>): Promise<CommentResultValidator['create']>;
 };

package/dist/server/src/services/admin/admin.service.d.ts

@@ -818,7 +818,7 @@ declare const _default: ({ strapi }: StrapiContext) => {
                 total?: number;
             };
         }>;
-        findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+        findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
             sort?: string;
             locale?: string;
             relation?: `${string}::${string}.${string}`;
@@ -2418,6 +2418,7 @@ declare const _default: ({ strapi }: StrapiContext) => {
             };
         }[T_2], deepLimit?: number): Promise<boolean>;
         checkBadWords(content: string): Promise<string>;
+        perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
         registerLifecycleHook(): void;
         runLifecycleHook(): Promise<void>;
     };

package/dist/server/src/services/client.service.d.ts

@@ -822,7 +822,7 @@ export declare const clientService: ({ strapi }: StrapiContext) => {
                 total?: number;
             };
         }>;
-        findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+        findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
             sort?: string;
             locale?: string;
             relation?: `${string}::${string}.${string}`;
@@ -2422,6 +2422,7 @@ export declare const clientService: ({ strapi }: StrapiContext) => {
             };
         }[T_2], deepLimit?: number): Promise<boolean>;
         checkBadWords(content: string): Promise<string>;
+        perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
         registerLifecycleHook(): void;
         runLifecycleHook(): Promise<void>;
     };

package/dist/server/src/services/common.service.d.ts

@@ -20,7 +20,7 @@ declare const commonService: ({ strapi }: StrapiContext) => {
         data: Array<CommentWithRelated | Comment>;
         pagination?: Pagination;
     }>;
-    findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: clientValidator.FindAllInHierarchyValidatorSchema, relatedEntity?: any): Promise<{
+    findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: clientValidator.FindAllInHierarchyValidatorSchema, relatedEntity?: any): Promise<{
         id?: number;
         documentId?: string;
         content?: string;
@@ -561,6 +561,7 @@ declare const commonService: ({ strapi }: StrapiContext) => {
         };
     }[T_2], deepLimit?: number): Promise<boolean>;
     checkBadWords(content: string): Promise<string>;
+    perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
     registerLifecycleHook(): void;
     runLifecycleHook(): Promise<void>;
 };

package/dist/server/src/services/index.d.ts

@@ -817,7 +817,7 @@ declare const pluginServices: {
                     total?: number;
                 };
             }>;
-            findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+            findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
                 sort?: string;
                 locale?: string;
                 relation?: `${string}::${string}.${string}`;
@@ -2417,6 +2417,7 @@ declare const pluginServices: {
                 };
             }[T_2], deepLimit?: number): Promise<boolean>;
             checkBadWords(content: string): Promise<string>;
+            perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
             registerLifecycleHook(): void;
             runLifecycleHook(): Promise<void>;
         };
@@ -4154,7 +4155,7 @@ declare const pluginServices: {
                     total?: number;
                 };
             }>;
-            findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+            findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
                 sort?: string;
                 locale?: string;
                 relation?: `${string}::${string}.${string}`;
@@ -5754,6 +5755,7 @@ declare const pluginServices: {
                 };
             }[T_2], deepLimit?: number): Promise<boolean>;
             checkBadWords(content: string): Promise<string>;
+            perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
             registerLifecycleHook(): void;
             runLifecycleHook(): Promise<void>;
         };
@@ -6999,7 +7001,7 @@ declare const pluginServices: {
                 total?: number;
             };
         }>;
-        findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit }: {
+        findAllInHierarchy({ filters, populate, sort, fields, startingFromId, dropBlockedThreads, isAdmin, omit, locale, limit, }: {
             sort?: string;
             locale?: string;
             relation?: `${string}::${string}.${string}`;
@@ -8599,6 +8601,7 @@ declare const pluginServices: {
             };
         }[T_2], deepLimit?: number): Promise<boolean>;
         checkBadWords(content: string): Promise<string>;
+        perRemove(related: string, locale?: string): Promise<import("@strapi/database/dist/types").CountResult>;
         registerLifecycleHook(): void;
         runLifecycleHook(): Promise<void>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -57,7 +57,7 @@
     "no-profanity": "^1.5.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.26.2",
+    "react-router-dom": "^6.22.3",
     "sanitize-html": "^2.13.1",
     "styled-components": "^6.1.13",
     "zod": "^3.23.8",
@@ -66,12 +66,12 @@
   "devDependencies": {
     "@jest/types": "29.5.x",
     "@sensinum/strapi-utils": "^1.0.4",
-    "@strapi/plugin-cloud": "^5.7.0",
-    "@strapi/plugin-graphql": "5.7.0",
-    "@strapi/plugin-users-permissions": "^5.7.0",
-    "@strapi/sdk-plugin": "^5.2.8",
-    "@strapi/strapi": "^5.7.0",
-    "@strapi/types": "^5.7.0",
+    "@strapi/plugin-cloud": "^5.8.1",
+    "@strapi/plugin-graphql": "5.8.1",
+    "@strapi/plugin-users-permissions": "^5.8.1",
+    "@strapi/sdk-plugin": "^5.3.0",
+    "@strapi/strapi": "^5.8.1",
+    "@strapi/types": "^5.8.1",
     "@types/jest": "^29.5.12",
     "@types/koa": "^2.15.0",
     "@types/react": "^18.3.8",
@@ -88,11 +88,11 @@
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "@strapi/sdk-plugin": "^5.2.8",
-    "@strapi/strapi": "^5.7.0",
+    "@strapi/sdk-plugin": "^5.3.0",
+    "@strapi/strapi": "^5.8.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.26.2",
+    "react-router-dom": "^6.22.3",
     "styled-components": "^6.1.13"
   },
   "nodemonConfig": {