From a074476a298a56c3a12cf17de0d18ba04f7850e9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 4 Jan 2023 19:17:35 +0530
Subject: [PATCH 1/9] fix: render html text for field label

---
 frappe/public/js/form_builder/components/EditableInput.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/form_builder/components/EditableInput.vue b/frappe/public/js/form_builder/components/EditableInput.vue
index 3ede63db43..8964838f4a 100644
--- a/frappe/public/js/form_builder/components/EditableInput.vue
+++ b/frappe/public/js/form_builder/components/EditableInput.vue
@@ -53,11 +53,11 @@ function focus_on_label() {
 			@blur="editing = false"
 			@click.stop
 		/>
-		<span v-else-if="text">{{ text }}</span>
+		<span v-else-if="text" v-html="text" ></span>
 		<i v-else class="text-muted">
 			{{ empty_label }}
 		</i>
-		<span class="hidden-span" ref="hidden_text">{{ text }}</span>
+		<span class="hidden-span" ref="hidden_text" v-html="text"></span>
 		<span class="hidden-span" ref="hidden_placeholder">{{ placeholder }}</span>
 	</div>
 </template>

From 97fc172bb9f10316496ac06b319de63d0cf6d5e2 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 4 Jan 2023 19:19:18 +0530
Subject: [PATCH 2/9] fix: small text & long text height issue

---
 .../form_builder/components/controls/TextControl.vue  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/form_builder/components/controls/TextControl.vue b/frappe/public/js/form_builder/components/controls/TextControl.vue
index 19fd3971d2..5fc503f0dd 100644
--- a/frappe/public/js/form_builder/components/controls/TextControl.vue
+++ b/frappe/public/js/form_builder/components/controls/TextControl.vue
@@ -8,10 +8,13 @@ let store = useStore();
 let props = defineProps(["df", "value", "modelValue"]);
 let emit = defineEmits(["update:modelValue"]);
 let slots = useSlots();
-let height = "300px";
-if (props.df.fieldtype == "Small Text") {
-	height = "150px";
-}
+
+let height = computed(() => {
+	if (props.df.fieldtype == "Small Text") {
+		return "150px";
+	}
+	return "300px";
+});
 
 let doctype = ref("");
 let fieldname = ref("");

From 80ceb33c01ae6d6dd34a23fcafb0dd470ba06bfd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 4 Jan 2023 19:20:36 +0530
Subject: [PATCH 3/9] fix: allow using login_with_email_link if user_pass_login
 is disabled

unrelated fix
---
 frappe/core/doctype/system_settings/system_settings.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/system_settings/system_settings.py b/frappe/core/doctype/system_settings/system_settings.py
index 0f7a7f0819..c4f35f3cc0 100644
--- a/frappe/core/doctype/system_settings/system_settings.py
+++ b/frappe/core/doctype/system_settings/system_settings.py
@@ -50,11 +50,14 @@ class SystemSettings(Document):
 
 		social_login_enabled = frappe.db.exists("Social Login Key", {"enable_social_login": 1})
 		ldap_enabled = frappe.db.get_single_value("LDAP Settings", "enabled")
+		login_with_email_link_enabled = frappe.db.get_single_value(
+			"System Settings", "login_with_email_link"
+		)
 
-		if not (social_login_enabled or ldap_enabled):
+		if not (social_login_enabled or ldap_enabled or login_with_email_link_enabled):
 			frappe.throw(
 				_(
-					"Please enable atleast one Social Login Key or LDAP before disabling username/password based login."
+					"Please enable atleast one Social Login Key or LDAP or Login With Email Link before disabling username/password based login."
 				)
 			)
 

From bae711cff263c68ae7c6380b2e374062380533eb Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 11 Jan 2023 20:57:11 +0530
Subject: [PATCH 4/9] fix: changing documentation_url docfields type from Small
 Text to Data(URL)

---
 frappe/core/doctype/docfield/docfield.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json
index f03c5506d3..0d8d7ea671 100644
--- a/frappe/core/doctype/docfield/docfield.json
+++ b/frappe/core/doctype/docfield/docfield.json
@@ -546,15 +546,16 @@
   {
    "depends_on": "eval:!in_list([\"Tab Break\", \"Section Break\", \"Column Break\", \"Button\", \"HTML\"], doc.fieldtype)",
    "fieldname": "documentation_url",
-   "fieldtype": "Small Text",
-   "label": "Documentation URL"
+   "fieldtype": "Data",
+   "label": "Documentation URL",
+   "options": "URL"
   }
  ],
  "idx": 1,
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-11-17 14:14:39.404696",
+ "modified": "2023-01-11 20:46:43.164926",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocField",

From 597dd1f6196f9c951f91a5a3c2268b820d6d89de Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 11 Jan 2023 20:58:13 +0530
Subject: [PATCH 5/9] fix: show field documentation_url icon if set

---
 .../js/form_builder/components/Field.vue      | 31 ++++++++++++++-----
 .../form_builder/components/FormBuilder.vue   |  4 ---
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/form_builder/components/Field.vue b/frappe/public/js/form_builder/components/Field.vue
index b6301352a3..82351fccd8 100644
--- a/frappe/public/js/form_builder/components/Field.vue
+++ b/frappe/public/js/form_builder/components/Field.vue
@@ -49,13 +49,16 @@ function move_fields_to_column() {
 			:data-fieldtype="field.df.fieldtype"
 		>
 			<template #label>
-				<EditableInput
-					:class="{ reqd: field.df.reqd }"
-					:text="field.df.label"
-					:placeholder="__('Label')"
-					:empty_label="`${__('No Label')} (${field.df.fieldtype})`"
-					v-model="field.df.label"
-				/>
+				<div class="field-label">
+					<EditableInput
+						:text="field.df.label"
+						:placeholder="__('Label')"
+						:empty_label="`${__('No Label')} (${field.df.fieldtype})`"
+						v-model="field.df.label"
+					/>
+					<div class="reqd-asterisk" v-if="field.df.reqd">*</div>
+					<div class="help-icon" v-if="field.df.documentation_url" v-html="frappe.utils.icon('help', 'sm')"></div>
+				</div>
 			</template>
 			<template #actions>
 				<div class="field-actions" :hidden="store.read_only">
@@ -113,6 +116,20 @@ function move_fields_to_column() {
 		align-items: center;
 		margin-bottom: 0.3rem;
 
+		.field-label {
+			display: flex;
+			align-items: center;
+			.reqd-asterisk {
+				margin-left: 3px;
+				color: var(--red-400);
+			}
+			.help-icon {
+				margin-left: 3px;
+				color: var(--text-muted);
+				cursor: pointer;
+			}
+		}
+
 		.field-actions {
 			flex: none;
 
diff --git a/frappe/public/js/form_builder/components/FormBuilder.vue b/frappe/public/js/form_builder/components/FormBuilder.vue
index b4657066e8..6145a3cecc 100644
--- a/frappe/public/js/form_builder/components/FormBuilder.vue
+++ b/frappe/public/js/form_builder/components/FormBuilder.vue
@@ -169,10 +169,6 @@ onMounted(() => {
 				}
 			}
 
-			.reqd::after {
-				content: " *";
-				color: var(--red-400);
-			}
 			.description,
 			.time-zone {
 				font-size: var(--text-sm);

From c9d3449bd3e44bea3d5fa253e75c1b9f1bfa6410 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 11 Jan 2023 22:50:58 +0530
Subject: [PATCH 6/9] fix: cmd/ctrl+s to save the form

---
 .../public/js/form_builder/components/FormBuilder.vue  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/form_builder/components/FormBuilder.vue b/frappe/public/js/form_builder/components/FormBuilder.vue
index 6145a3cecc..e23fa72fc9 100644
--- a/frappe/public/js/form_builder/components/FormBuilder.vue
+++ b/frappe/public/js/form_builder/components/FormBuilder.vue
@@ -3,7 +3,7 @@ import Sidebar from "./Sidebar.vue";
 import Tabs from "./Tabs.vue";
 import { computed, onMounted, watch, ref } from "vue";
 import { useStore } from "../store";
-import { onClickOutside } from "@vueuse/core";
+import { onClickOutside, useMagicKeys, whenever } from "@vueuse/core";
 
 let store = useStore();
 
@@ -14,6 +14,14 @@ let should_render = computed(() => {
 let container = ref(null);
 onClickOutside(container, () => store.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", () => {
 		let dialog = new frappe.ui.Dialog({

From 9cdd4e835db04511c8bf32feb6f1404c88663c4c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 11 Jan 2023 23:14:10 +0530
Subject: [PATCH 7/9] feat: duplicate field

---
 .../js/form_builder/components/Field.vue      | 19 ++++++++++++++++++-
 .../js/form_builder/components/FieldTypes.vue |  6 +-----
 frappe/public/js/form_builder/utils.js        |  6 ++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/form_builder/components/Field.vue b/frappe/public/js/form_builder/components/Field.vue
index 82351fccd8..4f6ed50020 100644
--- a/frappe/public/js/form_builder/components/Field.vue
+++ b/frappe/public/js/form_builder/components/Field.vue
@@ -2,7 +2,7 @@
 import EditableInput from "./EditableInput.vue";
 import { ref, computed } from "vue";
 import { useStore } from "../store";
-import { move_children_to_parent } from "../utils";
+import { move_children_to_parent, clone_field } from "../utils";
 
 let props = defineProps(["column", "field"]);
 let store = useStore();
@@ -28,6 +28,20 @@ function move_fields_to_column() {
 	);
 	move_children_to_parent(props, "column", "field", current_section);
 }
+
+function duplicate_field() {
+	let duplicate_field = clone_field(props.field);
+
+	if (duplicate_field.df.label) {
+		duplicate_field.df.label = duplicate_field.df.label + " Copy";
+	}
+	duplicate_field.df.fieldname = "";
+
+	// push duplicate_field after props.field in the same column
+	let index = props.column.fields.indexOf(props.field);
+	props.column.fields.splice(index + 1, 0, duplicate_field);
+	store.selected_field = duplicate_field.df;
+}
 </script>
 
 <template>
@@ -79,6 +93,9 @@ function move_fields_to_column() {
 					>
 						<div v-html="frappe.utils.icon('move', 'sm')"></div>
 					</button>
+					<button class="btn btn-xs btn-icon" @click.stop="duplicate_field">
+						<div v-html="frappe.utils.icon('duplicate', 'sm')"></div>
+					</button>
 					<button class="btn btn-xs btn-icon" @click.stop="remove_field">
 						<div v-html="frappe.utils.icon('remove', 'sm')"></div>
 					</button>
diff --git a/frappe/public/js/form_builder/components/FieldTypes.vue b/frappe/public/js/form_builder/components/FieldTypes.vue
index 04096e3015..2907614a51 100644
--- a/frappe/public/js/form_builder/components/FieldTypes.vue
+++ b/frappe/public/js/form_builder/components/FieldTypes.vue
@@ -3,15 +3,11 @@ import SearchBox from "./SearchBox.vue";
 import draggable from "vuedraggable";
 import { ref, computed } from "vue";
 import { useStore } from "../store";
+import { clone_field } from "../utils";
 
 let store = useStore();
 let search_text = ref("");
 
-function clone_field(field) {
-	field.df.name = frappe.utils.get_random(8);
-	return JSON.parse(JSON.stringify(field));
-}
-
 let fields = computed(() => {
 	let fields = frappe.model.all_fieldtypes
 		.filter(df => {
diff --git a/frappe/public/js/form_builder/utils.js b/frappe/public/js/form_builder/utils.js
index 4c2887e4e7..8a7a2c6b54 100644
--- a/frappe/public/js/form_builder/utils.js
+++ b/frappe/public/js/form_builder/utils.js
@@ -318,3 +318,9 @@ export function scrub_field_names(fields) {
 
 	return fields;
 }
+
+export function clone_field(field) {
+	let cloned_field = JSON.parse(JSON.stringify(field));
+	cloned_field.df.name = frappe.utils.get_random(8);
+	return cloned_field;
+}

From e29d9451bf6663636ac4a9cd24977cf9d241d786 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 12 Jan 2023 20:57:17 +0530
Subject: [PATCH 8/9] fix: removed :has() pseudo class since it is not yet
 supported in firefox

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

diff --git a/frappe/public/js/form_builder/components/FormBuilder.vue b/frappe/public/js/form_builder/components/FormBuilder.vue
index e23fa72fc9..c641643414 100644
--- a/frappe/public/js/form_builder/components/FormBuilder.vue
+++ b/frappe/public/js/form_builder/components/FormBuilder.vue
@@ -117,7 +117,7 @@ onMounted(() => {
 			font-size: var(--text-sm);
 			cursor: pointer;
 
-			&:has(.drop-it-here) {
+			&:not(.hovered) {
 				position: relative;
 				background-color: transparent;
 				height: 60px;
@@ -268,7 +268,7 @@ onMounted(() => {
 		}
 	}
 
-	.form-main:not(:has(.tab-header)) :deep(.tab-contents) {
+	.form-main > :deep(div:first-child:not(.tab-header)) {
 		max-height: calc(100vh - 160px);
 	}
 }

From e9ac718199d3b7f334769d8304d58ca650bd81c5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 12 Jan 2023 21:25:39 +0530
Subject: [PATCH 9/9] fix: cannot focus on disabled input field in firefox

made it readonly
---
 frappe/public/js/form_builder/components/Field.vue            | 4 ++++
 .../js/form_builder/components/controls/DataControl.vue       | 4 ++--
 .../js/form_builder/components/controls/LinkControl.vue       | 2 +-
 .../js/form_builder/components/controls/SelectControl.vue     | 2 +-
 .../js/form_builder/components/controls/TextControl.vue       | 2 +-
 .../js/form_builder/components/controls/TextEditorControl.vue | 4 ++++
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/form_builder/components/Field.vue b/frappe/public/js/form_builder/components/Field.vue
index 4f6ed50020..5a7ce5626f 100644
--- a/frappe/public/js/form_builder/components/Field.vue
+++ b/frappe/public/js/form_builder/components/Field.vue
@@ -127,6 +127,10 @@ function duplicate_field() {
 		}
 	}
 
+	:deep(.form-control:read-only:focus) {
+		box-shadow: none;
+	}
+
 	:deep(.field-controls) {
 		display: flex;
 		justify-content: space-between;
diff --git a/frappe/public/js/form_builder/components/controls/DataControl.vue b/frappe/public/js/form_builder/components/controls/DataControl.vue
index aec72925a5..2052912130 100644
--- a/frappe/public/js/form_builder/components/controls/DataControl.vue
+++ b/frappe/public/js/form_builder/components/controls/DataControl.vue
@@ -43,7 +43,7 @@ if (props.df.fieldtype === "Icon") {
 			type="text"
 			:style="{ height: df.fieldtype == 'Table MultiSelect' ? '42px' : '' }"
 			:placeholder="placeholder"
-			disabled
+			readonly
 		/>
 		<input
 			v-else
@@ -58,7 +58,7 @@ if (props.df.fieldtype === "Icon") {
 			class="mt-2 form-control"
 			type="text"
 			:style="{ height: '110px' }"
-			disabled
+			readonly
 		/>
 
 		<!-- description -->
diff --git a/frappe/public/js/form_builder/components/controls/LinkControl.vue b/frappe/public/js/form_builder/components/controls/LinkControl.vue
index 1779f45d6f..ce58c9a81e 100644
--- a/frappe/public/js/form_builder/components/controls/LinkControl.vue
+++ b/frappe/public/js/form_builder/components/controls/LinkControl.vue
@@ -77,7 +77,7 @@ watch(
 		</div>
 
 		<!-- link input -->
-		<input class="form-control" type="text" disabled />
+		<input class="form-control" type="text" readonly />
 
 		<!-- description -->
 		<div v-if="df.description" class="mt-2 description" v-html="df.description" />
diff --git a/frappe/public/js/form_builder/components/controls/SelectControl.vue b/frappe/public/js/form_builder/components/controls/SelectControl.vue
index fb2821eb3b..091430a6fe 100644
--- a/frappe/public/js/form_builder/components/controls/SelectControl.vue
+++ b/frappe/public/js/form_builder/components/controls/SelectControl.vue
@@ -94,7 +94,7 @@ watch(() => props.df.options, () => {
 
 		<!-- select input -->
 		<div class="select-input">
-			<input class="form-control" disabled />
+			<input class="form-control" readonly />
 			<div class="select-icon" v-html="frappe.utils.icon('select', 'sm')"></div>
 		</div>
 
diff --git a/frappe/public/js/form_builder/components/controls/TextControl.vue b/frappe/public/js/form_builder/components/controls/TextControl.vue
index 5fc503f0dd..8c49834ccf 100644
--- a/frappe/public/js/form_builder/components/controls/TextControl.vue
+++ b/frappe/public/js/form_builder/components/controls/TextControl.vue
@@ -113,7 +113,7 @@ watch([() => doctype.value, () => fieldname.value], ([doctype_value, fieldname_v
 			:style="{ height: height, maxHeight: df.max_height ?? '' }"
 			class="form-control"
 			type="text"
-			disabled
+			readonly
 		/>
 		<textarea
 			v-else
diff --git a/frappe/public/js/form_builder/components/controls/TextEditorControl.vue b/frappe/public/js/form_builder/components/controls/TextEditorControl.vue
index b9ff8dee44..a47a444836 100644
--- a/frappe/public/js/form_builder/components/controls/TextEditorControl.vue
+++ b/frappe/public/js/form_builder/components/controls/TextEditorControl.vue
@@ -34,6 +34,10 @@ onMounted(() => {
 :deep(.quill) {
 	.ql-toolbar {
 		pointer-events: none;
+
+		.ql-formats {
+			margin-right: 12px;
+		}
 	}
 	.ql-container p {
 		cursor: pointer;