Skip to content

A platform for community discussion. Free, open, simple.

FIX: Don't save automation when saving key-value field modal (#44479)

Régis Hanol8ee92d2dadd1
diff --git a/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs
index 076e7bcc715..339b6589643 100644
--- a/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs
+++ b/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs
@@ -60,7 +60,6 @@ export default class AutomationField extends Component {
@field={{@field}}
@label={{this.label}}
@placeholders={{@automation.placeholders}}
- @saveAutomation={{@saveAutomation}}
/>
{{/if}}
</template>
diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs
index c3ed573dce9..8bf87f6d4be 100644
--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs
+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs
@@ -44,7 +44,7 @@ export default class KeyValueField extends BaseField {
@closeModal={{this.closeModal}}
@model={{hash
value=this.value
- updateValue=this.handleValueChange
+ updateValue=this.mutValue
settingName=@label
jsonSchema=this.jsonSchema
}}
@@ -82,14 +82,6 @@ export default class KeyValueField extends BaseField {
}
}
- @action
- handleValueChange(value) {
- if (value !== this.args.field.metadata.value) {
- this.mutValue(value);
- this.args.saveAutomation();
- }
- }
-
@action
openModal() {
this.showJsonEditorModal = true;
diff --git a/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjs b/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjs
index 19ad3da9ad8..b03ac499d06 100644
--- a/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjs
+++ b/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjs
@@ -156,10 +156,6 @@ export default <template>
<AutomationField
@automation={{@controller.automation}}
@field={{field}}
- @saveAutomation={{fn
- @controller.saveAutomation
- @controller.automation
- }}
/>
{{/each}}
{{/if}}
@@ -186,10 +182,6 @@ export default <template>
<AutomationField
@automation={{@controller.automation}}
@field={{field}}
- @saveAutomation={{fn
- @controller.saveAutomation
- @controller.automation
- }}
/>
{{/each}}
</div>
@@ -199,11 +191,7 @@ export default <template>
<div class="control-group">
<DButton
class="btn-primary update-automation"
- @action={{fn
- @controller.saveAutomation
- @controller.automation
- true
- }}
+ @action={{fn @controller.saveAutomation true}}
@isLoading={{@controller.isUpdatingAutomation}}
@label="discourse_automation.update"
@type="submit"
diff --git a/plugins/automation/spec/system/automation_edit_page_spec.rb b/plugins/automation/spec/system/automation_edit_page_spec.rb
index c87d4220282..97e93ad63df 100644
--- a/plugins/automation/spec/system/automation_edit_page_spec.rb
+++ b/plugins/automation/spec/system/automation_edit_page_spec.rb
@@ -10,6 +10,8 @@ describe "DiscourseAutomation | Edit page" do
field :dog, component: :text, required: false
end
+ DiscourseAutomation::Scriptable.add("key_value_cats") { field :cats, component: :"key-value" }
+
SiteSetting.discourse_automation_enabled = true
sign_in(admin)
end
@@ -57,4 +59,24 @@ describe "DiscourseAutomation | Edit page" do
)
end
end
+
+ describe "the key-value field" do
+ it "doesn't save the automation when saving the modal" do
+ automation.update!(script: "key_value_cats")
+ automation_page.visit(automation)
+
+ find(".key-value-field .configure-btn").click
+ modal = PageObjects::Modals::Base.new(modal_selector: ".json-schema-editor-modal")
+ modal.click_primary_button
+
+ expect(modal).to be_closed
+ expect(page).to have_current_path("/admin/plugins/automation/automation/#{automation.id}")
+ expect(automation.fields.where(name: "cats")).to be_empty
+
+ automation_page.update
+
+ expect(page).to have_current_path("/admin/plugins/automation/automation")
+ expect(automation.fields.find_by(name: "cats").metadata["value"]).to be_present
+ end
+ end
end