strapi-plugin-comments 2.1.5 → 2.1.8

package/README.md

@@ -61,7 +61,7 @@ A plugin for [Strapi Headless CMS](https://github.com/strapi/strapi) that provid
 
 ## ⏳ Installation
 
-### Via Strapi Markerplace
+### Via Strapi Marketplace
 
 As a ✅ **verified** plugin by Strapi team we're available on the [**Strapi Marketplace**](https://market.strapi.io/plugins/strapi-plugin-comments) as well as **In-App Marketplace** where you can follow the installation instructions.
 
@@ -132,7 +132,7 @@ In our minimum support we're following [official Node.js releases timelines](htt
 
 **Supported Strapi versions**:
 
-- Strapi v4.1.8 (recently tested)
+- Strapi v4.1.12 (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).
@@ -150,8 +150,6 @@ To start your journey with **Comments plugin** you must first setup it using the
 
 Version `2.0.3` introduce the intuitive **Settings** page which you can easly access via `Strapi Settings -> Section: Comments Plugin -> Configuration`. On dedicated page you will be able to setup all crucial properties which drives the plugin and customize each individual collection for which **Comments plugin** should be enabled.
 
-On the dedicated page, you will be able to set up all crucial properties which drive the plugin and customize each individual collection for which **Comments plugin** should be enabled.
-
 <div style="margin: 20px 0" align="center">
   <img style="width: 100%; height: auto;" src="public/assets/configuration.png" alt="Plugin configuration" />
 </div>

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

@@ -14,9 +14,9 @@ const UserAvatar = ({ avatar, name }) => {
         if ((0, lodash_1.isObject)(avatar)) {
             image = avatar?.formats?.thumbnail.url || avatar.url;
         }
-        return react_1.default.createElement(Avatar_1.Avatar, { src: image, alt: name });
+        return image && (react_1.default.createElement(Avatar_1.Avatar, { src: image, alt: name }));
     }
-    return react_1.default.createElement(Avatar_1.Initials, null, (0, utils_1.renderInitials)(name));
+    return name && (react_1.default.createElement(Avatar_1.Initials, null, (0, utils_1.renderInitials)(name)));
 };
 UserAvatar.propTypes = {
     avatar: prop_types_1.default.oneOfType(prop_types_1.default.string, prop_types_1.default.object).isRequired,

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

@@ -34,6 +34,7 @@ const Button_1 = require("@strapi/design-system/Button");
 const IconButton_1 = require("@strapi/design-system/IconButton");
 const helper_plugin_1 = require("@strapi/helper-plugin");
 const icons_1 = require("../icons");
+const icons_2 = require("@strapi/icons");
 const api_1 = require("../../pages/utils/api");
 const utils_1 = require("../../utils");
 const ReportsReviewTable_1 = __importDefault(require("../ReportsReviewTable"));
@@ -42,9 +43,14 @@ const pluginId_1 = require("../../pluginId");
 const DiscussionThreadItemReviewAction = ({ item, isAnyActionLoading: isAnyActionLoading, queryToInvalidate, areBlockButtonsDisabled, allowedActions: { canModerate, canAccessReports, canReviewReports }, blockItemMutation, blockItemThreadMutation, onBlockButtonsStateChange, onBlockActionClick, }) => {
     const { reports } = item;
     const [reportsReviewVisible, setReportsReviewVisible] = (0, react_1.useState)(false);
+    const [storedItems, setStoredItems] = (0, react_1.useState)([]);
+    const [selectedItems, setSelectedItems] = (0, react_1.useState)([]);
     const toggleNotification = (0, helper_plugin_1.useNotification)();
     const queryClient = (0, react_query_1.useQueryClient)();
-    const { unlockApp } = (0, helper_plugin_1.useOverlayBlocker)();
+    const { lockApp, unlockApp } = (0, helper_plugin_1.useOverlayBlocker)();
+    (0, react_1.useEffect)(() => {
+        setStoredItems((0, lodash_1.orderBy)(reports, ["resolved", "createdAt"], ["DESC", "DESC"]));
+    }, [reportsReviewVisible]);
     const onSuccess = (message, stateAction = () => { }, indalidate = true) => async () => {
         if (indalidate) {
             await queryClient.invalidateQueries(queryToInvalidate);
@@ -59,11 +65,17 @@ const DiscussionThreadItemReviewAction = ({ item, isAnyActionLoading: isAnyActio
     const onError = (err) => {
         (0, utils_1.handleAPIError)(err, toggleNotification);
     };
+    const isNotResolved = entry => !entry.resolved;
     const resolveReportMutation = (0, react_query_1.useMutation)(api_1.resolveReport, {
         onSuccess: onSuccess("page.details.panel.discussion.warnings.reports.dialog.confirmation.success", () => { }, false),
         onError,
         refetchActive: false,
     });
+    const resolveMultipleReportsMutation = (0, react_query_1.useMutation)(api_1.resolveMultipleReports, {
+        onSuccess: onSuccess("page.details.panel.discussion.warnings.reports.selected.dialog.confirmation.success", () => { }, false),
+        onError,
+        refetchActive: false,
+    });
     const handleBlockActionClick = () => setReportsReviewVisible(false);
     const handleReportsReviewClick = () => {
         if (canAccessReports) {
@@ -80,21 +92,47 @@ const DiscussionThreadItemReviewAction = ({ item, isAnyActionLoading: isAnyActio
             await onBlockActionClick(blockItemThreadMutation, handleBlockActionClick);
         }
     };
+    const handleClickResolveSelected = async () => {
+        if (canReviewReports) {
+            lockApp();
+            const items = await resolveMultipleReportsMutation.mutateAsync({
+                id: item.id,
+                reportIds: selectedItems,
+            });
+            if (!(0, lodash_1.isEmpty)(items)) {
+                const updatedItems = storedItems.map((_) => ({
+                    ..._,
+                    resolved: selectedItems.includes(_.id) ? true : _.resolved,
+                }));
+                setStoredItems(updatedItems);
+                setSelectedItems([], false);
+                onBlockButtonsStateChange(updatedItems.filter(isNotResolved).length === 0);
+            }
+        }
+    };
     const handleReportsReviewClose = async () => {
         await queryClient.invalidateQueries(queryToInvalidate);
         setReportsReviewVisible(false);
     };
+    const onSelectionChange = selection => setSelectedItems(selection);
     const isLoading = isAnyActionLoading && resolveReportMutation.isLoading;
-    const openReports = reports?.filter((_) => !_.resolved);
+    const openReports = reports?.filter(isNotResolved);
     const hasReports = !(0, lodash_1.isEmpty)(openReports);
     const reviewFlowEnabled = canAccessReports && hasReports && !(item.blocked || item.blockedThread);
+    const hasAnySelectedItems = selectedItems.length > 0;
     if (reviewFlowEnabled) {
         return (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement(IconButton_1.IconButton, { onClick: handleReportsReviewClick, label: (0, utils_1.getMessage)("page.discover.table.reports.review"), icon: react_1.default.createElement(icons_1.ReviewIcon, null) }),
             react_1.default.createElement(ReportsReviewModal_1.default, { isVisible: reportsReviewVisible, isActionAsync: isLoading, allowedActions: { canModerate, canAccessReports, canReviewReports }, onClose: handleReportsReviewClose, startActions: react_1.default.createElement(Button_1.Button, { onClick: handleReportsReviewClose, variant: "tertiary" }, (0, utils_1.getMessage)("compontents.confirmation.dialog.button.cancel", "Cancel")), endActions: canModerate && (react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(Button_1.Button, { onClick: handleBlockItemClick, variant: "danger-light", startIcon: react_1.default.createElement(icons_1.LockIcon, null), disabled: areBlockButtonsDisabled }, (0, utils_1.getMessage)(`page.details.actions.comment.block`, "Block comment")),
-                    item.gotThread && (react_1.default.createElement(Button_1.Button, { onClick: handleBlockItemThreadClick, variant: "danger", startIcon: react_1.default.createElement(icons_1.LockIcon, null), disabled: areBlockButtonsDisabled }, (0, utils_1.getMessage)(`page.details.actions.thread.block`, "Block thread"))))), item: item },
-                react_1.default.createElement(ReportsReviewTable_1.default, { commentId: item.id, items: (0, lodash_1.orderBy)(reports, ["resolved", "createdAt"], ["DESC", "DESC"]), mutation: resolveReportMutation, allowedActions: { canAccessReports, canReviewReports }, onBlockButtonsStateChange: onBlockButtonsStateChange }))));
+                    item.gotThread && (react_1.default.createElement(Button_1.Button, { onClick: handleBlockItemThreadClick, variant: "danger", startIcon: react_1.default.createElement(icons_1.LockIcon, null), disabled: areBlockButtonsDisabled }, (0, utils_1.getMessage)(`page.details.actions.thread.block`, "Block thread"))),
+                    hasAnySelectedItems && (react_1.default.createElement(Button_1.Button, { onClick: handleClickResolveSelected, variant: "success", startIcon: react_1.default.createElement(icons_2.Check, null) }, (0, utils_1.getMessage)({
+                        id: `page.details.panel.discussion.warnings.reports.dialog.actions.resolve.selected`,
+                        props: {
+                            count: selectedItems.length,
+                        }
+                    }, "Resolve selected"))))), item: item },
+                react_1.default.createElement(ReportsReviewTable_1.default, { commentId: item.id, items: storedItems, selectedItems: selectedItems, mutation: resolveReportMutation, updateItems: setStoredItems, allowedActions: { canAccessReports, canReviewReports }, onBlockButtonsStateChange: onBlockButtonsStateChange, onSelectionChange: onSelectionChange }))));
     }
     return null;
 };

package/admin/src/components/ReportsReviewTable/index.d.ts

@@ -1,20 +1,26 @@
 declare const ReportsReviewTable: {
-    ({ commentId, items, mutation, allowedActions: { canAccessReports, canReviewReports }, onBlockButtonsStateChange, }: {
+    ({ commentId, items, selectedItems, mutation, updateItems, allowedActions: { canAccessReports, canReviewReports }, onBlockButtonsStateChange, onSelectionChange, }: {
         commentId: any;
         items: any;
+        selectedItems?: never[] | undefined;
         mutation: any;
+        updateItems: any;
         allowedActions: {
             canAccessReports: any;
             canReviewReports: any;
         };
         onBlockButtonsStateChange: any;
+        onSelectionChange: any;
     }): any;
     propTypes: {
         commentId: any;
         items: any;
+        selectedItems: any;
         mutation: any;
         allowedActions: any;
         onBlockButtonsStateChange: any;
+        onSelectionChange: any;
+        updateItems: any;
     };
 };
 export default ReportsReviewTable;

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

@@ -41,8 +41,7 @@ const utils_1 = require("../../utils");
 const constants_1 = require("../../utils/constants");
 const StatusBadge_1 = __importDefault(require("../StatusBadge"));
 const styles_1 = require("../ActionButton/styles");
-const ReportsReviewTable = ({ commentId, items, mutation, allowedActions: { canAccessReports, canReviewReports }, onBlockButtonsStateChange, }) => {
-    const [storedItems, setStoredItems] = (0, react_1.useState)([]);
+const ReportsReviewTable = ({ commentId, items, selectedItems = [], mutation, updateItems, allowedActions: { canAccessReports, canReviewReports }, onBlockButtonsStateChange, onSelectionChange, }) => {
     const { formatDate } = (0, react_intl_1.useIntl)();
     const { lockApp } = (0, helper_plugin_1.useOverlayBlocker)();
     const renderStatus = (resolved) => {
@@ -68,6 +67,20 @@ const ReportsReviewTable = ({ commentId, items, mutation, allowedActions: { canA
         }
         return (react_1.default.createElement(StatusBadge_1.default, { backgroundColor: `${color}100`, textColor: `${color}600`, color: color }, (0, utils_1.getMessage)(`page.details.panel.discussion.warnings.reports.dialog.reason.${reason}`, reason)));
     };
+    const handleItemSelectionChange = (selection, value) => {
+        if ((0, lodash_1.isArray)(selection)) {
+            onSelectionChange(value ? selection : []);
+        }
+        else {
+            onSelectionChange([...selectedItems, selection].filter(item => value || selection !== item));
+        }
+    };
+    const isNotResolved = entry => !entry.resolved;
+    const unresolvedItems = items.filter(isNotResolved);
+    const areAllItemsSelected = () => !(0, lodash_1.isEmpty)(selectedItems) ?
+        selectedItems.length === unresolvedItems.length :
+        false;
+    const isItemSelected = id => selectedItems.includes(id);
     const handleClickResolve = async (reportId) => {
         if (canReviewReports) {
             lockApp();
@@ -76,28 +89,26 @@ const ReportsReviewTable = ({ commentId, items, mutation, allowedActions: { canA
                 reportId,
             });
             if (item) {
-                const updatedItems = storedItems.map((_) => ({
+                const updatedItems = items.map((_) => ({
                     ..._,
                     resolved: reportId === _.id ? true : _.resolved,
                 }));
-                setStoredItems(updatedItems);
-                onBlockButtonsStateChange(updatedItems.filter((_) => !_.resolved).length === 0);
+                updateItems(updatedItems);
+                onSelectionChange(selectedItems.filter(_ => _ !== reportId));
+                onBlockButtonsStateChange(updatedItems.filter(isNotResolved).length === 0);
             }
         }
     };
-    (0, react_1.useEffect)(() => {
-        setStoredItems(items);
-    }, []);
-    if ((0, lodash_1.isEmpty)(storedItems)) {
+    if ((0, lodash_1.isEmpty)(items)) {
         return null;
     }
     const COL_COUNT = 6;
     if (canAccessReports) {
-        return (react_1.default.createElement(Table_1.Table, { colCount: COL_COUNT, rowCount: storedItems.length },
+        return (react_1.default.createElement(Table_1.Table, { colCount: COL_COUNT, rowCount: items.length },
             react_1.default.createElement(Table_1.Thead, null,
                 react_1.default.createElement(Table_1.Tr, null,
                     react_1.default.createElement(Table_1.Th, null,
-                        react_1.default.createElement(BaseCheckbox_1.BaseCheckbox, { "aria-label": "Select all entries" })),
+                        react_1.default.createElement(BaseCheckbox_1.BaseCheckbox, { "aria-label": (0, utils_1.getMessage)("page.details.panel.discussion.warnings.reports.dialog.selectAll"), value: areAllItemsSelected(), disabled: (0, lodash_1.isEmpty)(unresolvedItems), onValueChange: (0, react_1.useCallback)((value) => handleItemSelectionChange(unresolvedItems.map(_ => _.id), value), [unresolvedItems]) })),
                     react_1.default.createElement(Table_1.Th, null,
                         react_1.default.createElement(Typography_1.Typography, { variant: "sigma" }, (0, utils_1.getMessage)("page.details.panel.discussion.warnings.reports.dialog.reason"))),
                     react_1.default.createElement(Table_1.Th, null,
@@ -108,9 +119,9 @@ const ReportsReviewTable = ({ commentId, items, mutation, allowedActions: { canA
                         react_1.default.createElement(Typography_1.Typography, { variant: "sigma" }, (0, utils_1.getMessage)("page.details.panel.discussion.warnings.reports.dialog.status"))),
                     canReviewReports && (react_1.default.createElement(Table_1.Th, null,
                         react_1.default.createElement(VisuallyHidden_1.VisuallyHidden, null, (0, utils_1.getMessage)("page.details.panel.discussion.warnings.reports.dialog.actions")))))),
-            react_1.default.createElement(Table_1.Tbody, null, storedItems.map((entry) => (react_1.default.createElement(Table_1.Tr, { key: entry.id },
+            react_1.default.createElement(Table_1.Tbody, null, items.map((entry) => (react_1.default.createElement(Table_1.Tr, { key: entry.id },
                 react_1.default.createElement(Table_1.Td, null,
-                    react_1.default.createElement(BaseCheckbox_1.BaseCheckbox, { "aria-label": `Select report` })),
+                    react_1.default.createElement(BaseCheckbox_1.BaseCheckbox, { "aria-label": (0, utils_1.getMessage)("page.details.panel.discussion.warnings.reports.dialog.select"), value: isItemSelected(entry.id), disabled: entry.resolved, onValueChange: (value) => handleItemSelectionChange(entry.id, value) })),
                 react_1.default.createElement(Table_1.Td, null,
                     react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800" }, renderReason(entry.reason))),
                 react_1.default.createElement(Table_1.Td, null,
@@ -129,12 +140,15 @@ const ReportsReviewTable = ({ commentId, items, mutation, allowedActions: { canA
 ReportsReviewTable.propTypes = {
     commentId: prop_types_1.default.oneOfType(prop_types_1.default.string, prop_types_1.default.number).isRequired,
     items: prop_types_1.default.array.isRequired,
+    selectedItems: prop_types_1.default.array.isRequired,
     mutation: prop_types_1.default.func.isRequired,
     allowedActions: prop_types_1.default.shape({
         canAccessReports: prop_types_1.default.bool,
         canReviewReports: prop_types_1.default.bool,
     }),
     onBlockButtonsStateChange: prop_types_1.default.func.isRequired,
+    onSelectionChange: prop_types_1.default.func.isRequired,
+    updateItems: prop_types_1.default.func.isRequired,
 };
 exports.default = ReportsReviewTable;
 //# sourceMappingURL=index.js.map

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

@@ -39,6 +39,7 @@ const Box_1 = require("@strapi/design-system/Box");
 const Stack_1 = require("@strapi/design-system/Stack");
 const Typography_1 = require("@strapi/design-system/Typography");
 const Grid_1 = require("@strapi/design-system/Grid");
+const TextInput_1 = require("@strapi/design-system/TextInput");
 const ToggleInput_1 = require("@strapi/design-system/ToggleInput");
 const Select_1 = require("@strapi/design-system/Select");
 const LiveRegions_1 = require("@strapi/design-system/LiveRegions");
@@ -75,7 +76,7 @@ const Settings = () => {
         areCollectionsLoading ||
         areRolesLoading;
     const isError = configErr || collectionsErr || rolesErr;
-    const preparePayload = ({ enabledCollections, gqlAuthEnabled, approvalFlow, entryLabel, ...rest }) => ({
+    const preparePayload = ({ enabledCollections, gqlAuthEnabled, approvalFlow, entryLabel, clientUrl, clientEmail, ...rest }) => ({
         ...rest,
         enabledCollections,
         approvalFlow: approvalFlow.filter((_) => enabledCollections.includes(_)),
@@ -89,6 +90,10 @@ const Settings = () => {
             "*": entryLabel["*"],
         },
         reportReasons: configData?.reportReasons,
+        client: clientEmail || clientUrl ? {
+            contactEmail: clientEmail,
+            url: clientUrl,
+        } : undefined,
         gql: gqlAuthEnabled ? { auth: true } : undefined,
     });
     if (isLoading || isError) {
@@ -109,6 +114,8 @@ const Settings = () => {
     const isGQLPluginEnabled = configData?.isGQLPluginEnabled;
     const gqlAuthEnabled = configData?.gql?.auth || undefined;
     const moderatorRoles = configData?.moderatorRoles?.filter((code) => allRoles.find((_) => _.code === code)) || [];
+    const clientUrl = configData?.client?.url;
+    const clientEmail = configData?.client?.contactEmail;
     const changeApprovalFlowFor = (uid, current, value) => {
         const currentSet = new Set(current);
         if (value) {
@@ -170,6 +177,8 @@ const Settings = () => {
                 badWords,
                 approvalFlow,
                 entryLabel,
+                clientEmail,
+                clientUrl,
                 gqlAuthEnabled,
             }, enableReinitialize: true, onSubmit: handleUpdateConfiguration }, ({ handleSubmit, setFieldValue, values }) => (react_1.default.createElement(helper_plugin_1.Form, { noValidate: true, onSubmit: handleSubmit },
             react_1.default.createElement(Layout_1.HeaderLayout, { title: (0, utils_1.getMessage)("page.settings.header.title"), subtitle: (0, utils_1.getMessage)("page.settings.header.description"), primaryAction: react_1.default.createElement(helper_plugin_1.CheckPermissions, { permissions: permissions_1.default.settingsChange },
@@ -205,12 +214,20 @@ const Settings = () => {
                         react_1.default.createElement(Stack_1.Stack, { size: 4 },
                             react_1.default.createElement(Typography_1.Typography, { variant: "delta", as: "h2" }, (0, utils_1.getMessage)("page.settings.section.additional")),
                             react_1.default.createElement(Grid_1.Grid, { gap: 4 },
-                                react_1.default.createElement(Grid_1.GridItem, { col: 6, xs: 12 },
-                                    react_1.default.createElement(Select_1.Select, { name: "moderatorRoles", label: (0, utils_1.getMessage)("page.settings.form.moderatorRoles.label"), placeholder: (0, utils_1.getMessage)("page.settings.form.moderatorRoles.placeholder"), hint: (0, utils_1.getMessage)("page.settings.form.moderatorRoles.hint"), onClear: () => setFieldValue("moderatorRoles", [], false), value: values.moderatorRoles, onChange: (value) => setFieldValue("moderatorRoles", value, false), disabled: restartRequired, multi: true, withTags: true }, allRoles.map(({ code, name }) => (react_1.default.createElement(Select_1.Option, { key: code, value: code }, name))))),
                                 react_1.default.createElement(Grid_1.GridItem, { col: 6, xs: 12 },
                                     react_1.default.createElement(ToggleInput_1.ToggleInput, { name: "badWords", label: (0, utils_1.getMessage)("page.settings.form.badWords.label"), hint: (0, utils_1.getMessage)("page.settings.form.badWords.hint"), checked: values.badWords, onChange: ({ target: { checked } }) => setFieldValue("badWords", checked, false), onLabel: (0, utils_1.getMessage)("compontents.toogle.enabled"), offLabel: (0, utils_1.getMessage)("compontents.toogle.disabled"), disabled: restartRequired })),
                                 isGQLPluginEnabled && (react_1.default.createElement(Grid_1.GridItem, { col: 6, xs: 12 },
-                                    react_1.default.createElement(ToggleInput_1.ToggleInput, { name: "badWords", label: (0, utils_1.getMessage)("page.settings.form.gqlAuth.label"), hint: (0, utils_1.getMessage)("page.settings.form.gqlAuth.hint"), checked: values.gqlAuthEnabled, onChange: ({ target: { checked } }) => setFieldValue("gqlAuthEnabled", checked, false), onLabel: (0, utils_1.getMessage)("compontents.toogle.enabled"), offLabel: (0, utils_1.getMessage)("compontents.toogle.disabled"), disabled: restartRequired })))))),
+                                    react_1.default.createElement(ToggleInput_1.ToggleInput, { name: "gqlAuthEnabled", label: (0, utils_1.getMessage)("page.settings.form.gqlAuth.label"), hint: (0, utils_1.getMessage)("page.settings.form.gqlAuth.hint"), checked: values.gqlAuthEnabled, onChange: ({ target: { checked } }) => setFieldValue("gqlAuthEnabled", checked, false), onLabel: (0, utils_1.getMessage)("compontents.toogle.enabled"), offLabel: (0, utils_1.getMessage)("compontents.toogle.disabled"), disabled: restartRequired })))))),
+                    react_1.default.createElement(Box_1.Box, { ...boxDefaultProps },
+                        react_1.default.createElement(Stack_1.Stack, { size: 4 },
+                            react_1.default.createElement(Typography_1.Typography, { variant: "delta", as: "h2" }, (0, utils_1.getMessage)("page.settings.section.client")),
+                            react_1.default.createElement(Grid_1.Grid, { gap: 4 },
+                                react_1.default.createElement(Grid_1.GridItem, { col: 3, xs: 12 },
+                                    react_1.default.createElement(TextInput_1.TextInput, { type: "url", name: "clientUrl", label: (0, utils_1.getMessage)("page.settings.form.client.url.label"), hint: (0, utils_1.getMessage)("page.settings.form.client.url.hint"), value: values.clientUrl, onChange: ({ target: { value } }) => setFieldValue("clientUrl", value, false), disabled: restartRequired })),
+                                react_1.default.createElement(Grid_1.GridItem, { col: 3, xs: 12 },
+                                    react_1.default.createElement(TextInput_1.TextInput, { type: "email", name: "clientEmail", label: (0, utils_1.getMessage)("page.settings.form.client.email.label"), hint: (0, utils_1.getMessage)("page.settings.form.client.email.hint"), value: values.clientEmail, onChange: ({ target: { value } }) => setFieldValue("clientEmail", value, false), disabled: restartRequired })),
+                                react_1.default.createElement(Grid_1.GridItem, { col: 6, xs: 12 },
+                                    react_1.default.createElement(Select_1.Select, { name: "moderatorRoles", label: (0, utils_1.getMessage)("page.settings.form.moderatorRoles.label"), placeholder: (0, utils_1.getMessage)("page.settings.form.moderatorRoles.placeholder"), hint: (0, utils_1.getMessage)("page.settings.form.moderatorRoles.hint"), onClear: () => setFieldValue("moderatorRoles", [], false), value: values.moderatorRoles, onChange: (value) => setFieldValue("moderatorRoles", value, false), disabled: restartRequired, multi: true, withTags: true }, allRoles.map(({ code, name }) => (react_1.default.createElement(Select_1.Option, { key: code, value: code }, name)))))))),
                     react_1.default.createElement(helper_plugin_1.CheckPermissions, { permissions: permissions_1.default.settingsChange },
                         react_1.default.createElement(Box_1.Box, { ...boxDefaultProps },
                             react_1.default.createElement(Stack_1.Stack, { size: 4 },

package/admin/src/pages/utils/api.d.ts

@@ -9,4 +9,8 @@ export declare const rejectItem: (id: Id) => any;
 export declare const blockItemThread: (id: Id) => any;
 export declare const unblockItemThread: (id: Id) => any;
 export declare const resolveReport: ({ id, reportId }: ToBeFixed) => any;
+export declare const resolveMultipleReports: ({ id, reportIds }: {
+    id: Id;
+    reportIds: Array<Id>;
+}) => any;
 //# sourceMappingURL=api.d.ts.map

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveReport = exports.unblockItemThread = exports.blockItemThread = exports.rejectItem = exports.approveItem = exports.unblockItem = exports.blockItem = exports.fetchContentTypeData = exports.fetchDetailsData = void 0;
+exports.resolveMultipleReports = exports.resolveReport = exports.unblockItemThread = exports.blockItemThread = exports.rejectItem = exports.approveItem = exports.unblockItem = exports.blockItem = exports.fetchContentTypeData = exports.fetchDetailsData = void 0;
 const qs_1 = require("qs");
 const lodash_1 = require("lodash");
 const utils_1 = require("../../utils");
@@ -55,4 +55,8 @@ const resolveReport = ({ id, reportId }) => {
     return utils_1.axiosInstance.patch((0, utils_1.getApiURL)(`moderate/single/${id}/report/${reportId}/resolve`));
 };
 exports.resolveReport = resolveReport;
+const resolveMultipleReports = ({ id, reportIds }) => {
+    return utils_1.axiosInstance.put((0, utils_1.getApiURL)(`moderate/single/${id}/report/resolve`), reportIds);
+};
+exports.resolveMultipleReports = resolveMultipleReports;
 //# sourceMappingURL=api.js.map

package/admin/src/translations/en.json

@@ -43,6 +43,8 @@
   "page.details.panel.discussion.warnings.reports.review": "Review",
   "page.details.panel.discussion.warnings.reports.dialog.list": "Reports",
   "page.details.panel.discussion.warnings.reports.dialog.header": "Moderation: Review open reports",
+  "page.details.panel.discussion.warnings.reports.dialog.selectAll": "Select all entries",
+  "page.details.panel.discussion.warnings.reports.dialog.select": "Select entity",
   "page.details.panel.discussion.warnings.reports.dialog.reason": "Reason",
   "page.details.panel.discussion.warnings.reports.dialog.reason.BAD_LANGUAGE": "Bad language",
   "page.details.panel.discussion.warnings.reports.dialog.reason.DISCRIMINATION": "Discrimination",
@@ -54,7 +56,9 @@
   "page.details.panel.discussion.warnings.reports.dialog.status.RESOLVED": "Resolved",
   "page.details.panel.discussion.warnings.reports.dialog.actions": "Actions",
   "page.details.panel.discussion.warnings.reports.dialog.actions.resolve": "Resolve",
+  "page.details.panel.discussion.warnings.reports.dialog.actions.resolve.selected": "Resolve reports ({count})",
   "page.details.panel.discussion.warnings.reports.dialog.confirmation.success": "Open report has been resolved",
+  "page.details.panel.discussion.warnings.reports.selected.dialog.confirmation.success": "Open reports has been resolved",
   "page.details.panel.discussion.status.blocked": "Blocked",
   "page.details.panel.entity": "Entity details",
   "page.details.panel.status": "Discussion is",
@@ -90,6 +94,7 @@
   "page.settings.actions.restart": "Restart Strapi",
   "page.settings.section.general": "General configuration",
   "page.settings.section.additional": "Additional configuration",
+  "page.settings.section.client": "Client portal configuration",
   "page.settings.section.restore": "Restore default settings",
   "page.settings.section.restore.subtitle": "Discarding all of applied settings and getting back to plugin default ones. Use reasonable.",
   "page.settings.form.enabledCollections.label": "Enable comments only for",
@@ -109,6 +114,10 @@
   "page.settings.form.entryLabel.label": "Title fields",
   "page.settings.form.entryLabel.placeholder": "Select at least one or leave empty to apply defaults",
   "page.settings.form.entryLabel.hint": "If left empty title rendering is going to take following ordered fields: \"Title\", \"Subject\" & \"Name\"",
+  "page.settings.form.client.url.label": "Portal URL",
+  "page.settings.form.client.url.hint": "URL where your client portal is available",
+  "page.settings.form.client.email.label": "Communication e-mail",
+  "page.settings.form.client.email.hint": "E-mail address used for mailings, communication with users on behalf of portal team",
   "page.settings.actions.restore.confirmation.header": "Restore default configuration",
   "page.settings.actions.restore.confirmation.description": "You're about to restore plugin configuration to it default values. It might have destructive impact on already collected content. Do you really want to proceed?",
   "page.settings.actions.restore.confirmation.button.confirm": "Yes, I want to restore",

package/admin/src/translations/fr.json

@@ -43,6 +43,8 @@
   "page.details.panel.discussion.warnings.reports.review": "consultation",
   "page.details.panel.discussion.warnings.reports.dialog.list": "Rapports",
   "page.details.panel.discussion.warnings.reports.dialog.header": "Modération : Examiner les rapports ouverts",
+  "page.details.panel.discussion.warnings.reports.dialog.selectAll": "Sélectionner toutes les entrées",
+  "page.details.panel.discussion.warnings.reports.dialog.select": "Sélectionnez l'entité",
   "page.details.panel.discussion.warnings.reports.dialog.reason": "Raison",
   "page.details.panel.discussion.warnings.reports.dialog.reason.BAD_LANGUAGE": "Langage inapproprié",
   "page.details.panel.discussion.warnings.reports.dialog.reason.DISCRIMINATION": "Discrimination",
@@ -54,7 +56,9 @@
   "page.details.panel.discussion.warnings.reports.dialog.status.RESOLVED": "Résolu",
   "page.details.panel.discussion.warnings.reports.dialog.actions": "Actions",
   "page.details.panel.discussion.warnings.reports.dialog.actions.resolve": "Résoudre",
+  "page.details.panel.discussion.warnings.reports.dialog.actions.resolve.selected": "Résoudre les rapports ({count})",
   "page.details.panel.discussion.warnings.reports.dialog.confirmation.success": "Le rapport ouvert a été résolu",
+  "page.details.panel.discussion.warnings.reports.selected.dialog.confirmation.success": "Les rapports ouverts ont été résolus",
   "page.details.panel.discussion.status.blocked": "Bloqué",
   "page.details.panel.entity": "Détails de l'entité",
   "page.details.panel.status": "La discussion est",
@@ -90,6 +94,7 @@
   "page.settings.actions.restart": "Redémarrer Strapi",
   "page.settings.section.general": "Configuration générale",
   "page.settings.section.additional": "Configuration supplémentaire",
+  "page.settings.section.client": "Configuration du portail client",
   "page.settings.section.restore": "Restaurer les paramètres par défaut",
   "page.settings.section.restore.subtitle": "Suppression de tous les paramètres appliqués et retour aux paramètres par défaut du plugin. Utilisez-les raisonnablement",
   "page.settings.form.enabledCollections.label": "Activer les commentaires uniquement pour",
@@ -109,6 +114,10 @@
   "page.settings.form.entryLabel.label": "Champs de titre",
   "page.settings.form.entryLabel.placeholder": "Sélectionnez au moins un champ ou laissez vide pour appliquer les valeurs par défaut",
   "page.settings.form.entryLabel.hint": "Si vous laissez vide, le rendu du titre sera le suivant : \"Title\", \"Subject\" & \"Name\"",
+  "page.settings.form.client.url.label": "Portail URL",
+  "page.settings.form.client.url.hint": "URL où votre portail client est disponible",
+  "page.settings.form.client.email.label": "E-mail de communication",
+  "page.settings.form.client.email.hint": "Adresse e-mail utilisée pour les mailings, la communication avec les utilisateurs au nom de l'équipe du portail",
   "page.settings.actions.restore.confirmation.header": "Restaurer la configuration par défaut",
   "page.settings.actions.restore.confirmation.description": "Vous êtes sur le point de restaurer la configuration du plugin à ses valeurs par défaut. Cela pourrait avoir un impact destructeur sur le contenu déjà collecté. Voulez-vous vraiment continuer ?",
   "page.settings.actions.restore.confirmation.button.confirm": "Oui, je veux restaurer",

package/admin/src/translations/pt-BR.json

@@ -43,6 +43,8 @@
   "page.details.panel.discussion.warnings.reports.review": "Review",
   "page.details.panel.discussion.warnings.reports.dialog.list": "Reports",
   "page.details.panel.discussion.warnings.reports.dialog.header": "Moderation: Review open reports",
+  "page.details.panel.discussion.warnings.reports.dialog.selectAll": "Selecione todas as entradas",
+  "page.details.panel.discussion.warnings.reports.dialog.select": "Selecionar entidade",
   "page.details.panel.discussion.warnings.reports.dialog.reason": "Razão",
   "page.details.panel.discussion.warnings.reports.dialog.reason.BAD_LANGUAGE": "Linguagem imprópria",
   "page.details.panel.discussion.warnings.reports.dialog.reason.DISCRIMINATION": "Discrimination",
@@ -54,7 +56,9 @@
   "page.details.panel.discussion.warnings.reports.dialog.status.RESOLVED": "Resolvido",
   "page.details.panel.discussion.warnings.reports.dialog.actions": "Ações",
   "page.details.panel.discussion.warnings.reports.dialog.actions.resolve": "Resolver",
-  "page.details.panel.discussion.warnings.reports.dialog.confirmation.success": "Open report has been resolved",
+  "page.details.panel.discussion.warnings.reports.dialog.actions.resolve.selected": "Resolver relatórios ({count})",
+  "page.details.panel.discussion.warnings.reports.dialog.confirmation.success": "O relatório aberto foi resolvido",
+  "page.details.panel.discussion.warnings.reports.selected.dialog.confirmation.success": "Os relatórios abertos foram resolvidos",
   "page.details.panel.discussion.status.blocked": "Bloqueado",
   "page.details.panel.entity": "Entity details",
   "page.details.panel.status": "Discussion is",
@@ -90,6 +94,7 @@
   "page.settings.actions.restart": "Restart Strapi",
   "page.settings.section.general": "Configurações gerais",
   "page.settings.section.additional": "Configurações adicionais",
+  "page.settings.section.client": "Configurações do portal do cliente",
   "page.settings.section.restore": "Restaurar configurações originais",
   "page.settings.section.restore.subtitle": "Descartando todas as configurações aplicadas e voltando para as configurações padrão do plugin. Use razoável.",
   "page.settings.form.enabledCollections.label": "Ativar comentários apenas para",
@@ -109,6 +114,10 @@
   "page.settings.form.entryLabel.label": "Campos de título",
   "page.settings.form.entryLabel.placeholder": "Selecione pelo menos um ou deixe em branco para aplicar os padrões",
   "page.settings.form.entryLabel.hint": "Se deixado em branco, a renderização do título terá os seguintes campos ordenados: \"Title\", \"Subject\" & \"Name\"",
+  "page.settings.form.client.url.label": "Portal URL",
+  "page.settings.form.client.url.hint": "URL onde seu portal do cliente está disponível",
+  "page.settings.form.client.email.label": "Email de comunicação",
+  "page.settings.form.client.email.hint": "Endereço de e-mail usado para correspondências, comunicação com usuários em nome da equipe do portal",
   "page.settings.actions.restore.confirmation.header": "Restaurar a configuração padrão",
   "page.settings.actions.restore.confirmation.description": "Você está prestes a restaurar a configuração do plug-in para seus valores padrão. Pode ter um impacto destrutivo no conteúdo já coletado. Você realmente quer continuar?",
   "page.settings.actions.restore.confirmation.button.confirm": "Sim, quero restaurar",

package/admin/src/utils/renderInitials.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
-const renderInitials = (value = "") => value
-    .split(" ")
-    .map((_) => (0, lodash_1.first)(_))
-    .join("")
-    .toUpperCase();
+const renderInitials = (value = "") => (0, lodash_1.isString)(value) ?
+    value
+        .split(" ")
+        .map((_) => (0, lodash_1.first)(_))
+        .join("")
+        .toUpperCase() : "";
 exports.default = renderInitials;
 //# sourceMappingURL=renderInitials.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.1.5",
+  "version": "2.1.8",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -14,8 +14,8 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
-    "@strapi/utils": "^4.1.8",
-    "@strapi/plugin-graphql": "^4.1.8",
+    "@strapi/utils": "^4.3.0",
+    "@strapi/plugin-graphql": "^4.3.0",
     "bad-words": "^3.0.4"
   },
   "devDependencies": {},
@@ -53,7 +53,7 @@
     }
   ],
   "engines": {
-    "node": ">=14.x.x <=17.x.x",
+    "node": ">=14.19.1 <=17.x.x",
     "npm": ">=7.x.x"
   },
   "keywords": [

package/server/controllers/admin.js

@@ -112,6 +112,18 @@ const controllers = {
             throw (0, functions_2.throwError)(ctx, e);
         }
     },
+    async resolveMultipleAbuseReports(ctx) {
+        const { params = {}, request } = ctx;
+        const { body } = request;
+        const { id: commentId } = (0, functions_2.parseParams)(params);
+        (0, functions_1.assertNotEmpty)(body);
+        try {
+            return await this.getService().resolveMultipleAbuseReports(body, commentId);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
     async approveComment(ctx) {
         const { id } = (0, functions_2.parseParams)(ctx.params || {});
         try {

package/server/routes/admin.js

@@ -65,6 +65,14 @@ const routes = [
             policies: [],
         },
     },
+    {
+        method: "PUT",
+        path: "/moderate/single/:id/report/resolve",
+        handler: "admin.resolveMultipleAbuseReports",
+        config: {
+            policies: [],
+        },
+    },
     {
         method: "PATCH",
         path: "/moderate/thread/:id/block",