Merge pull request #1188 from rdmorganiser/interview-import-dataset

feat(interview): Reuse datasets and values [5]

Author: jochenklar

Diff for: .gitignore

@@ -1,3 +1,9 @@
+__pycache__
+*.pyc
+*~
+*.swp
+.DS_Store
+
 testing/config/settings/local.py
 testing/log/
 .pytest*/
@@ -6,19 +12,12 @@ static_root
 media_root
 components_root
 
-docs/_build*
-
-__pycache__
-*.pyc
-*~
-*.swp
-.DS_Store
-.ruff_cache
-
 env
 env2
 env3
 
+Makefile
+
 .coverage
 .coverage.*
 htmlcov
@@ -32,16 +31,19 @@ dist
 .imdone/
 
 .pytest_cache
+.ruff_cache
 .on-save.json
 
 rdmo/management/static
 
-rdmo/core/static/core/js/base*.js
+rdmo/core/static/core/js/base.js
+rdmo/core/static/core/css/base.css
 rdmo/core/static/core/fonts
-rdmo/core/static/core/css/base*.css
 
-rdmo/projects/static/projects/js/*.js
-rdmo/projects/static/projects/fonts
-rdmo/projects/static/projects/css/*.css
+rdmo/projects/static/projects/css/interview.css
+rdmo/projects/static/projects/css/projects.css
+rdmo/projects/static/projects/fonts/
+rdmo/projects/static/projects/js/interview.js
+rdmo/projects/static/projects/js/projects.js
 
 screenshots

Diff for: rdmo/core/assets/js/components/Modal.js

@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Modal as BootstrapModal } from 'react-bootstrap'
 
-const Modal = ({ title, show, modalProps, submitLabel, submitProps, onClose, onSubmit, children }) => {
+const Modal = ({ title, show, modalProps, submitLabel, submitProps, onClose, onSubmit, children, buttons }) => {
   return (
     <BootstrapModal className="element-modal" onHide={onClose} show={show} {...modalProps}>
       <BootstrapModal.Header closeButton>
@@ -19,6 +19,7 @@ const Modal = ({ title, show, modalProps, submitLabel, submitProps, onClose, onS
         <button type="button" className="btn btn-default" onClick={onClose}>
           {gettext('Close')}
         </button>
+        {buttons}
         {
           onSubmit && (
             <button type="button" className="btn btn-primary" onClick={onSubmit} {...submitProps}>
@@ -39,7 +40,8 @@ Modal.propTypes = {
   submitProps: PropTypes.object,
   onClose: PropTypes.func.isRequired,
   onSubmit: PropTypes.func,
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired,
+  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+  buttons: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
 }
 
 export default Modal

Diff for: rdmo/core/assets/js/hooks/useLsState.js

@@ -0,0 +1,46 @@
+import { useState } from 'react'
+import { isEmpty, isPlainObject, omit as lodashOmit } from 'lodash'
+
+import { checkStoreId } from '../utils/store'
+
+const useLsState = (path, initialValue, omit = []) => {
+  checkStoreId()
+
+  const getLs = (path) => {
+    const data = JSON.parse(localStorage.getItem(path))
+    return isPlainObject(data) ? lodashOmit(data, omit) : data
+  }
+
+  const setLs = (path, value) => {
+    const data = isPlainObject(value) ? lodashOmit(value, omit) : value
+    localStorage.setItem(path, JSON.stringify(data))
+  }
+
+  const getInitialState = () => {
+    // get the value from the local storage
+    const lsValue = getLs(path)
+
+    // return the state with the value from the local storage or the provided initialValue
+    if (isPlainObject(lsValue)) {
+      return { ...initialValue, ...lsValue }
+    } else if (isEmpty(lsValue)) {
+      return initialValue
+    } else {
+      return lsValue
+    }
+  }
+
+  // setup the state
+  const [value, setValue] = useState(getInitialState())
+
+  return [
+    value,
+    (value) => {
+      setLs(path, value)
+      setValue(value)
+    },
+    () => setValue(getInitialState())
+  ]
+}
+
+export default useLsState

Diff for: 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;
 }
 
@@ -317,6 +316,7 @@ form .yesno label {
 /* modals */
 
 .modal-body {
+    > div:last-child,
     > p:last-child,
     formgroup:last-child .form-group {
         margin-bottom: 0;
@@ -495,3 +495,7 @@ li.has-warning > a.control-label > i {
     color: $link-color;
     cursor: pointer;
 }
+
+.has-error .react-select__control {
+    border-color: #a94442;
+}

Diff for: rdmo/core/settings.py

@@ -238,7 +238,8 @@
     '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',
+    'projects/project_interview_sidebar.html',
 ]
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
@@ -348,6 +349,8 @@
 
 OPTIONSET_PROVIDERS = []
 
+PROJECT_VALUES_SEARCH_LIMIT = 10
+
 PROJECT_VALUES_VALIDATION = False
 
 PROJECT_VALUES_VALIDATION_URL = True

Diff for: rdmo/projects/assets/js/interview/actions/interviewActions.js

@@ -611,18 +611,20 @@ export function deleteSetError(errors) {
   return {type: DELETE_SET_ERROR, errors}
 }
 
-export function copySet(currentSet, currentSetValue, attrs) {
-  const pendingId = `copySet/${currentSet.set_prefix}/${currentSet.set_index}`
+export function copySet(currentSet, copySetValue, attrs) {
+  const pendingId = isNil(currentSet) ? 'copySet' : `copySet/${currentSet.set_prefix}/${currentSet.set_index}`
 
   return (dispatch, getState) => {
     dispatch(addToPending(pendingId))
     dispatch(copySetInit())
 
-    // create a new set
-    const set = SetFactory.create(attrs)
+    // create a new set (create) or use the current one (import)
+    const set = isNil(attrs.id) ? SetFactory.create(attrs) : currentSet
 
-    // create a value for the text if the page has an attribute
-    const value = isNil(attrs.attribute) ? null : ValueFactory.create(attrs)
+    // create a value for the text if the page has an attribute (create) or use the current one (import)
+    const value = isNil(attrs.attribute) ? null : (
+      isNil(attrs.id) ? ValueFactory.create(attrs) : attrs
+    )
 
     // create a callback function to be called immediately or after saving the value
     const copySetCallback = (setValues) => {
@@ -631,7 +633,10 @@ export function copySet(currentSet, currentSetValue, attrs) {
       const state = getState().interview
 
       const page = state.page
-      const values = [...state.values, ...setValues]
+      const values = [
+        ...state.values.filter(v => !setValues.some(sv => compareValues(v, sv))),  // remove updated values
+        ...setValues
+      ]
       const sets = gatherSets(values)
 
       initSets(sets, page)
@@ -667,7 +672,7 @@ export function copySet(currentSet, currentSetValue, attrs) {
         })
       )
     } else {
-      promise = ValueApi.copySet(projectId, currentSetValue, value)
+      promise = ValueApi.copySet(projectId, value, copySetValue)
     }
 
     return promise.then((values) => {

Diff for: rdmo/projects/assets/js/interview/api/ProjectApi.js

@@ -6,6 +6,10 @@ import BaseApi from 'rdmo/core/assets/js/api/BaseApi'
 
 class ProjectsApi extends BaseApi {
 
+  static fetchProjects(params) {
+    return this.get(`/api/v1/projects/projects/?${encodeParams(params)}`)
+  }
+
   static fetchOverview(projectId) {
     return this.get(`/api/v1/projects/projects/${projectId}/overview/`)
   }

Diff for: rdmo/projects/assets/js/interview/api/ValueApi.js

@@ -1,13 +1,17 @@
 import BaseApi from 'rdmo/core/assets/js/api/BaseApi'
 import { encodeParams } from 'rdmo/core/assets/js/utils/api'
-import isUndefined from 'lodash/isUndefined'
+import { isUndefined } from 'lodash'
 
 class ValueApi extends BaseApi {
 
   static fetchValues(projectId, params) {
     return this.get(`/api/v1/projects/projects/${projectId}/values/?${encodeParams(params)}`)
   }
 
+  static searchValues(params) {
+    return this.get(`/api/v1/projects/values/search/?${encodeParams(params)}`)
+  }
+
   static storeValue(projectId, value) {
     if (isUndefined(value.id)) {
       return this.post(`/api/v1/projects/projects/${projectId}/values/`, value)
@@ -29,8 +33,10 @@ class ValueApi extends BaseApi {
     }
   }
 
-  static copySet(projectId, currentSetValue, setValue) {
-    return this.post(`/api/v1/projects/projects/${projectId}/values/${currentSetValue.id}/set/`, setValue)
+  static copySet(projectId, setValue, copySetValue) {
+    return this.post(`/api/v1/projects/projects/${projectId}/values/set/`, {
+      ...setValue, copy_set_value: copySetValue.id
+    })
   }
 
   static deleteSet(projectId, setValue) {

Diff for: rdmo/projects/assets/js/interview/components/main/Done.js

@@ -28,8 +28,7 @@ const Done = ({ templates }) => {
 }
 
 Done.propTypes = {
-  templates: PropTypes.object.isRequired,
-  overview: PropTypes.object.isRequired
+  templates: PropTypes.object.isRequired
 }
 
 export default Done