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

package/admin/src/pages/Discover/components/DiscoverTableRow/index.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { useMutation, useQueryClient } from 'react-query';
-import { first, isEmpty, orderBy } from 'lodash';
+import { isNil, isEmpty, orderBy } from 'lodash';
 import { Badge } from '@strapi/design-system/Badge';
 import { Box } from '@strapi/design-system/Box'; 
 import { Button } from '@strapi/design-system/Button'; 
@@ -13,15 +13,17 @@ import { Link } from '@strapi/design-system/Link';
 import { Stack } from '@strapi/design-system/Stack';
 import { Tr, Td } from '@strapi/design-system/Table'; 
 import { Typography } from '@strapi/design-system/Typography'; 
-import { Eye, Lock } from '@strapi/icons';
+import { Eye } from '@strapi/icons';
 import { useNotification, useOverlayBlocker } from '@strapi/helper-plugin';
-import { getMessage, handleAPIError } from '../../../../utils';
-import { COMMENT_STATUS } from '../../../../utils/constants';
+import { getMessage, getUrl, handleAPIError, resolveCommentStatus, resolveCommentStatusColor } from '../../../../utils';
 import ReportsReviewModal from '../../../../components/ReportsReviewModal';
 import ReportsReviewTable from '../../../../components/ReportsReviewTable';
-import { blockItem, blockItemThread, resolveReport } from '../../../Details/utils/api';
+import { blockItem, blockItemThread, resolveReport } from '../../../utils/api';
 import pluginId from '../../../../pluginId';
 import { ReviewIcon, LockIcon } from '../../../../components/icons';
+import { TableLink } from './styles';
+import renderEntryTitle from '../../../../utils/renderEntryTitle';
+import DiscussionThreadItemApprovalFlowActions from '../../../../components/DiscussionThreadItemApprovalFlowActions';
 
 const DiscoverTableRow = ({ config, item, onClick }) => {
 
@@ -94,54 +96,45 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
     const handleClick = () => onClick();
     const handleBlockButtonsStateChange = disabled => setBlockButtonsDisabled(disabled);
 
-    const renderStatus = ({ blocked, blockedThread }) => {
-        let status = blocked || blockedThread ? COMMENT_STATUS.BLOCKED : COMMENT_STATUS.OPEN;
-        if (reviewFlowEnabled) {
-            status = COMMENT_STATUS.TO_REVIEW;
-        }
-        let color = 'secondary';
-        switch (status) {
-            case COMMENT_STATUS.OPEN:
-                color = 'success';
-                break;
-            case COMMENT_STATUS.TO_REVIEW:
-                color = 'warning';
-                break;
-            case COMMENT_STATUS.BLOCKED:
-                color = 'danger';
-                break;
-        };
+    const renderStatus = (props) => {
+        const status = resolveCommentStatus({ ...props, reviewFlowEnabled });
+        const color = resolveCommentStatusColor(status);
+   
         return (<Badge backgroundColor={`${color}100`} textColor={`${color}600`}>{ getMessage({
-            id: `page.discover.table.header.status.${status}`,
+            id: `page.common.item.status.${status}`,
             props: {
                 count: openReports.length
             }
         }, status) }</Badge>);
       };
     
-      const renderEntryTitle = entry => {
-        const { entryLabel } = config;
-        const rule = entry.uid in entryLabel ? entryLabel[entry.uid] : entryLabel['*'];
-        return first(
-          Object.keys(entry)
-            .filter(_ => (rule === _) || rule.includes(_))
-            .map(_ => entry[_])
-            .filter(_ => _)
-        );
-      };
-    
       const renderEntryUrl = entry => `/content-manager/collectionType/${entry.uid}/${entry.id}`;
+      const renderDetailsUrl = entry => getUrl(`discover/${entry.id}`);
+
+      const gotApprovalFlow = !isNil(item.approvalStatus);
+      const needsApproval = gotApprovalFlow && (item.approvalStatus === 'PENDING');
+
+      let actionItemsCount = 1;
+      if(reviewFlowEnabled || needsApproval) {
+        actionItemsCount = 2;
+      }
 
     return (
         <Tr key={item.id}>
-            <Td style={{ maxWidth: '40vw' }}>
+            <Td>
+                <Typography textColor="neutral800" fontWeight="bold">#{ item.id }</Typography>
+            </Td>
+            <Td style={{ maxWidth: '30vw' }}>
                 <Typography textColor="neutral800" ellipsis>{item.content}</Typography>
             </Td>
             <Td>
-                <Typography textColor="neutral800">{item.threadOf?.id || '-'}</Typography>
+                { item.threadOf?.id ? (<Link to={ renderDetailsUrl(item.threadOf) }>{ getMessage({
+                    id: 'page.discover.table.cell.thread',
+                    props: { id: item.threadOf.id },
+                }, '#' + item.threadOf.id) }</Link>) : '-' }
             </Td>
-            <Td>
-                <Link to={ renderEntryUrl(item.related) }>{ renderEntryTitle(item.related) }</Link>
+            <Td style={{ maxWidth: '15vw' }}>
+                <TableLink to={ renderEntryUrl(item.related) }>{ renderEntryTitle(item.related, config) }</TableLink>
             </Td>
             <Td>
                 <Typography textColor="neutral800">{ formatDate(item.updatedAt || item.createdAt, { dateStyle: 'long', timeStyle: 'short' }) }</Typography>
@@ -151,8 +144,9 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
             </Td>
             <Td>
                 <Flex direction="column" alignItems="flex-end">
-                    <Stack size={reviewFlowEnabled ? 2 : 1} horizontal>
+                    <Stack size={actionItemsCount} horizontal>
                         { reviewFlowEnabled && (<IconButton onClick={handleReportsReviewClick} label={ getMessage('page.discover.table.reports.review') } icon={<ReviewIcon />} />)}
+                        { needsApproval &&  (<DiscussionThreadItemApprovalFlowActions id={item.id} queryToInvalidate="get-data" />)}
                         <IconButton onClick={handleClick} label={ getMessage('page.discover.table.action.display') } icon={<Eye />} />
                     </Stack>
                 </Flex>

package/admin/src/pages/Discover/components/DiscoverTableRow/styles.js

@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+import { Link } from '@strapi/design-system/Link';
+
+export const TableLink = styled(Link)`
+    display: block;
+    text-overflow: ellipsis;
+    overflow: hidden;
+`

package/admin/src/pages/Discover/index.js

@@ -90,10 +90,10 @@ const Discover = ({ config }) => {
 
   const emptyContent = _q ? 'search' : 'comments';
   
-  const COL_COUNT = 6;
+  const COL_COUNT = 7;
 
   return <Box background="neutral100">
-          <Layout sideNav={<Nav />}>
+          <Layout>
             {isLoading || isLoadingForPermissions ? (<LoadingIndicatorPage />) : (
             <>
               <HeaderLayout title={ getMessage('page.discover.header') } subtitle={ `${total} ${ getMessage('page.discover.header.count')}` } as="h2" />
@@ -109,6 +109,9 @@ const Discover = ({ config }) => {
                 <Table colCount={COL_COUNT} rowCount={result.length}>
                   <Thead>
                     <Tr>
+                      <Th>
+                        <Typography variant="sigma">{ getMessage('page.discover.table.header.id') }</Typography>
+                      </Th>
                       <Th>
                         <Typography variant="sigma">{ getMessage('page.discover.table.header.message') }</Typography>
                       </Th>
@@ -130,7 +133,7 @@ const Discover = ({ config }) => {
                     </Tr>
                   </Thead>
                   <Tbody>
-                    {result.map(entry => (<DiscoverTableRow config={config} item={entry} onClick={() => handleClickDisplay(entry.id)}/>))}
+                    {result.map(entry => (<DiscoverTableRow key={`comment-${entry.id}`} config={config} item={entry} onClick={() => handleClickDisplay(entry.id)}/>))}
                   </Tbody>
                 </Table>
                 <TablePagination pagination={{ pageCount: pagination?.pageCount || 1 }} />

package/admin/src/pages/{Details/utils → utils}/api.js

@@ -1,9 +1,13 @@
-import { getApiURL, axiosInstance, handleAPIError } from '../../../utils';
+import { stringify } from 'qs';
+import { isEmpty } from 'lodash';
+
+import { getApiURL, axiosInstance, handleAPIError } from '../../utils';
 
 // eslint-disable-next-line import/prefer-default-export
-export const fetchDetailsData = async (id, toggleNotification) => {
+export const fetchDetailsData = async (id, queryParams, toggleNotification) => {
   try {
-    const { data } = await axiosInstance.get(getApiURL(`moderate/single/${id}`));
+    const stringifiedProps = !isEmpty(queryParams) ? `?${stringify(queryParams, { encode: false })}` : '';
+    const { data } = await axiosInstance.get(getApiURL(`moderate/single/${id}${stringifiedProps}`));
 
     return data;
   } catch (err) {
@@ -28,6 +32,14 @@ export const unblockItem = id => {
   return axiosInstance.patch(getApiURL(`moderate/single/${id}/unblock`));
 };
 
+export const approveItem = id => {
+  return axiosInstance.patch(getApiURL(`moderate/single/${id}/approve`));
+};
+
+export const rejectItem = id => {
+  return axiosInstance.patch(getApiURL(`moderate/single/${id}/reject`));
+};
+
 export const blockItemThread = id => {
   return axiosInstance.patch(getApiURL(`moderate/thread/${id}/block`));
 };

package/admin/src/translations/en.json

@@ -7,18 +7,23 @@
     "nav.item.discover": "Discover",
     "nav.item.reports": "Reports",
     "nav.item.settings": "Settings",
+    "page.common.item.status.OPEN": "OPEN",
+    "page.common.item.status.BLOCKED": "BLOCKED",
+    "page.common.item.status.APPROVED": "APPROVED",
+    "page.common.item.status.TO_REVIEW": "TO REVIEW ({count, number})",
+    "page.common.item.status.REJECTED": "REJECTED",
+    "page.common.item.status.REMOVED": "REMOVED BY AUTHOR",
     "page.updates.header": "Recent updates",
     "page.discover.header": "Discover threads",
     "page.discover.header.count": "entries found",
+    "page.discover.table.header.id": "ID",
     "page.discover.table.header.message": "Message",
     "page.discover.table.header.thread": "Thread of",
     "page.discover.table.header.entry": "Entry",
     "page.discover.table.header.lastUpdate": "Last update",
     "page.discover.table.header.status": "Status",
-    "page.discover.table.header.status.OPEN": "OPEN",
-    "page.discover.table.header.status.BLOCKED": "BLOCKED",
-    "page.discover.table.header.status.TO_REVIEW": "TO REVIEW ({count, number})",
-    "page.discover.table.header.actions": "Status",
+    "page.discover.table.header.actions": "Actions",
+    "page.discover.table.cell.thread": "Comment #{id}",
     "page.discover.table.action.display": "Display",
     "page.discover.table.action.reports": "Reports",
     "page.discover.table.empty": "You don't have any comments yet.",
@@ -52,6 +57,7 @@
     "page.details.panel.status.open": "OPEN",
     "page.details.panel.status.blocked": "BLOCKED",
     "page.details.panel.status.pending": "PENDING",
+    "page.details.panel.loading": "Fetching entity...",
     "page.details.actions.comment.block": "Block comment",
     "page.details.actions.comment.block.confirmation.header": "Moderation: Block comment",
     "page.details.actions.comment.block.confirmation.description": "Do you really want to block this comment?",
@@ -67,6 +73,11 @@
     "page.details.actions.thread.block.confirmation.success": "Thread has been blocked",
     "page.details.actions.thread.unblock": "Unblock thread",
     "page.details.actions.thread.unblock.confirmation.success": "Thread has been unblocked",
+    "page.details.actions.comment.approve.confirmation.success": "Comment has been approved",
+    "page.details.actions.comment.reject.confirmation.success": "Comment has been rejected",
+    "page.details.filters.label": "View",
+    "page.details.filters.removed.show": "Show removed",
+    "page.details.filters.removed.hide": "Hide removed",
     "page.coming.soon": "Wait for what is coming soon...",
     "compontents.confirmation.dialog.header": "Confirmation",
     "compontents.confirmation.dialog.description": "Do you really want to perform this action?",

package/admin/src/utils/constants.js

@@ -16,13 +16,10 @@ export const REPORT_REASON = {
 };
 
 export const COMMENT_STATUS = {
+  'UNKNOWN': 'UNKNOWN',
   'BLOCKED': 'BLOCKED',
   'OPEN': 'OPEN',
+  'REMOVED': 'REMOVED',
   'TO_REVIEW': 'TO_REVIEW',
-};
-
-export 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+/),
+  ...APPROVAL_STATUS,
 };

package/admin/src/utils/getMessage.js

@@ -4,7 +4,7 @@ import { isString } from 'lodash';
 
 import pluginId from '../pluginId';
 
-const getMessage = (input, defaultMessage, inPluginScope = true) => {
+const getMessage = (input, defaultMessage = '', inPluginScope = true) => {
     const { formatMessage } = useIntl();
     let formattedId = ''
     if (isString(input)) {

package/admin/src/utils/getRelatedGroups.js

@@ -1,5 +1,3 @@
-import { REGEX } from "./constants";
-
-const getRelatedGroups = related => related.split(REGEX.relatedUid).filter(s => s && s.length > 0);
+const getRelatedGroups = (related, config) => related.split(config.regex.relatedUid).filter(s => s && s.length > 0);
 
 export default getRelatedGroups;

package/admin/src/utils/index.js

@@ -3,4 +3,6 @@ export { default as getApiURL } from './getApiUrl';
 export { default as getUrl } from './getUrl';
 export { default as getMessage } from './getMessage';
 export { default as handleAPIError } from './handleAPIError';
-export { default as getRelatedGroups } from './getRelatedGroups';
+export { default as getRelatedGroups } from './getRelatedGroups';
+export { default as resolveCommentStatus } from './resolveCommentStatus';
+export { default as resolveCommentStatusColor } from './resolveCommentStatusColor';

package/admin/src/utils/renderEntryTitle.js

@@ -0,0 +1,14 @@
+import { first } from 'lodash';
+
+const renderEntryTitle = (entry, config = {}) => {
+    const { entryLabel } = config;
+    const rule = entry.uid in entryLabel ? entryLabel[entry.uid] : entryLabel['*'];
+    return first(
+      Object.keys(entry)
+        .filter(_ => (rule === _) || rule.includes(_))
+        .map(_ => entry[_])
+        .filter(_ => _)
+    );
+  };
+
+export default renderEntryTitle;

package/admin/src/utils/resolveCommentStatus.js

@@ -0,0 +1,30 @@
+import { isNil } from 'lodash';
+import { COMMENT_STATUS } from './constants';
+
+const resolveCommentStatus = ({ removed, blocked, blockedThread, approvalStatus, reviewFlowEnabled }) => {
+    const gotApprovalFlow = !isNil(approvalStatus);
+
+    if (reviewFlowEnabled) {
+        return COMMENT_STATUS.TO_REVIEW;
+    }
+
+    if (removed) {
+        return COMMENT_STATUS.REMOVED;
+    } 
+    
+    if (blocked || blockedThread) {
+        return COMMENT_STATUS.BLOCKED;
+    } 
+    
+    if (gotApprovalFlow) {
+        const status = approvalStatus.toUpperCase();
+        if (Object.keys(COMMENT_STATUS).includes(status)) {
+            return status;
+        }
+        return COMMENT_STATUS.UNKNOWN;
+    }
+
+    return COMMENT_STATUS.OPEN;
+}
+
+export default resolveCommentStatus;

package/admin/src/utils/resolveCommentStatusColor.js

@@ -0,0 +1,22 @@
+import { isNil } from 'lodash';
+import { COMMENT_STATUS } from './constants';
+
+const resolveCommentStatusColor = (status) => {
+    if (Object.keys(COMMENT_STATUS).includes(status)) {
+        switch (status) {
+            case COMMENT_STATUS.REMOVED:
+                return 'secondary';
+            case COMMENT_STATUS.TO_REVIEW:
+            case COMMENT_STATUS.REJECTED:
+                return 'warning';
+            case COMMENT_STATUS.BLOCKED:
+                return 'danger';
+            case COMMENT_STATUS.OPEN:
+            case COMMENT_STATUS.APPROVED:
+                return 'success';
+        };
+    }
+    return 'secondary';
+}
+
+export default resolveCommentStatusColor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -15,6 +15,7 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
+    "@strapi/utils": "^4.0.5",
     "bad-words": "^3.0.4"
   },
   "devDependencies": {
@@ -23,6 +24,9 @@
     "jest-cli": "^26.0.1",
     "jest-styled-components": "^7.0.2"
   },
+  "peerDependencies": {
+    "@strapi/strapi": "4.x"
+  },
   "author": {
     "name": "VirtusLab // Mateusz Ziarko",
     "email": "mziarko@virtuslab.com",
@@ -41,8 +45,8 @@
     }
   ],
   "engines": {
-    "node": ">=12.x. <=16.x.x",
-    "npm": ">=6.0.0"
+    "node": ">=14.x.x <=17.x.x",
+    "npm": ">=7.x.x"
   },
   "keywords": ["strapi", "plugin", "comments"],
   "license": "MIT"

package/server/config/index.js

@@ -2,9 +2,10 @@
 
 module.exports = {
   default: {
+    approvalFlow: [],
     entryLabel: {
       '*': ['Title', 'title', 'Name', 'name', 'Subject', 'subject']
-    }
+    },
   },
   validator() {},
 };

package/server/controllers/admin.js

@@ -16,11 +16,11 @@ module.exports = {
   },
 
   async findOne(ctx) {
-    const { params = {} } = ctx;
+    const { params = {}, query } = ctx;
     const { id } = parseParams(params);
     try {
       return await this.getService()
-        .findOneAndThread(id);
+        .findOneAndThread(id, query);
     } catch (e) {
       throwError(ctx, e);
     }
@@ -101,7 +101,7 @@ module.exports = {
     }
   },
 
-  async config() {
+  async config(ctx) {
     try {
       return await this.getService().config();
     } catch (e) {

package/server/controllers/client.js

@@ -18,6 +18,7 @@ module.exports = {
         .findAllFlat({
           query: {
             ...query,
+            $or: [{ removed: { $null: true } }, { removed: false }],
             related: relation,
           },
           populate: {

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')
 
@@ -25,8 +23,14 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
     // 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(),
+            }), {}),
         };
     },
 
@@ -34,10 +38,18 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
     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' }],
@@ -59,6 +71,7 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
                 ...params, 
                 populate: {
                     authorUser: true,
+                    threadOf: true,
                     reports: {
                         where: { 
                             resolved: false
@@ -87,7 +100,14 @@ 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: { 
@@ -98,7 +118,7 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
 
         const entity = await strapi.db.query(getModelUid('comment')).findOne({ 
             where: {
-                id
+                id,
             },
             populate: {
                 authorUser: true,
@@ -132,6 +152,8 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
         const entitiesOnSameLevel = await this.getCommonService()
             .findAllInHierarchy({
                 query: {
+                    ...defaultWhere,
+                    ...query,
                     threadOf: levelThreadId,
                     related: entity.related,
                 },
@@ -167,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);
@@ -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 }));
     },