Skip to content

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

Migrate audit table from Emotion to Mantine and CSS modules (#75028)

Andrei Chernykhd70174060f4d
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx
index 31d71a5c541..b584e7ba64f 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.jsx
@@ -9,7 +9,7 @@ import { CheckBox } from "metabase/common/components/CheckBox";
import { EmptyState } from "metabase/common/components/EmptyState";
import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
-import { Icon } from "metabase/ui";
+import { Box, Icon } from "metabase/ui";
import { displayNameForColumn } from "metabase/utils/formatting";
import { registerVisualization } from "metabase/visualizations/index";
import { formatValue } from "metabase/visualizations/lib/formatting";
@@ -18,7 +18,7 @@ import { Table } from "metabase/visualizations/visualizations/Table/Table";
import { getColumnName, getRowValuesByColumns } from "../../lib/mode";
-import { HeaderCell, RowCell } from "./AuditTableVisualization.styled";
+import S from "./AuditTableVisualization.module.css";
const propTypes = {
series: PropTypes.array,
@@ -137,11 +137,14 @@ export class AuditTableVisualization extends Component {
sorting && sorting.column === getColumnName(column);
return (
- <HeaderCell
+ <Box
+ component="th"
key={colIndex}
- isSortable={isSortable}
- isSortedByColumn={isSortedByColumn}
- isRightAligned={isColumnRightAligned(column)}
+ className={cx(S.headerCell, {
+ [S.sortable]: isSortable,
+ [S.sortedByColumn]: isSortedByColumn,
+ [S.rightAligned]: isColumnRightAligned(column),
+ })}
onClick={() => this.handleColumnHeaderClick(column)}
>
{displayNameForColumn(cols[colIndex])}
@@ -152,7 +155,7 @@ export class AuditTableVisualization extends Component {
size={10}
/>
)}
- </HeaderCell>
+ </Box>
);
})}
</tr>
@@ -195,10 +198,13 @@ export class AuditTableVisualization extends Component {
};
return (
- <RowCell
+ <Box
+ component="td"
key={colIndex}
- isClickable={clickable}
- isRightAligned={isColumnRightAligned(column)}
+ className={cx({
+ [S.clickable]: clickable,
+ [S.rightAligned]: isColumnRightAligned(column),
+ })}
onClick={handleClick}
>
<div
@@ -223,7 +229,7 @@ export class AuditTableVisualization extends Component {
local: true,
})}
</div>
- </RowCell>
+ </Box>
);
})}
</tr>
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.module.css
new file mode 100644
index 00000000000..9a744f9cac0
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.module.css
@@ -0,0 +1,24 @@
+.headerCell {
+ white-space: nowrap;
+}
+
+.sortable {
+ cursor: pointer;
+
+ &:hover {
+ color: var(--mb-color-brand);
+ }
+}
+
+.sortedByColumn {
+ color: var(--mb-color-brand);
+}
+
+.rightAligned {
+ text-align: right;
+}
+
+.clickable {
+ color: var(--mb-color-brand);
+ cursor: pointer;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.styled.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.styled.tsx
deleted file mode 100644
index 81b68b57eb6..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/components/AuditTableVisualization/AuditTableVisualization.styled.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import styled from "@emotion/styled";
-
-interface HeaderCellProps {
- isSortable?: boolean;
- isSortedByColumn?: boolean;
- isRightAligned?: boolean;
-}
-
-export const HeaderCell = styled.th<HeaderCellProps>`
- cursor: ${(props) => props.isSortable && "pointer"};
- color: ${(props) => props.isSortedByColumn && "var(--mb-color-brand)"};
- text-align: ${(props) => props.isRightAligned && "right"};
- white-space: nowrap;
-
- &:hover {
- color: ${(props) => props.isSortable && "var(--mb-color-brand)"};
- }
-`;
-
-interface RowCellProps {
- isClickable?: boolean;
- isRightAligned?: boolean;
-}
-
-export const RowCell = styled.td<RowCellProps>`
- color: ${(props) => props.isClickable && "var(--mb-color-brand)"};
- cursor: ${(props) => props.isClickable && "pointer"};
- text-align: ${(props) => props.isRightAligned && "right"};
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx
index 769e42d2efd..11a21b48d4c 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.jsx
@@ -11,11 +11,12 @@ import { usePagination } from "metabase/common/hooks/use-pagination";
import CS from "metabase/css/core/index.css";
import { connect } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
+import { Flex } from "metabase/ui";
import Question from "metabase-lib/v1/Question";
import { AuditMode } from "../lib/mode";
-import { PaginationControlsContainer } from "./AuditTable.styled";
+import S from "./AuditTable.module.css";
import QuestionLoadAndDisplay from "./QuestionLoadAndDisplay";
const mapStateToProps = (state) => ({
@@ -82,7 +83,7 @@ function AuditTable({
/>
{shouldShowPagination && (
- <PaginationControlsContainer>
+ <Flex justify="flex-end" pt="md" className={S.paginationControls}>
<PaginationControls
page={page}
pageSize={pageSize}
@@ -90,7 +91,7 @@ function AuditTable({
onNextPage={loadedCount === pageSize ? handleNextPage : null}
onPreviousPage={handlePreviousPage}
/>
- </PaginationControlsContainer>
+ </Flex>
)}
{children}
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.module.css b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.module.css
new file mode 100644
index 00000000000..afdf97f1738
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.module.css
@@ -0,0 +1,3 @@
+.paginationControls {
+ border-top: 1px solid var(--mb-color-border);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.styled.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.styled.tsx
deleted file mode 100644
index 62a73e17d21..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/containers/AuditTable.styled.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from "@emotion/styled";
-
-export const PaginationControlsContainer = styled.div`
- display: flex;
- justify-content: flex-end;
- padding-top: 1rem;
- border-top: 1px solid var(--mb-color-border);
-`;