Dynamic Panel - The panel count bindings setting is not saved to a survey JSON definition fix #6743 (#6748)

Author: andrewtelnov

packages/survey-creator-core/src/property-grid/bindings.ts

@@ -30,14 +30,14 @@ export class PropertyGridEditorBindings extends PropertyGridEditor {
   public onCreated(obj: Base, question: QuestionCompositeModel, prop: JsonObjectProperty, options: ISurveyCreatorOptions) {
     question.contentPanel.fromJSON({ elements: this.getQuestions(obj, options) });
     question.valueFromDataCallback = (value: any): any => {
-      if(!value && obj.bindings.getNames().length > 0) {
-        const result: { [index: string]: any } = {};
-        for(const bindingName of obj.bindings.getNames()) {
-          result[bindingName] = obj.bindings.getValueNameByPropertyName(bindingName);
+      const keys = obj.bindings.getNames();
+      const result: { [index: string]: any } = {};
+      if(keys.length > 0) {
+        for(const key of keys) {
+          result[key] = !!value ? value[key] : obj.bindings.getValueNameByPropertyName(key);
         }
-        return result;
       }
-      return value;
+      return result;
     };
   }
   private getQuestions(obj: Base, options: ISurveyCreatorOptions): Array<object> {

packages/survey-creator-core/tests/property-grid/property-grid.tests.ts

@@ -810,6 +810,28 @@ test("bindings property editor", () => {
   q.value = "q3";
   expect(matrix.bindings.getValueNameByPropertyName("rowCount")).toEqual("q3");
 });
+test("bindings property editor, store in JSON, Bug#6743", () => {
+  const survey = new SurveyModel({
+    elements: [
+      { type: "matrixdynamic", name: "q1" },
+      { type: "text", name: "q2" }
+    ]
+  });
+  const matrix = <QuestionMatrixDynamicModel>survey.getQuestionByName("q1");
+  const propertyGrid = new PropertyGridModelTester(matrix);
+  const bindingsQuestion = <QuestionCompositeModel>(
+    propertyGrid.survey.getQuestionByName("bindings")
+  );
+  expect(bindingsQuestion).toBeTruthy();
+  expect(bindingsQuestion.getType()).toEqual("propertygrid_bindings");
+  expect(bindingsQuestion.contentPanel.questions).toHaveLength(1);
+  const q = bindingsQuestion.contentPanel.questions[0];
+  expect(q.name).toEqual("rowCount");
+  q.value = "q2";
+  expect(matrix.bindings.getValueNameByPropertyName("rowCount")).toEqual("q2");
+  expect(matrix.toJSON()).toEqual({ name: "q1", bindings: { rowCount: "q2" } });
+  expect(survey.getQuestionByName("q2").toJSON()).toEqual({ name: "q2" });
+});
 
 test("Dynamic panel 'Panel count' binding property editor", () => {
   const survey = new SurveyModel({