strapi-plugin-comments 2.2.9 → 2.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -14,8 +14,8 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
-    "@strapi/plugin-graphql": "^4.8.2",
-    "@strapi/utils": "^4.8.2",
+    "@strapi/plugin-graphql": "^4.10.7",
+    "@strapi/utils": "^4.10.7",
     "@types/axios": "^0.14.0",
     "@types/react-intl": "^3.0.0",
     "@types/react-query": "^1.2.9",

package/server/controllers/client.js

@@ -7,6 +7,7 @@ const functions_1 = require("./../utils/functions");
 const functions_2 = require("./utils/functions");
 const parsers_1 = require("./utils/parsers");
 const error_1 = __importDefault(require("../utils/error"));
+const constants_1 = require("../utils/constants");
 const controllers = {
     getService(name = "client") {
         return (0, functions_1.getPluginService)(name);
@@ -49,6 +50,23 @@ const controllers = {
             throw (0, functions_2.throwError)(ctx, e);
         }
     },
+    async findAllPerAuthor(ctx) {
+        const { params = {}, query, sort, pagination } = ctx;
+        const { id, type } = (0, functions_2.parseParams)(params);
+        const { sort: querySort, pagination: queryPagination, fields, ...filterQuery } = query || {};
+        try {
+            (0, functions_1.assertParamsPresent)(params, ["id"]);
+            return this.getService("common").findAllPerAuthor((0, parsers_1.flatInput)({
+                query: filterQuery,
+                sort: sort || querySort,
+                pagination: pagination || queryPagination,
+                fields,
+            }), id, ![constants_1.AUTHOR_TYPE.GENERIC.toLowerCase(), constants_1.AUTHOR_TYPE.GENERIC].includes(type));
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
     async post(ctx) {
         const { request, params, state = {} } = ctx;
         const { relation } = (0, functions_2.parseParams)(params);

package/server/graphql/queries/findAllPerAuthor.d.ts

@@ -0,0 +1,21 @@
+import { Id, StrapiGraphQLContext, ToBeFixed } from "../../../types";
+type ResponseFindAllPerAuthorResolverProps = {
+    authorId: Id;
+    authorType: 'STRAPI' | 'GENERIC' | undefined;
+    filters: ToBeFixed;
+    sort: ToBeFixed;
+    pagination: ToBeFixed;
+};
+declare const _default: ({ strapi, nexus }: StrapiGraphQLContext) => {
+    type: string;
+    args: {
+        authorId: any;
+        authorType: any;
+        filters: any;
+        pagination: any;
+        sort: any;
+    };
+    resolve(obj: Object, args: ResponseFindAllPerAuthorResolverProps): Promise<import("strapi-typed").StrapiPaginatedResponse<import("../../../types").Comment<import("../../../types").CommentAuthor>>>;
+};
+export = _default;
+//# sourceMappingURL=findAllPerAuthor.d.ts.map

package/server/graphql/queries/findAllPerAuthor.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const lodash_1 = require("lodash");
+const comment_1 = __importDefault(require("../../../content-types/comment"));
+const parsers_1 = require("../../controllers/utils/parsers");
+const functions_1 = require("../../utils/functions");
+const constants_1 = require("../../utils/constants");
+module.exports = ({ strapi, nexus }) => {
+    const { nonNull, intArg, arg } = nexus;
+    const { service: getService } = strapi.plugin("graphql");
+    const { args } = getService("internals");
+    const { naming: { getFiltersInputTypeName }, } = getService("utils");
+    return {
+        type: "ResponseFindAllPerAuthor",
+        args: {
+            authorId: nonNull(intArg()),
+            authorType: arg({ type: 'AuthorType' }),
+            filters: getFiltersInputTypeName(comment_1.default),
+            pagination: args.PaginationArg,
+            sort: args.SortArg,
+        },
+        async resolve(obj, args) {
+            const { authorId, authorType, filters, sort, pagination } = args;
+            const isStrapiUser = authorType !== constants_1.AUTHOR_TYPE.GENERIC;
+            return await (0, functions_1.getPluginService)("common").findAllPerAuthor((0, parsers_1.flatInput)({
+                query: (0, functions_1.getPluginService)("gql").graphQLFiltersToStrapiQuery(filters, comment_1.default),
+                sort,
+                pagination: pagination
+                    ? {
+                        ...pagination,
+                        withCount: !(0, lodash_1.isEmpty)(pagination),
+                    }
+                    : undefined,
+            }), authorId, isStrapiUser);
+        },
+    };
+};
+//# sourceMappingURL=findAllPerAuthor.js.map

package/server/graphql/queries/index.js

@@ -4,10 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const findAllFlat_1 = __importDefault(require("./findAllFlat"));
 const findAllInHierarchy_1 = __importDefault(require("./findAllInHierarchy"));
+const findAllPerAuthor_1 = __importDefault(require("./findAllPerAuthor"));
 module.exports = (context) => {
     const queries = {
         findAllFlat: findAllFlat_1.default,
         findAllInHierarchy: findAllInHierarchy_1.default,
+        findAllPerAuthor: findAllPerAuthor_1.default,
     };
     return context.nexus.extendType({
         type: "Query",

package/server/graphql/types/comment-author-type.d.ts

@@ -0,0 +1,4 @@
+import { StrapiGraphQLContext } from '../../../types';
+declare const _default: ({ nexus }: StrapiGraphQLContext) => any;
+export = _default;
+//# sourceMappingURL=comment-author-type.d.ts.map

package/server/graphql/types/comment-author-type.js

@@ -0,0 +1,8 @@
+"use strict";
+const constants_1 = require("../../utils/constants");
+module.exports = ({ nexus }) => nexus.enumType({
+    name: 'AuthorType',
+    description: "User type which was the author of comment - Strapi built-in or generic",
+    members: Object.values(constants_1.AUTHOR_TYPE),
+});
+//# sourceMappingURL=comment-author-type.js.map

package/server/graphql/types/index.js

@@ -6,6 +6,7 @@ const id_1 = __importDefault(require("./id"));
 const comment_1 = __importDefault(require("./comment"));
 const comment_nested_1 = __importDefault(require("./comment-nested"));
 const comment_author_1 = __importDefault(require("./comment-author"));
+const comment_author_type_1 = __importDefault(require("./comment-author-type"));
 const create_comment_1 = __importDefault(require("./create-comment"));
 const create_comment_author_1 = __importDefault(require("./create-comment-author"));
 const update_comment_1 = __importDefault(require("./update-comment"));
@@ -17,11 +18,13 @@ const create_report_1 = __importDefault(require("./create-report"));
 const response_pagination_1 = __importDefault(require("./response-pagination"));
 const response_meta_1 = __importDefault(require("./response-meta"));
 const response_find_all_1 = __importDefault(require("./response-find-all"));
+const response_find_all_per_author_1 = __importDefault(require("./response-find-all-per-author"));
 const typesFactories = [
     id_1.default,
     comment_1.default,
     comment_nested_1.default,
     comment_author_1.default,
+    comment_author_type_1.default,
     create_comment_1.default,
     create_comment_author_1.default,
     update_comment_1.default,
@@ -33,6 +36,7 @@ const typesFactories = [
     response_pagination_1.default,
     response_meta_1.default,
     response_find_all_1.default,
+    response_find_all_per_author_1.default,
 ];
 module.exports = (context) => typesFactories.map((factory) => factory(context));
 //# sourceMappingURL=index.js.map

package/server/graphql/types/response-find-all-per-author.d.ts

@@ -0,0 +1,4 @@
+import { StrapiGraphQLContext } from "../../../types";
+declare const _default: ({ nexus }: StrapiGraphQLContext) => any;
+export = _default;
+//# sourceMappingURL=response-find-all-per-author.d.ts.map

package/server/graphql/types/response-find-all-per-author.js

@@ -0,0 +1,9 @@
+"use strict";
+module.exports = ({ nexus }) => nexus.objectType({
+    name: "ResponseFindAllPerAuthor",
+    definition(t) {
+        t.list.field("data", { type: "CommentSingle" });
+        t.field("meta", { type: "ResponseMeta" });
+    },
+});
+//# sourceMappingURL=response-find-all-per-author.js.map

package/server/routes/client.js

@@ -85,6 +85,34 @@ const routes = [
             },
         },
     },
+    {
+        method: "GET",
+        path: "/author/:id",
+        handler: "client.findAllPerAuthor",
+        config: {
+            policies: [],
+            description: "Find all comments created by Strapi user",
+            tag: {
+                plugin: "comments",
+                name: "Comments",
+                actionType: "find",
+            },
+        },
+    },
+    {
+        method: "GET",
+        path: "/author/:id/:type",
+        handler: "client.findAllPerAuthor",
+        config: {
+            policies: [],
+            description: "Find all comments created by specified type of user",
+            tag: {
+                plugin: "comments",
+                name: "Comments",
+                actionType: "find",
+            },
+        },
+    },
 ];
 exports.default = routes;
 //# sourceMappingURL=client.js.map

package/server/services/common.js

@@ -7,6 +7,7 @@ const lodash_1 = require("lodash");
 const constants_1 = require("../utils/constants");
 const error_1 = __importDefault(require("./../utils/error"));
 const functions_1 = require("./utils/functions");
+const parsers_1 = require("./utils/parsers");
 const PAGE_SIZE = 10;
 module.exports = ({ strapi }) => ({
     async getConfig(prop, defaultValue, useLocal = false) {
@@ -41,54 +42,9 @@ module.exports = ({ strapi }) => ({
         const doNotPopulateAuthor = isAdmin
             ? []
             : await this.getConfig(constants_1.CONFIG_PARAMS.AUTHOR_BLOCKED_PROPS, []);
-        let queryExtension = {};
-        if (sort && ((0, lodash_1.isString)(sort) || (0, lodash_1.isArray)(sort))) {
-            queryExtension = {
-                ...queryExtension,
-                orderBy: ((0, lodash_1.isString)(sort) ? [sort] : sort)
-                    .map((_) => (constants_1.REGEX.sorting.test(_) ? _ : `${_}:asc`))
-                    .reduce((prev, curr) => {
-                    const [type = "asc", ...parts] = curr.split(":").reverse();
-                    return { ...(0, lodash_1.set)(prev, parts.reverse().join("."), type) };
-                }, {}),
-            };
-        }
-        if (!(0, lodash_1.isNil)(fields)) {
-            queryExtension = {
-                ...queryExtension,
-                select: (0, lodash_1.isArray)(fields) ? (0, lodash_1.uniq)([...fields, ...defaultSelect]) : fields,
-            };
-        }
-        let meta = {};
-        if (pagination && (0, lodash_1.isObject)(pagination)) {
-            const parsedpagination = Object.keys(pagination).reduce((prev, curr) => ({
-                ...prev,
-                [curr]: (0, lodash_1.parseInt)((0, lodash_1.get)(pagination, curr)),
-            }), {});
-            const { page = 1, pageSize = PAGE_SIZE, start = 0, limit = PAGE_SIZE, } = parsedpagination;
-            const paginationByPage = !(0, lodash_1.isNil)(parsedpagination?.page) || !(0, lodash_1.isNil)(parsedpagination?.pageSize);
-            queryExtension = {
-                ...queryExtension,
-                offset: paginationByPage ? (page - 1) * pageSize : start,
-                limit: paginationByPage ? pageSize : limit,
-            };
-            const metapagination = paginationByPage
-                ? {
-                    pagination: {
-                        page,
-                        pageSize,
-                    },
-                }
-                : {
-                    pagination: {
-                        start,
-                        limit,
-                    },
-                };
-            meta = {
-                ...metapagination,
-            };
-        }
+        const sortQuery = (0, parsers_1.parseSortQuery)(sort);
+        const fieldsQuery = (0, parsers_1.parseFieldsQuery)(fields, sortQuery, defaultSelect);
+        let [meta, queryExtension = {}] = (0, parsers_1.parsePaginationsQuery)(pagination, fieldsQuery, { PAGE_SIZE });
         const entries = await strapi.db
             .query((0, functions_1.getModelUid)("comment"))
             .findMany({
@@ -154,9 +110,12 @@ module.exports = ({ strapi }) => ({
                         ? populateClause.authorUser.populate
                         : populateClause.authorUser;
             }
+            const primitiveThreadOf = (0, lodash_1.isString)(parsedThreadOf) || (0, lodash_1.isNumber)(parsedThreadOf) ?
+                parsedThreadOf :
+                null;
             return this.sanitizeCommentEntity({
                 ..._,
-                threadOf: parsedThreadOf || _.threadOf || null,
+                threadOf: primitiveThreadOf || _.threadOf,
                 gotThread: (threadedItem?.itemsInTread || 0) > 0,
                 threadFirstItemId: threadedItem?.firstThreadItemId,
             }, doNotPopulateAuthor, authorUserPopulate);
@@ -188,6 +147,32 @@ module.exports = ({ strapi }) => ({
         const doNotPopulateAuthor = await this.getConfig(constants_1.CONFIG_PARAMS.AUTHOR_BLOCKED_PROPS, []);
         return (0, functions_1.filterOurResolvedReports)(this.sanitizeCommentEntity(entity, doNotPopulateAuthor));
     },
+    async findAllPerAuthor({ query = {}, populate = {}, pagination, sort, fields, isAdmin = false, }, authorId, isStrapiAuthor = false) {
+        if ((0, lodash_1.isNil)(authorId)) {
+            return {
+                data: [],
+            };
+        }
+        const { related, ...restQuery } = query;
+        const authorQuery = isStrapiAuthor ? {
+            authorUser: {
+                id: authorId
+            },
+        } : {
+            authorId,
+        };
+        const response = await this.findAllFlat({
+            query: {
+                ...restQuery,
+                ...authorQuery,
+            },
+            pagination, populate, sort, fields, isAdmin
+        });
+        return {
+            ...response,
+            data: response.data.map(({ author, ...rest }) => rest),
+        };
+    },
     async findRelatedEntitiesFor(entities = []) {
         const data = entities.reduce((acc, curr) => {
             const [relatedUid, relatedStringId] = (0, functions_1.getRelatedGroups)(curr.related);

package/server/services/utils/parsers.d.ts

@@ -0,0 +1,6 @@
+import { StrapiDBQueryArgs, StrapiPagination, StrapiResponseMeta, StringMap } from "strapi-typed";
+import { CommentModelKeys, ToBeFixed } from "../../../types";
+export declare const parseSortQuery: (sort: StringMap<unknown> | undefined, query?: StrapiDBQueryArgs<CommentModelKeys>) => StrapiDBQueryArgs<CommentModelKeys>;
+export declare const parseFieldsQuery: (fields: ToBeFixed, query?: StrapiDBQueryArgs<CommentModelKeys>, defaultSelect?: Array<CommentModelKeys>) => StrapiDBQueryArgs<CommentModelKeys>;
+export declare const parsePaginationsQuery: (pagination: StrapiPagination | undefined, query?: StrapiDBQueryArgs<CommentModelKeys>, defaults?: any) => [StrapiResponseMeta, StrapiDBQueryArgs<CommentModelKeys>];
+//# sourceMappingURL=parsers.d.ts.map

package/server/services/utils/parsers.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parsePaginationsQuery = exports.parseFieldsQuery = exports.parseSortQuery = void 0;
+const constants_1 = require("./../../utils/constants");
+const lodash_1 = require("lodash");
+const parseSortQuery = (sort, query = {}) => {
+    if (sort && ((0, lodash_1.isString)(sort) || (0, lodash_1.isArray)(sort))) {
+        return {
+            ...query,
+            orderBy: ((0, lodash_1.isString)(sort) ? [sort] : sort)
+                .map((_) => (constants_1.REGEX.sorting.test(_) ? _ : `${_}:asc`))
+                .reduce((prev, curr) => {
+                const [type = "asc", ...parts] = curr.split(":").reverse();
+                return { ...(0, lodash_1.set)(prev, parts.reverse().join("."), type) };
+            }, {}),
+        };
+    }
+    return query;
+};
+exports.parseSortQuery = parseSortQuery;
+const parseFieldsQuery = (fields, query = {}, defaultSelect = []) => {
+    if (!(0, lodash_1.isNil)(fields)) {
+        return {
+            ...query,
+            select: (0, lodash_1.isArray)(fields) ? (0, lodash_1.uniq)([...fields, ...defaultSelect]) : fields,
+        };
+    }
+    return query;
+};
+exports.parseFieldsQuery = parseFieldsQuery;
+const parsePaginationsQuery = (pagination, query = {}, defaults = []) => {
+    if (pagination && (0, lodash_1.isObject)(pagination)) {
+        const parsedpagination = Object.keys(pagination).reduce((prev, curr) => ({
+            ...prev,
+            [curr]: parseInt((0, lodash_1.get)(pagination, curr)),
+        }), {});
+        const { page = 1, pageSize = defaults.PAGE_SIZE, start = 0, limit = defaults.PAGE_SIZE, } = parsedpagination;
+        const paginationByPage = !(0, lodash_1.isNil)(parsedpagination?.page) || !(0, lodash_1.isNil)(parsedpagination?.pageSize);
+        const metapagination = paginationByPage
+            ? {
+                pagination: {
+                    page,
+                    pageSize,
+                },
+            }
+            : {
+                pagination: {
+                    start,
+                    limit,
+                },
+            };
+        return [{
+                ...metapagination,
+            }, {
+                ...query,
+                offset: paginationByPage ? (page - 1) * pageSize : start,
+                limit: paginationByPage ? pageSize : limit,
+            }];
+    }
+    return [{}, query];
+};
+exports.parsePaginationsQuery = parsePaginationsQuery;
+//# sourceMappingURL=parsers.js.map

package/server/utils/constants.d.ts

@@ -5,5 +5,9 @@ export declare const APPROVAL_STATUS: {
     APPROVED: string;
     REJECTED: string;
 };
+export declare const AUTHOR_TYPE: {
+    GENERIC: string;
+    STRAPI: string;
+};
 export declare const REGEX: RegExpCollection;
 //# sourceMappingURL=constants.d.ts.map

package/server/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REGEX = exports.APPROVAL_STATUS = exports.CONFIG_PARAMS = void 0;
+exports.REGEX = exports.AUTHOR_TYPE = exports.APPROVAL_STATUS = exports.CONFIG_PARAMS = void 0;
 exports.CONFIG_PARAMS = {
     ENABLED_COLLECTIONS: "enabledCollections",
     APPROVAL_FLOW: "approvalFlow",
@@ -14,6 +14,10 @@ exports.APPROVAL_STATUS = {
     APPROVED: "APPROVED",
     REJECTED: "REJECTED",
 };
+exports.AUTHOR_TYPE = {
+    GENERIC: 'GENERIC',
+    STRAPI: 'STRAPI',
+};
 exports.REGEX = {
     uid: /^(?<type>[a-z0-9-]+)\:{2}(?<api>[a-z0-9-]+)\.{1}(?<contentType>[a-z0-9-]+)$/i,
     relatedUid: /^(?<uid>[a-z0-9-]+\:{2}[a-z0-9-]+\.[a-z0-9-]+)\:{1}(?<id>[a-z0-9-]+)$/i,