strapi-plugin-comments 2.1.0-beta.1 → 2.1.2

package/admin/src/utils/getRelatedGroups.ts

@@ -0,0 +1,6 @@
+import { ToBeFixed } from "../../../types";
+
+const getRelatedGroups = (related: string, config: ToBeFixed) =>
+  related.split(config.regex.relatedUid).filter((s) => s && s.length > 0);
+
+export default getRelatedGroups;

package/admin/src/utils/getUrl.ts

@@ -0,0 +1,5 @@
+import { pluginId } from "../pluginId";
+
+const getUrl = (path = "") => `/plugins/${pluginId}/${path}`;
+
+export default getUrl;

package/admin/src/utils/handleAPIError.ts

@@ -0,0 +1,21 @@
+import { ToBeFixed } from "../../../types";
+import { pluginId } from "../pluginId";
+
+const handleAPIError = (
+  err = null,
+  toggleNotification: ToBeFixed = null,
+  message = "app.components.notification.error"
+) => {
+  toggleNotification({
+    type: "warning",
+    message: `${pluginId}.${message}`,
+  });
+
+  if (err) {
+    throw err;
+  } else {
+    throw new Error("error");
+  }
+};
+
+export default handleAPIError;

package/admin/src/utils/index.ts

@@ -0,0 +1,11 @@
+export { default as axiosInstance } from "./axiosInstance";
+export { default as getApiURL } from "./getApiUrl";
+export { default as getUrl } from "./getUrl";
+export { default as getMessage } from "./getMessage";
+export { default as handleAPIError } from "./handleAPIError";
+export { default as getRelatedGroups } from "./getRelatedGroups";
+export { default as renderEntryTitle } from "./renderEntryTitle";
+export { default as renderInitials } from "./renderInitials";
+export { default as resolveCommentStatus } from "./resolveCommentStatus";
+export { default as resolveCommentStatusColor } from "./resolveCommentStatusColor";
+export { default as parseRegExp } from "./parseRegExp";

package/admin/src/utils/parseRegExp.ts

@@ -0,0 +1,9 @@
+const parseRegExp = (regexpString: string) => {
+  const [value, flags] = regexpString.split("/").filter((_) => _.length > 0);
+  return {
+    value,
+    flags,
+  };
+};
+
+export default parseRegExp;

package/admin/src/utils/renderEntryTitle.ts

@@ -0,0 +1,16 @@
+import { first } from "lodash";
+import { ToBeFixed } from "../../../types";
+
+const renderEntryTitle = (entry: ToBeFixed, config: ToBeFixed = {}) => {
+  const { entryLabel } = config;
+  const rule =
+    entry.uid in entryLabel ? entryLabel[entry.uid] : entryLabel["*"];
+  return first(
+    Object.keys(entry)
+      .filter((_) => rule === _ || rule.includes(_))
+      .map((_) => entry[_])
+      .filter((_) => _)
+  );
+};
+
+export default renderEntryTitle;

package/admin/src/utils/renderInitials.ts

@@ -0,0 +1,10 @@
+import { first } from "lodash";
+
+const renderInitials = (value = "") =>
+  value
+    .split(" ")
+    .map((_) => first(_))
+    .join("")
+    .toUpperCase();
+
+export default renderInitials;

package/admin/src/utils/resolveCommentStatus.ts

@@ -0,0 +1,37 @@
+import { isNil } from "lodash";
+import { ToBeFixed } from "../../../types";
+import { COMMENT_STATUS } from "./constants";
+
+const resolveCommentStatus = ({
+  removed,
+  blocked,
+  blockedThread,
+  approvalStatus,
+  reviewFlowEnabled,
+}: ToBeFixed) => {
+  const gotApprovalFlow = !isNil(approvalStatus);
+
+  if (removed) {
+    return COMMENT_STATUS.REMOVED;
+  }
+
+  if (blocked || blockedThread) {
+    return COMMENT_STATUS.BLOCKED;
+  }
+
+  if (reviewFlowEnabled) {
+    return COMMENT_STATUS.TO_REVIEW;
+  }
+
+  if (gotApprovalFlow) {
+    const status = approvalStatus.toUpperCase();
+    if (Object.keys(COMMENT_STATUS).includes(status)) {
+      return status;
+    }
+    return COMMENT_STATUS.UNKNOWN;
+  }
+
+  return COMMENT_STATUS.OPEN;
+};
+
+export default resolveCommentStatus;

package/admin/src/utils/resolveCommentStatusColor.ts

@@ -0,0 +1,22 @@
+import { ToBeFixed } from "../../../types";
+import { COMMENT_STATUS } from "./constants";
+
+const resolveCommentStatusColor = (status: ToBeFixed) => {
+  if (Object.keys(COMMENT_STATUS).includes(status)) {
+    switch (status) {
+      case COMMENT_STATUS.REMOVED:
+        return "secondary";
+      case COMMENT_STATUS.TO_REVIEW:
+      case COMMENT_STATUS.REJECTED:
+        return "warning";
+      case COMMENT_STATUS.BLOCKED:
+        return "danger";
+      case COMMENT_STATUS.OPEN:
+      case COMMENT_STATUS.APPROVED:
+        return "success";
+    }
+  }
+  return "secondary";
+};
+
+export default resolveCommentStatusColor;

package/build/admin/src/components/Avatar/index.d.ts

@@ -0,0 +1,12 @@
+declare const UserAvatar: {
+    ({ avatar, name }: {
+        avatar: any;
+        name: any;
+    }): any;
+    propTypes: {
+        avatar: any;
+        name: any;
+    };
+};
+export default UserAvatar;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importDefault(require("react"));
+const prop_types_1 = __importDefault(require("prop-types"));
+const lodash_1 = require("lodash");
+const Avatar_1 = require("@strapi/design-system/Avatar");
+const utils_1 = require("../../utils");
+const UserAvatar = ({ avatar, name }) => {
+    if (avatar) {
+        let image = avatar;
+        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 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,
+    name: prop_types_1.default.string,
+};
+exports.default = UserAvatar;
+//# sourceMappingURL=index.js.map

package/{admin → build/admin}/src/components/DiscussionThreadItemFooter/index.js

@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const prop_types_1 = __importDefault(require("prop-types"));
 const react_intl_1 = require("react-intl");
-const Avatar_1 = require("@strapi/design-system/Avatar");
 const Box_1 = require("@strapi/design-system/Box");
 const Typography_1 = require("@strapi/design-system/Typography");
-const utils_1 = require("../../utils");
 const styles_1 = require("./styles");
+const Avatar_1 = __importDefault(require("../Avatar"));
 const DiscussionThreadItemFooter = ({ children, author, createdAt, updatedAt, }) => {
     const { formatDate } = (0, react_intl_1.useIntl)();
     const dateTime = formatDate(updatedAt || createdAt, {
@@ -20,7 +19,7 @@ const DiscussionThreadItemFooter = ({ children, author, createdAt, updatedAt, })
     const { name, avatar } = author;
     return (react_1.default.createElement(styles_1.DiscussionThreadItemFooterStyled, { as: Box_1.Box, paddingTop: 2, direction: "row" },
         react_1.default.createElement(styles_1.DiscussionThreadItemFooterMeta, { size: 3, horizontal: true },
-            avatar ? (react_1.default.createElement(Avatar_1.Avatar, { src: avatar, alt: name })) : (react_1.default.createElement(Avatar_1.Initials, null, (0, utils_1.renderInitials)(name))),
+            react_1.default.createElement(Avatar_1.default, { avatar: avatar, name: name }),
             react_1.default.createElement(Typography_1.Typography, { variant: "pi", fontWeight: "bold", textColor: "neutral800" }, name),
             react_1.default.createElement(Typography_1.Typography, { variant: "pi", textColor: "neutral600" }, dateTime)),
         children));
@@ -30,7 +29,7 @@ DiscussionThreadItemFooter.propTypes = {
         id: prop_types_1.default.oneOfType(prop_types_1.default.string, prop_types_1.default.number).isRequired,
         name: prop_types_1.default.string.isRequired,
         email: prop_types_1.default.string,
-        avatar: prop_types_1.default.string,
+        avatar: prop_types_1.default.oneOfType(prop_types_1.default.string, prop_types_1.default.object),
     }).isRequired,
     createdAt: prop_types_1.default.string.isRequired,
     updatedAt: prop_types_1.default.string,

package/{admin → build/admin}/src/pages/Discover/components/DiscoverTableRow/index.js

@@ -31,7 +31,6 @@ const prop_types_1 = __importDefault(require("prop-types"));
 const react_intl_1 = require("react-intl");
 const react_query_1 = require("react-query");
 const lodash_1 = require("lodash");
-const Avatar_1 = require("@strapi/design-system/Avatar");
 const Flex_1 = require("@strapi/design-system/Flex");
 const IconButton_1 = require("@strapi/design-system/IconButton");
 const Link_1 = require("@strapi/design-system/Link");
@@ -49,6 +48,7 @@ const DiscussionThreadItemApprovalFlowActions_1 = __importDefault(require("../..
 const StatusBadge_1 = __importDefault(require("../../../../components/StatusBadge"));
 const styles_2 = require("../../../../components/IconButton/styles");
 const DiscussionThreadItemReviewAction_1 = __importDefault(require("../../../../components/DiscussionThreadItemReviewAction"));
+const Avatar_1 = __importDefault(require("../../../../components/Avatar"));
 const DiscoverTableRow = ({ config, item, allowedActions: { canModerate, canAccessReports, canReviewReports }, onClick, }) => {
     const { id, reports } = item;
     const [blockButtonsDisabled, setBlockButtonsDisabled] = (0, react_1.useState)(false);
@@ -128,7 +128,7 @@ const DiscoverTableRow = ({ config, item, allowedActions: { canModerate, canAcce
                 item.id)),
         react_1.default.createElement(Table_1.Td, null,
             react_1.default.createElement(Stack_1.Stack, { size: 2, horizontal: true },
-                item.author?.avatar ? (react_1.default.createElement(Avatar_1.Avatar, { src: item.author?.avatar, alt: item.author.name })) : (react_1.default.createElement(Avatar_1.Initials, null, (0, utils_1.renderInitials)(item.author.name))),
+                react_1.default.createElement(Avatar_1.default, { avatar: item.author?.avatar, name: item.author.name }),
                 react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800", variant: "pi" }, item.author.name))),
         react_1.default.createElement(Table_1.Td, { style: { maxWidth: "30vw" } },
             react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800", ellipsis: true }, item.content)),