From 61f1ea1daec179dbb5eb0d5950ede23e62dfc0d6 Mon Sep 17 00:00:00 2001 From: GaelleA Date: Mon, 20 Jan 2025 16:32:38 -0500 Subject: [PATCH 1/2] feat(study): SJIP-1170 update guid in summary --- src/graphql/studies/models.ts | 1 + src/graphql/studies/queries.ts | 1 + src/locales/en.ts | 2 +- src/views/StudyEntity/utils/summary.tsx | 43 ++++++++++++------------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/graphql/studies/models.ts b/src/graphql/studies/models.ts index 3cd67738..4ccead31 100644 --- a/src/graphql/studies/models.ts +++ b/src/graphql/studies/models.ts @@ -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; diff --git a/src/graphql/studies/queries.ts b/src/graphql/studies/queries.ts index 0e9a3a59..5965a996 100644 --- a/src/graphql/studies/queries.ts +++ b/src/graphql/studies/queries.ts @@ -118,6 +118,7 @@ export const GET_STUDY = gql` guid institutions investigator_names + is_guid_mapped is_harmonized part_lifespan_stages participant_count diff --git a/src/locales/en.ts b/src/locales/en.ts index 665ef201..1f01c7e1 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -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: diff --git a/src/views/StudyEntity/utils/summary.tsx b/src/views/StudyEntity/utils/summary.tsx index 21012631..72cb1540 100644 --- a/src/views/StudyEntity/utils/summary.tsx +++ b/src/views/StudyEntity/utils/summary.tsx @@ -64,28 +64,27 @@ const getSummaryDescriptions = (study?: IStudyEntity): IEntityDescriptionsItem[] }, { label: intl.get('entities.study.guid'), - value: - study?.guid === 'NDAR' ? ( - - {intl.get('entities.study.guidEntityTooltip1')} - - {intl.get('entities.study.guidEntityTooltip2')} - - . - - } - > - {study.guid} - - ) : ( - TABLE_EMPTY_PLACE_HOLDER - ), + value: study?.is_guid_mapped ? ( + + {intl.get('entities.study.guidEntityTooltip1')} + + {intl.get('entities.study.guidEntityTooltip2')} + + . + + } + > + True + + ) : ( + False + ), }, { label: intl.get('entities.study.participant_life_span'), From e68bf41f11d8fb5aeee6da73230de1a7233eaae8 Mon Sep 17 00:00:00 2001 From: kstonge Date: Wed, 22 Jan 2025 13:36:42 -0500 Subject: [PATCH 2/2] feat: SJIP-1170 Adjust Cypress tests --- cypress/e2e/Consultation/PageStudy.cy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/Consultation/PageStudy.cy.ts b/cypress/e2e/Consultation/PageStudy.cy.ts index b258a1d5..2ed96d9d 100644 --- a/cypress/e2e/Consultation/PageStudy.cy.ts +++ b/cypress/e2e/Consultation/PageStudy.cy.ts @@ -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');