strapi-plugin-comments 2.0.7 → 2.0.8

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

@@ -1,7 +1,7 @@
 import React, { useRef, useMemo, useState } from 'react';
 import { useQuery } from 'react-query';
 import { Formik } from 'formik';
-import { capitalize, first, orderBy, isEmpty, isEqual } from 'lodash';
+import { capitalize, first, orderBy, isEmpty, isEqual, isNil } from 'lodash';
 import {
 	CheckPermissions,
 	LoadingIndicatorPage,
@@ -109,7 +109,7 @@ const Settings = () => {
 		.filter(_ => _) || [];
 	const entryLabel = configData?.entryLabel || {};
 	const approvalFlow = configData?.approvalFlow || [];
-	const badWords = configData?.badWords || undefined;
+	const badWords = isNil(configData?.badWords) ? true : configData?.badWords;
 	const isGQLPluginEnabled = configData?.isGQLPluginEnabled;
 	const gqlAuthEnabled = configData?.gql?.auth || undefined;
 	const moderatorRoles = configData?.moderatorRoles

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",

package/server/services/__tests__/common.test.js

@@ -308,7 +308,7 @@ describe('Test Comments service functions utils', () => {
 
       beforeEach(() => setup({ enabledCollections: [collection] }, true, {
         'plugins::comments': db,
-        'api::collection': [relatedEntity],
+        'api::collection': [relatedEntity, { id: 2, title: 'Test 2', uid: collection }],
       }));
 
       describe('findAllFlat', () => {
@@ -327,6 +327,10 @@ describe('Test Comments service functions utils', () => {
           expect(result).toHaveProperty('meta');
           expect(result.data.length).toBe(4);
           expect(result).toHaveProperty(['data', 0, 'content'], db[0].content);
+          expect(result).toHaveProperty(['data', 0, 'author']);
+          expect(result).toHaveProperty(['data', 0, 'author', 'id'], db[0].authorId);
+          expect(result).toHaveProperty(['data', 0, 'author', 'name'], db[0].authorName);
+          expect(result).toHaveProperty(['data', 0, 'author', 'email'], db[0].authorEmail);
           expect(result).toHaveProperty(['data', 3, 'content'], db[3].content);
           expect(result).toHaveProperty(['meta', 'pagination', 'page'], 1);
           expect(result).toHaveProperty(['meta', 'pagination', 'pageSize'], 5);
@@ -370,6 +374,26 @@ describe('Test Comments service functions utils', () => {
           expect(result[0].children.length).toBe(0);
         });
       });
+
+      describe('findOne', () => {
+        test('Should return proper structure', async () => {
+          const result = await getPluginService('common').findOne({ related });
+          expect(result).toHaveProperty('id', db[0].id);
+          expect(result).toHaveProperty('content', db[0].content);
+          expect(result).toHaveProperty(['author', 'id'], db[0].authorId);
+          expect(result).toHaveProperty(['author', 'name'], db[0].authorName);
+          expect(result).toHaveProperty(['author', 'email'], db[0].authorEmail);
+        });
+      });
+
+      describe('findRelatedEntitiesFor', () => {
+        test('Should return proper structure', async () => {
+          const result = await getPluginService('common').findRelatedEntitiesFor(db);
+          expect(result).toHaveProperty([0, 'id'], relatedEntity.id);
+          expect(result).toHaveProperty([0, 'title'], relatedEntity.title);
+          expect(result).toHaveProperty([0, 'uid'], relatedEntity.uid);
+        });
+      });
     });
   });
 });