diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index dd80d7df..b9753a7e 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -16,7 +16,7 @@ jobs: uses: cypress-io/github-action@v5 with: working-directory: system-tests - browser: chrome + browser: electron headed: false start: docker compose up --build -d wait-on: 'http://local.rosalution.cgds' diff --git a/frontend/src/components/AnalysisView/DiscussionSection.vue b/frontend/src/components/AnalysisView/DiscussionSection.vue new file mode 100644 index 00000000..9c665103 --- /dev/null +++ b/frontend/src/components/AnalysisView/DiscussionSection.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/frontend/src/models/analyses.js b/frontend/src/models/analyses.js index 35fbf578..b44801c0 100644 --- a/frontend/src/models/analyses.js +++ b/frontend/src/models/analyses.js @@ -22,6 +22,21 @@ export default { const baseUrl = '/rosalution/api/'; const urlQuery = 'analysis/' + analysisName; const body = await Requests.get(baseUrl + urlQuery); + + body['discussions'] = [{ + 'postId': '', + 'client_id': '', + 'datetimestamp': '', + 'content': [], + 'attachments': [], + 'replies': [{ + 'client_id': '', + 'datetimestamp': '', + 'content': '', + 'attachments': [], + }], + }]; + return body; }, diff --git a/frontend/src/styles/main.css b/frontend/src/styles/main.css index 70efc827..3c582f0e 100644 --- a/frontend/src/styles/main.css +++ b/frontend/src/styles/main.css @@ -51,6 +51,7 @@ html { --p-8: 0.5rem; --p-10: 0.625rem; --p-16: 1rem; + --p-28: 1.75rem; scroll-padding-top: 4rem; diff --git a/frontend/src/styles/rosalution.css b/frontend/src/styles/rosalution.css index 3d1de02a..6da55da3 100644 --- a/frontend/src/styles/rosalution.css +++ b/frontend/src/styles/rosalution.css @@ -15,8 +15,10 @@ html { font-family: "Proxima Nova", sans-serif; font-weight: 700; font-size: 1.125rem; - height: 1.75rem; - width: 7rem; + padding-top: var(--p-10); + padding-bottom: var(--p-10); + padding-left: var(--p-28); + padding-right: var(--p-28); border: none; border-radius: var(--content-border-radius); cursor: pointer; @@ -27,8 +29,10 @@ html { color: var(--rosalution-purple-300); font-weight: 700; font-size: 1.125rem; - height: 1.75rem; - width: 7rem; + padding-top: var(--p-10); + padding-bottom: var(--p-10); + padding-left: var(--p-28); + padding-right: var(--p-28); border: none; border-radius: var(--button-border-radius); cursor: pointer; @@ -49,8 +53,10 @@ html { font-family: "Proxima Nova", sans-serif; font-weight: 700; font-size: 1.125rem; - height: 1.75rem; - width: 7rem; + padding-top: var(--p-10); + padding-bottom: var(--p-10); + padding-left: var(--p-28); + padding-right: var(--p-28); border-color: var(--rosalution-black); border-radius: var(--button-border-radius); border-style: solid; @@ -107,7 +113,7 @@ html { .rosalution-section-header { display: flex; - align-items: flex-end; + align-items: center; } .rosalution-header-right-icons { diff --git a/frontend/src/views/AnalysisView.vue b/frontend/src/views/AnalysisView.vue index 71224e27..f2c3a93c 100644 --- a/frontend/src/views/AnalysisView.vue +++ b/frontend/src/views/AnalysisView.vue @@ -37,6 +37,9 @@ @update-image="this.updateSectionImage" @update:content-row="this.onAnalysisContentUpdated" /> + { return section.header; }); + sections.push('Discussion'); sections.push('Supporting Evidence'); return sections; }, diff --git a/frontend/test/components/AnalysisView/DiscussionSection.spec.js b/frontend/test/components/AnalysisView/DiscussionSection.spec.js new file mode 100644 index 00000000..5f40a389 --- /dev/null +++ b/frontend/test/components/AnalysisView/DiscussionSection.spec.js @@ -0,0 +1,23 @@ +import {it, expect, describe, beforeEach} from 'vitest'; +import {shallowMount} from '@vue/test-utils'; + +import DiscussionSection from '../../../src/components/AnalysisView/DiscussionSection.vue'; +import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'; + +describe('DiscussionSection.vue', () => { + let wrapper; + + beforeEach(() => { + wrapper = shallowMount(DiscussionSection, { + global: { + components: { + 'font-awesome-icon': FontAwesomeIcon, + }, + }, + }); + }); + + it('Vue instance exists and it is an object', () => { + expect(typeof wrapper).toBe('object'); + }); +}); diff --git a/frontend/test/views/AnalysisView.spec.js b/frontend/test/views/AnalysisView.spec.js index 03a8efa0..f62e5fbc 100644 --- a/frontend/test/views/AnalysisView.spec.js +++ b/frontend/test/views/AnalysisView.spec.js @@ -143,7 +143,7 @@ describe('AnalysisView', () => { it('provides the expected headings of sections to be used as anchors', () => { const headerComponent = wrapper.get('[data-test="analysis-view-header"]'); expect(headerComponent.attributes('sectionanchors')).to.equal( - 'Brief,Medical Summary,Pedigree,Case Information,Supporting Evidence', + 'Brief,Medical Summary,Pedigree,Case Information,Discussion,Supporting Evidence', ); }); diff --git a/paper.md b/paper.md index 9de84a52..7c00bc71 100644 --- a/paper.md +++ b/paper.md @@ -47,15 +47,15 @@ authors: affiliation: "1,2,3" affiliations: - - name: Center for Computational Genomics and Data Sciences, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, AL + - name: Center for Computational Genomics and Data Sciences, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, Alabama, United States of America index: 1 - - name: Department of Genetics, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, AL + - name: Department of Genetics, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, Alabama, United States of America index: 2 - - name: Department of Pediatrics, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, AL + - name: Department of Pediatrics, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, Alabama, United States of America index: 3 - - name: Hugh Kaul Precision Medicine Institute, Heersink School of Medicine, The University of Alabama at Birmingham + - name: Hugh Kaul Precision Medicine Institute, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, Alabama, United States of America index: 4 - - name: Department of Cell, Developmental and Integrative Biology, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, AL + - name: Department of Cell, Developmental and Integrative Biology, Heersink School of Medicine, The University of Alabama at Birmingham, Birmingham, Alabama, United States of America index: 5 diff --git a/system-tests/e2e/rosalution_analysis.cy.js b/system-tests/e2e/rosalution_analysis.cy.js index 0644ef80..ede7289d 100644 --- a/system-tests/e2e/rosalution_analysis.cy.js +++ b/system-tests/e2e/rosalution_analysis.cy.js @@ -8,11 +8,11 @@ describe('As a Clinical Analyst using Rosalution for analysis', () => { .find('.case-name').click(); }); - it.skip('should allow the user to navigate the analysis via the logo, header, and section anchor links', () => { + it('should allow the user to navigate the analysis via the logo, header, and section anchor links', () => { const anchorLinks = [ 'Brief', 'Clinical History', 'Pedigree', 'Supporting Evidence', 'VMA21_Gene%20To%20Phenotype', - 'VMA21_Molecular%20Mechanism', 'VMA21_Function', 'Model_Goals', + 'VMA21_Molecular%20Mechanism', 'VMA21_Function', 'Model_Goals', 'Discussion' ]; const expectedHeaderLinks = ['CPAM0002', 'LOGIN', ...anchorLinks];