chore: removing usage of loading indicator inside table

aws-amplify · Nov 19, 2024 · e376108 · e376108
1 parent b878f2d
commit e376108
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 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
@@ -11,8 +11,6 @@ import { TextDataCell } from './dataCells/TextDataCell';
 import { DataTableDataCell, DataTableHeader } from './types';
 import { WithKey } from '../../components/types';
 import { CheckboxHeader } from './headers/CheckboxHeader';
-import { STORAGE_BROWSER_BLOCK } from '../../constants';
-import { ViewElement } from '../../context/elements';
 
 export interface DataTableRow {
   content: WithKey<DataTableDataCell>[];
@@ -21,14 +19,12 @@ export interface DataTableRow {
 export interface DataTableProps {
   headers: WithKey<DataTableHeader>[];
   isLoading?: boolean;
-  loadingIndicator?: React.ReactNode;
   rows: WithKey<DataTableRow>[];
 }
 
 export const DataTable = ({
   headers,
   isLoading,
-  loadingIndicator,
   rows,
 }: DataTableProps): React.JSX.Element => {
   const mappedHeaders = headers.map(({ key, content, type }) => {
@@ -96,10 +92,5 @@ export const DataTable = ({
         }),
       }));
 
-  return (
-    <ViewElement className={`${STORAGE_BROWSER_BLOCK}__data-table`}>
-      <Table headers={mappedHeaders} rows={mappedRows} />
-      {isLoading ? loadingIndicator : null}
-    </ViewElement>
-  );
+  return <Table headers={mappedHeaders} rows={mappedRows} />;
 };
diff --git a/packages/react-storage/src/components/StorageBrowser/controls/hooks/useDataTable.ts b/packages/react-storage/src/components/StorageBrowser/controls/hooks/useDataTable.ts
@@ -35,8 +35,7 @@ const UNSORTABLE_GROUPS: DataTableDataCell['type'][] = ['checkbox'];
 
 export const useDataTable = (): DataTableProps => {
   const { data } = useControlsContext();
-  const { tableData } = data;
-  const { isLoading, loadingIndicator } = data;
+  const { isLoading, tableData } = data;
 
   const defaultSortIndex = React.useMemo(
     () => tableData?.headers?.findIndex(({ type }) => type === 'sort') ?? -1,
@@ -156,7 +155,6 @@ export const useDataTable = (): DataTableProps => {
   return {
     headers: mappedHeaders ?? [],
     isLoading,
-    loadingIndicator,
     rows: sortedRows ?? [],
   };
 };
diff --git a/packages/react-storage/src/components/StorageBrowser/controls/types.ts b/packages/react-storage/src/components/StorageBrowser/controls/types.ts
@@ -62,7 +62,6 @@ export interface ControlsContext {
     isFolderNameDisabled?: boolean;
     isOverwriteToggleDisabled?: boolean;
     isSearchingSubfolders?: boolean;
-    loadingIndicator?: React.ReactNode;
     loadingIndicatorLabel?: string;
     location?: LocationState;
     overwriteToggleLabel?: string;