Merge branch 'develop' into update-python-deps

cypress/integration/control_data.js

@@ -34,6 +34,12 @@ context('Data Control', () => {
 			});
 		});
 	});
+
+	it('check custom formatters', () => {
+		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');
+	});
+
 	it('Verifying data control by inputting different patterns for "Name" field', () => {
 		cy.new_form('Test Data Control');
 
@@ -54,7 +60,7 @@ context('Data Control', () => {
 
 		//Checking if the border color of the field changes to red
 		cy.get('.frappe-control[data-fieldname="name1"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 
 		//Checking for the error message
 		cy.get('.modal-title').should('have.text', 'Message');
@@ -64,7 +70,7 @@ context('Data Control', () => {
 		cy.get_field('name1', 'Data').clear({force: true});
 		cy.fill_field('name1', 'Komal{}/!', 'Data');
 		cy.get('.frappe-control[data-fieldname="name1"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 		cy.get('.modal-title').should('have.text', 'Message');
 		cy.get('.msgprint').should('have.text', 'Komal{}/! is not a valid Name');
 		cy.hide_dialog();
@@ -76,14 +82,14 @@ context('Data Control', () => {
 		cy.get_field('email', 'Data').clear({force: true});
 		cy.fill_field('email', 'komal', 'Data');
 		cy.get('.frappe-control[data-fieldname="email"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 		cy.get('.modal-title').should('have.text', 'Message');
 		cy.get('.msgprint').should('have.text', 'komal is not a valid Email Address');
 		cy.hide_dialog();
 		cy.get_field('email', 'Data').clear({force: true});
 		cy.fill_field('email', 'komal@test', 'Data');
 		cy.get('.frappe-control[data-fieldname="email"]').should('have.class', 'has-error');
-		cy.findByRole('button', {name: 'Save'}).click();
+		cy.save();
 		cy.get('.modal-title').should('have.text', 'Message');
 		cy.get('.msgprint').should('have.text', 'komal@test is not a valid Email Address');
 		cy.hide_dialog();
@@ -125,4 +131,4 @@ context('Data Control', () => {
 		cy.get('.actions-btn-group > .dropdown-menu [data-label="Delete"]').click();
 		cy.click_modal_primary_button('Yes');
 	});
-});
+});

cypress/integration/customize_form.js

@@ -1,5 +1,6 @@
 context('Customize Form', () => {
 	before(() => {
+		cy.login();
 		cy.visit('/app/customize-form');
 	});
 	it('Changing to naming rule should update autoname', () => {
@@ -19,4 +20,4 @@ context('Customize Form', () => {
 			cy.get_field("autoname", "Data").should("have.value", value);
 		});
 	});
-});
+});

cypress/support/commands.js

@@ -27,6 +27,7 @@ import "cypress-real-events/support";
 //
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... });
+
 Cypress.Commands.add('login', (email, password) => {
 	if (!email) {
 		email = 'Administrator';
@@ -265,9 +266,15 @@ Cypress.Commands.add('get_open_dialog', () => {
 	return cy.get('.modal:visible').last();
 });
 
+Cypress.Commands.add('save', () => {
+	cy.intercept('/api').as('api');
+	cy.get(`button[data-label="Save"]:visible`).click({scrollBehavior: false, force: true});
+	cy.wait('@api');
+});
+
 Cypress.Commands.add('hide_dialog', () => {
-	cy.wait(300);
-	cy.get_open_dialog().find('.btn-modal-close').click();
+	cy.wait(400);
+	cy.get('.btn-modal-close:visible').click({force: true});
 	cy.get('.modal:visible').should('not.exist');
 });
 

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

@@ -5,6 +5,21 @@ frappe.provide("frappe.model");
 	apply to both DocType form and customize form.
 */
 frappe.model.DocTypeController = class DocTypeController extends frappe.ui.form.Controller {
+	setup() {
+		// setup formatters for fieldtype
+		frappe.meta.docfield_map[this.frm.doctype==='DocType' ? 'DocField' : 'Customize Form Field'].fieldtype.formatter = (value) => {
+			const prefix = {
+				'Tab Break': '🔴',
+				'Section Break': '🔵',
+				'Column Break': '🟡',
+			};
+			if (prefix[value]) {
+				value = prefix[value] + ' ' + value;
+			}
+			return value;
+		};
+	}
+
 	max_attachments() {
 		if (!this.frm.doc.max_attachments) {
 			return;

frappe/public/js/frappe/form/dashboard.js

@@ -19,7 +19,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 		});
 
 		this.heatmap_area = this.make_section({
-			label: __("Overview"),
+			label: __("Activity"),
 			css_class: 'form-heatmap',
 			hidden: 1,
 			collapsible: 1,

frappe/public/js/frappe/form/formatters.js

@@ -15,17 +15,35 @@ frappe.form.formatters = {
 			return "<div style='text-align: right'>" + value + "</div>";
 		}
 	},
+	_apply_custom_formatter: function(value, df) {
+		/* you can add a custom formatter in df.formatter
+		example:
+			frappe.meta.docfield_map[df.parent][df.fieldname].formatter = (value) => {
+				if (value==='Test') return '😜';
+			}
+		*/
+
+		if (df) {
+			const std_df = frappe.meta.docfield_map[df.parent] && frappe.meta.docfield_map[df.parent][df.fieldname];
+			if (std_df && std_df.formatter && typeof std_df.formatter==='function') {
+				value = std_df.formatter(value);
+			}
+		}
+		return value;
+	},
 	Data: function(value, df) {
 		if (df && df.options == "URL") {
 			return `<a href="${value}" title="Open Link" target="_blank">${value}</a>`;
 		}
-		return value==null ? "" : value;
+		value = value==null ? "" : value;
+
+		return frappe.form.formatters._apply_custom_formatter(value, df);
 	},
-	Autocomplete: function(value) {
-		return __(frappe.form.formatters["Data"](value));
+	Autocomplete: function(value, df) {
+		return __(frappe.form.formatters["Data"](value, df));
 	},
-	Select: function(value) {
-		return __(frappe.form.formatters["Data"](value));
+	Select: function(value, df) {
+		return __(frappe.form.formatters["Data"](value, df));
 	},
 	Float: function(value, docfield, options, doc) {
 		// don't allow 0 precision for Floats, hence or'ing with null
@@ -183,7 +201,7 @@ frappe.form.formatters = {
 			return "";
 		}
 	},
-	Text: function(value) {
+	Text: function(value, df) {
 		if(value) {
 			var tags = ["<p", "<div", "<br", "<table"];
 			var match = false;
@@ -200,7 +218,7 @@ frappe.form.formatters = {
 			}
 		}
 
-		return frappe.form.formatters.Data(value);
+		return frappe.form.formatters.Data(value, df);
 	},
 	Time: function(value) {
 		if (value) {

frappe/public/js/frappe/form/tab.js

@@ -3,7 +3,7 @@ export default class Tab {
 		this.parent = parent;
 		this.df = df || {};
 		this.frm = frm;
-		this.doctype = 'User';
+		this.doctype = this.frm.doctype;
 		this.label = this.df && this.df.label;
 		this.tabs_list = tabs_list;
 		this.tabs_content = tabs_content;

frappe/public/js/frappe/widgets/onboarding_widget.js

@@ -222,7 +222,7 @@ export default class OnboardingWidget extends Widget {
 			const on_finish = () => {
 				let msg_dialog = frappe.msgprint({
 					message: __("Let's take you back to onboarding"),
-					title: __("Great Job"),
+					title: __("Onboarding complete"),
 					primary_action: {
 						action: () => {
 							frappe.set_route(current_route).then(() => {
@@ -265,7 +265,7 @@ export default class OnboardingWidget extends Widget {
 
 			if (success) {
 				args.message = __("Let's take you back to onboarding");
-				args.title = __("Looks Great");
+				args.title = __("Action Complete");
 				args.primary_action = {
 					action: () => {
 						frappe.set_route(current_route).then(() => {
@@ -278,7 +278,7 @@ export default class OnboardingWidget extends Widget {
 				custom_onhide = () => args.primary_action.action();
 			} else {
 				args.message = __("Looks like you didn't change the value");
-				args.title = __("Oops");
+				args.title = __("Try Again");
 				args.secondary_action = {
 					action: () => frappe.set_route(current_route),
 					label: __("Go Back"),
@@ -314,7 +314,7 @@ export default class OnboardingWidget extends Widget {
 			const on_finish = () => {
 				frappe.msgprint({
 					message: __("Awesome, now try making an entry yourself"),
-					title: __("Great"),
+					title: __("Document Saved"),
 					primary_action: {
 						action: () => {
 							frappe.set_route(current_route).then(() => {
@@ -337,8 +337,8 @@ export default class OnboardingWidget extends Widget {
 
 		let callback = () => {
 			frappe.msgprint({
-				message: __("You're doing great, let's take you back to the onboarding page."),
-				title: __("Good Work 🎉"),
+				message: __("Let's take you back to onboarding"),
+				title: __("Action Complete"),
 				primary_action: {
 					action: () => {
 						frappe.set_route(current_route).then(() => {
@@ -358,7 +358,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = () => {
 				frappe.msgprint({
 					message: __("Submit this document to complete this step."),
-					title: __("Great")
+					title: __("Document Saved")
 				});
 			};
 			frappe.route_hooks.after_submit = callback;
@@ -377,7 +377,7 @@ export default class OnboardingWidget extends Widget {
 				if (frappe.get_route_str() != current_route) {
 					let success_dialog = frappe.msgprint({
 						message: __("Let's take you back to onboarding"),
-						title: __("Looks Great"),
+						title: __("Document Saved"),
 						primary_action: {
 							action: () => {
 								success_dialog.hide();
@@ -397,7 +397,7 @@ export default class OnboardingWidget extends Widget {
 				} else {
 					frappe.msgprint({
 						message: __("Let us continue with the onboarding"),
-						title: __("Looks Great")
+						title: __("Document Saved")
 					});
 					this.mark_complete(step);
 				}

frappe/public/scss/common/grid.scss

@@ -201,7 +201,7 @@
 		}
 
 		.link-btn {
-			top: 8px;
+			top: 2px;
 		}
 
 		.form-control:focus {

frappe/public/scss/desk/desktop.scss

@@ -421,8 +421,8 @@ body {
 						display: none;
 					}
 
-					i {
-						color: var(--green-600);
+					.icon {
+						stroke: var(--white);
 					}
 
 					span {

frappe/public/scss/login.bundle.scss

@@ -16,7 +16,7 @@ body {
 .for-forgot,
 .for-signup,
 .for-email-login {
-	padding: max(15vh, 70px) 0;
+	padding: max(10vh, 60px) 0;
 
 	@include media-breakpoint-up(sm) {
 		.page-card {
@@ -177,6 +177,7 @@ body {
 		}
 
 		h4 {
+			margin-top: 1rem;
 			font-size: var(--text-xl);
 			color: var(--text-color);
 		}