-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feat/vadc_sprint21' into bugfix/comboBoxLabels
- Loading branch information
Showing
19 changed files
with
470 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...ysis/GWASApp/Components/AttritionTableWrapper/AttritionTableModal/AttritionTableModal.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| .attrition-table-modal .ant-modal-content { | ||
| width: 650px; | ||
| min-height: 480px; | ||
| } | ||
|
|
||
| .attrition-table-modal .ant-modal-body { | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| .attrition-table-modal h3 { | ||
| color: #2e77b8; | ||
| font-size: 14px; | ||
| } | ||
|
|
||
| .attrition-table-modal h4, | ||
| .attrition-table-modal .histrogram-loading, | ||
| .attrition-table-modal .euler-loading { | ||
| text-align: center; | ||
| } |
68 changes: 68 additions & 0 deletions
68
...ysis/GWASApp/Components/AttritionTableWrapper/AttritionTableModal/AttritionTableModal.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { Modal } from 'antd'; | ||
| import './AttritionTableModal.css'; | ||
| import PhenotypeHistogram from '../../Diagrams/PhenotypeHistogram/PhenotypeHistogram'; | ||
| import CohortsOverlapDiagram from '../../Diagrams/CohortsOverlapDiagram/CohortsOverlapDiagram'; | ||
|
|
||
| const AttritionTableModal = ({ modalInfo, setModalInfo }) => { | ||
| const modalWidth = 650; | ||
| const rowIsOutcome = modalInfo.rowType === 'Outcome'; | ||
|
|
||
| return ( | ||
| <Modal | ||
| title={<h3>{modalInfo.title}</h3>} | ||
| open={modalInfo.isModalOpen} | ||
| onOk={() => setModalInfo({ ...modalInfo, isModalOpen: false })} | ||
| onCancel={() => setModalInfo({ ...modalInfo, isModalOpen: false })} | ||
| footer={null} | ||
| width={modalWidth} | ||
| className='attrition-table-modal' | ||
| > | ||
| {modalInfo?.rowObject | ||
| && modalInfo.rowObject.variable_type === 'concept' && ( | ||
| <div data-testid='phenotype-histogram-diagram'> | ||
| <PhenotypeHistogram | ||
| useInlineErrorMessages | ||
| selectedStudyPopulationCohort={modalInfo.selectedCohort} | ||
| selectedCovariates={ | ||
| modalInfo.currentCovariateAndCovariatesFromPrecedingRows | ||
| } | ||
| outcome={modalInfo.outcome} | ||
| selectedContinuousItem={modalInfo.rowObject} | ||
| useAnimation={false} | ||
| /> | ||
| </div> | ||
| )} | ||
| {modalInfo?.rowObject | ||
| && modalInfo.rowObject.variable_type === 'custom_dichotomous' && ( | ||
| <div data-testid='euler-diagram'> | ||
| <CohortsOverlapDiagram | ||
| useInlineErrorMessages | ||
| selectedStudyPopulationCohort={modalInfo.selectedCohort} | ||
| selectedCaseCohort={{ | ||
| cohort_name: modalInfo?.rowObject?.cohort_names[0], | ||
| size: modalInfo?.rowObject?.cohort_sizes[0], | ||
| cohort_definition_id: modalInfo?.rowObject?.cohort_ids[0], | ||
| }} | ||
| selectedControlCohort={{ | ||
| cohort_name: modalInfo?.rowObject?.cohort_names[1], | ||
| size: modalInfo?.rowObject?.cohort_sizes[1], | ||
| cohort_definition_id: modalInfo?.rowObject?.cohort_ids[1], | ||
| }} | ||
| selectedCovariates={rowIsOutcome ? [] : modalInfo.currentCovariateAndCovariatesFromPrecedingRows} | ||
| outcome={rowIsOutcome ? null : modalInfo.outcome} | ||
| diagramId='modal-euler' | ||
| /> | ||
| </div> | ||
| )} | ||
| </Modal> | ||
| ); | ||
| }; | ||
|
|
||
| AttritionTableModal.propTypes = { | ||
| modalInfo: PropTypes.object.isRequired, | ||
| setModalInfo: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| export default AttritionTableModal; |
103 changes: 103 additions & 0 deletions
103
...GWASApp/Components/AttritionTableWrapper/AttritionTableModal/AttritionTableModal.test.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| import React from 'react'; | ||
| import { render, screen } from '@testing-library/react'; | ||
| import '@testing-library/jest-dom/extend-expect'; | ||
| import { QueryClient, QueryClientProvider } from 'react-query'; | ||
| import AttritionTableModal from './AttritionTableModal'; | ||
| import { SourceContextProvider } from '../../../Utils/Source'; | ||
| import { | ||
| fetchSimpleOverlapInfo, | ||
| useSourceFetch, | ||
| } from '../../../Utils/cohortMiddlewareApi'; | ||
|
|
||
| // Mock the PhenotypeHistogram component | ||
| jest.mock( | ||
| '../../Diagrams/PhenotypeHistogram/PhenotypeHistogram', | ||
| () => () => null, | ||
| ); | ||
| jest.mock('../../../Utils/cohortMiddlewareApi'); | ||
| fetchSimpleOverlapInfo.mockResolvedValue({ | ||
| cohort_overlap: { | ||
| case_control_overlap: 123, | ||
| }, | ||
| }); | ||
| useSourceFetch.mockResolvedValue({ | ||
| sourceId: 2, | ||
| loading: false, | ||
| }); | ||
| console.error = jest.fn(); | ||
|
|
||
| describe('AttritionTableModal', () => { | ||
| const mockSetModalInfo = jest.fn(); | ||
| const defaultProps = { | ||
| modalInfo: { | ||
| isModalOpen: true, | ||
| title: 'Test Modal', | ||
| rowObject: { | ||
| variable_type: 'concept', | ||
| }, | ||
| selectedCohort: {}, | ||
| currentCovariateAndCovariatesFromPrecedingRows: [], | ||
| outcome: {}, | ||
| }, | ||
| setModalInfo: mockSetModalInfo, | ||
| }; | ||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| it('renders modal with title and histogram content', () => { | ||
| render(<AttritionTableModal {...defaultProps} />); | ||
| expect(screen.getByText('Test Modal')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('phenotype-histogram-diagram'), | ||
| ).toBeInTheDocument(); | ||
| expect(screen.queryByTestId('euler-diagram')).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('displays Euler Diagram when variable_type is custom_dichotomous', () => { | ||
| const mockedQueryClient = new QueryClient({ | ||
| defaultOptions: { | ||
| queries: { retry: false }, | ||
| }, | ||
| }); | ||
| const customProps = { | ||
| ...defaultProps, | ||
| modalInfo: { | ||
| ...defaultProps.modalInfo, | ||
| rowObject: { | ||
| variable_type: 'custom_dichotomous', | ||
| cohort_names: [1], | ||
| cohort_ids: [2], | ||
| cohort_sizes: [3], | ||
| }, | ||
| }, | ||
| }; | ||
| render( | ||
| <QueryClientProvider client={mockedQueryClient}> | ||
| <SourceContextProvider> | ||
| <AttritionTableModal {...customProps} /> | ||
| </SourceContextProvider> | ||
| </QueryClientProvider>, | ||
| ); | ||
| expect(screen.queryByTestId('euler-diagram')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('phenotype-histogram-diagram'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('does not render content if rowObject is not provided', () => { | ||
| const noRowObjectProps = { | ||
| ...defaultProps, | ||
| modalInfo: { | ||
| ...defaultProps.modalInfo, | ||
| rowObject: null, | ||
| }, | ||
| }; | ||
| render(<AttritionTableModal {...noRowObjectProps} />); | ||
| expect(screen.getByText('Test Modal')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('phenotype-histogram-diagram'), | ||
| ).not.toBeInTheDocument(); | ||
| expect(screen.queryByTestId('euler-diagram')).not.toBeInTheDocument(); | ||
| }); | ||
| }); |
Oops, something went wrong.