The other value and comment in a Composite Question stores incorrectly fix #9378 (#9389)

Author: andrewtelnov

packages/survey-core/src/question_custom.ts

@@ -22,6 +22,7 @@ import { LocalizableString } from "./localizablestring";
 import { SurveyError } from "./survey-error";
 import { CustomError } from "./error";
 import { ConsoleWarnings } from "./console-warnings";
+import { settings } from "./settings";
 
 /**
  * An interface used to create custom question types.
@@ -1244,6 +1245,31 @@ export class QuestionCompositeModel extends QuestionCustomModelBase {
     this.settingNewValue = false;
     this.runPanelTriggers(QuestionCompositeModel.ItemVariableName + "." + name, newValue);
   }
+  setComment(name: string, newValue: string, locNotification: any): any {
+    let val = this.getUnbindValue(this.value);
+    const commentName = this.getCommentName(name);
+    if(!val && !newValue || !!newValue && !!val && val[commentName] === newValue) return;
+    if(!!newValue) {
+      if(!val) { val = {}; }
+      val[commentName] = newValue;
+    } else {
+      delete val[commentName];
+    }
+    const q = <Question>this.getQuestionByName(name);
+    if(!!q && q.comment !== newValue) {
+      q.comment = newValue;
+    }
+    this.value = val;
+  }
+  getComment(name: string): string {
+    const q = <Question>this.getQuestionByName(name);
+    if(!!q) return q.comment;
+    const val = this.value;
+    return !!val && val[this.getCommentName(name)] || "";
+  }
+  private getCommentName(name: string): string {
+    return name + settings.commentSuffix;
+  }
   private runPanelTriggers(name: string, value: any): void {
     if(!!this.contentPanel) {
       this.contentPanel.questions.forEach(q => {
@@ -1321,18 +1347,23 @@ export class QuestionCompositeModel extends QuestionCustomModelBase {
     super.setQuestionValue(newValue, updateIsAnswered);
   }
   private setValuesIntoQuestions(newValue: any): void {
-    if(!this.contentPanel) return;
+    if(!this.contentPanel || this.settingNewValue) return;
     newValue = this.getValueForContentPanel(newValue);
     const oldSettingNewValue = this.settingNewValue;
     this.settingNewValue = true;
     const questions = this.contentPanel.questions;
     for (var i = 0; i < questions.length; i++) {
-      const key = questions[i].getValueName();
-      const val = !!newValue ? newValue[key] : undefined;
       const q = questions[i];
+      const key = q.getValueName();
+      const commentKey = this.getCommentName(key);
+      const val = !!newValue ? newValue[key] : undefined;
+      const commentVal = !!newValue && newValue[commentKey] || "";
       if(!this.isTwoValueEquals(q.value, val) && (val !== undefined || !q.isEmpty())) {
         q.value = val;
       }
+      if(q.comment !== commentVal) {
+        q.comment = commentVal;
+      }
     }
     this.settingNewValue = oldSettingNewValue;
   }

packages/survey-core/tests/question_customtests.ts

@@ -3462,5 +3462,32 @@ QUnit.test("Composite: clearIfInvisible='onHidden'", function (assert) {
   q1.contentPanel.getQuestionByName("q2").value = 3;
   assert.deepEqual(q1.value, { q1: "test1", q2: 3 }, "test #1");
 
+  ComponentCollection.Instance.clear();
+});
+QUnit.test("Composite: with dropdown & showOtherItem, Bug#9378", function (assert) {
+  ComponentCollection.Instance.add({
+    name: "test",
+    elementsJSON: [
+      { type: "text", name: "q1" },
+      { type: "dropdown", name: "q2", choices: [1, 2, 3], showOtherItem: true }
+    ]
+  });
+  const survey = new SurveyModel({
+    elements: [
+      { type: "test", name: "question1" }
+    ]
+  });
+  const q = <QuestionCompositeModel>survey.getQuestionByName("question1");
+  const q1 = q.contentPanel.getQuestionByName("q1");
+  const q2 = q.contentPanel.getQuestionByName("q2");
+  q1.value = "test1";
+  q2.value = "other";
+  q2.comment = "abc";
+  assert.deepEqual(q.value, { q1: "test1", q2: "other", "q2-Comment": "abc" }, "q.value #1");
+  survey.data = {};
+  assert.ok(q.isEmpty(), "q.value #2");
+  survey.data = { question1: { q1: "test2", q2: "other", "q2-Comment": "def" } };
+  assert.deepEqual(q.value, { q1: "test2", q2: "other", "q2-Comment": "def" }, "q.value #3");
+
   ComponentCollection.Instance.clear();
 });