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

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

@@ -1,84 +0,0 @@
-import React, { useMemo } from 'react';
-import PropTypes from 'prop-types';
-import { useGlobalContext, CheckPermissions } from 'strapi-helper-plugin';
-import { Button } from '@buffetjs/core';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faComment, faCommentSlash, faComments, faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
-import Wrapper from './Wrapper';
-import pluginId from '../../pluginId';
-import pluginPermissions from '../../permissions';
-import { APPROVAL_STATUS } from '../../utils/constants';
-
-const ItemModeration = ({ id, blocked, blockedThread, onBlockClick, onBlockThreadClick, onApproveCommentClick, onRejectCommentClick, approvalStatus }) => {
-  const { formatMessage } = useGlobalContext();
-  const canBeApproved =
-    approvalStatus === APPROVAL_STATUS.PENDING ||
-    approvalStatus === APPROVAL_STATUS.REJECTED;
-  const approvalButtonProps = useMemo(
-    () =>
-      canBeApproved
-        ? {
-            onClick: onApproveCommentClick.bind(null, id),
-            color: 'primary',
-            label: formatMessage({
-              id: `${pluginId}.list.item.moderation.button.comment.approval.approve`,
-            }),
-          }
-        : {
-            onClick: onRejectCommentClick.bind(null, id),
-            color: 'delete',
-            label: formatMessage({
-              id: `${pluginId}.list.item.moderation.button.comment.approval.reject`,
-            }),
-          },
-    [canBeApproved, id],
-  );
-
-  return (
-    <CheckPermissions permissions={pluginPermissions.moderate}>
-      <Wrapper>
-        {approvalStatus ? (
-          <CheckPermissions permissions={pluginPermissions.moderateComments}>
-            <Button
-              {...approvalButtonProps}
-              icon={<FontAwesomeIcon icon={faExclamationCircle} />}
-            />
-          </CheckPermissions>
-        ) : null}
-        {!blockedThread && (
-          <CheckPermissions permissions={pluginPermissions.moderateComments}>
-            <Button
-              onClick={e => onBlockClick(id)}
-              color={blocked ? 'primary' : 'delete'} 
-              icon={<FontAwesomeIcon icon={blocked ? faComment : faCommentSlash} />} 
-              label={formatMessage({ id: `${pluginId}.list.item.moderation.button.comment.${blocked ? 'restore' : 'hide'}` })} />
-          </CheckPermissions>
-        )}
-        <CheckPermissions permissions={pluginPermissions.moderateThreads}>
-          <Button 
-            onClick={e => onBlockThreadClick(id)}
-            color={blockedThread ? 'primary' : 'delete'} 
-            icon={<FontAwesomeIcon icon={faComments} />} 
-            label={formatMessage({ id: `${pluginId}.list.item.moderation.button.thread.${blockedThread ? 'restore' : 'hide'}` })} />
-        </CheckPermissions>
-      </Wrapper>
-    </CheckPermissions>
-  );
-};
-
-ItemModeration.propTypes = {
-  id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), 
-  blocked: PropTypes.bool, 
-  blockedThread: PropTypes.bool, 
-  onBlockClick: PropTypes.func.isRequired, 
-  onBlockThreadClick: PropTypes.func.isRequired,
-  approvalStatus: PropTypes.oneOf([
-    APPROVAL_STATUS.APPROVED,
-    APPROVAL_STATUS.PENDING,
-    APPROVAL_STATUS
-  ]),
-  onApproveCommentClick: PropTypes.func,
-  onRejectCommentClick: PropTypes.func,
-};
-
-export default ItemModeration;

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

@@ -1,20 +0,0 @@
-import styled from 'styled-components';
-
-import { colors, sizes } from 'strapi-helper-plugin';
-
-const Container = styled.ul`
-  display: flex;
-  padding: ${2*sizes.margin}px;
-  flex-direction: column;
-  flex-grow: 1;
-  margin: 0;
-
-  z-index: 0;
-
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  list-style: none;
-`;
-
-export default Container;

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

@@ -1,21 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Item from '../Item';
-import Container from './Container';
-
-const List = ({ items, relatedContentTypes }) => (
-  <Container>
-    {items.map((item, n) => (
-      <Item
-        key={`list-item-${item.id || n}`}
-        relatedContentTypes={relatedContentTypes}
-        {...item}
-      />))}
-  </Container>
-);
-
-List.propTypes = {
-  items: PropTypes.array,
-};
-
-export default List;

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

@@ -1,83 +0,0 @@
-/*
- *
- * Search
- *
- */
-
-import React, { memo } from 'react';
-import { isEmpty, upperFirst } from 'lodash';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
-import { HeaderSearch } from 'strapi-helper-plugin';
-import getTrad from '../../utils/getTrad';
-
-const WAIT = 400;
-
-class Search extends React.Component {
-  state = { value: this.props.initValue };
-
-  timer = null;
-
-  componentDidUpdate(prevProps) {
-    const { model, value } = this.props;
-
-    if (prevProps.model !== model || (!isEmpty(prevProps.value) && isEmpty(value))) {
-      this.resetState();
-    }
-  }
-
-  resetState = () => this.setState({ value: '' });
-
-  handleChange = ({ target }) => {
-    clearTimeout(this.timer);
-    this.setState({ value: target.value });
-    this.timer = setTimeout(() => this.triggerChange(target.value), WAIT);
-  };
-
-  handleClick = () => {
-    this.setState({ value: '' });
-    this.triggerChange('');
-  };
-
-  triggerChange = value =>
-    this.props.changeParams({
-      target: {
-        name: '_q',
-        value,
-      },
-    });
-
-  render() {
-    const { model } = this.props;
-    const { value } = this.state;
-
-    return (
-      <FormattedMessage id={getTrad('components.Search.placeholder')}>
-        {placeholder => (
-          <HeaderSearch
-            label={upperFirst(model)}
-            onChange={this.handleChange}
-            onClear={this.handleClick}
-            placeholder={placeholder}
-            value={value}
-          />
-        )}
-      </FormattedMessage>
-    );
-  }
-}
-
-Search.defaultProps = {
-  changeParams: () => {},
-  model: '',
-  value: '',
-};
-
-Search.propTypes = {
-  changeParams: PropTypes.func,
-  initValue: PropTypes.string.isRequired,
-  model: PropTypes.string,
-  value: PropTypes.string,
-};
-
-export default memo(Search);

package/admin/src/containers/App/Wrapper.js

@@ -1,14 +0,0 @@
-import styled from 'styled-components';
-
-import { sizes } from 'strapi-helper-plugin';
-
-const Wrapper = styled.div`
-  min-height: calc(100vh - ${sizes.header.height});
-  .centered {
-    position: fixed;
-    top: calc(50% - 13px);
-    right: calc(50% - 13px);
-  }
-`;
-
-export default Wrapper;

package/admin/src/containers/App/index.js

@@ -1,47 +0,0 @@
-/**
- *
- * This component is the skeleton around the actual pages, and should only
- * contain code that should be seen on all pages. (e.g. navigation bar)
- *
- */
-
-import React,  { Suspense, lazy }from 'react';
-import { Switch, Route } from 'react-router-dom';
-import { NotFound, LoadingIndicatorPage, CheckPagePermissions } from 'strapi-helper-plugin';
-import Wrapper from './Wrapper';
-// Utils
-import pluginId from '../../pluginId';
-import DataManagerProvider from '../DataManagerProvider';
-import pluginPermissions from '../../permissions';
-// Containers
-
-
-const Panel = lazy(() => import('../Panel'));
-
-const App = () => {
-  return (
-    <CheckPagePermissions permissions={pluginPermissions.main}>
-      <Wrapper>
-        <DataManagerProvider>
-          <Suspense fallback={<LoadingIndicatorPage />}>
-            <Switch>
-              <Route
-                path={`/plugins/${pluginId}`}
-                component={Panel}
-                exact
-              />
-              <Route
-                path={`/plugins/${pluginId}/display/:id`}
-                component={Panel}
-                exact
-              />
-              <Route component={NotFound} />
-            </Switch>
-          </Suspense>
-        </DataManagerProvider>
-      </Wrapper>
-    </CheckPagePermissions>
-  );
-};
-
-export default App;

package/admin/src/containers/DataManagerProvider/actions.js

@@ -1,15 +0,0 @@
-export const GET_DATA = 'GET_DATA';
-export const GET_DATA_SUCCEEDED = 'GET_DATA_SUCCEEDED';
-export const GET_SINGLE_DATA = 'GET_SINGLE_DATA';
-export const BLOCK_COMMENT = 'BLOCK_COMMENT';
-export const BLOCK_COMMENT_THREAD = 'BLOCK_COMMENT_THREAD';
-export const GET_SINGLE_DATA_SUCCEEDED = 'GET_SINGLE_DATA_SUCCEEDED';
-export const RELOAD_PLUGIN = 'RELOAD_PLUGIN';
-export const BLOCK_COMMENT_SUCCESS = 'BLOCK_COMMENT_SUCCESS';
-export const BLOCK_COMMENT_THREAD_SUCCESS = 'BLOCK_COMMENT_THREAD_SUCCESS';
-export const RESOLVE_ABUSE_REPORT = 'RESOLVE_ABUSE_REPORT';
-export const RESOLVE_ABUSE_REPORT_SUCCESS = 'RESOLVE_ABUSE_REPORT_SUCCESS';
-export const APPROVE_COMMENT = 'APPROVE_COMMENT';
-export const REJECT_COMMENT = 'REJECT_COMMENT';
-export const APPROVE_COMMENT_SUCCESS = 'APPROVE_COMMENT_SUCCESS';
-export const REJECT_COMMENT_SUCCESS = 'REJECT_COMMENT_SUCCESS';

package/admin/src/containers/DataManagerProvider/index.js

@@ -1,332 +0,0 @@
-import React, { memo, useCallback, useEffect, useReducer, useRef } from 'react';
-import PropTypes from 'prop-types';
-import { get } from 'lodash';
-import {
-  request,
-  storeData,
-  LoadingIndicatorPage,
-  useGlobalContext,
-  generateFiltersFromSearch,
-  generateSearchFromFilters,
-  generateSearchFromObject,
-  getQueryParameters,
-} from 'strapi-helper-plugin';
-import { useHistory, useLocation, useRouteMatch } from 'react-router-dom';
-import moment from 'moment';
-import DataManagerContext from '../../contexts/DataManagerContext';
-import Container from '../../components/Container';
-import Search from '../../components/Search';
-import getTrad from '../../utils/getTrad';
-import pluginId from '../../pluginId';
-import init from './init';
-import reducer, { initialState } from './reducer';
-import {
-  BLOCK_COMMENT,
-  BLOCK_COMMENT_SUCCESS,
-  BLOCK_COMMENT_THREAD,
-  BLOCK_COMMENT_THREAD_SUCCESS,
-  GET_DATA,
-  GET_DATA_SUCCEEDED,
-  GET_SINGLE_DATA,
-  GET_SINGLE_DATA_SUCCEEDED,
-  RESOLVE_ABUSE_REPORT,
-  RESOLVE_ABUSE_REPORT_SUCCESS,
-  APPROVE_COMMENT,
-  APPROVE_COMMENT_SUCCESS,
-  REJECT_COMMENT,
-  REJECT_COMMENT_SUCCESS,
-} from './actions';
-
-const RECENTLY_VIEVEW_KEY = `${pluginId}-recently-viewed`;
-
-const getCurrent = async (dispatch, searchParams = {}, recentlyViewed = undefined) => {
-  try {
-    const generatedSearch = generateSearchFromObject(searchParams);
-    dispatch({
-      type: GET_DATA,
-    });
-    const result = await request(`/${pluginId}/moderation/all?${generatedSearch}`, {
-      method: 'GET',
-    });
-    const { items, total: itemsTotal } = result;
-
-    dispatch({
-      type: GET_DATA_SUCCEEDED,
-      items,
-      itemsTotal,
-      recentlyViewed,
-    });
-  } catch (err) {
-    console.error({ err });
-    strapi.notification.error('notification.error');
-  }
-};
-
-const getDetails = async (dispatch, activeId) => {
-  try {
-    if (activeId) {
-      dispatch({
-        type: GET_SINGLE_DATA,
-      });
-
-      const activeItem = await request(`/${pluginId}/moderation/single/${activeId}`, {
-        method: 'GET',
-      });
-
-      dispatch({
-        type: GET_SINGLE_DATA_SUCCEEDED,
-        activeItem,
-      });
-    }
-  } catch (err) {
-    console.error({ err });
-    strapi.notification.error('notification.error');
-  }
-};
-
-const DataManagerProvider = ({ children }) => {
-  const [reducerState, dispatch] = useReducer(reducer, initialState, init);
-  const {
-    autoReload,
-    currentEnvironment,
-    emitEvent,
-    formatMessage,
-  } = useGlobalContext();
-  const {
-    items,
-    itemsTotal,
-    activeItem,
-    isLoading,
-    isLoadingForDetailsDataToBeSet,
-    initialData,
-  } = reducerState.toJS();
-  const { pathname, search } = useLocation();
-  const { push } = useHistory();
-
-  const formatMessageRef = useRef();
-  formatMessageRef.current = formatMessage;
-
-  const isInDevelopmentMode = currentEnvironment === 'development' && autoReload;
-
-  const detailsViewMatch = useRouteMatch(`/plugins/${pluginId}/display/:id`);
-  const activeId = get(detailsViewMatch, 'params.id', null);
-
-  useEffect(() => {
-    getCurrent(dispatch, getSearchParams(), moment(storeData.get(RECENTLY_VIEVEW_KEY) || undefined));
-    storeData.set(RECENTLY_VIEVEW_KEY, moment().toString());
-  }, [search, dispatch]);
-
-  useEffect(() => {
-    // We need to set the modifiedData after the data has been retrieved
-    // and also on pathname change
-    if (!isLoading) {
-      getDetails(dispatch, activeId);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isLoading, pathname, dispatch, activeId]);
-
-  useEffect(() => {
-    if (currentEnvironment === 'development' && !autoReload) {
-      strapi.notification.info(
-        formatMessageRef.current({
-          id: getTrad('notification.info.autoreaload-disable'),
-        }),
-      );
-    }
-  }, [autoReload, currentEnvironment]);
-
-  const blockComment = async (id) => {
-    try {
-      emitEvent('willBlockComment');
-      dispatch({ type: BLOCK_COMMENT });
-
-      await request(`/${pluginId}/moderation/block/${id}`, {
-        method: 'PUT',
-      });
-
-      getCurrent(dispatch, getSearchParams());
-      getDetails(dispatch, activeId);
-
-      emitEvent('didBlockComment');
-      dispatch({ type: BLOCK_COMMENT_SUCCESS });
-
-      strapi.notification.success(`${pluginId}.notification.comment.visibility`);
-
-    } catch (err) {
-      emitEvent('didNotBlockComment');
-      console.error({ err: err.response });
-      strapi.notification.error('notification.error');
-    }
-  };
-
-  const blockCommentThread = async (id) => {
-    try {
-      emitEvent('willBlockCommentThread');
-      dispatch({ type: BLOCK_COMMENT_THREAD });
-
-      await request(`/${pluginId}/moderation/block-thread/${id}`, {
-        method: 'PUT',
-      });
-
-      getCurrent(dispatch, getSearchParams());
-      getDetails(dispatch, activeId);
-
-      emitEvent('didBlockCommentThread');
-      dispatch({ type: BLOCK_COMMENT_THREAD_SUCCESS });
-
-      strapi.notification.success(`${pluginId}.notification.thread.visibility`);
-
-    } catch (err) {
-      emitEvent('didNotBlockCommentThread');
-      console.error({ err: err.response });
-      strapi.notification.error('notification.error');
-    }
-  };
-
-  const resolveAbuseReport = async (id, commentId) => {
-    try {
-      emitEvent('willResolveAbuseReport');
-      dispatch({ type: RESOLVE_ABUSE_REPORT });
-
-      await request(`/${pluginId}/moderation/abuse-reports/${commentId}/resolve/${id}`, {
-        method: 'PATCH',
-      });
-
-      getCurrent(dispatch, getSearchParams());
-      getDetails(dispatch, activeId);
-
-      emitEvent('didResolveAbuseReport');
-      dispatch({ type: RESOLVE_ABUSE_REPORT_SUCCESS });
-
-      strapi.notification.success(`${pluginId}.notification.abuse-report.resolution`);
-
-    } catch (err) {
-      emitEvent('didNotResolveAbuseReport');
-      console.error({ err: err.response });
-      strapi.notification.error('notification.error');
-    }
-  };
-
-  const approveComment = async (id) => {
-    try {
-      dispatch({ type: APPROVE_COMMENT });
-      emitEvent('willApprove');
-
-      await request(`/${pluginId}/moderation/approve/${id}`, {
-        method: 'PUT',
-      });
-
-      getCurrent(dispatch, getSearchParams());
-      getDetails(dispatch, activeId);
-
-      dispatch({ type: APPROVE_COMMENT_SUCCESS });
-      emitEvent('didApprove');
-
-      strapi.notification.success(`${pluginId}.notification.comment.approval`);
-    } catch (err) {
-      console.error({ err: err.response });
-      strapi.notification.error('notification.error');
-      emitEvent('didNotApprove');
-    }
-  };
-
-  const rejectComment = async (id) => {
-    try {
-      dispatch({ type: REJECT_COMMENT });
-      emitEvent('willReject');
-
-      await request(`/${pluginId}/moderation/reject/${id}`, {
-        method: 'PUT',
-      });
-
-      getCurrent(dispatch, getSearchParams());
-      getDetails(dispatch, activeId);
-
-      dispatch({ type: REJECT_COMMENT_SUCCESS });
-      emitEvent('didReject');
-
-      strapi.notification.success(`${pluginId}.notification.comment.approval`);
-    } catch (err) {
-      console.error({ err: err.response });
-      strapi.notification.error('notification.error');
-      emitEvent('didNotReject');
-    }
-  };
-
-  const getSearchParams = useCallback(
-    (updatedParams = {}) => {
-      return {
-        _limit: getQueryParameters(search, '_limit') || 10,
-        _page: getQueryParameters(search, '_page') || 1,
-        _q: getQueryParameters(search, '_q') || '',
-        filters: generateFiltersFromSearch(search),
-        ...updatedParams,
-      };
-    },
-    [search],
-  );
-
-  const handleChangeParams = ({ target: { name, value } }) => {
-    const currentParams = getSearchParams();
-    const updatedParams = {
-      ...currentParams,
-      [name]: value,
-    };
-    const updatedSearch = getSearchParams({
-      ...updatedParams,
-      _start: name === '_q' ? 0 : updatedParams._start,
-      _page: name === '_q' ? 1 : updatedParams._page,
-    });
-    const newSearch = generateSearchFromFilters(updatedSearch);
-
-    if (name === '_limit') {
-      emitEvent('willChangeNumberOfEntriesPerPage');
-    }
-
-    push({ search: newSearch });
-  };
-
-  return (
-    <DataManagerContext.Provider
-      value={{
-        items,
-        itemsTotal,
-        search: getSearchParams(),
-        getSearchParams,
-        activeItem,
-        initialData,
-        isLoading,
-        isLoadingForDetailsDataToBeSet,
-        blockComment,
-        blockCommentThread,
-        resolveAbuseReport,
-        isInDevelopmentMode,
-        handleChangeParams,
-        approveComment,
-        rejectComment,
-      }}
-    >
-      {isLoading ? (
-        <LoadingIndicatorPage />
-      ) : (
-        <>
-          <Container>
-            <Search
-              changeParams={handleChangeParams}
-              initValue={getQueryParameters(search, '_q') || ''}
-              model="Comments"
-              value={getQueryParameters(search, '_q') || ''}
-            />
-          </Container>
-          {children}
-        </>
-      )}
-    </DataManagerContext.Provider>
-  );
-};
-
-DataManagerProvider.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
-export default memo(DataManagerProvider);

package/admin/src/containers/DataManagerProvider/init.js

@@ -1,5 +0,0 @@
-function init(initialState) {
-  return initialState;
-}
-
-export default init;

package/admin/src/containers/DataManagerProvider/reducer.js

@@ -1,59 +0,0 @@
-import { fromJS } from 'immutable';
-import moment from 'moment';
-import {
-  BLOCK_COMMENT,
-  BLOCK_COMMENT_THREAD,
-  GET_DATA,
-  GET_DATA_SUCCEEDED,
-  GET_SINGLE_DATA,
-  GET_SINGLE_DATA_SUCCEEDED,
-  RELOAD_PLUGIN,
-} from './actions';
-
-const initialState = fromJS({
-  items: [],
-  itemsTotal: 0,
-  activeItem: undefined,
-  isLoading: true,
-  isLoadingForDataToBeSet: false,
-  isLoadingForDetailsDataToBeSet: false,
-});
-
-const reducer = (state, action) => {
-  switch (action.type) {
-    case GET_DATA: {
-      return state
-        .removeIn('items')
-        .update('isLoadingForDataToBeSet', () => true);
-    }
-    case GET_DATA_SUCCEEDED: {
-      return state
-        .update('items', () => fromJS(action.items.map(_ => ({
-          ..._,
-          isNew: moment(_.created_at).diff(moment(action.recentlyViewed), 'seconds') > 0,
-        }))))
-        .update('itemsTotal', () => fromJS(action.itemsTotal))
-        .update('isLoading', () => false)
-        .update('isLoadingForDataToBeSet', () => false);
-    }
-    case GET_SINGLE_DATA:
-    case BLOCK_COMMENT:
-    case BLOCK_COMMENT_THREAD: {
-      return state
-        .removeIn('activeItem')
-        .update('isLoadingForDetailsDataToBeSet', () => true);
-    }
-    case GET_SINGLE_DATA_SUCCEEDED: {
-      return state
-        .update('activeItem', () => fromJS(action.activeItem))
-        .update('isLoadingForDetailsDataToBeSet', () => false);
-    }
-    case RELOAD_PLUGIN:
-      return initialState;
-    default:
-      return state;
-  }
-};
-
-export default reducer;
-export { initialState };