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
Migrate the action creator layout off Emotion (#83665)
Andrei Chernykh69b3d2309683
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/ImplicitActionContextProvider.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/ImplicitActionContextProvider.styled.tsxdeleted file mode 100644index 26270c04c3e..00000000000--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/ImplicitActionContextProvider.styled.tsx+++ /dev/null@@ -1,15 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--export const EditorBodyRoot = styled.div`- display: flex;- flex-direction: column;- justify-content: center;- align-items: center;- width: 100%;- height: 100%;-`;--export const EditorTitle = styled.h3`- margin-top: 1rem;-`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/ImplicitActionContextProvider.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/ImplicitActionContextProvider.tsxindex 4a566586481..3197b94a9dc 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/ImplicitActionContextProvider.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/ImplicitActionContextProvider.tsx@@ -3,6 +3,7 @@ import { t } from "ttag";import _ from "underscore";import ImplicitActionIcon from "metabase/actions/components/ImplicitActionIcon";+import { Stack, Title } from "metabase/ui";import type {ActionFormSettings,WritebackImplicitQueryAction,@@ -13,11 +14,6 @@ import type { ActionContextType } from "../ActionContext";import { ActionContext } from "../ActionContext";import type { ActionContextProviderProps } from "../types";-import {- EditorBodyRoot,- EditorTitle,-} from "./ImplicitActionContextProvider.styled";-export type ImplicitActionContextProviderProps = Omit<ActionContextProviderProps,"initialAction"@@ -27,14 +23,14 @@ export type ImplicitActionContextProviderProps = Omit<function EditorBody() {return (- <EditorBodyRoot>+ <Stack justify="center" align="center" gap="lg" w="100%" h="100%"><ImplicitActionIcon size={64} />- <EditorTitle>{t`Auto tracking schema`}</EditorTitle>- </EditorBodyRoot>+ <Title order={3} size="h4">{t`Auto tracking schema`}</Title>+ </Stack>);}-function ImplicitActionContextProvider({+export function ImplicitActionContextProvider({initialAction,children,}: ImplicitActionContextProviderProps) {@@ -78,6 +74,3 @@ function ImplicitActionContextProvider({<ActionContext.Provider value={value}>{children}</ActionContext.Provider>);}--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default ImplicitActionContextProvider;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/index.ts b/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/index.tsindex bc47c2033de..3bba6343945 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/index.ts+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider/index.ts@@ -1,3 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./ImplicitActionContextProvider";export * from "./ImplicitActionContextProvider";diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsxdeleted file mode 100644index 5816d782190..00000000000--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx+++ /dev/null@@ -1,77 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import SidebarContentS from "metabase/common/components/SidebarContent/SidebarContent.module.css";--export const ActionCreatorBodyContainer = styled.div`- display: grid;- grid-template-columns: 4fr 3fr;-- .react-resizable-handle {- display: none;- }-- flex: 1;- overflow-y: auto;-`;--export const EditorContainer = styled.div`- flex: 1 1 0;- overflow-y: auto;- background-color: var(--mb-color-background_page-secondary);-- .ace_editor {- margin-left: var(--mantine-spacing-lg);- }-`;--export const ModalActions = styled.div`- display: flex;- flex: 0 0 auto;- justify-content: space-between;- gap: 1rem;- padding: 1rem;- border-top: 1px solid var(--mb-color-border-neutral);-`;--export const ModalRoot = styled.div`- display: flex;- flex-direction: column;- /**- * Compensate 2px for border on .Modal-module__content- * Otherwise vertical scrollbar is shown even though there is no overflow.- **/- height: calc(90dvh - 2px);-`;--export const ModalLeft = styled.div`- position: relative;- display: flex;- flex-direction: column;- border-right: 1px solid var(--mb-color-border-neutral);-`;--export const ModalRight = styled.div`- display: flex;- position: relative;- overflow-y: hidden;-- .${SidebarContentS.SidebarContentRoot},- .${SidebarContentS.SidebarContentMain} {- width: 100%;- height: 100%;- }-- .${SidebarContentS.SidebarContentMain} {- overflow-y: auto;- }-- .${SidebarContentS.SidebarContentHeader} {- position: sticky;- top: 0;- padding: 1.5rem 1.5rem 0.5rem 1.5rem;- margin: 0;- background-color: var(--mb-color-background_page-primary);- z-index: 5;- }-`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsxindex b0badba249d..90ffc7c42be 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx@@ -12,7 +12,7 @@ import type { CardId, WritebackAction } from "metabase-types/api";import { isSavedAction } from "../../utils";import { useActionContext } from "./ActionContext";-import ActionCreatorView from "./ActionCreatorView";+import { ActionCreatorView } from "./ActionCreatorView";import type { FormValues as CreateActionFormValues } from "./CreateActionForm";import CreateActionForm from "./CreateActionForm";import type { DataReferenceSlot } from "./types";diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.module.css b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.module.cssnew file mode 100644index 00000000000..9b94e2140dd--- /dev/null+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.module.css@@ -0,0 +1,3 @@+.borderBottom {+ border-bottom: 1px solid var(--mb-color-border-neutral);+}diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsxdeleted file mode 100644index d410aab86fb..00000000000--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx+++ /dev/null@@ -1,36 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--import { EditableText as EditableTextBase } from "metabase/common/components/EditableText";--export const Container = styled.div`- display: flex;- flex: 0 0 auto;- align-items: center;- justify-content: space-between;- width: 100%;- background-color: var(--mb-color-background_page-primary);- border-bottom: 1px solid var(--mb-color-border-neutral);- padding: var(--mantine-spacing-lg) var(--mantine-spacing-xxl);-`;--export const LeftHeader = styled.div`- display: flex;- align-items: center;- color: var(--mb-color-text-secondary);- gap: var(--mantine-spacing-lg);-`;--export const EditableText = styled(EditableTextBase)`- font-weight: bold;- font-size: 1.3em;- color: var(--mb-color-text-secondary);-`;--export const ActionButtons = styled.div`- /* Since the button is borderless, adding the negative margin- will make it look flush with the container */- &:last-child {- margin-right: calc(var(--mantine-spacing-sm) * -1);- }-`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsxindex 5749c4c7f89..3b140d58e9d 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsx@@ -1,13 +1,11 @@import { t } from "ttag";-import {- ActionButtons,- Container,- EditableText,- LeftHeader,-} from "./ActionCreatorHeader.styled";+import { EditableText } from "metabase/common/components/EditableText";+import { Box, Flex } from "metabase/ui";-type Props = {+import S from "./ActionCreatorHeader.module.css";++type ActionCreatorHeaderProps = {name: string;isEditable: boolean;canRename: boolean;@@ -15,28 +13,36 @@ type Props = {actionButtons: React.ReactElement[];};-const ActionCreatorHeader = ({+export function ActionCreatorHeader({name = t`New Action`,isEditable,canRename,onChangeName,actionButtons,-}: Props) => {+}: ActionCreatorHeaderProps) {return (- <Container>- <LeftHeader>- <EditableText- initialValue={name}- onChange={onChangeName}- isDisabled={!isEditable || !canRename}- />- </LeftHeader>+ <Flex+ className={S.borderBottom}+ flex="0 0 auto"+ align="center"+ justify="space-between"+ w="100%"+ py="lg"+ px="xxl"+ bg="background_page-primary"+ >+ <EditableText+ initialValue={name}+ onChange={onChangeName}+ isDisabled={!isEditable || !canRename}+ fz="lg"+ fw="bold"+ c="text-secondary"+ />{actionButtons.length > 0 && (- <ActionButtons>{actionButtons}</ActionButtons>+ // The buttons are borderless, so the negative margin lines them up with the edge+ <Box mr="-sm">{actionButtons}</Box>)}- </Container>+ </Flex>);-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default ActionCreatorHeader;+}diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.module.css b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.module.cssnew file mode 100644index 00000000000..f3babf08206--- /dev/null+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.module.css@@ -0,0 +1,12 @@+.columns {+ display: grid;+ grid-template-columns: 4fr 3fr;+}++.borderTop {+ border-top: 1px solid var(--mb-color-border-neutral);+}++.borderRight {+ border-right: 1px solid var(--mb-color-border-neutral);+}diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsxindex 4c7693bb594..542382ef6ee 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx@@ -1,22 +1,19 @@+import cx from "classnames";import { useCallback, useState } from "react";import { t } from "ttag";-import { Button } from "metabase/ui";+import SidebarContentS from "metabase/common/components/SidebarContent/SidebarContent.module.css";+import CS from "metabase/css/core/index.css";+import { Box, Button, Flex, Stack } from "metabase/ui";import { isNotNull } from "metabase/utils/types";import type { ActionFormSettings, WritebackAction } from "metabase-types/api";-import {- ActionCreatorBodyContainer,- EditorContainer,- ModalActions,- ModalLeft,- ModalRight,- ModalRoot,-} from "./ActionCreator.styled";-import ActionCreatorHeader from "./ActionCreatorHeader";+import { ActionCreatorHeader } from "./ActionCreatorHeader";+import S from "./ActionCreatorView.module.css";import { FormCreator } from "./FormCreator";-import InlineActionSettings, {+import {ActionSettingsTriggerButton,+ InlineActionSettings,} from "./InlineActionSettings";import type {ActionCreatorUIProps,@@ -24,7 +21,7 @@ import type {SideView,} from "./types";-interface ActionCreatorProps extends ActionCreatorUIProps {+interface ActionCreatorViewProps extends ActionCreatorUIProps {action: Partial<WritebackAction>;formSettings: ActionFormSettings;@@ -43,8 +40,7 @@ interface ActionCreatorProps extends ActionCreatorUIProps {const DEFAULT_SIDE_VIEW: SideView = "actionForm";-// eslint-disable-next-line import/no-default-export -- deprecated usage-export default function ActionCreatorView({+export function ActionCreatorView({action,formSettings,canSave,@@ -58,7 +54,7 @@ export default function ActionCreatorView({onChangeFormSettings,onClickSave,onCloseModal,-}: ActionCreatorProps) {+}: ActionCreatorViewProps) {const [activeSideView, setActiveSideView] =useState<SideView>(DEFAULT_SIDE_VIEW);@@ -87,9 +83,14 @@ export default function ActionCreatorView({}, []);return (- <ModalRoot data-testid="action-creator">- <ActionCreatorBodyContainer>- <ModalLeft>+ <Stack+ // 2px less for the modal content border, which would otherwise add a scrollbar+ h="calc(90dvh - 2px)"+ gap={0}+ data-testid="action-creator"+ >+ <Box className={cx(S.columns, CS.overflowYAuto)} flex={1}>+ <Stack className={S.borderRight} pos="relative" gap={0}><ActionCreatorHeadername={action.name ?? t`New Action`}canRename={canRename}@@ -106,8 +107,20 @@ export default function ActionCreatorView({/>,].filter(isNotNull)}/>- <EditorContainer>{children}</EditorContainer>- <ModalActions>+ <Box+ className={CS.overflowYAuto}+ flex="1 1 0"+ bg="background_page-secondary"+ >+ {children}+ </Box>+ <Flex+ className={S.borderTop}+ flex="0 0 auto"+ justify="space-between"+ gap="lg"+ p="lg"+ ><Button onClick={onCloseModal} variant="subtle" color="neutral">{t`Cancel`}</Button>@@ -120,9 +133,13 @@ export default function ActionCreatorView({{isNew ? t`Save` : t`Update`}</Button>)}- </ModalActions>- </ModalLeft>- <ModalRight>+ </Flex>+ </Stack>+ <Stack+ className={cx(SidebarContentS.stickyHeader, CS.overflowHidden)}+ pos="relative"+ gap={0}+ >{activeSideView === "actionForm" ? (<FormCreatoractionType={action.type ?? "query"}@@ -147,8 +164,8 @@ export default function ActionCreatorView({onBack={closeSideView}/>) : null}- </ModalRight>- </ActionCreatorBodyContainer>- </ModalRoot>+ </Stack>+ </Box>+ </Stack>);}diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.styled.tsxdeleted file mode 100644index 73561d46d2a..00000000000--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line eslint-js/no-restricted-imports-import styled from "@emotion/styled";--export const ActionSettingsContent = styled.div`- margin: 1rem 1.5rem;-`;--export const CopyWidgetContainer = styled.div`- margin-bottom: 1.25rem;-`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsxindex f0a02e1f36d..a5f000ff157 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -15,16 +15,31 @@ import { useUniqueId } from "metabase/common/hooks/use-unique-id";import { getUserIsAdmin } from "metabase/current-user";import { useSelector } from "metabase/redux";import { getSetting } from "metabase/settings";-import { ActionIcon, Icon, Switch, Tooltip } from "metabase/ui";+import { ActionIcon, Box, Icon, Switch, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";import type { ActionFormSettings, WritebackAction } from "metabase-types/api";import { isActionPublic, isSavedAction } from "../../utils";-import {- ActionSettingsContent,- CopyWidgetContainer,-} from "./InlineActionSettings.styled";+type ActionSettingsTriggerButtonProps = {+ onClick: () => void;+};++export function ActionSettingsTriggerButton({+ onClick,+}: ActionSettingsTriggerButtonProps) {+ return (+ <Tooltip label={t`Action settings`}>+ <ActionIcon+ variant="viewHeader"+ onClick={onClick}+ aria-label={t`Action settings`}+ >+ <Icon name="gear" />+ </ActionIcon>+ </Tooltip>+ );+}type InlineActionSettingsProps = {action?: Partial<WritebackAction>;@@ -35,30 +50,14 @@ type InlineActionSettingsProps = {onBack?: () => void;};-export const ActionSettingsTriggerButton = ({- onClick,-}: {- onClick: () => void;-}) => (- <Tooltip label={t`Action settings`}>- <ActionIcon- variant="viewHeader"- onClick={onClick}- aria-label={t`Action settings`}- >- <Icon name="gear" />- </ActionIcon>- </Tooltip>-);--const InlineActionSettings = ({+export function InlineActionSettings({action,formSettings,isEditable,onChangeFormSettings,onClose,onBack,-}: InlineActionSettingsProps) => {+}: InlineActionSettingsProps) {const siteUrl = useSelector((state) => getSetting(state, "site-url"));const isAdmin = useSelector((state) => getUserIsAdmin(state));const isPublicSharingEnabled = useSelector((state) =>@@ -105,7 +104,7 @@ const InlineActionSettings = ({onClose={onClose}onBack={onBack}>- <ActionSettingsContent>+ <Box mx="xl" my="lg">{action && hasSharingPermission && (<FormFieldtitle={t`Make public`}@@ -129,12 +128,12 @@ const InlineActionSettings = ({</FormField>)}{action?.public_uuid && hasSharingPermission && (- <CopyWidgetContainer>+ <Box mb="1.25rem"><CopyTextInputvalue={Urls.publicAction(siteUrl, action.public_uuid)}aria-label={t`Public action form URL`}/>- </CopyWidgetContainer>+ </Box>)}<ConfirmModalopened={modalOpened}@@ -153,10 +152,7 @@ const InlineActionSettings = ({onChange={handleSuccessMessageChange}/></FormField>- </ActionSettingsContent>+ </Box></SidebarContent>);-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default InlineActionSettings;+}diff --git a/frontend/src/metabase/common/components/SidebarContent/SidebarContent.module.css b/frontend/src/metabase/common/components/SidebarContent/SidebarContent.module.cssindex 27fa3ecef07..4098fe338c4 100644--- a/frontend/src/metabase/common/components/SidebarContent/SidebarContent.module.css+++ b/frontend/src/metabase/common/components/SidebarContent/SidebarContent.module.css@@ -24,3 +24,13 @@padding-top: 0.5rem;margin: 1rem 1.5rem;}++/* Set on an ancestor to keep the header in view while the content scrolls under it */+.stickyHeader .SidebarContentHeader {+ position: sticky;+ top: 0;+ z-index: 5;+ margin: 0;+ padding: 1.5rem 1.5rem 0.5rem;+ background-color: var(--mb-color-background_page-primary);+}diff --git a/frontend/src/metabase/querying/action-creator/ActionContextProvider.tsx b/frontend/src/metabase/querying/action-creator/ActionContextProvider.tsxindex 85ab2ddb7f5..62a595112e4 100644--- a/frontend/src/metabase/querying/action-creator/ActionContextProvider.tsx+++ b/frontend/src/metabase/querying/action-creator/ActionContextProvider.tsx@@ -1,5 +1,7 @@-import type { ImplicitActionContextProviderProps } from "metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider";-import ImplicitActionContextProvider from "metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider";+import {+ ImplicitActionContextProvider,+ type ImplicitActionContextProviderProps,+} from "metabase/actions/containers/ActionCreator/ActionContext/ImplicitActionContextProvider";import type { WritebackAction } from "metabase-types/api";import type { QueryActionContextProviderProps } from "./QueryActionContextProvider";