Merge pull request #1384 from rdmorganiser/fix_apply_to_all

Fix copyValue and only "apply" to empty sets

Author: jochenklar

rdmo/projects/assets/js/interview/actions/interviewActions.js

@@ -375,7 +375,7 @@ export function updateValue(value, attrs, store = true) {
   }
 }
 
-export function copyValue(...originalValues) {
+export function copyValue(question, ...originalValues) {
   const firstValue = first(originalValues)
   const pendingId = `copyValue/${firstValue.attribute}/${firstValue.set_prefix}/${firstValue.set_index}`
 
@@ -390,22 +390,33 @@ export function copyValue(...originalValues) {
         ...copies,
         ...sets.filter((set) => (
           (set.set_prefix == value.set_prefix) &&
-          (set.set_index != value.set_index)
+          (set.set_index != value.set_index) &&
+          (set.element == question.parent)
         )).map((set) => {
-          const siblingIndex = values.findIndex((v) => (
+          // check if every sibling is empty
+          if (values.filter((v) => (
             (v.attribute == value.attribute) &&
             (v.set_prefix == set.set_prefix) &&
-            (v.set_index == set.set_index) &&
-            (v.collection_index == value.collection_index)
-          ))
-
-          const sibling = siblingIndex > 0 ? values[siblingIndex] : null
-
-          if (isNil(sibling)) {
-            return [ValueFactory.create({ ...value, set_index: set.set_index }), siblingIndex]
-          } else if (isEmptyValue(sibling)) {
-            // the spread operator { ...sibling } does prevent an update in place
-            return [ValueFactory.update({ ...sibling }, value), siblingIndex]
+            (v.set_index == set.set_index)
+          )).every(v => isEmptyValue(v))) {
+            // find the corresponding sibling to this original value
+            const siblingIndex = values.findIndex((v) => (
+              (v.attribute == value.attribute) &&
+              (v.set_prefix == set.set_prefix) &&
+              (v.set_index == set.set_index) &&
+              (v.collection_index == value.collection_index)
+            ))
+
+            const sibling = siblingIndex > 0 ? values[siblingIndex] : null
+
+            if (isNil(sibling)) {
+              return [ValueFactory.create({ ...value, set_index: set.set_index }), siblingIndex]
+            } else if (isEmptyValue(sibling)) {
+              // the spread operator { ...sibling } does prevent an update in place
+              return [ValueFactory.update({ ...sibling }, value), siblingIndex]
+            } else {
+              return null
+            }
           } else {
             return null
           }

rdmo/projects/assets/js/interview/components/main/question/QuestionCopyValue.js

@@ -9,7 +9,7 @@ const QuestionCopyValue = ({ question, value, siblings, copyValue }) => {
     !question.is_collection &&
     !isEmptyValue(value) &&
     siblings.some((value) => isEmptyValue(value)) && (
-      <button type="button" className="btn btn-link btn-apply-to-all" onClick={() => copyValue(value)}
+      <button type="button" className="btn btn-link btn-apply-to-all" onClick={() => copyValue(question, value)}
               title={gettext('Apply this answer to all tabs where this question is empty')}
               aria-label={gettext('Apply this answer to all tabs where this question is empty')}>
         <i className="fa fa-arrow-circle-right fa-btn" aria-hidden="true"></i>

rdmo/projects/assets/js/interview/components/main/question/QuestionCopyValues.js

@@ -6,13 +6,13 @@ import { isEmptyValue } from '../../../utils/value'
 
 const QuestionCopyValues = ({ question, sets, values, siblings, currentSet, copyValue }) => {
   const button = question.widget_type == 'checkbox' ? (
-    <button className="btn btn-link btn-apply-to-all" onClick={() => copyValue(...values)}
+    <button className="btn btn-link btn-apply-to-all" onClick={() => copyValue(question, ...values)}
             title={gettext('Apply this answer to all tabs where this question is empty')}
             aria-label={gettext('Apply this answer to all tabs where this question is empty')}>
       <i className="fa fa-arrow-circle-right fa-btn" aria-hidden="true"></i>
     </button>
   ) : (
-    <button type="button" className="btn btn-primary btn-xs copy-value-button ml-10" onClick={() => copyValue(...values)}>
+    <button type="button" className="btn btn-primary btn-xs copy-value-button ml-10" onClick={() => copyValue(question, ...values)}>
       <i className="fa fa-arrow-circle-right fa-btn" aria-hidden="true"></i> {gettext('Apply to all')}
     </button>
   )
@@ -21,7 +21,8 @@ const QuestionCopyValues = ({ question, sets, values, siblings, currentSet, copy
 
   const hasEmptySiblings = sets.filter((set) => (
       (set.set_prefix == currentSet.set_prefix) &&
-      (set.set_index != currentSet.set_index)
+      (set.set_index != currentSet.set_index) &&
+      (set.element == question.parent)
     )).some((set) => {
       // loop over all other sets and filter siblings accordingly
       const setSiblings = siblings.filter((value) => (