Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(study): SJIP-1170 update guid in summary #839

Merged
merged 2 commits into from
Jan 22, 2025
Merged

feat(study): SJIP-1170 update guid in summary #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61f1ea1
feat(study): SJIP-1170 update guid in summary
Jan 20, 2025
e68bf41
feat: SJIP-1170 Adjust Cypress tests
kstonge Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cypress/e2e/Consultation/PageStudy.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ describe('Page d\'une étude - Vérifier les informations affichées', () => {
cy.get('[id="summary"] [class="ant-descriptions-item-content"]').eq(2).contains('INCLUDE').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-label"]').eq(3).contains('dbGaP Accession Number').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-content"]').eq(3).contains(/(phs002330|phs002981|-)/).should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-label"]').eq(4).contains('GUID Type').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-content"]').eq(4).find('[class*="ant-tag-volcano"]').contains('NDAR').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-label"]').eq(4).contains('GUID Available').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-content"]').eq(4).find('[class*="ant-tag-green"]').contains('True').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-label"]').eq(5).contains('Participant Lifespan').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-content"]').eq(5).find('[class*="ant-tag-cyan"]').contains('Pediatric').should('exist');
cy.get('[id="summary"] [class="ant-descriptions-item-content"]').eq(5).find('[class*="ant-tag-cyan"]').contains('Adult').should('exist');
Expand Down
1 change: 1 addition & 0 deletions src/graphql/studies/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export interface IStudyEntity {
guid?: string;
institutions?: string[];
investigator_names?: string[];
is_guid_mapped?: boolean;
is_harmonized?: boolean;
part_lifespan_stages?: string[];
participant_count: number;
Expand Down
1 change: 1 addition & 0 deletions src/graphql/studies/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export const GET_STUDY = gql`
guid
institutions
investigator_names
is_guid_mapped
is_harmonized
part_lifespan_stages
participant_count
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,7 +1955,7 @@ const en = {
expected_data_categories: 'Data Category',
file: 'File',
files: 'Files',
guid: 'GUID Type',
guid: 'GUID Available',
guidAbrv: 'G',
guidTooltip: 'NDA GUIDs',
guidEntityTooltip1:
Expand Down
43 changes: 21 additions & 22 deletions src/views/StudyEntity/utils/summary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,27 @@ const getSummaryDescriptions = (study?: IStudyEntity): IEntityDescriptionsItem[]
},
{
label: intl.get('entities.study.guid'),
value:
study?.guid === 'NDAR' ? (
<Tooltip
title={
<>
{intl.get('entities.study.guidEntityTooltip1')}
<Link
to={STATIC_ROUTES.STUDIES}
style={{ textDecoration: 'underline' }}
target="_blank"
>
{intl.get('entities.study.guidEntityTooltip2')}
</Link>
.
</>
}
>
<Tag color="volcano">{study.guid}</Tag>
</Tooltip>
) : (
TABLE_EMPTY_PLACE_HOLDER
),
value: study?.is_guid_mapped ? (
<Tooltip
title={
<>
{intl.get('entities.study.guidEntityTooltip1')}
<Link
to={STATIC_ROUTES.STUDIES}
style={{ textDecoration: 'underline' }}
target="_blank"
>
{intl.get('entities.study.guidEntityTooltip2')}
</Link>
.
</>
}
>
<Tag color="green">True</Tag>
</Tooltip>
) : (
<Tag color="default">False</Tag>
),
},
{
label: intl.get('entities.study.participant_life_span'),
Expand Down
Loading