From 898f5e6ec1ca8df20fd502dc32eaadf5bc1c448e Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 27 Sep 2024 16:24:44 +0200
Subject: [PATCH 1/8] Add PROJECT_CONTACT settings and the corresponding API,
 actions and components

---
 rdmo/core/assets/js/api/BaseApi.js            |  6 +-
 rdmo/core/assets/scss/base.scss               |  1 +
 rdmo/core/assets/scss/forms.scss              |  3 +
 rdmo/core/settings.py                         |  9 +-
 rdmo/core/utils.py                            |  4 +
 .../js/interview/actions/actionTypes.js       | 10 +++
 .../js/interview/actions/contactActions.js    | 84 +++++++++++++++++++
 .../assets/js/interview/api/ContactApi.js     | 17 ++++
 .../js/interview/components/main/Contact.js   | 82 ++++++++++++++++++
 .../js/interview/components/main/page/Page.js |  8 +-
 .../components/main/question/Question.js      | 10 ++-
 .../main/question/QuestionContact.js          | 24 ++++++
 .../main/questionset/QuestionSet.js           | 12 ++-
 .../assets/js/interview/containers/Main.js    | 22 ++++-
 .../js/interview/reducers/contactReducer.js   | 33 ++++++++
 .../js/interview/store/configureStore.js      |  2 +
 rdmo/projects/assets/scss/interview.scss      | 23 +++++
 .../email/project_contact_message.txt         | 34 ++++++++
 .../email/project_contact_subject.txt         |  3 +
 .../projects/email/project_invite_subject.txt |  2 +-
 .../project_interview_contact_help.html       |  8 ++
 rdmo/projects/utils.py                        | 63 ++++++++++++++
 rdmo/projects/viewsets.py                     | 26 ++++++
 rdmo/questions/models/catalog.py              | 18 ++++
 testing/config/settings/base.py               |  3 +
 25 files changed, 492 insertions(+), 15 deletions(-)
 create mode 100644 rdmo/core/assets/scss/forms.scss
 create mode 100644 rdmo/projects/assets/js/interview/actions/contactActions.js
 create mode 100644 rdmo/projects/assets/js/interview/api/ContactApi.js
 create mode 100644 rdmo/projects/assets/js/interview/components/main/Contact.js
 create mode 100644 rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
 create mode 100644 rdmo/projects/assets/js/interview/reducers/contactReducer.js
 create mode 100644 rdmo/projects/templates/projects/email/project_contact_message.txt
 create mode 100644 rdmo/projects/templates/projects/email/project_contact_subject.txt
 create mode 100644 rdmo/projects/templates/projects/project_interview_contact_help.html

diff --git a/rdmo/core/assets/js/api/BaseApi.js b/rdmo/core/assets/js/api/BaseApi.js
index 7db8e00011..c7d6d76510 100644
--- a/rdmo/core/assets/js/api/BaseApi.js
+++ b/rdmo/core/assets/js/api/BaseApi.js
@@ -50,7 +50,11 @@ class BaseApi {
       throw new ApiError(error.message)
     }).then(response => {
       if (response.ok) {
-        return response.json()
+        if (response.status == 204) {
+          return null
+        } else {
+          return response.json()
+        }
       } else if (response.status == 400) {
         return response.json().then(errors => {
           throw new ValidationError(errors)
diff --git a/rdmo/core/assets/scss/base.scss b/rdmo/core/assets/scss/base.scss
index dadff686a5..66febc9427 100644
--- a/rdmo/core/assets/scss/base.scss
+++ b/rdmo/core/assets/scss/base.scss
@@ -10,6 +10,7 @@ $icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/";
 @import 'codemirror';
 @import 'fonts';
 @import 'footer';
+@import 'forms';
 @import 'header';
 @import 'swagger';
 @import 'utils';
diff --git a/rdmo/core/assets/scss/forms.scss b/rdmo/core/assets/scss/forms.scss
new file mode 100644
index 0000000000..3149abb28f
--- /dev/null
+++ b/rdmo/core/assets/scss/forms.scss
@@ -0,0 +1,3 @@
+textarea {
+    resize: vertical;
+}
diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py
index c6610be4de..63d3b17459 100644
--- a/rdmo/core/settings.py
+++ b/rdmo/core/settings.py
@@ -220,13 +220,15 @@
     'MULTISITE',
     'GROUPS',
     'EXPORT_FORMATS',
-    'PROJECT_TABLE_PAGE_SIZE'
+    'PROJECT_TABLE_PAGE_SIZE',
+    'PROJECT_CONTACT'
 ]
 
 TEMPLATES_API = [
     'projects/project_interview_add_set_help.html',
     'projects/project_interview_add_value_help.html',
     'projects/project_interview_buttons_help.html',
+    'projects/project_interview_contact_help.html',
     'projects/project_interview_done.html',
     'projects/project_interview_error.html',
     'projects/project_interview_multiple_values_warning.html',
@@ -236,7 +238,7 @@
     'projects/project_interview_page_tabs_help.html',
     'projects/project_interview_progress_help.html',
     'projects/project_interview_question_help.html',
-    'projects/project_interview_questionset_help.html',
+    'projects/project_interview_questionset_help.html'
 ]
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
@@ -305,6 +307,9 @@
 
 PROJECT_VIEWS = True
 
+PROJECT_CONTACT = False
+PROJECT_CONTACT_RECIPIENTS = []
+
 PROJECT_EXPORTS = [
     ('xml', _('RDMO XML'), 'rdmo.projects.exports.RDMOXMLExport'),
     ('csvcomma', _('CSV (comma separated)'), 'rdmo.projects.exports.CSVCommaExport'),
diff --git a/rdmo/core/utils.py b/rdmo/core/utils.py
index 791917b375..0813b05c74 100644
--- a/rdmo/core/utils.py
+++ b/rdmo/core/utils.py
@@ -418,3 +418,7 @@ def save_metadata(metadata):
     f = open(tmp_metadata_file)
     log.info('Save metadata file %s %s', tmp_metadata_file, str(metadata))
     return tmp_metadata_file
+
+
+def remove_double_newlines(string):
+    return re.sub(r'[\n]{2,}', '\n\n', string)
diff --git a/rdmo/projects/assets/js/interview/actions/actionTypes.js b/rdmo/projects/assets/js/interview/actions/actionTypes.js
index b42995cdbf..4972df8501 100644
--- a/rdmo/projects/assets/js/interview/actions/actionTypes.js
+++ b/rdmo/projects/assets/js/interview/actions/actionTypes.js
@@ -54,3 +54,13 @@ export const DELETE_SET_ERROR = 'DELETE_SET_ERROR'
 export const COPY_SET_INIT = 'COPY_SET_INIT'
 export const COPY_SET_SUCCESS = 'COPY_SET_SUCCESS'
 export const COPY_SET_ERROR = 'COPY_SET_ERROR'
+
+export const FETCH_CONTACT_INIT = 'FETCH_CONTACT_INIT'
+export const FETCH_CONTACT_SUCCESS = 'FETCH_CONTACT_SUCCESS'
+export const FETCH_CONTACT_ERROR = 'FETCH_CONTACT_ERROR'
+
+export const SEND_CONTACT_INIT = 'SEND_CONTACT_INIT'
+export const SEND_CONTACT_SUCCESS = 'SEND_CONTACT_SUCCESS'
+export const SEND_CONTACT_ERROR = 'SEND_CONTACT_ERROR'
+
+export const CLOSE_CONTACT = 'CLOSE_CONTACT'
diff --git a/rdmo/projects/assets/js/interview/actions/contactActions.js b/rdmo/projects/assets/js/interview/actions/contactActions.js
new file mode 100644
index 0000000000..472afd6bca
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/actions/contactActions.js
@@ -0,0 +1,84 @@
+import ContactApi from '../api/ContactApi'
+
+import { projectId } from '../utils/meta'
+
+import {
+  FETCH_CONTACT_INIT,
+  FETCH_CONTACT_SUCCESS,
+  FETCH_CONTACT_ERROR,
+  SEND_CONTACT_INIT,
+  SEND_CONTACT_SUCCESS,
+  SEND_CONTACT_ERROR,
+  CLOSE_CONTACT
+} from './actionTypes'
+
+import { addToPending, removeFromPending } from 'rdmo/core/assets/js/actions/pendingActions'
+
+export function fetchContact({ questionset, question, values }) {
+  const pendingId = 'fetchContact'
+
+  return (dispatch, getState) => {
+    const params = {
+      page: getState().interview.page.id,
+      questionset: questionset && questionset.id,
+      question: question && question.id,
+      values: values.filter(value => value.id).map(value => value.id)
+    }
+
+    dispatch(addToPending(pendingId))
+    dispatch(fetchContactInit())
+
+    return ContactApi.fetchContact(projectId, params).then((values) => {
+      dispatch(removeFromPending(pendingId))
+      dispatch(fetchContactSuccess(values))
+    }).catch((error) => {
+      dispatch(removeFromPending(pendingId))
+      dispatch(fetchContactError(error))
+    })
+  }
+}
+
+export function fetchContactInit() {
+  return {type: FETCH_CONTACT_INIT}
+}
+
+export function fetchContactSuccess(values) {
+  return {type: FETCH_CONTACT_SUCCESS, values}
+}
+
+export function fetchContactError(error) {
+  return {type: FETCH_CONTACT_ERROR, error}
+}
+
+export function sendContact(values) {
+  const pendingId = 'sendContact'
+
+  return (dispatch) => {
+    dispatch(addToPending(pendingId))
+    dispatch(sendContactInit())
+
+    return ContactApi.sendContact(projectId, values).then(() => {
+      dispatch(removeFromPending(pendingId))
+      dispatch(sendContactSuccess())
+    }).catch((error) => {
+      dispatch(removeFromPending(pendingId))
+      dispatch(sendContactError(error))
+    })
+  }
+}
+
+export function sendContactInit() {
+  return {type: SEND_CONTACT_INIT}
+}
+
+export function sendContactSuccess() {
+  return {type: SEND_CONTACT_SUCCESS}
+}
+
+export function sendContactError(error) {
+  return {type: SEND_CONTACT_ERROR, error}
+}
+
+export function closeContact() {
+  return {type: CLOSE_CONTACT}
+}
diff --git a/rdmo/projects/assets/js/interview/api/ContactApi.js b/rdmo/projects/assets/js/interview/api/ContactApi.js
new file mode 100644
index 0000000000..012996a0e3
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/api/ContactApi.js
@@ -0,0 +1,17 @@
+import { encodeParams } from 'rdmo/core/assets/js/utils/api'
+
+import BaseApi from 'rdmo/core/assets/js/api/BaseApi'
+
+class ContactApi extends BaseApi {
+
+  static fetchContact(projectId, params) {
+    return this.get(`/api/v1/projects/projects/${projectId}/contact/?${encodeParams(params)}`)
+  }
+
+  static sendContact(projectId, data) {
+    return this.post(`/api/v1/projects/projects/${projectId}/contact/`, data)
+  }
+
+}
+
+export default ContactApi
diff --git a/rdmo/projects/assets/js/interview/components/main/Contact.js b/rdmo/projects/assets/js/interview/components/main/Contact.js
new file mode 100644
index 0000000000..84d88109d1
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/components/main/Contact.js
@@ -0,0 +1,82 @@
+import React, { useState, useEffect } from 'react'
+import PropTypes from 'prop-types'
+
+import Modal from 'rdmo/core/assets/js/components/Modal'
+
+import Html from 'rdmo/core/assets/js/components/Html'
+
+const Contact = ({ templates, contact, sendContact, closeContact }) => {
+  const { showModal, values: initialValues, errors } = contact
+
+  const [values, setValues] = useState({})
+
+  useEffect(() => setValues(initialValues), [initialValues])
+
+  const onSubmit = (event) => {
+    event.preventDefault()
+    sendContact(values)
+  }
+
+  const onClose = () => closeContact()
+
+  return (
+    <>
+      <Modal
+        show={showModal}
+        title={gettext('Contact support')}
+        submitLabel={gettext('Send message')}
+        onSubmit={onSubmit}
+        onClose={onClose}
+        modalProps={{
+          bsSize: 'lg'
+        }}>
+          <Html html={templates.project_interview_contact_help} />
+          <form onSubmit={onSubmit}>
+            <div className="form-group">
+              <label htmlFor="interview-question-contact-subject">Subject</label>
+              <input
+                type="text"
+                id="interview-question-contact-subject"
+                className="form-control"
+                value={values.subject || ''}
+                onChange={event => setValues({ ...values, subject: event.target.value })}
+              />
+              <ul className="help-block list-unstyled">
+                {
+                  errors && errors.subject && errors.subject.map((error, errorIndex) => (
+                    <li key={errorIndex} className="text-danger">{errors.subject}</li>
+                  ))
+                }
+              </ul>
+            </div>
+            <div className="form-group">
+              <label htmlFor="interview-question-contact-message">Message</label>
+              <textarea
+                rows="12"
+                id="interview-question-contact-message"
+                className="form-control"
+                value={values.message || ''}
+                onChange={event => setValues({...values, message: event.target.value })}
+              />
+              <ul className="help-block list-unstyled">
+                {
+                  errors && errors.message && errors.message.map((error, errorIndex) => (
+                    <li key={errorIndex} className="text-danger">{errors.message}</li>
+                  ))
+                }
+              </ul>
+            </div>
+          </form>
+      </Modal>
+    </>
+  )
+}
+
+Contact.propTypes = {
+  templates: PropTypes.object.isRequired,
+  contact: PropTypes.object.isRequired,
+  sendContact: PropTypes.func.isRequired,
+  closeContact: PropTypes.func.isRequired
+}
+
+export default Contact
diff --git a/rdmo/projects/assets/js/interview/components/main/page/Page.js b/rdmo/projects/assets/js/interview/components/main/page/Page.js
index b99953367f..79a3e59998 100644
--- a/rdmo/projects/assets/js/interview/components/main/page/Page.js
+++ b/rdmo/projects/assets/js/interview/components/main/page/Page.js
@@ -11,7 +11,7 @@ import QuestionSet from '../questionset/QuestionSet'
 import PageButtons from './PageButtons'
 import PageHead from './PageHead'
 
-const Page = ({ config, templates, overview, page, sets, values, fetchPage,
+const Page = ({ config, settings, templates, overview, page, sets, values, fetchPage, fetchContact,
                 createValue, updateValue, deleteValue, copyValue,
                 activateSet, createSet, updateSet, deleteSet, copySet }) => {
 
@@ -51,6 +51,7 @@ const Page = ({ config, templates, overview, page, sets, values, fetchPage,
                 return (
                   <QuestionSet
                     key={elementIndex}
+                    settings={settings}
                     templates={templates}
                     questionset={element}
                     sets={sets}
@@ -66,12 +67,14 @@ const Page = ({ config, templates, overview, page, sets, values, fetchPage,
                     updateValue={updateValue}
                     deleteValue={deleteValue}
                     copyValue={copyValue}
+                    fetchContact={fetchContact}
                   />
                 )
               } else {
                 return (
                   <Question
                     key={elementIndex}
+                    settings={settings}
                     templates={templates}
                     question={element}
                     sets={sets.filter((set) => (
@@ -94,6 +97,7 @@ const Page = ({ config, templates, overview, page, sets, values, fetchPage,
                     updateValue={updateValue}
                     deleteValue={deleteValue}
                     copyValue={copyValue}
+                    fetchContact={fetchContact}
                   />
                 )
               }
@@ -109,12 +113,14 @@ const Page = ({ config, templates, overview, page, sets, values, fetchPage,
 
 Page.propTypes = {
   config: PropTypes.object.isRequired,
+  settings: PropTypes.object.isRequired,
   templates: PropTypes.object.isRequired,
   overview: PropTypes.object.isRequired,
   page: PropTypes.object.isRequired,
   sets: PropTypes.array.isRequired,
   values: PropTypes.array.isRequired,
   fetchPage: PropTypes.func.isRequired,
+  fetchContact: PropTypes.func.isRequired,
   createValue: PropTypes.func.isRequired,
   updateValue: PropTypes.func.isRequired,
   deleteValue: PropTypes.func.isRequired,
diff --git a/rdmo/projects/assets/js/interview/components/main/question/Question.js b/rdmo/projects/assets/js/interview/components/main/question/Question.js
index a74e89ba96..de0472a1c0 100644
--- a/rdmo/projects/assets/js/interview/components/main/question/Question.js
+++ b/rdmo/projects/assets/js/interview/components/main/question/Question.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types'
 import { checkQuestion } from '../../../utils/page'
 
 import QuestionAddValueHelp from './QuestionAddValueHelp'
+import QuestionContact from './QuestionContact'
 import QuestionHelp from './QuestionHelp'
 import QuestionHelpTemplate from './QuestionHelpTemplate'
 import QuestionManagement from './QuestionManagement'
@@ -12,10 +13,11 @@ import QuestionText from './QuestionText'
 import QuestionWarning from './QuestionWarning'
 import QuestionWidget from './QuestionWidget'
 
-const Question = ({ templates, question, sets, values, siblings, disabled, isManager,
-                    currentSet, createValue, updateValue, deleteValue, copyValue }) => {
+const Question = ({ settings, templates, question, sets, values, siblings, disabled, isManager,
+                    currentSet, createValue, updateValue, deleteValue, copyValue, fetchContact }) => {
   return checkQuestion(question, currentSet) && (
     <div className={`interview-question col-md-${question.width || '12'}`}>
+      <QuestionContact settings={settings} question={question} values={values} fetchContact={fetchContact} />
       <QuestionOptional question={question} />
       <QuestionText question={question} />
       <QuestionHelp question={question} />
@@ -40,6 +42,7 @@ const Question = ({ templates, question, sets, values, siblings, disabled, isMan
 }
 
 Question.propTypes = {
+  settings: PropTypes.object.isRequired,
   templates: PropTypes.object.isRequired,
   question: PropTypes.object.isRequired,
   sets: PropTypes.array.isRequired,
@@ -51,7 +54,8 @@ Question.propTypes = {
   createValue: PropTypes.func.isRequired,
   updateValue: PropTypes.func.isRequired,
   deleteValue: PropTypes.func.isRequired,
-  copyValue: PropTypes.func.isRequired
+  copyValue: PropTypes.func.isRequired,
+  fetchContact: PropTypes.func.isRequired
 }
 
 export default Question
diff --git a/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js b/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
new file mode 100644
index 0000000000..6b410fd3d0
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
@@ -0,0 +1,24 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+const QuestionContact = ({ settings, question, values, fetchContact }) => {
+  return settings.project_contact && (
+    <div className="interview-question-contact">
+      <button className="btn btn-link" title={gettext('Contact support.')}
+              onClick={() => fetchContact({ question, values })}>
+        <span className="badge badge-pill badge-primary">
+          <i className="fa fa-question" aria-hidden="true"></i>
+        </span>
+      </button>
+    </div>
+  )
+}
+
+QuestionContact.propTypes = {
+  settings: PropTypes.object.isRequired,
+  question: PropTypes.object.isRequired,
+  values: PropTypes.array.isRequired,
+  fetchContact: PropTypes.func.isRequired,
+}
+
+export default QuestionContact
diff --git a/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSet.js b/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSet.js
index c9131f6a0b..7dbec42962 100644
--- a/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSet.js
+++ b/rdmo/projects/assets/js/interview/components/main/questionset/QuestionSet.js
@@ -13,9 +13,9 @@ import QuestionSetHelp from './QuestionSetHelp'
 import QuestionSetHelpTemplate from './QuestionSetHelpTemplate'
 import QuestionSetRemoveSet from './QuestionSetRemoveSet'
 
-const QuestionSet = ({ templates, questionset, sets, values, disabled, isManager,
+const QuestionSet = ({ settings, templates, questionset, sets, values, disabled, isManager,
                        parentSet, createSet, updateSet, deleteSet, copySet,
-                       createValue, updateValue, deleteValue, copyValue }) => {
+                       createValue, updateValue, deleteValue, copyValue, fetchContact }) => {
 
   const setPrefix = getChildPrefix(parentSet)
 
@@ -47,6 +47,7 @@ const QuestionSet = ({ templates, questionset, sets, values, disabled, isManager
                         return (
                           <QuestionSet
                             key={elementIndex}
+                            settings={settings}
                             templates={templates}
                             questionset={element}
                             sets={sets}
@@ -62,12 +63,14 @@ const QuestionSet = ({ templates, questionset, sets, values, disabled, isManager
                             updateValue={updateValue}
                             deleteValue={deleteValue}
                             copyValue={copyValue}
+                            fetchContact={fetchContact}
                           />
                         )
                       } else {
                         return (
                           <Question
                             key={elementIndex}
+                            settings={settings}
                             templates={templates}
                             question={element}
                             sets={sets.filter((set) => (
@@ -90,6 +93,7 @@ const QuestionSet = ({ templates, questionset, sets, values, disabled, isManager
                             updateValue={updateValue}
                             deleteValue={deleteValue}
                             copyValue={copyValue}
+                            fetchContact={fetchContact}
                           />
                         )
                       }
@@ -108,6 +112,7 @@ const QuestionSet = ({ templates, questionset, sets, values, disabled, isManager
 }
 
 QuestionSet.propTypes = {
+  settings: PropTypes.object.isRequired,
   templates: PropTypes.object.isRequired,
   questionset: PropTypes.object.isRequired,
   sets: PropTypes.array.isRequired,
@@ -122,7 +127,8 @@ QuestionSet.propTypes = {
   createValue: PropTypes.func.isRequired,
   updateValue: PropTypes.func.isRequired,
   deleteValue: PropTypes.func.isRequired,
-  copyValue: PropTypes.func.isRequired
+  copyValue: PropTypes.func.isRequired,
+  fetchContact: PropTypes.func.isRequired
 }
 
 export default QuestionSet
diff --git a/rdmo/projects/assets/js/interview/containers/Main.js b/rdmo/projects/assets/js/interview/containers/Main.js
index be0b98f316..0d675e9241 100644
--- a/rdmo/projects/assets/js/interview/containers/Main.js
+++ b/rdmo/projects/assets/js/interview/containers/Main.js
@@ -6,16 +6,19 @@ import { connect } from 'react-redux'
 import { hasErrors, isReady } from '../utils/interview'
 
 import Breadcrump from '../components/main/Breadcrump'
+import Contact from '../components/main/Contact'
 import Done from '../components/main/Done'
 import Page from '../components/main/page/Page'
 import Errors from '../components/main/Errors'
 
 import * as configActions from 'rdmo/core/assets/js/actions/configActions'
 
+import * as contactActions from '../actions/contactActions'
 import * as interviewActions from '../actions/interviewActions'
 
-// eslint-disable-next-line no-unused-vars
-const Main = ({ config, settings, templates, user, project, interview, configActions, interviewActions }) => {
+const Main = ({ config, settings, templates, project, interview, contact,
+                interviewActions, contactActions }) => {
+
   if (hasErrors(project, interview)) {
     return (
       <Errors
@@ -40,6 +43,7 @@ const Main = ({ config, settings, templates, user, project, interview, configAct
           interview.page && (
             <Page
               config={config}
+              settings={settings}
               templates={templates}
               overview={project.overview}
               page={interview.page}
@@ -55,9 +59,16 @@ const Main = ({ config, settings, templates, user, project, interview, configAct
               deleteSet={interviewActions.deleteSet}
               copyValue={interviewActions.copyValue}
               copySet={interviewActions.copySet}
+              fetchContact={contactActions.fetchContact}
             />
           )
         }
+        <Contact
+          templates={templates}
+          contact={contact}
+          sendContact={contactActions.sendContact}
+          closeContact={contactActions.closeContact}
+        />
       </div>
     )
   }
@@ -73,8 +84,9 @@ Main.propTypes = {
   user: PropTypes.object.isRequired,
   project: PropTypes.object.isRequired,
   interview: PropTypes.object.isRequired,
-  configActions: PropTypes.object.isRequired,
-  interviewActions: PropTypes.object.isRequired
+  contact: PropTypes.object.isRequired,
+  interviewActions: PropTypes.object.isRequired,
+  contactActions: PropTypes.object.isRequired
 }
 
 function mapStateToProps(state) {
@@ -85,6 +97,7 @@ function mapStateToProps(state) {
     user: state.user,
     project: state.project,
     interview: state.interview,
+    contact: state.contact,
   }
 }
 
@@ -92,6 +105,7 @@ function mapDispatchToProps(dispatch) {
   return {
     configActions: bindActionCreators(configActions, dispatch),
     interviewActions: bindActionCreators(interviewActions, dispatch),
+    contactActions: bindActionCreators(contactActions, dispatch),
   }
 }
 
diff --git a/rdmo/projects/assets/js/interview/reducers/contactReducer.js b/rdmo/projects/assets/js/interview/reducers/contactReducer.js
new file mode 100644
index 0000000000..013efec3b8
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/reducers/contactReducer.js
@@ -0,0 +1,33 @@
+import {
+  FETCH_CONTACT_INIT,
+  FETCH_CONTACT_SUCCESS,
+  FETCH_CONTACT_ERROR,
+  SEND_CONTACT_INIT,
+  SEND_CONTACT_SUCCESS,
+  SEND_CONTACT_ERROR,
+  CLOSE_CONTACT
+} from '../actions/actionTypes'
+
+const initialState = {
+  showModal: false,
+  values: {},
+  errors: []
+}
+
+export default function interviewReducer(state = initialState, action) {
+  switch(action.type) {
+    case FETCH_CONTACT_INIT:
+    case SEND_CONTACT_INIT:
+      return { ...state, errors: [] }
+    case FETCH_CONTACT_ERROR:
+    case SEND_CONTACT_ERROR:
+      return { ...state, errors: action.error.errors }
+    case FETCH_CONTACT_SUCCESS:
+      return { ...state, showModal: true, values: action.values }
+    case SEND_CONTACT_SUCCESS:
+    case CLOSE_CONTACT:
+      return { ...state, showModal: false, values: {} }
+    default:
+      return state
+  }
+}
diff --git a/rdmo/projects/assets/js/interview/store/configureStore.js b/rdmo/projects/assets/js/interview/store/configureStore.js
index a813ee929b..0daadd97c6 100644
--- a/rdmo/projects/assets/js/interview/store/configureStore.js
+++ b/rdmo/projects/assets/js/interview/store/configureStore.js
@@ -10,6 +10,7 @@ import settingsReducer from 'rdmo/core/assets/js/reducers/settingsReducer'
 import templateReducer from 'rdmo/core/assets/js/reducers/templateReducer'
 import userReducer from 'rdmo/core/assets/js/reducers/userReducer'
 
+import contactReducer from '../reducers/contactReducer'
 import interviewReducer from '../reducers/interviewReducer'
 import projectReducer from '../reducers/projectReducer'
 
@@ -36,6 +37,7 @@ export default function configureStore() {
 
   const rootReducer = combineReducers({
     config: configReducer,
+    contact: contactReducer,
     interview: interviewReducer,
     pending: pendingReducer,
     project: projectReducer,
diff --git a/rdmo/projects/assets/scss/interview.scss b/rdmo/projects/assets/scss/interview.scss
index 4fa5b2a1c4..c5dd2053a6 100644
--- a/rdmo/projects/assets/scss/interview.scss
+++ b/rdmo/projects/assets/scss/interview.scss
@@ -388,3 +388,26 @@
     cursor: help;
     background-color: black;
 }
+
+.interview-question-contact {
+    float: right;
+    margin-top: -1px;
+
+    .btn.btn-link {
+        opacity: 0.8;
+        line-height: 20px;
+        font-size: 14px;
+        padding: 0;
+
+        &:hover {
+            opacity: 1;
+        }
+        &:focus {
+            outline: 0;
+        }
+
+        i {
+            background: transparent;
+        }
+    }
+}
diff --git a/rdmo/projects/templates/projects/email/project_contact_message.txt b/rdmo/projects/templates/projects/email/project_contact_message.txt
new file mode 100644
index 0000000000..c42e55d225
--- /dev/null
+++ b/rdmo/projects/templates/projects/email/project_contact_message.txt
@@ -0,0 +1,34 @@
+{# Warning: Double newlines will be removed #}{% load i18n accounts_tags %}{% trans "Greetings" %}!
+
+{% if page %}
+{% blocktrans trimmed with project_title=project.title page_title=page.title %}
+I have a question regarding the project "{{ project_title }}" on the page "{{ page_title }}":
+{% endblocktrans %}
+
+{{ page_url }}
+{% else %}
+{% blocktrans trimmed with project_title=project.title %}
+I have a question regarding the project "{{ project_title }}".
+{% endblocktrans %}
+
+{{ project_url }}
+{% endif %}
+
+{% if question %}
+{% blocktrans trimmed with page_title=page.title question_text=question.text %}
+In particular, it is about the question: {{ question_text }}
+{% endblocktrans %}
+{% endif %}
+
+{% if page and set_value %}
+{% firstof page.verbose_name 'Set' %}: {{ set_value.value }}
+{% endif %}
+
+{% if values %}
+{% trans 'Answers:' %}{% for value in values %}
+* {{ value.value }}{% endfor %}
+
+{% endif %}
+
+{% trans "Sincerely" %},
+    {{ user_full_name }}
diff --git a/rdmo/projects/templates/projects/email/project_contact_subject.txt b/rdmo/projects/templates/projects/email/project_contact_subject.txt
new file mode 100644
index 0000000000..547100276e
--- /dev/null
+++ b/rdmo/projects/templates/projects/email/project_contact_subject.txt
@@ -0,0 +1,3 @@
+{% load i18n accounts_tags %}{% full_name user as user_full_name %}{% blocktrans trimmed with project_title=project.title %}
+{{ user_full_name }} contacted support regarding "{{ project_title }}"
+{% endblocktrans %}
\ No newline at end of file
diff --git a/rdmo/projects/templates/projects/email/project_invite_subject.txt b/rdmo/projects/templates/projects/email/project_invite_subject.txt
index 55eab1d1fb..2ab837af9e 100644
--- a/rdmo/projects/templates/projects/email/project_invite_subject.txt
+++ b/rdmo/projects/templates/projects/email/project_invite_subject.txt
@@ -1,3 +1,3 @@
 {% load i18n accounts_tags %}{% full_name user as user_full_name %}{% blocktrans trimmed with project_title=project.title %}
-{{ user_full_name }} invited you to collaborate on {{ project_title }}
+{{ user_full_name }} invited you to collaborate on "{{ project_title }}"
 {% endblocktrans %}
\ No newline at end of file
diff --git a/rdmo/projects/templates/projects/project_interview_contact_help.html b/rdmo/projects/templates/projects/project_interview_contact_help.html
new file mode 100644
index 0000000000..dbb7cfcc8e
--- /dev/null
+++ b/rdmo/projects/templates/projects/project_interview_contact_help.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+
+    <p>
+        {% blocktrans trimmed %}
+        If you have questions about a question or other inqueries to support, you can use the
+        form below to send an email to the people supporting this RDMO site.
+        {% endblocktrans %}
+    </p>
diff --git a/rdmo/projects/utils.py b/rdmo/projects/utils.py
index 06153b855e..f5448cbfd3 100644
--- a/rdmo/projects/utils.py
+++ b/rdmo/projects/utils.py
@@ -3,12 +3,14 @@
 
 from django.conf import settings
 from django.contrib.sites.models import Site
+from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.timezone import now
 
 from rdmo.core.mail import send_mail
 from rdmo.core.plugins import get_plugins
+from rdmo.core.utils import remove_double_newlines
 
 logger = logging.getLogger(__name__)
 
@@ -269,3 +271,64 @@ def compute_set_prefix_from_set_value(set_value, value):
         str(set_value.set_index) if (index == set_prefix_length) else value
         for index, value in enumerate(value.set_prefix.split('|'))
     ])
+
+
+def get_contact_message(request, project):
+    project_url = project.get_absolute_url()
+    project_interview_url = reverse('project_interview', args=[project.id])
+
+    context = {
+        'user': request.user,
+        'site': Site.objects.get_current(),
+        'project': project,
+        'project_url': request.build_absolute_uri(project_url)
+    }
+
+    page_id = request.GET.get('page')
+    if page_id:
+        page = project.catalog.get_page(page_id)
+        if page:
+            context.update({
+                'page': page,
+                'page_url': request.build_absolute_uri(f'{project_interview_url}{page_id}/')
+            })
+
+    questionset_id = request.GET.get('questionset')
+    if questionset_id:
+        context['questionset'] = project.catalog.get_questionset(questionset_id)
+
+    question_id = request.GET.get('question')
+    if question_id:
+        context['question'] = project.catalog.get_question(question_id)
+
+    value_ids = request.GET.getlist('values')
+    if value_ids:
+        values = project.values.filter(snapshot=None).filter(id__in=value_ids)
+        context['values'] = values
+
+        if page and page.is_collection and page.attribute is not None:
+            value = values.filter(set_prefix='').first()
+            if value:
+                try:
+                    context['set_value'] = project.values.filter(snapshot=None).get(
+                        attribute=page.attribute,
+                        set_prefix='',
+                        set_index=value.set_index,
+                        collection_index=0
+                    )
+                except ObjectDoesNotExist:
+                    pass
+
+    subject = render_to_string('projects/email/project_contact_subject.txt', context)
+    message = render_to_string('projects/email/project_contact_message.txt', context)
+
+    return {
+        'subject': subject,
+        'message': remove_double_newlines(message)
+    }
+
+
+def send_contact_message(request, subject, message):
+    send_mail(subject, message,
+              to=settings.PROJECT_CONTACT_RECIPIENTS,
+              cc=[request.user.email], reply_to=[request.user.email])
diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
index 9eccecfa28..48afd3295b 100644
--- a/rdmo/projects/viewsets.py
+++ b/rdmo/projects/viewsets.py
@@ -14,6 +14,7 @@
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
+from rest_framework.serializers import ValidationError
 from rest_framework.viewsets import GenericViewSet, ModelViewSet, ReadOnlyModelViewSet
 
 from django_filters.rest_framework import DjangoFilterBackend
@@ -79,7 +80,9 @@
     check_conditions,
     compute_set_prefix_from_set_value,
     copy_project,
+    get_contact_message,
     get_upload_accept,
+    send_contact_message,
     send_invite_email,
 )
 
@@ -325,6 +328,29 @@ def visibility(self, request, pk=None):
         # if nothing worked, raise 404
         raise Http404
 
+    @action(detail=True, methods=['get', 'post'],
+            permission_classes=(HasModelPermission | HasProjectPermission, ))
+    def contact(self, request, pk):
+        if settings.PROJECT_CONTACT:
+            project = self.get_object()
+
+            if request.method == 'POST':
+                subject = request.data.get('subject')
+                message = request.data.get('message')
+
+                if subject and message:
+                    send_contact_message(request, subject, message)
+                    return Response(status=status.HTTP_204_NO_CONTENT)
+                else:
+                    raise ValidationError({
+                        'subject': [_('This field may not be blank.')] if not subject else [],
+                        'message': [_('This field may not be blank.')] if not message else []
+                    })
+            else:
+                return Response(get_contact_message(request, project))
+        else:
+            return 404
+
     @action(detail=False, url_path='upload-accept', permission_classes=(IsAuthenticated, ))
     def upload_accept(self, request):
         return Response(get_upload_accept())
diff --git a/rdmo/questions/models/catalog.py b/rdmo/questions/models/catalog.py
index 8eec46f90f..69b60401b3 100644
--- a/rdmo/questions/models/catalog.py
+++ b/rdmo/questions/models/catalog.py
@@ -223,6 +223,24 @@ def get_next_page(self, page):
         except (ValueError, IndexError):
             return None
 
+    def get_page(self, page_id):
+        try:
+            return next(page for page in self.pages if page.id == int(page_id))
+        except (StopIteration, ValueError):
+            return None
+
+    def get_questionset(self, questionset_id):
+        try:
+            return next(questionset for questionset in self.questionsets if questionset.id == int(questionset_id))
+        except (StopIteration, ValueError):
+            return None
+
+    def get_question(self, question_id):
+        try:
+            return next(question for question in self.questions if question.id == int(question_id))
+        except (StopIteration, ValueError):
+            return None
+
     @classmethod
     def build_uri(cls, uri_prefix, uri_path):
         if not uri_path:
diff --git a/testing/config/settings/base.py b/testing/config/settings/base.py
index 3517e314a4..dad68a9871 100644
--- a/testing/config/settings/base.py
+++ b/testing/config/settings/base.py
@@ -95,3 +95,6 @@
 PROJECT_IMPORTS_LIST = ['url']
 
 PROJECT_VALUES_VALIDATION = True
+
+PROJECT_CONTACT = True
+PROJECT_CONTACT_RECIPIENTS = ['email@example.com']

From 13d309d9fb0018be821c60322982e7e36e1f7e98 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 27 Sep 2024 16:56:25 +0200
Subject: [PATCH 2/8] Improve styling for contact feature

---
 .../main/question/QuestionContact.js          | 12 ++----
 rdmo/projects/assets/scss/interview.scss      | 39 +++++++++++--------
 .../email/project_contact_message.txt         |  7 ++--
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js b/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
index 6b410fd3d0..75d747b33d 100644
--- a/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
+++ b/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
@@ -3,14 +3,10 @@ import PropTypes from 'prop-types'
 
 const QuestionContact = ({ settings, question, values, fetchContact }) => {
   return settings.project_contact && (
-    <div className="interview-question-contact">
-      <button className="btn btn-link" title={gettext('Contact support.')}
-              onClick={() => fetchContact({ question, values })}>
-        <span className="badge badge-pill badge-primary">
-          <i className="fa fa-question" aria-hidden="true"></i>
-        </span>
-      </button>
-    </div>
+    <button className="btn btn-link badge badge-contact" title={gettext('Contact support.')}
+            onClick={() => fetchContact({ question, values })}>
+      <i className="fa fa-question" aria-hidden="true"></i>
+    </button>
   )
 }
 
diff --git a/rdmo/projects/assets/scss/interview.scss b/rdmo/projects/assets/scss/interview.scss
index c5dd2053a6..5782947819 100644
--- a/rdmo/projects/assets/scss/interview.scss
+++ b/rdmo/projects/assets/scss/interview.scss
@@ -376,38 +376,43 @@
     }
 }
 
-.badge-optional {
-    cursor: help;
+.badge-optional,
+.badge-contact {
     float: right;
     margin-top: 1px;
-    background-color: #efefef;
-    color: #777;
+    margin-left: 5px;
 }
 
-.badge-read-only {
+.badge-optional {
     cursor: help;
-    background-color: black;
+    background-color: #efefef;
+    color: #777;
 }
 
-.interview-question-contact {
-    float: right;
-    margin-top: -1px;
+.badge-contact {
+    background-color: $link-color;
+    color: white;
+
+    font-weight: normal;
 
-    .btn.btn-link {
+    &.btn.btn-link {
         opacity: 0.8;
-        line-height: 20px;
-        font-size: 14px;
-        padding: 0;
+        border: 0;
 
         &:hover {
             opacity: 1;
+            background-color: $link-color-hover;
+            color: white;
         }
         &:focus {
             outline: 0;
-        }
-
-        i {
-            background: transparent;
+            background-color: $link-color-hover;
+            color: white;
         }
     }
 }
+
+.badge-read-only {
+    cursor: help;
+    background-color: black;
+}
diff --git a/rdmo/projects/templates/projects/email/project_contact_message.txt b/rdmo/projects/templates/projects/email/project_contact_message.txt
index c42e55d225..b07a9070ee 100644
--- a/rdmo/projects/templates/projects/email/project_contact_message.txt
+++ b/rdmo/projects/templates/projects/email/project_contact_message.txt
@@ -16,7 +16,7 @@ I have a question regarding the project "{{ project_title }}".
 
 {% if question %}
 {% blocktrans trimmed with page_title=page.title question_text=question.text %}
-In particular, it is about the question: {{ question_text }}
+In particular, about the question: {{ question_text }}
 {% endblocktrans %}
 {% endif %}
 
@@ -24,10 +24,11 @@ In particular, it is about the question: {{ question_text }}
 {% firstof page.verbose_name 'Set' %}: {{ set_value.value }}
 {% endif %}
 
-{% if values %}
+{% if values|length == 1 %}
+{% trans 'Answer:' %} {% for value in values %}{{ value.value }}{% endfor %}
+{% elif values %}
 {% trans 'Answers:' %}{% for value in values %}
 * {{ value.value }}{% endfor %}
-
 {% endif %}
 
 {% trans "Sincerely" %},

From c821947ba29242c075ec8e6091f53a9d514c1ffe Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 27 Sep 2024 18:13:02 +0200
Subject: [PATCH 3/8] Add tests for project contact

---
 .../email/project_contact_message.txt         |   2 +-
 .../tests/test_viewset_project_contact.py     | 194 ++++++++++++++++++
 rdmo/projects/utils.py                        |   2 +-
 3 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 rdmo/projects/tests/test_viewset_project_contact.py

diff --git a/rdmo/projects/templates/projects/email/project_contact_message.txt b/rdmo/projects/templates/projects/email/project_contact_message.txt
index b07a9070ee..e852349bbd 100644
--- a/rdmo/projects/templates/projects/email/project_contact_message.txt
+++ b/rdmo/projects/templates/projects/email/project_contact_message.txt
@@ -8,7 +8,7 @@ I have a question regarding the project "{{ project_title }}" on the page "{{ pa
 {{ page_url }}
 {% else %}
 {% blocktrans trimmed with project_title=project.title %}
-I have a question regarding the project "{{ project_title }}".
+I have a question regarding the project "{{ project_title }}":
 {% endblocktrans %}
 
 {{ project_url }}
diff --git a/rdmo/projects/tests/test_viewset_project_contact.py b/rdmo/projects/tests/test_viewset_project_contact.py
new file mode 100644
index 0000000000..97526fafcb
--- /dev/null
+++ b/rdmo/projects/tests/test_viewset_project_contact.py
@@ -0,0 +1,194 @@
+import pytest
+
+from django.core import mail
+from django.urls import reverse
+
+from rdmo.projects.models import Project, Value
+from rdmo.questions.models import Page, Question
+
+users = (
+    ('owner', 'owner'),
+    ('manager', 'manager'),
+    ('author', 'author'),
+    ('guest', 'guest'),
+    ('api', 'api'),
+    ('user', 'user'),
+    ('site', 'site'),
+    ('anonymous', None),
+)
+
+view_project_permission_map = {
+    'owner': [1, 2, 3, 4, 5, 10, 12],
+    'manager': [1, 3, 5, 7, 12],
+    'author': [1, 3, 5, 8, 12],
+    'guest': [1, 3, 5, 9, 12],
+    'user': [12],
+    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+}
+
+change_project_permission_map = {
+    'owner': [1, 2, 3, 4, 5, 10, 12],
+    'manager': [1, 3, 5, 7],
+    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12],
+    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12]
+}
+
+delete_project_permission_map = {
+    'owner': [1, 2, 3, 4, 5, 10, 12],
+    'api': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12],
+    'site': [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12]
+}
+
+urlnames = {
+    'contact': 'v1-projects:project-contact'
+}
+
+projects = [1, 2, 3, 4, 5, 12]
+projects_internal = [12]
+conditions = [1]
+
+@pytest.mark.parametrize('username,password', users)
+@pytest.mark.parametrize('project_id', projects)
+def test_contact_get(db, client, username, password, project_id):
+    client.login(username=username, password=password)
+
+    project = Project.objects.get(pk=project_id)
+
+    url = reverse(urlnames['contact'], args=[project_id])
+    response = client.get(url)
+
+    if project_id in view_project_permission_map.get(username, []):
+        assert response.status_code == 200
+        assert isinstance(response.json(), dict)
+        assert response.json().get('subject')
+        assert response.json().get('message')
+        assert f'regarding the project "{project.title}":' in response.json().get('message')
+    else:
+        if password:
+            assert response.status_code == 404
+        else:
+            assert response.status_code == 401
+
+def test_contact_get_page(db, client):
+    client.login(username='guest', password='guest')
+
+    project = Project.objects.get(pk=1)
+    page = Page.objects.get(pk=1)
+
+    url = reverse(urlnames['contact'], args=[project.id]) + f'?page={page.id}'
+    response = client.get(url)
+
+    assert response.status_code == 200
+    assert isinstance(response.json(), dict)
+    assert response.json().get('subject')
+    assert f'regarding the project "{project.title}" on the page "{page.title}":' in response.json().get('message')
+
+
+def test_contact_get_question(db, client):
+    client.login(username='guest', password='guest')
+
+    project = Project.objects.get(pk=1)
+    question = Question.objects.get(pk=1)
+
+    url = reverse(urlnames['contact'], args=[project.id]) + f'?question={question.id}'
+    response = client.get(url)
+
+    assert response.status_code == 200
+    assert isinstance(response.json(), dict)
+    assert response.json().get('subject')
+    assert f'In particular, about the question: {question.text}' in response.json().get('message')
+
+
+def test_contact_get_value(db, client):
+    client.login(username='guest', password='guest')
+
+    project = Project.objects.get(pk=1)
+    value = Value.objects.get(pk=1)
+
+    url = reverse(urlnames['contact'], args=[project.id]) + f'?values={value.id}'
+    response = client.get(url)
+
+    assert response.status_code == 200
+    assert isinstance(response.json(), dict)
+    assert response.json().get('subject')
+    assert f'Answer: {value.value}' in response.json().get('message')
+
+
+def test_contact_get_values(db, client):
+    client.login(username='guest', password='guest')
+
+    project = Project.objects.get(pk=1)
+    value1 = Value.objects.get(pk=8)
+    value2 = Value.objects.get(pk=9)
+
+    url = reverse(urlnames['contact'], args=[project.id]) + f'?values={value1.id}&values={value2.id}'
+    response = client.get(url)
+
+    assert response.status_code == 200
+    assert isinstance(response.json(), dict)
+    assert response.json().get('subject')
+    assert f'* {value1.value}' in response.json().get('message')
+    assert f'* {value2.value}' in response.json().get('message')
+
+
+def test_contact_get_set(db, client):
+    client.login(username='guest', password='guest')
+
+    project = Project.objects.get(pk=1)
+    page = Page.objects.get(pk=42)
+    value = Value.objects.get(pk=47)
+    set_value = Value.objects.get(id=85)
+
+    url = reverse(urlnames['contact'], args=[project.id]) + f'?page={page.id}&values={value.id}'
+    response = client.get(url)
+
+    assert response.status_code == 200
+    assert isinstance(response.json(), dict)
+    assert response.json().get('subject')
+    assert f'Set: {set_value.value}' in response.json().get('message')
+
+
+@pytest.mark.parametrize('username,password', users)
+@pytest.mark.parametrize('project_id', projects)
+def test_contact_post(db, client, username, password, project_id):
+    client.login(username=username, password=password)
+
+    url = reverse(urlnames['contact'], args=[project_id])
+    response = client.post(url, {
+        'subject': 'Test subject',
+        'message': 'Test message'
+    })
+
+    if project_id in view_project_permission_map.get(username, []):
+        assert response.status_code == 204
+        assert len(mail.outbox) == 1
+        assert mail.outbox[0].subject == '[example.com] Test subject'
+        assert mail.outbox[0].body == 'Test message'
+    else:
+        if password:
+            assert response.status_code == 404
+        else:
+            assert response.status_code == 401
+
+        assert len(mail.outbox) == 0
+
+
+@pytest.mark.parametrize('username,password', users)
+@pytest.mark.parametrize('project_id', projects)
+def test_contact_post_error(db, client, username, password, project_id):
+    client.login(username=username, password=password)
+
+    url = reverse(urlnames['contact'], args=[project_id])
+    response = client.post(url, {})
+
+    if project_id in view_project_permission_map.get(username, []):
+        assert response.status_code == 400
+        assert len(mail.outbox) == 0
+    else:
+        if password:
+            assert response.status_code == 404
+        else:
+            assert response.status_code == 401
+
+        assert len(mail.outbox) == 0
diff --git a/rdmo/projects/utils.py b/rdmo/projects/utils.py
index f5448cbfd3..4ecaa9b411 100644
--- a/rdmo/projects/utils.py
+++ b/rdmo/projects/utils.py
@@ -306,7 +306,7 @@ def get_contact_message(request, project):
         values = project.values.filter(snapshot=None).filter(id__in=value_ids)
         context['values'] = values
 
-        if page and page.is_collection and page.attribute is not None:
+        if page_id and page and page.is_collection and page.attribute is not None:
             value = values.filter(set_prefix='').first()
             if value:
                 try:

From f199bc61519af1849a1784c0b358e6bbd6125515 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 17 Jan 2025 16:13:30 +0100
Subject: [PATCH 4/8] Change contact badge to button

---
 .../main/question/QuestionContact.js          |  4 +--
 rdmo/projects/assets/scss/interview.scss      | 35 +++++++------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js b/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
index 75d747b33d..32b3cd1382 100644
--- a/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
+++ b/rdmo/projects/assets/js/interview/components/main/question/QuestionContact.js
@@ -3,9 +3,9 @@ import PropTypes from 'prop-types'
 
 const QuestionContact = ({ settings, question, values, fetchContact }) => {
   return settings.project_contact && (
-    <button className="btn btn-link badge badge-contact" title={gettext('Contact support.')}
+    <button className="btn btn-link btn-contact" title={gettext('Contact support.')}
             onClick={() => fetchContact({ question, values })}>
-      <i className="fa fa-question" aria-hidden="true"></i>
+      <i className="fa fa-commenting-o" aria-hidden="true"></i>
     </button>
   )
 }
diff --git a/rdmo/projects/assets/scss/interview.scss b/rdmo/projects/assets/scss/interview.scss
index 5782947819..8e601ea3ec 100644
--- a/rdmo/projects/assets/scss/interview.scss
+++ b/rdmo/projects/assets/scss/interview.scss
@@ -376,39 +376,28 @@
     }
 }
 
-.badge-optional,
-.badge-contact {
+.badge-optional {
     float: right;
     margin-top: 1px;
     margin-left: 5px;
-}
-
-.badge-optional {
     cursor: help;
     background-color: #efefef;
     color: #777;
 }
 
-.badge-contact {
-    background-color: $link-color;
-    color: white;
-
-    font-weight: normal;
+.btn-contact {
+    float: right;
+    opacity: 0.8;
+    line-height: 20px;
+    font-size: 14px;
 
-    &.btn.btn-link {
-        opacity: 0.8;
-        border: 0;
+    padding: 0;
 
-        &:hover {
-            opacity: 1;
-            background-color: $link-color-hover;
-            color: white;
-        }
-        &:focus {
-            outline: 0;
-            background-color: $link-color-hover;
-            color: white;
-        }
+    &:hover {
+        opacity: 1;
+    }
+    &:focus {
+        outline: 0;
     }
 }
 

From 3259809e8c8858c6c9641b92c6cf09e2f7a62af7 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 17 Jan 2025 16:18:18 +0100
Subject: [PATCH 5/8] Update project_interview_contact_help template

---
 .../templates/projects/project_interview_contact_help.html   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rdmo/projects/templates/projects/project_interview_contact_help.html b/rdmo/projects/templates/projects/project_interview_contact_help.html
index dbb7cfcc8e..db9611dcf7 100644
--- a/rdmo/projects/templates/projects/project_interview_contact_help.html
+++ b/rdmo/projects/templates/projects/project_interview_contact_help.html
@@ -1,8 +1,7 @@
 {% load i18n %}
 
     <p>
-        {% blocktrans trimmed %}
-        If you have questions about a question or other inqueries to support, you can use the
-        form below to send an email to the people supporting this RDMO site.
+        {% blocktrans trimmed with site_name=request.site.name %}
+        If you have a question or feedback please get in touch with us, you can use this form to send an email to the {{ site_name }} support"
         {% endblocktrans %}
     </p>

From b1a5da8160f947c04df2558ecfaeadbec335f0bd Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 17 Jan 2025 16:59:31 +0100
Subject: [PATCH 6/8] Fix fetchNavigation for "done"

---
 rdmo/projects/assets/js/interview/actions/interviewActions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmo/projects/assets/js/interview/actions/interviewActions.js b/rdmo/projects/assets/js/interview/actions/interviewActions.js
index e55aa275a6..53ff451506 100644
--- a/rdmo/projects/assets/js/interview/actions/interviewActions.js
+++ b/rdmo/projects/assets/js/interview/actions/interviewActions.js
@@ -109,7 +109,7 @@ export function fetchPageError(error) {
 }
 
 export function fetchNavigation(page) {
-  const pendingId = `fetchNavigation/${page.id}`
+  const pendingId = `fetchNavigation/${page ? page.id : 'done'}`
 
   return (dispatch) => {
     dispatch(addToPending(pendingId))

From 0d35cd4f4254a4122f1bc8696040c9ff1f71f9a2 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Tue, 21 Jan 2025 16:03:22 +0100
Subject: [PATCH 7/8] Prefetch catalog in contact action

---
 rdmo/projects/viewsets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
index 48afd3295b..0527882b2e 100644
--- a/rdmo/projects/viewsets.py
+++ b/rdmo/projects/viewsets.py
@@ -332,8 +332,6 @@ def visibility(self, request, pk=None):
             permission_classes=(HasModelPermission | HasProjectPermission, ))
     def contact(self, request, pk):
         if settings.PROJECT_CONTACT:
-            project = self.get_object()
-
             if request.method == 'POST':
                 subject = request.data.get('subject')
                 message = request.data.get('message')
@@ -347,6 +345,8 @@ def contact(self, request, pk):
                         'message': [_('This field may not be blank.')] if not message else []
                     })
             else:
+                project = self.get_object()
+                project.catalog.prefetch_elements()
                 return Response(get_contact_message(request, project))
         else:
             return 404

From 459f6563d07f6652ccc6681abf42d477434e1358 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Thu, 23 Jan 2025 10:25:28 +0100
Subject: [PATCH 8/8] Fix contact action

---
 rdmo/projects/viewsets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
index 0527882b2e..d9b6215e1b 100644
--- a/rdmo/projects/viewsets.py
+++ b/rdmo/projects/viewsets.py
@@ -332,6 +332,7 @@ def visibility(self, request, pk=None):
             permission_classes=(HasModelPermission | HasProjectPermission, ))
     def contact(self, request, pk):
         if settings.PROJECT_CONTACT:
+            project = self.get_object()
             if request.method == 'POST':
                 subject = request.data.get('subject')
                 message = request.data.get('message')
@@ -345,11 +346,10 @@ def contact(self, request, pk):
                         'message': [_('This field may not be blank.')] if not message else []
                     })
             else:
-                project = self.get_object()
                 project.catalog.prefetch_elements()
                 return Response(get_contact_message(request, project))
         else:
-            return 404
+            raise Http404
 
     @action(detail=False, url_path='upload-accept', permission_classes=(IsAuthenticated, ))
     def upload_accept(self, request):