strapi-plugin-comments 2.0.0-beta.1 → 2.0.0-beta.5

package/server/services/admin.js

@@ -1,14 +1,12 @@
 'use strict';
 
 const { getPluginService, parseParams } = require('./../utils/functions');
-const { getAssociationModel } = require('./common');
-const { first, isEmpty, isNil, uniq, get } = require('lodash');
+const { isEmpty, isNil } = require('lodash');
 const PluginError = require('./../utils/error');
 const {
     getModelUid,
     getRelatedGroups,
     filterOurResolvedReports,
-    convertContentTypeNameToSlug
 } = require('./utils/functions');
 const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
 
@@ -22,14 +20,36 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
         return getPluginService('common');
     },
 
+    // Config
+    async config() {
+        const entryLabel = this.getCommonService().getConfig('entryLabel');
+        const approvalFlow = this.getCommonService().getConfig('approvalFlow');
+        return {
+            entryLabel,
+            approvalFlow,
+            regex: Object.keys(REGEX).reduce((prev, curr) => ({
+                ...prev,
+                [curr]: REGEX[curr].toString(),
+            }), {}),
+        };
+    },
+
     // Find all comments
     async findAll({ related, entity, ...query }) {
         const { _q, orderBy, pageSize = 10, page = 1, filters, ...rest } = parseParams(query);
 
+        const defaultWhere = {
+            $or: [
+                { removed: false },
+                { removed: null },
+            ],
+        };
+
         let params = {
             where: !isEmpty(filters) ? {
+                ...defaultWhere,
                 ...filters,
-            } : undefined,
+            } : { ...defaultWhere },
             offset: (page - 1)*pageSize, 
             limit: pageSize,
             orderBy: orderBy || [{ createdAt: 'desc' }],
@@ -47,7 +67,18 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
         }
     
         const entities = await strapi.db.query(getModelUid('comment'))
-            .findMany(params, ['authorUser', 'reports']);
+            .findMany({
+                ...params, 
+                populate: {
+                    authorUser: true,
+                    threadOf: true,
+                    reports: {
+                        where: { 
+                            resolved: false
+                        },
+                    },
+                },
+            });
         const total = await strapi.db.query(getModelUid('comment'))
             .count({
                 where: params.where,
@@ -57,8 +88,6 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
             .map(_ => filterOurResolvedReports(this.getCommonService().sanitizeCommentEntity(_)))
             .map(_ => this.getCommonService().mergeRelatedEntityTo(_, relatedEntities));
 
-            console.log(relatedEntities);
-
         return {
             result,
             pagination: {
@@ -71,12 +100,35 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
     },
 
     // Find single comment
-    async findOneAndThread(id) {
+    async findOneAndThread(id, { removed, ...query }) {
+        const defaultWhere = !removed ? {
+            $or: [
+                { removed: false },
+                { removed: null },
+            ],
+        } : {};
+        
+        const reportsPopulation = {
+            reports: {
+                where: { 
+                    resolved: false,
+                },
+            }
+        };
+
         const entity = await strapi.db.query(getModelUid('comment')).findOne({ 
             where: {
-                id
+                id,
+            },
+            populate: {
+                authorUser: true,
+                threadOf: {
+                    populate: { 
+                        ...reportsPopulation
+                    },
+                },
+                ...reportsPopulation,
             },
-            populate: ['threadOf', 'threadOf.reports', 'authorUser', 'reports'] 
         });
 
         if (!entity){
@@ -100,22 +152,27 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
         const entitiesOnSameLevel = await this.getCommonService()
             .findAllInHierarchy({
                 query: {
+                    ...defaultWhere,
+                    ...query,
                     threadOf: levelThreadId,
                     related: entity.related,
                 },
+                populate: {
+                    ...reportsPopulation,
+                },
                 startingFromId: levelThreadId,
                 isAdmin: true
             }, false);
 
-        const selectedEntity = filterOurResolvedReports(this.getCommonService().sanitizeCommentEntity(entity));
+        const selectedEntity = this.getCommonService().sanitizeCommentEntity(entity);
         
         return {
             entity: relatedEntity,
             selected: {
                 ...selectedEntity,
-                threadOf: selectedEntity.threadOf ? filterOurResolvedReports(selectedEntity.threadOf) : null,
+                threadOf: selectedEntity.threadOf ? selectedEntity.threadOf : null,
             },
-            level: entitiesOnSameLevel.map(_ => filterOurResolvedReports(_))
+            level: entitiesOnSameLevel,
         };
     },
 
@@ -132,9 +189,13 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
     // Block / Unblock a comment thread
     async blockCommentThread(id, forceStatus) {
         const existingEntity = await this.getCommonService().findOne({ id });
+        const status = !isNil(forceStatus) ? forceStatus : !existingEntity.blockedThread;
         const changedEntity = await strapi.db.query(getModelUid('comment')).update({ 
             where: { id },
-            data: { blockedThread: !isNil(forceStatus) ? forceStatus : !existingEntity.blockedThread }
+            data: { 
+                blocked: status,
+                blockedThread: status,
+            },
         });
         await this.blockNestedThreads(id, changedEntity.blockedThread);
 

package/server/services/client.js

@@ -26,18 +26,14 @@ module.exports = ({ strapi }) => ({
 
     // Create a comment
     async create(relation, data, user = undefined) {
-        const { content, threadOf, related } = data;
-        const singleRelationFulfilled = related && REGEX.relatedUid.test(related);
-
-        if (relation !== related) {
-            throw new PluginError(400, `Insonsistent relation uid`);
-        }
-
+        const { content, threadOf } = data;
+        const singleRelationFulfilled = relation && REGEX.relatedUid.test(relation);
+        
         if(!singleRelationFulfilled) {
             throw new PluginError(400, `Field "related" got incorrect format, use format like "api::<collection name>.<content type name>:<entity id>"`);
         }
 
-        const [ uid, relatedStringId ] = getRelatedGroups(related);
+        const [ uid, relatedStringId ] = getRelatedGroups(relation);
         const relatedId = parseInt(relatedStringId, 10);
 
         const relatedEntity = await strapi.db.query(uid).findOne(relatedId);
@@ -45,9 +41,12 @@ module.exports = ({ strapi }) => ({
             throw new PluginError(400, `Relation for field "related" does not exist. Check your payload please.`);
         }
 
+        const isApprovalFlowEnabled = this.getCommonService().getConfig('approvalFlow', []).includes(uid) ||
+            relatedEntity.requireCommentsApproval;
+
         const linkToThread = !isNil(threadOf) ? !!await this.getCommonService().findOne({
             id: threadOf,
-            related,
+            related: relation,
         }) : true;
         const validContext = isValidUserContext(user);
 
@@ -87,7 +86,8 @@ module.exports = ({ strapi }) => ({
                 throw new PluginError(400, 'Object: "author" is invalid. Check your payload');
             }
 
-            if (relatedEntity.requireCommentsApproval && data.approvalStatus !== APPROVAL_STATUS.PENDING) {
+            if (isApprovalFlowEnabled && 
+                (!isNil(data.approvalStatus) && (data.approvalStatus !== APPROVAL_STATUS.PENDING))) {
                 throw new PluginError(400, 'Invalid approval status');
             }
 
@@ -95,7 +95,8 @@ module.exports = ({ strapi }) => ({
                 data: {
                     ...rest,
                     ...authorData,
-                    related,
+                    related: relation,
+                    approvalStatus: isApprovalFlowEnabled ? APPROVAL_STATUS.PENDING : null,
                 }
             });
             return this.getCommonService().sanitizeCommentEntity(entity);
@@ -160,7 +161,7 @@ module.exports = ({ strapi }) => ({
                 try {
                     await this.sendAbuseReportEmail(entity.reason, entity.content); // Could also add some info about relation
                 } catch (err) {
-                    throw err;
+                    return entity;
                 }
             } else {
                 throw new PluginError(500, 'Report cannot be created');
@@ -177,10 +178,17 @@ module.exports = ({ strapi }) => ({
           $or: [{ authorUser: authorId }, { authorId }],
         });
         if (!entity){
-            throw strapi.errors.notFound('Entity not exist');
+            throw new PluginError(404, 'Entity not exist');
         }
+
         return strapi.db.query(getModelUid('comment'))
-          .update({ id: commentId, relatedSlug: relationId }, { removed: true })
+          .update({
+              where: { 
+                  id: commentId, 
+                  related: relationId
+                },
+                data: { removed: true }
+          })
           .then(({ id }) => this.markAsRemovedNested(id, true))
           .then(() => ({ id: commentId }));
     },

package/server/services/common.js

@@ -1,10 +1,9 @@
 'use strict';
 
-const { isArray, isEmpty, uniq, get, first } = require('lodash');
+const { isArray, uniq, first } = require('lodash');
 // const { sanitizeEntity } = require('strapi-utils');
 const PluginError = require('./../utils/error');
 const {
-    extractMeta,
     getModelUid,
     getRelatedGroups,
     buildNestedStructure,
@@ -16,71 +15,31 @@ const {
  */
 
 module.exports = ({ strapi }) => ({
-    getAssociationModel(ormModel, related) {
-        const relatedAssociation = ormModel.associations.find(_ => _.alias === 'related');
-        if (relatedAssociation) {
-            return relatedAssociation.related.find(rel => rel.collectionName === related);
-        }
-        return null;
-    },
-
-    getMorphModel() {
-        const ormModel = strapi.query(getModelUid('comment'));
-        return ormModel.model.morph;
-    },
-
-    isMongoDB(){
-        return strapi.query(getModelUid('comment'))?.model?.orm === 'mongoose';
-    },
-
-    getMorphData(query) {
-        return this
-          .getMorphModel()
-          .query(function () {
-              this.where(query);
-          })
-          .fetchAll()
-          .then((entities) => entities.map(entity => entity.toJSON()));
-    },
-
-    checkEntityRelation(uid, entityId) {
-        const result = parsedRelation.some(ref => {
-            const model = strapi.query(ref);
-            return model && model.associations.length &&
-              model.associations.some(_ => _.plugin === 'comments' && _.collection === 'comment');
-        });
-        if (!result) {
-            throw new PluginError(400, 'Comment not have relation to this type content type.');
-        }
-    },
 
-    getConfig(prop) {
+    getConfig(prop, defaultValue) {
         let queryProp = prop;
         if (prop && isArray(prop)) {
             queryProp = prop.join('.');
         }
-        return strapi.config.get(`plugin.comments${ queryProp ? '.' + queryProp : ''}`);
+        return strapi.config.get(`plugin.comments${ queryProp ? '.' + queryProp : ''}`) || defaultValue;
     },
 
     // Find comments in the flat structure
-    async findAllFlat(query, isAdmin = false, relatedEntity = null) {
-        const criteria = { 
-            ...query,
-            $or: [{ removed: { $null: true } }, { removed: false }],
-        }
-
-        if (isAdmin){
-            delete criteria.$or;
-        }
+    async findAllFlat({ query = {}, populate = {} }, relatedEntity = null) {
 
-        const populate = { authorUser: true, reports: true };
+        const defaultPopulate = {
+            authorUser: true,
+        };
 
         const entries = await strapi.db.query(getModelUid('comment'))
         .findMany({
             where: {
-                ...criteria,
+                ...query,
+            },
+            populate: {
+                ...defaultPopulate,
+                ...populate,
             },
-            populate,
         });
 
         const entriesWithThreads = await Promise.all(entries.map(async _ => {
@@ -93,16 +52,16 @@ module.exports = ({ strapi }) => ({
             return { id: _.id, itemsInTread: count, firstThreadItemId: first(nestedEntries)?.id }
         }));
 
-        const relatedEntities = relatedEntity !== null ? [relatedEntity] : await this.findRelatedEntitiesFor([...entitiesRoot, ...entitiesNested]);
+        const relatedEntities = relatedEntity !== null ? [relatedEntity] : await this.findRelatedEntitiesFor([...entries]);
         const result = entries
             .map(_ => {
                 const threadedItem = entriesWithThreads.find(item => item.id === _.id);
-                return filterOurResolvedReports(this.sanitizeCommentEntity({
+                return this.sanitizeCommentEntity({
                     ..._,
                     threadOf: query.threadOf || _.threadOf || null,
                     gotThread: (threadedItem?.itemsInTread || 0) > 0,
                     threadFirstItemId: threadedItem?.firstThreadItemId,
-                }))
+                });
             });
 
         if (relatedEntities.filter(_ => _).length > 0) {
@@ -114,11 +73,11 @@ module.exports = ({ strapi }) => ({
     // Find comments and create relations tree structure
     async findAllInHierarchy ({
         query,
+        populate = {},
         startingFromId = null,
         dropBlockedThreads = false,
-        isAdmin = false,
     }, relatedEntity) {
-        const entities = await this.findAllFlat(query, isAdmin, relatedEntity);
+        const entities = await this.findAllFlat({ query, populate }, relatedEntity);
         return buildNestedStructure(entities, startingFromId, 'threadOf', dropBlockedThreads, false);
     },
 
@@ -129,24 +88,36 @@ module.exports = ({ strapi }) => ({
                 where: criteria
             }, ['related', 'reports']);
         if (!entity){
-            throw strapi.errors.notFound();
+            throw new PluginError(404, 'Not found');
         }
         return filterOurResolvedReports(this.sanitizeCommentEntity(entity));
     },
 
     // Find all related entiries
     async findRelatedEntitiesFor(entities = []) {
-        return Promise.all(uniq(entities.map(_ => _.related)).map(async _ => {
-            const [relatedUid, relatedStringId] = getRelatedGroups(_);
-            const relatedId = parseInt(relatedStringId, 10);
-            const relatedEntity = await strapi.db.query(relatedUid).findOne({ 
-                where: { id: relatedId }
-            });
-            return {
-                ...relatedEntity,
-                uid: relatedUid,
-            };
-        }))
+        const data = entities.reduce((acc, cur) => {
+                const [relatedUid, relatedStringId] = getRelatedGroups(cur.related);
+                return {
+                    ...acc,
+                    [relatedUid]: [...(acc[relatedUid] || []), parseInt(relatedStringId, 10)]
+                };
+            },
+            {}
+        );
+        return Promise.all(
+            Object.entries(data)
+            .map(async ([relatedUid, relatedStringIds]) => 
+                strapi.db.query(relatedUid).findMany({ 
+                    where: { id: Array.from(new Set(relatedStringIds)) } 
+                }).then(relatedEntities => relatedEntities.map(_ => 
+                    ({
+                        ..._,
+                        uid: relatedUid,
+                    })
+                ))
+            )
+        )
+        .then(result => result.flat(2));
     },
 
     // Merge related entity with comment

package/server/services/utils/functions.js

@@ -34,9 +34,14 @@ const buildNestedStructure = (
 module.exports = {
     isEqualEntity: (existing, data, user) => {
         const { authorUser, authorId } = existing;
-        console.log('data', data);
-        console.log(existing);
         const { author } = data;
+
+        // Disallow approval status change by Client
+        if (data.approvalStatus && (existing.approvalStatus !== data.approvalStatus)) {
+            return false;
+        }
+
+        // Make sure that author is exact the same
         if (authorUser) {
             const existingUserId = authorUser?.id || authorUser;
             const receivedUserId = user?.id || author;
@@ -45,18 +50,6 @@ module.exports = {
         return authorId === author?.id;
     },
 
-    extractMeta: plugins => {
-        const { comments: plugin } = plugins;
-        const { comments: service } = plugin.services;
-        const { comment: model} = plugin.models;
-        return {
-            model,
-            service,
-            plugin,
-            pluginName: plugin.package.strapi.name.toLowerCase()
-        };
-    },
-
     getRelatedGroups: related => related.split(REGEX.relatedUid).filter(s => s && s.length > 0),
 
     getModelUid: name => {

package/server/utils/constants.js

@@ -5,9 +5,9 @@ const APPROVAL_STATUS = {
 };
 
 const REGEX = {
-  uid: new RegExp(/^(?<type>[a-z]+)\:{2}(?<api>[a-z]+)\.{1}(?<contentType>[a-z]+)$/gmi),
-  relatedUid: new RegExp(/^(?<uid>[a-z]+\:{2}[a-z]+\.[a-z]+)\:{1}(?<id>[0-9]+)$/gmi),
-  email: new RegExp(/\S+@\S+\.\S+/),
+  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,
+  email: /\S+@\S+\.\S+/,
 };
 
 module.exports = {

package/admin/src/components/EntityDetails/index.js

@@ -1,53 +0,0 @@
-/**
- *
- * Entity Details
- *
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { isNil } from 'lodash';
-import { Box } from '@strapi/design-system/Box';
-import { Divider } from '@strapi/design-system/Divider';
-import { Flex } from '@strapi/design-system/Flex';
-import { Stack } from '@strapi/design-system/Stack';
-import { Typography } from '@strapi/design-system/Typography';
-import { getMessage } from '../../utils';
-
-const EntityDetails = ({ data = {}, schema = {} }) => {
-    const { attributes = {} } = schema;
-    const keys = Object.keys(attributes);
-    
-    if (keys.length === 0) {
-        return null;
-    }
-
-    const itemKeys = keys.filter(_ => (attributes[_].type === 'string') && !isNil(data[_]));
-
-    return (<Box padding={4}>
-        <Typography variant="sigma" textColor="neutral600" id="entity-details">
-            { getMessage('page.details.panel.entity', 'Details') }
-        </Typography>
-        <Box paddingTop={2} paddingBottom={6}>
-            <Divider />
-        </Box>
-        <Stack size={itemKeys.length}>
-            {  itemKeys.map(_ => 
-            (<Flex justifyContent="space-between">
-                <Typography fontWeight="bold">
-                    { _ }
-                </Typography>
-                <Typography>{ data[_] }</Typography>
-            </Flex>))
-            }
-        </Stack>
-    </Box>);
-};
-
-EntityDetails.propTypes = {
-    data: PropTypes.object.isRequired,
-    schema: PropTypes.object.isRequired,
-};
-
-export default EntityDetails;
-