diff --git a/compose/neurosynth-frontend/cypress/e2e/workflows/Extraction/ExtractionTable.cy.tsx b/compose/neurosynth-frontend/cypress/e2e/workflows/Extraction/ExtractionTable.cy.tsx index d2b039dd..30d6a675 100644 --- a/compose/neurosynth-frontend/cypress/e2e/workflows/Extraction/ExtractionTable.cy.tsx +++ b/compose/neurosynth-frontend/cypress/e2e/workflows/Extraction/ExtractionTable.cy.tsx @@ -370,46 +370,46 @@ describe('ExtractionTable', () => { }); }); - it('should sort by doi desc', () => { - cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); - - cy.wait('@studysetFixture').then((studysetFixture) => { - const studyset = studysetFixture.response?.body as StudysetReturn; - const studies = [...(studyset.studies || [])] as StudyReturn[]; - - const sortedStudies = studies.sort((a, b) => - (b.doi as string).localeCompare(a.doi as string) - ); - - console.log(sortedStudies); - - cy.get('tbody > tr').each((tr, index) => { - cy.wrap(tr).within(() => { - cy.get('td').eq(4).should('have.text', sortedStudies[index].doi); - }); - }); - }); - }); - it('should sort by doi asc', () => { - cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); - cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); - cy.get('[data-testid="ArrowUpwardIcon"]').should('exist'); - - cy.wait('@studysetFixture').then((studysetFixture) => { - const studyset = studysetFixture.response?.body as StudysetReturn; - const studies = [...(studyset.studies || [])] as StudyReturn[]; - - const sortedStudies = studies.sort((a, b) => - (a.doi as string).localeCompare(b.doi as string) - ); - - cy.get('tbody > tr').each((tr, index) => { - cy.wrap(tr).within(() => { - cy.get('td').eq(4).should('have.text', sortedStudies[index].doi); - }); - }); - }); - }); + // it('should sort by doi desc', () => { + // cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); + + // cy.wait('@studysetFixture').then((studysetFixture) => { + // const studyset = studysetFixture.response?.body as StudysetReturn; + // const studies = [...(studyset.studies || [])] as StudyReturn[]; + + // const sortedStudies = studies.sort((a, b) => + // (b.doi as string).localeCompare(a.doi as string) + // ); + + // console.log(sortedStudies); + + // cy.get('tbody > tr').each((tr, index) => { + // cy.wrap(tr).within(() => { + // cy.get('td').eq(4).should('have.text', sortedStudies[index].doi); + // }); + // }); + // }); + // }); + // it('should sort by doi asc', () => { + // cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); + // cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); + // cy.get('[data-testid="ArrowUpwardIcon"]').should('exist'); + + // cy.wait('@studysetFixture').then((studysetFixture) => { + // const studyset = studysetFixture.response?.body as StudysetReturn; + // const studies = [...(studyset.studies || [])] as StudyReturn[]; + + // const sortedStudies = studies.sort((a, b) => + // (a.doi as string).localeCompare(b.doi as string) + // ); + + // cy.get('tbody > tr').each((tr, index) => { + // cy.wrap(tr).within(() => { + // cy.get('td').eq(4).should('have.text', sortedStudies[index].doi); + // }); + // }); + // }); + // }); it('should sort by pmid desc', () => { cy.get('[data-testid="ArrowDownwardIcon"]').eq(5).click(); @@ -424,12 +424,10 @@ describe('ExtractionTable', () => { }) ); - console.log(sortedStudies); - cy.get('tbody > tr').each((tr, index) => { cy.wrap(tr).within(() => { cy.get('td') - .eq(5) + .eq(4) .should('have.text', sortedStudies[index].pmid ?? ''); }); }); @@ -437,8 +435,8 @@ describe('ExtractionTable', () => { }); it('should sort by pmid asc', () => { - cy.get('[data-testid="ArrowDownwardIcon"]').eq(5).click(); - cy.get('[data-testid="ArrowDownwardIcon"]').eq(5).click(); + cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); + cy.get('[data-testid="ArrowDownwardIcon"]').eq(4).click(); cy.get('[data-testid="ArrowUpwardIcon"]').should('exist'); cy.wait('@studysetFixture').then((studysetFixture) => { @@ -487,7 +485,7 @@ describe('ExtractionTable', () => { cy.get('tbody > tr').each((tr, index) => { cy.wrap(tr).within(() => { cy.get('td') - .eq(6) + .eq(5) .within(() => { const studyStatus = sortedStudies[index].status; const buttonIndex = @@ -545,7 +543,7 @@ describe('ExtractionTable', () => { cy.get('tbody > tr').each((tr, index) => { cy.wrap(tr).within(() => { cy.get('td') - .eq(6) + .eq(5) .within(() => { const studyStatus = sortedStudies[index].status; const buttonIndex = diff --git a/compose/neurosynth_compose/openapi b/compose/neurosynth_compose/openapi index ca2494f7..3e4cba60 160000 --- a/compose/neurosynth_compose/openapi +++ b/compose/neurosynth_compose/openapi @@ -1 +1 @@ -Subproject commit ca2494f73d0c88c013c7aab0b0de8f8a89b4bc11 +Subproject commit 3e4cba60f52a6c6bdd1ac5b55cb70d0ae3399aab