Skip to content

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

GDGT-1761 Remove Grid component (#69351)

Kamil Mielnik3bd26a01795a
diff --git a/frontend/src/metabase/common/components/Grid/Grid.styled.tsx b/frontend/src/metabase/common/components/Grid/Grid.styled.tsx
deleted file mode 100644
index d573cc00343..00000000000
--- a/frontend/src/metabase/common/components/Grid/Grid.styled.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-export const GridRoot = styled.div`
- display: flex;
- flex-wrap: wrap;
- margin-left: -0.5rem;
- margin-right: -0.5rem;
-`;
-
-export const GridItemRoot = styled.div`
- width: 25%;
- padding: 0.5rem;
-`;
diff --git a/frontend/src/metabase/common/components/Grid/Grid.tsx b/frontend/src/metabase/common/components/Grid/Grid.tsx
deleted file mode 100644
index 933f20d0c9c..00000000000
--- a/frontend/src/metabase/common/components/Grid/Grid.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { ReactNode } from "react";
-
-import { GridItemRoot, GridRoot } from "./Grid.styled";
-
-export const Grid = (props: { children: ReactNode }) => (
- <GridRoot>{props.children}</GridRoot>
-);
-
-export const GridItem = (props: { children: ReactNode }) => (
- <GridItemRoot>{props.children}</GridItemRoot>
-);
diff --git a/frontend/src/metabase/common/components/Grid/index.tsx b/frontend/src/metabase/common/components/Grid/index.tsx
deleted file mode 100644
index f2b81475d2c..00000000000
--- a/frontend/src/metabase/common/components/Grid/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./Grid";
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
index 5a08300e637..98117f1442f 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
@@ -2,15 +2,7 @@
import styled from "@emotion/styled";
import { ExternalLink } from "metabase/common/components/ExternalLink";
-import { GridItem } from "metabase/common/components/Grid";
-import {
- breakpointMinMedium,
- breakpointMinSmall,
-} from "metabase/styled-components/theme";
-
-const getPercentage = (number: number): string => {
- return `${number * 100}%`;
-};
+import { breakpointMinSmall } from "metabase/styled-components/theme";
export const OptionsRoot = styled.div`
display: flex;
@@ -39,19 +31,3 @@ export const EducationalButton = styled(ExternalLink)`
background-color: var(--mb-color-brand);
}
`;
-
-interface OptionsGridItemProps {
- itemsCount: number;
-}
-
-export const OptionsGridItem = styled(GridItem)<OptionsGridItemProps>`
- width: 100%;
-
- ${breakpointMinSmall} {
- width: 50%;
- }
-
- ${breakpointMinMedium} {
- width: ${(props) => getPercentage(1 / props.itemsCount)};
- }
-`;
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
index 84fc7184c03..c1d60be5a08 100644
--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.tsx
@@ -2,7 +2,6 @@ import cx from "classnames";
import type { Location } from "history";
import { t } from "ttag";
-import { Grid } from "metabase/common/components/Grid";
import CS from "metabase/css/core/index.css";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
@@ -14,12 +13,9 @@ import {
canUserCreateQueries,
} from "metabase/selectors/user";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
+import { Group } from "metabase/ui";
-import {
- EducationalButton,
- OptionsGridItem,
- OptionsRoot,
-} from "./NewModelOptions.styled";
+import { EducationalButton, OptionsRoot } from "./NewModelOptions.styled";
const EDUCATIONAL_LINK = getLearnUrl("metabase-basics/getting-started/models");
@@ -51,14 +47,11 @@ const NewModelOptions = ({ location }: NewModelOptionsProps) => {
);
}
- // Determine how many items will be shown based on permissions etc so we can make sure the layout adapts
- const itemsCount = (hasDataAccess ? 1 : 0) + (hasNativeWrite ? 1 : 0);
-
return (
<OptionsRoot data-testid="new-model-options">
- <Grid>
+ <Group justify="center">
{hasDataAccess && (
- <OptionsGridItem itemsCount={itemsCount}>
+ <div>
<NewModelOption
image="app/img/notebook_mode_illustration"
title={t`Use the notebook editor`}
@@ -71,10 +64,10 @@ const NewModelOptions = ({ location }: NewModelOptionsProps) => {
collectionId,
})}
/>
- </OptionsGridItem>
+ </div>
)}
{hasNativeWrite && (
- <OptionsGridItem itemsCount={itemsCount}>
+ <div>
<NewModelOption
image="app/img/sql_illustration"
title={t`Use a native query`}
@@ -89,9 +82,9 @@ const NewModelOptions = ({ location }: NewModelOptionsProps) => {
})}
width={180}
/>
- </OptionsGridItem>
+ </div>
)}
- </Grid>
+ </Group>
{showMetabaseLinks && (
<EducationalButton