diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTable.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTable.tsx
index f8937694..72c1229f 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTable.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTable.tsx
@@ -37,7 +37,6 @@ import { useNavigate } from 'react-router-dom';
import { EExtractionStatus } from '../ExtractionPage';
import styles from './ExtractionTable.module.css';
import { ExtractionTableAuthorCell, ExtractionTableAuthorHeader } from './ExtractionTableAuthor';
-import { ExtractionTableDOICell, ExtractionTableDOIHeader } from './ExtractionTableDOI';
import ExtractionTableFilterInput from './ExtractionTableFilterInput';
import { ExtractionTableJournalCell, ExtractionTableJournalHeader } from './ExtractionTableJournal';
import { ExtractionTableNameCell, ExtractionTableNameHeader } from './ExtractionTableName';
@@ -106,9 +105,9 @@ const ExtractionTable: React.FC = () => {
return [
columnHelper.accessor(({ year }) => (year ? String(year) : ''), {
id: 'year',
- size: 5,
- minSize: 5,
- maxSize: 5,
+ size: 70,
+ minSize: 70,
+ maxSize: 70,
cell: ExtractionTableYearCell,
header: ExtractionTableYearHeader,
enableSorting: true,
@@ -121,9 +120,9 @@ const ExtractionTable: React.FC = () => {
columnHelper.accessor('name', {
id: 'name',
cell: ExtractionTableNameCell,
- size: 25,
- minSize: 25,
- maxSize: 25,
+ size: 500,
+ minSize: 500,
+ maxSize: 500,
header: ExtractionTableNameHeader,
enableSorting: true,
sortingFn: 'text',
@@ -134,9 +133,9 @@ const ExtractionTable: React.FC = () => {
}),
columnHelper.accessor('authors', {
id: 'authors',
- size: 20,
- minSize: 20,
- maxSize: 20,
+ size: 300,
+ minSize: 300,
+ maxSize: 300,
enableSorting: true,
enableColumnFilter: true,
sortingFn: 'text',
@@ -149,9 +148,9 @@ const ExtractionTable: React.FC = () => {
}),
columnHelper.accessor('publication', {
id: 'journal',
- size: 15,
- minSize: 15,
- maxSize: 15,
+ size: 100,
+ minSize: 100,
+ maxSize: 100,
enableSorting: true,
enableColumnFilter: true,
cell: ExtractionTableJournalCell,
@@ -160,26 +159,26 @@ const ExtractionTable: React.FC = () => {
filterVariant: 'journal-autocomplete',
},
}),
- columnHelper.accessor('doi', {
- id: 'doi',
- size: 15,
- minSize: 15,
- maxSize: 15,
- sortingFn: 'alphanumeric',
- enableSorting: true,
- enableColumnFilter: true,
- filterFn: 'includesString',
- cell: ExtractionTableDOICell,
- header: ExtractionTableDOIHeader,
- meta: {
- filterVariant: 'text',
- },
- }),
+ // columnHelper.accessor('doi', {
+ // id: 'doi',
+ // size: 10,
+ // minSize: 10,
+ // maxSize: 10,
+ // sortingFn: 'alphanumeric',
+ // enableSorting: true,
+ // enableColumnFilter: true,
+ // filterFn: 'includesString',
+ // cell: ExtractionTableDOICell,
+ // header: ExtractionTableDOIHeader,
+ // meta: {
+ // filterVariant: 'text',
+ // },
+ // }),
columnHelper.accessor('pmid', {
id: 'pmid',
- size: 10,
- minSize: 10,
- maxSize: 10,
+ size: 100,
+ minSize: 100,
+ maxSize: 100,
enableColumnFilter: true,
filterFn: 'includesString',
cell: ExtractionTablePMIDCell,
@@ -192,9 +191,9 @@ const ExtractionTable: React.FC = () => {
}),
columnHelper.accessor('status', {
id: 'status',
- size: 10,
- minSize: 10,
- maxSize: 10,
+ size: 120,
+ minSize: 120,
+ maxSize: 120,
enableSorting: true,
cell: ExtractionTableStatusCell,
filterFn: (row, columnId, filterValue: EExtractionStatus | null) => {
@@ -270,20 +269,16 @@ const ExtractionTable: React.FC = () => {
onChange={handlePaginationChangeMuiPaginator}
page={pagination.pageIndex + 1}
/>
- Total: {data.length} studies
-
+
{table.getHeaderGroups().map((headerGroup) => (
{headerGroup.headers.map((header) => (
{flexRender(
@@ -416,7 +411,14 @@ const ExtractionTable: React.FC = () => {
- Viewing {table.getFilteredRowModel().rows.length} / {data.length}
+ {columnFilters.length > 0 ? (
+
+ Viewing {table.getFilteredRowModel().rows.length} /{' '}
+ {data.length}
+
+ ) : (
+ Total: {data.length} studies
+ )}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableAuthor.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableAuthor.tsx
index 8cfac918..717ab712 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableAuthor.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableAuthor.tsx
@@ -33,19 +33,27 @@ export const ExtractionTableAuthorHeader: React.FC<
}
}}
>
-
+
) : isSorted === 'asc' ? (
table.resetSorting()}>
-
+ sx={{ width: '' }}
+
) : (
table.setSorting([{ id: 'authors', desc: false }])}
>
-
+
)}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableDOI.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableDOI.tsx
index bf36cf6e..5e4844cf 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableDOI.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableDOI.tsx
@@ -37,19 +37,25 @@ export const ExtractionTableDOIHeader: React.FC
-
+
) : isSorted === 'asc' ? (
table.resetSorting()}>
-
+
) : (
table.setSorting([{ id: 'doi', desc: false }])}
>
-
+
)}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableFilterInput.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableFilterInput.tsx
index 728bdcbe..86a4ec00 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableFilterInput.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableFilterInput.tsx
@@ -41,7 +41,7 @@ const ExtractionTableFilterInput: React.FC<{
-
+
) : isSorted === 'asc' ? (
table.resetSorting()}>
-
+
) : (
table.setSorting([{ id: 'journal', desc: false }])}
>
-
+
)}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableJournalAutocomplete.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableJournalAutocomplete.tsx
index 07225d68..e4fa3cbe 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableJournalAutocomplete.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableJournalAutocomplete.tsx
@@ -31,7 +31,7 @@ const ExtractionTableJournalAutocomplete: React.FC<{
}
+ renderInput={(params) => }
onChange={handleChange}
value={value || null}
options={options}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableName.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableName.tsx
index 21198759..f25011e3 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableName.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableName.tsx
@@ -37,19 +37,25 @@ export const ExtractionTableNameHeader: React.FC
-
+
) : isSorted === 'asc' ? (
table.resetSorting()}>
-
+
) : (
table.setSorting([{ id: 'name', desc: false }])}
>
-
+
)}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTablePMID.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTablePMID.tsx
index aefc1208..6ded5224 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTablePMID.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTablePMID.tsx
@@ -33,19 +33,25 @@ export const ExtractionTablePMIDHeader: React.FC
-
+
) : isSorted === 'asc' ? (
table.resetSorting()}>
-
+
) : (
table.setSorting([{ id: 'pmid', desc: false }])}
>
-
+
)}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableStatus.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableStatus.tsx
index 0be5f302..7a23808a 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableStatus.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableStatus.tsx
@@ -28,6 +28,7 @@ export const ExtractionTableStatusCell: React.FC<
disableElevation
sx={{ paddingX: '0' }}
color="warning"
+ size="small"
variant={
status === undefined || status === EExtractionStatus.UNCATEGORIZED
? 'contained'
@@ -47,6 +48,7 @@ export const ExtractionTableStatusCell: React.FC<
disableElevation
sx={{ paddingX: '0' }}
color="info"
+ size="small"
variant={status === EExtractionStatus.SAVEDFORLATER ? 'contained' : 'outlined'}
>
@@ -62,6 +64,7 @@ export const ExtractionTableStatusCell: React.FC<
disableElevation
sx={{ paddingX: '0' }}
color="success"
+ size="small"
variant={status === EExtractionStatus.COMPLETED ? 'contained' : 'outlined'}
>
@@ -92,19 +95,25 @@ export const ExtractionTableStatusHeader: React.FC<
}
}}
>
-
+
) : isSorted === 'asc' ? (
table.resetSorting()}>
-
+
) : (
table.setSorting([{ id: 'status', desc: false }])}
>
-
+
)}
diff --git a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableYear.tsx b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableYear.tsx
index 84cd28a4..ce9d7d4f 100644
--- a/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableYear.tsx
+++ b/compose/neurosynth-frontend/src/pages/Extraction/components/ExtractionTableYear.tsx
@@ -34,19 +34,25 @@ export const ExtractionTableYearHeader: React.FC
-
+
) : isSorted === 'asc' ? (
table.resetSorting()}>
-
+
) : (
table.setSorting([{ id: 'year', desc: false }])}
>
-
+
)}