cleanup

Author: VREMSoftwareDevelopment

react/package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "bwmon",
     "description": "Bandwidth Monitor",
-    "version": "3.1.4",
+    "version": "3.1.5",
     "homepage": "/bwmon/",
     "private": true,
     "scripts": {

react/package.json

@@ -5,7 +5,7 @@ import Header from './Header';
 import Body from './Body';
 import Footer from './Footer';
 
-const UsageTable = ({ prefix, cellInfos, columnCount, paginationProps, headerProps, bodyProps, footerProps, showFooter }) => (
+const UsageTable = ({ prefix, cellInfos, paginationProps, headerProps, bodyProps, footerProps, showFooter }) => (
     <Table stickyHeader size="small">
         <TableHead>
             <TableRow>

react/src/components/table/UsageTable.jsx

@@ -43,7 +43,6 @@ describe('UsageTable', () => {
             <UsageTable
                 prefix="test"
                 cellInfos={cellInfos}
-                columnCount={2}
                 paginationProps={paginationProps}
                 headerProps={headerProps}
                 bodyProps={bodyProps}
@@ -63,7 +62,6 @@ describe('UsageTable', () => {
             <UsageTable
                 prefix="test"
                 cellInfos={cellInfos}
-                columnCount={2}
                 paginationProps={paginationProps}
                 headerProps={headerProps}
                 bodyProps={bodyProps}

react/src/components/table/UsageTable.test.jsx

@@ -76,12 +76,9 @@ const UsageByUser = () => {
         [sortedData, page, rowsPerPage]
     );
 
-    const columnCount = () => cellInfos.length - 4;
-
     const paginationProps = {
         'data-testid': 'user-pagination-id',
         id: 'user-pagination-id',
-        colSpan: columnCount(),
         count: data && data.usage ? data.usage.length : 0,
         minimum: rowsPerPageMin,
         rowsPerPage,
@@ -101,7 +98,6 @@ const UsageByUser = () => {
             <UsageTable
                 prefix="user"
                 cellInfos={cellInfos}
-                columnCount={columnCount()}
                 paginationProps={paginationProps}
                 headerProps={headerProps}
                 bodyProps={bodyProps}
@@ -115,7 +111,7 @@ const UsageByUser = () => {
             <Loading isLoading={loading} />
             {error && <ErrorMessage message={error} />}
             <TableContainer>
-                <div style={{ display: 'flex', gap: '1rem', marginBottom: '1rem' }}>
+                <div style={{ display: 'flex', gap: '1rem' }}>
                     <DropDown data-testid="user-year" id="user-year" onChange={handleChangeYear} items={years} value={year} />
                     <DropDown data-testid="user-month" id="user-month" onChange={handleChangeMonth} items={months} value={month} />
                     <Search data-testid="user-filter" id="user-filter" onChange={handleChangeFilter} />

react/src/features/byuser/UsageByUser.jsx

@@ -82,12 +82,6 @@ describe('UsageByUser', () => {
         expect(screen.queryByTestId('user-header')).not.toBeInTheDocument();
     });
 
-    it('Pagination colSpan matches columnCount', () => {
-        renderComponent();
-        const pagination = screen.getByTestId('user-pagination-id');
-        expect(pagination).toHaveAttribute('colspan', '7');
-    });
-
     it('renders table header', () => {
         renderComponent();
         expect(screen.queryByText('Loading...')).not.toBeInTheDocument();

react/src/features/byuser/UsageByUser.test.jsx

@@ -51,10 +51,7 @@ const UsageByYear = () => {
         setOrderBy(property);
     };
 
-    const sortedData = useMemo(
-        () => (data ? sort(data, comparator(ascending, orderBy)) : []),
-        [data, ascending, orderBy]
-    );
+    const sortedData = useMemo(() => (data ? sort(data, comparator(ascending, orderBy)) : []), [data, ascending, orderBy]);
 
     const paginatedData = useMemo(
         () => sortedData.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage),
@@ -83,7 +80,6 @@ const UsageByYear = () => {
             <UsageTable
                 prefix="year"
                 cellInfos={cellInfos}
-                columnCount={cellInfos.length}
                 paginationProps={paginationProps}
                 headerProps={headerProps}
                 bodyProps={bodyProps}