Merge pull request #153 from paviliondev/conditionality_fix
Conditionality Fix
Dieser Commit ist enthalten in:
Commit
c2864b9790
9 geänderte Dateien mit 78 neuen und 8 gelöschten Zeilen
|
@ -24,6 +24,8 @@ const customFieldActionMap = {
|
|||
user: ["update_profile"],
|
||||
};
|
||||
|
||||
const values = ["present", "true", "false"];
|
||||
|
||||
export default Component.extend({
|
||||
classNameBindings: [":mapper-selector", "activeType"],
|
||||
|
||||
|
@ -60,6 +62,9 @@ export default Component.extend({
|
|||
showCustomField: computed("activeType", function () {
|
||||
return this.showInput("customField");
|
||||
}),
|
||||
showValue: computed("activeType", function () {
|
||||
return this.showInput("value");
|
||||
}),
|
||||
textEnabled: computed("options.textSelection", "inputType", function () {
|
||||
return this.optionEnabled("textSelection");
|
||||
}),
|
||||
|
@ -117,6 +122,9 @@ export default Component.extend({
|
|||
listEnabled: computed("options.listSelection", "inputType", function () {
|
||||
return this.optionEnabled("listSelection");
|
||||
}),
|
||||
valueEnabled: computed("connector", function () {
|
||||
return this.connector === "is";
|
||||
}),
|
||||
|
||||
groups: alias("site.groups"),
|
||||
categories: alias("site.categories"),
|
||||
|
@ -125,7 +133,8 @@ export default Component.extend({
|
|||
"showWizardAction",
|
||||
"showUserField",
|
||||
"showUserFieldOptions",
|
||||
"showCustomField"
|
||||
"showCustomField",
|
||||
"showValue"
|
||||
),
|
||||
showMultiSelect: or("showCategory", "showGroup"),
|
||||
hasTypes: gt("selectorTypes.length", 1),
|
||||
|
@ -157,7 +166,7 @@ export default Component.extend({
|
|||
}
|
||||
},
|
||||
|
||||
@discourseComputed
|
||||
@discourseComputed("connector")
|
||||
selectorTypes() {
|
||||
return selectionTypes
|
||||
.filter((type) => this[`${type}Enabled`])
|
||||
|
@ -268,6 +277,13 @@ export default Component.extend({
|
|||
}));
|
||||
}
|
||||
|
||||
if (activeType === "value") {
|
||||
content = values.map((value) => ({
|
||||
id: value,
|
||||
name: value,
|
||||
}));
|
||||
}
|
||||
|
||||
return content;
|
||||
},
|
||||
|
||||
|
@ -337,7 +353,7 @@ export default Component.extend({
|
|||
resetActiveType() {
|
||||
this.set(
|
||||
"activeType",
|
||||
defaultSelectionType(this.selectorType, this.options)
|
||||
defaultSelectionType(this.selectorType, this.options, this.connector)
|
||||
);
|
||||
},
|
||||
|
||||
|
|
|
@ -105,13 +105,18 @@ const selectionTypes = [
|
|||
"tag",
|
||||
"user",
|
||||
"customField",
|
||||
"value",
|
||||
];
|
||||
|
||||
function defaultSelectionType(inputType, options = {}) {
|
||||
function defaultSelectionType(inputType, options = {}, connector = null) {
|
||||
if (options[`${inputType}DefaultSelection`]) {
|
||||
return options[`${inputType}DefaultSelection`];
|
||||
}
|
||||
|
||||
if (connector === "is") {
|
||||
return "value";
|
||||
}
|
||||
|
||||
let type = selectionTypes[0];
|
||||
|
||||
for (let t of selectionTypes) {
|
||||
|
|
|
@ -23,7 +23,8 @@
|
|||
value=pair.value
|
||||
activeType=pair.value_type
|
||||
options=options
|
||||
onUpdate=onUpdate}}
|
||||
onUpdate=onUpdate
|
||||
connector=pair.connector}}
|
||||
</div>
|
||||
|
||||
{{#if showJoin}}
|
||||
|
|
|
@ -124,6 +124,7 @@ en:
|
|||
group: "group"
|
||||
list: "list"
|
||||
custom_field: "custom field"
|
||||
value: "value"
|
||||
|
||||
placeholder:
|
||||
text: "Enter text"
|
||||
|
@ -138,7 +139,8 @@ en:
|
|||
group: "Select group"
|
||||
list: "Enter item"
|
||||
custom_field: "Select field"
|
||||
|
||||
value: "Select value"
|
||||
|
||||
error:
|
||||
failed: "failed to save wizard"
|
||||
required: "{{type}} requires {{property}}"
|
||||
|
|
|
@ -143,7 +143,7 @@ class CustomWizard::Mapper
|
|||
if value == "present"
|
||||
result = key.public_send(operator)
|
||||
elsif ["true", "false"].include?(value)
|
||||
result = key.public_send(operator, ActiveRecord::Type::Boolean.new.cast(value))
|
||||
result = bool(key).public_send(operator, bool(value))
|
||||
end
|
||||
elsif [key, value, operator].all? { |i| !i.nil? }
|
||||
result = key.public_send(operator, value)
|
||||
|
@ -265,4 +265,8 @@ class CustomWizard::Mapper
|
|||
result = data[k]
|
||||
keys.empty? ? result : self.recurse(result, keys)
|
||||
end
|
||||
|
||||
def bool(value)
|
||||
ActiveRecord::Type::Boolean.new.cast(value)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
# name: discourse-custom-wizard
|
||||
# about: Create custom wizards
|
||||
# version: 1.15.1
|
||||
# version: 1.15.2
|
||||
# authors: Angus McLeod
|
||||
# url: https://github.com/paviliondev/discourse-custom-wizard
|
||||
# contact emails: angus@thepavilion.io
|
||||
|
|
|
@ -47,6 +47,14 @@ describe CustomWizard::Builder do
|
|||
)
|
||||
}
|
||||
|
||||
let(:boolean_field_condition_json) {
|
||||
JSON.parse(
|
||||
File.open(
|
||||
"#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/condition/boolean_field_condition.json"
|
||||
).read
|
||||
)
|
||||
}
|
||||
|
||||
before do
|
||||
Group.refresh_automatic_group!(:trust_level_3)
|
||||
CustomWizard::Template.save(
|
||||
|
@ -322,6 +330,7 @@ describe CustomWizard::Builder do
|
|||
context "with condition" do
|
||||
before do
|
||||
@template[:steps][0][:fields][0][:condition] = user_condition_json['condition']
|
||||
@template[:steps][2][:fields][5][:condition] = boolean_field_condition_json['condition']
|
||||
CustomWizard::Template.save(@template.as_json)
|
||||
end
|
||||
|
||||
|
@ -334,6 +343,16 @@ describe CustomWizard::Builder do
|
|||
wizard = CustomWizard::Builder.new(@template[:id], user).build
|
||||
expect(wizard.steps.first.fields.first.id).to eq(@template[:steps][0][:fields][1]['id'])
|
||||
end
|
||||
|
||||
it "works if a field condition uses 'is true/false'" do
|
||||
builder = CustomWizard::Builder.new(@template[:id], user)
|
||||
wizard = builder.build
|
||||
wizard.create_updater('step_2', step_2_field_5: 'true').update
|
||||
|
||||
builder = CustomWizard::Builder.new(@template[:id], user)
|
||||
wizard = builder.build
|
||||
expect(wizard.steps.last.fields.last.id).to eq(@template[:steps][2][:fields][5]['id'])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
17
spec/fixtures/condition/boolean_field_condition.json
gevendort
Normale Datei
17
spec/fixtures/condition/boolean_field_condition.json
gevendort
Normale Datei
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"condition": [
|
||||
{
|
||||
"type": "validation",
|
||||
"pairs": [
|
||||
{
|
||||
"index": 0,
|
||||
"key": "step_2_field_5",
|
||||
"key_type": "wizard_field",
|
||||
"value": "true",
|
||||
"value_type": "text",
|
||||
"connector": "is"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
6
spec/fixtures/wizard.json
gevendort
6
spec/fixtures/wizard.json
gevendort
|
@ -157,6 +157,12 @@
|
|||
"label": "User Selector",
|
||||
"description": "",
|
||||
"type": "user_selector"
|
||||
},
|
||||
{
|
||||
"id": "step_3_field_6",
|
||||
"label": "Conditional User Selector",
|
||||
"description": "Shown when checkbox in step_2_field_5 is true",
|
||||
"type": "user_selector"
|
||||
}
|
||||
],
|
||||
"description": "Unfortunately not the edible type :sushi: "
|
||||
|
|
Laden …
In neuem Issue referenzieren