Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Migrate QuestionModerationSection to TS and drop dead unverify path (#75134)

Andrei Chernykh008feef3310c
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx
deleted file mode 100644
index 9ec7cbaf5ab..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.jsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import PropTypes from "prop-types";
-import { Fragment } from "react";
-
-import { useEditItemVerificationMutation } from "metabase/api";
-import { connect } from "metabase/redux";
-import { getIsModerator } from "metabase-enterprise/moderation/selectors";
-import { getLatestModerationReview } from "metabase-enterprise/moderation/service";
-
-import { ModerationReviewBanner } from "../ModerationReviewBanner/ModerationReviewBanner";
-
-import { VerifyButton as DefaultVerifyButton } from "./QuestionModerationSection.styled";
-
-const mapStateToProps = (state, props) => ({
- isModerator: getIsModerator(state, props),
-});
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default connect(mapStateToProps)(QuestionModerationSection);
-
-QuestionModerationSection.VerifyButton = DefaultVerifyButton;
-
-QuestionModerationSection.propTypes = {
- question: PropTypes.object.isRequired,
- isModerator: PropTypes.bool.isRequired,
- reviewBannerClassName: PropTypes.string,
- VerifyButton: PropTypes.func,
-};
-
-function QuestionModerationSection({
- question,
- isModerator,
- reviewBannerClassName,
-}) {
- const [editItemVerification] = useEditItemVerificationMutation();
-
- const latestModerationReview = getLatestModerationReview(
- question.getModerationReviews(),
- );
-
- const onRemoveModerationReview = () => {
- const id = question.id();
- editItemVerification({
- status: null,
- moderated_item_id: id,
- moderated_item_type: "card",
- });
- };
-
- return (
- <Fragment>
- {latestModerationReview && (
- <ModerationReviewBanner
- className={reviewBannerClassName}
- moderationReview={latestModerationReview}
- onRemove={isModerator ? onRemoveModerationReview : undefined}
- />
- )}
- </Fragment>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.tsx
new file mode 100644
index 00000000000..141024840e7
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.tsx
@@ -0,0 +1,29 @@
+import { getLatestModerationReview } from "metabase-enterprise/moderation/service";
+import type Question from "metabase-lib/v1/Question";
+
+import { ModerationReviewBanner } from "../ModerationReviewBanner/ModerationReviewBanner";
+
+interface QuestionModerationSectionProps {
+ question: Question;
+ reviewBannerClassName?: string;
+}
+
+export function QuestionModerationSection({
+ question,
+ reviewBannerClassName,
+}: QuestionModerationSectionProps) {
+ const latestModerationReview = getLatestModerationReview(
+ question.getModerationReviews(),
+ );
+
+ if (!latestModerationReview) {
+ return null;
+ }
+
+ return (
+ <ModerationReviewBanner
+ className={reviewBannerClassName}
+ moderationReview={latestModerationReview}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.unit.spec.tsx
new file mode 100644
index 00000000000..3c595ad40ef
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.unit.spec.tsx
@@ -0,0 +1,67 @@
+import { setupUserEndpoints } from "__support__/server-mocks";
+import { renderWithProviders, screen } from "__support__/ui";
+import Question from "metabase-lib/v1/Question";
+import type { ModerationReview } from "metabase-types/api";
+import { createMockUser } from "metabase-types/api/mocks";
+
+import { QuestionModerationSection } from "./QuestionModerationSection";
+
+const moderator = createMockUser({ id: 1, common_name: "Foo" });
+const currentUser = createMockUser({
+ id: 2,
+ common_name: "Bar",
+ is_superuser: true,
+});
+
+const verifiedReview: ModerationReview = {
+ most_recent: true,
+ status: "verified",
+ moderator_id: 1,
+ created_at: "1997-10-10T03:30:30",
+ user: moderator,
+};
+
+const removedReview: ModerationReview = {
+ ...verifiedReview,
+ status: null,
+};
+
+const setup = (
+ moderationReviews: ModerationReview[],
+ props: { reviewBannerClassName?: string } = {},
+) => {
+ setupUserEndpoints(moderator);
+ const question = new Question({ moderation_reviews: moderationReviews });
+
+ return renderWithProviders(
+ <QuestionModerationSection question={question} {...props} />,
+ { storeInitialState: { currentUser } },
+ );
+};
+
+describe("QuestionModerationSection", () => {
+ it("renders the moderation review banner for the latest review", async () => {
+ setup([verifiedReview]);
+
+ expect(await screen.findByText("Foo verified this")).toBeInTheDocument();
+ });
+
+ it("passes reviewBannerClassName through to the banner", async () => {
+ setup([verifiedReview], { reviewBannerClassName: "my-banner" });
+
+ const banner = await screen.findByText("Foo verified this");
+ expect(banner.closest(".my-banner")).toBeInTheDocument();
+ });
+
+ it("renders nothing when the question has no moderation reviews", () => {
+ setup([]);
+
+ expect(screen.queryByText(/verified this/)).not.toBeInTheDocument();
+ });
+
+ it("renders nothing when the latest review was removed", () => {
+ setup([removedReview]);
+
+ expect(screen.queryByText(/verified this/)).not.toBeInTheDocument();
+ });
+});
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/index.ts b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/index.ts
index 8e49079adf9..ec577e66d27 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./QuestionModerationSection";
+export { QuestionModerationSection } from "./QuestionModerationSection";
diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/index.ts b/enterprise/frontend/src/metabase-enterprise/moderation/index.ts
index 01cada97615..059ca754c5d 100644
--- a/enterprise/frontend/src/metabase-enterprise/moderation/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/moderation/index.ts
@@ -9,7 +9,7 @@ import {
ModerationReviewTextForQuestion,
} from "./components/ModerationReviewBanner";
import { ModerationStatusIcon } from "./components/ModerationStatusIcon";
-import QuestionModerationSection from "./components/QuestionModerationSection";
+import { QuestionModerationSection } from "./components/QuestionModerationSection";
import { useCardMenuItems, useDashboardMenuItems } from "./hooks/useMenuItems";
import {
getModerationTimelineEvents,