Add project_interview_sidebar template

rdmorganiser · Nov 14, 2024 · fbbe3dc · fbbe3dc
1 parent 87aa8c5
commit fbbe3dc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/rdmo/core/assets/scss/style.scss b/rdmo/core/assets/scss/style.scss
@@ -190,8 +190,7 @@ metadata {
 .page h2:nth-child(2) {
     margin-top: 0;
 }
-.sidebar h2:first-child,
-.sidebar .import-buttons {
+.sidebar > *:first-child {
     margin-top: 70px;
 }
 

diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py
@@ -233,6 +233,7 @@
     'projects/project_interview_progress_help.html',
     'projects/project_interview_question_help.html',
     'projects/project_interview_questionset_help.html',
+    'projects/project_interview_sidebar.html',
 ]
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

diff --git a/rdmo/projects/assets/js/interview/components/main/Search.js b/rdmo/projects/assets/js/interview/components/main/Search.js
@@ -7,14 +7,14 @@ import { isEmpty, isNil, pick, truncate } from 'lodash'
 import ProjectApi from '../../api/ProjectApi'
 import ValueApi from '../../api/ValueApi'
 
-const Search = ({ attribute, setAttribute, values, setValues, collection = false }) => {
+const Search = ({ page, attribute, values, setValues, collection = false }) => {
   // create a key for the first AsyncSelect, to reset the loaded values when project or snapshot changes
   const key = (values.project ? values.project.id : '') + (values.snapshot ? '-all' : '')
 
   const handleLoadValues = useDebouncedCallback((search, callback) => {
     ValueApi.searchValues({
       attribute,
-      set_attribute: setAttribute,
+      set_attribute: page && page.is_collection && page.attribute,
       search,
       project: values.project ? values.project.id : '',
       snapshot: values.snapshot ? 'all' : '',
@@ -136,6 +136,7 @@ const Search = ({ attribute, setAttribute, values, setValues, collection = false
 }
 
 Search.propTypes = {
+  page: PropTypes.number.isRequired,
   attribute: PropTypes.number.isRequired,
   setAttribute: PropTypes.number,
   values: PropTypes.object.isRequired,

diff --git a/rdmo/projects/assets/js/interview/containers/Sidebar.js b/rdmo/projects/assets/js/interview/containers/Sidebar.js
@@ -5,6 +5,8 @@ import { connect } from 'react-redux'
 
 import { isReady } from '../utils/interview'
 
+import Html from 'rdmo/core/assets/js/components/Html'
+
 import Buttons from '../components/sidebar/Buttons'
 import Navigation from '../components/sidebar/Navigation'
 import Overview from '../components/sidebar/Overview'
@@ -18,7 +20,7 @@ import * as interviewActions from '../actions/interviewActions'
 const Sidebar = ({ config, settings, templates, user, project, interview, configActions, interviewActions }) => {
   if (isReady(interview)) {
     return (
-      <div>
+      <>
         <Overview
           overview={project.overview}
           help={templates.project_interview_overview_help}/>
@@ -35,7 +37,8 @@ const Sidebar = ({ config, settings, templates, user, project, interview, config
           navigation={interview.navigation}
           help={templates.project_interview_navigation_help}
           fetchPage={interviewActions.fetchPage} />
-      </div>
+        <Html html={templates.project_interview_sidebar} />
+      </>
     )
   }
 

diff --git a/rdmo/projects/templates/projects/project_interview_sidebar.html b/rdmo/projects/templates/projects/project_interview_sidebar.html