@genesislcap/grid-pro 14.464.0 → 14.464.1-alpha-76f77f9.0

package/dist/dts/datasource/server-side.resource-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-side.resource-base.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-side.resource-base.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-base.ts"],"names":[],"mappings":"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"}

package/dist/dts/datasource/server-side.resource-dataserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-side.resource-dataserver.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-dataserver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EAGxB,gBAAgB,EAChB,kBAAkB,EAGnB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAEvE;;;GAGG;AACH,qBAAa,8BACX,SAAQ,wBACR,YAAW,qBAAqB;IAEhC,gBAAgB,EAAE,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAC7D,4BAA4B,EAAE,kBAAkB,CAAC;IACjD,0BAA0B,EAAE,CAC1B,cAAc,CAAC,EAAE,GAAG,KACjB,OAAO,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,CAAC;gBAE7C,OAAO,EAAE,2BAA2B;IAK1C,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D,OAAO,CAAC,MAAM,EAAE,wBAAwB;IAqE9C,OAAO,CAAC,mBAAmB;IAgD3B;;;OAGG;cACa,YAAY,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvE,OAAO;IAOb,OAAO,CAAC,uBAAuB;CAYhC"}
+{"version":3,"file":"server-side.resource-dataserver.d.ts","sourceRoot":"","sources":["../../../src/datasource/server-side.resource-dataserver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EAGxB,gBAAgB,EAChB,kBAAkB,EAGnB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAEvE;;;GAGG;AACH,qBAAa,8BACX,SAAQ,wBACR,YAAW,qBAAqB;IAEhC,gBAAgB,EAAE,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAC7D,4BAA4B,EAAE,kBAAkB,CAAC;IACjD,0BAA0B,EAAE,CAC1B,cAAc,CAAC,EAAE,GAAG,KACjB,OAAO,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC,CAAC;gBAE7C,OAAO,EAAE,2BAA2B;IAK1C,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3D,OAAO,CAAC,MAAM,EAAE,wBAAwB;IA+E9C,OAAO,CAAC,mBAAmB;IAuD3B;;;OAGG;cACa,YAAY,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDvE,OAAO;IAOb,OAAO,CAAC,uBAAuB;CAYhC"}

package/dist/dts/react.d.ts

@@ -133,6 +133,15 @@ export declare const StringEditor: React.ForwardRefExoticComponent<
 >;
 export type StringEditorRef = StringEditorWC;
 
+export declare const GridProColumn: React.ForwardRefExoticComponent<
+  React.PropsWithChildren<
+    Omit<PublicOf<GridProColumnWC>, 'children' | 'style'> &
+    HTMLWCProps & {
+    }
+  > & React.RefAttributes<GridProColumnWC>
+>;
+export type GridProColumnRef = GridProColumnWC;
+
 export declare const ActionRenderer: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
     Omit<PublicOf<ActionRendererWC>, 'children' | 'style'> &
@@ -205,15 +214,6 @@ export declare const AgTextRenderer: React.ForwardRefExoticComponent<
 >;
 export type AgTextRendererRef = AgTextRendererWC;
 
-export declare const GridProColumn: React.ForwardRefExoticComponent<
-  React.PropsWithChildren<
-    Omit<PublicOf<GridProColumnWC>, 'children' | 'style'> &
-    HTMLWCProps & {
-    }
-  > & React.RefAttributes<GridProColumnWC>
->;
-export type GridProColumnRef = GridProColumnWC;
-
 export declare const GridProClientSideDatasource: React.ForwardRefExoticComponent<
   React.PropsWithChildren<
     Omit<PublicOf<GridProClientSideDatasourceWC>, 'children' | 'style'> &

package/dist/esm/datasource/server-side.resource-base.js

@@ -331,7 +331,8 @@ export class BaseServerSideDatasource {
         if (this.pagination) {
             rowCount = !criteriaMatch ? Math.min(this.serverRowsCount, this.maxView) : undefined;
             if (criteriaMatch) {
-                rowCount = defaultCount;
+                const loadedCount = this.rowData.size;
+                rowCount = loadedCount > 0 ? Math.min(loadedCount, this.maxView) : defaultCount;
             }
             return rowCount;
         }
@@ -352,6 +353,11 @@ export class BaseServerSideDatasource {
     }
     /** Completes an SSRM request with zero rows and invokes `onNoDataAvailableFunc` on the first block only. @internal */
     completeEmptyResult(params) {
+        var _a, _b;
+        if ((_b = (_a = this.lastSuccessRowData) === null || _a === void 0 ? void 0 : _a.rowData) === null || _b === void 0 ? void 0 : _b.length) {
+            params.success(this.lastSuccessRowData);
+            return;
+        }
         this.rowData = new Map();
         const successRowData = { rowData: [], rowCount: 0 };
         params.success(successRowData);

package/dist/esm/datasource/server-side.resource-dataserver.js

@@ -20,38 +20,52 @@ export class DataserverServerSideDatasource extends BaseServerSideDatasource {
             var _a;
             (_a = this.dataserverStreamSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
             this.dataserverStreamSubscription = undefined;
+            this.dataserverStream = undefined;
             yield _super.refreshDatasource.call(this, params);
         });
     }
     getRows(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             // Use separated filtering and sorting setup
             yield this.setupFiltering(params);
             yield this.setupSorting(params);
             if (this.pagination && !this.isNewPageSize && this.currentSequenceId > 0) {
-                params.success(this.lastSuccessRowData);
-                return;
+                const requestFilter = JSON.stringify((_a = params.request.filterModel) !== null && _a !== void 0 ? _a : {});
+                const currentFilter = JSON.stringify((_b = this.currentFilterModel) !== null && _b !== void 0 ? _b : {});
+                if (requestFilter === currentFilter && this.lastSuccessRowData) {
+                    params.success(this.lastSuccessRowData);
+                    return;
+                }
             }
             if (!this.dataserverStream) {
                 this.dataserverStream = yield this.createDataserverStreamFunc(this.resourceParams);
             }
             if (this.currentSequenceId >= 1 &&
-                (this.moreRows ||
-                    params.request.startRow >= Number(this.maxRows) ||
-                    params.request.startRow === 0)) {
+                (this.moreRows || params.request.startRow >= Number(this.maxRows))) {
                 if (this.pagination) {
-                    this.resourceParams.VIEW_NUMBER = this.getPageNumber(params.request.startRow, this.maxRows, this.maxView, this.zeroBasedViewNumber);
-                    // if (this.resourceParams.VIEW_NUMBER === 1) {
-                    //   await this.refreshDatasource(params);
-                    //   return;
-                    // }
+                    const startRow = Number.isFinite(Number(params.request.startRow))
+                        ? Number(params.request.startRow)
+                        : 0;
+                    this.resourceParams.VIEW_NUMBER = this.getPageNumber(startRow, this.maxRows, this.maxView, this.zeroBasedViewNumber);
+                }
+                const viewNumber = this.pagination
+                    ? this.resourceParams.VIEW_NUMBER
+                    : Number.isFinite(Number(this.resourceParams.VIEW_NUMBER))
+                        ? Number(this.resourceParams.VIEW_NUMBER)
+                        : 0;
+                if (Number.isFinite(viewNumber)) {
+                    this.connect.getMoreRows(this.sourceRef, viewNumber);
                 }
-                this.connect.getMoreRows(this.sourceRef, this.resourceParams.VIEW_NUMBER);
             }
             let applyResult = true;
             this.dataserverStreamSubscription = this.dataserverStream.subscribe((dataserverResult) => {
-                if (applyResult) {
+                var _a;
+                const incomingRowCount = (_a = dataserverResult === null || dataserverResult === void 0 ? void 0 : dataserverResult.ROW) === null || _a === void 0 ? void 0 : _a.length;
+                const shouldApply = applyResult || (incomingRowCount > 0 && this.rowData.size === 0);
+                if (shouldApply) {
                     DOM.queueUpdate(() => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
                         // TODO: this is a bit of hack, due GSF not returning a different ROWS_COUNT when there is a CRITERIA_MATCH
                         if (this.resourceParams.CRITERIA_MATCH && this.pagination) {
                             const updatedInfo = yield this.connect.snapshot(this.resourceName, {
@@ -66,7 +80,7 @@ export class DataserverServerSideDatasource extends BaseServerSideDatasource {
                             }
                             else {
                                 this.serverRowsCount = this.resourceParams.CRITERIA_MATCH
-                                    ? updatedInfo.ROW.length
+                                    ? ((_b = (_a = updatedInfo.ROW) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : updatedInfo.ROWS_COUNT)
                                     : updatedInfo.ROWS_COUNT;
                             }
                         }
@@ -98,6 +112,9 @@ export class DataserverServerSideDatasource extends BaseServerSideDatasource {
             this.handleCurrentStreamLoad(nextMessage);
         }
         else {
+            if (this.currentSequenceId >= 1 && this.rowData.size > 0) {
+                return;
+            }
             this.completeEmptyResult(params);
             return;
         }
@@ -107,6 +124,10 @@ export class DataserverServerSideDatasource extends BaseServerSideDatasource {
             if (this.serverRowsCount === 0) {
                 this.serverRowsCount = (_a = result.ROWS_COUNT) !== null && _a !== void 0 ? _a : this.rowData.size;
             }
+            if (this.getResourceParam('CRITERIA_MATCH') && result.ROW) {
+                this.serverRowsCount = result.ROW.length;
+                this.clientRowsCount = result.ROW.length;
+            }
         }
         const successRowData = {
             rowData: Array.from(this.rowData.values()),

package/dist/react.cjs

@@ -121,6 +121,11 @@ const StringEditor = React.forwardRef(function StringEditor(props, ref) {
   return React.createElement(customElements.getName(StringEditorWC) ?? '%%prefix%%-string-editor', { ...rest, ref }, children);
 });
 
+const GridProColumn = React.forwardRef(function GridProColumn(props, ref) {
+  const { children, ...rest } = props;
+  return React.createElement(customElements.getName(GridProColumnWC) ?? 'grid-pro-column', { ...rest, ref }, children);
+});
+
 const ActionRenderer = React.forwardRef(function ActionRenderer(props, ref) {
   const { children, ...rest } = props;
   return React.createElement(customElements.getName(ActionRendererWC) ?? '%%prefix%%-grid-pro-action-renderer', { ...rest, ref }, children);
@@ -161,11 +166,6 @@ const AgTextRenderer = React.forwardRef(function AgTextRenderer(props, ref) {
   return React.createElement(customElements.getName(AgTextRendererWC) ?? '%%prefix%%-grid-text-renderer', { ...rest, ref }, children);
 });
 
-const GridProColumn = React.forwardRef(function GridProColumn(props, ref) {
-  const { children, ...rest } = props;
-  return React.createElement(customElements.getName(GridProColumnWC) ?? 'grid-pro-column', { ...rest, ref }, children);
-});
-
 const GridProClientSideDatasource = React.forwardRef(function GridProClientSideDatasource(props, ref) {
   const { onBaseDatasourceError, onDatasourceError, onBaseDatasourceConnected, onDatasourceLoadingFinished, onDatasourceNoDataAvailable, onDatasourceDataChanged, onDatasourceInitialize, onDatasourceDestroy, onDatasourceDataCleared, onDatasourceSchemaUpdated, onDatasourceFiltersRestored, onDatasourceDataLoaded, onDatasourceLoadingStarted, onDatasourceMoreDataAvailable, onDatasourceReady, onDatasourceInit, onMoreRowsChanged, onDatasourceSizeChanged, children, ...rest } = props;
   const _innerRef = React.useRef(null);
@@ -491,6 +491,7 @@ module.exports = {
   NumberEditor,
   SelectEditor,
   StringEditor,
+  GridProColumn,
   ActionRenderer,
   ActionsMenuRenderer,
   BooleanRenderer,
@@ -499,7 +500,6 @@ module.exports = {
   StatusPillRenderer,
   AgTextFieldRenderer,
   AgTextRenderer,
-  GridProColumn,
   GridProClientSideDatasource,
   GridProServerSideDatasource,
   GridProGenesisDatasource,

package/dist/react.mjs

@@ -119,6 +119,11 @@ export const StringEditor = React.forwardRef(function StringEditor(props, ref) {
   return React.createElement(customElements.getName(StringEditorWC) ?? '%%prefix%%-string-editor', { ...rest, ref }, children);
 });
 
+export const GridProColumn = React.forwardRef(function GridProColumn(props, ref) {
+  const { children, ...rest } = props;
+  return React.createElement(customElements.getName(GridProColumnWC) ?? 'grid-pro-column', { ...rest, ref }, children);
+});
+
 export const ActionRenderer = React.forwardRef(function ActionRenderer(props, ref) {
   const { children, ...rest } = props;
   return React.createElement(customElements.getName(ActionRendererWC) ?? '%%prefix%%-grid-pro-action-renderer', { ...rest, ref }, children);
@@ -159,11 +164,6 @@ export const AgTextRenderer = React.forwardRef(function AgTextRenderer(props, re
   return React.createElement(customElements.getName(AgTextRendererWC) ?? '%%prefix%%-grid-text-renderer', { ...rest, ref }, children);
 });
 
-export const GridProColumn = React.forwardRef(function GridProColumn(props, ref) {
-  const { children, ...rest } = props;
-  return React.createElement(customElements.getName(GridProColumnWC) ?? 'grid-pro-column', { ...rest, ref }, children);
-});
-
 export const GridProClientSideDatasource = React.forwardRef(function GridProClientSideDatasource(props, ref) {
   const { onBaseDatasourceError, onDatasourceError, onBaseDatasourceConnected, onDatasourceLoadingFinished, onDatasourceNoDataAvailable, onDatasourceDataChanged, onDatasourceInitialize, onDatasourceDestroy, onDatasourceDataCleared, onDatasourceSchemaUpdated, onDatasourceFiltersRestored, onDatasourceDataLoaded, onDatasourceLoadingStarted, onDatasourceMoreDataAvailable, onDatasourceReady, onDatasourceInit, onMoreRowsChanged, onDatasourceSizeChanged, children, ...rest } = props;
   const _innerRef = React.useRef(null);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/grid-pro",
   "description": "Genesis Foundation AG Grid",
-  "version": "14.464.0",
+  "version": "14.464.1-alpha-76f77f9.0",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -40,20 +40,20 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.464.0",
-    "@genesislcap/genx": "14.464.0",
-    "@genesislcap/rollup-builder": "14.464.0",
-    "@genesislcap/ts-builder": "14.464.0",
-    "@genesislcap/uvu-playwright-builder": "14.464.0",
-    "@genesislcap/vite-builder": "14.464.0",
-    "@genesislcap/webpack-builder": "14.464.0"
+    "@genesislcap/foundation-testing": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/genx": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/rollup-builder": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/ts-builder": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/uvu-playwright-builder": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/vite-builder": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/webpack-builder": "14.464.1-alpha-76f77f9.0"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.464.0",
-    "@genesislcap/foundation-criteria": "14.464.0",
-    "@genesislcap/foundation-logger": "14.464.0",
-    "@genesislcap/foundation-ui": "14.464.0",
-    "@genesislcap/foundation-utils": "14.464.0",
+    "@genesislcap/foundation-comms": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/foundation-criteria": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/foundation-logger": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/foundation-ui": "14.464.1-alpha-76f77f9.0",
+    "@genesislcap/foundation-utils": "14.464.1-alpha-76f77f9.0",
     "@microsoft/fast-colors": "5.3.1",
     "@microsoft/fast-components": "2.30.6",
     "@microsoft/fast-element": "1.14.0",
@@ -91,5 +91,5 @@
       "require": "./dist/react.cjs"
     }
   },
-  "gitHead": "48f6879adc2477efcd9f984712bcc26a1e8e0544"
+  "gitHead": "0066ad53195dc2487061afb3f7c59480454f3efa"
 }