strapi-plugin-comments 2.0.0-beta.2 → 2.0.0-beta.6

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/strapi-server.js

@@ -1,9 +1,42 @@
 'use strict';
 
+const { isArray, isEmpty, isString } = require('lodash');
+
 const server = require('./server');
 const contentTypes = require('./content-types');
+const { REGEX } = require('./server/utils/constants');
 
 module.exports = () => ({
     ...server,
     contentTypes,
+    config: {
+      ...server.config,
+      default: ({ env }) => ({
+        ...server.config.default,
+      }),
+      validator: (config) => { 
+        // Check moderatorRoles values
+        const moderatorRolesValid = config.moderatorRoles
+          .filter(_ => !isString(_)).length === 0;
+        if (!moderatorRolesValid) {
+          throw new Error(`'moderatorRoles' must roles keys`);
+        }
+
+        // Check approvalFlow values
+        const approvalFlowValid = config.approvalFlow
+          .filter(_ => !REGEX.uid.test(_)).length === 0;
+        if (!approvalFlowValid) {
+          throw new Error(`'approvalFlow' must contain Content Types identifiers in the format like 'api::<collection name>.<content type name>'`);
+        }
+
+        // Check entryLabel keys and values
+        const entryLabelKeysValid = Object.keys(config.entryLabel)
+          .filter(_ => _ !== '*')
+          .filter(_ => !(REGEX.uid.test(_) && isArray(config.entryLabel[_]) && !isEmpty(config.entryLabel[_]))).length === 0;
+
+        if (!entryLabelKeysValid) {
+          throw new Error(`'entryLabel' must contain records in the format like 'api::<collection name>.<content type name>': ['Field1', 'field_2']`);
+        }
+      },
+    },
   });

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;
-