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

package/admin/src/index.js

@@ -4,6 +4,7 @@ import pluginId from './pluginId';
 import Initializer from './components/Initializer';
 import PluginIcon from './components/PluginIcon';
 import pluginPermissions from './permissions';
+import reducers from './reducers';
 
 const name = pluginPkg.strapi.name;
 
@@ -24,6 +25,7 @@ export default {
       },
       permissions: pluginPermissions,
     });
+    app.addReducers(reducers);
     app.registerPlugin({
       id: pluginId,
       initializer: Initializer,
@@ -33,10 +35,10 @@ export default {
   },
 
   bootstrap(app) {
-    app.injectContentManagerComponent('editView', 'informations', {
-        name: 'comments-link',
-        Component: () => 'TODO: Comments count',
-    });
+    // app.injectContentManagerComponent('editView', 'informations', {
+    //     name: 'comments-link',
+    //     Component: () => 'TODO: Comments count',
+    // });
   },
   
   async registerTrads({ locales }) {

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

@@ -5,16 +5,44 @@
  *
  */
 
-import React from 'react';
+import React, { useReducer } from 'react';
 import { Switch, Route } from 'react-router-dom';
-import { NotFound } from '@strapi/helper-plugin';
+import { useQuery } from 'react-query';
+import { 
+  NotFound, 
+  LoadingIndicatorPage, 
+  useNotification } from '@strapi/helper-plugin';
+
 import ComingSoonPage from '../ComingSoonPage';
 import getUrl from '../../utils/getUrl';
 import Discover from '../Discover';
 import Details from '../Details';
-
+import { fetchConfig } from './utils/api';
+import initReducer from './reducer/init';
+import reducer, { initialState } from './reducer';
+import { setConfig } from './reducer/actions';
 
 const App = () => {
+
+  const toggleNotification = useNotification();
+  const [reducerState, dispatch] = useReducer(reducer, initialState, () =>
+    initReducer(initialState)
+  );
+
+  const { isLoading, isFetching } = useQuery(
+    'get-config', () => fetchConfig(toggleNotification),
+    {
+      initialData: { },
+      onSuccess: (response) => {
+        dispatch(setConfig(response));
+      }
+    }
+  );
+
+  if (isLoading || isFetching) {
+    return (<LoadingIndicatorPage />)
+  }
+
   return (
     <div>
       <Switch>

package/admin/src/pages/App/reducer/actions.js

@@ -0,0 +1,8 @@
+import { GET_CONFIG, SET_CONFIG } from "./constants";
+
+export const setConfig = data => ({
+    data,
+    type: SET_CONFIG,
+  });
+
+export const getConfig = () => ({ type: GET_CONFIG });

package/admin/src/pages/App/reducer/constants.js

@@ -0,0 +1,4 @@
+export const REDUCER_NAME = 'plugin-comments_app';
+
+export const SET_CONFIG = 'SET_CONFIG';
+export const GET_CONFIG = 'GET_CONFIG';

package/admin/src/pages/App/reducer/index.js

@@ -0,0 +1,27 @@
+import produce from 'immer'; // current
+import { set } from 'lodash';
+import { GET_CONFIG, SET_CONFIG } from './constants';
+
+const initialState = {
+  config: {},
+};
+
+const reducer = (state = initialState, action) =>
+  // eslint-disable-next-line consistent-return
+  produce(state, draftState => {
+    switch (action.type) {
+      case SET_CONFIG: {
+        set(draftState, 'config', action.data);
+        break;
+      }
+      case GET_CONFIG: {
+        return draftState?.config;
+      }
+      default:
+        console.log('draftState', draftState);
+        return draftState;
+    }
+  });
+
+export default reducer;
+export { initialState };

package/admin/src/pages/App/reducer/init.js

@@ -0,0 +1,7 @@
+const initReducer = (initialState) => {
+    return {
+      ...initialState,
+    };
+  };
+  
+  export default initReducer;

package/admin/src/pages/App/reducer/selectors.js

@@ -0,0 +1,35 @@
+
+   
+import { createSelector } from 'reselect';
+import { initialState } from './';
+import { REDUCER_NAME } from './constants';
+
+/**
+ * Direct selector to the listView state domain
+ */
+const appView = () => state => state[REDUCER_NAME] || initialState;
+
+/**
+ * Other specific selectors
+ */
+
+/**
+ * Default selector used by listView
+ */
+
+const makeAppView = () =>
+  createSelector(
+    appView(),
+    substate => {
+      return substate;
+    }
+  );
+
+const selectConfig = state => {
+  const { config } = state[REDUCER_NAME];
+
+  return config;
+};
+
+export default makeAppView;
+export { appView, selectConfig };

package/admin/src/pages/App/utils/api.js

@@ -0,0 +1,20 @@
+import { stringify } from 'qs';
+import { isEmpty } from 'lodash';
+
+import { getApiURL, axiosInstance } from '../../../utils';
+
+// eslint-disable-next-line import/prefer-default-export
+export const fetchConfig = async (toggleNotification) => {
+  try {
+    const { data } = await axiosInstance.get(getApiURL(`moderate/config`));
+
+    return data;
+  } catch (err) {
+    toggleNotification({
+      type: 'warning',
+      message: { id: 'notification.error' },
+    });
+
+    throw new Error('error');
+  }
+};

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

@@ -5,6 +5,9 @@
  */
 
 import React, { memo, useRef, useMemo } from 'react';
+import { connect } from 'react-redux';
+import { bindActionCreators, compose } from 'redux';
+import isEqual from 'react-fast-compare';
 import { useIntl } from 'react-intl';
 import { useQuery } from 'react-query';
 import { useHistory } from 'react-router-dom';
@@ -41,8 +44,10 @@ import { COMMENT_STATUS } from '../../utils/constants';
 import TablePagination from '../../components/TablePagination';
 import filtersSchema from './utils/filtersSchema';
 import TableFilters from '../../components/TableFilters';
+import appReducer from '../App/reducer';
+import makeAppView, { selectConfig } from '../App/reducer/selectors';
 
-const Discover = () => {
+const Discover = ({ config }) => {
   useFocusWhenNavigate();
 
   const { push } = useHistory();
@@ -182,4 +187,17 @@ const Discover = () => {
         </Box>;
 }
 
-export default memo(Discover);
+const mapStateToProps = makeAppView();
+
+export function mapDispatchToProps(dispatch) {
+  return bindActionCreators(
+    { },
+    dispatch
+  );
+}
+const withConnect = connect(
+  mapStateToProps,
+  mapDispatchToProps
+);
+
+export default compose(withConnect)(memo(Discover, isEqual));

package/admin/src/pages/Discover/utils/api.js

@@ -6,9 +6,6 @@ import { getApiURL, axiosInstance } from '../../../utils';
 // eslint-disable-next-line import/prefer-default-export
 export const fetchData = async (queryParams, toggleNotification) => {
   try {
-    console.log('api');
-    console.log(queryParams);
-    console.log(getApiURL(`moderate/all${!isEmpty(queryParams) ? `?${stringify(queryParams, { encode: false })}` : ''}`));
     const { data } = await axiosInstance.get(getApiURL(`moderate/all${queryParams ? `?${stringify(queryParams, { encode: false })}` : ''}`));
 
     return data;

package/admin/src/reducers.js

@@ -0,0 +1,8 @@
+import appReducer from './pages/App/reducer';
+import { REDUCER_NAME } from './pages/App/reducer/constants';
+
+const reducers = {
+    [`${REDUCER_NAME}`]: appReducer,
+};
+
+export default reducers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",

package/server/config/index.js

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

package/server/controllers/admin.js

@@ -102,27 +102,11 @@ module.exports = {
   },
 
   async config() {
-    const configRelatedContentTypes = _.get(strapi.config, ['plugins', 'comments', 'relatedContentTypes'], {});
-    const contentsTypes = this.getContentsTypes();
-    const relatedContentTypes = Object
-      .keys(configRelatedContentTypes)
-      .reduce((acc, currentKey) => {
-          const current = configRelatedContentTypes[currentKey];
-          const { key } = contentsTypes.find(content => content.value === currentKey) || {};
-          return {
-            ...acc,
-            [currentKey]: {
-              ...current,
-              globalName: _.snakeCase(key),
-            },
-          };
-        },
-        {},
-      );
-    return {
-      relatedContentTypes,
-      contentsTypes,
-    };
+    try {
+      return await this.getService().config();
+    } catch (e) {
+      throwError(ctx, e);
+    }
   },
 
   getContentsTypes() {

package/server/services/admin.js

@@ -22,6 +22,14 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
         return getPluginService('common');
     },
 
+    // Config
+    async config() {
+        const entryLabel = this.getCommonService().getConfig('entryLabel');
+        return {
+            entryLabel,
+        };
+    },
+
     // Find all comments
     async findAll({ related, entity, ...query }) {
         const { _q, orderBy, pageSize = 10, page = 1, filters, ...rest } = parseParams(query);
@@ -57,8 +65,6 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
             .map(_ => filterOurResolvedReports(this.getCommonService().sanitizeCommentEntity(_)))
             .map(_ => this.getCommonService().mergeRelatedEntityTo(_, relatedEntities));
 
-            console.log(relatedEntities);
-
         return {
             result,
             pagination: {

package/server/services/common.js

@@ -93,7 +93,7 @@ module.exports = ({ strapi }) => ({
             return { id: _.id, itemsInTread: count, firstThreadItemId: first(nestedEntries)?.id }
         }));
 
-        const relatedEntities = relatedEntity !== null ? [relatedEntity] : await this.findRelatedEntitiesFor([...entitiesRoot, ...entitiesNested]);
+        const relatedEntities = relatedEntity !== null ? [relatedEntity] : await this.findRelatedEntitiesFor([...entries]);
         const result = entries
             .map(_ => {
                 const threadedItem = entriesWithThreads.find(item => item.id === _.id);