{{wizard-mapper
- inputs=action.required
+ inputs=this.action.required
property="required"
onUpdate=(action "mappedFieldUpdated")
options=(hash
diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
index 4138a254..d21a90c0 100644
--- a/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-mapper-input.hbs
@@ -1,23 +1,23 @@
{{wizard-mapper-connector
- connector=input.type
- connectors=inputTypes
+ connector=this.input.type
+ connectors=this.inputTypes
inputTypes=true
- inputType=inputType
+ inputType=this.inputType
connectorType="type"
- options=options
- onUpdate=onUpdate
+ options=this.options
+ onUpdate=this.onUpdate
}}
{{#if hasPairs}}
- {{#each input.pairs as |pair|}}
+ {{#each this.input.pairs as |pair|}}
{{wizard-mapper-pair
pair=pair
last=pair.last
- inputType=inputType
- options=options
+ inputType=this.inputType
+ options=this.options
removePair=(action "removePair")
- onUpdate=onUpdate
+ onUpdate=this.onUpdate
}}
{{/each}}
@@ -32,27 +32,27 @@
{{#if hasOutput}}
{{#if hasPairs}}
{{wizard-mapper-connector
- connector=input.output_connector
- connectors=connectors
+ connector=this.input.output_connector
+ connectors=this.connectors
connectorType="output"
- inputType=inputType
- options=options
- onUpdate=onUpdate
+ inputType=this.inputType
+ options=this.options
+ onUpdate=this.onUpdate
}}
{{/if}}
{{wizard-mapper-selector
selectorType="output"
- inputType=input.type
- value=input.output
- activeType=input.output_type
- options=options
- onUpdate=onUpdate
+ inputType=this.input.type
+ value=this.input.output
+ activeType=this.input.output_type
+ options=this.options
+ onUpdate=this.onUpdate
}}
{{/if}}
-
+
{{d-icon "times"}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs b/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs
deleted file mode 100644
index b37a92bf..00000000
--- a/assets/javascripts/discourse/templates/modal/admin-wizards-columns.hbs
+++ /dev/null
@@ -1,35 +0,0 @@
-{{#d-modal-body title="admin.wizard.edit_columns"}}
- {{#if loading}}
- {{loading-spinner size="large"}}
- {{else}}
-
- {{#each model.columns as |column|}}
-
-
-
-
-
- {{/each}}
-
- {{/if}}
-{{/d-modal-body}}
-
-
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs
deleted file mode 100644
index c7e52a56..00000000
--- a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{#d-modal-body class="next-session-time-modal" title=title}}
- {{date-time-input
- date=bufferedDateTime
- onChange=(action "dateTimeChanged")
- showTime=true
- clearable=true
- }}
-{{/d-modal-body}}
-
-
\ No newline at end of file
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e8ceb44b..9fa23d53 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -55,6 +55,8 @@ en:
liquid_syntax_error: "Liquid syntax error in %{attribute}: %{message}"
subscription: "%{type} %{property} usage is not supported on your subscription"
not_permitted_for_guests: "%{object_id} is not permitted when guests can access the wizard"
+ error_messages:
+ wizard_replacing_composer: "Category not allowed for topic creation."
site_settings:
custom_wizard_enabled: "Enable custom wizards."
diff --git a/plugin.rb b/plugin.rb
index f50e1e8a..2c2f5215 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -1,7 +1,7 @@
# 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.4.21
+# version: 2.4.24
# 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
@@ -239,4 +239,13 @@ after_initialize do
end
DiscourseEvent.trigger(:custom_wizard_ready)
+
+ on(:before_create_topic) do |topic_params, user|
+ category = topic_params.category
+ if category&.custom_fields&.[]('create_topic_wizard').present?
+ raise Discourse::InvalidParameters.new(
+ I18n.t('wizard.error_messages.wizard_replacing_composer')
+ )
+ end
+ end
end
diff --git a/spec/extensions/topic_extension_spec.rb b/spec/extensions/topic_extension_spec.rb
new file mode 100644
index 00000000..da4f416e
--- /dev/null
+++ b/spec/extensions/topic_extension_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+describe Topic, type: :model do
+ fab!(:category_with_wizard) do
+ Fabricate(:category, custom_fields: { create_topic_wizard: 'true' })
+ end
+ fab!(:category_without_wizard) { Fabricate(:category) }
+ fab!(:user) { Fabricate(:user) }
+ let(:valid_attrs) { Fabricate.attributes_for(:topic) }
+
+ context 'with a create_topic_wizard custom field in the category' do
+ it 'will not allow creating a topic directly' do
+ expect do
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(
+ title: 'A valid and sufficiently long title for testing',
+ category: category_with_wizard.id,
+ raw: 'hello this is a test topic with category with custom fields'
+ )
+ )
+ end.to raise_error(
+ Discourse::InvalidParameters,
+ 'Category not allowed for topic creation.'
+ )
+ end
+ end
+
+ context 'without a create_topic_wizard custom field in the category' do
+ it 'will allow creating a topic directly' do
+ expect do
+ TopicCreator.create(
+ user,
+ Guardian.new(user),
+ valid_attrs.merge(
+ category: category_without_wizard.id,
+ title: 'Another valid and sufficiently long title for testing',
+ raw: 'This is the body of a valid topic'
+ )
+ )
+ end.not_to raise_error
+ end
+ end
+end
diff --git a/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js b/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js
index 8811c989..fbfa2314 100644
--- a/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js
+++ b/test/javascripts/acceptance/admin-custom-fields-unsubscribed-test.js
@@ -13,7 +13,7 @@ import {
} from "../helpers/admin-wizard";
import { Promise } from "rsvp";
-acceptance("Admin | Custom Fields Unsuscribed", function (needs) {
+acceptance("Admin | Custom Fields Unsubscribed", function (needs) {
needs.user();
needs.settings({
custom_wizard_enabled: true,
diff --git a/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js b/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
index 9e2b00e7..52d70e69 100644
--- a/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
+++ b/test/javascripts/acceptance/admin-wizards-unsuscribed-test.js
@@ -16,7 +16,7 @@ import {
getWizard,
} from "../helpers/admin-wizard";
-acceptance("Admin | Custom Wizard Unsuscribed", function (needs) {
+acceptance("Admin | Custom Wizard Unsubscribed", function (needs) {
needs.user();
needs.settings({
custom_wizard_enabled: true,
@@ -257,7 +257,7 @@ acceptance("Admin | Custom Wizard Unsuscribed", function (needs) {
".wizard-custom-step .wizard-text-editor .d-editor button.local-dates"
);
assert.ok(
- exists(".discourse-local-dates-create-modal.modal-body"),
+ exists(".discourse-local-dates-create-modal .modal-body"),
"Insert date-time modal visible"
);
assert.ok(
@@ -269,7 +269,7 @@ acceptance("Admin | Custom Wizard Unsuscribed", function (needs) {
await click(".modal-footer button.advanced-mode-btn");
assert.ok(
exists(
- ".discourse-local-dates-create-modal.modal-body .advanced-options"
+ ".discourse-local-dates-create-modal .modal-body .advanced-options"
),
"Advanced mode is visible"
);
diff --git a/test/javascripts/acceptance/category-chooser-initializer-test.js b/test/javascripts/acceptance/category-chooser-initializer-test.js
new file mode 100644
index 00000000..f7e02bb8
--- /dev/null
+++ b/test/javascripts/acceptance/category-chooser-initializer-test.js
@@ -0,0 +1,82 @@
+import { click, visit } from "@ember/test-helpers";
+import { acceptance } from "discourse/tests/helpers/qunit-helpers";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
+import { test } from "qunit";
+
+acceptance("Category Chooser Initializer", function (needs) {
+ needs.user();
+ needs.settings({
+ allow_uncategorized_topics: false,
+ });
+ needs.site({
+ can_tag_topics: true,
+ categories: [
+ {
+ id: 1,
+ name: "General",
+ slug: "general",
+ permission: 1,
+ topic_template: null,
+ },
+ {
+ id: 2,
+ name: "Category with custom field",
+ slug: "category-custom-field",
+ permission: 1,
+ topic_template: "",
+ custom_fields: {
+ create_topic_wizard: "21",
+ },
+ },
+ {
+ id: 3,
+ name: "Category 1",
+ slug: "category-1",
+ permission: 1,
+ topic_template: "",
+ },
+ {
+ id: 4,
+ name: "Category 2",
+ slug: "category-2",
+ permission: 1,
+ topic_template: "",
+ },
+ ],
+ });
+
+ test("does not display category with create_topic_wizard custom field", async function (assert) {
+ const categoryChooser = selectKit(".category-chooser");
+
+ await visit("/");
+ await click("#create-topic");
+ await categoryChooser.expand();
+ let categories = Array.from(
+ document.querySelectorAll(".category-chooser .category-row")
+ ).filter((category) => category.getAttribute("data-name")); // Filter elements with a data-name attribute
+ assert.equal(
+ categories.length,
+ 3,
+ "Correct number of categories are displayed"
+ );
+ const categoryNames = ["General", "Category 1", "Category 2"];
+
+ categoryNames.forEach((categoryName) => {
+ assert.ok(
+ categories.some(
+ (category) => category.getAttribute("data-name") === categoryName
+ ),
+ `Category '${categoryName}' is displayed`
+ );
+ });
+
+ const categoryNameWithCustomField = "Category with custom field";
+ assert.notOk(
+ categories.some(
+ (category) =>
+ category.getAttribute("data-name") === categoryNameWithCustomField
+ ),
+ `Category '${categoryNameWithCustomField}' is not displayed`
+ );
+ });
+});
diff --git a/test/javascripts/acceptance/wizard-test.js b/test/javascripts/acceptance/wizard-test.js
index dd441649..0527cf0f 100644
--- a/test/javascripts/acceptance/wizard-test.js
+++ b/test/javascripts/acceptance/wizard-test.js
@@ -74,6 +74,15 @@ acceptance("Wizard | Redirect", function (needs) {
"pending wizard routing works"
);
});
+
+ test("Don't redirect to pending Wizard when ingore redirect param is supplied", async function (assert) {
+ sinon.stub(DiscourseURL, "routeTo");
+ await visit("/latest?ignore_redirect=1");
+ assert.notOk(
+ DiscourseURL.routeTo.calledWith("/w/wizard"),
+ "pending wizard routing blocked"
+ );
+ });
});
acceptance("Wizard | Wizard", function (needs) {