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

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,62 +15,17 @@ 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, populate = {} }, 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 defaultPopulate = {
             authorUser: true,
@@ -80,7 +34,7 @@ module.exports = ({ strapi }) => ({
         const entries = await strapi.db.query(getModelUid('comment'))
         .findMany({
             where: {
-                ...criteria,
+                ...query,
             },
             populate: {
                 ...defaultPopulate,
@@ -122,9 +76,8 @@ module.exports = ({ strapi }) => ({
         populate = {},
         startingFromId = null,
         dropBlockedThreads = false,
-        isAdmin = false,
     }, relatedEntity) {
-        const entities = await this.findAllFlat({ query, populate }, isAdmin, relatedEntity);
+        const entities = await this.findAllFlat({ query, populate }, relatedEntity);
         return buildNestedStructure(entities, startingFromId, 'threadOf', dropBlockedThreads, false);
     },
 
@@ -135,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;
-