Skip to content

Commit

Permalink
Merge pull request #959 from amitamrutiya/revert
Browse files Browse the repository at this point in the history 
Revert "Merge pull request #916 from Karan-Palan/feat/all-columns-tab
  • Loading branch information
@amitamrutiya
amitamrutiya authored Mar 4, 2025
2 parents 327bd4a + aa49a5c commit 2e91d50
Showing 11 changed files with 95 additions and 140 deletions.
11 changes: 2 additions & 9 deletions examples/next-12/components/ResponsiveDataTable/ResponsiveDataTable.jsx
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ export function ResponsiveDataTable({ data, columns, options = {}, ...props }) {
year: 'numeric'
};

return new Intl.DateTimeFormat('en-US', dateOptions).format(date);
return new Intl.DateTimeFormat('un-US', dateOptions).format(date);
};

const updatedOptions = {
@@ -37,21 +37,14 @@ export function ResponsiveDataTable({ data, columns, options = {}, ...props }) {
break;
}
}
},
filter: true,
sort: true,
responsive: 'standard',
serverSide: false,
}
};

useEffect(() => {
columns?.forEach((col) => {
if (!col.options) {
col.options = {};
}

col.options.sort = true;
col.options.filter = true;
col.options.display = columnVisibility[col.name];

if (
15 changes: 1 addition & 14 deletions src/custom/CatalogDesignTable/CatalogDesignTable.tsx
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import _ from 'lodash';
import { MUIDataTableColumn } from 'mui-datatables';
import { useCallback, useMemo, useRef } from 'react';
import { PublishIcon } from '../../icons';
import { CHARCOAL, useTheme } from '../../theme';
import { CHARCOAL } from '../../theme';
import { Pattern } from '../CustomCatalog/CustomCard';
import { ErrorBoundary } from '../ErrorBoundary';
import { ColView } from '../Helpers/ResponsiveColumns/responsive-coulmns.tsx/responsive-column';
@@ -52,10 +52,8 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
handleBulkDeleteModal,
setSearch,
rowsPerPageOptions = [10, 25, 50, 100],
tableBackgroundColor,
handleBulkpatternsDataUnpublishModal
}) => {
const theme = useTheme();
const modalRef = useRef<PromptRef>(null);

const formatDate = useCallback((date: string | Date): string => {
@@ -72,8 +70,6 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
return columns.map((col) => {
const newCol = { ...col };
if (!newCol.options) newCol.options = {};
newCol.options.sort = true;
newCol.options.filter = true;
newCol.options.display = columnVisibility[col.name];
if (
[
@@ -149,8 +145,6 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
rowsPerPage: pageSize,
page,
elevation: 0,
sort: true,
filter: true,
sortOrder: {
name: sortOrder.split(' ')[0],
direction: sortOrder.split(' ')[1]
@@ -208,13 +202,6 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
colViews={colViews}
tableCols={processedColumns}
columnVisibility={columnVisibility}
backgroundColor={
tableBackgroundColor
? tableBackgroundColor
: theme.palette.mode === 'light'
? theme.palette.background.default
: theme.palette.background.secondary
}
/>
</ErrorBoundary>
);
40 changes: 20 additions & 20 deletions src/custom/CatalogDesignTable/DesignTableColumnConfig.tsx
View file
Original file line number Diff line number Diff line change
@@ -72,17 +72,15 @@ export const createDesignsColumnsConfig = ({
name: 'id',
label: 'ID',
options: {
filter: true,
sort: true,
searchable: true,
filter: false,
customBodyRender: (value: string) => <ConditionalTooltip value={value} maxLength={10} />
}
},
{
name: 'name',
label: 'Name',
options: {
filter: true,
filter: false,
sort: true,
searchable: true,
customBodyRender: (value: string, tableMeta: MUIDataTableMeta) => {
@@ -97,7 +95,7 @@ export const createDesignsColumnsConfig = ({
name: 'first_name',
label: 'Author',
options: {
filter: true,
filter: false,
sort: true,
searchable: true,
customBodyRender: (_, tableMeta: MUIDataTableMeta) => {
@@ -122,7 +120,7 @@ export const createDesignsColumnsConfig = ({
name: 'created_at',
label: 'Created At',
options: {
filter: true,
filter: false,
sort: true,
searchable: true,
setCellHeaderProps: () => {
@@ -134,7 +132,7 @@ export const createDesignsColumnsConfig = ({
name: 'updated_at',
label: 'Updated At',
options: {
filter: true,
filter: false,
sort: true,
searchable: true,
setCellHeaderProps: () => {
@@ -146,36 +144,38 @@ export const createDesignsColumnsConfig = ({
name: 'visibility',
label: 'Visibility',
options: {
filter: true,
sort: true,
filter: false,
sort: false,
searchable: true
}
},
{
name: 'user_id',
label: 'User ID',
options: {
filter: true,
sort: true,
searchable: true
filter: false,
sort: false,
searchable: false
}
},

{
name: 'email',
label: 'Email',
label: 'email',
options: {
filter: true,
sort: true,
searchable: true
filter: false,
sort: false,
searchable: false
}
},

{
name: 'actions',
label: 'Actions',
options: {
filter: true,
sort: true,
searchable: true,
filter: false,
sort: false,
searchable: false,
setCellHeaderProps: () => ({ align: 'center' as const }),
setCellProps: () => ({ align: 'center' as const }),
customBodyRender: function CustomBody(_, tableMeta: MUIDataTableMeta) {
@@ -247,7 +247,7 @@ export const createDesignsColumnsConfig = ({
actionsList.splice(1, 0, publishAction);
}

return <DataTableEllipsisMenu actionsList={actionsList} theme={theme} />;
return <DataTableEllipsisMenu actionsList={actionsList} />;
}
}
}
28 changes: 14 additions & 14 deletions src/custom/CatalogDesignTable/columnConfig.tsx
View file
Original file line number Diff line number Diff line change
@@ -86,15 +86,15 @@ export const createDesignColumns = ({
name: 'id',
label: 'ID',
options: {
filter: true,
filter: false,
customBodyRender: (value: string) => <ConditionalTooltip value={value} maxLength={10} />
}
},
{
name: 'name',
label: 'Name',
options: {
filter: true,
filter: false,
sort: true,
searchable: true,
customBodyRender: (value: string, tableMeta: MUIDataTableMeta) => {
@@ -122,7 +122,7 @@ export const createDesignColumns = ({
name: 'first_name',
label: 'Author',
options: {
filter: true,
filter: false,
sort: true,
searchable: true,
customBodyRender: (_: string, tableMeta: MUIDataTableMeta) => {
@@ -154,7 +154,7 @@ export const createDesignColumns = ({
name: 'created_at',
label: 'Created At',
options: {
filter: true,
filter: false,
sort: true,
searchable: true
}
@@ -163,7 +163,7 @@ export const createDesignColumns = ({
name: 'updated_at',
label: 'Updated At',
options: {
filter: true,
filter: false,
sort: true,
searchable: true
}
@@ -173,7 +173,7 @@ export const createDesignColumns = ({
label: 'Type',
options: {
filter: true,
sort: true,
sort: false,
searchable: true
}
},
@@ -182,56 +182,56 @@ export const createDesignColumns = ({
label: 'Class',
options: {
filter: true,
sort: true,
sort: false,
searchable: true
}
},
{
name: 'view_count',
label: 'Opens',
options: {
filter: true,
filter: false,
sort: true
}
},
{
name: 'download_count',
label: 'Downloads',
options: {
filter: true,
filter: false,
sort: true
}
},
{
name: 'clone_count',
label: 'Clones',
options: {
filter: true,
filter: false,
sort: true
}
},
{
name: 'deployment_count',
label: 'Deploys',
options: {
filter: true,
filter: false,
sort: true
}
},
{
name: 'share_count',
label: 'Shares',
options: {
filter: true,
filter: false,
sort: true
}
},
{
name: 'actions',
label: 'Actions',
options: {
filter: true,
sort: true,
filter: false,
sort: false,
searchable: false,
setCellHeaderProps: () => ({ align: 'center' }),
setCellProps: () => ({ align: 'center' }),
23 changes: 8 additions & 15 deletions src/custom/ResponsiveDataTable.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Theme, styled } from '@mui/material/styles';
import MUIDataTable, { MUIDataTableColumn } from 'mui-datatables';
import React, { useCallback } from 'react';
import { Checkbox, Collapse, ListItemIcon, ListItemText, Menu, MenuItem } from '../base';
import { ShareIcon } from '../icons';
import { EllipsisIcon } from '../icons/Ellipsis';
import { styled, useTheme } from './../theme';
import { ColView } from './Helpers/ResponsiveColumns/responsive-coulmns.tsx';
import { TooltipIcon } from './TooltipIconButton';

@@ -20,11 +20,10 @@ export const IconWrapper = styled('div', {

export const DataTableEllipsisMenu: React.FC<{
actionsList: NonNullable<Column['options']>['actionsList'];
theme?: Theme;
}> = ({ actionsList, theme }) => {
}> = ({ actionsList }) => {
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
const [isSocialShareOpen, setIsSocialShareOpen] = React.useState(false);

const theme = useTheme();
const handleClick = (event: React.MouseEvent<HTMLElement>) => {
setAnchorEl(event.currentTarget);
};
@@ -50,7 +49,7 @@ export const DataTableEllipsisMenu: React.FC<{
<TooltipIcon
title="View Actions"
onClick={handleClick}
icon={<EllipsisIcon fill={theme?.palette.icon.default ?? 'black'} />}
icon={<EllipsisIcon fill={theme.palette.icon.default} />}
arrow
/>
<Menu
@@ -59,9 +58,8 @@ export const DataTableEllipsisMenu: React.FC<{
open={Boolean(anchorEl)}
onClose={handleClose}
sx={{
fontFamily: theme?.typography.fontFamily,
'& .MuiPaper-root': {
backgroundColor: theme?.palette.background.card ?? 'white'
backgroundColor: theme.palette.background.card
}
}}
>
@@ -73,19 +71,14 @@ export const DataTableEllipsisMenu: React.FC<{
key={`${index}-menuitem`}
sx={{
width: '-webkit-fill-available'
// background: theme.palette.background.surfaces
}}
onClick={() => handleActionClick(action)}
disabled={action.disabled}
>
<ListItemIcon>
<ShareIcon
width={24}
height={24}
fill={theme?.palette.text.primary ?? 'black'}
/>
<ShareIcon width={24} height={24} fill={theme.palette.text.primary} />
</ListItemIcon>
<ListItemText sx={{ color: theme?.palette.text.primary ?? 'black' }}>
<ListItemText sx={{ color: theme.palette.text.primary }}>
{action.title}
</ListItemText>
</MenuItem>,
@@ -109,7 +102,7 @@ export const DataTableEllipsisMenu: React.FC<{
disabled={action.disabled}
>
<ListItemIcon>{action.icon}</ListItemIcon>
<ListItemText sx={{ color: theme?.palette.text.primary ?? 'black' }}>
<ListItemText sx={{ color: theme.palette.text.primary }}>
{action.title}
</ListItemText>
</MenuItem>
Loading

0 comments on commit 2e91d50

Please sign in to comment.