Issue/6880 refactor jsons are compatible function in question adoner (#6891)

* #6880 Refactor jsonsAreCompatible function in Question adoner
Fixes #6880

* #6880 - optimize

* #6880 add test

Author: novikov82

packages/survey-creator-core/src/components/question.ts

@@ -479,25 +479,35 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
     return newAction;
   }
 
-  private jsonsAreCompatible(objJson: any, json: any): boolean {
-    let question = this.element;
-    if (!!objJson && !!objJson.type && question.getType() !== objJson.type) {
-      question = QuestionFactory.Instance.createQuestion(objJson.type, "question") || this.element;
-    }
+  public static checkForNeedDefaultSubitems(items: QuestionToolboxItem[]) {
+    items.filter(i => i.needDefaultSubitem === undefined).forEach((item: QuestionToolboxItem) => {
+      item.needDefaultSubitem = false;
+      if (item.items?.length > 0) {
+        item.needDefaultSubitem = true;
+        item.items.forEach(subitem => {
+          const question = QuestionFactory.Instance.createQuestion(item.json.type, "question");
+          if (QuestionAdornerViewModel.jsonsAreCompatible(question, subitem.json)) item.needDefaultSubitem = false;
+        });
+      }
+    });
+  }
+
+  private static jsonsAreCompatible(element: SurveyElement, json: any): boolean {
+    let question = element;
     const keys = Object.keys(json);
     for (let i = 0; i < keys.length; i++) {
       const p = keys[i];
-      if (!objJson && p === "type") continue;
-      let propertyValue = !!objJson ? objJson[p] : question.getPropertyValue(p);
-      if (!!objJson && propertyValue === undefined) {
+      if (p === "type") continue;
+      let propertyValue = question.getPropertyValue(p);
+      if (propertyValue === undefined) {
         propertyValue = p === "type" ? question.getType() : question.getDefaultPropertyValue(p);
       }
       if (!Helpers.isTwoValueEquals(json[p], propertyValue)) return false;
     }
     return true;
   }
   private jsonIsCorresponded(json: any) {
-    return this.jsonsAreCompatible(undefined, json);
+    return QuestionAdornerViewModel.jsonsAreCompatible(this.element, json);
   }
 
   private toolboxItemIsCorresponded(toolboxItem: QuestionToolboxItem, someItemSelectedAlready: boolean) {
@@ -525,6 +535,7 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
 
   protected updateQuestionTypeOrSubtypeListModel(listModel: ListModel, subtypeOnly: boolean) {
     const availableItems = this.getConvertToTypes();
+    QuestionAdornerViewModel.checkForNeedDefaultSubitems(availableItems);
     const defaultJsons = this.buildDefaultJsonMap(availableItems);
     const newItems: Array<IAction> = [];
     let lastItem: QuestionToolboxItem;
@@ -548,14 +559,12 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
       if (item.items?.length > 0 && this.creator.toolbox.showSubitems) {
         const subactions = [];
         let selectedSubactionLocal: IAction = undefined;
-        let allChildsAreCompatibleToParent = false;
         item.items.forEach(subitem => {
           const subaction = toolboxItemToAction(subitem,);
           if (this.toolboxItemIsCorresponded(subitem, !!selectedAction)) selectedSubactionLocal = subitem;
-          if (this.jsonsAreCompatible(item.json, subitem.json)) allChildsAreCompatibleToParent = true;
           subactions.push(subaction);
         });
-        if (!allChildsAreCompatibleToParent && subactions.length > 0) {
+        if (item.needDefaultSubitem && subactions.length > 0) {
           const defaultSubaction = toolboxItemToAction(item);
           defaultSubaction.id = action.id + "-default";
           defaultSubaction.iconName = undefined;

packages/survey-creator-core/src/toolbox.ts

@@ -139,6 +139,7 @@ export class QuestionToolboxItem extends Action implements IQuestionToolboxItem
   public propName: string;
   public propValue: string;
   public showInToolboxOnly: boolean = false;
+  public needDefaultSubitem: boolean = undefined;
   static getItemClassNames(iconName?: string): string {
     return new CssClassBuilder()
       .append("svc-toolbox__item")
@@ -278,6 +279,7 @@ export class QuestionToolboxItem extends Action implements IQuestionToolboxItem
    */
   public clearSubitems(): void {
     if (this.hasSubItems) {
+      this.needDefaultSubitem = undefined;
       this.items = [];
       this.component = "";
       this.popupModel.dispose();
@@ -294,6 +296,7 @@ export class QuestionToolboxItem extends Action implements IQuestionToolboxItem
    */
   public addSubitem(subitem: IQuestionToolboxItem, index: number = -1): void {
     if (!subitem) return;
+    this.needDefaultSubitem = undefined;
     const newItem: QuestionToolboxItem = new QuestionToolboxItem(subitem);
     newItem.iconName = "";
     if (!newItem.className) newItem.className = QuestionToolboxItem.getItemClassNames(newItem.iconName);
@@ -316,7 +319,7 @@ export class QuestionToolboxItem extends Action implements IQuestionToolboxItem
    */
   public removeSubitem(subitem: IQuestionToolboxItem | string): void {
     if (!this.hasSubItems || !subitem) return;
-
+    this.needDefaultSubitem = undefined;
     const id: string = (subitem as IQuestionToolboxItem)?.id || subitem as string;
     if (!id) return;
 

packages/survey-creator-core/tests/question-adorner.tests.ts

@@ -1135,5 +1135,38 @@ test("Check question converter subitems", (): any => {
   const subitems = getQuestionConverterList(creator, "q1").getActionById("rating").items;
   expect(subitems.length).toBe(3);
 
+  surveySettings.animationEnabled = true;
+});
+
+test("Check question converter subitems", (): any => {
+  surveySettings.animationEnabled = false;
+  const creator = new CreatorTester();
+
+  // create subitems from new items (the same type, different json)
+  const text = creator.toolbox.getItemByName("text") as QuestionToolboxItem;
+  const number = text.getSubitem("number");
+
+  expect(text.needDefaultSubitem).toBeUndefined();
+  QuestionAdornerViewModel.checkForNeedDefaultSubitems(creator.toolbox.items);
+  expect(text.needDefaultSubitem).toBeFalsy();
+
+  text.needDefaultSubitem = true;
+  QuestionAdornerViewModel.checkForNeedDefaultSubitems(creator.toolbox.items);
+  expect(text.needDefaultSubitem).toBeTruthy(); // needDefaultSubitem is not recalculated
+
+  text.removeSubitem(number);
+  QuestionAdornerViewModel.checkForNeedDefaultSubitems(creator.toolbox.items);
+  expect(text.needDefaultSubitem).toBeFalsy(); // needDefaultSubitem is recalculated after removeSubitem
+
+  text.needDefaultSubitem = true;
+  text.addSubitem(number);
+  QuestionAdornerViewModel.checkForNeedDefaultSubitems(creator.toolbox.items);
+  expect(text.needDefaultSubitem).toBeFalsy(); // needDefaultSubitem is recalculated after addSubitem
+
+  text.needDefaultSubitem = true;
+  text.clearSubitems();
+  QuestionAdornerViewModel.checkForNeedDefaultSubitems(creator.toolbox.items);
+  expect(text.needDefaultSubitem).toBeFalsy(); // needDefaultSubitem is recalculated after clearSubitems
+
   surveySettings.animationEnabled = true;
 });