Version 16

.github/workflows/build-and-commit-assets.yml

@@ -0,0 +1,60 @@
+name: Build and Upload Assets
+
+on:
+  push:
+    branches:
+      - develop
+      - 'version-*'
+
+concurrency:
+  group: build-assets-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+
+jobs:
+  build-assets:
+    name: Build JS/CSS and upload to release
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: apps/frappe
+
+      - name: Create bench structure
+        run: |
+          mkdir -p sites
+          echo "frappe" > sites/apps.txt
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: yarn
+          cache-dependency-path: apps/frappe/yarn.lock
+
+      - name: Install JS dependencies
+        working-directory: apps/frappe
+        run: yarn install --frozen-lockfile
+
+      - name: Link node_modules into public/
+        working-directory: apps/frappe
+        run: ln -s "$PWD/node_modules" frappe/public/node_modules
+
+      - name: Build assets (production)
+        working-directory: apps/frappe
+        run: yarn run production
+
+      - name: Package assets
+        working-directory: apps/frappe
+        run: tar czf frappe-assets.tar.gz -C ../../sites/assets/frappe dist
+
+      - name: Upload to rolling release
+        working-directory: apps/frappe
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          TAG="assets-${GITHUB_REF_NAME//\//-}"
+          gh release create "$TAG" --prerelease --title "Assets: $GITHUB_REF_NAME" --notes "" 2>/dev/null || true
+          gh release upload "$TAG" frappe-assets.tar.gz --clobber

.github/workflows/server-tests.yml

@@ -65,8 +65,8 @@ jobs:
   coverage:
     name: Coverage Wrap Up
     needs: [test, checkrun]
+    if: ${{ needs.checkrun.outputs.build == 'strawberry' && github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Clone
         uses: actions/checkout@v6

cypress/integration/global_search_settings.js

@@ -0,0 +1,129 @@
+context("Global Search Settings — configure search fields", () => {
+	const GS_GRID = '.frappe-control[data-fieldname="allowed_in_global_search"]';
+
+	/** Editable-grid Link fields only mount after the row is active (toggle_editable_row → make_control). */
+	function ensure_first_priority_row() {
+		cy.get(`${GS_GRID} .grid-body`).then(($body) => {
+			if ($body.find(".grid-row").length === 0) {
+				cy.get(`${GS_GRID} .grid-add-row`).click();
+			}
+		});
+		cy.get(`${GS_GRID} .grid-body .grid-row[data-idx="1"]`).should("exist");
+	}
+
+	function activate_document_type_cell(rowAlias = "@row") {
+		cy.get(rowAlias).find('[data-fieldname="document_type"]').click();
+		cy.get(rowAlias).find('[data-fieldname="document_type"] input').should("exist");
+	}
+
+	/** Awesomplete dropdown is attached via `aria-owns` (often outside the row); items are `div[role="option"]`, not `li`. */
+	function select_document_type_link(rowAlias, label) {
+		cy.get(rowAlias).find('[data-fieldname="document_type"] input').as("docTypeInput");
+		cy.get("@docTypeInput").clear().focus().type(label, { delay: 100 });
+		cy.get("@docTypeInput").invoke("attr", "aria-owns").should("match", /\w+/);
+		cy.get("@docTypeInput")
+			.invoke("attr", "aria-owns")
+			.then((ownsId) => {
+				const sel = `#${CSS.escape(ownsId)}`;
+				cy.get(sel).should("be.visible");
+				cy.get(sel)
+					.find('[role="option"]')
+					.filter((_, el) => {
+						const $el = Cypress.$(el);
+						const primary =
+							$el.find("strong").first().text().trim() ||
+							$el.text().trim().split("\n")[0];
+						return primary === label;
+					})
+					.should("have.length", 1)
+					.scrollIntoView()
+					.click({ force: true });
+			});
+		cy.get("@docTypeInput").blur();
+		cy.get("@docTypeInput").should("have.value", label);
+	}
+
+	beforeEach(() => {
+		cy.login("Administrator", Cypress.env("adminPassword") || "admin");
+		cy.visit("/desk/global-search-settings");
+		cy.get("body").should("have.attr", "data-ajax-state", "complete");
+		cy.get(`${GS_GRID}`).should("exist");
+	});
+
+	it("shows a message when Configure is clicked without Document Type", () => {
+		cy.get('.frappe-control[data-fieldname="allowed_in_global_search"]')
+			.find(".grid-add-row")
+			.click();
+		cy.get(
+			'.frappe-control[data-fieldname="allowed_in_global_search"] .grid-body .grid-row:last'
+		)
+			.find('[data-fieldname="configure"] button')
+			.click();
+		cy.get(".msgprint").should("contain", "Please select Document Type first");
+	});
+
+	it("opens configure dialog with MultiCheck field options and filter search", () => {
+		ensure_first_priority_row();
+		cy.get(`${GS_GRID} .grid-body .grid-row[data-idx="1"]`).as("row");
+		activate_document_type_cell();
+		select_document_type_link("@row", "ToDo");
+
+		cy.get("@row").find('[data-fieldname="configure"] button').click();
+
+		cy.get_open_dialog().find(".modal-title").should("contain", "Configure search fields");
+		cy.get_open_dialog().should("contain", "ToDo");
+		cy.get_open_dialog()
+			.find('.checkbox-options input[type="checkbox"][data-unit="name"]')
+			.should("exist");
+
+		const unlikely = "xyz-nonmatching-global-search-filter-12345";
+		cy.get_open_dialog().find('[data-element="search"]').clear().type(unlikely);
+		cy.get_open_dialog()
+			.find(".checkbox-options .unit-checkbox:visible")
+			.should("have.length", 0);
+		cy.get_open_dialog().find('[data-element="search"]').clear();
+		cy.get_open_dialog()
+			.find(".checkbox-options .unit-checkbox:visible")
+			.should((els) => {
+				expect(els.length).to.be.greaterThan(0);
+			});
+
+		cy.get_open_dialog().find(".btn-modal-close").click();
+		cy.get(".modal:visible").should("not.exist");
+	});
+
+	it("saves selected fields and shows success toast", () => {
+		cy.intercept(
+			"POST",
+			"/api/method/frappe.desk.doctype.global_search_settings.global_search_settings.update_global_search_fields"
+		).as("update_global_search_fields");
+
+		ensure_first_priority_row();
+		cy.get(`${GS_GRID} .grid-body .grid-row[data-idx="1"]`).as("row");
+		activate_document_type_cell();
+		// Must not be a Core module DocType — API rejects those (no toast; server error).
+		select_document_type_link("@row", "ToDo");
+
+		cy.get("@row").find('[data-fieldname="configure"] button').click();
+
+		cy.get_open_dialog()
+			.find('.checkbox-options input[type="checkbox"][data-unit="name"]')
+			.should("exist");
+
+		cy.get_open_dialog()
+			.find(".modal-footer .standard-actions .btn-primary")
+			.contains("Save")
+			.click({ force: true });
+
+		cy.wait("@update_global_search_fields").then(({ response }) => {
+			expect(response.statusCode).to.eq(200);
+			expect(response.body.exc, JSON.stringify(response.body)).to.be.undefined;
+			expect(response.body.message?.success).to.eq(true);
+		});
+
+		cy.get('[role="alert"].desk-alert .alert-message', { timeout: 25000 }).should(
+			"contain",
+			"Search fields updated."
+		);
+	});
+});

cypress/integration/grid.js

@@ -111,4 +111,90 @@ context("Grid", () => {
 				cy.get("@table-form").find(".grid-footer-toolbar").click();
 			});
 	});
+
+	it("shows edit button only when child table allow_bulk_edit is enabled", () => {
+		cy.visit("/desk/contact/Test Contact");
+		cy.get('.frappe-control[data-fieldname="phone_nos"]').as("table");
+
+		cy.window()
+			.its("cur_frm")
+			.then((frm) => {
+				const grid = frm.get_field("phone_nos").grid;
+				grid.meta.allow_bulk_edit = false;
+				grid.refresh_edit_rows_button();
+			});
+
+		cy.get("@table").find('.grid-row[data-idx="1"] .grid-row-check').click({ force: true });
+		cy.get("@table").find(".grid-edit-rows").should("have.class", "hidden");
+
+		cy.window()
+			.its("cur_frm")
+			.then((frm) => {
+				const grid = frm.get_field("phone_nos").grid;
+				grid.meta.allow_bulk_edit = true;
+				grid.refresh_edit_rows_button();
+			});
+
+		cy.get("@table").find(".grid-edit-rows").should("not.have.class", "hidden");
+	});
+
+	it("bulk edit updates only selected child rows", () => {
+		const updated_phone = `99999${Date.now().toString().slice(-5)}`;
+
+		cy.visit("/desk/contact/Test Contact");
+		cy.get('.frappe-control[data-fieldname="phone_nos"]').as("table");
+
+		cy.window()
+			.its("cur_frm")
+			.then((frm) => {
+				const grid = frm.get_field("phone_nos").grid;
+				grid.meta.allow_bulk_edit = true;
+				grid.refresh_edit_rows_button();
+
+				expect(frm.doc.phone_nos.length).to.be.greaterThan(1);
+				const phone_df = grid.docfields.find((df) => df.fieldname === "phone");
+				expect(phone_df).to.exist;
+				cy.wrap(phone_df.label).as("phoneFieldLabel");
+				cy.wrap(frm.doc.phone_nos[1].phone || "").as("secondRowPhoneBefore");
+			});
+
+		cy.get("@table").find('.grid-row[data-idx="1"] .grid-row-check').click({ force: true });
+		cy.get("@table").find(".grid-edit-rows").click({ force: true });
+
+		cy.window()
+			.its("cur_dialog")
+			.then((dialog) => {
+				cy.get("@phoneFieldLabel").then((phoneFieldLabel) => {
+					return dialog
+						.set_value("field", phoneFieldLabel)
+						.then(() => dialog.set_value("value", updated_phone))
+						.then(() => {
+							dialog.get_primary_btn().click();
+						});
+				});
+			});
+
+		cy.window().its("cur_frm.doc.phone_nos.0.phone").should("eq", updated_phone);
+		cy.window()
+			.its("cur_frm")
+			.then((frm) => {
+				cy.get("@secondRowPhoneBefore").then((secondRowPhoneBefore) => {
+					expect(frm.doc.phone_nos[1].phone || "").to.equal(secondRowPhoneBefore);
+				});
+			});
+	});
+
+	it("hides add-row and add-multiple-rows buttons when rows are selected", () => {
+		cy.visit("/desk/contact/Test Contact");
+		cy.get('.frappe-control[data-fieldname="phone_nos"]').as("table");
+
+		cy.get("@table").find('.grid-row[data-idx="1"] .grid-row-check').click({ force: true });
+
+		cy.get("@table").find(".grid-add-row").should("have.class", "hidden");
+		cy.get("@table").find(".grid-add-multiple-rows").should("have.class", "hidden");
+
+		cy.get("@table").find('.grid-row[data-idx="1"] .grid-row-check').click({ force: true });
+
+		cy.get("@table").find(".grid-add-row").should("not.have.class", "hidden");
+	});
 });

cypress/integration/grid_row_form_tabs.js

@@ -112,6 +112,29 @@ context("Grid Row Form Tabs", () => {
 		cy.get("@table-form2").find(".form-tabs .nav-link").first().should("have.class", "active");
 	});
 
+	it("should jump to a field inside the grid row form", () => {
+		cy.new_form(parent_doctype_name);
+		cy.fill_field("title", "Test Jump To Field");
+
+		// Add a row and open the grid row form
+		cy.get('.frappe-control[data-fieldname="items"]').as("table");
+		cy.get("@table").findByRole("button", { name: "Add row" }).click();
+		cy.get("@table").find('[data-idx="1"]').find(".btn-open-row").click();
+		cy.get(".grid-row-open").as("table-form");
+
+		// Jump to a field that lives on a different tab (Details > Notes)
+		cy.get("body").type("{esc}").type("{ctrl+j}");
+		cy.get(".modal input[type='text']").first().focus();
+		cy.get("body").type("Notes").wait(1000).type("{enter}").wait(200);
+		cy.findByRole("button", { name: "Go" }).click().wait(500);
+
+		// Grid row form stays open and the target field is focused
+		cy.get(".grid-row-open").should("exist");
+		cy.get("@table-form")
+			.find('.frappe-control[data-fieldname="notes"] input')
+			.should("be.focused");
+	});
+
 	it("should allow data entry in fields across different tabs", () => {
 		cy.new_form(parent_doctype_name);
 		cy.fill_field("title", "Test Data Entry");

cypress/integration/query_report.js

@@ -39,8 +39,17 @@ context("Query Report", () => {
 					.click({ force: true });
 				cy.get_open_dialog().get(".modal-title").should("contain", "Add Column");
 				cy.get('select[data-fieldname="doctype"]').select("Role (Name)", { force: true });
-				cy.get('select[data-fieldname="field"]').select("Role Name", { force: true });
-				cy.get('select[data-fieldname="insert_after"]').select("Name", { force: true });
+				cy.wait(500);
+				cy.get_open_dialog()
+					.find('.control-input > .awesomplete > input[data-fieldname="field"]')
+					.should("be.visible")
+					.clear({ force: true })
+					.type("Role Name{enter}", { delay: 150, force: true });
+				cy.get_open_dialog()
+					.find('.control-input > .awesomplete > input[data-fieldname="insert_after"]')
+					.should("be.visible")
+					.clear({ force: true })
+					.type("Name{enter}", { delay: 150, force: true });
 				cy.get_open_dialog()
 					.findByRole("button", { name: "Submit" })
 					.click({ force: true });