Skip to content

Commit

Permalink
Merge pull request #1625 from jay-hodgson/standards-data
Browse files Browse the repository at this point in the history
Hook up real standards MV and a dummy Standard Details page
  • Loading branch information
jay-hodgson authored Mar 7, 2025
2 parents d49bc36 + 3b85f72 commit 49c7c3a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 58 deletions.
2 changes: 1 addition & 1 deletion apps/portals/standards/src/config/resources.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const dataSql = `SELECT id, study, numberParticipants,reportedOutcome,dataCollectionMethod,deviceType,devicePlatform,deviceLocation,sensorType,diagnosis,digitalAssessmentCategory,digitalAssessmentDetails,dataType,dataSubtype,dataDescriptionLocation, dataAccessInstructions FROM syn21994970.10 where dhPortalIndex = 'TRUE'`
export const dataSql = `SELECT * FROM syn64960277`
38 changes: 6 additions & 32 deletions apps/portals/standards/src/config/synapseConfigs/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,10 @@ import { dataSql } from '../resources'
const dataRgbIndex = 0
export const dataColumnLinks: LabelLinkConfig = [
{
matchColumnName: 'dataDescriptionLocation',
isMarkdown: true,
},
{
matchColumnName: 'dataAccessInstructions',
isMarkdown: true,
},
{
matchColumnName: 'study',
matchColumnName: 'Name',
isMarkdown: false,
baseURL: 'Explore/Collections/DetailsPage',
URLColumnName: 'study',
baseURL: 'Explore/Standard/DetailsPage',
URLColumnName: 'Name',
},
]

Expand All @@ -30,34 +22,16 @@ export const dataQueryWrapperPlotNavProps: QueryWrapperPlotNavProps = {
shouldDeepLink: true,
hideDownload: true,
sql: dataSql,
name: 'Data',
name: 'Standards',
columnAliases,
tableConfiguration: {
showDownloadColumn: false,
columnLinks: dataColumnLinks,
},
facetsToPlot: [
'study',
'reportedOutcome',
'dataCollectionMethod',
'deviceType',
'devicePlatform',
'deviceLocation',
'diagnosis',
'digitalAssessmentCategory',
'dataType',
'dataSubtype',
'Data_Topic',
// 'Organizations',
],
searchConfiguration: {
searchable: [
'collection',
'reportedOutcome',
'devicePlatform',
'diagnosis',
'digitalAssessmentCategory',
'digitalAssessmentDetails',
],
},
initialPlotType: 'BAR',
}

Expand Down
56 changes: 31 additions & 25 deletions apps/portals/standards/src/pages/StandardsDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,20 @@ import { MarkdownSynapseFromColumnData } from '@sage-bionetworks/synapse-portal-
import { useGetPortalComponentSearchParams } from '@sage-bionetworks/synapse-portal-framework/utils/UseGetPortalComponentSearchParams'
import {
ErrorPage,
GenericCardSchema,
SynapseConstants,
SynapseErrorType,
} from 'synapse-react-client'
import { dataSql } from '../config/resources'
import { CardContainerLogic } from 'synapse-react-client'

export const standardsCardSchema: GenericCardSchema = {
type: SynapseConstants.GENERIC_CARD,
title: 'Name',
// subTitle: '',
// description: '',
secondaryLabels: ['Collections', 'Data_Topic', 'Organizations'],
}

export const standardDetailsPageContent: DetailsPageContentType = [
{
Expand Down Expand Up @@ -41,42 +52,37 @@ export const standardDetailsPageContent: DetailsPageContentType = [
title: 'Related Standards',
element: (
<DetailsPageContextConsumer columnName={'id'}>
{({ value }) => (
<>{value}</>
// TODO:
// <CardContainerLogic
// {...standardCardContainerProps}
// searchParams={{ standardId: value! }}
// />
)}
</DetailsPageContextConsumer>

{({ value }) => (
<>{value}</>
// TODO:
// <CardContainerLogic
// {...standardCardContainerProps}
// searchParams={{ standardId: value! }}
// />
)}
</DetailsPageContextConsumer>
),
},
]

export default function StandardsDetailsPage() {
const { study } = useGetPortalComponentSearchParams()
const { Name } = useGetPortalComponentSearchParams()

if (!study) {
if (!Name) {
return <ErrorPage type={SynapseErrorType.NOT_FOUND} gotoPlace={() => {}} />
}
return (
<>
{/* TODO: header card */}
{/* <CardContainerLogic
isHeader
isAlignToLeftNav
{...standardsCardConfiguration}
columnAliases={columnAliases}
genericCardSchema={{
...standardsSchema,
title: 'name',
link: 'id',
}}
sql={studySql}
searchParams={{ study }}
/> */}
<CardContainerLogic
sql={dataSql}
type={SynapseConstants.GENERIC_CARD}
genericCardSchema={standardsCardSchema}
secondaryLabelLimit={6}
isHeader={true}
searchParams={{ Name }}
/>

<DetailsPage sql={dataSql}>
<DetailsPageContent content={standardDetailsPageContent} />
</DetailsPage>
Expand Down

0 comments on commit 49c7c3a

Please sign in to comment.