remove table interface changes

aws-amplify · Nov 7, 2024 · 4bb6ca7 · 4bb6ca7
1 parent 49dfe0c
commit 4bb6ca7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 17 deletions.
diff --git a/packages/react-storage/src/components/StorageBrowser/composables/DataTable/DataTable.tsx b/packages/react-storage/src/components/StorageBrowser/composables/DataTable/DataTable.tsx
@@ -13,11 +13,11 @@ import { WithKey } from '../../components/types';
 import { CheckboxHeader } from './headers/CheckboxHeader';
 
 export interface DataTableRow {
-  content: DataTableDataCell[];
+  content: WithKey<DataTableDataCell>[];
 }
 
 export interface DataTableProps {
-  headers: DataTableHeader[];
+  headers: WithKey<DataTableHeader>[];
   rows: WithKey<DataTableRow>[];
 }
 

diff --git a/packages/react-storage/src/components/StorageBrowser/composables/DataTable/types.ts b/packages/react-storage/src/components/StorageBrowser/composables/DataTable/types.ts
@@ -6,17 +6,16 @@ import { CheckboxDataCellProps } from './dataCells/CheckboxDataCell';
 import { DateDataCellProps } from './dataCells/DateDataCell';
 import { NumberDataCellProps } from './dataCells/NumberDataCell';
 import { TextDataCellProps } from './dataCells/TextDataCell';
-import { WithKey } from '../../components/types';
 
-export interface DataTableCheckboxHeader extends WithKey<CheckboxHeaderProps> {
+export interface DataTableCheckboxHeader extends CheckboxHeaderProps {
   type: 'checkbox';
 }
 
-export interface DataTableSortHeader extends WithKey<SortHeaderProps> {
+export interface DataTableSortHeader extends SortHeaderProps {
   type: 'sort';
 }
 
-export interface DataTableTextHeader extends WithKey<TextHeaderProps> {
+export interface DataTableTextHeader extends TextHeaderProps {
   type: 'text';
 }
 
@@ -25,24 +24,23 @@ export type DataTableHeader =
   | DataTableSortHeader
   | DataTableTextHeader;
 
-export interface DataTableButtonDataCell extends WithKey<ButtonDataCellProps> {
+export interface DataTableButtonDataCell extends ButtonDataCellProps {
   type: 'button';
 }
 
-export interface DataTableCheckboxDataCell
-  extends WithKey<CheckboxDataCellProps> {
+export interface DataTableCheckboxDataCell extends CheckboxDataCellProps {
   type: 'checkbox';
 }
 
-export interface DataTableDateDataCell extends WithKey<DateDataCellProps> {
+export interface DataTableDateDataCell extends DateDataCellProps {
   type: 'date';
 }
 
-export interface DataTableNumberDataCell extends WithKey<NumberDataCellProps> {
+export interface DataTableNumberDataCell extends NumberDataCellProps {
   type: 'number';
 }
 
-export interface DataTableTextDataCell extends WithKey<TextDataCellProps> {
+export interface DataTableTextDataCell extends TextDataCellProps {
   type: 'text';
 }
 

diff --git a/...c/components/StorageBrowser/controls/compareFunctions/__tests__/compareButtonData.spec.ts b/...c/components/StorageBrowser/controls/compareFunctions/__tests__/compareButtonData.spec.ts
@@ -2,7 +2,7 @@ import { SortDirection } from '../../../composables/DataTable';
 import { compareButtonData } from '../compareButtonData';
 
 describe('compareButtonData', () => {
-  const emptyContent = { type: 'button' as const, key: '', content: {} };
+  const emptyContent = { type: 'button' as const, content: {} };
   const a = { ...emptyContent, content: { label: 'a' } };
   const b = { ...emptyContent, content: { label: 'b' } };
   const getComparisonResults = (direction: SortDirection) => [

diff --git a/...src/components/StorageBrowser/controls/compareFunctions/__tests__/compareDateData.spec.ts b/...src/components/StorageBrowser/controls/compareFunctions/__tests__/compareDateData.spec.ts
@@ -2,7 +2,7 @@ import { SortDirection } from '../../../composables/DataTable';
 import { compareDateData } from '../compareDateData';
 
 describe('compareDateData', () => {
-  const emptyContent = { type: 'date' as const, key: '', content: {} };
+  const emptyContent = { type: 'date' as const, content: {} };
   const a = { ...emptyContent, content: { date: new Date(1600387200000) } };
   const b = { ...emptyContent, content: { date: new Date(1702339200000) } };
   const getComparisonResults = (direction: SortDirection) => [

diff --git a/...c/components/StorageBrowser/controls/compareFunctions/__tests__/compareNumberData.spec.ts b/...c/components/StorageBrowser/controls/compareFunctions/__tests__/compareNumberData.spec.ts
@@ -2,7 +2,7 @@ import { SortDirection } from '../../../composables/DataTable';
 import { compareNumberData } from '../compareNumberData';
 
 describe('compareNumberData', () => {
-  const emptyContent = { type: 'number' as const, key: '', content: {} };
+  const emptyContent = { type: 'number' as const, content: {} };
   const a = { ...emptyContent, content: { value: 1 } };
   const b = { ...emptyContent, content: { value: 2 } };
   const getComparisonResults = (direction: SortDirection) => [

diff --git a/...src/components/StorageBrowser/controls/compareFunctions/__tests__/compareTextData.spec.ts b/...src/components/StorageBrowser/controls/compareFunctions/__tests__/compareTextData.spec.ts
@@ -2,7 +2,7 @@ import { SortDirection } from '../../../composables/DataTable';
 import { compareTextData } from '../compareTextData';
 
 describe('compareTextData', () => {
-  const emptyContent = { type: 'text' as const, key: '', content: {} };
+  const emptyContent = { type: 'text' as const, content: {} };
   const a = { ...emptyContent, content: { text: 'a' } };
   const b = { ...emptyContent, content: { text: 'b' } };
   const getComparisonResults = (direction: SortDirection) => [

diff --git a/packages/react-storage/src/components/StorageBrowser/views/LocationActionView/utils.ts b/packages/react-storage/src/components/StorageBrowser/views/LocationActionView/utils.ts
@@ -110,7 +110,7 @@ export const getActionViewTableData = <T extends FileItem | FileData>({
               item.data.key
             }`;
 
-            const buttonCell: DataTableButtonDataCell = {
+            const buttonCell: WithKey<DataTableButtonDataCell> = {
               key,
               type: 'button',
               content: { isDisabled, onClick, ariaLabel, icon: 'cancel' },