From e3a8625bcfca325b53f7435b0598edf0f981de0e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Jun 2023 18:27:57 +0530
Subject: [PATCH 01/50] fix: do not render sidebar in doctype form

---
 frappe/public/js/frappe/form/form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 0a60b00af2..dd57e773cb 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -77,9 +77,12 @@ frappe.ui.form.Form = class FrappeForm {
 		// wrapper
 		this.wrapper = this.parent;
 		this.$wrapper = $(this.wrapper);
+
+		let is_single_column = this.doctype === "DocType" ? true : this.meta.hide_toolbar;
+
 		frappe.ui.make_app_page({
 			parent: this.wrapper,
-			single_column: this.meta.hide_toolbar,
+			single_column: is_single_column,
 		});
 		this.page = this.wrapper.page;
 		this.layout_main = this.page.main.get(0);

From 25bb74c2f950597d29231c4e1a8f62f188061258 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Jun 2023 18:29:15 +0530
Subject: [PATCH 02/50] fix: make tabs in doctype form

---
 frappe/core/doctype/doctype/doctype.json | 82 ++++++++++++++----------
 1 file changed, 47 insertions(+), 35 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 5209a408eb..a342bdacae 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -25,9 +25,6 @@
   "beta",
   "is_virtual",
   "queue_in_background",
-  "fields_section_break",
-  "try_form_builder_html",
-  "fields",
   "sb1",
   "naming_rule",
   "autoname",
@@ -35,6 +32,32 @@
   "column_break_15",
   "description",
   "documentation",
+  "sb2",
+  "permissions",
+  "restrict_to_domain",
+  "read_only",
+  "in_create",
+  "actions_section",
+  "actions",
+  "links_section",
+  "links",
+  "document_states_section",
+  "states",
+  "web_view",
+  "has_web_view",
+  "allow_guest_to_view",
+  "index_web_pages_for_search",
+  "route",
+  "is_published_field",
+  "website_search_field",
+  "advanced",
+  "engine",
+  "migration_hash",
+  "form_builder_tab",
+  "form_builder",
+  "fields_section",
+  "fields",
+  "settings_tab",
   "form_settings_section",
   "image_field",
   "timeline_field",
@@ -68,28 +91,7 @@
   "column_break_51",
   "email_append_to",
   "sender_field",
-  "subject_field",
-  "sb2",
-  "permissions",
-  "restrict_to_domain",
-  "read_only",
-  "in_create",
-  "actions_section",
-  "actions",
-  "links_section",
-  "links",
-  "document_states_section",
-  "states",
-  "web_view",
-  "has_web_view",
-  "allow_guest_to_view",
-  "index_web_pages_for_search",
-  "route",
-  "is_published_field",
-  "website_search_field",
-  "advanced",
-  "engine",
-  "migration_hash"
+  "subject_field"
  ],
  "fields": [
   {
@@ -195,12 +197,6 @@
    "fieldtype": "Check",
    "label": "Beta"
   },
-  {
-   "fieldname": "fields_section_break",
-   "fieldtype": "Section Break",
-   "label": "Fields",
-   "oldfieldtype": "Section Break"
-  },
   {
    "fieldname": "fields",
    "fieldtype": "Table",
@@ -633,9 +629,25 @@
    "label": "Is Calendar and Gantt"
   },
   {
-   "fieldname": "try_form_builder_html",
+   "fieldname": "settings_tab",
+   "fieldtype": "Tab Break",
+   "label": "Settings"
+  },
+  {
+   "fieldname": "form_builder_tab",
+   "fieldtype": "Tab Break",
+   "label": "Form"
+  },
+  {
+   "fieldname": "form_builder",
    "fieldtype": "HTML",
-   "label": "Try Form Builder HTML"
+   "label": "Form Builder"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "fields_section",
+   "fieldtype": "Section Break",
+   "label": "Fields"
   }
  ],
  "icon": "fa fa-bolt",
@@ -718,7 +730,7 @@
    "link_fieldname": "reference_doctype"
   }
  ],
- "modified": "2023-05-15 14:07:51.526257",
+ "modified": "2023-06-14 20:44:15.361716",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",
@@ -755,4 +767,4 @@
  "states": [],
  "track_changes": 1,
  "translated_doctype": 1
-}
+}
\ No newline at end of file

From 7349ccc3555a47a22fa2f8c1bfbac6e5b897513d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Jun 2023 18:30:06 +0530
Subject: [PATCH 03/50] fix: render form builder in html field in doctype form

---
 frappe/core/doctype/doctype/doctype.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index bb2af5cec0..9f1e262b09 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -21,7 +21,7 @@ frappe.ui.form.on("DocType", {
 			frm.toggle_enable("beta", 0);
 		}
 
-		render_form_builder_message(frm);
+		render_form_builder(frm);
 
 		if (!frm.is_new() && !frm.doc.istable) {
 			if (frm.doc.issingle) {
@@ -142,4 +142,15 @@ function render_form_builder_message(frm) {
 	}
 }
 
+function render_form_builder(frm) {
+	frappe.require("form_builder.bundle.js").then(() => {
+		frappe.form_builder = new frappe.ui.FormBuilder({
+			wrapper: $(frm.fields_dict["form_builder"].wrapper),
+			page: frm.page,
+			doctype: frm.doc.name,
+			customize: false,
+		});
+	});
+}
+
 extend_cscript(cur_frm.cscript, new frappe.model.DocTypeController({ frm: cur_frm }));

From b661500c6518389576dc01590ef240ea1dfe5406 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Jun 2023 18:30:44 +0530
Subject: [PATCH 04/50] revert: form builder breadcrumbs creation

---
 frappe/public/js/form_builder/store.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 384baf646d..e1366bd9e9 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -105,7 +105,6 @@ export const useStore = defineStore("form-builder-store", () => {
 		});
 
 		setup_undo_redo();
-		setup_breadcrumbs();
 	}
 
 	let undo_redo_keyboard_event = onKeyDown(true, (e) => {

From 9bfec81c7ca1e99abb464a4245ab6feeba5f1a5d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Jun 2023 18:31:25 +0530
Subject: [PATCH 05/50] fix: do not scroll when tabs are changed in form
 builder

---
 frappe/public/js/form_builder/components/Tabs.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/form_builder/components/Tabs.vue b/frappe/public/js/form_builder/components/Tabs.vue
index 5c233dbd1b..557b83c866 100644
--- a/frappe/public/js/form_builder/components/Tabs.vue
+++ b/frappe/public/js/form_builder/components/Tabs.vue
@@ -20,7 +20,8 @@ function activate_tab(tab) {
 	nextTick(() => {
 		$(".tabs .tab.active")[0].scrollIntoView({
 			behavior: "smooth",
-			inline: "center"
+			inline: "center",
+			block: "nearest",
 		});
 	});
 }

From b97fc51edd0cbe876868ae946c3def3f924dfa64 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 14 Jun 2023 18:33:33 +0530
Subject: [PATCH 06/50] style: css changes to fit in tab

---
 frappe/public/js/form_builder/FormBuilder.vue       | 13 ++++++++++---
 .../js/form_builder/components/FieldTypes.vue       |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/form_builder/FormBuilder.vue b/frappe/public/js/form_builder/FormBuilder.vue
index c1ab90c4a4..a393388963 100644
--- a/frappe/public/js/form_builder/FormBuilder.vue
+++ b/frappe/public/js/form_builder/FormBuilder.vue
@@ -62,9 +62,8 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .form-builder-container {
-	margin-bottom: -60px;
+	margin: -12px -20px -5px;
 	display: flex;
-	gap: 20px;
 
 	&.resizing {
 		user-select: none;
@@ -79,12 +78,20 @@ onMounted(() => {
 		flex: 1;
 	}
 
-	.form-sidebar,
+	.form-sidebar {
+		border-right: 1px solid var(--border-color);
+		border-bottom-left-radius: var(--border-radius);
+	}
+
 	.form-main {
 		border-radius: var(--border-radius);
 		box-shadow: var(--card-shadow);
 		background-color: var(--card-bg);
+		margin: 10px;
+	}
 
+	.form-sidebar,
+	.form-main {
 		:deep(.section-columns.has-one-column .field) {
 			input.form-control, .signature-field {
 				width: calc(50% - 19px);
diff --git a/frappe/public/js/form_builder/components/FieldTypes.vue b/frappe/public/js/form_builder/components/FieldTypes.vue
index 2907614a51..50902b5a3a 100644
--- a/frappe/public/js/form_builder/components/FieldTypes.vue
+++ b/frappe/public/js/form_builder/components/FieldTypes.vue
@@ -67,7 +67,7 @@ function on_drag_end(evt) {
 
 <style lang="scss" scoped>
 .fields-container {
-	height: calc(100vh - 250px);
+	height: calc(100vh - 233px);
 	overflow-y: auto;
 	display: grid;
 	gap: 8px;

From d00c32e4a668b5938cc13c68a066e944e293f171 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 23 Jun 2023 15:02:58 +0530
Subject: [PATCH 07/50] fix: removed add doctype using form builder button

---
 frappe/core/doctype/doctype/doctype_list.js | 28 ---------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 frappe/core/doctype/doctype/doctype_list.js

diff --git a/frappe/core/doctype/doctype/doctype_list.js b/frappe/core/doctype/doctype/doctype_list.js
deleted file mode 100644
index f4811fa01d..0000000000
--- a/frappe/core/doctype/doctype/doctype_list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-frappe.listview_settings["DocType"] = {
-	onload: function (me) {
-		me.page.btn_primary.addClass("hidden");
-		this.setup_select_primary_button(me);
-	},
-
-	setup_select_primary_button: function (me) {
-		let actions = [
-			{
-				label: __("Add DocType (Form Builder)"),
-				description: __("Use the form builder to create a new DocType"),
-				action: () => frappe.set_route("form-builder", "new-doctype"),
-			},
-			{
-				label: __("Add DocType"),
-				description: __("Create a new DocType"),
-				action: () => frappe.new_doc("DocType"),
-			},
-		];
-
-		frappe.utils.add_select_group_button(
-			me.page.btn_primary.parent(),
-			actions,
-			"btn-primary",
-			"add"
-		);
-	},
-};

From d111aab507f3d44fdafacc2eaab5838cddffa7f0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 23 Jun 2023 16:48:11 +0530
Subject: [PATCH 08/50] fix: hide fields table in doctype

---
 frappe/core/doctype/doctype/doctype.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index a342bdacae..51fb6a51dd 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -647,7 +647,8 @@
    "collapsible": 1,
    "fieldname": "fields_section",
    "fieldtype": "Section Break",
-   "label": "Fields"
+   "label": "Fields",
+   "hidden": 1
   }
  ],
  "icon": "fa fa-bolt",

From 1cc55ba21d0a20d961d66f8d0f12521a2951d513 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 10:46:07 +0530
Subject: [PATCH 09/50] fix: remove overflow-x from tab content

---
 frappe/public/js/form_builder/components/Tabs.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/form_builder/components/Tabs.vue b/frappe/public/js/form_builder/components/Tabs.vue
index 557b83c866..b091abefb6 100644
--- a/frappe/public/js/form_builder/components/Tabs.vue
+++ b/frappe/public/js/form_builder/components/Tabs.vue
@@ -281,6 +281,7 @@ function delete_tab(with_children) {
 .tab-contents {
 	max-height: calc(100vh - 210px);
 	overflow-y: auto;
+	overflow-x: hidden;
 	border-radius: var(--border-radius);
 	min-height: 70px;
 

From e08a474cd61b99c64abf657756dd0910354da1c9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 10:53:59 +0530
Subject: [PATCH 10/50] fix: send frm to form builder to control frm properties

---
 frappe/core/doctype/doctype/doctype.js               | 2 +-
 frappe/public/js/form_builder/form_builder.bundle.js | 8 ++++----
 frappe/public/js/form_builder/store.js               | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 9f1e262b09..8f990c0ac1 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -146,7 +146,7 @@ function render_form_builder(frm) {
 	frappe.require("form_builder.bundle.js").then(() => {
 		frappe.form_builder = new frappe.ui.FormBuilder({
 			wrapper: $(frm.fields_dict["form_builder"].wrapper),
-			page: frm.page,
+			frm: frm,
 			doctype: frm.doc.name,
 			customize: false,
 		});
diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js
index 87767d6961..d585ae1d6e 100644
--- a/frappe/public/js/form_builder/form_builder.bundle.js
+++ b/frappe/public/js/form_builder/form_builder.bundle.js
@@ -5,9 +5,10 @@ import FormBuilderComponent from "./FormBuilder.vue";
 import { registerGlobalComponents } from "./globals.js";
 
 class FormBuilder {
-	constructor({ wrapper, page, doctype, customize }) {
+	constructor({ wrapper, frm, doctype, customize }) {
 		this.$wrapper = $(wrapper);
-		this.page = page;
+		this.frm = frm;
+		this.page = frm.page;
 		this.doctype = doctype;
 		this.customize = customize;
 		this.read_only = false;
@@ -99,10 +100,9 @@ class FormBuilder {
 	watch_changes() {
 		watchEffect(() => {
 			if (this.store.dirty) {
-				this.page.set_indicator(__("Not Saved"), "orange");
 				this.reset_changes_btn.show();
+				this.frm.dirty();
 			} else {
-				this.page.clear_indicator();
 				this.reset_changes_btn.hide();
 			}
 
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index e1366bd9e9..b866ff9f2c 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -5,6 +5,7 @@ import { useDebouncedRefHistory, onKeyDown } from "@vueuse/core";
 
 export const useStore = defineStore("form-builder-store", () => {
 	let doctype = ref("");
+	let frm = ref(null);
 	let doc = ref(null);
 	let docfields = ref([]);
 	let custom_docfields = ref([]);
@@ -310,6 +311,7 @@ export const useStore = defineStore("form-builder-store", () => {
 
 	return {
 		doctype,
+		frm,
 		doc,
 		form,
 		dirty,

From 670dc7b3223b32b8f51048149c00d851c4b88859 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 11:00:36 +0530
Subject: [PATCH 11/50] fix: load new doctype with one field without name

---
 frappe/public/js/form_builder/store.js | 14 +++-----------
 frappe/public/js/form_builder/utils.js |  4 +---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index b866ff9f2c..cf2d9b33ce 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -70,17 +70,9 @@ export const useStore = defineStore("form-builder-store", () => {
 	}
 
 	async function fetch() {
-		await frappe.model.clear_doc("DocType", doctype.value);
-		await frappe.model.with_doctype(doctype.value);
-
-		if (is_customize_form.value) {
-			await frappe.model.with_doc("Customize Form");
-			let _doc = frappe.get_doc("Customize Form");
-			_doc.doc_type = doctype.value;
-			let r = await frappe.call({ method: "fetch_to_customize", doc: _doc });
-			doc.value = r.docs[0];
-		} else {
-			doc.value = await frappe.db.get_doc("DocType", doctype.value);
+		doc.value = frm.value.doc;
+		if (doctype.value.startsWith("new-doctype-")) {
+			doc.value.fields = [get_df("Data", "", __("Title"))];
 		}
 
 		if (!get_docfields.value.length) {
diff --git a/frappe/public/js/form_builder/utils.js b/frappe/public/js/form_builder/utils.js
index 1f9ffbb20e..b5c1699c40 100644
--- a/frappe/public/js/form_builder/utils.js
+++ b/frappe/public/js/form_builder/utils.js
@@ -61,8 +61,6 @@ export function create_layout(fields) {
 		if (df.fieldname) {
 			// make a copy to avoid mutation bugs
 			df = JSON.parse(JSON.stringify(df));
-		} else {
-			continue;
 		}
 
 		if (df.fieldtype === "Tab Break") {
@@ -71,7 +69,7 @@ export function create_layout(fields) {
 			set_section(df);
 		} else if (df.fieldtype === "Column Break") {
 			set_column(df);
-		} else if (df.name) {
+		} else {
 			if (!column) set_column();
 
 			let field = { df: df };

From 3e3d868895a1564210481ee1e9e10531c9d72f22 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 11:02:07 +0530
Subject: [PATCH 12/50] fix: removed unused code

---
 frappe/public/js/form_builder/FormBuilder.vue | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/frappe/public/js/form_builder/FormBuilder.vue b/frappe/public/js/form_builder/FormBuilder.vue
index a393388963..4dd04f5b70 100644
--- a/frappe/public/js/form_builder/FormBuilder.vue
+++ b/frappe/public/js/form_builder/FormBuilder.vue
@@ -3,7 +3,7 @@ import Sidebar from "./components/Sidebar.vue"
 import Tabs from "./components/Tabs.vue";
 import { computed, onMounted, watch, ref } from "vue";
 import { useStore } from "./store";
-import { onClickOutside, useMagicKeys, whenever } from "@vueuse/core";
+import { onClickOutside } from "@vueuse/core";
 
 let store = useStore();
 
@@ -14,19 +14,6 @@ let should_render = computed(() => {
 let container = ref(null);
 onClickOutside(container, () => store.form.selected_field = null);
 
-// cmd/ctrl + s to save the form
-const { meta_s, ctrl_s } = useMagicKeys();
-whenever(() => meta_s.value || ctrl_s.value, () => {
-	if (store.dirty) {
-		store.save_changes();
-	}
-});
-
-function setup_change_doctype_dialog() {
-	store.page.$title_area.on("click", () => {
-		frappe.pages["form-builder"].select_doctype();
-	});
-}
 
 watch(
 	() => store.form.layout,
@@ -34,10 +21,7 @@ watch(
 	{ deep: true }
 );
 
-onMounted(() => {
-	store.fetch();
-	setup_change_doctype_dialog();
-});
+onMounted(() => store.fetch());
 </script>
 
 <template>

From 0f4120724032db06607b841851d9209f1ea5919c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 11:04:28 +0530
Subject: [PATCH 13/50] fix: reuse the same form_builder vue instance with for
 different doctypes

---
 frappe/core/doctype/doctype/doctype.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 8f990c0ac1..4f807b9f1c 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -143,14 +143,25 @@ function render_form_builder_message(frm) {
 }
 
 function render_form_builder(frm) {
-	frappe.require("form_builder.bundle.js").then(() => {
-		frappe.form_builder = new frappe.ui.FormBuilder({
-			wrapper: $(frm.fields_dict["form_builder"].wrapper),
-			frm: frm,
-			doctype: frm.doc.name,
-			customize: false,
+	if (frappe.form_builder && frappe.form_builder.doctype === frm.doc.name) return;
+
+	if (frappe.form_builder) {
+		frappe.form_builder.wrapper = $(frm.fields_dict["form_builder"].wrapper);
+		frappe.form_builder.frm = frm;
+		frappe.form_builder.doctype = frm.doc.name;
+		frappe.form_builder.customize = false;
+		frappe.form_builder.init(true);
+		frappe.form_builder.store.fetch();
+	} else {
+		frappe.require("form_builder.bundle.js").then(() => {
+			frappe.form_builder = new frappe.ui.FormBuilder({
+				wrapper: $(frm.fields_dict["form_builder"].wrapper),
+				frm: frm,
+				doctype: frm.doc.name,
+				customize: false,
+			});
 		});
-	});
+	}
 }
 
 extend_cscript(cur_frm.cscript, new frappe.model.DocTypeController({ frm: cur_frm }));

From 61175469b6bb0b5149f64a82fb70a4dcbb4184d9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 11:05:43 +0530
Subject: [PATCH 14/50] fix: update store while reusing form builder vue
 instance

---
 frappe/public/js/form_builder/form_builder.bundle.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js
index d585ae1d6e..b4fe6b2bab 100644
--- a/frappe/public/js/form_builder/form_builder.bundle.js
+++ b/frappe/public/js/form_builder/form_builder.bundle.js
@@ -22,6 +22,7 @@ class FormBuilder {
 
 		this.setup_page_actions();
 		!refresh && this.setup_app();
+		refresh && this.update_store();
 		this.watch_changes();
 	}
 
@@ -86,9 +87,7 @@ class FormBuilder {
 
 		// create a store
 		this.store = useStore();
-		this.store.doctype = this.doctype;
-		this.store.is_customize_form = this.customize;
-		this.store.page = this.page;
+		this.update_store();
 
 		// register global components
 		registerGlobalComponents(app);
@@ -97,6 +96,13 @@ class FormBuilder {
 		this.$form_builder = app.mount(this.$wrapper.get(0));
 	}
 
+	update_store() {
+		this.store.doctype = this.doctype;
+		this.store.is_customize_form = this.customize;
+		this.store.page = this.page;
+		this.store.frm = this.frm;
+	}
+
 	watch_changes() {
 		watchEffect(() => {
 			if (this.store.dirty) {

From 63fa87d2b4e71e375d61d3ba0d81ac6054d25b95 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 11:14:32 +0530
Subject: [PATCH 15/50] fix: update fields before save

set default name to fields if not set
---
 frappe/core/doctype/doctype/doctype.js |  7 ++++++
 frappe/public/js/form_builder/store.js | 31 ++++++++++++++++----------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 4f807b9f1c..7ebbd2b5b9 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -2,6 +2,13 @@
 // MIT License. See license.txt
 
 frappe.ui.form.on("DocType", {
+	before_save: function (frm) {
+		let form_builder = frappe.form_builder;
+		if (form_builder?.store) {
+			form_builder.store.update_fields();
+			frm.refresh_fields();
+		}
+	},
 	refresh: function (frm) {
 		frm.set_query("role", "permissions", function (doc) {
 			if (doc.custom && frappe.session.user != "Administrator") {
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index cf2d9b33ce..91dee966f9 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -202,11 +202,8 @@ export const useStore = defineStore("form-builder-store", () => {
 		});
 	}
 
-	async function save_changes() {
-		if (!dirty.value) {
-			frappe.show_alert({ message: __("No changes to save"), indicator: "orange" });
-			return;
-		}
+	function update_fields() {
+		if (!dirty.value && !frm.value.is_new()) return;
 
 		frappe.dom.freeze(__("Saving..."));
 
@@ -216,14 +213,12 @@ export const useStore = defineStore("form-builder-store", () => {
 				_doc.doc_type = doctype.value;
 				_doc.fields = get_updated_fields();
 				validate_fields(_doc.fields, _doc.istable);
-				await frappe.call({ method: "save_customization", doc: _doc });
 			} else {
-				doc.value.fields = get_updated_fields();
-				validate_fields(doc.value.fields, doc.value.istable);
-				await frappe.call("frappe.client.save", { doc: doc.value });
-				frappe.toast("Fields Table Updated");
+				let fields = get_updated_fields();
+				validate_fields(fields, doc.value.istable);
+				doc.value.fields = fields;
+				return fields;
 			}
-			fetch();
 		} catch (e) {
 			console.error(e);
 		} finally {
@@ -244,6 +239,9 @@ export const useStore = defineStore("form-builder-store", () => {
 			) {
 				idx++;
 				tab.df.idx = idx;
+				if (tab.df.__unsaved) {
+					tab.df.name = "new-docfield-" + idx;
+				}
 				fields.push(tab.df);
 			}
 
@@ -257,6 +255,9 @@ export const useStore = defineStore("form-builder-store", () => {
 				if ((j == 0 && is_df_updated(section.df, get_df("Section Break"))) || j > 0) {
 					idx++;
 					section.df.idx = idx;
+					if (section.df.__unsaved) {
+						section.df.name = "new-docfield-" + idx;
+					}
 					fields.push(section.df);
 				}
 
@@ -269,12 +270,18 @@ export const useStore = defineStore("form-builder-store", () => {
 					) {
 						idx++;
 						column.df.idx = idx;
+						if (column.df.__unsaved) {
+							column.df.name = "new-docfield-" + idx;
+						}
 						fields.push(column.df);
 					}
 
 					column.fields.forEach((field) => {
 						idx++;
 						field.df.idx = idx;
+						if (field.df.__unsaved) {
+							field.df.name = "new-docfield-" + idx;
+						}
 						fields.push(field.df);
 						section.has_fields = true;
 					});
@@ -321,7 +328,7 @@ export const useStore = defineStore("form-builder-store", () => {
 		fetch,
 		reset_changes,
 		validate_fields,
-		save_changes,
+		update_fields,
 		get_updated_fields,
 		is_df_updated,
 		get_layout,

From 5db44e858b675c6fa9fedff64d0c4358b3478bfd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 11:15:47 +0530
Subject: [PATCH 16/50] fix: validate before saving

---
 frappe/core/doctype/doctype/doctype.js | 6 +++++-
 frappe/public/js/form_builder/store.js | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 7ebbd2b5b9..5cc4a8ea98 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -5,7 +5,11 @@ frappe.ui.form.on("DocType", {
 	before_save: function (frm) {
 		let form_builder = frappe.form_builder;
 		if (form_builder?.store) {
-			form_builder.store.update_fields();
+			let fields = form_builder.store.update_fields();
+
+			if (!fields.length) {
+				frappe.throw(__("Error occurred while saving the form."));
+			}
 			frm.refresh_fields();
 		}
 	},
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 91dee966f9..83a65b6fa1 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -142,6 +142,10 @@ export const useStore = defineStore("form-builder-store", () => {
 	function validate_fields(fields, is_table) {
 		fields = scrub_field_names(fields);
 
+		if (!fields.length) {
+			frappe.throw(__("DocType must have atleast one field"));
+		}
+
 		let not_allowed_in_list_view = ["Attach Image", ...frappe.model.no_value_type];
 		if (is_table) {
 			not_allowed_in_list_view = not_allowed_in_list_view.filter((f) => f != "Button");

From 29555899a725b50d735e3c63c43c6eb1a0f3c6a0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 13:49:34 +0530
Subject: [PATCH 17/50] fix: fetch after save

---
 frappe/core/doctype/doctype/doctype.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 5cc4a8ea98..91a02e9937 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -13,6 +13,15 @@ frappe.ui.form.on("DocType", {
 			frm.refresh_fields();
 		}
 	},
+	after_save: function (frm) {
+		if (
+			frappe.form_builder &&
+			frappe.form_builder.doctype === frm.doc.name &&
+			frappe.form_builder.store
+		) {
+			frappe.form_builder.store.fetch();
+		}
+	},
 	refresh: function (frm) {
 		frm.set_query("role", "permissions", function (doc) {
 			if (doc.custom && frappe.session.user != "Administrator") {

From b225bd22feadb1983d8516eeada1acacc6660a87 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 13:50:58 +0530
Subject: [PATCH 18/50] fix: set default name only for new fields

---
 frappe/public/js/form_builder/store.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 83a65b6fa1..6518420ed6 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -243,7 +243,7 @@ export const useStore = defineStore("form-builder-store", () => {
 			) {
 				idx++;
 				tab.df.idx = idx;
-				if (tab.df.__unsaved) {
+				if (tab.df.__unsaved && tab.df.__islocal) {
 					tab.df.name = "new-docfield-" + idx;
 				}
 				fields.push(tab.df);
@@ -259,7 +259,7 @@ export const useStore = defineStore("form-builder-store", () => {
 				if ((j == 0 && is_df_updated(section.df, get_df("Section Break"))) || j > 0) {
 					idx++;
 					section.df.idx = idx;
-					if (section.df.__unsaved) {
+					if (section.df.__unsaved && section.df.__islocal) {
 						section.df.name = "new-docfield-" + idx;
 					}
 					fields.push(section.df);
@@ -274,7 +274,7 @@ export const useStore = defineStore("form-builder-store", () => {
 					) {
 						idx++;
 						column.df.idx = idx;
-						if (column.df.__unsaved) {
+						if (column.df.__unsaved && column.df.__islocal) {
 							column.df.name = "new-docfield-" + idx;
 						}
 						fields.push(column.df);
@@ -283,7 +283,7 @@ export const useStore = defineStore("form-builder-store", () => {
 					column.fields.forEach((field) => {
 						idx++;
 						field.df.idx = idx;
-						if (field.df.__unsaved) {
+						if (field.df.__unsaved && field.df.__islocal) {
 							field.df.name = "new-docfield-" + idx;
 						}
 						fields.push(field.df);

From 053a5f039728c5dba31506ba7992e81b95e320aa Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 14:02:14 +0530
Subject: [PATCH 19/50] fix: removed unused action buttons

---
 .../js/form_builder/form_builder.bundle.js    | 84 -------------------
 1 file changed, 84 deletions(-)

diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js
index b4fe6b2bab..a4388d3a6a 100644
--- a/frappe/public/js/form_builder/form_builder.bundle.js
+++ b/frappe/public/js/form_builder/form_builder.bundle.js
@@ -27,16 +27,6 @@ class FormBuilder {
 	}
 
 	async setup_page_actions() {
-		// clear actions
-		this.page.clear_actions();
-		this.page.clear_menu();
-		this.page.clear_custom_actions();
-
-		// setup page actions
-		this.primary_btn = this.page.set_primary_action(__("Save"), () =>
-			this.store.save_changes()
-		);
-
 		this.preview_btn = this.page.add_button(__("Show Preview"), () => {
 			this.store.preview = !this.store.preview;
 
@@ -51,29 +41,6 @@ class FormBuilder {
 		this.reset_changes_btn = this.page.add_button(__("Reset Changes"), () => {
 			this.store.reset_changes();
 		});
-
-		this.go_to_doctype_list_btn = this.page.add_button(
-			__("Go to {0} List", [__(this.doctype)]),
-			() => {
-				window.open(`/app/${frappe.router.slug(this.doctype)}`);
-			}
-		);
-
-		this.customize_form_btn = this.page.add_menu_item(__("Switch to Customize"), () => {
-			frappe.set_route("form-builder", this.doctype, "customize");
-		});
-		this.doctype_form_btn = this.page.add_menu_item(__("Switch to DocType"), () => {
-			frappe.set_route("form-builder", this.doctype);
-		});
-
-		this.go_to_doctype_btn = this.page.add_menu_item(__("Go to DocType"), () =>
-			frappe.set_route("Form", "DocType", this.doctype)
-		);
-		this.go_to_customize_form_btn = this.page.add_menu_item(__("Go to Customize Form"), () =>
-			frappe.set_route("Form", "Customize Form", {
-				doc_type: this.doctype,
-			})
-		);
 	}
 
 	setup_app() {
@@ -112,59 +79,8 @@ class FormBuilder {
 				this.reset_changes_btn.hide();
 			}
 
-			// hide all buttons
-			this.go_to_doctype_list_btn.hide();
-			this.customize_form_btn.hide();
-			this.doctype_form_btn.hide();
-			this.go_to_doctype_btn.hide();
-			this.go_to_customize_form_btn.hide();
-
-			this.page.menu_btn_group.show();
-			let hide_menu = true;
-
-			// show customize form & Go to customize form btn
-			if (
-				this.store.doc &&
-				!this.store.doc.custom &&
-				!this.store.doc.issingle &&
-				!this.store.is_customize_form &&
-				!in_list(frappe.model.core_doctypes_list, this.doctype)
-			) {
-				this.customize_form_btn.show();
-				this.go_to_customize_form_btn.show();
-				hide_menu = false;
-			}
-
-			// show doctype form & Go to doctype form btn
-			if (
-				this.store.doc &&
-				!this.store.doc.custom &&
-				!this.store.doc.issingle &&
-				this.store.is_customize_form
-			) {
-				this.doctype_form_btn.show();
-				this.go_to_doctype_btn.show();
-				hide_menu = false;
-			}
-
-			// show Go to {0} List or Go to {0} button
-			if (this.store.doc && !this.store.doc.istable) {
-				let label = this.store.doc.issingle
-					? __("Go to {0}", [__(this.doctype)])
-					: __("Go to {0} List", [__(this.doctype)]);
-
-				this.go_to_doctype_list_btn.text(label).show();
-			}
-
-			if (hide_menu && window.matchMedia("(min-device-width: 992px)").matches) {
-				this.page.menu_btn_group.hide();
-			}
-
 			// toggle preview btn text
 			this.preview_btn.text(this.store.preview ? __("Hide Preview") : __("Show Preview"));
-
-			// toggle primary btn and show indicator based on read_only state
-			this.primary_btn.toggle(!this.store.read_only);
 			if (this.store.read_only) {
 				let message = this.store.preview ? __("Preview Mode") : __("Read Only");
 				this.page.set_indicator(message, "orange");

From c8d19d82e1df8cd50037304320f4e2b0729c0cdf Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 14:02:58 +0530
Subject: [PATCH 20/50] fix: make fields table unrequired

---
 frappe/public/js/frappe/doctype/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frappe/public/js/frappe/doctype/index.js b/frappe/public/js/frappe/doctype/index.js
index a0023164d7..5b072d6bfa 100644
--- a/frappe/public/js/frappe/doctype/index.js
+++ b/frappe/public/js/frappe/doctype/index.js
@@ -134,8 +134,6 @@ frappe.model.DocTypeController = class DocTypeController extends frappe.ui.form.
 
 			setTimeout(() => (this.frm.__from_autoname = false), 500);
 		}
-
-		this.frm.set_df_property("fields", "reqd", this.frm.doc.autoname !== "Prompt");
 	}
 
 	setup_fetch_from_fields(doc, doctype, docname) {

From 2fe91f93de7bbfd9a898d64fc8221144671a3d8e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 14:09:06 +0530
Subject: [PATCH 21/50] fix: make form undirty on fetch

---
 frappe/public/js/form_builder/store.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 6518420ed6..04961e98d3 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -92,6 +92,8 @@ export const useStore = defineStore("form-builder-store", () => {
 
 		nextTick(() => {
 			dirty.value = false;
+			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;

From 0919306f40160de9ab17256117ce4822e7033d10 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 14:26:09 +0530
Subject: [PATCH 22/50] fix: clear Not Saved indicator only if doctype
 properties were not changed

---
 frappe/public/js/form_builder/form_builder.bundle.js |  3 ++-
 frappe/public/js/form_builder/store.js               | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js
index a4388d3a6a..3bfe144684 100644
--- a/frappe/public/js/form_builder/form_builder.bundle.js
+++ b/frappe/public/js/form_builder/form_builder.bundle.js
@@ -38,7 +38,7 @@ class FormBuilder {
 			this.read_only = true;
 		});
 
-		this.reset_changes_btn = this.page.add_button(__("Reset Changes"), () => {
+		this.reset_changes_btn = this.page.add_button(__("Reset Form Changes"), () => {
 			this.store.reset_changes();
 		});
 	}
@@ -74,6 +74,7 @@ class FormBuilder {
 		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();
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 04961e98d3..761c47b899 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() {
+	async function fetch(reset) {
 		doc.value = frm.value.doc;
 		if (doctype.value.startsWith("new-doctype-")) {
 			doc.value.fields = [get_df("Data", "", __("Title"))];
@@ -92,8 +92,10 @@ export const useStore = defineStore("form-builder-store", () => {
 
 		nextTick(() => {
 			dirty.value = false;
-			frm.value.doc.__unsaved = 0;
-			frm.value.page.clear_indicator();
+			if (!reset || !frm.value.form_dirty) {
+				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;
@@ -138,7 +140,7 @@ export const useStore = defineStore("form-builder-store", () => {
 	}
 
 	function reset_changes() {
-		fetch();
+		fetch(true);
 	}
 
 	function validate_fields(fields, is_table) {

From 4d5322cc1afc95aaf8fe3e27b99c28e72e4e2ee3 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 16:02:27 +0530
Subject: [PATCH 23/50] 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,

From cbe23facc24cf722f7e3a23968119c665a197cda Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 16:03:33 +0530
Subject: [PATCH 24/50] fix: set page action & fetch on page refresh or
 reload_doc

---
 frappe/core/doctype/doctype/doctype.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 91a02e9937..b28c833a7c 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -41,8 +41,6 @@ frappe.ui.form.on("DocType", {
 			frm.toggle_enable("beta", 0);
 		}
 
-		render_form_builder(frm);
-
 		if (!frm.is_new() && !frm.doc.istable) {
 			if (frm.doc.issingle) {
 				frm.add_custom_button(__("Go to {0}", [__(frm.doc.name)]), () => {
@@ -92,6 +90,8 @@ frappe.ui.form.on("DocType", {
 		frm.cscript.autoname(frm);
 		frm.cscript.set_naming_rule_description(frm);
 		frm.trigger("setup_default_views");
+
+		render_form_builder(frm);
 	},
 
 	istable: (frm) => {
@@ -163,7 +163,11 @@ function render_form_builder_message(frm) {
 }
 
 function render_form_builder(frm) {
-	if (frappe.form_builder && frappe.form_builder.doctype === frm.doc.name) return;
+	if (frappe.form_builder && frappe.form_builder.doctype === frm.doc.name) {
+		frappe.form_builder.setup_page_actions();
+		frappe.form_builder.store.fetch();
+		return;
+	}
 
 	if (frappe.form_builder) {
 		frappe.form_builder.wrapper = $(frm.fields_dict["form_builder"].wrapper);

From a62d5249448d134cf6ff695e6c9deb2304d49601 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 16:37:02 +0530
Subject: [PATCH 25/50] fix: on show preview change the tab to Form

---
 frappe/public/js/form_builder/form_builder.bundle.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js
index 03f41c4bd6..ac49098288 100644
--- a/frappe/public/js/form_builder/form_builder.bundle.js
+++ b/frappe/public/js/form_builder/form_builder.bundle.js
@@ -28,6 +28,7 @@ class FormBuilder {
 
 	setup_page_actions() {
 		this.preview_btn = this.page.add_button(__("Show Preview"), () => {
+			this.store.frm.layout.tabs.find((tab) => tab.label === "Form").set_active();
 			this.store.preview = !this.store.preview;
 
 			if (this.store.read_only && !this.read_only) {
@@ -36,6 +37,9 @@ class FormBuilder {
 
 			this.store.read_only = this.store.preview;
 			this.read_only = true;
+
+			// toggle preview btn text
+			this.preview_btn.text(this.store.preview ? __("Hide Preview") : __("Show Preview"));
 		});
 	}
 
@@ -74,8 +78,6 @@ class FormBuilder {
 				this.page.clear_indicator();
 			}
 
-			// toggle preview btn text
-			this.preview_btn.text(this.store.preview ? __("Hide Preview") : __("Show Preview"));
 			if (this.store.read_only) {
 				let message = this.store.preview ? __("Preview Mode") : __("Read Only");
 				this.page.set_indicator(message, "orange");

From e0b8fd9f137cfffd6db34cec1efa99c49c636859 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 17:06:06 +0530
Subject: [PATCH 26/50] fix: clear and create preview button

---
 frappe/public/js/form_builder/form_builder.bundle.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js
index ac49098288..6f507936cb 100644
--- a/frappe/public/js/form_builder/form_builder.bundle.js
+++ b/frappe/public/js/form_builder/form_builder.bundle.js
@@ -27,6 +27,7 @@ class FormBuilder {
 	}
 
 	setup_page_actions() {
+		this.preview_btn?.remove();
 		this.preview_btn = this.page.add_button(__("Show Preview"), () => {
 			this.store.frm.layout.tabs.find((tab) => tab.label === "Form").set_active();
 			this.store.preview = !this.store.preview;

From 4d282f1d9143df94c42b823ef0715f111e10df88 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 17:20:31 +0530
Subject: [PATCH 27/50] fix: separate undo redo functionally for doctype form
 and form builder

---
 frappe/public/js/form_builder/store.js | 2 +-
 frappe/public/js/frappe/form/form.js   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index d82263f375..79a718c9c0 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -104,7 +104,7 @@ export const useStore = defineStore("form-builder-store", () => {
 
 	let undo_redo_keyboard_event = onKeyDown(true, (e) => {
 		if (!ref_history.value) return;
-		if (e.ctrlKey || e.metaKey) {
+		if (frm.value.get_active_tab().label == "Form" && (e.ctrlKey || e.metaKey)) {
 			if (e.key === "z" && !e.shiftKey && ref_history.value.canUndo) {
 				ref_history.value.undo();
 			} else if (e.key === "z" && e.shiftKey && ref_history.value.canRedo) {
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 5216837ffe..d5be43fc6a 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -160,12 +160,14 @@ frappe.ui.form.Form = class FrappeForm {
 			action: () => this.undo_manager.undo(),
 			page: this.page,
 			description: __("Undo last action"),
+			condition: () => !this.is_form_builder(),
 		});
 		frappe.ui.keys.add_shortcut({
 			shortcut: "shift+ctrl+z",
 			action: () => this.undo_manager.redo(),
 			page: this.page,
 			description: __("Redo last action"),
+			condition: () => !this.is_form_builder(),
 		});
 		frappe.ui.keys.add_shortcut({
 			shortcut: "ctrl+y",
@@ -1364,6 +1366,10 @@ frappe.ui.form.Form = class FrappeForm {
 		return this.doc.__islocal;
 	}
 
+	is_form_builder() {
+		return this.doctype === "DocType" && this.get_active_tab().label == "Form";
+	}
+
 	get_perm(permlevel, access_type) {
 		return this.perm[permlevel] ? this.perm[permlevel][access_type] : null;
 	}

From b5f43916816e77f493ff653b8de8827ce0cf6e74 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 17:33:30 +0530
Subject: [PATCH 28/50] style: reduced resizer z-index as it was escaping the
 doctype tabs

---
 frappe/public/js/form_builder/components/Sidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/form_builder/components/Sidebar.vue b/frappe/public/js/form_builder/components/Sidebar.vue
index ed50510cc3..dc292058c4 100644
--- a/frappe/public/js/form_builder/components/Sidebar.vue
+++ b/frappe/public/js/form_builder/components/Sidebar.vue
@@ -77,7 +77,7 @@ watch(
 	opacity: 0;
 	background-color: var(--bg-gray);
 	transition: opacity 0.2s ease;
-	z-index: 10;
+	z-index: 4;
 	cursor: col-resize;
 
 	&:hover, &.resizing {

From c694d2f1e821d978911edba30a0459e606e166a8 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 17:35:49 +0530
Subject: [PATCH 29/50] fix: removed unused code

---
 frappe/public/js/form_builder/store.js | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 79a718c9c0..ca6cf59326 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -119,24 +119,6 @@ export const useStore = defineStore("form-builder-store", () => {
 		undo_redo_keyboard_event;
 	}
 
-	function setup_breadcrumbs() {
-		!is_customize_form.value && frappe.model.init_doctype("DocType");
-		let breadcrumbs = `
-			<li><a href="/app/doctype">${__("DocType")}</a></li>
-			<li><a href="/app/doctype/${doctype.value}">${__(doctype.value)}</a></li>
-		`;
-		if (is_customize_form.value) {
-			breadcrumbs = `
-				<li><a href="/app/customize-form?doc_type=${doctype.value}">
-					${__("Customize Form")}
-				</a></li>
-			`;
-		}
-		breadcrumbs += `<li class="disabled"><a href="#">${__("Form Builder")}</a></li>`;
-		frappe.breadcrumbs.clear();
-		frappe.breadcrumbs.$breadcrumbs.append(breadcrumbs);
-	}
-
 	function validate_fields(fields, is_table) {
 		fields = scrub_field_names(fields);
 

From 98bedb7058aea671a14ad2629c2481aa0c083f1a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 19:09:58 +0530
Subject: [PATCH 30/50] fix: compare with a deep copy version of dfs

---
 frappe/public/js/form_builder/store.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index ca6cf59326..b2aa3084fa 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -283,9 +283,11 @@ export const useStore = defineStore("form-builder-store", () => {
 	}
 
 	function is_df_updated(df, new_df) {
-		delete df.name;
-		delete new_df.name;
-		return JSON.stringify(df) != JSON.stringify(new_df);
+		let df_copy = JSON.parse(JSON.stringify(df));
+		let new_df_copy = JSON.parse(JSON.stringify(new_df));
+		delete df_copy.name;
+		delete new_df_copy.name;
+		return JSON.stringify(df_copy) != JSON.stringify(new_df_copy);
 	}
 
 	function get_layout() {

From 727480480faeefd65f605578cc9ec3acc77eeac3 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 19:10:29 +0530
Subject: [PATCH 31/50] fix: only show validation error if form is dirty

---
 frappe/core/doctype/doctype/doctype.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index b28c833a7c..32eb0fd2bb 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -7,7 +7,7 @@ frappe.ui.form.on("DocType", {
 		if (form_builder?.store) {
 			let fields = form_builder.store.update_fields();
 
-			if (!fields.length) {
+			if (!fields?.length && frm.is_dirty()) {
 				frappe.throw(__("Error occurred while saving the form."));
 			}
 			frm.refresh_fields();

From a8e73054c64fe9b6957b71107a114aa0ade4d750 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 19:21:50 +0530
Subject: [PATCH 32/50] fix: also consider Customize Form for form_builder

---
 frappe/public/js/frappe/form/form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index d5be43fc6a..5e6acc9bcd 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1367,7 +1367,10 @@ frappe.ui.form.Form = class FrappeForm {
 	}
 
 	is_form_builder() {
-		return this.doctype === "DocType" && this.get_active_tab().label == "Form";
+		return (
+			in_list(["DocType", "Customize Form"], this.doctype) &&
+			this.get_active_tab().label == "Form"
+		);
 	}
 
 	get_perm(permlevel, access_type) {

From a62fce498cd8eba9c47fb59a07fb6de1a0b5a5cd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 10 Jul 2023 19:22:24 +0530
Subject: [PATCH 33/50] fix: render form builder in html field in customize
 form

---
 .../doctype/customize_form/customize_form.js  | 27 ++++++++++++++
 .../customize_form/customize_form.json        | 37 +++++++++++++------
 2 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index bd711c169d..0d07e0dc35 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -65,6 +65,7 @@ frappe.ui.form.on("Customize Form", {
 							frm.refresh();
 							frm.trigger("add_customize_child_table_button");
 							frm.trigger("setup_default_views");
+							render_form_builder(frm);
 						}
 					}
 					localStorage["customize_doctype"] = frm.doc.doc_type;
@@ -460,4 +461,30 @@ function render_form_builder_message(frm) {
 	}
 }
 
+function render_form_builder(frm) {
+	if (frappe.form_builder && frappe.form_builder.doctype === frm.doc.name) {
+		frappe.form_builder.setup_page_actions();
+		frappe.form_builder.store.fetch();
+		return;
+	}
+
+	if (frappe.form_builder) {
+		frappe.form_builder.wrapper = $(frm.fields_dict["form_builder"].wrapper);
+		frappe.form_builder.frm = frm;
+		frappe.form_builder.doctype = frm.doc.name;
+		frappe.form_builder.customize = true;
+		frappe.form_builder.init(true);
+		frappe.form_builder.store.fetch();
+	} else {
+		frappe.require("form_builder.bundle.js").then(() => {
+			frappe.form_builder = new frappe.ui.FormBuilder({
+				wrapper: $(frm.fields_dict["form_builder"].wrapper),
+				frm: frm,
+				doctype: frm.doc.name,
+				customize: true,
+			});
+		});
+	}
+}
+
 extend_cscript(cur_frm.cscript, new frappe.model.DocTypeController({ frm: cur_frm }));
diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index e0d822eb61..ddc01f7dcb 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -21,12 +21,20 @@
   "allow_auto_repeat",
   "allow_import",
   "queue_in_background",
-  "fields_section_break",
-  "try_form_builder_html",
-  "fields",
   "naming_section",
   "naming_rule",
   "autoname",
+  "document_actions_section",
+  "actions",
+  "document_links_section",
+  "links",
+  "document_states_section",
+  "states",
+  "form_tab",
+  "form_builder",
+  "fields_section_break",
+  "fields",
+  "settings_tab",
   "form_settings_section",
   "image_field",
   "max_attachments",
@@ -48,12 +56,6 @@
   "email_append_to",
   "sender_field",
   "subject_field",
-  "document_actions_section",
-  "actions",
-  "document_links_section",
-  "links",
-  "document_states_section",
-  "states",
   "section_break_8",
   "sort_field",
   "column_break_10",
@@ -178,6 +180,7 @@
    "description": "Customize Label, Print Hide, Default etc.",
    "fieldname": "fields_section_break",
    "fieldtype": "Section Break",
+   "hidden": 1,
    "label": "Fields"
   },
   {
@@ -369,9 +372,19 @@
    "label": "Is Calendar and Gantt"
   },
   {
-   "fieldname": "try_form_builder_html",
+   "fieldname": "settings_tab",
+   "fieldtype": "Tab Break",
+   "label": "Settings"
+  },
+  {
+   "fieldname": "form_builder",
    "fieldtype": "HTML",
-   "label": "Try Form Builder HTML"
+   "label": "Form Builder"
+  },
+  {
+   "fieldname": "form_tab",
+   "fieldtype": "Tab Break",
+   "label": "Form"
   }
  ],
  "hide_toolbar": 1,
@@ -380,7 +393,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-05-15 16:03:19.872532",
+ "modified": "2023-07-10 19:20:26.149909",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form",

From 1aff1a8f24ebc226d1403dc3fc6684a40645267d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 12:38:05 +0530
Subject: [PATCH 34/50] fix: commonify update fields for customize form and
 doctype form

---
 frappe/public/js/form_builder/store.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index b2aa3084fa..bdc36b69ef 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -192,17 +192,10 @@ export const useStore = defineStore("form-builder-store", () => {
 		frappe.dom.freeze(__("Saving..."));
 
 		try {
-			if (is_customize_form.value) {
-				let _doc = frappe.get_doc("Customize Form");
-				_doc.doc_type = doctype.value;
-				_doc.fields = get_updated_fields();
-				validate_fields(_doc.fields, _doc.istable);
-			} else {
-				let fields = get_updated_fields();
-				validate_fields(fields, doc.value.istable);
-				doc.value.fields = fields;
-				return fields;
-			}
+			let fields = get_updated_fields();
+			validate_fields(fields, doc.value.istable);
+			doc.value.fields = fields;
+			return fields;
 		} catch (e) {
 			console.error(e);
 		} finally {

From 07a4aa5046e34a7c0909785bff823e50920f8cfe Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 12:39:02 +0530
Subject: [PATCH 35/50] fix: separate new field name for customize form &
 doctype form

---
 frappe/public/js/form_builder/store.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index bdc36b69ef..65435fb03d 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -206,6 +206,9 @@ export const useStore = defineStore("form-builder-store", () => {
 	function get_updated_fields() {
 		let fields = [];
 		let idx = 0;
+		let new_field_name = is_customize_form.value
+			? "new-customize-form-field-"
+			: "new-docfield-";
 
 		let layout_fields = JSON.parse(JSON.stringify(form.value.layout.tabs));
 
@@ -217,7 +220,7 @@ export const useStore = defineStore("form-builder-store", () => {
 				idx++;
 				tab.df.idx = idx;
 				if (tab.df.__unsaved && tab.df.__islocal) {
-					tab.df.name = "new-docfield-" + idx;
+					tab.df.name = new_field_name + idx;
 				}
 				fields.push(tab.df);
 			}
@@ -233,7 +236,7 @@ export const useStore = defineStore("form-builder-store", () => {
 					idx++;
 					section.df.idx = idx;
 					if (section.df.__unsaved && section.df.__islocal) {
-						section.df.name = "new-docfield-" + idx;
+						section.df.name = new_field_name + idx;
 					}
 					fields.push(section.df);
 				}
@@ -248,7 +251,7 @@ export const useStore = defineStore("form-builder-store", () => {
 						idx++;
 						column.df.idx = idx;
 						if (column.df.__unsaved && column.df.__islocal) {
-							column.df.name = "new-docfield-" + idx;
+							column.df.name = new_field_name + idx;
 						}
 						fields.push(column.df);
 					}
@@ -257,7 +260,7 @@ export const useStore = defineStore("form-builder-store", () => {
 						idx++;
 						field.df.idx = idx;
 						if (field.df.__unsaved && field.df.__islocal) {
-							field.df.name = "new-docfield-" + idx;
+							field.df.name = new_field_name + idx;
 						}
 						fields.push(field.df);
 						section.has_fields = true;

From 64225bb90963ec53446a2f0cb90884ab63b4298e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 12:40:54 +0530
Subject: [PATCH 36/50] fix: remove render form builder message

---
 .../doctype/customize_form/customize_form.js  | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index 0d07e0dc35..139bccd20d 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -101,8 +101,6 @@ frappe.ui.form.on("Customize Form", {
 				frm.page.set_title(__("Customize Form - {0}", [frm.doc.doc_type]));
 				frappe.customize_form.set_primary_action(frm);
 
-				render_form_builder_message(frm);
-
 				frm.add_custom_button(
 					__("Go to {0} List", [__(frm.doc.doc_type)]),
 					function () {
@@ -434,33 +432,6 @@ frappe.customize_form.clear_locals_and_refresh = function (frm) {
 	frm.refresh();
 };
 
-function render_form_builder_message(frm) {
-	$(frm.fields_dict["try_form_builder_html"].wrapper).empty();
-	if (!frm.is_new() && frm.fields_dict["try_form_builder_html"]) {
-		let title = __("Use Form Builder to visually customize your form layout");
-		let msg = __(
-			"You can drag and drop fields to create your form layout, add tabs, sections and columns to organize your form and update field properties all from one screen."
-		);
-
-		let message = `
-		<div class="flex form-message blue p-3">
-			<div class="mr-3"><img style="border-radius: var(--border-radius-md)" width="275" src="/assets/frappe/images/form-builder.gif"></div>
-			<div>
-				<p style="font-size: var(--text-lg)">${title}</p>
-				<p>${msg}</p>
-				<div>
-					<a class="btn btn-primary btn-sm" href="/app/form-builder/${frm.doc.doc_type}/customize">
-						${__("Form Builder")} ${frappe.utils.icon("right", "xs")}
-					</a>
-				</div>
-			</div>
-		</div>
-		`;
-
-		$(frm.fields_dict["try_form_builder_html"].wrapper).html(message);
-	}
-}
-
 function render_form_builder(frm) {
 	if (frappe.form_builder && frappe.form_builder.doctype === frm.doc.name) {
 		frappe.form_builder.setup_page_actions();

From ad4aaf7ae0287ea527bc651afbef540e5c488b90 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 12:42:38 +0530
Subject: [PATCH 37/50] fix: load customize form doc_type instead of name

---
 frappe/custom/doctype/customize_form/customize_form.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index 139bccd20d..d35ebbc9b6 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -433,7 +433,7 @@ frappe.customize_form.clear_locals_and_refresh = function (frm) {
 };
 
 function render_form_builder(frm) {
-	if (frappe.form_builder && frappe.form_builder.doctype === frm.doc.name) {
+	if (frappe.form_builder && frappe.form_builder.doctype === frm.doc.doc_type) {
 		frappe.form_builder.setup_page_actions();
 		frappe.form_builder.store.fetch();
 		return;
@@ -442,7 +442,7 @@ function render_form_builder(frm) {
 	if (frappe.form_builder) {
 		frappe.form_builder.wrapper = $(frm.fields_dict["form_builder"].wrapper);
 		frappe.form_builder.frm = frm;
-		frappe.form_builder.doctype = frm.doc.name;
+		frappe.form_builder.doctype = frm.doc.doc_type;
 		frappe.form_builder.customize = true;
 		frappe.form_builder.init(true);
 		frappe.form_builder.store.fetch();
@@ -451,7 +451,7 @@ function render_form_builder(frm) {
 			frappe.form_builder = new frappe.ui.FormBuilder({
 				wrapper: $(frm.fields_dict["form_builder"].wrapper),
 				frm: frm,
-				doctype: frm.doc.name,
+				doctype: frm.doc.doc_type,
 				customize: true,
 			});
 		});

From 8efb61133930b441ac73be9bf8988994bc82cf9c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 12:43:44 +0530
Subject: [PATCH 38/50] fix: render form builder on refresh not on change of
 doc_type

---
 frappe/custom/doctype/customize_form/customize_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index d35ebbc9b6..bf089462a4 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -65,7 +65,6 @@ frappe.ui.form.on("Customize Form", {
 							frm.refresh();
 							frm.trigger("add_customize_child_table_button");
 							frm.trigger("setup_default_views");
-							render_form_builder(frm);
 						}
 					}
 					localStorage["customize_doctype"] = frm.doc.doc_type;
@@ -148,6 +147,8 @@ frappe.ui.form.on("Customize Form", {
 					["queue_in_background"],
 					frappe.get_meta(frm.doc.doc_type).is_submittable || 0
 				);
+
+				render_form_builder(frm);
 			});
 		}
 

From 71edb99f5ccedbd61277cacdb768b7577be3b618 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 12:47:37 +0530
Subject: [PATCH 39/50] fix: remove validate fieldname with restricted
 fieldnames logic

since every new custom field is now prepended with 'custom_'
---
 .../doctype/customize_form/customize_form.js  | 34 +------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index bf089462a4..8ec0b4c7dd 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -334,37 +334,6 @@ frappe.ui.form.on("DocType State", {
 	},
 });
 
-frappe.customize_form.validate_fieldnames = async function (frm) {
-	for (let i = 0; i < frm.doc.fields.length; i++) {
-		let field = frm.doc.fields[i];
-
-		let fieldname = field.label && frappe.model.scrub(field.label).toLowerCase();
-		if (
-			field.label &&
-			!field.fieldname &&
-			in_list(frappe.model.restricted_fields, fieldname)
-		) {
-			let message = __(
-				"For field <b>{0}</b> in row <b>{1}</b>, fieldname <b>{2}</b> is restricted it will be renamed as <b>{2}1</b>. Do you want to continue?",
-				[field.label, field.idx, fieldname]
-			);
-			await pause_to_confirm(message);
-		}
-	}
-
-	function pause_to_confirm(message) {
-		return new Promise((resolve) => {
-			frappe.confirm(
-				message,
-				() => resolve(),
-				() => {
-					frm.page.btn_primary.prop("disabled", false);
-				}
-			);
-		});
-	}
-};
-
 frappe.customize_form.save_customization = function (frm) {
 	if (frm.doc.doc_type) {
 		return frm.call({
@@ -384,8 +353,7 @@ frappe.customize_form.save_customization = function (frm) {
 };
 
 frappe.customize_form.set_primary_action = function (frm) {
-	frm.page.set_primary_action(__("Update"), async () => {
-		await this.validate_fieldnames(frm);
+	frm.page.set_primary_action(__("Update"), () => {
 		this.save_customization(frm);
 	});
 };

From 6d912c934bfd76b02b79368f59a6c1fe66d93d38 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 12:48:31 +0530
Subject: [PATCH 40/50] fix: update customize form fields before save

---
 .../custom/doctype/customize_form/customize_form.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index 8ec0b4c7dd..26d8407f6e 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -352,8 +352,21 @@ frappe.customize_form.save_customization = function (frm) {
 	}
 };
 
+frappe.customize_form.update_fields_from_form_builder = function (frm) {
+	let form_builder = frappe.form_builder;
+	if (form_builder?.store) {
+		let fields = form_builder.store.update_fields();
+
+		if (!fields?.length && frm.is_dirty()) {
+			frappe.throw(__("Error occurred while saving the form."));
+		}
+		frm.refresh_fields();
+	}
+};
+
 frappe.customize_form.set_primary_action = function (frm) {
 	frm.page.set_primary_action(__("Update"), () => {
+		this.update_fields_from_form_builder(frm);
 		this.save_customization(frm);
 	});
 };

From 39f2ba28d93bbcfcff62d016087238be1574f7de Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 12 Jul 2023 13:03:07 +0530
Subject: [PATCH 41/50] fix: make form dirty if doctype form/customize
 form/form builder is dirty

---
 frappe/public/js/form_builder/form_builder.bundle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/form_builder/form_builder.bundle.js b/frappe/public/js/form_builder/form_builder.bundle.js
index 6f507936cb..fcf50ee244 100644
--- a/frappe/public/js/form_builder/form_builder.bundle.js
+++ b/frappe/public/js/form_builder/form_builder.bundle.js
@@ -73,7 +73,7 @@ class FormBuilder {
 
 	watch_changes() {
 		watchEffect(() => {
-			if (this.store.dirty) {
+			if (this.store.dirty || this.frm.is_dirty()) {
 				this.frm.dirty();
 			} else {
 				this.page.clear_indicator();

From 7ff438a249dc9c9011ef23f88fb4c5e7bdaad1eb Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 13 Jul 2023 11:30:14 +0530
Subject: [PATCH 42/50] fix: only hide form sections not form builder sections

---
 frappe/public/js/frappe/form/layout.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index cf976fba00..6678b53d75 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -365,7 +365,10 @@ frappe.ui.form.Layout = class Layout {
 			const section = $(this).removeClass("empty-section visible-section");
 			if (section.find(".frappe-control:not(.hide-control)").length) {
 				section.addClass("visible-section");
-			} else {
+			} else if (
+				section.parent().hasClass("tab-pane") ||
+				section.parent().hasClass("form-page")
+			) {
 				// nothing visible, hide the section
 				section.addClass("empty-section");
 			}

From 48c9099a0fda80fd6b6d6c2a1c1c315f71c08d3f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 13 Jul 2023 11:32:37 +0530
Subject: [PATCH 43/50] fix: show fields table for fallback

---
 frappe/core/doctype/doctype/doctype.js   | 1 -
 frappe/core/doctype/doctype/doctype.json | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 32eb0fd2bb..d7e93dd3d5 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -10,7 +10,6 @@ frappe.ui.form.on("DocType", {
 			if (!fields?.length && frm.is_dirty()) {
 				frappe.throw(__("Error occurred while saving the form."));
 			}
-			frm.refresh_fields();
 		}
 	},
 	after_save: function (frm) {
diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 51fb6a51dd..d42fa62802 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -647,8 +647,7 @@
    "collapsible": 1,
    "fieldname": "fields_section",
    "fieldtype": "Section Break",
-   "label": "Fields",
-   "hidden": 1
+   "label": "Fields"
   }
  ],
  "icon": "fa fa-bolt",
@@ -731,7 +730,7 @@
    "link_fieldname": "reference_doctype"
   }
  ],
- "modified": "2023-06-14 20:44:15.361716",
+ "modified": "2023-07-12 13:56:26.185637",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",

From 3b2f2ef4185354d62ad99cd634aafb48f8e4943d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 16 Jul 2023 12:06:48 +0530
Subject: [PATCH 44/50] test: fix sidebar UI Test

---
 cypress/integration/sidebar.js  | 96 ++++++++++++++++++---------------
 frappe/tests/ui_test_helpers.py |  2 +-
 2 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/cypress/integration/sidebar.js b/cypress/integration/sidebar.js
index 0f97cdc7fe..91c38ef6ce 100644
--- a/cypress/integration/sidebar.js
+++ b/cypress/integration/sidebar.js
@@ -27,60 +27,70 @@ context("Sidebar", () => {
 	});
 
 	it("Verify attachment visibility config", () => {
-		verify_attachment_visibility("doctype/Blog Post", true);
+		cy.call("frappe.tests.ui_test_helpers.create_todo", {
+			description: "Sidebar Attachment ToDo",
+		}).then((todo) => {
+			verify_attachment_visibility(`todo/${todo.message.name}`, true);
+		});
 		verify_attachment_visibility("blog-post/test-blog-attachment-post", false);
 	});
 
 	it('Test for checking "Assigned To" counter value, adding filter and adding & removing an assignment', () => {
-		cy.visit("/app/doctype");
-		cy.click_sidebar_button("Assigned To");
+		cy.call("frappe.tests.ui_test_helpers.create_todo", {
+			description: "Sidebar Attachment ToDo",
+		}).then((todo) => {
+			let todo_name = todo.message.name;
+			cy.visit("/app/todo");
+			cy.click_sidebar_button("Assigned To");
 
-		//To check if no filter is available in "Assigned To" dropdown
-		cy.get(".empty-state").should("contain", "No filters found");
+			//To check if no filter is available in "Assigned To" dropdown
+			cy.get(".empty-state").should("contain", "No filters found");
 
-		//Assigning a doctype to a user
-		cy.visit("/app/doctype/ToDo");
-		cy.get(".form-assignments > .flex > .text-muted").click();
-		cy.get_field("assign_to_me", "Check").click();
-		cy.get(".modal-footer > .standard-actions > .btn-primary").click();
-		cy.visit("/app/doctype");
-		cy.click_sidebar_button("Assigned To");
+			//Assigning a doctype to a user
+			cy.visit(`/app/todo/${todo_name}`);
+			cy.get(".form-assignments > .flex > .text-muted").click();
+			cy.get_field("assign_to_me", "Check").click();
+			cy.get(".modal-footer > .standard-actions > .btn-primary").click();
+			cy.visit("/app/todo");
+			cy.click_sidebar_button("Assigned To");
 
-		//To check if filter is added in "Assigned To" dropdown after assignment
-		cy.get(".group-by-field.show > .dropdown-menu > .group-by-item > .dropdown-item").should(
-			"contain",
-			"1"
-		);
+			//To check if filter is added in "Assigned To" dropdown after assignment
+			cy.get(
+				".group-by-field.show > .dropdown-menu > .group-by-item > .dropdown-item"
+			).should("contain", "1");
 
-		//To check if there is no filter added to the listview
-		cy.get(".filter-button").should("contain", "Filter");
+			//To check if there is no filter added to the listview
+			cy.get(".filter-button").should("contain", "Filter");
 
-		//To add a filter to display data into the listview
-		cy.get(".group-by-field.show > .dropdown-menu > .group-by-item > .dropdown-item").click();
+			//To add a filter to display data into the listview
+			cy.get(
+				".group-by-field.show > .dropdown-menu > .group-by-item > .dropdown-item"
+			).click();
 
-		//To check if filter is applied
-		cy.click_filter_button().should("contain", "1 filter");
-		cy.get(".fieldname-select-area > .awesomplete > .form-control").should(
-			"have.value",
-			"Assigned To"
-		);
-		cy.get(".condition").should("have.value", "like");
-		cy.get(".filter-field > .form-group > .input-with-feedback").should(
-			"have.value",
-			`%${cy.config("testUser")}%`
-		);
-		cy.click_filter_button();
+			//To check if filter is applied
+			cy.click_filter_button().should("contain", "1 filter");
+			cy.get(".fieldname-select-area > .awesomplete > .form-control").should(
+				"have.value",
+				"Assigned To"
+			);
+			cy.get(".condition").should("have.value", "like");
+			cy.get(".filter-field > .form-group > .input-with-feedback").should(
+				"have.value",
+				`%${cy.config("testUser")}%`
+			);
+			cy.click_filter_button();
 
-		//To remove the applied filter
-		cy.clear_filters();
+			//To remove the applied filter
+			cy.clear_filters();
 
-		//To remove the assignment
-		cy.visit("/app/doctype/ToDo");
-		cy.get(".assignments > .avatar-group > .avatar > .avatar-frame").click();
-		cy.get(".remove-btn").click({ force: true });
-		cy.hide_dialog();
-		cy.visit("/app/doctype");
-		cy.click_sidebar_button("Assigned To");
-		cy.get(".empty-state").should("contain", "No filters found");
+			//To remove the assignment
+			cy.visit(`/app/todo/${todo_name}`);
+			cy.get(".assignments > .avatar-group > .avatar > .avatar-frame").click();
+			cy.get(".remove-btn").click({ force: true });
+			cy.hide_dialog();
+			cy.visit("/app/todo");
+			cy.click_sidebar_button("Assigned To");
+			cy.get(".empty-state").should("contain", "No filters found");
+		});
 	});
 });
diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py
index 8920872069..3feea15df0 100644
--- a/frappe/tests/ui_test_helpers.py
+++ b/frappe/tests/ui_test_helpers.py
@@ -582,7 +582,7 @@ def create_kanban():
 
 @whitelist_for_tests
 def create_todo(description):
-	frappe.get_doc({"doctype": "ToDo", "description": description}).insert()
+	return frappe.get_doc({"doctype": "ToDo", "description": description}).insert()
 
 
 @whitelist_for_tests

From a7eb3a452b939363189c28695168f2bdc2e0493f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 16 Jul 2023 12:23:28 +0530
Subject: [PATCH 45/50] test: fix grid_configuration UI test

---
 cypress/integration/grid_configuration.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cypress/integration/grid_configuration.js b/cypress/integration/grid_configuration.js
index 9112d7023e..3d49ed1503 100644
--- a/cypress/integration/grid_configuration.js
+++ b/cypress/integration/grid_configuration.js
@@ -4,6 +4,8 @@ context("Grid Configuration", () => {
 		cy.visit("/app/doctype/User");
 	});
 	it("Set user wise grid settings", () => {
+		cy.findByRole("tab", { name: "Form" }).click();
+		cy.get('.form-section[data-fieldname="fields_section"]').click();
 		cy.wait(100);
 		cy.get('.frappe-control[data-fieldname="fields"]').as("table");
 		cy.get("@table").find(".icon-sm").click();

From 686589d3eee97e8430a9c6aaeca1177c75315cf0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 16 Jul 2023 13:01:56 +0530
Subject: [PATCH 46/50] test: fix form_builder UI test

---
 cypress/integration/form_builder.js | 72 +++++++++++++----------------
 1 file changed, 31 insertions(+), 41 deletions(-)

diff --git a/cypress/integration/form_builder.js b/cypress/integration/form_builder.js
index b298abdbe7..bf7ab86008 100644
--- a/cypress/integration/form_builder.js
+++ b/cypress/integration/form_builder.js
@@ -9,38 +9,23 @@ context("Form Builder", () => {
 
 	it("Open Form Builder for Web Form Doctype/Customize Form", () => {
 		// doctype
-		cy.visit("/app/form-builder/Web Form");
+		cy.visit("/app/doctype/Web Form");
+		cy.findByRole("tab", { name: "Form" }).click();
 		cy.get(".form-builder-container").should("exist");
 
 		// customize form
-		cy.visit("/app/form-builder/Web Form/customize");
+		cy.visit("/app/customize-form?doc_type=Web%20Form");
+		cy.findByRole("tab", { name: "Form" }).click();
 		cy.get(".form-builder-container").should("exist");
 	});
 
-	it("Change Doctype using page title dialog", () => {
-		cy.intercept("POST", "/api/method/frappe.desk.search.search_link").as("search_link");
-
-		cy.visit(`/app/form-builder/Web Form`);
-		cy.get(".form-builder-container").should("exist");
-
-		cy.get(".page-title").click();
-
-		cy.get(".frappe-control[data-fieldname='doctype'] input").click().as("input");
-		cy.get("@input").type("{rightArrow}Web Form Field", { delay: 200 });
-		cy.wait("@search_link");
-		cy.get("@input").type("{enter}").blur();
-
-		cy.click_modal_primary_button("Edit");
-
-		cy.get(".page-title .title-text").should("have.text", "Web Form Field");
-	});
-
-	it("Save without change, check form dirty and reset changes", () => {
-		cy.visit(`/app/form-builder/${doctype_name}`);
+	it("Save without change, check form dirty", () => {
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		// Save without change
 		cy.click_doc_primary_button("Save");
-		cy.get(".desk-alert.orange .alert-message").should("have.text", "No changes to save");
+		cy.get(".desk-alert.orange .alert-message").should("have.text", "No changes in document");
 
 		// Check form dirty
 		cy.get(".tab-content.active .section-columns-container:first .column:first .field:first")
@@ -48,14 +33,11 @@ context("Form Builder", () => {
 			.dblclick()
 			.type("Dirty");
 		cy.get(".title-area .indicator-pill.orange").should("have.text", "Not Saved");
-
-		// Reset changes
-		cy.get(".page-actions .custom-actions .btn").contains("Reset Changes").click();
-		cy.get(".title-area .indicator-pill.orange").should("not.exist");
 	});
 
 	it("Add empty section and save", () => {
-		cy.visit(`/app/form-builder/${doctype_name}`);
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		let first_section = ".tab-content.active .form-section-container:first";
 
@@ -71,7 +53,8 @@ context("Form Builder", () => {
 	it("Add Table field and check if columns are rendered", () => {
 		cy.intercept("POST", "/api/method/frappe.desk.search.search_link").as("search_link");
 
-		cy.visit(`/app/form-builder/${doctype_name}`);
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		let first_field =
 			".tab-content.active .section-columns-container:first .column:first .field:first";
@@ -126,20 +109,23 @@ context("Form Builder", () => {
 	});
 
 	it("Drag Field/Column/Section & Tab", () => {
-		cy.visit(`/app/form-builder/${doctype_name}`);
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		let first_column = ".tab-content.active .section-columns-container:first .column:first";
 		let first_field = first_column + " .field:first";
 		let label = "div[title='Double click to edit label'] span:first";
 
+		cy.get(".tab-header .tabs .tab:first").click();
+
 		// drag first tab to second position
-		cy.get(".tabs .tab:first").drag(".tabs .tab:nth-child(2)", {
+		cy.get(".tab-header .tabs .tab:first").drag(".tab-header .tabs .tab:nth-child(2)", {
 			target: { x: 10, y: 10 },
 			force: true,
 		});
-		cy.get(".tabs .tab:first").find(label).should("have.text", "Tab 2");
+		cy.get(".tab-header .tabs .tab:first").find(label).should("have.text", "Tab 2");
 
-		cy.get(".tabs .tab:first").click();
+		cy.get(".tab-header .tabs .tab:first").click();
 		cy.get(".sidebar-container .tab:first").click();
 
 		// drag check field to first column
@@ -151,7 +137,7 @@ context("Form Builder", () => {
 		cy.get(first_field)
 			.find("div[title='Double click to edit label']")
 			.dblclick()
-			.type("Test Check{enter}");
+			.type("Test Check");
 		cy.get(first_field).find(label).should("have.text", "Test Check");
 
 		// drag the first field to second position
@@ -184,13 +170,14 @@ context("Form Builder", () => {
 	});
 
 	it("Add New Tab/Section/Column to Form", () => {
-		cy.visit(`/app/form-builder/${doctype_name}`);
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		let first_section = ".tab-content.active .form-section-container:first";
 
 		// add new tab
 		cy.get(".tab-header").realHover().find(".tab-actions .new-tab-btn").click();
-		cy.get(".tabs .tab").should("have.length", 3);
+		cy.get(".tab-header .tabs .tab").should("have.length", 3);
 
 		// add new section
 		cy.get(first_section).click(15, 10);
@@ -218,11 +205,12 @@ context("Form Builder", () => {
 
 		// remove tab
 		cy.get(".tab-header").realHover().find(".tab-actions .remove-tab-btn").click();
-		cy.get(".tabs .tab").should("have.length", 2);
+		cy.get(".tab-header .tabs .tab").should("have.length", 2);
 	});
 
 	it("Update Title field Label to New Title through Customize Form", () => {
-		cy.visit(`/app/form-builder/${doctype_name}`);
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		let first_field =
 			".tab-content.active .section-columns-container:first .column:first .field:first";
@@ -239,7 +227,8 @@ context("Form Builder", () => {
 	});
 
 	it("Validate Duplicate Name & reqd + hidden without default logic", () => {
-		cy.visit(`/app/form-builder/${doctype_name}`);
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		let first_field =
 			".tab-content.active .section-columns-container:first .column:first .field:first";
@@ -275,10 +264,11 @@ context("Form Builder", () => {
 	});
 
 	it("Undo/Redo", () => {
-		cy.visit(`/app/form-builder/${doctype_name}`);
+		cy.visit(`/app/doctype/${doctype_name}`);
+		cy.findByRole("tab", { name: "Form" }).click();
 
 		// click on second tab
-		cy.get(".tabs .tab:last").click();
+		cy.get(".tab-header .tabs .tab:last").click();
 
 		let first_column = ".tab-content.active .section-columns-container:first .column:first";
 		let first_field = first_column + " .field:first";

From b3333b803c060a991aef61a7d2081cec26620424 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 16 Jul 2023 13:24:24 +0530
Subject: [PATCH 47/50] fix: throw error and store save if validation fails

---
 frappe/core/doctype/doctype/doctype.js        |  5 ++-
 .../doctype/customize_form/customize_form.js  |  5 ++-
 frappe/public/js/form_builder/store.js        | 45 ++++++++++---------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index d7e93dd3d5..650729aef6 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -7,8 +7,9 @@ frappe.ui.form.on("DocType", {
 		if (form_builder?.store) {
 			let fields = form_builder.store.update_fields();
 
-			if (!fields?.length && frm.is_dirty()) {
-				frappe.throw(__("Error occurred while saving the form."));
+			// if fields is a string, it means there is an error
+			if (typeof fields === "string") {
+				frappe.throw(fields);
 			}
 		}
 	},
diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index 26d8407f6e..c2e2e83d7f 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -357,8 +357,9 @@ frappe.customize_form.update_fields_from_form_builder = function (frm) {
 	if (form_builder?.store) {
 		let fields = form_builder.store.update_fields();
 
-		if (!fields?.length && frm.is_dirty()) {
-			frappe.throw(__("Error occurred while saving the form."));
+		// if fields is a string, it means there is an error
+		if (typeof fields === "string") {
+			frappe.throw(fields);
 		}
 		frm.refresh_fields();
 	}
diff --git a/frappe/public/js/form_builder/store.js b/frappe/public/js/form_builder/store.js
index 65435fb03d..5b79cd6bc3 100644
--- a/frappe/public/js/form_builder/store.js
+++ b/frappe/public/js/form_builder/store.js
@@ -121,9 +121,14 @@ export const useStore = defineStore("form-builder-store", () => {
 
 	function validate_fields(fields, is_table) {
 		fields = scrub_field_names(fields);
+		let error_message = "";
 
-		if (!fields.length) {
-			frappe.throw(__("DocType must have atleast one field"));
+		let has_fields = fields.some((df) => {
+			return !["Section Break", "Tab Break", "Column Break"].includes(df.fieldtype);
+		});
+
+		if (!has_fields) {
+			error_message = __("DocType must have atleast one field");
 		}
 
 		let not_allowed_in_list_view = ["Attach Image", ...frappe.model.no_value_type];
@@ -144,46 +149,43 @@ export const useStore = defineStore("form-builder-store", () => {
 			// check if fieldname already exist
 			let duplicate = fields.filter((f) => f.fieldname == df.fieldname);
 			if (duplicate.length > 1) {
-				frappe.throw(__("Fieldname {0} appears multiple times", get_field_data(df)));
+				error_message = __("Fieldname {0} appears multiple times", get_field_data(df));
 			}
 
 			// Link & Table fields should always have options set
 			if (in_list(["Link", ...frappe.model.table_fields], df.fieldtype) && !df.options) {
-				frappe.throw(
-					__("Options is required for field {0} of type {1}", get_field_data(df))
+				error_message = __(
+					"Options is required for field {0} of type {1}",
+					get_field_data(df)
 				);
 			}
 
 			// Do not allow if field is hidden & required but doesn't have default value
 			if (df.hidden && df.reqd && !df.default) {
-				frappe.throw(
-					__(
-						"{0} cannot be hidden and mandatory without any default value",
-						get_field_data(df)
-					)
+				error_message = __(
+					"{0} cannot be hidden and mandatory without any default value",
+					get_field_data(df)
 				);
 			}
 
 			// In List View is not allowed for some fieldtypes
 			if (df.in_list_view && in_list(not_allowed_in_list_view, df.fieldtype)) {
-				frappe.throw(
-					__(
-						"'In List View' is not allowed for field {0} of type {1}",
-						get_field_data(df)
-					)
+				error_message = __(
+					"'In List View' is not allowed for field {0} of type {1}",
+					get_field_data(df)
 				);
 			}
 
 			// In Global Search is not allowed for no_value_type fields
 			if (df.in_global_search && in_list(frappe.model.no_value_type, df.fieldtype)) {
-				frappe.throw(
-					__(
-						"'In Global Search' is not allowed for field {0} of type {1}",
-						get_field_data(df)
-					)
+				error_message = __(
+					"'In Global Search' is not allowed for field {0} of type {1}",
+					get_field_data(df)
 				);
 			}
 		});
+
+		return error_message;
 	}
 
 	function update_fields() {
@@ -193,7 +195,8 @@ export const useStore = defineStore("form-builder-store", () => {
 
 		try {
 			let fields = get_updated_fields();
-			validate_fields(fields, doc.value.istable);
+			let has_error = validate_fields(fields, doc.value.istable);
+			if (has_error) return has_error;
 			doc.value.fields = fields;
 			return fields;
 		} catch (e) {

From 4763dd529389d69567fcde134a372b0908693b26 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 16 Jul 2023 13:26:12 +0530
Subject: [PATCH 48/50] fix: show fields table for fallback also in customize
 form

---
 frappe/custom/doctype/customize_form/customize_form.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index ddc01f7dcb..d3c8c661e7 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -176,11 +176,10 @@
    "options": "ASC\nDESC"
   },
   {
+   "collapsible": 1,
    "depends_on": "doc_type",
-   "description": "Customize Label, Print Hide, Default etc.",
    "fieldname": "fields_section_break",
    "fieldtype": "Section Break",
-   "hidden": 1,
    "label": "Fields"
   },
   {
@@ -393,7 +392,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-07-10 19:20:26.149909",
+ "modified": "2023-07-16 13:25:46.201184",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form",

From ae8af1d1d362a7a96a7edf0906d6931309a0eb5a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 16 Jul 2023 13:30:14 +0530
Subject: [PATCH 49/50] fix: removed unused form builder page

---
 frappe/desk/page/form_builder/__init__.py     |   0
 frappe/desk/page/form_builder/form_builder.js | 211 ------------------
 .../desk/page/form_builder/form_builder.json  |  19 --
 3 files changed, 230 deletions(-)
 delete mode 100644 frappe/desk/page/form_builder/__init__.py
 delete mode 100644 frappe/desk/page/form_builder/form_builder.js
 delete mode 100644 frappe/desk/page/form_builder/form_builder.json

diff --git a/frappe/desk/page/form_builder/__init__.py b/frappe/desk/page/form_builder/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/desk/page/form_builder/form_builder.js b/frappe/desk/page/form_builder/form_builder.js
deleted file mode 100644
index a7a25b5c6c..0000000000
--- a/frappe/desk/page/form_builder/form_builder.js
+++ /dev/null
@@ -1,211 +0,0 @@
-frappe.pages["form-builder"].on_page_load = function (wrapper) {
-	frappe.ui.make_app_page({
-		parent: wrapper,
-		title: __("Form Builder"),
-		single_column: true,
-	});
-
-	// hot reload in development
-	if (frappe.boot.developer_mode) {
-		frappe.hot_update = frappe.hot_update || [];
-		frappe.hot_update.push(() => load_form_builder(wrapper));
-	}
-};
-
-frappe.pages["form-builder"].on_page_show = function (wrapper) {
-	load_form_builder(wrapper);
-};
-
-function load_form_builder(wrapper) {
-	let route = frappe.get_route();
-	route = route.filter((a) => a);
-
-	if (route.length > 1 && route[1] === "new-doctype") {
-		frappe.pages["form-builder"].new_doctype(route[2]);
-	} else if (route.length > 1) {
-		let doctype = route[1];
-		let is_customize_form = route[2] === "customize";
-
-		if (frappe.form_builder?.doctype) {
-			frappe.form_builder.doctype = frappe.form_builder.store.doctype = doctype;
-			frappe.form_builder.customize = frappe.form_builder.store.is_customize_form =
-				is_customize_form;
-			frappe.form_builder.init(true);
-			frappe.form_builder.store.fetch();
-			return;
-		}
-
-		let $parent = $(wrapper).find(".layout-main-section");
-		$parent.empty();
-
-		frappe.require("form_builder.bundle.js").then(() => {
-			frappe.form_builder = new frappe.ui.FormBuilder({
-				wrapper: $parent,
-				page: wrapper.page,
-				doctype: doctype,
-				customize: is_customize_form,
-			});
-		});
-	} else {
-		frappe.pages["form-builder"].select_doctype();
-	}
-}
-
-frappe.pages["form-builder"].select_doctype = function () {
-	let d = new frappe.ui.Dialog({
-		title: __("Select DocType"),
-		fields: [
-			{
-				label: __("Select DocType"),
-				fieldname: "doctype",
-				fieldtype: "Link",
-				options: "DocType",
-				only_select: 1,
-			},
-			{
-				label: __("Customize"),
-				fieldname: "customize",
-				fieldtype: "Check",
-			},
-		],
-		primary_action_label: __("Edit"),
-		primary_action({ doctype, customize }) {
-			if (customize) {
-				frappe.model.with_doctype(doctype).then(() => {
-					let meta = frappe.get_meta(doctype);
-					if (in_list(frappe.model.core_doctypes_list, this.doctype))
-						frappe.throw(__("Core DocTypes cannot be customized."));
-
-					if (meta.issingle) frappe.throw(__("Single DocTypes cannot be customized."));
-
-					if (meta.custom)
-						frappe.throw(
-							__(
-								"Only standard DocTypes are allowed to be customized from Customize Form."
-							)
-						);
-					frappe.set_route("form-builder", doctype, "customize");
-				});
-			} else {
-				frappe.set_route("form-builder", doctype);
-			}
-		},
-		secondary_action_label: __("Create New DocType"),
-		secondary_action() {
-			let doctype = d.get_value("doctype") || "";
-			d.hide();
-			frappe.set_route("form-builder", "new-doctype", doctype);
-		},
-	});
-
-	d.show();
-};
-
-frappe.pages["form-builder"].new_doctype = function (doctype) {
-	let non_developer = frappe.session.user !== "Administrator" || !frappe.boot.developer_mode;
-	let new_d = new frappe.ui.Dialog({
-		title: __("Create New DocType"),
-		fields: [
-			{
-				label: __("DocType Name"),
-				fieldname: "doctype_name",
-				fieldtype: "Data",
-				default: doctype,
-				reqd: 1,
-			},
-			{ fieldtype: "Column Break" },
-			{
-				label: __("Module"),
-				fieldname: "module",
-				fieldtype: "Link",
-				options: "Module Def",
-				reqd: 1,
-			},
-			{ fieldtype: "Section Break" },
-			{
-				label: __("Is Submittable"),
-				fieldname: "is_submittable",
-				fieldtype: "Check",
-				description: __(
-					"Once submitted, submittable documents cannot be changed. They can only be Cancelled and Amended."
-				),
-				depends_on: "eval:!doc.istable && !doc.issingle",
-			},
-			{
-				label: __("Is Child Table"),
-				fieldname: "istable",
-				fieldtype: "Check",
-				description: __("Child Tables are shown as a Grid in other DocTypes"),
-				depends_on: "eval:!doc.is_submittable && !doc.issingle",
-			},
-			{
-				label: __("Editable Grid"),
-				fieldname: "editable_grid",
-				fieldtype: "Check",
-				depends_on: "istable",
-				default: 1,
-			},
-			{
-				label: __("Is Single"),
-				fieldname: "issingle",
-				fieldtype: "Check",
-				description: __(
-					"Single Types have only one record no tables associated. Values are stored in tabSingles"
-				),
-				depends_on: "eval:!doc.istable && !doc.is_submittable",
-			},
-			{
-				label: __("Custom?"),
-				fieldname: "custom",
-				fieldtype: "Check",
-				default: non_developer,
-				read_only: non_developer,
-			},
-		],
-		primary_action_label: __("Create & Continue"),
-		primary_action(values) {
-			if (!values.istable) values.editable_grid = 0;
-			frappe.db
-				.insert({
-					doctype: "DocType",
-					name: values.doctype_name,
-					module: values.module,
-					istable: values.istable,
-					editable_grid: values.editable_grid,
-					issingle: values.issingle,
-					custom: values.custom,
-					is_submittable: values.is_submittable,
-					permissions: [
-						{
-							create: 1,
-							delete: 1,
-							email: 1,
-							export: 1,
-							print: 1,
-							read: 1,
-							report: 1,
-							role: "System Manager",
-							share: 1,
-							write: 1,
-						},
-					],
-					fields: [
-						{
-							label: "Title",
-							fieldname: "title",
-							fieldtype: "Data",
-						},
-					],
-				})
-				.then((doc) => {
-					frappe.set_route("form-builder", doc.name);
-				});
-		},
-		secondary_action_label: __("Back"),
-		secondary_action() {
-			new_d.hide();
-			window.history.back();
-		},
-	});
-	new_d.show();
-};
diff --git a/frappe/desk/page/form_builder/form_builder.json b/frappe/desk/page/form_builder/form_builder.json
deleted file mode 100644
index afeacecd90..0000000000
--- a/frappe/desk/page/form_builder/form_builder.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "content": null,
- "creation": "2022-10-10 22:42:53.597423",
- "docstatus": 0,
- "doctype": "Page",
- "idx": 0,
- "modified": "2022-10-10 22:42:53.597423",
- "modified_by": "Administrator",
- "module": "Desk",
- "name": "form-builder",
- "owner": "Administrator",
- "page_name": "form-builder",
- "roles": [],
- "script": null,
- "standard": "Yes",
- "style": null,
- "system_page": 0,
- "title": "Form Builder"
-}
\ No newline at end of file

From 628bdd18d254f3205346a6abc99b402ace058217 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Sun, 16 Jul 2023 13:40:06 +0530
Subject: [PATCH 50/50] fix: allow to add all states even if it is already
 added

---
 .../js/workflow_builder/components/Properties.vue  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/frappe/public/js/workflow_builder/components/Properties.vue b/frappe/public/js/workflow_builder/components/Properties.vue
index 67044a8e9c..44092dfd2d 100644
--- a/frappe/public/js/workflow_builder/components/Properties.vue
+++ b/frappe/public/js/workflow_builder/components/Properties.vue
@@ -1,12 +1,9 @@
 <script setup>
 import { ref, computed, nextTick } from "vue";
 import { useStore } from "../store";
-import { useVueFlow } from "@vue-flow/core";
 
 let store = useStore();
 
-let { nodes } = useVueFlow();
-
 let title = ref("Workflow Details");
 
 let doc = computed(() => {
@@ -37,17 +34,6 @@ let properties = computed(() => {
 				df.options = ["Draft", "Submitted", "Cancelled"];
 				df.description = "";
 			}
-			if (df.fieldname == "state") {
-				let filter = nodes.value
-					.filter(state => state.type == "state")
-					.map(node => node.data.state);
-				if (doc.value.state) {
-					filter = filter.filter(state => state !== doc.value.state);
-				}
-				df.filters = {
-					name: ["not in", filter]
-				};
-			}
 			if (df.fieldname == "update_field") {
 				df.options = store.workflow_doc_fields;
 			}