From 4d5322cc1afc95aaf8fe3e27b99c28e72e4e2ee3 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 10 Jul 2023 16:02:27 +0530 Subject: [PATCH] fix: removed reset changes btn --- .../public/js/form_builder/form_builder.bundle.js | 10 ++-------- frappe/public/js/form_builder/store.js | 13 +++---------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js index 3bfe144684..03f41c4bd6 100644 --- a/frappe/public/js/form_builder/form_builder.bundle.js +++ b/frappe/public/js/form_builder/form_builder.bundle.js @@ -26,7 +26,7 @@ class FormBuilder { this.watch_changes(); } - async setup_page_actions() { + setup_page_actions() { this.preview_btn = this.page.add_button(__("Show Preview"), () => { this.store.preview = !this.store.preview; @@ -37,10 +37,6 @@ class FormBuilder { this.store.read_only = this.store.preview; this.read_only = true; }); - - this.reset_changes_btn = this.page.add_button(__("Reset Form Changes"), () => { - this.store.reset_changes(); - }); } setup_app() { @@ -73,11 +69,9 @@ class FormBuilder { watch_changes() { watchEffect(() => { if (this.store.dirty) { - this.reset_changes_btn.show(); - this.frm.form_dirty = this.frm.doc.__unsaved; this.frm.dirty(); } else { - this.reset_changes_btn.hide(); + this.page.clear_indicator(); } // toggle preview btn text diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js index 761c47b899..d82263f375 100644 --- a/frappe/public/js/form_builder/store.js +++ b/frappe/public/js/form_builder/store.js @@ -69,7 +69,7 @@ export const useStore = defineStore("form-builder-store", () => { return cint(field.df.is_custom_field && !field.df.is_system_generated); } - async function fetch(reset) { + async function fetch() { doc.value = frm.value.doc; if (doctype.value.startsWith("new-doctype-")) { doc.value.fields = [get_df("Data", "", __("Title"))]; @@ -92,10 +92,8 @@ export const useStore = defineStore("form-builder-store", () => { nextTick(() => { dirty.value = false; - if (!reset || !frm.value.form_dirty) { - frm.value.doc.__unsaved = 0; - frm.value.page.clear_indicator(); - } + frm.value.doc.__unsaved = 0; + frm.value.page.clear_indicator(); read_only.value = !is_customize_form.value && !frappe.boot.developer_mode && !doc.value.custom; preview.value = false; @@ -139,10 +137,6 @@ export const useStore = defineStore("form-builder-store", () => { frappe.breadcrumbs.$breadcrumbs.append(breadcrumbs); } - function reset_changes() { - fetch(true); - } - function validate_fields(fields, is_table) { fields = scrub_field_names(fields); @@ -334,7 +328,6 @@ export const useStore = defineStore("form-builder-store", () => { has_standard_field, is_user_generated_field, fetch, - reset_changes, validate_fields, update_fields, get_updated_fields,