Merge branch 'main' into stable

assets/javascripts/discourse/components/wizard-custom-field.js.es6

@@ -86,8 +86,8 @@ export default Component.extend(UndoChanges, {
     if (this.isDropdown) {
       options.wizardFieldSelection = "key,value";
       options.userFieldOptionsSelection = "output";
-      options.textSelection = "key,value,output";
-      options.inputTypes = "conditional,association,assignment";
+      options.textSelection = "key,value";
+      options.inputTypes = "association,conditional,assignment";
       options.pairConnector = "association";
       options.keyPlaceholder = "admin.wizard.key";
       options.valuePlaceholder = "admin.wizard.value";

coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "line": 92.52
+    "line": 92.87
   }
 }

lib/custom_wizard/builder.rb

@@ -154,15 +154,6 @@ class CustomWizard::Builder
           end
         end
 
-        if content[:type] == 'assignment' && field_template['type'] === 'dropdown'
-          content[:result] = content[:result].map do |item|
-            {
-              id: item,
-              name: item
-            }
-          end
-        end
-
         params[:content] = content[:result]
       end
     end

plugin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Create custom wizards
-# version: 1.18.2.stable
+# version: 1.18.3.stable
 # authors: Angus McLeod
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact emails: angus@thepavilion.io

serializers/custom_wizard/wizard_field_serializer.rb

@@ -101,7 +101,7 @@ class CustomWizard::FieldSerializer < ::ApplicationSerializer
     object.content
   end
 
-  def content
+  def tag_groups
     object.tag_groups
   end