From 7a754b7444fee6f77d099b863f0e3f876db56cf7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 15:42:47 +0530
Subject: [PATCH] fix: misc onboarding fixes (#21078) (#21085)

* fix: show fields without label too

* fix: make form tour step editable

* fix: hide duplicate save buttons


(cherry picked from commit 119313810e64b044337e05ec31fdd772251283fa)

Co-authored-by: Ankush Menat <ankush@frappe.io>
---
 frappe/desk/doctype/form_tour_step/form_tour_step.json | 3 ++-
 frappe/public/js/frappe/form/form.js                   | 3 ++-
 frappe/public/js/frappe/form/form_tour.js              | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/doctype/form_tour_step/form_tour_step.json b/frappe/desk/doctype/form_tour_step/form_tour_step.json
index 7eb6eab223d..d0c57ba1e67 100644
--- a/frappe/desk/doctype/form_tour_step/form_tour_step.json
+++ b/frappe/desk/doctype/form_tour_step/form_tour_step.json
@@ -2,6 +2,7 @@
  "actions": [],
  "creation": "2021-05-21 23:05:45.342114",
  "doctype": "DocType",
+ "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "is_table_field",
@@ -115,7 +116,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-01-27 15:18:36.481801",
+ "modified": "2023-05-23 13:09:15.923043",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Form Tour Step",
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 7fd6953251b..25e1c6c74fc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1991,7 +1991,8 @@ frappe.ui.form.Form = class FrappeForm {
 		return new Promise((resolve) => {
 			frappe.model.with_doctype(reference_doctype, () => {
 				frappe.get_meta(reference_doctype).fields.map((df) => {
-					filter_function(df) && options.push({ label: df.label, value: df.fieldname });
+					filter_function(df) &&
+						options.push({ label: df.label || df.fieldname, value: df.fieldname });
 				});
 				options &&
 					this.set_df_property(
diff --git a/frappe/public/js/frappe/form/form_tour.js b/frappe/public/js/frappe/form/form_tour.js
index dbdd673aeaf..f7953c08b2b 100644
--- a/frappe/public/js/frappe/form/form_tour.js
+++ b/frappe/public/js/frappe/form/form_tour.js
@@ -261,10 +261,10 @@ frappe.ui.form.FormTour = class FormTour {
 			allowClose: false,
 			overlayClickNext: false,
 			popover: {
-				title: __("Save"),
+				title: __("Save the document."),
 				description: "",
 				position: "left",
-				doneBtnText: __("Save"),
+				showButtons: false,
 			},
 			onNext: () => {
 				this.frm.save();