-
+
User not found.
@@ -83,105 +56,12 @@ const UserHistoryDrawerQuery: FunctionComponent
= ({
);
}
- const { user, settings } = props;
-
return (
- <>
-
-
- {user.username}
-
-
-
-
-
-
-
- Status:
-
-
-
-
-
-
-
-
-
-
-
-
-
- mail_outline
-
-
-
- {user.email}
-
-
-
-
-
-
- date_range
-
-
-
- {formatter.format(new Date(user.createdAt))}
-
-
-
-
-
- people_outline
-
-
-
- {user.id}
-
-
-
-
-
-
-
-
-
+
);
}}
/>
diff --git a/src/core/client/admin/components/UserHistoryDrawer/index.ts b/src/core/client/admin/components/UserHistoryDrawer/index.ts
new file mode 100644
index 000000000..df71edd90
--- /dev/null
+++ b/src/core/client/admin/components/UserHistoryDrawer/index.ts
@@ -0,0 +1 @@
+export { default } from "./UserHistoryDrawer";
diff --git a/src/core/client/admin/mutations/ApproveCommentMutation.ts b/src/core/client/admin/mutations/ApproveCommentMutation.ts
index 3bdf2d6b7..c019631ff 100644
--- a/src/core/client/admin/mutations/ApproveCommentMutation.ts
+++ b/src/core/client/admin/mutations/ApproveCommentMutation.ts
@@ -27,6 +27,18 @@ const ApproveCommentMutation = createMutation(
comment {
id
status
+ author {
+ id
+ recentCommentHistory {
+ statuses {
+ NONE
+ APPROVED
+ REJECTED
+ PREMOD
+ SYSTEM_WITHHELD
+ }
+ }
+ }
statusHistory(first: 1) {
edges {
node {
diff --git a/src/core/client/admin/mutations/RejectCommentMutation.ts b/src/core/client/admin/mutations/RejectCommentMutation.ts
index 2105aa27b..c78efa270 100644
--- a/src/core/client/admin/mutations/RejectCommentMutation.ts
+++ b/src/core/client/admin/mutations/RejectCommentMutation.ts
@@ -27,6 +27,18 @@ const RejectCommentMutation = createMutation(
comment {
id
status
+ author {
+ id
+ recentCommentHistory {
+ statuses {
+ NONE
+ APPROVED
+ REJECTED
+ PREMOD
+ SYSTEM_WITHHELD
+ }
+ }
+ }
statusHistory(first: 1) {
edges {
node {
diff --git a/src/core/client/admin/routes/Community/UserTable.tsx b/src/core/client/admin/routes/Community/UserTable.tsx
index c0749d627..e18cc5133 100644
--- a/src/core/client/admin/routes/Community/UserTable.tsx
+++ b/src/core/client/admin/routes/Community/UserTable.tsx
@@ -4,7 +4,7 @@ import React, { FunctionComponent, useCallback, useState } from "react";
import { PropTypesOf } from "coral-framework/types";
import AutoLoadMore from "coral-admin/components/AutoLoadMore";
-import UserHistoryDrawerContainer from "coral-admin/components/UserHistoryDrawer/UserHistoryDrawerContainer";
+import UserHistoryDrawer from "coral-admin/components/UserHistoryDrawer";
import {
Table,
TableBody,
@@ -108,7 +108,7 @@ const UserTable: FunctionComponent = ({
/>
)}
- ["settings"] &
PropTypesOf["settings"] &
- PropTypesOf["settings"];
+ PropTypesOf["settings"] &
+ PropTypesOf["settings"];
onInitValues: (values: any) => void;
}
@@ -21,6 +23,11 @@ const ModerationConfig: FunctionComponent = ({
onInitValues,
}) => (
+
({
...AkismetConfigContainer_settings
...PerspectiveConfigContainer_settings
...PreModerationConfigContainer_settings
+ ...RecentCommentHistoryConfigContainer_settings
}
`,
})(ModerationConfigContainer);
diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.css b/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.css
index 54cc0f1d0..3648e55cb 100644
--- a/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.css
+++ b/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.css
@@ -1,3 +1,3 @@
.thresholdTextField {
- width: 60px;
+ width: calc(6 * var(--mini-unit));
}
diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.css b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.css
new file mode 100644
index 000000000..3648e55cb
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.css
@@ -0,0 +1,3 @@
+.thresholdTextField {
+ width: calc(6 * var(--mini-unit));
+}
diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.tsx b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.tsx
new file mode 100644
index 000000000..1cf8a16be
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.tsx
@@ -0,0 +1,133 @@
+import { Localized } from "fluent-react/compat";
+import React, { FunctionComponent } from "react";
+import { Field } from "react-final-form";
+
+import { DURATION_UNIT, DurationField } from "coral-framework/components";
+import {
+ formatPercentage,
+ parsePercentage,
+ ValidationMessage,
+} from "coral-framework/lib/form";
+import {
+ composeValidators,
+ required,
+ validatePercentage,
+ validateWholeNumberGreaterThan,
+} from "coral-framework/lib/validation";
+import {
+ FieldSet,
+ FormField,
+ HorizontalGutter,
+ InputDescription,
+ InputLabel,
+ TextField,
+ Typography,
+} from "coral-ui/components";
+
+import Header from "../../Header";
+import OnOffField from "../../OnOffField";
+
+import styles from "./RecentCommentHistoryConfig.css";
+
+interface Props {
+ disabled: boolean;
+}
+
+const RecentCommentHistoryConfig: FunctionComponent = ({ disabled }) => {
+ return (
+ }>
+
+ }>
+
+
+
+ {({ input, meta }) => (
+ <>
+
+
+
+ )}
+
+
+ }>
+
+ }
+ >
+
+ Prevents repeat offenders from publishing comments without approval.
+ After a commenter's rejection rate rises above the defined threshold
+ below, their next submitted comments are{" "}
+ sent to Pending for moderator approval. The filter
+ is removed when their rejection rate falls below the threshold.
+
+
+
+
+
+
+
+
+ {({ input, meta }) => (
+ <>
+ %}
+ textAlignCenter
+ {...input}
+ />
+
+
+ )}
+
+
+
+ );
+};
+
+export default RecentCommentHistoryConfig;
diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfigContainer.tsx
new file mode 100644
index 000000000..a136ee232
--- /dev/null
+++ b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfigContainer.tsx
@@ -0,0 +1,39 @@
+import React from "react";
+import { graphql } from "react-relay";
+
+import { RecentCommentHistoryConfigContainer_settings as SettingsData } from "coral-admin/__generated__/RecentCommentHistoryConfigContainer_settings.graphql";
+import { withFragmentContainer } from "coral-framework/lib/relay";
+
+import RecentCommentHistoryConfig from "./RecentCommentHistoryConfig";
+
+interface Props {
+ settings: SettingsData;
+ onInitValues: (values: SettingsData) => void;
+ disabled: boolean;
+}
+
+class RecentCommentHistoryConfigContainer extends React.Component {
+ constructor(props: Props) {
+ super(props);
+ props.onInitValues(props.settings);
+ }
+
+ public render() {
+ const { disabled } = this.props;
+ return ;
+ }
+}
+
+const enhanced = withFragmentContainer({
+ settings: graphql`
+ fragment RecentCommentHistoryConfigContainer_settings on Settings {
+ recentCommentHistory {
+ enabled
+ timeFrame
+ triggerRejectionRate
+ }
+ }
+ `,
+})(RecentCommentHistoryConfigContainer);
+
+export default enhanced;
diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/__snapshots__/ModerationConfig.spec.tsx.snap b/src/core/client/admin/routes/Configure/sections/Moderation/__snapshots__/ModerationConfig.spec.tsx.snap
index 7bd009582..4ea3b8256 100644
--- a/src/core/client/admin/routes/Configure/sections/Moderation/__snapshots__/ModerationConfig.spec.tsx.snap
+++ b/src/core/client/admin/routes/Configure/sections/Moderation/__snapshots__/ModerationConfig.spec.tsx.snap
@@ -5,6 +5,11 @@ exports[`renders correctly 1`] = `
data-testid="configure-moderationContainer"
size="double"
>
+
= ({
)}
{comments.length === 0 && emptyElement}
-
-
- {
routeConfig,
renderReady: ({ elements }) => (
-
{
diff --git a/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap
index 996a668f8..33caff810 100644
--- a/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap
+++ b/src/core/client/admin/test/configure/__snapshots__/moderation.spec.tsx.snap
@@ -116,6 +116,178 @@ exports[`renders configure moderation 1`] = `
className="Box-root HorizontalGutter-root HorizontalGutter-double"
data-testid="configure-moderationContainer"
>
+