Dashboard page

README.md

@@ -127,14 +127,14 @@ Complete installation requirements are exact same as for Strapi itself and can b
 
 **Minimum environment requirements**
 
-- Node.js `>=14.x.x`
+- Node.js `>=14.19.1 <=18.x.x`
 - NPM `>=7.x.x`
 
 In our minimum support we're following [official Node.js releases timelines](https://nodejs.org/en/about/releases/).
 
 **Supported Strapi versions**:
 
-- Strapi v4.4.3 (recently tested)
+- Strapi v4.10.5 (recently tested)
 - Strapi v4.x
 
 > This plugin is designed for **Strapi v4** and is not working with v3.x. To get version for **Strapi v3** install version [v1.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-comments/tree/strapi-v3).
@@ -176,6 +176,7 @@ module.exports = ({ env }) => ({
         "*": ["Title", "title", "Name", "name", "Subject", "subject"],
         "api::page.page": ["MyField"],
       },
+      blockedAuthorProps: ["name", "email"],
       reportReasons: {
         MY_CUSTOM_REASON: "MY_CUSTOM_REASON",
       },
@@ -197,6 +198,7 @@ module.exports = ({ env }) => ({
 - `entryLabel` - ordered list of property names per Content Type to generate related entity label. Keys must be in format like `'api::<collection name>.<content type name>'`. Default formatting set as `*`.
 - `reportReasons` - set of enums you would like to use for issuing abuse reports. Provided by default `'BAD_LANGUAGE'`, `'DISCRIMINATION'` and `'OTHER'`.
 - `gql` - specific configuration for GraphQL. See [Additional GQL Configuration](#additional-gql-configuration)
+- `blockedAuthorProps` - list of author's entity properties removed from a response for client side
 
 ## Additional GQL Configuration
 
@@ -359,6 +361,50 @@ Return a flat structure of comments for specified instance of Content Type like
 - [sorting](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest/sort-pagination.html#sorting)
 - [pagination](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest/sort-pagination.html#pagination)
 
+### Get Comments (by Author)
+
+_GraphQL equivalent: [Public GraphQL API -> Get Comments (by Author)](#get-comments-by-author-1)_
+
+`GET <host>/api/comments/author/<id>/<?type>`
+
+Return a flat structure of comments by specified Author for example `Author` with `ID: 1`
+
+**Example URL**: `https://localhost:1337/api/comments/author/1` - get comments by `ID:1` of Strapi User
+**Example URL**: `https://localhost:1337/api/comments/author/1/generic` - get comments by `ID:1` of Generic User
+
+**Example response body**
+
+```json
+{
+  "data": [
+    {
+      // -- Comment Model fields ---
+    },
+    {
+      // -- Comment Model fields ---
+    }
+    // ...
+  ],
+  "meta": {
+    "pagination": {
+      // payload based on Strapi REST Pagination specification
+    }
+  }
+}
+```
+
+**Possible response codes**
+
+- `200` - Successful. Response with list of comments (can be empty)
+- `400` - Bad Request. Requested list for not valid / not existing Content Type
+
+#### Strapi REST API properties support:
+
+- [filtering](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest/filtering-locale-publication.html#filtering)
+- [field selection](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest/populating-fields.html#field-selection)
+- [sorting](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest/sort-pagination.html#sorting)
+- [pagination](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest/sort-pagination.html#pagination)
+
 ### Post a Comment
 
 _GraphQL equivalent: [Public GraphQL API -> Post a Comments](#post-a-comment-1)_
@@ -532,13 +578,14 @@ _REST API equivalent: [Public REST API -> Get Comments](#get-comments)_
 
 ```graphql
 query {
-  findAllFlat(
-    relation: "api::page.page:1"
-    filters: { content: { contains: "Test" } }
-  ) {
+  findAllInHierarchy(relation: "api::page.page:1") {
     id
     content
     blocked
+    children {
+      id
+      content
+    }
     threadOf {
       id
     }
@@ -555,20 +602,28 @@ query {
 ```json
 {
   "data": {
-    "findAllFlat": [
+    "findAllInHierarchy": [
       {
-        "id": 3,
+        "id": 1,
         "content": "Test",
         "blocked": false,
+        "children": [
+          {
+            "id": 6,
+            "content": "Text to search for"
+          }
+          // ...
+        ],
         "threadOf": null,
         "author": {
           "id": "123456",
           "name": "Joe Doe"
         }
-      },
+      }
       // ...
     ]
   }
+}
 ```
 
 #### Strapi GraphQL API properties support:
@@ -583,14 +638,13 @@ _REST API equivalent: [Public REST API -> Get Comments (flat structure)](#get-co
 
 ```graphql
 query {
-  findAllInHierarchy(relation: "api::page.page:1") {
+  findAllFlat(
+    relation: "api::page.page:1"
+    filters: { content: { contains: "Test" } }
+  ) {
     id
     content
     blocked
-    children {
-      id
-      content
-    }
     threadOf {
       id
     }
@@ -607,28 +661,69 @@ query {
 ```json
 {
   "data": {
-    "findAllInHierarchy": [
+    "findAllFlat": [
       {
-        "id": 1,
+        "id": 3,
         "content": "Test",
         "blocked": false,
-        "children": [
-          {
-            "id": 6,
-            "content": "Text to search for"
-          }
-          // ...
-        ],
         "threadOf": null,
         "author": {
           "id": "123456",
           "name": "Joe Doe"
         }
-      }
+      },
       // ...
     ]
   }
+```
+
+#### Strapi GraphQL API properties support:
+
+- [filtering](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/graphql-api.html#filters)
+- [sorting](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/graphql-api.html#sorting)
+- [pagination](https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/graphql-api.html#pagination)
+
+### Get Comments (by Author)
+
+_REST API equivalent: [Public REST API -> Get Comments (by Author)](#get-comments-by-author)_
+
+**Example request**
+
+```graphql
+query {
+  findAllPerAuthor(authorId: 1, authorType: STRAPI) { // authorType might be one of [GENERIC, STRAPI]
+    data {
+      id
+      content
+      blocked
+      threadOf {
+        id
+      }
+    }
+  }
 }
+
+```
+
+**Example response**
+
+```json
+{
+  "data": {
+    "findAllPerAuthor": {
+      "data": [
+        {
+          "id": 4,
+          "content": "Hackaton test comment",
+          "blocked": false,
+          "threadOf": {
+            "id": 1
+          }
+        }
+      // ...
+      ]
+    }
+  }
 ```
 
 #### Strapi GraphQL API properties support:

admin/src/components/AdminAvatar/index.tsx

@@ -8,10 +8,10 @@ import {Icon} from "@strapi/design-system/Icon";
 const AdminAvatar: React.FC<React.PropsWithChildren<{}>>  = ({ children } ) => {
     return ( 
         <AdminAvatarWrapper>
+            {children}
             <AdminShield>
                 <Icon as={Shield} color="neutral800"/>
             </AdminShield>
-            {children}
         </AdminAvatarWrapper>
      );
 }

admin/src/components/AdminAvatar/styles.ts

@@ -3,13 +3,22 @@ import { Icon } from "@strapi/design-system/Icon";
 import styled from "styled-components";
 // @ts-ignore
 import { Box } from "@strapi/design-system/Box";
+// @ts-ignore
+import { Avatar, Initials } from "@strapi/design-system/Avatar";
 
 export const AdminAvatarWrapper = styled(Box)`
     position: relative;
 `;
 
 export const AdminShield = styled(Box)`
+    display: flex;
+    align-items: middle;
+
     position: absolute;
-    right: -30%;
-    top: -30%;
+    right: -20%;
+    top: -20%;
+
+    border-radius: 50%;
+
+    background: transparent;
 `;

admin/src/components/Avatar/index.tsx

@@ -17,25 +17,39 @@ import AdminAvatar from "../AdminAvatar";
 import { ToBeFixed } from "../../../../types";
 
 interface IProps {
-    avatar: string | ToBeFixed; 
-    name: string;
-    isAdminComment?: boolean;
-};
+  avatar: string | ToBeFixed;
+  name: string;
+  isAdminComment?: boolean;
+}
 
-const UserAvatar: React.FC<IProps> = ({ avatar, name, isAdminComment = false }) => {
+const UserAvatar: React.FC<IProps> = ({
+  avatar,
+  name,
+  isAdminComment = false,
+}) => {
   if (avatar) {
     let image = avatar;
+
     if (isObject(avatar)) {
       image = avatar?.formats?.thumbnail.url || avatar.url;
     }
-      return(
-        isAdminComment ? <AdminAvatar>{image && (<Avatar src={image} alt={name} />)}</AdminAvatar>
-        : image && (<Avatar src={image} alt={name} />))
-      }
-  return(
-    isAdminComment ? <AdminAvatar>{name && (<Initials>{renderInitials(name)}</Initials>)}</AdminAvatar>
-    : name && (<Initials>{renderInitials(name)}</Initials>)
-  ) 
+
+    return isAdminComment ? (
+      <AdminAvatar>
+        {image ? <Avatar src={image} alt={name} /> : null}
+      </AdminAvatar>
+    ) : image ? (
+      <Avatar src={image} alt={name} />
+    ) : null;
+  }
+
+  return isAdminComment ? (
+    <AdminAvatar>
+      {name ? <Initials>{renderInitials(name)}</Initials> : null}
+    </AdminAvatar>
+  ) : name ? (
+    <Initials>{renderInitials(name)}</Initials>
+  ) : null;
 };
 
 export default UserAvatar;

admin/src/components/DiscussionThreadItem/index.tsx

@@ -11,7 +11,7 @@ import { Box } from "@strapi/design-system/Box";
 import { Flex } from "@strapi/design-system/Flex";
 import { Typography } from "@strapi/design-system/Typography";
 import PropTypes from "prop-types";
-import React from "react";
+import React, { useMemo } from "react";
 
 import DiscussionThreadItemActions from "../DiscussionThreadItemActions";
 import DiscussionThreadItemFooter from "../DiscussionThreadItemFooter";
@@ -20,8 +20,12 @@ import {
   DiscussionThreadItemContainer,
   DiscussionThreadFullsize,
   DiscussionThreadItemContent,
+  DiscussionThreadItemContentTypographyRenderer,
 } from "./styles";
 
+import sanitizeHtml from './../PreviewWysiwyg/utils/satinizeHtml';
+import md from "./../PreviewWysiwyg/utils/mdRenderer";
+
 const DiscussionThreadItem = (props) => {
   const {
     as = "li",
@@ -34,6 +38,8 @@ const DiscussionThreadItem = (props) => {
     root,
   } = props;
 
+  const sanitizedContent = useMemo(() => sanitizeHtml(md.render(content || '')), [content]);
+
   return (
     <DiscussionThreadFullsize as={as} marginBottom={preview ? 4 : 0}>
       <DiscussionThreadItemContainer
@@ -54,7 +60,7 @@ const DiscussionThreadItem = (props) => {
         >
           <Box as={Flex} grow={1} alignItems="center" marginTop="6px">
             <Typography variant="omega" textColor="neutral800">
-              {content}
+              <DiscussionThreadItemContentTypographyRenderer dangerouslySetInnerHTML={{ __html: sanitizedContent }} />
             </Typography>
           </Box>
           {!preview && (

admin/src/components/DiscussionThreadItem/styles.ts

@@ -14,3 +14,17 @@ export const DiscussionThreadItemContent = styled(DiscussionThreadFullsize)`
 export const DiscussionThreadItemContainer = styled(DiscussionThreadFullsize)`
   align-items: flex-start;
 `;
+
+export const DiscussionThreadItemContentTypographyRenderer = styled.div`
+  strong {
+    font-weight: bold;
+  }
+
+  i, em {
+    font-style: italic;
+  }
+
+  u {
+    font-style: underline;
+  }
+`