strapi-plugin-comments 1.0.2-beta.1 → 2.0.0-beta.2

package/{services → server/services}/utils/functions.js

@@ -1,5 +1,6 @@
 const BadWordsFilter = require('bad-words');
-const PluginError = require('./error');
+const PluginError = require('./../../utils/error');
+const { REGEX } = require('./../../utils/constants')
 const { first, get, isObject, isNil } = require('lodash');
 
 const buildNestedStructure = (
@@ -8,12 +9,11 @@ const buildNestedStructure = (
   field = 'parent',
   dropBlockedThreads = false,
   blockNestedThreads = false,
-  isMongoDB = false
 ) =>
   entities
     .filter(entity => {
         // mongo by default not return `null` for empty data
-        if ((entity[field] === null && id === null) || (isMongoDB && entity[field] === undefined && id === null)) {
+        if (entity[field] === null && id === null) {
             return true;
         }
         let data = entity[field];
@@ -34,12 +34,15 @@ const buildNestedStructure = (
 module.exports = {
     isEqualEntity: (existing, data, user) => {
         const { authorUser, authorId } = existing;
+        console.log('data', data);
+        console.log(existing);
+        const { author } = data;
         if (authorUser) {
-            const existingUserId = get(authorUser, 'id', authorUser);
-            const receivedUserId = get(user, 'id', data.authorUser);
+            const existingUserId = authorUser?.id || authorUser;
+            const receivedUserId = user?.id || author;
             return existingUserId === receivedUserId;
         }
-        return authorId === data.authorId;
+        return authorId === author?.id;
     },
 
     extractMeta: plugins => {
@@ -54,13 +57,21 @@ module.exports = {
         };
     },
 
+    getRelatedGroups: related => related.split(REGEX.relatedUid).filter(s => s && s.length > 0),
+
+    getModelUid: name => {
+        return strapi
+            .plugin('comments')
+            .contentTypes[name]?.uid;
+    },
+
     filterOurResolvedReports: item => (item ? {
         ...item,
         reports: (item.reports || []).filter(report => !report.resolved),
     } : item),
 
     checkBadWords: content => {
-        const config = get(strapi.config, 'custom.plugins.comments.badWords', true);
+        const config = get(strapi.config, 'plugins.comments.badWords', true);
         if (config) {
             const filter = new BadWordsFilter(isObject(config) ? config : undefined);
             if (content && filter.isProfane(content)) {
@@ -82,7 +93,7 @@ module.exports = {
     buildNestedStructure,
 
     isValidUserContext: (user = {}) => {
-        const builtInContextEnabled = get(strapi.config, 'custom.plugins.comments.enableUsers', false);
+		const builtInContextEnabled = get(strapi.config, 'plugins.comments.enableUsers', false);
         return builtInContextEnabled ? !isNil(user.id) : true;
     },
 

package/server/utils/constants.js

@@ -0,0 +1,16 @@
+const APPROVAL_STATUS = {
+  PENDING: "PENDING",
+  APPROVED: "APPROVED",
+  REJECTED: "REJECTED",
+};
+
+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+/),
+};
+
+module.exports = {
+  APPROVAL_STATUS,
+  REGEX,
+};

package/server/utils/functions.js

@@ -0,0 +1,19 @@
+'use strict'
+
+module.exports = {
+    getPluginService(name) {
+        return strapi
+          .plugin('comments')
+          .service(name);
+      },
+
+    parseParams: params => 
+        Object.keys(params).reduce((prev, curr) => {
+            const value = params[curr];
+            const parsedValue = Number(value);
+            return {
+                ...prev,
+                [curr]: isNaN(parsedValue) ? value : parsedValue
+            };
+        }, {}),
+};

package/strapi-admin.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./admin/src').default;

package/strapi-server.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const server = require('./server');
+const contentTypes = require('./content-types');
+
+module.exports = () => ({
+    ...server,
+    contentTypes,
+  });

package/admin/src/assets/images/icon-cross-blue.svg

@@ -1 +0,0 @@
-<svg width="8" height="8" xmlns="http://www.w3.org/2000/svg"><path d="M7.78 6.72L5.06 4l2.72-2.72a.748.748 0 0 0 0-1.06.748.748 0 0 0-1.06 0L4 2.94 1.28.22a.748.748 0 0 0-1.06 0 .748.748 0 0 0 0 1.06L2.94 4 .22 6.72a.748.748 0 0 0 0 1.06.748.748 0 0 0 1.06 0L4 5.06l2.72 2.72a.748.748 0 0 0 1.06 0 .752.752 0 0 0 0-1.06z" fill="#007EFF" fill-rule="evenodd"/></svg>

package/admin/src/assets/images/icon_remove.svg

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 49.3 (51167) - http://www.bohemiancoding.com/sketch -->
-    <title>Icon remove</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Pages" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Content-Manager---List-view" transform="translate(-279.000000, -165.000000)">
-            <g id="Container" transform="translate(234.000000, 0.000000)">
-                <g id="Add-filters" transform="translate(0.000000, 60.000000)">
-                    <g id="Icon-remove" transform="translate(45.000000, 105.000000)">
-                        <rect id="Rectangle-12" stroke="#E3E9F3" x="0.5" y="0.5" width="19" height="19" rx="9.5"></rect>
-                        <path d="M6,10 L14,10" id="Line-4" stroke="#007EFF" stroke-width="2" stroke-linecap="round"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

package/admin/src/assets/images/logo.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M532 386.2c27.5-27.1 44-61.1 44-98.2 0-80-76.5-146.1-176.2-157.9C368.3 72.5 294.3 32 208 32 93.1 32 0 103.6 0 192c0 37 16.5 71 44 98.2-15.3 30.7-37.3 54.5-37.7 54.9-6.3 6.7-8.1 16.5-4.4 25 3.6 8.5 12 14 21.2 14 53.5 0 96.7-20.2 125.2-38.8 9.2 2.1 18.7 3.7 28.4 4.9C208.1 407.6 281.8 448 368 448c20.8 0 40.8-2.4 59.8-6.8C456.3 459.7 499.4 480 553 480c9.2 0 17.5-5.5 21.2-14 3.6-8.5 1.9-18.3-4.4-25-.4-.3-22.5-24.1-37.8-54.8zm-392.8-92.3L122.1 305c-14.1 9.1-28.5 16.3-43.1 21.4 2.7-4.7 5.4-9.7 8-14.8l15.5-31.1L77.7 256C64.2 242.6 48 220.7 48 192c0-60.7 73.3-112 160-112s160 51.3 160 112-73.3 112-160 112c-16.5 0-33-1.9-49-5.6l-19.8-4.5zM498.3 352l-24.7 24.4 15.5 31.1c2.6 5.1 5.3 10.1 8 14.8-14.6-5.1-29-12.3-43.1-21.4l-17.1-11.1-19.9 4.6c-16 3.7-32.5 5.6-49 5.6-54 0-102.2-20.1-131.3-49.7C338 339.5 416 272.9 416 192c0-3.4-.4-6.7-.7-10C479.7 196.5 528 238.8 528 288c0 28.7-16.2 50.6-29.7 64z"/></svg>
-<!--
-Font Awesome Free 5.2.0 by @fontawesome - https://fontawesome.com
-License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
--->

package/admin/src/components/AbuseReportsPopUp/ItemPreviewContainer.js

@@ -1,8 +0,0 @@
-import Container from '../List/Container';
-import styled from 'styled-components';
-
-const ItemPreviewContainer = styled(Container)`
-    padding: 0;
-`;
-
-export default ItemPreviewContainer;

package/admin/src/components/AbuseReportsPopUp/ModalFooter.js

@@ -1,31 +0,0 @@
-import { ModalFooter as StrapiModalFooter, colors } from 'strapi-helper-plugin';
-
-import styled from 'styled-components';
-
-const ModalFooter = styled(StrapiModalFooter)`
-      section {
-        justify-content: flex-end;
-        &:last-of-type {
-            justify-content: flex-end;
-        }
-
-        label {
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            justify-content: center;
-            padding: 0;
-            margin: 0;
-
-            color: ${colors.leftMenu.darkGrey};
-            font-weight: 600;
-            font-style: italic;
-        }
-
-        button {
-            margin-left: 1rem;
-        }
-    }
-`;
-
-export default ModalFooter;

package/admin/src/components/AbuseReportsPopUp/TableContainer.js

@@ -1,63 +0,0 @@
-import { colors } from 'strapi-helper-plugin';
-
-import styled from 'styled-components';
-
-const TableContainer = styled.div`
-    table {
-        thead {
-            tr {
-                border-bottom: 1px ${colors.grey} solid;
-
-                td {
-                    background: transparent;
-
-                    &:first-child {
-                        padding-left: 0;
-                    }
-
-                    &:last-child {
-                        padding-right: 0;
-                    }
-                }
-            }
-        }
-
-        tbody {
-            tr {
-                background-color: white;
-
-                td {
-                    &:first-child {
-                        padding-left: 0;
-                    }
-
-                    &:last-child {
-                        padding-right: 0;
-                    }
-                }
-
-                &:last-child {
-                    border-bottom: 0;
-                }
-
-                &:hover {
-                    background-color: white;
-
-                    cursor: default;
-                }
-            }
-        }
-
-        p {
-            margin: 0;
-            padding: 0;
-        }
-    }
-
-    &>div {
-        box-shadow: none;
-        border: 0;
-    }
-`;
-
-export default TableContainer;

package/admin/src/components/AbuseReportsPopUp/index.js

@@ -1,148 +0,0 @@
-/**
- *
- * AbuseReportsPopUp
- *
- */
-
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import moment from 'moment';
-import PropTypes from 'prop-types';
-import { isEmpty } from 'lodash';
-import {
-  ButtonModal,
-  HeaderModal,
-  HeaderModalTitle,
-  Modal,
-  ModalBody,
-  ModalForm,
-  useGlobalContext,
-  CheckPermissions,
-} from 'strapi-helper-plugin';
-import { Table, Button } from '@buffetjs/core';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import {
-  faCheck,
-  faSmile,
-} from '@fortawesome/free-solid-svg-icons';
-import TableContainer from './TableContainer';
-import EmptyView from '../EmptyView';
-import ItemDetails from '../ItemDetails';
-import ItemPreviewContainer from './ItemPreviewContainer';
-import ModalFooter from './ModalFooter';
-import pluginId from '../../pluginId';
-
-// Translations
-import en from '../../translations/en.json';
-import pluginPermissions from '../../permissions';
-
-const CustomRow = props => {
-  const { row, formatMessage, onClick } = props;
-  const { created_at, reason, content } = row;
-  return (<tr>
-      <td>{ created_at }</td>
-      <td>{ reason }</td>
-      <td><em>{ content }</em></td>
-      <td style={{ textAlign: 'right' }}><Button
-        onClick={onClick}
-        color="secondary"
-        icon={<FontAwesomeIcon icon={faCheck} />} 
-        label={formatMessage({ id: `${pluginId}.popup.reports.item.button` })}
-      /></td>
-    </tr>);
-}
-
-const AbuseReportsPopUp = ({ isOpen, reports, comment, blocked, blockedThread, onBlockClick, onBlockThreadClick, onClose, onAbuseReportResolveClick }) => {
-
-  const { formatMessage } = useGlobalContext();
-
-  const resolveReportReason = reason => formatMessage({ id: `${pluginId}.popup.reports.item.reason.${reason.toLowerCase()}`});
-
-  const headers = [
-    {
-      name: formatMessage({ id: `${pluginId}.popup.reports.item.header.date` }),
-      value: 'created_at',
-    },
-    {
-      name: formatMessage({ id: `${pluginId}.popup.reports.item.header.reason` }),
-      value: 'reason',
-    },
-    {
-      name: formatMessage({ id: `${pluginId}.popup.reports.item.header.message` }),
-      value: 'content',
-    },
-    { value: 'actions' }
-  ];
-
-  const rows = reports.map(({ id, created_at, content, reason }) => ({
-    id,
-    created_at: moment(created_at).format('DD/MM/YYYY, HH:mm'),
-    reason: resolveReportReason(reason),
-    content,
-  }));
-  
-  return (
-    <CheckPermissions permissions={pluginPermissions.moderateReports}>
-      <Modal isOpen={isOpen} onToggle={onClose}>
-        <HeaderModal>
-          <section>
-            <HeaderModalTitle>
-              <FormattedMessage id={`${pluginId}.popup.reports.header`} />
-            </HeaderModalTitle>
-          </section>
-        </HeaderModal>
-        <ModalForm>
-          <ModalBody>
-            <section style={{ width: '100%' }}>
-              <ItemPreviewContainer>
-                <ItemDetails root={true} {...comment} />
-              </ItemPreviewContainer>
-              { isEmpty(reports) && (
-                <EmptyView>
-                  <FontAwesomeIcon icon={faSmile} size="5x" />
-                  <FormattedMessage id={`${pluginId}.popup.reports.empty`} />
-                </EmptyView>
-              ) }
-              { !isEmpty(reports) && (<TableContainer>
-                  <Table
-                  customRow={props => (<CustomRow {...props} formatMessage={formatMessage} onClick={(e) => onAbuseReportResolveClick(e, props.row.id)} />)}
-                  headers={headers}
-                  rows={rows}
-                />
-              </TableContainer>)}
-            </section>
-          </ModalBody>
-        </ModalForm>
-        { !isEmpty(reports) && !blockedThread && !blocked && (<ModalFooter>
-          <section>
-            <label>
-              <FormattedMessage id={`${pluginId}.popup.reports.footer.actions`} />
-            </label>
-            { !blockedThread && (<ButtonModal
-              onClick={e => onBlockClick(comment.id)}
-              isSecondary
-              message={`${pluginId}.list.item.moderation.button.comment.hide`} />)}
-            <ButtonModal 
-              onClick={e => onBlockThreadClick(comment.id)}
-              isSecondary
-              message={`${pluginId}.list.item.moderation.button.thread.hide`} />
-          </section>
-        </ModalFooter>)}
-      </Modal>
-    </CheckPermissions>
-  );
-}
-
-AbuseReportsPopUp.propTypes = {
-  blocked: PropTypes.bool,
-  blockedThread: PropTypes.bool,
-  reports: PropTypes.array,
-  comment: PropTypes.object.isRequired,
-  onBlockClick: PropTypes.func.isRequired,
-  onBlockThreadClick: PropTypes.func.isRequired,
-  onAbuseReportResolveClick: PropTypes.func.isRequired,
-  isOpen: PropTypes.bool,
-  onClose: PropTypes.func.isRequired,
-};
-
-export default AbuseReportsPopUp;

package/admin/src/components/Container/index.js

@@ -1,7 +0,0 @@
-import styled from 'styled-components';
-
-const Container = styled.div`
-  padding: 0 30px;
-`;
-
-export default Container;

package/admin/src/components/EmptyView/index.js

@@ -1,25 +0,0 @@
-import styled from 'styled-components';
-
-import { colors } from 'strapi-helper-plugin';
-
-const EmptyView = styled.div`
-  display: flex;
-  flex-grow: 1;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding-left: 2rem;
-  padding-right: 2rem;
-  padding-bottom: ${props => props.fixPosition ? '8rem' : 0};
-
-  font-size: 2rem;
-  font-weight: 600;
-  color: ${colors.leftMenu.grey};
-  text-align: center;
-
-  svg {
-    margin-bottom: 1rem;
-  }
-`;
-
-export default EmptyView;

package/admin/src/components/Filters/index.js

@@ -1,151 +0,0 @@
-import React, { useMemo } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Collapse } from 'reactstrap';
-import { Select } from '@buffetjs/core';
-import { map, noop, startCase } from 'lodash';
-
-import { FilterButton, getFilterType } from 'strapi-helper-plugin';
-
-import { AddFilterCta, Container, FilterIcon, FiltersWrapper, InputWrapper, styles, Wrapper } from './index.styled';
-import useDataManager from '../../hooks/useDataManager';
-import { isEntityFilter, isMatch } from './utils';
-
-const allowedAttributes = ['Related to'];
-
-const Filters = ({
-  contentsTypes,
-  isLoadingContentsTypes,
-  isOpenFilter,
-  onToggleOpen,
-  onRemoveFilter,
-  onChangeFilter,
-  filters,
-  isLoadingEntries,
-  availableEntriesMap,
-}) => {
-  const filtersOptions = getFilterType();
-  const { search } = useDataManager();
-
-  const searchFilters = useMemo(
-    () => (search.filters.reduce(
-        (acc, current) => ({ ...acc, [current.name]: { ...current, contentType: filters?.related?.value } }),
-        {})
-    ),
-    [search.filters],
-  );
-
-  const contentsTypesOptions = useMemo(
-    () => [{ key: '', value: '' }, ...(contentsTypes || []).map(_ => ({ ..._, key: startCase(_.key) }))],
-    [contentsTypes],
-  );
-  const availableEntriesOptions = useMemo(
-    () => [{ key: '', value: '' }, ...(availableEntriesMap[filters?.related?.value] || [])],
-    [availableEntriesMap],
-  );
-
-  if (isLoadingContentsTypes) {
-    return null;
-  }
-  return (
-    <>
-      <Collapse isOpen={isOpenFilter}>
-        <Container>
-          <form>
-            <Wrapper>
-              <FiltersWrapper borderLeft={filters.related.value}>
-                <InputWrapper>
-                  <Select
-                    disabled
-                    options={allowedAttributes}
-                    onChange={noop}
-                    name='name'
-                    value={filters.related.name}
-                    style={styles.select}
-                  />
-                  <Select
-                    disabled
-                    name='filter'
-                    onChange={noop}
-                    value={filters.related.filter}
-                    options={
-                      filtersOptions.map(({ id, value }) => (
-                        <FormattedMessage key={id} id={id}>
-                          {msg => <option value={value}>{msg}</option>}
-                        </FormattedMessage>
-                      ))
-                    }
-                    style={styles.selectMiddle}
-                  />
-                  <Select
-                    name="related-value"
-                    onChange={onChangeFilter}
-                    value={filters.related.value}
-                    options={
-                      contentsTypesOptions
-                        .map(({ key, value }) => (
-                          <option key={value} value={value}>
-                            {key}
-                          </option>
-                        ))
-                    }
-                    style={styles.select}
-                  />
-                  {
-                    filters.related.value && !isLoadingEntries && (
-                      <Select
-                        name="entity-value"
-                        options={
-                          availableEntriesOptions.map(({ key, value }) => (
-                            <option key={key} value={value}>
-                              {key}
-                            </option>
-                          ))
-                        }
-                        value={filters?.entity?.value}
-                        onChange={onChangeFilter}
-                        style={styles.select}
-                      />
-                    )
-                  }
-                </InputWrapper>
-              </FiltersWrapper>
-            </Wrapper>
-          </form>
-        </Container>
-      </Collapse>
-      <div className="container-fluid">
-        <div className="row">
-          <AddFilterCta type="button" onClick={onToggleOpen}>
-            <FilterIcon />
-            <FormattedMessage id="app.utils.filters" />
-          </AddFilterCta>
-          {
-            !isLoadingEntries && map(
-              searchFilters,
-              (filter) => {
-                if (!filter.value) {
-                  return null;
-                }
-                const label = {
-                  ...filter,
-                  value: (isEntityFilter(filter.name)
-                    ? availableEntriesMap[filter.contentType] || []
-                    : contentsTypesOptions).find(isMatch(filter.value))?.key,
-                };
-                return (
-                  <FilterButton
-                    key={filter.name}
-                    onClick={onRemoveFilter(filter)}
-                    label={label}
-                    type="string"
-                  />
-                );
-              })
-          }
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default Filters;

package/admin/src/components/Filters/index.styled.js

@@ -1,82 +0,0 @@
-import styled from 'styled-components';
-import { Button, FilterIcon as Filter } from 'strapi-helper-plugin';
-
-export const FilterIcon = styled(Filter)`
-  padding: 0 !important;
-  margin: auto !important;
-  > g {
-    stroke: #282b2c;
-  }
-`;
-
-export const AddFilterCta = styled(Button)`
-  display: flex;
-  height: 30px;
-  margin-right: 10px;
-  padding: 0 10px;
-  text-align: center;
-  background-color: #ffffff;
-  border: 1px solid #e3e9f3;
-  border-radius: 2px;
-  line-height: 28px;
-  font-size: 13px;
-  font-weight: 500;
-  font-family: Lato;
-  -webkit-font-smoothing: antialiased;
-  cursor: pointer;
-  &:hover {
-    background: #f7f8f8;
-  }
-  &:focus,
-  &:active {
-    outline: 0;
-  }
-  > span {
-    margin-left: 10px;
-  }
-`;
-
-export const Container = styled.div`
-  padding: 18px 30px 18px 0;
-`;
-
-export const Wrapper = styled.div`
-  margin-top: -6px;
-  > div {
-    padding-top: 2px;
-    &:not(:first-of-type) {
-      padding-top: 9px;
-      padding-bottom: 2px;
-      &:last-of-type:nth-of-type(even) {
-        padding-bottom: 11px;
-      }
-    }
-  }
-`;
-
-export const FiltersWrapper = styled.div`
-  min-height: 38px;
-  border-left: ${props => props.borderLeft && '3px solid #007EFF'};
-  padding-left: ${props => (props.borderLeft ? '10px' : '13px')};
-  margin-bottom: 0 !important;
-`;
-
-export const InputWrapper = styled.div`
-  display: flex;
-  input,
-  select {
-    margin: 0px 5px !important;
-  }
-`;
-export const styles = {
-  select: {
-    minWidth: '170px',
-    maxWidth: '200px',
-  },
-  selectMiddle: {
-    minWidth: '130px',
-    maxWidth: '200px',
-    marginLeft: '10px',
-    marginRight: '10px',
-  },
-};