Fix tag and category fields

assets/javascripts/wizard/components/wizard-field-category.js.es6

@@ -1,13 +1,28 @@
 import { observes } from 'ember-addons/ember-computed-decorators';
+import Category from 'discourse/models/category';
 
 export default Ember.Component.extend({
+  didInsertElement() {
+    const value = this.get('field.value');
+    if (value) {
+      const property = this.get('field.property') || 'id';
+      const categories = [...value].map(v => {
+        return property === 'id' ?
+               Category.findById(v) :
+               Category.findBySlug(v);
+      });
+      this.set('categories', categories);
+    }
+  },
+
   @observes('categories')
   setValue() {
     const categories = this.get('categories');
     if (categories.length) {
-      const limit = this.get('field.limit');
       const property = this.get('field.property') || 'id';
-      let value = limit === 1 ? categories[0][property] : categories.map(c => c[property]);
+      let value = categories.length === 1 ?
+                  categories[0][property] :
+                  categories.map(c => c[property]);
       this.set('field.value', value);
     }
   }

assets/javascripts/wizard/templates/components/wizard-field-tag.hbs

@@ -1 +1 @@
-{{tag-chooser value=field.value maximum=field.limit}}
+{{tag-chooser tags=field.value maximum=field.limit}}

lib/builder.rb

@@ -339,16 +339,17 @@ class CustomWizard::Builder
         skip_validations: true
       }
 
-      if action['custom_category_enabled'] &&
-        !action['custom_category_wizard_field'] &&
-        action['custom_category_user_field_key']
-
+      if action['custom_category_enabled']
+        if action['custom_category_wizard_field']
+          category_id = data[action['category_id']]
+        elsif action['custom_category_user_field_key']
           if action['custom_category_user_field_key'].include?('custom_fields')
             field = action['custom_category_user_field_key'].split('.').last
             category_id = user.custom_fields[field]
           else
             category_id = user.send(action['custom_category_user_field_key'])
           end
+        end
       else
         category_id = action['category_id']
       end
@@ -378,7 +379,7 @@ class CustomWizard::Builder
                 end
               end
             else
-              value = [value] if key === 'tags'
+              value = [*value] if key === 'tags'
               params[key.to_sym] = value
             end
           end