Remove the table hookup form from regions.mount now that tables mount as registered cards; prompt for the commit message when push.py is run without one

Author: jamesbognar

juneau-rest/juneau-rest-server-views/src/main/resources/org/apache/juneau/views/juneau-regions.js

@@ -1722,22 +1722,20 @@
 	}
 
 	/**
-	 * Binds author-HTML slot ids to registered region populators and/or table widgets.
+	 * Binds author-HTML slot ids to registered region populators.
 	 *
-	 * HTML ids are places.  A string value is a registered populator name.  A `{ table: url | inlineEnvelope }`
-	 * value mounts a table widget into that empty slot.  The string `"juneau-table"` is not a populator and
-	 * throws.  Missing element ids, blank names, unregistered populators, and unrecognized value shapes fail
-	 * loud and enrol nothing on the page - they do not skip the bad entry and they do not fall through to
-	 * defaultPopulate.
+	 * HTML ids are places.  A value is a registered populator name; tables mount as `<@card type="datatables">`,
+	 * not through this call.  Missing element ids, blank names, unregistered populators, and unrecognized value
+	 * shapes fail loud and enrol nothing on the page - they do not skip the bad entry and they do not fall
+	 * through to defaultPopulate.
 	 *
 	 * Region enrolment is synchronous through initRegion (populate has already run before the returned
-	 * thenable is handed back).  Table entries are fetched/inited asynchronously.  The return is a thenable
-	 * that resolves to the region-handle array (map-key order among region entries).  A table fetch/handshake
-	 * failure paints a banner in that slot and does not unroll already-enrolled regions.
+	 * thenable is handed back).  The return is a thenable that resolves to the region-handle array (map-key
+	 * order).
 	 *
 	 * Bus targeting `{to: slotId}` uses the slot id (the map key), which is the region id after mount.
 	 *
-	 * @param {Object<string, string|{table: string|Object}>} hookup Map of element id → populator name or table binding.
+	 * @param {Object<string, string>} hookup Map of element id → populator name.
 	 * @returns {Promise<Array>} Thenable resolving to the region handles initRegion minted.
 	 */
 	function mount(hookup) { // NOSONAR javascript:S3776 -- encodes a views/widgets state machine; complexity is inherent
@@ -1757,12 +1755,6 @@
 				window.console.error(message);
 				throw new Error(message);
 			}
-			if (value === "juneau-table") {
-				const message = "JuneauViews.regions.mount: the string 'juneau-table' is not a populator; "
-					+ "use { table: url } (or an inline envelope) as the slot value.";
-				window.console.error(message);
-				throw new Error(message);
-			}
 			if (typeof value === "string") {
 				const name = value;
 				if (blank(name)) {
@@ -1779,73 +1771,19 @@
 				planned.push({ kind: "region", el: el, id: id, name: name });
 				continue;
 			}
-			if (value != null && typeof value === "object" && !Array.isArray(value) && Object.hasOwn(value, "table")) {
-				const table = value.table;
-				if (typeof table === "string") {
-					if (blank(table)) {
-						const message = "JuneauViews.regions.mount: slot '" + id + "' has a blank or missing table URL.";
-						window.console.error(message);
-						throw new Error(message);
-					}
-					planned.push({ kind: "table", el: el, id: id, table: table });
-					continue;
-				}
-				if (table != null && typeof table === "object" && !Array.isArray(table)) {
-					planned.push({ kind: "table", el: el, id: id, table: table });
-					continue;
-				}
-			}
 			const message = "JuneauViews.regions.mount: slot '" + id + "' has an unrecognized binding "
-				+ "(expected a populator name or { table: url | envelope }).";
+				+ "(expected a populator name).";
 			window.console.error(message);
 			throw new Error(message);
 		}
 		const handles = [];
-		const tableJobs = [];
-		for (const plannedItem of planned) {
-			const item = plannedItem;
-			if (item.kind === "region") {
-				item.el.setAttribute(REGION_ATTR, item.id);
-				item.el.setAttribute(REGION_POPULATE_ATTR, item.name);
-				const handle = initRegion(item.el);
-				if (handle) handles.push(handle);
-				continue;
-			}
-			tableJobs.push(mountTableSlot(item.el, item.table));
+		for (const item of planned) {
+			item.el.setAttribute(REGION_ATTR, item.id);
+			item.el.setAttribute(REGION_POPULATE_ATTR, item.name);
+			const handle = initRegion(item.el);
+			if (handle) handles.push(handle);
 		}
-		const done = tableJobs.length ? Promise.all(tableJobs) : Promise.resolve();
-		return done.then(function () { return handles; });
-	}
-
-	/**
-	 * Delegates table-slot construction to juneau-views.js.  Fetch/handshake failures are swallowed here so
-	 * Promise.all still resolves (the views helper paints the slot banner).  A missing helper is a banner +
-	 * console.error, not an unroll of already-enrolled regions.
-	 */
-	function mountTableSlot(slot, tableValue) {
-		const init = window.JuneauViews?.init;
-		if (!init || typeof init.mountTableSlot !== "function") {
-			const message = "JuneauViews.regions.mount: table slots require JuneauViews.init.mountTableSlot.";
-			window.console.error(message);
-			paintMountBanner(slot, message);
-			return Promise.resolve();
-		}
-		return Promise.resolve()
-			.then(function () { return init.mountTableSlot(slot, tableValue); })
-			.catch(function (err) {
-				const message = String(err?.message ? err.message : err);
-				window.console.error("JuneauViews.regions.mount: table slot failed: " + message);
-				paintMountBanner(slot, message);
-			});
-	}
-
-	function paintMountBanner(slot, message) {
-		if (!slot) return;
-		slot.textContent = "";
-		const p = window.document.createElement("p");
-		p.className = "juneau-view-error";
-		p.textContent = message;
-		slot.appendChild(p);
+		return Promise.resolve(handles);
 	}
 
 	// ==================================================================================================================

juneau-rest/juneau-rest-server-views/src/test/java/org/apache/juneau/rest/server/views/Regions_Mount_Test.java

@@ -51,8 +51,8 @@ private static void assertAllTrue(Map<?,?> r, String... keys) {
 		assertFalse(body.contains("NS.pages.mount"), "mount must not publish under NS.pages");
 		assertTrue(body.contains("no populator is registered under the name"), body);
 		assertTrue(body.contains("no element with id"), body);
-		assertTrue(body.contains("the string 'juneau-table' is not a populator"), body);
-		assertTrue(body.contains("{ table: url }"), body);
+		assertFalse(body.contains("is not a populator"), "the juneau-table guard is retired");
+		assertFalse(body.contains("{ table: url"), "the table hookup form is retired");
 	}
 
 	@Test void a02_sourceShape_mountDoesNotFallThroughToDefaultPopulate() throws Exception {
@@ -105,9 +105,9 @@ private static void assertAllTrue(Map<?,?> r, String... keys) {
 		assertAllTrue(r, "t6_pageNavNotExported", "t6_authorAriaPreserved", "t6_noSelectedClass", "t6_noPillClass");
 	}
 
-	@Test void b07_juneauTableStringThrowsNewMessageAndEnrolsNothing() {
+	@Test void b07_retiredTableFormAndJuneauTableStringAreRejectedAndEnrolNothing() {
 		var r = report();
-		assertAllTrue(r, "t7_threw", "t7_pointsAtTableUrl", "t7_notUnregisteredName", "t7_consoleError",
+		assertAllTrue(r, "t7_tableFormRejectedAsUnrecognized", "t7_juneauTableStringRejectedAsUnknownPopulator",
 			"t7_notStamped", "t7_defaultDidNotRun");
 	}
 }

juneau-rest/juneau-rest-server-views/src/test/java/org/apache/juneau/rest/server/views/ViewsJs_SlotMount_Test.java

@@ -110,17 +110,6 @@ private static String viewsJs() throws IOException {
 		assertAllTrue(r, "t5_urlUsed", "t5_tableFromUrl");
 	}
 
-	@Test void b06_blankTableUrlThrowsWithoutFetch() {
-		var r = report();
-		assertAllTrue(r, "t6_blankThrew", "t6_blankNamesUrl", "t6_blankNoFetch", "t6_blankLogged",
-			"t6_blankNotStamped", "t7_wsThrew", "t7_wsNoFetch");
-	}
-
-	@Test void b07_missingIdOrBadShapeEnrolsNothing() {
-		var r = report();
-		assertAllTrue(r, "t8_missingIdThrew", "t8_probesNotStamped", "t9_badShapeThrew", "t9_probesNotStamped");
-	}
-
 	@Test void b08_csrfCopiedFromAncestorNotFromSsc() {
 		var r = report();
 		assertAllTrue(r, "t10_csrfCopied", "t10_csrfHeaderCopied", "t11_noJuneauToken",

juneau-rest/juneau-rest-server-views/src/test/js/detail-region-params.cjs

@@ -61,7 +61,7 @@ function envelope(NS, region) {
 async function build(region) {
 	const ctx = H.load(rendersJsPath, viewsJsPath, regionsJsPath);
 	const host = slot(ctx.env, 'runs-slot');
-	await Promise.resolve(ctx.R.mount({ 'runs-slot': { table: envelope(ctx.NS, region) } }));
+	await Promise.resolve(ctx.NS.init.mountTableSlot(host, envelope(ctx.NS, region)));
 	const tpl = host.querySelector('template[data-juneau-row-detail]');
 	const content = tpl && tpl.content ? tpl.content : null;
 	ctx.region = content ? content.querySelector('[data-juneau-region="' + region.id + '"]') : null;

juneau-rest/juneau-rest-server-views/src/test/js/regions-mount.cjs

@@ -227,25 +227,31 @@ function slot(env, id) {
 	}
 
 	// =================================================================================================================
-	// String "juneau-table" throws a NEW message pointing at { table: url }; enrols nothing.
+	// The retired { table: ... } hookup form is an unrecognized binding, and "juneau-table" is just an unknown
+	// populator name; neither enrols anything.
 	// =================================================================================================================
 	{
 		const { env, R, rec } = H.load(rendersJsPath, viewsJsPath, regionsJsPath);
 		let defaultRan = false;
 		R.builtins.default = function () { defaultRan = true; };
 		const incidents = slot(env, 'incidents');
-		let threw = false;
-		let message = '';
+		let tableMessage = '';
+		try {
+			R.mount({ incidents: { table: '/x' } });
+		} catch (error) {
+			tableMessage = String(error?.message ? error.message : error);
+		}
+		out.t7_tableFormRejectedAsUnrecognized = tableMessage.indexOf('has an unrecognized binding') >= 0
+			&& rec.errorsMatching('unrecognized binding').length >= 1;
+		let stringMessage = '';
 		try {
 			R.mount({ incidents: 'juneau-table' });
 		} catch (error) {
-			threw = true;
-			message = String(error?.message ? error.message : error);
+			stringMessage = String(error?.message ? error.message : error);
 		}
-		out.t7_threw = threw;
-		out.t7_pointsAtTableUrl = message.indexOf('{ table: url }') >= 0;
-		out.t7_notUnregisteredName = message.indexOf('no populator is registered under the name') < 0;
-		out.t7_consoleError = rec.errorsMatching('juneau-table').length >= 1;
+		out.t7_juneauTableStringRejectedAsUnknownPopulator
+			= stringMessage.indexOf("no populator is registered under the name 'juneau-table'") >= 0
+			&& rec.errorsMatching('juneau-table').length >= 1;
 		out.t7_notStamped = incidents.dataset.juneauRegion == null;
 		out.t7_defaultDidNotRun = defaultRan === false;
 	}

juneau-rest/juneau-rest-server-views/src/test/js/slot-detail-chevron-browser.cjs

@@ -25,7 +25,7 @@
  *
  * Chromium is the subject: buildDetailTemplate must paint into tpl.content (the fragment expandDetailRow clones).
  * template.appendChild leaves that fragment empty in Chromium, which expands to a ~26px blank gap.  The fixture
- * is a ViewSlot envelope mounted through JuneauViews.regions.mount({ table }), so the template under test is the
+ * is a ViewSlot envelope mounted through JuneauViews.init.mountTableSlot, so the template under test is the
  * production slot path.  No jQuery/DataTables is provisioned for this profile: after mount, the prober synthesizes
  * one body row with the production chevron markup and a DataTables child-row stand-in, matching TableClipFree.
  * Prints ONE JSON object to stdout; every assertion is in Java.
@@ -58,7 +58,7 @@ const PROBE = async function () {
 	// The canary's RegionDef.populate("p") is a named populator; register a stub so chevron expand
 	// does not console.error "no populator is registered under the name 'p'" into jsFailures.
 	R.register('p', function () { /* stub: region-only DETAIL_SLOT chrome is what this canary asserts */ });
-	await Promise.resolve(R.mount({ gacks: { table: envelope } }));
+	await Promise.resolve(NS.init.mountTableSlot(slot, envelope));
 
 	const tpl = slot.querySelector('template[data-juneau-row-detail]');
 	const dest = tpl?.content ? tpl.content : null;