Merge pull request Sage-Bionetworks#1486 from nickgros/PORTALS-2795a

jay-hodgson · Jan 9, 2025 · 4431e59 · 4431e59
2 parents 7eda4f5 + f35303a
commit 4431e59
Show file tree

Hide file tree

Showing 46 changed files with 2,001 additions and 2,182 deletions.
diff --git a/apps/synapse-oauth-signin/package.json b/apps/synapse-oauth-signin/package.json
@@ -9,7 +9,6 @@
     "@mui/icons-material": "^5.15.13",
     "@mui/material": "^5.15.13",
     "@react-hookz/web": "^23.1.0",
-    "@sage-bionetworks/react-base-table": "^1.13.4",
     "@tanstack/react-query": "5.22.2",
     "katex": "^0.16.10",
     "lodash-es": "^4.17.21",

diff --git a/packages/synapse-react-client/package.json b/packages/synapse-react-client/package.json
@@ -53,7 +53,6 @@
     "@rjsf/utils": "5.17.1",
     "@rjsf/validator-ajv8": "5.17.1",
     "@sage-bionetworks/markdown-it-container": "workspace:*",
-    "@sage-bionetworks/react-base-table": "^1.13.4",
     "@sage-bionetworks/synapse-client": "workspace:*",
     "@sage-bionetworks/synapse-types": "workspace:*",
     "@tanstack/query-core": "5.22.2",

diff --git a/packages/synapse-react-client/src/assets/icons/Sort.tsx b/packages/synapse-react-client/src/assets/icons/Sort.tsx
@@ -1,9 +1,8 @@
-import { SVGProps } from 'react'
-import { SortOrder } from '@sage-bionetworks/react-base-table'
 import { Direction } from '@sage-bionetworks/synapse-types'
+import { SVGProps } from 'react'
 
 type SortIconProps = {
-  direction: Direction | SortOrder | 'ASC' | 'DESC'
+  direction: Direction | 'ASC' | 'DESC'
   active: boolean
 }
 

diff --git a/packages/synapse-react-client/src/components/ChallengeDataDownload/ChallengeDataDownload.tsx b/packages/synapse-react-client/src/components/ChallengeDataDownload/ChallengeDataDownload.tsx
@@ -1,15 +1,16 @@
-import { useCallback } from 'react'
 import AddCircleTwoToneIcon from '@mui/icons-material/AddCircleTwoTone'
+import { Box, Button } from '@mui/material'
 import { EntityType } from '@sage-bionetworks/synapse-types'
+import { useCallback } from 'react'
+import { useAddFileBatchToDownloadList } from '../../synapse-queries'
+import { useSynapseContext } from '../../utils'
+import { EntityChildrenDetails } from '../EntityFinder/details/configurations/EntityChildrenDetails'
 import { EntityDetailsListSharedProps } from '../EntityFinder/details/EntityDetailsList'
-import { VersionSelectionType } from '../EntityFinder/VersionSelectionType'
+import { DetailsViewColumn } from '../EntityFinder/details/view/DetailsView'
 import { EntityFinderHeader } from '../EntityFinder/EntityFinderHeader'
 import { useEntitySelection } from '../EntityFinder/useEntitySelection'
-import { ChallengeEntityChildrenDetails } from './ChallengeEntityChildrenDetails'
-import { Box, Button } from '@mui/material'
-import { useAddFileBatchToDownloadList } from '../../synapse-queries'
+import { VersionSelectionType } from '../EntityFinder/VersionSelectionType'
 import { displayToast } from '../ToastMessage'
-import { useSynapseContext } from '../../utils'
 
 export type ChallengeDataDownloadProps = {
   parentContainerId: string
@@ -70,11 +71,18 @@ export function ChallengeDataDownload({
     isIdSelected,
     isSelectable: () => true,
     toggleSelection,
+    hiddenColumns: [
+      DetailsViewColumn.BADGES,
+      DetailsViewColumn.ADD_TO_DOWNLOAD_CART,
+      DetailsViewColumn.CREATED_ON,
+      DetailsViewColumn.VERSION,
+      DetailsViewColumn.MODIFIED_BY,
+    ],
   }
   return (
     <>
       <Box>
-        <ChallengeEntityChildrenDetails
+        <EntityChildrenDetails
           parentContainerId={parentContainerId}
           {...sharedProps}
         />