Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: catalog table date and pagination issue #814

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 94 additions & 41 deletions src/custom/CatalogDesignTable/CatalogDesignTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import _ from 'lodash';
import { useEffect, useRef, useState } from 'react';
import { useCallback, useMemo, useRef } from 'react';
import { PublishIcon } from '../../icons';
import { CHARCOAL, useTheme } from '../../theme';
import { Pattern } from '../CustomCatalog/CustomCard';
Expand Down Expand Up @@ -47,28 +47,54 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
handleBulkDeleteModal,
handleBulkpatternsDataUnpublishModal
}) => {
const [tableCols, updateCols] = useState<Array<any>>([]);
const { width } = useWindowDimensions();
const smallScreen = width <= 360;
const theme = useTheme();
const modalRef = useRef<PromptRef>(null);

useEffect(() => {
if (Array.isArray(columns) && columns.length > 0) {
updateCols(columns);
}
}, [columns]);
const formatDate = useCallback((date: string | Date): string => {
const dateOptions: Intl.DateTimeFormatOptions = {
weekday: 'short',
day: 'numeric',
month: 'long',
year: 'numeric'
};
return new Date(date).toLocaleDateString('en-US', dateOptions);
}, []);

const processedColumns = useMemo(() => {
return columns.map((col) => {
const newCol = { ...col };
if (!newCol.options) newCol.options = {};
newCol.options.display = columnVisibility[col.name];
if (
[
'updated_at',
'created_at',
'deleted_at',
'last_login_time',
'joined_at',
'last_run',
'next_run'
].includes(col.name)
) {
newCol.options.customBodyRender = (value: any) => {
if (!value || value === 'NA') return <>NA</>;
if (typeof value === 'object' && 'Valid' in value) {
if (value.Valid && value.Time) {
return <>{formatDate(value.Time)}</>;
}
return <>NA</>;
}
return <>{formatDate(value)}</>;
};
}
return newCol;
});
}, [columns, columnVisibility, formatDate]);

const options: any = {
selectableRows: _.isNil(filter) ? 'none' : 'multiple',
serverSide: true,
filterType: 'multiselect',
responsive: smallScreen ? 'vertical' : 'standard',
count: totalCount,
rowsPerPage: pageSize,
page,
elevation: 0,
onTableChange: (action: string, tableState: any) => {
const handleTableChange = useCallback(
(action: string, tableState: any) => {
const sortInfo = tableState.announceText ? tableState.announceText.split(' : ') : [];
let order = '';
if (tableState.activeColumn) {
Expand Down Expand Up @@ -98,44 +124,71 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
}
break;
}
}
};
},
[columns, setPage, setPageSize, setSortOrder, sortOrder]
);

if (_.isNil(filter)) {
options.customToolbarSelect = (selected: any) => (
<UnpublishTooltipIcon
title="Unpublish"
onClick={() => handleBulkpatternsDataUnpublishModal(selected, patterns, modalRef)}
iconType="publish"
id={'unpublish-button'}
>
<PublishIcon width={28.8} height={28.8} fill={CHARCOAL} />
</UnpublishTooltipIcon>
);
} else {
options.onRowsDelete = (rowsDeleted: any) => {
const selectedPatterns = rowsDeleted.data.map(({ dataIndex }: any) => patterns[dataIndex]);
handleBulkDeleteModal(selectedPatterns, modalRef);
return false;
};
}
const options = useMemo(
() => ({
selectableRows: _.isNil(filter) ? 'none' : 'multiple',
serverSide: true,
filterType: 'multiselect',
responsive: smallScreen ? 'vertical' : 'standard',
count: totalCount,
rowsPerPage: pageSize,
page,
elevation: 0,
onTableChange: handleTableChange,
customToolbarSelect: _.isNil(filter)
? (selected: any) => (
<UnpublishTooltipIcon
title="Unpublish"
onClick={() => handleBulkpatternsDataUnpublishModal(selected, patterns, modalRef)}
iconType="publish"
id={'unpublish-button'}
>
<PublishIcon width={28.8} height={28.8} fill={CHARCOAL} />
</UnpublishTooltipIcon>
)
: undefined,
onRowsDelete: !_.isNil(filter)
? (rowsDeleted: any) => {
const selectedPatterns = rowsDeleted.data.map(
({ dataIndex }: any) => patterns[dataIndex]
);
handleBulkDeleteModal(selectedPatterns, modalRef);
return false;
}
: undefined
}),
[
filter,
smallScreen,
totalCount,
pageSize,
page,
handleTableChange,
patterns,
handleBulkDeleteModal,
handleBulkpatternsDataUnpublishModal
]
);

if (!Array.isArray(tableCols) || tableCols.length === 0) {
if (!processedColumns.length) {
return null;
}

return (
<>
<PromptComponent ref={modalRef} />
<ResponsiveDataTable
columns={columns}
columns={processedColumns}
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore
data={patterns || []}
options={options}
colViews={colViews}
tableCols={tableCols}
updateCols={updateCols}
tableCols={processedColumns}
columnVisibility={columnVisibility}
backgroundColor={
theme.palette.mode === 'light'
Expand Down
30 changes: 14 additions & 16 deletions src/custom/TooltipIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,21 @@ export function TooltipIcon({
}: TooltipIconProps): JSX.Element {
return (
<CustomTooltip title={title} arrow={arrow}>
<div>
<IconButton
onClick={onClick}
sx={{
'&:hover': {
'& svg': {
fill: '#00d3a9'
},
borderRadius: '4px'
<IconButton
onClick={onClick}
sx={{
'&:hover': {
'& svg': {
fill: '#00d3a9'
},
...(style as SxProps)
}}
disableRipple
>
{icon}
</IconButton>
</div>
borderRadius: '4px'
},
...(style as SxProps)
}}
disableRipple
>
{icon}
</IconButton>
</CustomTooltip>
);
}
Expand Down
Loading