Merge pull request #18123 from frappe/mergify/bp/version-14-hotfix/pr-18111

refactor(minor): simplify show_kanban_dialog & allow multiple kanban board creation (backport #18111)

frappe/public/js/frappe/list/list_view_select.js

@@ -248,19 +248,34 @@ frappe.views.ListViewSelect = class ListViewSelect {
 	}
 
 	setup_kanban_boards() {
+		function fetch_kanban_board(doctype) {
+			frappe.db.get_value(
+				"Kanban Board",
+				{ reference_doctype: doctype },
+				"name",
+				(board) => {
+					if (!$.isEmptyObject(board)) {
+						frappe.set_route("list", doctype, "kanban", board.name);
+					} else {
+						frappe.views.KanbanView.show_kanban_dialog(doctype);
+					}
+				}
+			);
+		}
+
 		const last_opened_kanban =
 			frappe.model.user_settings[this.doctype]["Kanban"]?.last_kanban_board;
-
 		if (!last_opened_kanban) {
-			return frappe.views.KanbanView.show_kanban_dialog(this.doctype, true);
+			fetch_kanban_board(this.doctype);
+		} else {
+			frappe.db.exists("Kanban Board", last_opened_kanban).then((exists) => {
+				if (exists) {
+					frappe.set_route("list", this.doctype, "kanban", last_opened_kanban);
+				} else {
+					fetch_kanban_board(this.doctype);
+				}
+			});
 		}
-		frappe.db.exists("Kanban Board", last_opened_kanban).then((exists) => {
-			if (exists) {
-				frappe.set_route("list", this.doctype, "kanban", last_opened_kanban);
-			} else {
-				frappe.views.KanbanView.show_kanban_dialog(this.doctype, true);
-			}
-		});
 	}
 
 	get_calendars() {

frappe/public/js/frappe/views/kanban/kanban_view.js

@@ -234,13 +234,9 @@ frappe.views.KanbanView.get_kanbans = function (doctype) {
 	}
 };
 
-frappe.views.KanbanView.show_kanban_dialog = function (doctype, show_existing) {
-	let dialog = null;
-
-	frappe.views.KanbanView.get_kanbans(doctype).then((kanbans) => {
-		dialog = new_kanban_dialog(kanbans, show_existing);
-		dialog.show();
-	});
+frappe.views.KanbanView.show_kanban_dialog = function (doctype) {
+	let dialog = new_kanban_dialog();
+	dialog.show();
 
 	function make_kanban_board(board_name, field_name, project) {
 		return frappe.call({
@@ -262,79 +258,74 @@ frappe.views.KanbanView.show_kanban_dialog = function (doctype, show_existing) {
 		});
 	}
 
-	function new_kanban_dialog(kanbans, show_existing) {
+	function new_kanban_dialog() {
 		/* Kanban dialog can show either "Save" or "Customize Form" option depending if any Select fields exist in the DocType for Kanban creation
 		 */
-		if (dialog) return dialog;
 
-		const dialog_fields = get_fields_for_dialog(
-			kanbans.map((kanban) => kanban.name),
-			show_existing
-		);
 		const select_fields = frappe.get_meta(doctype).fields.filter((df) => {
 			return df.fieldtype === "Select" && df.fieldname !== "kanban_column";
 		});
+		const dialog_fields = get_fields_for_dialog(select_fields);
 		const to_save = select_fields.length > 0;
 		const primary_action_label = to_save ? __("Save") : __("Customize Form");
+		const dialog_title = to_save ? __("New Kanban Board") : __("No Select Field Found");
 
 		let primary_action = () => {
 			if (to_save) {
 				const values = dialog.get_values();
-				if (!values.selected_kanban || values.selected_kanban == "Create New Board") {
-					make_kanban_board(values.board_name, values.field_name, values.project).then(
-						() => dialog.hide(),
-						(err) => frappe.msgprint(err)
-					);
-				} else {
-					frappe.set_route(
-						kanbans.find((kanban) => kanban.name == values.selected_kanban).route
-					);
-				}
+				make_kanban_board(values.board_name, values.field_name, values.project).then(
+					() => dialog.hide(),
+					(err) => frappe.msgprint(err)
+				);
 			} else {
 				frappe.set_route("Form", "Customize Form", { doc_type: doctype });
 			}
 		};
 
-		dialog = new frappe.ui.Dialog({
-			title: __("New Kanban Board"),
+		return new frappe.ui.Dialog({
+			title: dialog_title,
 			fields: dialog_fields,
 			primary_action_label,
 			primary_action,
 		});
-		return dialog;
 	}
 
-	function get_fields_for_dialog(kanban_options, show_existing = false) {
-		kanban_options.push("Create New Board");
-		const select_fields = frappe.get_meta(doctype).fields.filter((df) => {
-			return df.fieldtype === "Select" && df.fieldname !== "kanban_column";
-		});
+	function get_fields_for_dialog(select_fields) {
+		if (!select_fields.length) {
+			return [
+				{
+					fieldtype: "HTML",
+					options: `
+					<div>
+						<p class="text-medium">
+						${__(
+							'No fields found that can be used as a Kanban Column. Use the Customize Form to add a Custom Field of type "Select".'
+						)}
+						</p>
+					</div>
+				`,
+				},
+			];
+		}
 
 		let fields = [
-			{
-				fieldtype: "Select",
-				fieldname: "selected_kanban",
-				label: __("Choose Kanban Board"),
-				reqd: 1,
-				depends_on: `eval: ${show_existing}`,
-				mandatory_depends_on: `eval: ${show_existing}`,
-				options: kanban_options,
-				default: kanban_options[0],
-			},
-			{
-				fieldname: "new_kanban_board_sb",
-				fieldtype: "Section Break",
-				depends_on: `eval: !${show_existing} || doc.selected_kanban == "Create New Board"`,
-			},
 			{
 				fieldtype: "Data",
 				fieldname: "board_name",
 				label: __("Kanban Board Name"),
-				mandatory_depends_on: 'eval: doc.selected_kanban == "Create New Board"',
+				reqd: 1,
 				description: ["Note", "ToDo"].includes(doctype)
 					? __("This Kanban Board will be private")
 					: "",
 			},
+			{
+				fieldtype: "Select",
+				fieldname: "field_name",
+				label: __("Columns based on"),
+				options: select_fields.map((df) => ({ label: df.label, value: df.fieldname })),
+				default: select_fields[0],
+				reqd: 1,
+			},
 		];
 
 		if (doctype === "Task") {
@@ -346,32 +337,6 @@ frappe.views.KanbanView.show_kanban_dialog = function (doctype, show_existing) {
 			});
 		}
 
-		if (select_fields.length > 0) {
-			fields.push({
-				fieldtype: "Select",
-				fieldname: "field_name",
-				label: __("Columns based on"),
-				options: select_fields.map((df) => ({ label: df.label, value: df.fieldname })),
-				default: select_fields[0],
-				mandatory_depends_on: 'eval: doc.selected_kanban == "Create New Board"',
-			});
-		} else {
-			fields = [
-				{
-					fieldtype: "HTML",
-					options: `
-					<div>
-						<p class="text-medium">
-						${__(
-							'No fields found that can be used as a Kanban Column. Use the Customize Form to add a Custom Field of type "Select".'
-						)}
-						</p>
-					</div>
-				`,
-				},
-			];
-		}
-
 		return fields;
 	}
 };