strapi-plugin-comments 2.2.2-beta.1 → 2.2.4

package/README.md

@@ -134,7 +134,7 @@ In our minimum support we're following [official Node.js releases timelines](htt
 
 **Supported Strapi versions**:
 
-- Strapi v4.5.2 (recently tested)
+- Strapi v4.5.5 (recently tested)
 - Strapi v4.x
 
 > This plugin is designed for **Strapi v4** and is not working with v3.x. To get version for **Strapi v3** install version [v1.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-comments/tree/strapi-v3).

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

@@ -1,5 +1,5 @@
 import React from 'react';
-declare type HintProps = {
+type HintProps = {
     description: {
         id: string;
         defaultMessage: string;

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

@@ -1,6 +1,6 @@
 import React from "react";
 import { Comment } from "../../../../types/contentTypes";
-declare type ModeratorResponseProps = {
+type ModeratorResponseProps = {
     rootThread: Comment;
 };
 declare const ModeratorResponse: React.FC<ModeratorResponseProps>;

package/admin/src/components/ModeratorResponseModal/ModeratorResponseModal.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import { Id } from "strapi-typed";
-declare type ModeratorResponseModalProps = {
+type ModeratorResponseModalProps = {
     content: string;
     id: Id;
     title: string;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-declare type PreviewWysiwygProps = {
+type PreviewWysiwygProps = {
     data: string;
 };
 declare const _default: React.NamedExoticComponent<PreviewWysiwygProps>;

package/admin/src/components/Wysiwyg/Editor.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import 'codemirror/addon/display/placeholder';
-declare type EditorProps = {
+type EditorProps = {
     disabled?: boolean;
     editorRef: any;
     error?: string;

package/admin/src/components/Wysiwyg/EditorLayout.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export declare const ExpandButton: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
-declare type EditorLayoutProps = {
+type EditorLayoutProps = {
     children: React.ReactNode;
     error: string | undefined;
     isExpandMode: boolean;

package/admin/src/components/Wysiwyg/WysiwygFooter.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-declare type WysiwyhFooterProps = {
+type WysiwyhFooterProps = {
     onToggleExpand: () => void;
 };
 declare const WysiwygFooter: React.FC<WysiwyhFooterProps>;

package/admin/src/components/Wysiwyg/WysiwygNav.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-declare type WysiwygNavProps = {
+type WysiwygNavProps = {
     disabled?: boolean;
     editorRef: any;
     isExpandMode: boolean;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-declare type WysiwygProps = {
+type WysiwygProps = {
     description?: {
         id: string;
         defaultMessage: string;

package/admin/src/custom-fields/comments/components/input/consts.d.ts

@@ -0,0 +1,3 @@
+import { CommentsFieldValue } from "./types";
+export declare const DEFAULTS: CommentsFieldValue;
+//# sourceMappingURL=consts.d.ts.map

package/admin/src/custom-fields/comments/components/input/consts.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULTS = void 0;
+exports.DEFAULTS = {
+    commentsNumber: 30,
+    populate: [],
+    renderType: "FLAT",
+};
+//# sourceMappingURL=consts.js.map

package/admin/src/custom-fields/comments/components/input/input.js

@@ -37,14 +37,10 @@ const Grid_1 = require("@strapi/design-system/Grid");
 const utils_1 = require("./utils");
 const utils_2 = require("../../../../utils");
 const react_intl_1 = require("react-intl");
-const DEFAULTS = {
-    commentsNumber: 30,
-    populate: [],
-    renderType: "FLAT",
-};
+const consts_1 = require("./consts");
 const CustomFieldInput = ({ attribute, description, disabled, error, intlLabel, labelAction, name, onChange, required, value, }) => {
     const { formatMessage } = (0, react_intl_1.useIntl)();
-    const [currentState, setCurrentState] = (0, react_1.useState)(value ? (0, utils_1.fromInput)(value) : DEFAULTS);
+    const [currentState, setCurrentState] = (0, react_1.useState)(value ? (0, utils_1.fromInput)(value) : consts_1.DEFAULTS);
     const onCommentsNumberChange = (0, react_1.useCallback)((0, utils_1.handleStateSliceChange)("commentsNumber", setCurrentState), [setCurrentState]);
     const onRenderTypeChange = (0, react_1.useCallback)((0, utils_1.handleStateSliceChange)("renderType", setCurrentState), [setCurrentState]);
     const onSortByDateChange = (0, react_1.useCallback)((0, utils_1.handleStateSliceChange)("sortByDate", setCurrentState), [setCurrentState]);

package/admin/src/custom-fields/comments/components/input/types.d.ts

@@ -1,5 +1,5 @@
-export declare type PopulateField = "avatar" | "author";
-export declare type CommentsFieldValue = {
+export type PopulateField = "avatar" | "author";
+export type CommentsFieldValue = {
     commentsNumber: number;
     renderType?: "FLAT" | "TREE";
     sortByDate?: "ASC" | "DESC";

package/admin/src/custom-fields/comments/components/input/utils.js

@@ -3,11 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getApprovalStatusOptions = exports.getFilterByOptions = exports.getSortByDateOptions = exports.getRenderTypeOptions = exports.handlePopulateChange = exports.handleStateSliceChange = exports.assertCorrectState = exports.toOutput = exports.fromInput = exports.asString = void 0;
 const lodash_1 = require("lodash");
 const utils_1 = require("../../../../utils");
+const consts_1 = require("./consts");
 const asString = () => "";
 exports.asString = asString;
 const fromInput = (value) => {
     (0, utils_1.assertString)(value);
-    const state = JSON.parse(value);
+    let state = JSON.parse(value);
+    if (!state) {
+        console.group("[Comments]");
+        console.warn("Empty state provided from the back-end");
+        console.groupEnd();
+        state = consts_1.DEFAULTS;
+    }
     assertCorrectState(state);
     if (state.filterBy === "DATE_CREATED" && state.filterByValue) {
         state.filterByValue = new Date(state.filterByValue);

package/admin/src/index.d.ts

@@ -1,8 +1,13 @@
 import { StrapiAdminInstance } from "strapi-typed";
-import { ToBeFixed } from "../../types";
+import { TranslationKey } from "./translations";
 declare const _default: {
     register(app: StrapiAdminInstance): void;
-    registerTrads({ locales }: ToBeFixed): Promise<any[]>;
+    registerTrads({ locales }: {
+        locales: Array<TranslationKey>;
+    }): {
+        data: any;
+        locale: string;
+    }[];
 };
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/admin/src/index.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const helper_plugin_1 = require("@strapi/helper-plugin");
+const lodash_1 = require("lodash");
 const pluginPkg = __importStar(require("../../package.json"));
 const pluginId_1 = require("./pluginId");
 const Initializer_1 = __importDefault(require("./components/Initializer"));
@@ -34,6 +35,7 @@ const PluginIcon_1 = __importDefault(require("./components/PluginIcon"));
 const permissions_1 = __importDefault(require("./permissions"));
 const reducers_1 = __importDefault(require("./reducers"));
 const custom_fields_1 = require("./custom-fields");
+const translations_1 = __importDefault(require("./translations"));
 const { name, displayName } = pluginPkg.strapi;
 exports.default = {
     register(app) {
@@ -81,22 +83,13 @@ exports.default = {
         });
         (0, custom_fields_1.registerCustomFields)(app);
     },
-    async registerTrads({ locales }) {
-        const importedTrads = await Promise.all(locales.map((locale) => {
-            return Promise.resolve().then(() => __importStar(require(`./translations/${locale}.json`))).then(({ default: data }) => {
-                return {
-                    data: (0, helper_plugin_1.prefixPluginTranslations)(data, pluginId_1.pluginId),
-                    locale,
-                };
-            })
-                .catch(() => {
-                return {
-                    data: {},
-                    locale,
-                };
-            });
-        }));
-        return Promise.resolve(importedTrads);
+    registerTrads({ locales }) {
+        return locales.map((locale) => {
+            return {
+                data: (0, helper_plugin_1.prefixPluginTranslations)((0, lodash_1.get)(translations_1.default, locale), pluginId_1.pluginId, {}),
+                locale,
+            };
+        });
     },
 };
 //# sourceMappingURL=index.js.map

package/admin/src/translations/index.d.ts

@@ -0,0 +1,8 @@
+import { KeyValueSet } from "strapi-typed";
+export type TranslationKey = "en" | "fr" | "pt-BR";
+export type Translations = {
+    [key in TranslationKey]: KeyValueSet<string>;
+};
+declare const trads: Translations;
+export default trads;
+//# sourceMappingURL=index.d.ts.map

package/admin/src/translations/index.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const en_json_1 = __importDefault(require("./en.json"));
+const fr_json_1 = __importDefault(require("./fr.json"));
+const pt_BR_json_1 = __importDefault(require("./pt-BR.json"));
+const trads = {
+    en: en_json_1.default,
+    fr: fr_json_1.default,
+    "pt-BR": pt_BR_json_1.default,
+};
+exports.default = trads;
+//# sourceMappingURL=index.js.map

package/admin/src/utils/getMessage.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_intl_1 = require("react-intl");
-const lodash_1 = require("lodash");
 const pluginId_1 = require("../pluginId");
 const getMessage = (input, defaultMessage = "", inPluginScope = true) => {
     const { formatMessage } = (0, react_intl_1.useIntl)();
     let formattedId = "";
-    if ((0, lodash_1.isString)(input)) {
+    if (typeof input === 'string') {
         formattedId = input;
     }
     else {
-        formattedId = input?.id;
+        formattedId = input?.id.toString() || formattedId;
     }
     return formatMessage({
         id: `${inPluginScope ? pluginId_1.pluginId : "app.components"}.${formattedId}`,
         defaultMessage,
-    }, input?.props);
+    }, typeof input === 'string' ? undefined : input?.props);
 };
 exports.default = getMessage;
 //# sourceMappingURL=getMessage.js.map

package/admin/src/utils/getRelatedGroups.d.ts

@@ -1,4 +1,4 @@
-declare type Config = {
+type Config = {
     regex: {
         relatedUid: string;
     };

package/admin/src/utils/resolveCommentStatus.d.ts

@@ -1,4 +1,4 @@
-declare type Config = {
+type Config = {
     removed?: boolean;
     blocked?: boolean;
     blockedThread?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.2.2-beta.1",
+  "version": "2.2.4",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -14,8 +14,8 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
-    "@strapi/plugin-graphql": "^4.5.2",
-    "@strapi/utils": "^4.5.2",
+    "@strapi/plugin-graphql": "^4.5.5",
+    "@strapi/utils": "^4.5.5",
     "@types/axios": "^0.14.0",
     "@types/react-intl": "^3.0.0",
     "@types/react-query": "^1.2.9",

package/server/controllers/index.d.ts

@@ -1,4 +1,4 @@
-declare type PluginControllers = {
+type PluginControllers = {
     [key: string]: Function | Object;
 };
 declare const controllers: PluginControllers;

package/server/controllers/utils/functions.d.ts

@@ -1,6 +1,6 @@
 import { Id, StringMap, StrapiRequestContext } from "strapi-typed";
 import PluginError from "../../utils/error";
-declare type ParseResponse = StringMap<string | number | Id>;
+type ParseResponse = StringMap<string | number | Id>;
 export declare const parseParams: <T extends ParseResponse>(params: StringMap<string | number>) => T;
 export declare const throwError: <T extends {} = never>(ctx: StrapiRequestContext<T, StringMap<string | number>, StringMap<string | number>>, e: PluginError | Error | unknown) => PluginError | Error | unknown | never;
 export {};

package/server/graphql/mutations/createComment.d.ts

@@ -1,6 +1,6 @@
 import { StrapiRequestContext } from "strapi-typed";
 import { StrapiGraphQLContext, ToBeFixed } from "../../../types";
-declare type CreateCommentProps = {
+type CreateCommentProps = {
     input: ToBeFixed;
 };
 declare const _default: ({ nexus }: StrapiGraphQLContext) => {

package/server/graphql/queries/findAllFlat.d.ts

@@ -1,5 +1,5 @@
 import { Id, StrapiGraphQLContext, ToBeFixed } from "../../../types";
-declare type ResponseFindAllResolverProps = {
+type ResponseFindAllResolverProps = {
     relation: Id;
     filters: ToBeFixed;
     sort: ToBeFixed;

package/server/graphql/queries/findAllInHierarchy.d.ts

@@ -1,6 +1,6 @@
 import { Id } from "strapi-typed";
 import { StrapiGraphQLContext, ToBeFixed } from "../../../types";
-declare type findAllInHierarchyProps = {
+type findAllInHierarchyProps = {
     relation: Id;
     filters: ToBeFixed;
     sort: ToBeFixed;

package/server/routes/index.d.ts

@@ -1,8 +1,8 @@
 import { StrapiRoute } from "strapi-typed";
-declare type PluginRoutes = {
+type PluginRoutes = {
     [key: string]: PluginScopeRoutes;
 };
-declare type PluginScopeRoutes = {
+type PluginScopeRoutes = {
     type: string;
     routes: Array<StrapiRoute>;
 };

package/server/services/admin.js

@@ -94,19 +94,25 @@ module.exports = ({ strapi }) => ({
                 },
             };
         }
+        const basePopulate = {
+            threadOf: true,
+            reports: {
+                where: {
+                    resolved: false,
+                },
+            },
+        };
+        const populate = defaultAuthorUserPopulate
+            ? {
+                ...basePopulate,
+                authorUser: defaultAuthorUserPopulate,
+            }
+            : basePopulate;
         const entities = await strapi.db
             .query((0, functions_2.getModelUid)("comment"))
             .findMany({
             ...params,
-            populate: {
-                authorUser: defaultAuthorUserPopulate,
-                threadOf: true,
-                reports: {
-                    where: {
-                        resolved: false,
-                    },
-                },
-            },
+            populate,
         });
         const total = await strapi.db.query((0, functions_2.getModelUid)("comment")).count({
             where: params.where,
@@ -216,18 +222,30 @@ module.exports = ({ strapi }) => ({
                 },
             },
         };
-        const defaultPopulate = {
+        const basePopulate = {
             populate: {
-                authorUser: defaultAuthorUserPopulate,
                 threadOf: {
                     populate: {
-                        authorUser: defaultAuthorUserPopulate,
                         ...reportsPopulation,
                     },
                 },
                 ...reportsPopulation,
             },
         };
+        const defaultPopulate = defaultAuthorUserPopulate
+            ? {
+                populate: {
+                    ...basePopulate.populate,
+                    authorUser: defaultAuthorUserPopulate,
+                    threadOf: {
+                        populate: {
+                            ...basePopulate.populate.threadOf.populate,
+                            authorUser: defaultAuthorUserPopulate,
+                        },
+                    },
+                },
+            }
+            : basePopulate;
         const entity = await strapi.db
             .query((0, functions_2.getModelUid)("comment"))
             .findOne({

package/server/utils/error.d.ts

@@ -1,4 +1,4 @@
-declare type ErrorPayload = {
+type ErrorPayload = {
     [key: string]: any;
 } | undefined;
 interface IPluginError extends Error {