-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'task/digital-rocks' into bug/WC-17--drp-project-search-…
…case
- Loading branch information
Showing
81 changed files
with
3,215 additions
and
440 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
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
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
44 changes: 44 additions & 0 deletions
44
client/src/components/DataFiles/DataFilesModals/DataFilesProjectCitationModal.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,44 @@ | ||
| import React, { useCallback } from 'react'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { Modal, ModalHeader, ModalBody } from 'reactstrap'; | ||
| import styles from './DataFilesProjectCitationModal.module.scss'; | ||
| import { Citations } from '_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ReviewAuthors'; | ||
|
|
||
| const DataFilesProjectCitationModal = () => { | ||
| const dispatch = useDispatch(); | ||
|
|
||
| const isOpen = useSelector((state) => state.files.modals.projectCitation); | ||
| const props = useSelector((state) => state.files.modalProps.projectCitation); | ||
|
|
||
| const toggle = useCallback(() => { | ||
| dispatch({ | ||
| type: 'DATA_FILES_TOGGLE_MODAL', | ||
| payload: { operation: 'projectCitation', props: {} }, | ||
| }); | ||
| }, []); | ||
|
|
||
| return ( | ||
| <> | ||
| {props?.project && ( | ||
| <Modal | ||
| size="lg" | ||
| isOpen={isOpen} | ||
| toggle={toggle} | ||
| className={styles['modal-dialog']} | ||
| > | ||
| <ModalHeader toggle={toggle} charCode=""> | ||
| Citations | ||
| </ModalHeader> | ||
| <ModalBody className={styles['modal-body']}> | ||
| <Citations | ||
| project={props.project} | ||
| authors={props.project.authors} | ||
| /> | ||
| </ModalBody> | ||
| </Modal> | ||
| )} | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default DataFilesProjectCitationModal; |
Empty file.
40 changes: 40 additions & 0 deletions
40
client/src/components/DataFiles/DataFilesModals/DataFilesProjectDescriptionModal.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,40 @@ | ||
| import React, { useCallback } from 'react'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { Modal, ModalHeader, ModalBody } from 'reactstrap'; | ||
| import styles from './DataFilesProjectDescriptionModal.module.scss'; | ||
|
|
||
| const DataFilesProjectDescriptionModal = () => { | ||
| const dispatch = useDispatch(); | ||
|
|
||
| const isOpen = useSelector((state) => state.files.modals.projectDescription); | ||
| const props = useSelector( | ||
| (state) => state.files.modalProps.projectDescription | ||
| ); | ||
|
|
||
| const toggle = useCallback(() => { | ||
| dispatch({ | ||
| type: 'DATA_FILES_TOGGLE_MODAL', | ||
| payload: { operation: 'projectDescription', props: {} }, | ||
| }); | ||
| }, []); | ||
|
|
||
| return ( | ||
| <> | ||
| <Modal | ||
| size="lg" | ||
| isOpen={isOpen} | ||
| toggle={toggle} | ||
| className={styles['modal-dialog']} | ||
| > | ||
| <ModalHeader toggle={toggle} charCode=""> | ||
| {props?.title} | ||
| </ModalHeader> | ||
| <ModalBody className={styles['modal-body']}> | ||
| <p>{props?.description}</p> | ||
| </ModalBody> | ||
| </Modal> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default DataFilesProjectDescriptionModal; |
Empty file.
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
45 changes: 45 additions & 0 deletions
45
client/src/components/DataFiles/DataFilesModals/DataFilesProjectTreeModal.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,45 @@ | ||
| import React, { useCallback } from 'react'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { Modal, ModalHeader, ModalBody } from 'reactstrap'; | ||
| import styles from './DataFilesProjectTreeModal.module.scss'; | ||
| import { ProjectTreeView } from '_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ProjectTreeView'; | ||
|
|
||
| const DataFilesProjectTreeModal = () => { | ||
| const { projectId } = useSelector((state) => state.projects.metadata); | ||
|
|
||
| const isOpen = useSelector((state) => state.files.modals.projectTree); | ||
| const props = useSelector((state) => state.files.modalProps['projectTree']); | ||
|
|
||
| const toggle = useCallback(() => { | ||
| dispatch({ | ||
| type: 'DATA_FILES_TOGGLE_MODAL', | ||
| payload: { operation: 'projectTree', props: {} }, | ||
| }); | ||
| }, []); | ||
|
|
||
| const dispatch = useDispatch(); | ||
|
|
||
| return ( | ||
| <> | ||
| <Modal | ||
| size="lg" | ||
| isOpen={isOpen} | ||
| toggle={toggle} | ||
| className={styles['modal-dialog']} | ||
| > | ||
| <ModalHeader toggle={toggle} charCode=""> | ||
| Project Tree | ||
| </ModalHeader> | ||
| <ModalBody className={styles['modal-body']}> | ||
| {' '} | ||
| <ProjectTreeView | ||
| projectId={projectId} | ||
| readOnly={props?.readOnly ?? true} | ||
| /> | ||
| </ModalBody> | ||
| </Modal> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default DataFilesProjectTreeModal; |
4 changes: 4 additions & 0 deletions
4
client/src/components/DataFiles/DataFilesModals/DataFilesProjectTreeModal.module.scss
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,4 @@ | ||
| .modal-body { | ||
| overflow: auto; | ||
| max-height: 80vh; | ||
| } |
Oops, something went wrong.