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 License billing info from Emotion to Mantine and CSS modules (#74990)
Andrei Chernykh2b4386c78412
diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.module.css b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.module.cssnew file mode 100644index 00000000000..2343cc881a9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.module.css@@ -0,0 +1,11 @@+.row {+ &:not(:last-child) {+ border-bottom: 1px solid var(--mb-color-background-tertiary);+ }+}++.link {+ display: inline-flex;+ align-items: center;+ color: var(--mb-color-brand);+}diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.styled.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.styled.tsxdeleted file mode 100644index 49a3f67b113..00000000000--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.styled.tsx+++ /dev/null@@ -1,26 +0,0 @@-import { css } from "@emotion/react";-import styled from "@emotion/styled";--import { ExternalLink } from "metabase/common/components/ExternalLink";-import { Link } from "metabase/common/components/Link";--export const BillingInfoRowContainer = styled.div<{ extraPadding?: boolean }>`- display: flex;- justify-content: space-between;- padding: ${({ extraPadding }) => (extraPadding ? `1.5rem` : `0.5rem`)} 1rem;- align-items: center;-- &:not(:last-child) {- border-bottom: 1px solid var(--mb-color-background-tertiary);- }-`;--const linkStyles = css`- display: inline-flex;- align-items: center;- color: var(--mb-color-brand);-`;--export const BillingInternalLink = styled(Link)(linkStyles);--export const BillingExternalLink = styled(ExternalLink)(linkStyles);diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsxindex e7d55b88eaa..5fdf6690f9e 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx@@ -3,17 +3,15 @@ import { t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";import { SettingHeader } from "metabase/admin/settings/components/SettingHeader";+import { ExternalLink } from "metabase/common/components/ExternalLink";+import { Link } from "metabase/common/components/Link";import { useSetting } from "metabase/common/hooks";-import { Card, Icon, Text } from "metabase/ui";+import { Card, Flex, Icon, Text } from "metabase/ui";import type { BillingInfo, BillingInfoLineItem } from "metabase-types/api";import { StillNeedHelp } from "../StillNeedHelp";-import {- BillingExternalLink,- BillingInfoRowContainer,- BillingInternalLink,-} from "./BillingInfo.styled";+import S from "./BillingInfo.module.css";import {formatBillingValue,getBillingInfoId,@@ -40,7 +38,8 @@ const BillingInfoValue = ({if (lineItem.display === "internal-link") {return (- <BillingInternalLink+ <Link+ className={S.link}to={internalLinkMap[lineItem.link]}href={internalLinkMap[lineItem.link]}data-testid="test-link"@@ -49,18 +48,18 @@ const BillingInfoValue = ({<Text fw="bold" color="currentColor">{formattedValue}</Text>- </BillingInternalLink>+ </Link>);}if (lineItem.display === "external-link") {return (- <BillingExternalLink href={lineItem.link} {...props}>+ <ExternalLink className={S.link} href={lineItem.link} {...props}><Text fw="bold" color="currentColor">{formattedValue}</Text><Icon ml="sm" size="16" name="external" />- </BillingExternalLink>+ </ExternalLink>);}@@ -94,7 +93,14 @@ function BillingInfoRow({// changes in a way the current application doesn't expectreturn (<ErrorBoundary errorComponent={EmptyErrorComponent}>- <BillingInfoRowContainer extraPadding={extraPadding} {...props}>+ <Flex+ className={S.row}+ align="center"+ justify="space-between"+ px="md"+ py={extraPadding ? "lg" : "sm"}+ {...props}+ ><Textc="text-secondary"maw="15rem"@@ -106,7 +112,7 @@ function BillingInfoRow({lineItem={lineItem}data-testid={`billing-info-value-${id}`}/>- </BillingInfoRowContainer>+ </Flex></ErrorBoundary>);}