The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Refactor SegmentActionSelect (#65576)
Fraser22ebb534876e
diff --git a/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts b/e2e/test/scenarios/admin/datamodel/segments.cy.spec.tsindex f99512d68d2..e7f5d499056 100644--- a/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts+++ b/e2e/test/scenarios/admin/datamodel/segments.cy.spec.ts@@ -212,7 +212,6 @@ describe("scenarios > admin > datamodel > segments", () => {.find(".Icon-ellipsis").click();H.popover().findByText("Retire Segment").click();- H.modal().find("textarea").type("delete it");H.modal().contains("button", "Retire").click();});diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.jsx b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.jsxdeleted file mode 100644index 07f1f28c6c1..00000000000--- a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.jsx+++ /dev/null@@ -1,81 +0,0 @@-import cx from "classnames";-import PropTypes from "prop-types";-import { Component, createRef } from "react";-import { t } from "ttag";--import ModalWithTrigger from "metabase/common/components/ModalWithTrigger";-import PopoverWithTrigger from "metabase/common/components/PopoverWithTrigger";-import AdminS from "metabase/css/admin.module.css";-import CS from "metabase/css/core/index.css";-import { Icon } from "metabase/ui";--import { ActionLink, TriggerIconContainer } from "./SegmentActionSelect.styled";-import SegmentRetireModal from "./SegmentRetireModal";--export default class SegmentActionSelect extends Component {- constructor(props) {- super(props);-- this.retireModal = createRef();- }-- static propTypes = {- object: PropTypes.object.isRequired,- onRetire: PropTypes.func.isRequired,- };-- async onRetire(object) {- await this.props.onRetire(object);- this.retireModal.current.close();- }-- render() {- const { object } = this.props;- return (- <div>- <PopoverWithTrigger- triggerElement={- <TriggerIconContainer>- <Icon name="ellipsis" />- </TriggerIconContainer>- }- >- <ul className={AdminS.UserActionsSelect}>- <li>- <ActionLink to={`/admin/datamodel/segment/${object.id}`}>- {t`Edit Segment`}- </ActionLink>- </li>- <li>- <ActionLink- to={`/admin/datamodel/segment/${object.id}/revisions`}- >- {t`Revision History`}- </ActionLink>- </li>- <li className={cx(CS.mt1, CS.borderTop)}>- <ModalWithTrigger- ref={this.retireModal}- triggerElement={t`Retire Segment`}- triggerClasses={cx(- CS.block,- CS.p2,- CS.bgErrorHover,- CS.textError,- CS.textWhiteHover,- CS.cursorPointer,- )}- >- <SegmentRetireModal- object={object}- onRetire={this.onRetire.bind(this)}- onClose={() => this.retireModal.current.close()}- />- </ModalWithTrigger>- </li>- </ul>- </PopoverWithTrigger>- </div>- );- }-}diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.module.css b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.module.cssnew file mode 100644index 00000000000..15df813679b--- /dev/null+++ b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.module.css@@ -0,0 +1,9 @@+.dangerItem {+ color: var(--mb-color-error);+}++/* double classname for specifity */+.dangerItem.dangerItem:hover {+ background-color: var(--mb-color-error);+ color: var(--mb-color-text-white);+}diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.styled.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.styled.tsxdeleted file mode 100644index 72ed134cabc..00000000000--- a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.styled.tsx+++ /dev/null@@ -1,23 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";-import { Link } from "react-router";--export const ActionLink = styled(Link)`- display: block;- padding: 0.5rem 1rem;- cursor: pointer;- text-decoration: none;-- &:hover {- color: var(--mb-color-text-white);- background-color: var(--mb-color-brand);- }-`;--export const TriggerIconContainer = styled.span`- color: var(--mb-color-text-light);-- &:hover {- color: var(--mb-color-brand);- }-`;diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsxnew file mode 100644index 00000000000..36e2e0a4e29--- /dev/null+++ b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.tsx@@ -0,0 +1,57 @@+import { useDisclosure } from "@mantine/hooks";+import { Link } from "react-router";+import { t } from "ttag";++import { ActionIcon, Icon, Menu } from "metabase/ui";+import type { Segment } from "metabase-types/api";++import S from "./SegmentActionSelect.module.css";+import { SegmentRetireModal } from "./SegmentRetireModal";++interface SegmentActionSelectProps {+ object: Segment;+ onRetire: () => void;+}++export function SegmentActionSelect({+ object,+ onRetire,+}: SegmentActionSelectProps) {+ const [modalOpened, { open: openModal, close: closeModal }] =+ useDisclosure(false);++ return (+ <>+ <Menu position="bottom-end">+ <Menu.Target>+ <ActionIcon>+ <Icon name="ellipsis" />+ </ActionIcon>+ </Menu.Target>+ <Menu.Dropdown p="sm">+ <Menu.Item+ component={Link}+ to={`/admin/datamodel/segment/${object.id}`}+ >+ {t`Edit Segment`}+ </Menu.Item>+ <Menu.Item+ component={Link}+ to={`/admin/datamodel/segment/${object.id}/revisions`}+ >+ {t`Revision History`}+ </Menu.Item>+ <Menu.Divider />+ <Menu.Item className={S.dangerItem} onClick={openModal}>+ {t`Retire Segment`}+ </Menu.Item>+ </Menu.Dropdown>+ </Menu>+ <SegmentRetireModal+ opened={modalOpened}+ onClose={closeModal}+ onRetire={onRetire}+ />+ </>+ );+}diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsxindex b534ff55a50..72ab9863fec 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx@@ -4,7 +4,7 @@ import { TableBreadcrumbs } from "metabase/metadata/components";import { Box, Flex, Group, Icon } from "metabase/ui";import type { Segment } from "metabase-types/api";-import SegmentActionSelect from "./SegmentActionSelect";+import { SegmentActionSelect } from "./SegmentActionSelect";import S from "./SegmentItem.module.css";interface Props {diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.jsx b/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.jsxdeleted file mode 100644index 9bdb633b9ca..00000000000--- a/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.jsx+++ /dev/null@@ -1,75 +0,0 @@-/* eslint-disable react/prop-types */-import cx from "classnames";-import { Component, createRef } from "react";-import { t } from "ttag";--import ActionButton from "metabase/common/components/ActionButton";-import ModalContent from "metabase/common/components/ModalContent";-import ButtonsS from "metabase/css/components/buttons.module.css";-import CS from "metabase/css/core/index.css";--export default class SegmentRetireModal extends Component {- constructor(props, context) {- super(props, context);- this.state = {- valid: false,- };- this.revisionMessage = createRef();- }-- async handleSubmit() {- const payload = {- id: this.props.object.id,- revision_message: this.revisionMessage.current.value,- };-- await this.props.onRetire(payload);- this.props.onClose();- }-- render() {- const { valid } = this.state;-- return (- <ModalContent- title={t`Retire this segment?`}- onClose={this.props.onClose}- >- <form className={cx(CS.flex, CS.flexColumn, CS.flexFull)}>- <div className={cx("Form-inputs", CS.pb4)}>- <p- className={CS.textParagraph}- >{t`Saved questions and other things that depend on this segment will continue to work, but it will no longer be selectable from the query builder.`}</p>- <p className={CS.textParagraph}>- {t`If you're sure you want to retire this segment, please write a quick explanation of why it's being retired`}- :- </p>- <textarea- ref={this.revisionMessage}- className={cx(CS.input, CS.full)}- placeholder={t`This will show up in the activity feed and in an email that will be sent to anyone on your team who created something that uses this segment.`}- onChange={(e) => this.setState({ valid: !!e.target.value })}- />- </div>-- <div className={cx("Form-actions", CS.mlAuto)}>- <a className={ButtonsS.Button} onClick={this.props.onClose}>- {t`Cancel`}- </a>- <ActionButton- actionFn={this.handleSubmit.bind(this)}- className={cx(ButtonsS.Button, CS.ml2, {- [ButtonsS.ButtonDanger]: valid,- [CS.disabled]: !valid,- })}- normalText={t`Retire`}- activeText={t`Retiring…`}- failedText={t`Failed`}- successText={t`Success`}- />- </div>- </form>- </ModalContent>- );- }-}diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.tsxnew file mode 100644index 00000000000..3ddfff099cb--- /dev/null+++ b/frontend/src/metabase/admin/datamodel/components/SegmentRetireModal.tsx@@ -0,0 +1,41 @@+import { t } from "ttag";++import { Button, Flex, Modal, Text } from "metabase/ui";++interface SegmentRetireModalProps {+ opened: boolean;+ onClose: () => void;+ onRetire: () => void;+}++export function SegmentRetireModal({+ opened,+ onClose,+ onRetire,+}: SegmentRetireModalProps) {+ const handleRetire = () => {+ onRetire();+ onClose();+ };++ return (+ <Modal+ opened={opened}+ onClose={onClose}+ title={t`Retire this segment?`}+ size="lg"+ >+ <Flex direction="column">+ <Text>+ {t`Saved questions and other things that depend on this segment will continue to work, but it will no longer be selectable from the query builder.`}+ </Text>+ <Flex justify="flex-end" gap="sm">+ <Button onClick={onClose}>{t`Cancel`}</Button>+ <Button color="danger" variant="filled" onClick={handleRetire}>+ {t`Retire`}+ </Button>+ </Flex>+ </Flex>+ </Modal>+ );+}