From 14f1850532aed7fef9faf2c8b7d879d2f664bda4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 19 Jan 2024 15:44:04 +0530
Subject: [PATCH] fix: changed external icon & minor changes

---
 frappe/public/icons/timeless/icons.svg        | 10 +-----
 .../js/form_builder/components/Field.vue      | 33 +++++++++----------
 .../components/controls/TableControl.vue      |  2 +-
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/frappe/public/icons/timeless/icons.svg b/frappe/public/icons/timeless/icons.svg
index c4fa86572a..1ea247b405 100644
--- a/frappe/public/icons/timeless/icons.svg
+++ b/frappe/public/icons/timeless/icons.svg
@@ -87,12 +87,6 @@
 		<path d="M2.5 9.5L9.5 2.5M9.50002 8V2.5H4.00002" stroke-linecap="round" stroke-linejoin="round"/>
 	</symbol>
 
-	<symbol viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-up-right-external">
-		<path stroke-width="0.1" d="M5.868 10.132a.5.5 0 0 1 0-.707L12.793 2.5H9a.5.5 0 0 1 0-1h4.99a.499.499 0 0 1 .51.5v5a.5.5 0 0 1-1 0V3.207l-6.925 6.925a.5.5 0 0 1-.707 0ZM2.5 4A1.5 1.5 0 0 1 4 2.5h1.8a.5.5 0 0 0 0-1H4A2.5 2.5 0 0 0 1.5 4v8A2.5 2.5 0 0 0 4 14.5h8a2.5 2.5 0 0 0 2.5-2.5v-1.8a.5.5 0 0 0-1 0V12a1.5 1.5 0 0 1-1.5 1.5H4A1.5 1.5 0 0 1 2.5 12V4Z"
-		fill="#525252"
-		/>
-	</symbol>
-
 	<symbol viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-arrow-down-left">
 		<path d="M9.5 2.5L2.5 9.5M2.49999 4L2.49998 9.5L7.99998 9.5" stroke-linecap="round" stroke-linejoin="round"/>
 	</symbol>
@@ -127,9 +121,7 @@
 	</symbol>
 
 	<symbol viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-external-link">
-		<path d="M9.75003 7.83333V9C9.75003 9.82843 9.07846 10.5 8.25003 10.5H3.25C2.42157 10.5 1.75 9.82843 1.75 9V4C1.75 3.17158 2.42151 2.50001 3.24993 2.50001C3.62327 2.5 4.02808 2.5 4.4167 2.5" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
-		<path d="M6.75 1.5H10.25V4.5" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
-		<path d="M6.75 5L9.75 2" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
+		<path fill-rule="evenodd" stroke-width="0" clip-rule="evenodd" d="M4.52409 7.47575C4.3889 7.34059 4.3889 7.12141 4.52409 6.98623L9.31795 2.19237H6.69231C6.50113 2.19237 6.34615 2.03739 6.34615 1.84622C6.34615 1.65505 6.50113 1.50007 6.69231 1.50007H10.1469C10.2283 1.49846 10.3104 1.52546 10.3764 1.5811C10.452 1.64459 10.5 1.7398 10.5 1.84622V5.30773C10.5 5.4989 10.345 5.65388 10.1538 5.65388C9.9627 5.65388 9.80769 5.4989 9.80769 5.30773V2.68173L5.01362 7.47575C4.87844 7.61095 4.65927 7.61095 4.52409 7.47575ZM2.19231 3.23082C2.19231 2.6573 2.65724 2.19237 3.23077 2.19237H4.47692C4.6681 2.19237 4.82308 2.03739 4.82308 1.84622C4.82308 1.65505 4.6681 1.50007 4.47692 1.50007H3.23077C2.27489 1.50007 1.5 2.27496 1.5 3.23082V8.76924C1.5 9.72511 2.27489 10.5 3.23077 10.5H8.76923C9.7251 10.5 10.5 9.72511 10.5 8.76924V7.5231C10.5 7.33193 10.345 7.17695 10.1538 7.17695C9.9627 7.17695 9.80769 7.33193 9.80769 7.5231V8.76924C9.80769 9.34275 9.34274 9.8077 8.76923 9.8077H3.23077C2.65724 9.8077 2.19231 9.34275 2.19231 8.76924V3.23082Z" fill="var(--icon-stroke)"/>
 	</symbol>
 
 	<symbol viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg" fill="#112B42" id="icon-up">
diff --git a/frappe/public/js/form_builder/components/Field.vue b/frappe/public/js/form_builder/components/Field.vue
index accd2b1962..2c231193b3 100644
--- a/frappe/public/js/form_builder/components/Field.vue
+++ b/frappe/public/js/form_builder/components/Field.vue
@@ -186,10 +186,7 @@ function is_filter_applied() {
 }
 
 function open_child_doctype() {
-	if (!props.field.df.options) {
-		frappe.msgprint(__("Please add a Doctype in the options field"));
-		return;
-	}
+	if (!props.field?.df?.options) return;
 	window.open(`/app/doctype/${props.field.df.options}`, "_blank");
 }
 
@@ -224,7 +221,7 @@ onMounted(() => selected.value && label_input.value.focus_on_label());
 						class="help-icon"
 						v-if="field.df.documentation_url"
 						v-html="frappe.utils.icon('help', 'sm')"
-					></div>
+					/>
 				</div>
 			</template>
 			<template #actions>
@@ -235,19 +232,11 @@ onMounted(() => selected.value && label_input.value.focus_on_label());
 						:class="is_filter_applied()"
 						@click="edit_filters"
 					>
-						<div v-html="frappe.utils.icon('filter', 'sm')"></div>
+						<div v-html="frappe.utils.icon('filter', 'sm')" />
 					</button>
 					<AddFieldButton ref="add_field_ref" :column="column" :field="field">
 						<div v-html="frappe.utils.icon('add', 'sm')" />
 					</AddFieldButton>
-					<button
-						v-if="field.df.fieldtype === 'Table'"
-						class="btn btn-xs btn-icon"
-						@click="open_child_doctype"
-						:title="__(`Edit ${field.df.options} Doctype`)"
-					>
-						<div v-html="frappe.utils.icon('up-right-external', 'sm')"></div>
-					</button>
 					<button
 						v-if="column.fields.indexOf(field)"
 						class="btn btn-xs btn-icon"
@@ -255,20 +244,30 @@ onMounted(() => selected.value && label_input.value.focus_on_label());
 							__('Move the current field and the following fields to a new column')
 						"
 						@click="move_fields_to_column"
-					></button>
+					>
+						<div v-html="frappe.utils.icon('move', 'sm')" />
+					</button>
 					<button
 						class="btn btn-xs btn-icon"
 						:title="__('Duplicate field')"
 						@click.stop="duplicate_field"
 					>
-						<div v-html="frappe.utils.icon('duplicate', 'sm')"></div>
+						<div v-html="frappe.utils.icon('duplicate', 'sm')" />
+					</button>
+					<button
+						v-if="field.df.fieldtype === 'Table' && field.df.options"
+						class="btn btn-xs btn-icon"
+						@click="open_child_doctype"
+						:title="__(`Edit ${field.df.options} Doctype`)"
+					>
+						<div v-html="frappe.utils.icon('external-link', 'sm')" />
 					</button>
 					<button
 						class="btn btn-xs btn-icon"
 						:title="__('Remove field')"
 						@click.stop="remove_field"
 					>
-						<div v-html="frappe.utils.icon('remove', 'sm')"></div>
+						<div v-html="frappe.utils.icon('remove', 'sm')" />
 					</button>
 				</div>
 			</template>
diff --git a/frappe/public/js/form_builder/components/controls/TableControl.vue b/frappe/public/js/form_builder/components/controls/TableControl.vue
index bfaf395e44..db1b2407d8 100644
--- a/frappe/public/js/form_builder/components/controls/TableControl.vue
+++ b/frappe/public/js/form_builder/components/controls/TableControl.vue
@@ -56,7 +56,7 @@ function open_new_child_doctype_dialog() {
 				@click="open_new_child_doctype_dialog"
 				v-if="!table_columns.length"
 			>
-				{{ __("Create a New Child Doctype") }}
+				{{ __("Create Child Doctype") }}
 			</button>
 			<p v-else>{{ __("No Data") }}</p>
 		</div>