diff --git a/assets/javascripts/discourse/templates/components/wizard-table-field.hbs b/assets/javascripts/discourse/templates/components/wizard-table-field.hbs
index efbc7092..5d81b5f4 100644
--- a/assets/javascripts/discourse/templates/components/wizard-table-field.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-table-field.hbs
@@ -122,6 +122,22 @@
{{/if}}
+ {{#if isTopic}}
+
+ {{i18n "admin.wizard.submissions.topic_id"}}:
+
+ {{#each value.value as |topic|}}
+
+ {{topic.id}}
+
+ {{/each}}
+ {{/if}}
+
{{#if isGroup}}
{{i18n "admin.wizard.submissions.group_id"}}:
diff --git a/assets/stylesheets/common/wizard/field.scss b/assets/stylesheets/common/wizard/field.scss
index 71f12d84..b431ac72 100644
--- a/assets/stylesheets/common/wizard/field.scss
+++ b/assets/stylesheets/common/wizard/field.scss
@@ -182,7 +182,15 @@ body.custom-wizard {
}
}
- .wizard-category-selector {
+ .wizard-category-selector,
+ .wizard-topic-selector {
width: 500px;
}
+
+ .wizard-topic-selector .topic-row {
+ .topic-title,
+ .topic-categories > span:not(:last-of-type) {
+ margin-right: 10px;
+ }
+ }
}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index fa5c9deb..71d5eeac 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -212,6 +212,7 @@ en:
user_field_options: "user field options"
user: "user"
category: "category"
+ topic: "topic"
tag: "tag"
group: "group"
list: "list"
@@ -229,6 +230,7 @@ en:
user_field_options: "Select field"
user: "Select user"
category: "Select category"
+ topic: "Select a topic"
tag: "Select tag"
group: "Select group"
list: "Enter item"
@@ -280,6 +282,9 @@ en:
content: "Content"
tag_groups: "Tag Groups"
can_create_tag: "Can Create Tag"
+ category:
+ label: "Category"
+ none: "Limit to a category..."
date_time_format:
label: "Format"
instructions: "Moment.js format"
@@ -311,6 +316,7 @@ en:
dropdown: Dropdown
tag: Tag
category: Category
+ topic: Topic
group: Group
user_selector: User Selector
date: Date
@@ -469,6 +475,7 @@ en:
download: "Download"
group_id: "Group ID"
category_id: "Category ID"
+ topic_id: "Topic ID"
composer_preview: "Composer Preview"
api:
diff --git a/lib/custom_wizard/builder.rb b/lib/custom_wizard/builder.rb
index 0d0b689d..eb5369ec 100644
--- a/lib/custom_wizard/builder.rb
+++ b/lib/custom_wizard/builder.rb
@@ -131,7 +131,7 @@ class CustomWizard::Builder
params[:format] = field_template['format']
end
- if field_template['type'] === 'category' || field_template['type'] === 'tag'
+ if %w[category tag topic].include?(field_template['type'])
params[:limit] = field_template['limit']
end
@@ -143,6 +143,10 @@ class CustomWizard::Builder
params[:property] = field_template['property']
end
+ if field_template['type'] === 'topic'
+ params[:category] = field_template['category']
+ end
+
if (content_inputs = field_template['content']).present?
content = CustomWizard::Mapper.new(
inputs: content_inputs,
diff --git a/lib/custom_wizard/field.rb b/lib/custom_wizard/field.rb
index ec85ff3a..e8e7bbf9 100644
--- a/lib/custom_wizard/field.rb
+++ b/lib/custom_wizard/field.rb
@@ -22,6 +22,7 @@ class CustomWizard::Field
:property,
:content,
:tag_groups,
+ :category,
:can_create_tag,
:preview_template,
:placeholder
@@ -53,6 +54,7 @@ class CustomWizard::Field
@property = attrs[:property]
@content = attrs[:content]
@tag_groups = attrs[:tag_groups]
+ @category = attrs[:category]
@can_create_tag = attrs[:can_create_tag]
@preview_template = attrs[:preview_template]
@placeholder = attrs[:placeholder]
@@ -129,6 +131,12 @@ class CustomWizard::Field
prefill: nil,
content: nil
},
+ topic: {
+ limit: 1,
+ prefill: nil,
+ content: nil,
+ category: nil
+ },
group: {
prefill: nil,
content: nil
diff --git a/lib/discourse_plugin_statistics/plugin.rb b/lib/discourse_plugin_statistics/plugin.rb
index 70e62889..86b207d4 100644
--- a/lib/discourse_plugin_statistics/plugin.rb
+++ b/lib/discourse_plugin_statistics/plugin.rb
@@ -33,6 +33,7 @@ module DiscoursePluginStatistics
upload: 0,
tag: 0,
category: 0,
+ topic: 0,
group: 0,
user_selector: 0,
},
diff --git a/plugin.rb b/plugin.rb
index db0dd9be..dd33374c 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,14 +1,14 @@
# frozen_string_literal: true
# name: discourse-custom-wizard
# about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 2.6.11
+# version: 2.7.0
# authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos
# url: https://github.com/paviliondev/discourse-custom-wizard
# contact_emails: development@pavilion.tech
# subscription_url: https://coop.pavilion.tech
# meta_topic_id: 73345
-gem 'liquid', '5.0.1', require: true
+gem 'liquid', '5.5.0', require: true
gem "discourse_subscription_client", "0.1.2", require_name: "discourse_subscription_client"
gem 'discourse_plugin_statistics', '0.1.0.pre7', require: true
register_asset 'stylesheets/common/admin.scss'
diff --git a/spec/components/custom_wizard/mapper_spec.rb b/spec/components/custom_wizard/mapper_spec.rb
index 2e18cabd..7ebdcb32 100644
--- a/spec/components/custom_wizard/mapper_spec.rb
+++ b/spec/components/custom_wizard/mapper_spec.rb
@@ -63,6 +63,11 @@ describe CustomWizard::Mapper do
"step_1_field_1": get_wizard_fixture("field/upload")
}
}
+ let(:template_params_object_array) {
+ {
+ "step_1_field_1" => [{ text: "Hello" }, { text: "World" }]
+ }
+ }
def create_template_mapper(data, user)
CustomWizard::Mapper.new(
@@ -500,6 +505,21 @@ describe CustomWizard::Mapper do
expect(result).to eq("Incorrect")
end
+ it "iterates over an interpolated list of objects" do
+ template = <<-LIQUID.strip
+ {% for object in step_1_field_1 %}{{object.text}} {% endfor %}
+ LIQUID
+ mapper = create_template_mapper(template_params_object_array, user1)
+ result = mapper.interpolate(
+ template.dup,
+ template: true,
+ user: true,
+ wizard: true,
+ value: true
+ )
+ expect(result).to eq("Hello World ")
+ end
+
context "custom filter: 'first_non_empty'" do
it "gives first non empty element from list" do
template = <<-LIQUID.strip
diff --git a/spec/components/discourse_plugin_statistics/plugin_spec.rb b/spec/components/discourse_plugin_statistics/plugin_spec.rb
index bf3635c2..984bf2ce 100644
--- a/spec/components/discourse_plugin_statistics/plugin_spec.rb
+++ b/spec/components/discourse_plugin_statistics/plugin_spec.rb
@@ -57,6 +57,7 @@ describe DiscoursePluginStatistics::Plugin do
tag: 0,
category: 0,
group: 0,
+ topic: 0,
user_selector: 0,
},
realtime_validations: 0
diff --git a/test/javascripts/acceptance/field-test.js b/test/javascripts/acceptance/field-test.js
index fdf99da5..265100b1 100644
--- a/test/javascripts/acceptance/field-test.js
+++ b/test/javascripts/acceptance/field-test.js
@@ -273,6 +273,15 @@ acceptance("Field | Fields", function (needs) {
);
});
+ test("Topic", async function (assert) {
+ await visit("/w/wizard");
+ assert.ok(visible(".wizard-field.topic-field .multi-select-header"));
+ await click(".wizard-field.topic-field .select-kit-header");
+ assert.ok(
+ exists(".wizard-field.topic-field .topic-selector .select-kit-filter")
+ );
+ });
+
test("Group", async function (assert) {
await visit("/w/wizard");
assert.ok(visible(".wizard-field.group-field .single-select-header"));
diff --git a/test/javascripts/fixtures/wizard.js.es6 b/test/javascripts/fixtures/wizard.js.es6
index a3b83063..b3e6e520 100644
--- a/test/javascripts/fixtures/wizard.js.es6
+++ b/test/javascripts/fixtures/wizard.js.es6
@@ -462,6 +462,27 @@ export default {
stepId: "step_3",
_validState: 0,
},
+ {
+ id: "step_3_field_7",
+ index: 6,
+ type: "topic",
+ required: false,
+ value: null,
+ label: "Topic
",
+ file_types: null,
+ format: null,
+ limit: null,
+ property: null,
+ content: null,
+ validations: {},
+ max_length: null,
+ char_counter: null,
+ preview_template: null,
+ tabindex: 7,
+ wizardId: "super_mega_fun_wizard",
+ stepId: "step_3",
+ _validState: 0,
+ },
],
_validState: 0,
wizardId: "super_mega_fun_wizard",