Skip to content

Commit eb5108b

Browse files
committed
feat: update column view types to use ColView interface across CatalogDesignTable components
Signed-off-by: Amit Amrutiya <amitamrutiya2210@gmail.com>
1 parent a2c111e commit eb5108b

7 files changed

Lines changed: 15 additions & 12 deletions

File tree

src/custom/CatalogDesignTable/CatalogDesignTable.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { PublishIcon } from '../../icons';
55
import { CHARCOAL, useTheme } from '../../theme';
66
import { Pattern } from '../CustomCatalog/CustomCard';
77
import { ErrorBoundary } from '../ErrorBoundary';
8+
import { ColView } from '../Helpers/ResponsiveColumns/responsive-coulmns.tsx/responsive-column';
89
import PromptComponent from '../Prompt';
910
import { PromptRef } from '../Prompt/promt-component';
1011
import ResponsiveDataTable from '../ResponsiveDataTable';
@@ -22,7 +23,7 @@ interface CatalogDesignsTableProps {
2223
page: number;
2324
setPage: (page: number) => void;
2425
columnVisibility: Record<string, boolean>;
25-
colViews: Record<string, boolean> | undefined;
26+
colViews: ColView[];
2627
handleBulkDeleteModal: (patterns: Pattern[], modalRef: React.RefObject<PromptRef>) => void;
2728
handleBulkpatternsDataUnpublishModal: (
2829
selected: any,
@@ -43,7 +44,7 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
4344
page = 0,
4445
setPage,
4546
columnVisibility = {},
46-
colViews = {},
47+
colViews = [],
4748
handleBulkDeleteModal,
4849
handleBulkpatternsDataUnpublishModal
4950
}) => {

src/custom/CatalogDesignTable/DesignTableColumnConfig.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { downloadYaml, slugify } from '../CatalogDetail/helper';
77
import { RESOURCE_TYPES } from '../CatalogDetail/types';
88
import { Pattern } from '../CustomCatalog/CustomCard';
99
import { ConditionalTooltip } from '../Helpers/CondtionalTooltip';
10+
import { ColView } from '../Helpers/ResponsiveColumns/responsive-coulmns.tsx';
1011
import { DataTableEllipsisMenu } from '../ResponsiveDataTable';
1112
import AuthorCell from './AuthorCell';
1213
import { getColumnValue } from './helper';
@@ -31,7 +32,7 @@ interface ColumnConfigProps {
3132
isUnpublishDisabled: boolean;
3233
}
3334

34-
export const colViews: [string, string][] = [
35+
export const colViews: ColView[] = [
3536
['id', 'na'],
3637
['name', 'xs'],
3738
['first_name', 'xs'],

src/custom/CatalogDesignTable/columnConfig.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ import { downloadFilter, downloadYaml } from '../CatalogDetail/helper';
1717
import { RESOURCE_TYPES } from '../CatalogDetail/types';
1818
import { Pattern } from '../CustomCatalog/CustomCard';
1919
import { ConditionalTooltip } from '../Helpers/CondtionalTooltip';
20+
import { ColView } from '../Helpers/ResponsiveColumns/responsive-coulmns.tsx/responsive-column';
2021
import { DataTableEllipsisMenu } from '../ResponsiveDataTable';
2122
import AuthorCell from './AuthorCell';
2223
import { getColumnValue } from './helper';
2324
import { NameDiv } from './style';
2425

25-
export type ColView = [string, 'na' | 'xs' | 'l'];
26-
2726
export const colViews: ColView[] = [
2827
['id', 'na'],
2928
['name', 'xs'],

src/custom/CustomColumnVisibilityControl/CustomColumnVisibilityControl.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { MUIDataTableColumn } from 'mui-datatables';
12
import React from 'react';
23
import { Box } from '../../base/Box';
34
import { Card } from '../../base/Card';
@@ -10,7 +11,7 @@ import PopperListener from '../PopperListener';
1011
import TooltipIcon from '../TooltipIcon';
1112

1213
export interface CustomColumnVisibilityControlProps {
13-
columns: CustomColumn[];
14+
columns: MUIDataTableColumn[];
1415
customToolsProps: {
1516
columnVisibility: Record<string, boolean>;
1617
setColumnVisibility: React.Dispatch<React.SetStateAction<Record<string, boolean>>>;

src/custom/PerformersSection/PerformersSection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ interface PageArgs {
184184
[key: string]: any;
185185
}
186186

187-
const withDefaultPageArgs = (args: PageArgs = {}): PageArgs => ({
187+
export const withDefaultPageArgs = (args: PageArgs = {}): PageArgs => ({
188188
search: args.search ?? '',
189189
order: args.order ?? '',
190190
pagesize: args.pagesize ?? 0,

src/custom/ResponsiveDataTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import React, { useCallback } from 'react';
44
import { Checkbox, Collapse, ListItemIcon, ListItemText, Menu, MenuItem } from '../base';
55
import { ShareIcon } from '../icons';
66
import { EllipsisIcon } from '../icons/Ellipsis';
7+
import { ColView } from './Helpers/ResponsiveColumns/responsive-coulmns.tsx';
78
import TooltipIcon from './TooltipIcon';
89

910
export const IconWrapper = styled('div')<{ disabled?: boolean }>(({ disabled = false }) => ({
@@ -283,7 +284,7 @@ export interface ResponsiveDataTableProps {
283284
updateCols?: ((columns: Column[]) => void) | undefined;
284285
columnVisibility: Record<string, boolean> | undefined;
285286
theme?: object;
286-
colViews?: Record<string, boolean> | undefined;
287+
colViews?: ColView[];
287288
rowsPerPageOptions?: number[] | undefined;
288289
backgroundColor?: string;
289290
}

src/custom/Workspaces/AssignmentModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
/* eslint-disable @typescript-eslint/no-explicit-any */
12
import { Modal, ModalBody, ModalButtonPrimary, ModalButtonSecondary, ModalFooter } from '../Modal';
23
import { TransferList } from '../TransferModal/TransferList';
3-
import { ListItemType } from '../TransferModal/TransferList/TransferList';
44
import { ModalActionDiv } from './styles';
55

66
interface AssignmentModalProps {
@@ -9,9 +9,9 @@ interface AssignmentModalProps {
99
title: string;
1010
headerIcon: JSX.Element;
1111
name: string;
12-
assignableData: ListItemType[];
13-
handleAssignedData: (data: ListItemType[]) => void;
14-
originalAssignedData: ListItemType[];
12+
assignableData: any[];
13+
handleAssignedData: (data: any) => void;
14+
originalAssignedData: any[];
1515
emptyStateIcon: JSX.Element;
1616
handleAssignablePage: () => void;
1717
handleAssignedPage: () => void;

0 commit comments

Comments
 (0)