Update modals (after rebase)

rdmorganiser · Dec 5, 2024 · f972fd5 · f972fd5
1 parent 97fca6b
commit f972fd5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/rdmo/projects/assets/js/interview/components/main/page/PageHeadDeleteModal.js b/rdmo/projects/assets/js/interview/components/main/page/PageHeadDeleteModal.js
@@ -5,7 +5,7 @@ import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const PageHeadDeleteModal = ({ title, show, onClose, onSubmit }) => {
   return (
-    <Modal title={title} show={show} submitText={gettext('Delete')} submitColor="danger"
+    <Modal title={title} show={show} submitLabel={gettext('Delete')} submitProps={{className: 'btn btn-danger'}}
            onClose={onClose} onSubmit={onSubmit}>
       <p>{gettext('You are about to permanently delete this tab.')}</p>
       <p>{gettext('This includes all given answers for this tab on all pages, not just this one.')}</p>

diff --git a/rdmo/projects/assets/js/interview/components/main/page/PageHeadFormModal.js b/rdmo/projects/assets/js/interview/components/main/page/PageHeadFormModal.js
@@ -12,8 +12,13 @@ const PageHeadFormModal = ({ title, show, initial, onClose, onSubmit }) => {
   const ref = useRef(null)
   const [inputValue, setInputValue] = useState('')
   const [hasError, setHasError] = useState(false)
-  const submitText = isEmpty(initial) ? gettext('Create') : gettext('Update')
-  const submitColor = isEmpty(initial) ? 'success' : 'primary'
+  const submitLabel = isEmpty(initial) ? gettext('Create') : gettext('Update')
+  const submitProps = {
+    className: classNames('btn', {
+      'btn-success': isEmpty(initial),
+      'btn-primary': !isEmpty(initial),
+    })
+  }
 
   const handleSubmit = () => {
     if (isEmpty(inputValue) && !isNil(initial)) {
@@ -41,7 +46,7 @@ const PageHeadFormModal = ({ title, show, initial, onClose, onSubmit }) => {
   useFocusEffect(ref, show)
 
   return (
-    <Modal title={title} show={show} submitText={submitText} submitColor={submitColor}
+    <Modal title={title} show={show} submitLabel={submitLabel} submitProps={submitProps}
            onClose={onClose} onSubmit={handleSubmit} disableSubmit={hasError}>
       {
         isNil(initial) ? (

diff --git a/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSetDeleteModal.js b/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSetDeleteModal.js
@@ -5,7 +5,7 @@ import Modal from 'rdmo/core/assets/js/components/Modal'
 
 const QuestionSetDeleteModal = ({ title, show, onClose, onSubmit }) => {
   return (
-    <Modal title={title} show={show} submitText={gettext('Delete')} submitColor="danger"
+    <Modal title={title} show={show} submitLabel={gettext('Delete')} submitProps={{className: 'btn btn-danger'}}
            onClose={onClose} onSubmit={onSubmit}>
       <p>{gettext('You are about to permanently delete this block.')}</p>
       <p className="text-danger">{gettext('This action cannot be undone!')}</p>