diff --git a/rdmo/core/assets/js/components/Modal.js b/rdmo/core/assets/js/components/Modal.js index 22c07abea..2ef42a543 100644 --- a/rdmo/core/assets/js/components/Modal.js +++ b/rdmo/core/assets/js/components/Modal.js @@ -8,9 +8,13 @@ const Modal = ({ title, show, modalProps, submitLabel, submitProps, onClose, onS

{title}

- - { children } - + { + children && ( + + { children } + + ) + } + + + + ) +} + +QuestionCopySet.propTypes = { + questionset: PropTypes.object.isRequired, + sets: PropTypes.array.isRequired, + currentSet: PropTypes.object.isRequired, + copySet: PropTypes.func.isRequired +} + +export default QuestionCopySet diff --git a/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSetRemoveSet.js b/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSetRemoveSet.js index a7364a890..06a0dcae6 100644 --- a/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSetRemoveSet.js +++ b/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSetRemoveSet.js @@ -6,12 +6,12 @@ import useModal from 'rdmo/core/assets/js/hooks/useModal' import QuestionSetDeleteModal from './QuestionSetDeleteModal' -const QuestionAddSet = ({ questionset, set, deleteSet }) => { +const QuestionRemoveSet = ({ questionset, currentSet, deleteSet }) => { const {show: showDeleteModal, open: openDeleteModal, close: closeDeleteModal} = useModal() const handleDeleteSet = () => { - deleteSet(set) + deleteSet(currentSet) closeDeleteModal() } @@ -31,10 +31,10 @@ const QuestionAddSet = ({ questionset, set, deleteSet }) => { ) } -QuestionAddSet.propTypes = { +QuestionRemoveSet.propTypes = { questionset: PropTypes.object.isRequired, - set: PropTypes.object.isRequired, + currentSet: PropTypes.object.isRequired, deleteSet: PropTypes.func.isRequired } -export default QuestionAddSet +export default QuestionRemoveSet diff --git a/rdmo/projects/assets/scss/interview.scss b/rdmo/projects/assets/scss/interview.scss index 20eb128e6..b26bd1037 100644 --- a/rdmo/projects/assets/scss/interview.scss +++ b/rdmo/projects/assets/scss/interview.scss @@ -100,22 +100,20 @@ .interview-block-options { position: absolute; - top: 0; - right: 0; + top: 6px; + right: 8px; z-index: 5; + display: flex; + gap: 4px; + + .btn-copy-set, .btn-remove-set { opacity: 0.8; line-height: 20px; font-size: 14px; - position: absolute; - z-index: 5; - top: 0; - right: 0; - - padding-left: 8px; - padding-right: 8px; + padding: 0; &:hover { opacity: 1;