@yuneta/gobj-ui 7.9.0 → 7.9.2

package/dist/gobj-ui.cjs.js

@@ -15703,8 +15703,7 @@ function ac_mt_command_answer$2(gobj, event, kw, src) {
 			if (result >= 0) {
 				let gobj_topic_form = (0, _yuneta_gobj_js.gobj_find_child)(gobj, { __gobj_name__: `${(0, _yuneta_gobj_js.gobj_name)(gobj)}?${topic_name}` });
 				let answer = nodes_answer(data);
-				let md = (0, _yuneta_gobj_js.kw_get_dict)(gobj, kw_command, "__md_command__", {}, 0);
-				let req_id = (0, _yuneta_gobj_js.kw_get_str)(gobj, md, "req_id", "", 0);
+				let req_id = (0, _yuneta_gobj_js.kw_get_str)(gobj, kw_command, "req_id", "", 0);
 				if (req_id) (0, _yuneta_gobj_js.gobj_send_event)(gobj_topic_form, "EV_PAGE_LOADED", {
 					req_id,
 					rows: answer.rows,
@@ -16448,6 +16447,7 @@ var attrs_table$5 = [
 var PRIVATE_DATA$5 = {
 	_pending_pages: null,
 	_page_seq: 0,
+	_page_total: null,
 	$container: null,
 	treedb_name: "",
 	topic_name: "",
@@ -17216,11 +17216,19 @@ function create_tabulator(gobj) {
 		} catch (e) {
 			n = 0;
 		}
-		$rc.textContent = `${n} ${(0, i18next.t)("rows")}`;
+		let paged = (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "with_remote_paging");
+		let total = gobj.priv._page_total;
+		if (paged && typeof total === "number" && total > n) $rc.textContent = `${n} / ${total} ${(0, i18next.t)("rows")}`;
+		else $rc.textContent = `${n} ${(0, i18next.t)("rows")}`;
 		let single_page = true;
 		try {
-			let size = tabulator.getPageSize();
-			single_page = !size || n <= size;
+			if (paged) {
+				let max = tabulator.getPageMax();
+				single_page = max === false || max <= 1;
+			} else {
+				let size = tabulator.getPageSize();
+				single_page = !size || n <= size;
+			}
 		} catch (e) {
 			single_page = true;
 		}
@@ -18461,6 +18469,7 @@ function ac_repull_page(gobj, event, kw, src) {
 *  The host answered a page.
 ************************************************************/
 function ac_page_loaded(gobj, event, kw, src) {
+	if (typeof kw.total === "number") gobj.priv._page_total = kw.total;
 	settle_page(gobj, kw.req_id, {
 		data: (0, _yuneta_gobj_js.is_array)(kw.rows) ? kw.rows : [],
 		last_page: kw.pages || 1,

package/dist/gobj-ui.es.js

@@ -15698,8 +15698,7 @@ function ac_mt_command_answer$2(gobj, event, kw, src) {
 			if (result >= 0) {
 				let gobj_topic_form = gobj_find_child(gobj, { __gobj_name__: `${gobj_name(gobj)}?${topic_name}` });
 				let answer = nodes_answer(data);
-				let md = kw_get_dict(gobj, kw_command, "__md_command__", {}, 0);
-				let req_id = kw_get_str(gobj, md, "req_id", "", 0);
+				let req_id = kw_get_str(gobj, kw_command, "req_id", "", 0);
 				if (req_id) gobj_send_event(gobj_topic_form, "EV_PAGE_LOADED", {
 					req_id,
 					rows: answer.rows,
@@ -16443,6 +16442,7 @@ var attrs_table$5 = [
 var PRIVATE_DATA$5 = {
 	_pending_pages: null,
 	_page_seq: 0,
+	_page_total: null,
 	$container: null,
 	treedb_name: "",
 	topic_name: "",
@@ -17211,11 +17211,19 @@ function create_tabulator(gobj) {
 		} catch (e) {
 			n = 0;
 		}
-		$rc.textContent = `${n} ${t("rows")}`;
+		let paged = gobj_read_bool_attr(gobj, "with_remote_paging");
+		let total = gobj.priv._page_total;
+		if (paged && typeof total === "number" && total > n) $rc.textContent = `${n} / ${total} ${t("rows")}`;
+		else $rc.textContent = `${n} ${t("rows")}`;
 		let single_page = true;
 		try {
-			let size = tabulator.getPageSize();
-			single_page = !size || n <= size;
+			if (paged) {
+				let max = tabulator.getPageMax();
+				single_page = max === false || max <= 1;
+			} else {
+				let size = tabulator.getPageSize();
+				single_page = !size || n <= size;
+			}
 		} catch (e) {
 			single_page = true;
 		}
@@ -18456,6 +18464,7 @@ function ac_repull_page(gobj, event, kw, src) {
 *  The host answered a page.
 ************************************************************/
 function ac_page_loaded(gobj, event, kw, src) {
+	if (typeof kw.total === "number") gobj.priv._page_total = kw.total;
 	settle_page(gobj, kw.req_id, {
 		data: is_array(kw.rows) ? kw.rows : [],
 		last_page: kw.pages || 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.9.0",
+  "version": "7.9.2",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_yui_treedb_topic_with_form.js

@@ -151,6 +151,7 @@ SDATA_END()
 let PRIVATE_DATA = {
     _pending_pages:     null,       // req_id -> {resolve, reject, timer}
     _page_seq:          0,          // correlation id of a page request
+    _page_total:        null,       // rows the topic HAS, from the last page answer
     $container:         null,
     treedb_name:        "",
     topic_name:         "",
@@ -1203,15 +1204,33 @@ function create_tabulator(gobj)
                 n = 0;
             }
         }
-        $rc.textContent = `${n} ${t("rows")}`;
+        /*  Remote paging: `n` is the PAGE, so saying "50 rows" of a topic
+         *  with 114 would be a lie by omission. Say both. */
+        let paged = gobj_read_bool_attr(gobj, "with_remote_paging");
+        let total = gobj.priv._page_total;
+        if(paged && typeof total === "number" && total > n) {
+            $rc.textContent = `${n} / ${total} ${t("rows")}`;
+        } else {
+            $rc.textContent = `${n} ${t("rows")}`;
+        }
 
-        /*  Derived from the count and the page size rather than read from
-         *  getPageMax(), which is stale in the filter path for the same
-         *  reason. getPageSize() throws with pagination off -> one page. */
         let single_page = true;
         try {
-            let size = tabulator.getPageSize();
-            single_page = !size || n <= size;
+            if(paged) {
+                /*  Tabulator knows the last page from the answer's
+                 *  `last_page`, and that is the only thing that says whether
+                 *  there is more. Deriving it from the row count instead —
+                 *  which is what the local path does — hid the paginator on
+                 *  every FULL page: 50 rows of a 50-row page reads as "it all
+                 *  fits" and it does not.  */
+                let max = tabulator.getPageMax();
+                single_page = (max === false) || max <= 1;
+            } else {
+                /*  Derived from the count and the page size rather than read
+                 *  from getPageMax(), which is stale in the filter path. */
+                let size = tabulator.getPageSize();
+                single_page = !size || n <= size;
+            }
         } catch(e) {
             single_page = true;
         }
@@ -3089,6 +3108,9 @@ function ac_repull_page(gobj, event, kw, src)
  ************************************************************/
 function ac_page_loaded(gobj, event, kw, src)
 {
+    if(typeof kw.total === "number") {
+        gobj.priv._page_total = kw.total;
+    }
     settle_page(gobj, kw.req_id, {
         data:      is_array(kw.rows)? kw.rows : [],
         last_page: kw.pages || 1,

package/src/c_yui_treedb_topics.js

@@ -1803,12 +1803,14 @@ function ac_mt_command_answer(gobj, event, kw, src)
                  *  backend that cannot page: the whole list arrives as one
                  *  page, which is the truth. */
                 let answer = nodes_answer(data);
-                /*  The correlation id travels in `__md_command__` of the kw
-                 *  that was SENT — the same place `topic_name` rides — so it
-                 *  is read back from the command stack and never sent to the
-                 *  backend as a parameter it does not know. */
-                let md = kw_get_dict(gobj, kw_command, "__md_command__", {}, 0);
-                let req_id = kw_get_str(gobj, md, "req_id", "", 0);
+                /*  The correlation id rides in `__md_command__`, which is the
+                 *  same place `topic_name` rides — and `kw_command` IS that
+                 *  object: C_IEVENT_CLI EXTRACTS `__md_command__` from the kw
+                 *  and pushes it as the command stack's `kw`. So it is read
+                 *  flat, one level up from where the sent kw put it, and it
+                 *  never travels to the backend as a parameter it does not
+                 *  know. */
+                let req_id = kw_get_str(gobj, kw_command, "req_id", "", 0);
                 if(req_id) {
                     gobj_send_event(
                         gobj_topic_form,