Merge pull request #985 from include-dcc/fix/sjip-1502-studyentity

fix: SJIP-1502 change logic for view in exploration

Author: evans-g-crsj

cypress/e2e/Consultation/PageStudy_2.cy.ts

@@ -122,9 +122,9 @@ describe('Page d\'une étude - Vérifier les informations affichées', () => {
     cy.get('[class*="StudyEntity_datasetTitle"] [class*="StudyEntity_datasetInfo"]').should('exist');
     cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-header"]').contains('HTP Whole Blood RNAseq (2020)').should('exist');
     cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-header"] [class*="ant-tag-green"]').contains('Harmonized').should('exist');
-    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-header"]').contains('View in exploration').should('exist');
-    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-header"]').contains('Manifest').should('exist');
-    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-header"]').contains('Analysis').should('exist');
+    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-extra"]').contains('View in exploration').should('exist');
+    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-extra"]').contains('Manifest').should('exist');
+    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-extra"]').contains('Analysis').should('exist');
     cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-descriptions-item-label"]').eq(0).contains('Dataset ID').should('exist');
     cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-descriptions-item-content"]').eq(0).contains('HTP-RNAseq-WholeBlood-2020').should('exist');
     cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-descriptions-item-label"]').eq(1).contains('Description').should('exist');

cypress/e2e/Consultation/PageStudy_3.cy.ts

@@ -57,7 +57,7 @@ describe('Page d\'une étude - Valider les liens disponibles', () => {
   });
 
   it('Lien DataExploration du panneau HTP Whole Blood RNAseq (2020)', () => {
-    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-header"] button').eq(0).clickAndWait({force: true});
+    cy.get('[id="HTP-RNAseq-WholeBlood-2020"] [class="ant-collapse-extra"] button').eq(0).clickAndWait({force: true});
     cy.get('[class*="DataFiles_dataFilesTabWrapper"]').should('exist'); // data-cy="ProTable_Participants"
     cy.get('[class*="QueryBar_selected"] [class*="QueryPill_field"]').contains('Dataset').should('exist');
     cy.get('[class*="QueryBar_selected"] [class*="QueryValues_value"]').contains('HTP Whole Blood RNAseq (2020)').should('exist');

cypress/e2e/ManifestButton/Dataset_1.cy.ts

@@ -13,7 +13,7 @@ beforeEach(() => {
       req.alias = 'postStats';
       req.reply(mockResponseBody);
     });
-    cy.get('[id="HTP-WGS-2021-X01"] [class="ant-collapse-header"] button[class*="ant-btn-default "]').eq(1).click({force: true});
+    cy.get('[id="HTP-WGS-2021-X01"] [class="ant-collapse-extra"] button[class*="ant-btn-default "]').eq(1).click({force: true});
     cy.wait('@postStats');
   });
 });

cypress/e2e/ManifestButton/Dataset_3.cy.ts

@@ -15,7 +15,7 @@ beforeEach(() => {
       req.alias = 'postStats';
       req.reply(mockResponseBody);
     });
-    cy.get('[id="HTP-WGS-2021-X01"] [class="ant-collapse-header"] button[class*="ant-btn-default "]').eq(1).click({force: true});
+    cy.get('[id="HTP-WGS-2021-X01"] [class="ant-collapse-extra"] button[class*="ant-btn-default "]').eq(1).click({force: true});
     cy.wait('@postStats');
   });
 

cypress/fixtures/ResponseBody/StudyEntity.json

@@ -417,6 +417,7 @@
                                                 "experimental_platform": "Illumina",
                                                 "experimental_strategy": "WGS",
                                                 "external_dataset_id": "HTP-WGS-2021-X01",
+                                                "has_participant_docs": true,
                                                 "is_harmonized": true,
                                                 "publications": [],
                                                 "publications_details": "publications_details"
@@ -505,6 +506,7 @@
                                                 "experimental_platform": "Illumina NovaSeq 6000",
                                                 "experimental_strategy": "Bulk RNA-Seq",
                                                 "external_dataset_id": "HTP-RNAseq-WholeBlood-2020",
+                                                "has_participant_docs": true,
                                                 "is_harmonized": true,
                                                 "publications": [
                                                     "https://pubmed.ncbi.nlm.nih.gov/37379383|https://pubmed.ncbi.nlm.nih.gov/39737640"

src/graphql/studies/models.ts

@@ -28,6 +28,7 @@ export interface IStudyDataset {
   is_harmonized?: boolean;
   publications?: string[];
   publications_details?: ArrangerResultsTree<IPublicationDetails>;
+  has_participant_docs?: boolean;
 }
 
 export interface IAuthor {

src/graphql/studies/queries.ts

@@ -192,6 +192,7 @@ export const GET_STUDY = gql`
                     experimental_platform
                     experimental_strategy
                     external_dataset_id
+                    has_participant_docs
                     is_harmonized
                     publications
                     publications_details {

src/views/PublicStudyEntity/index.tsx

@@ -336,8 +336,8 @@ const PublicStudyEntity = () => {
                 </Title>
                 {studyData?.datasets?.map((dataset, index: number) => {
                   const titleExtra = [];
-
-                  if (dataset.dataset_name && dataset.is_harmonized) {
+                  const hasDocsInExploration = dataset.has_participant_docs;
+                  if (hasDocsInExploration) {
                     titleExtra.push(
                       <Button
                         className={style.datasetBtn}

src/views/StudyEntity/index.tsx

@@ -580,8 +580,8 @@ const StudyEntity = () => {
             </Title>
             {study?.datasets?.hits.edges.map(({ node: dataset }, index: number) => {
               const titleExtra = [];
-
-              if (dataset.dataset_name && dataset.is_harmonized) {
+              const hasDocsInExploration = dataset.has_participant_docs;
+              if (hasDocsInExploration) {
                 titleExtra.push(
                   <Button
                     className={style.datasetBtn}