Fixed #4940 - Change question menu incorrect for custom question type (…

…#5341) Co-authored-by: tsv2013 <tsv2013@noreply.github.com>
surveyjs · Mar 21, 2024 · ad70284 · ad70284
1 parent b9be320
commit ad70284
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 5 deletions.
diff --git a/packages/survey-creator-core/src/components/question.ts b/packages/survey-creator-core/src/components/question.ts
@@ -203,7 +203,7 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
       messageText: "",
       onClick: () => { }
     };
-    if(this.creator) {
+    if (this.creator) {
       this.creator.onCreateCustomMessagePanel.fire(this.creator, res);
     }
     res.text = res.messageText;
@@ -302,15 +302,19 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
   public getConvertToTypesActions(): Array<IAction> {
     const availableItems = this.creator.getAvailableToolboxItems(this.element, false);
     const itemNames = [];
-    availableItems.forEach(item => itemNames.push(item.typeName));
+    availableItems.forEach(item => {
+      if (itemNames.indexOf(item.typeName) == -1) {
+        itemNames.push(item.typeName);
+      }
+    });
     const convertClasses: string[] = QuestionConverter.getConvertToClasses(
       this.currentType, itemNames, true
     );
     const res = [];
     let lastItem = null;
     convertClasses.forEach((className: string) => {
       const items = this.creator.toolbox.items.filter(item => item.name == className);
-      if(Array.isArray(items) && items.length > 0) {
+      if (Array.isArray(items) && items.length > 0) {
         const item = items[0];
         const needSeparator = lastItem && item.category != lastItem.category;
         const action = this.creator.createIActionBarItemByClass(item.name, item.title, item.iconName, needSeparator);

diff --git a/packages/survey-creator-core/tests/creator-toolbox.tests.ts b/packages/survey-creator-core/tests/creator-toolbox.tests.ts
@@ -185,7 +185,7 @@ test("Add-remove toolbox items, #5271", (): any => {
     }
   });
   creator.currentAddQuestionType = "dropdown";
-  creator.addNewQuestionInPage(() => {}, undefined, "dropdown");
+  creator.addNewQuestionInPage(() => { }, undefined, "dropdown");
   expect(creator.getAddNewQuestionText()).toEqual("Add Question");
 });
 test("Add-remove toolbox items, #5067", (): any => {
@@ -204,4 +204,47 @@ test("Add-remove toolbox items, #5067", (): any => {
   expect(creator.selectedElement.getType()).toEqual("text");
   const adorner = new QuestionAdornerViewModel(creator, <SurveyElement>creator.selectedElement, undefined);
   expect(adorner.getConvertToTypesActions()).toHaveLength(0);
-});
+});
+test("Doesn't duplicate custom toolbox items with built-in ones in convertTo", (): any => {
+  const creator = new CreatorTester();
+  creator.toolbox.addItem({
+    name: "country",
+    title: "Country",
+    json: {
+      type: "dropdown",
+      placeholder: "Select a country...",
+      choicesByUrl: {
+        url: "https://surveyjs.io/api/CountriesExample",
+      },
+    },
+  } as any);
+  creator.JSON = {
+    elements: [
+      { type: "radiogroup", name: "q1" }
+    ]
+  };
+  const question = creator.survey.getQuestionByName("q1");
+  creator.selectElement(question);
+  const questionModel = new QuestionAdornerViewModel(
+    creator,
+    question,
+    undefined as any
+  );
+
+  const items = questionModel.getConvertToTypesActions();
+  let counter = 0;
+  items.forEach(item => {
+    if (item.id === "dropdown") counter++;
+  });
+  expect(counter).toEqual(1);
+
+  const popup = questionModel.getActionById("convertTo").popupModel;
+  expect(popup).toBeTruthy();
+  const list = popup.contentComponentData.model;
+  expect(list).toBeTruthy();
+  counter = 0;
+  list.actions.forEach(item => {
+    if (item.id === "dropdown") counter++;
+  });
+  expect(counter).toEqual(1);
+});