Allow to parse with json error on setting an object to an array prope…

…rty fix #7254
surveyjs · Oct 30, 2023 · ba8cee2 · ba8cee2
1 parent 283fe5e
commit ba8cee2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/src/jsonobject.ts b/src/jsonobject.ts
@@ -865,6 +865,7 @@ export class JsonMetadataClass {
       }
       if (propInfo.baseClassName) {
         prop.baseClassName = propInfo.baseClassName;
+        prop.isArray = true;
       }
       if (propInfo.classNamePart) {
         prop.classNamePart = propInfo.classNamePart;
@@ -1482,6 +1483,11 @@ export class JsonRequiredPropertyError extends JsonError {
     );
   }
 }
+export class JsonRequiredArrayPropertyError extends JsonError {
+  constructor(public propertyName: string, public className: string) {
+    super("arrayproperty", "The property '" + propertyName + "' should be an array in '" + className + "'.");
+  }
+}
 
 export class JsonObject {
   private static typePropertyName = "type";
@@ -1531,7 +1537,7 @@ export class JsonObject {
         }
         continue;
       }
-      this.valueToObj(jsonObj[key], obj, property);
+      this.valueToObj(jsonObj[key], obj, property, jsonObj);
     }
     if (obj.endLoadingFromJson) {
       obj.endLoadingFromJson();
@@ -1629,13 +1635,18 @@ export class JsonObject {
       }
     }
   }
-  public valueToObj(value: any, obj: any, property: JsonObjectProperty) {
+  public valueToObj(value: any, obj: any, property: JsonObjectProperty, jsonObj?: any): void {
     if (value === null || value === undefined) return;
     this.removePos(property, value);
     if (property != null && property.hasToUseSetValue) {
       property.setValue(obj, value, this);
       return;
     }
+    if(property.isArray && !Array.isArray(value) && !!value) {
+      value = [value];
+      const propName = !!jsonObj && property.alternativeName && !!jsonObj[property.alternativeName] ? property.alternativeName : property.name;
+      this.addNewError(new JsonRequiredArrayPropertyError(propName, obj.getType()), !!jsonObj ? jsonObj: value, obj);
+    }
     if (this.isValueArray(value)) {
       this.valueToArray(value, obj, property.name, property);
       return;

diff --git a/src/survey.ts b/src/survey.ts
@@ -7485,8 +7485,8 @@ Serializer.addClass("survey", [
   { name: "loadingHtml:html", serializationProperty: "locLoadingHtml" },
   { name: "pages:surveypages", className: "page" },
   {
-    name: "questions",
-    alternativeName: "elements",
+    name: "elements",
+    alternativeName: "questions",
     baseClassName: "question",
     visible: false,
     isLightSerializable: false,

diff --git a/tests/jsonobjecttests.ts b/tests/jsonobjecttests.ts
@@ -3032,4 +3032,31 @@ QUnit.test("Check that .toJSON returns clean structure for all question types",
       }
     }
   }
+});
+QUnit.test("Add a quesition into page elements array", function (assert) {
+  const prop = Serializer.findProperty("page", "elements");
+  assert.equal(prop.isArray, true, "Elements is an array");
+  const survey = new SurveyModel({
+    pages: [
+      {
+        elements: { type: "text", name: "q1" }
+      }
+    ]
+  });
+  assert.equal(survey.pages.length, 1, "There is one page");
+  assert.equal(survey.pages[0].elements.length, 1, "There is one element in the page");
+  assert.equal(survey.pages[0].elements[0].name, "q1", "Element has a correct name");
+  assert.equal(survey.jsonErrors.length, 1, "There is a JSON error");
+});
+QUnit.test("Add a quesition into survey questions array", function (assert) {
+  const prop = Serializer.findProperty("page", "elements");
+  assert.equal(prop.isArray, true, "Elements is an array");
+  const survey = new SurveyModel({
+    questions: { type: "text", name: "q1" }
+  });
+  assert.equal(survey.pages.length, 1, "There is one page");
+  assert.equal(survey.pages[0].elements.length, 1, "There is one element in the page");
+  assert.equal(survey.pages[0].elements[0].name, "q1", "Element has a correct name");
+  assert.equal(survey.jsonErrors.length, 1, "There is a JSON error");
+  assert.equal((<any>survey.jsonErrors[0]).propertyName, "questions", "Correct property name");
 });