Merge branch 'develop' into merge_translated_doctypes

cypress/integration/control_data.js

@@ -42,7 +42,7 @@ context("Data Control", () => {
 		cy.visit(`/app/doctype/User`);
 		cy.get(
 			'[data-fieldname="fields"] .grid-row[data-idx="2"] [data-fieldname="fieldtype"] .static-area'
-		).should("have.text", "🔵 Section Break");
+		).should("have.text", "Section Break");
 	});
 
 	it('Verifying data control by inputting different patterns for "Name" field', () => {

frappe/public/js/frappe/doctype/index.js

@@ -11,12 +11,12 @@ frappe.model.DocTypeController = class DocTypeController extends frappe.ui.form.
 			this.frm.doctype === "DocType" ? "DocField" : "Customize Form Field"
 		].fieldtype.formatter = (value) => {
 			const prefix = {
-				"Tab Break": "🔴",
-				"Section Break": "🔵",
-				"Column Break": "🟡",
+				"Tab Break": "--red-600",
+				"Section Break": "--blue-600",
+				"Column Break": "--yellow-600",
 			};
 			if (prefix[value]) {
-				value = prefix[value] + " " + value;
+				value = `<span class="bold" style="color: var(${prefix[value]})">${value}</span>`;
 			}
 			return value;
 		};

frappe/public/js/frappe/socketio_client.js

@@ -59,7 +59,7 @@ frappe.socketio = {
 		frappe.socketio.setup_reconnect();
 
 		$(document).on("form-load form-rename", function (e, frm) {
-			if (frm.is_new()) {
+			if (!frm.doc || frm.is_new()) {
 				return;
 			}
 
@@ -75,7 +75,7 @@ frappe.socketio = {
 		});
 
 		$(document).on("form-refresh", function (e, frm) {
-			if (frm.is_new()) {
+			if (!frm.doc || frm.is_new()) {
 				return;
 			}
 
@@ -83,7 +83,7 @@ frappe.socketio = {
 		});
 
 		$(document).on("form-unload", function (e, frm) {
-			if (frm.is_new()) {
+			if (!frm.doc || frm.is_new()) {
 				return;
 			}
 
@@ -100,14 +100,11 @@ frappe.socketio = {
 		});
 
 		window.addEventListener("beforeunload", () => {
-			if (!cur_frm || cur_frm.is_new()) {
+			if (!cur_frm || !cur_frm.doc || cur_frm.is_new()) {
 				return;
 			}
 
-			// if tab/window is closed, notify other users
-			if (cur_frm.doc) {
-				frappe.socketio.doc_close(cur_frm.doctype, cur_frm.docname);
-			}
+			frappe.socketio.doc_close(cur_frm.doctype, cur_frm.docname);
 		});
 	},
 	get_host: function (port = 3000) {

frappe/public/js/frappe/views/reports/report_view.js

@@ -536,7 +536,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		this.last_chart_type = args.chart_type;
 
 		const get_df = (field) => this.columns_map[field].docfield;
-		const get_doc = (value, field) => this.data.find((d) => d[field] === value);
 
 		this.$charts_wrapper.removeClass("hidden");
 
@@ -551,13 +550,12 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				numberFormatter: frappe.utils.format_chart_axis_number,
 			},
 			tooltipOptions: {
-				formatTooltipY: (value) =>
-					frappe.format(
-						value,
-						get_df(this.chart_args.y_axes[0]),
-						{ always_show_decimals: true, inline: true },
-						get_doc(value.doc)
-					),
+				formatTooltipY: (value) => {
+					return frappe.format(value, get_df(this.chart_args.y_axes[0]), {
+						always_show_decimals: true,
+						inline: true,
+					});
+				},
 			},
 		});
 	}