Skip to content

Commit

Permalink
[frontend] Refacto of data tables dimensions computation (#8808)
Browse files Browse the repository at this point in the history
  • Loading branch information
lndrtrbn authored Dec 3, 2024
1 parent 0640390 commit 0c3677c
Show file tree
Hide file tree
Showing 29 changed files with 771 additions and 841 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ const Breadcrumbs: FunctionComponent<BreadcrumbsProps> = ({ elements, isSensitiv
);

return (
<div data-testid="navigation" style={{ marginBottom: theme.spacing(2), display: 'flex' }}>
<div
id="page-breadcrumb"
data-testid="navigation"
style={{ marginBottom: theme.spacing(2), display: 'flex' }}
>
{elements.map((element, index) => {
if (element.current) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Chip from '@mui/material/Chip';
import React, { FunctionComponent } from 'react';
import makeStyles from '@mui/styles/makeStyles';
import useTheme from '@mui/styles/useTheme';
import { useTheme } from '@mui/styles';
import type { Theme } from './Theme';

const useStyles = makeStyles(() => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Typography from '@mui/material/Typography';
import Paper from '@mui/material/Paper';
import React, { CSSProperties, forwardRef, ReactNode } from 'react';
import React, { CSSProperties, ReactNode } from 'react';
import makeStyles from '@mui/styles/makeStyles';

// Deprecated - https://mui.com/system/styles/basics/
Expand All @@ -10,7 +10,6 @@ const useStyles = makeStyles({
minHeight: 110,
height: '100%',
margin: '4px 0 0 0',
padding: '0 0 10px 0',
borderRadius: 4,
},
});
Expand All @@ -23,17 +22,17 @@ interface WidgetContainerProps {
withoutTitle?: boolean
}

const WidgetContainer = forwardRef<HTMLDivElement, WidgetContainerProps>(({
const WidgetContainer = ({
children,
height,
title,
variant,
withoutTitle = false,
}, ref) => {
}: WidgetContainerProps) => {
const classes = useStyles();

return (
<div ref={ref} style={{ height: height || '100%' }}>
<div style={{ height: height || '100%' }}>
{!withoutTitle && (
<Typography
variant={variant === 'inEntity' ? 'h3' : 'h4'}
Expand All @@ -57,8 +56,6 @@ const WidgetContainer = forwardRef<HTMLDivElement, WidgetContainerProps>(({
)}
</div>
);
});

WidgetContainer.displayName = 'WidgetContainer';
};

export default WidgetContainer;
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { DataTableProps } from './dataTableTypes';
import useAuth from '../../utils/hooks/useAuth';
import { useDataTable, useLineData } from './dataTableHooks';
import DataTableComponent from './components/DataTableComponent';
import { SELECT_COLUMN_SIZE } from './components/DataTableHeader';
import { UsePreloadedPaginationFragment } from '../../utils/hooks/usePreloadedPaginationFragment';
import { FilterIconButtonProps } from '../FilterIconButton';
import { isNotEmptyField } from '../../utils/utils';
Expand Down Expand Up @@ -95,7 +94,6 @@ const DataTableInternalFilters = ({
availableEntityTypes={availableEntityTypes}
additionalFilterKeys={additionalFilterKeys}
entityTypes={computedEntityTypes}
paginationOptions={paginationOptions}
/>
)}
</>
Expand Down Expand Up @@ -135,7 +133,7 @@ const DataTableInternalToolbar = ({
<div
style={{
background: theme.palette.background.accent,
width: `calc(( var(--header-table-size) - ${SELECT_COLUMN_SIZE} ) * 1px)`,
flex: 1,
}}
>
<DataTableToolBar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const DataTablePagination = ({

const {
resetColumns,
useDataTableColumnsLocalStorage,
useDataTablePaginationLocalStorage: {
viewStorage: {
pageSize,
Expand Down Expand Up @@ -57,10 +56,7 @@ const DataTablePagination = ({
}
}, [page, pageSize]);

const [_, setLocalStorageColumns] = useDataTableColumnsLocalStorage;

const resetTable = () => {
setLocalStorageColumns({});
resetColumns();
helpers.handleAddProperty('pageSize', '25');
};
Expand Down
Loading

0 comments on commit 0c3677c

Please sign in to comment.