Skip to content

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

GDGT-1755: Migrate common components to TypeScript (partial) (#69354)

Stas Gavrylovc20bf2a94316
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx
index 104167131fc..ea59b5280af 100644
--- a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableBreadcrumbs.tsx
@@ -44,7 +44,7 @@ export const TableBreadcrumbs = ({
}, [database, table, showEditBreadcrumb]);
return (
- <ViewHeading color="medium">
+ <ViewHeading c="text-secondary">
<HeadBreadcrumbs parts={parts} variant="head" />
</ViewHeading>
);
diff --git a/frontend/src/metabase/account/login-history/components/LoginHistory/LoginHistory.tsx b/frontend/src/metabase/account/login-history/components/LoginHistory/LoginHistory.tsx
index 7eaa79ed1c4..51b6e43d0a9 100644
--- a/frontend/src/metabase/account/login-history/components/LoginHistory/LoginHistory.tsx
+++ b/frontend/src/metabase/account/login-history/components/LoginHistory/LoginHistory.tsx
@@ -7,8 +7,8 @@ import NoResults from "assets/img/no_results.svg";
import { Card } from "metabase/common/components/Card";
import { EmptyState } from "metabase/common/components/EmptyState";
import { Label } from "metabase/common/components/type/Label";
-import { Text } from "metabase/common/components/type/Text";
import CS from "metabase/css/core/index.css";
+import { Text } from "metabase/ui";
import type { UserLoginHistoryItem } from "metabase-types/api";
import {
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.jsx
index a52ad29cae2..c0f7598e399 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.jsx
@@ -5,9 +5,9 @@ import { t } from "ttag";
import { EmptyState } from "metabase/common/components/EmptyState";
import { Input } from "metabase/common/components/Input";
import { Subhead } from "metabase/common/components/type/Subhead";
-import { Text } from "metabase/common/components/type/Text";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
+import { Text } from "metabase/ui";
import { PermissionsTable } from "../PermissionsTable";
@@ -78,7 +78,7 @@ export function PermissionsEditorContent({
)}
</Subhead>
- {description && <Text>{description}</Text>}
+ {description && <Text lh="normal">{description}</Text>}
<PostHeaderContent />
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx
index a03fd50f629..0a6013c45e3 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx
@@ -1,7 +1,7 @@
import { memo } from "react";
import type { ITreeNodeItem } from "metabase/common/components/tree/types";
-import { Text } from "metabase/common/components/type/Text";
+import { Text } from "metabase/ui";
import { EntityViewSwitch } from "../EntityViewSwitch";
import { FilterableTree } from "../FilterableTree";
@@ -48,7 +48,11 @@ export const PermissionsSidebarContent = memo(
) : (
<div className={S.SidebarContentTitle}>{title}</div>
)}
- {description && <Text color="text-primary">{description}</Text>}
+ {description && (
+ <Text lh="normal" c="text-primary">
+ {description}
+ </Text>
+ )}
{entityViewFocus && onEntityChange && (
<EntityViewSwitch
value={entityViewFocus}
diff --git a/frontend/src/metabase/common/components/IconWrapper/IconWrapper.jsx b/frontend/src/metabase/common/components/IconWrapper/IconWrapper.jsx
deleted file mode 100644
index 182bdf311ee..00000000000
--- a/frontend/src/metabase/common/components/IconWrapper/IconWrapper.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const IconWrapper = styled.div`
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: ${({ borderRadius = 6 }) => borderRadius};
-`;
diff --git a/frontend/src/metabase/common/components/IconWrapper/index.tsx b/frontend/src/metabase/common/components/IconWrapper/index.tsx
deleted file mode 100644
index af112bd99d9..00000000000
--- a/frontend/src/metabase/common/components/IconWrapper/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { IconWrapper } from "./IconWrapper";
diff --git a/frontend/src/metabase/common/components/LabelIcon/LabelIcon.jsx b/frontend/src/metabase/common/components/LabelIcon/LabelIcon.jsx
deleted file mode 100644
index 73e7ad43cd7..00000000000
--- a/frontend/src/metabase/common/components/LabelIcon/LabelIcon.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/* eslint "react/prop-types": "warn" */
-import cx from "classnames";
-import PropTypes from "prop-types";
-
-import { Icon } from "metabase/ui";
-
-import S from "./LabelIcon.module.css";
-
-export const LabelIcon = ({ icon, size = 16, className, style }) =>
- icon.charAt(0) === "#" ? (
- <span
- className={cx(S.icon, S.colorIcon, className)}
- style={{ backgroundColor: icon, width: size, height: size }}
- />
- ) : (
- <Icon className={cx(S.icon, className)} name={icon} />
- );
-
-LabelIcon.propTypes = {
- className: PropTypes.string,
- style: PropTypes.object,
- icon: PropTypes.string,
- size: PropTypes.number,
-};
diff --git a/frontend/src/metabase/common/components/LabelIcon/LabelIcon.tsx b/frontend/src/metabase/common/components/LabelIcon/LabelIcon.tsx
new file mode 100644
index 00000000000..a7cd93aba4c
--- /dev/null
+++ b/frontend/src/metabase/common/components/LabelIcon/LabelIcon.tsx
@@ -0,0 +1,28 @@
+import cx from "classnames";
+
+import { Icon, type IconName } from "metabase/ui";
+
+import S from "./LabelIcon.module.css";
+
+type LabelIconProps = {
+ icon: IconName | `#${string}`;
+ size?: number;
+ className?: string;
+};
+
+export function LabelIcon({ icon, size = 16, className }: LabelIconProps) {
+ if (isColorString(icon)) {
+ return (
+ <span
+ className={cx(S.icon, S.colorIcon, className)}
+ style={{ backgroundColor: icon, width: size, height: size }}
+ />
+ );
+ }
+
+ return <Icon className={cx(S.icon, className)} name={icon} />;
+}
+
+function isColorString(icon: string): icon is `#${string}` {
+ return icon.startsWith("#");
+}
diff --git a/frontend/src/metabase/common/components/SelectList/BaseSelectListItem.tsx b/frontend/src/metabase/common/components/SelectList/BaseSelectListItem.tsx
index 9a4e8e1e4f8..e73ea55a702 100644
--- a/frontend/src/metabase/common/components/SelectList/BaseSelectListItem.tsx
+++ b/frontend/src/metabase/common/components/SelectList/BaseSelectListItem.tsx
@@ -32,7 +32,7 @@ export function BaseSelectListItem({
children,
...rest
}: BaseSelectListItemProps) {
- const ref = useScrollOnMount();
+ const ref = useScrollOnMount<HTMLLIElement>();
const Root = as;
return (
<Root
diff --git a/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsx b/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsx
index 3b30d11ddcb..64dbc44c822 100644
--- a/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsx
+++ b/frontend/src/metabase/common/components/SidebarItem/SidebarItem.tsx
@@ -1,13 +1,15 @@
import { memo } from "react";
import { Link } from "react-router";
+import type { IconName } from "metabase/ui";
+
import { LabelIcon } from "../LabelIcon";
import S from "../Sidebar.module.css";
type SidebarItemProps = {
name: string;
sidebar?: string;
- icon: string;
+ icon: IconName | `#${string}`;
href: string;
onClick?: () => void;
};
diff --git a/frontend/src/metabase/common/components/type/Label.jsx b/frontend/src/metabase/common/components/type/Label.jsx
deleted file mode 100644
index a4cb992b9f8..00000000000
--- a/frontend/src/metabase/common/components/type/Label.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-/* eslint-disable react/prop-types */
-import { Text } from "metabase/common/components/type/Text";
-import CS from "metabase/css/core/index.css";
-
-export const Label = ({ children, ...props }) => (
- <Text
- className={CS.mb2}
- color="dark"
- {...props}
- fontSize="14px"
- fontWeight={700}
- >
- {children}
- </Text>
-);
diff --git a/frontend/src/metabase/common/components/type/Label.tsx b/frontend/src/metabase/common/components/type/Label.tsx
new file mode 100644
index 00000000000..a732adce719
--- /dev/null
+++ b/frontend/src/metabase/common/components/type/Label.tsx
@@ -0,0 +1,14 @@
+import type { ReactNode } from "react";
+
+import CS from "metabase/css/core/index.css";
+import { Text, type TextProps } from "metabase/ui";
+
+type LabelProps = TextProps & {
+ children?: ReactNode;
+};
+
+export const Label = ({ children, ...props }: LabelProps) => (
+ <Text className={CS.mb2} c="text-primary" {...props} fz="14px" fw={700}>
+ {children}
+ </Text>
+);
diff --git a/frontend/src/metabase/common/components/type/Subhead.jsx b/frontend/src/metabase/common/components/type/Subhead.jsx
deleted file mode 100644
index 8b6532f6b4f..00000000000
--- a/frontend/src/metabase/common/components/type/Subhead.jsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* eslint-disable react/prop-types */
-import { Text } from "metabase/common/components/type/Text";
-
-export const Subhead = ({ children, ...props }) => (
- <Text mb="4px" color="dark" {...props} fontSize="18px" fontWeight={700}>
- {children}
- </Text>
-);
diff --git a/frontend/src/metabase/common/components/type/Subhead.tsx b/frontend/src/metabase/common/components/type/Subhead.tsx
new file mode 100644
index 00000000000..34cdae4e2e3
--- /dev/null
+++ b/frontend/src/metabase/common/components/type/Subhead.tsx
@@ -0,0 +1,13 @@
+import type { ReactNode } from "react";
+
+import { Text, type TextProps } from "metabase/ui";
+
+type SubheadProps = TextProps & {
+ children?: ReactNode;
+};
+
+export const Subhead = ({ children, ...props }: SubheadProps) => (
+ <Text lh="normal" c="text-primary" fz="18px" fw={700} {...props}>
+ {children}
+ </Text>
+);
diff --git a/frontend/src/metabase/common/components/type/Text.jsx b/frontend/src/metabase/common/components/type/Text.jsx
deleted file mode 100644
index 68fcdcd1a05..00000000000
--- a/frontend/src/metabase/common/components/type/Text.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-import PropTypes from "prop-types";
-
-import { color } from "metabase/ui/utils/colors";
-
-export const Text = styled.div`
- color: ${(props) => color(`text-${props.color ?? "medium"}`)};
- font-size: ${(props) => props.fontSize};
- font-weight: ${(props) => props.fontWeight};
-`;
-
-Text.propTypes = {
- color: PropTypes.string,
- fontSize: PropTypes.string,
- fontWeight: PropTypes.number,
-};
diff --git a/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.module.css b/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.module.css
new file mode 100644
index 00000000000..048e64c1a78
--- /dev/null
+++ b/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.module.css
@@ -0,0 +1,11 @@
+.root {
+ margin-left: 2rem;
+ margin-right: 2rem;
+ margin-top: 1rem;
+ padding: 0.8rem;
+ color: var(--mb-color-text-primary);
+ border-radius: 8px;
+ background-color: color-mix(in srgb, var(--mb-color-accent4) 5%, transparent);
+ border: 1px solid var(--mb-color-accent4);
+ line-height: 1.25rem;
+}
diff --git a/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.styled.tsx b/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.styled.tsx
deleted file mode 100644
index c51719db9a8..00000000000
--- a/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.styled.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Text } from "metabase/common/components/type/Text";
-import { alpha } from "metabase/lib/colors";
-import { color } from "metabase/ui/utils/colors";
-
-export const CaveatText = styled(Text)`
- margin-left: 2rem;
- margin-right: 2rem;
- margin-top: 1rem;
- padding: 0.8rem;
- color: var(--mb-color-text-primary);
- line-height: 1.25rem;
- border-radius: 8px;
- background-color: ${() => alpha("accent4", 0.05)};
- border: 1px solid ${() => color("accent4")};
-`;
diff --git a/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.tsx b/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.tsx
index 691c7a520f7..407e96b4073 100644
--- a/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.tsx
+++ b/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.tsx
@@ -3,8 +3,9 @@ import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
+import { Text } from "metabase/ui";
-import { CaveatText } from "./CaveatMessage.styled";
+import S from "./CaveatMessage.module.css";
export function CaveatMessage() {
const { url: docsUrl, showMetabaseLinks } = useDocsUrl(
@@ -12,7 +13,7 @@ export function CaveatMessage() {
);
return (
- <CaveatText>
+ <Text className={S.root}>
{t`Recipients will see this data just as you see it, regardless of their permissions.`}
{showMetabaseLinks && (
<>
@@ -22,6 +23,6 @@ export function CaveatMessage() {
</ExternalLink>
</>
)}
- </CaveatText>
+ </Text>
);
}
diff --git a/frontend/src/metabase/notifications/PulsesListSidebar.tsx b/frontend/src/metabase/notifications/PulsesListSidebar.tsx
index a366fa9b212..23b7886e2c0 100644
--- a/frontend/src/metabase/notifications/PulsesListSidebar.tsx
+++ b/frontend/src/metabase/notifications/PulsesListSidebar.tsx
@@ -135,7 +135,7 @@ function _PulsesListSidebar({
style={{ paddingBottom: "5px" }}
size={16}
/>
- <Label className={cx(CS.hoverChild, CS.hoverInherit)}>
+ <Label className={cx(CS.hoverChild, CS.hoverInherit)} mb="0">
{friendlySchedule(pulse.channels[0])}
</Label>
</div>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx
index 950a3ab66a7..f3e6b2ac3ce 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/AdHocQuestionLeftSide/AdHocQuestionLeftSide.tsx
@@ -48,7 +48,7 @@ export function AdHocQuestionLeftSide(
<Flex align="center" wrap="nowrap">
<ViewHeading
className={ViewTitleHeaderS.AdHocViewHeading}
- color="medium"
+ c="text-secondary"
>
{isNative ? (
t`New question`
diff --git a/frontend/src/metabase/query_builder/components/view/ViewSection.tsx b/frontend/src/metabase/query_builder/components/view/ViewSection.tsx
index fd96880f0c9..f7ccfe4183e 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewSection.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewSection.tsx
@@ -3,17 +3,15 @@ import type { CSSProperties, HTMLAttributes, ReactNode } from "react";
import { Subhead } from "metabase/common/components/type/Subhead";
import CS from "metabase/css/core/index.css";
-import { Flex, type FlexProps } from "metabase/ui";
+import { Flex, type FlexProps, type TextProps } from "metabase/ui";
import S from "./ViewSection.module.css";
-export interface ViewSectionProps
- extends HTMLAttributes<HTMLDivElement>,
- FlexProps {
+export type ViewSectionProps = FlexProps & {
className?: string;
style?: CSSProperties;
children?: ReactNode;
-}
+};
export const ViewSection = ({
className,
@@ -26,9 +24,9 @@ export const ViewSection = ({
</Flex>
);
-interface ViewHeadingProps extends HTMLAttributes<HTMLDivElement> {
+type ViewHeadingProps = TextProps & {
children?: ReactNode;
-}
+};
export const ViewHeading = ({ children, ...props }: ViewHeadingProps) => (
<Subhead {...props}>{children}</Subhead>
diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsx
index 47d3d294b2c..72bc6dee42d 100644
--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsx
+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeriesMultiple.jsx
@@ -4,9 +4,9 @@ import { Component } from "react";
import { t } from "ttag";
import { ColorSelector } from "metabase/common/components/ColorSelector";
-import { IconWrapper } from "metabase/common/components/IconWrapper";
import CS from "metabase/css/core/index.css";
import { getAccentColors } from "metabase/lib/colors/groups";
+import { Flex } from "metabase/ui";
import {
OptionsIcon,
@@ -82,7 +82,12 @@ export class ChartNestedSettingSeriesMultiple extends Component {
data-testid="series-name-input"
/>
{objects.length > 1 ? (
- <IconWrapper className={cx(CS.ml1, CS.p1)}>
+ <Flex
+ align="center"
+ justify="center"
+ bdrs={6}
+ className={cx(CS.ml1, CS.p1)}
+ >
<OptionsIcon
name={isSelected(single) ? "chevronup" : "chevrondown"}
tooltip={
@@ -94,7 +99,7 @@ export class ChartNestedSettingSeriesMultiple extends Component {
)
}
/>
- </IconWrapper>
+ </Flex>
) : null}
</div>
{objectSettingsWidgets &&