@genesislcap/grid-pro 14.40.1 → 14.41.1

package/dist/custom-elements.json

@@ -3241,11 +3241,7 @@
             },
             {
               "kind": "field",
-              "name": "rowId",
-              "type": {
-                "text": "string"
-              },
-              "default": "'ROW_REF'"
+              "name": "rowId"
             },
             {
               "kind": "field",
@@ -3279,6 +3275,15 @@
               },
               "privacy": "private"
             },
+            {
+              "kind": "field",
+              "name": "isRequestServer",
+              "type": {
+                "text": "boolean"
+              },
+              "privacy": "private",
+              "default": "false"
+            },
             {
               "kind": "field",
               "name": "requiresFullRowDataAndColDefs",
@@ -3358,6 +3363,15 @@
               "privacy": "private",
               "readonly": true
             },
+            {
+              "kind": "field",
+              "name": "rowIdByResourceType",
+              "type": {
+                "text": "string"
+              },
+              "privacy": "private",
+              "readonly": true
+            },
             {
               "kind": "method",
               "name": "init",
@@ -3639,10 +3653,6 @@
             },
             {
               "name": "row-id",
-              "type": {
-                "text": "string"
-              },
-              "default": "'ROW_REF'",
               "fieldName": "rowId"
             },
             {

package/dist/dts/grid-pro-genesis-datasource/grid-pro-genesis-datasource.d.ts

@@ -342,11 +342,12 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     resourceName: string;
     resourceNameChanged(oldValue: string, newValue: string): void;
     reverse: boolean;
-    rowId: string;
+    rowId: any;
     restartOnReconnection: boolean;
     private dataSub;
     private updateSub;
     private connectionSub;
+    private isRequestServer;
     private requiresFullRowDataAndColDefs;
     private dataSubWasLoggedOff;
     private rows;
@@ -358,12 +359,13 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     disconnectedCallback(): void;
     deepClone(): Node;
     private get agGrid();
+    private get rowIdByResourceType();
     /**
      * Initializes the datasource.
      * @public
      * @remarks This method is called automatically when the element is connected to the DOM.
      */
-    init(): void;
+    init(): Promise<void>;
     /**
      * Deinitialises the datasource, resetting it to its initial state.
      * @public

package/dist/dts/grid-pro-genesis-datasource/grid-pro-genesis-datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-pro-genesis-datasource.d.ts","sourceRoot":"","sources":["../../../src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,WAAW,EAAsB,MAAM,yBAAyB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,UAAU,EAWX,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiB/D;;;;GAIG;AACH,qBAGa,wBAAyB,SAAQ,6BAAiC;IACpE,OAAO,EAAG,OAAO,CAAC;IACf,UAAU,EAAG,UAAU,CAAC;IAExB,mBAAmB,EAAE,WAAW,CAAC;IACvC,QAAQ,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAalD,MAAM,EAAE,MAAM,CAAC;IACgC,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAmC;IAClD,OAAO,EAAE,MAAM,CAAoC;IAC/B,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACa,YAAY,EAAE,MAAM,CAAC;IAC3D,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAK3B,OAAO,UAAS;IACZ,KAAK,SAAa;IACgB,qBAAqB,UAAS;IAE/F,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,6BAA6B,CAAQ;IAC7C,OAAO,CAAC,mBAAmB,CAAS;IAEpC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,aAAa,CAAqB;IAE1C,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,MAAM,CAAwE;IAEtF,iBAAiB;IAuBjB,oBAAoB;IASX,SAAS,IAAI,IAAI;IAO1B,OAAO,KAAK,MAAM,GAEjB;IAID;;;;OAIG;IACH,IAAI;IAkCJ;;;OAGG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IA4BL;;;OAGG;IACH,OAAO;IAKP;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;YAUP,gBAAgB;IAiD9B,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAmC9B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,eAAe;IA0CvB,OAAO,CAAC,aAAa;IAMd,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C,YAAY,CAAC,SAAS,EAAE,MAAM;CAItC"}
+{"version":3,"file":"grid-pro-genesis-datasource.d.ts","sourceRoot":"","sources":["../../../src/grid-pro-genesis-datasource/grid-pro-genesis-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,WAAW,EAAsB,MAAM,yBAAyB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,UAAU,EAYX,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiB/D;;;;GAIG;AACH,qBAGa,wBAAyB,SAAQ,6BAAiC;IACpE,OAAO,EAAG,OAAO,CAAC;IACf,UAAU,EAAG,UAAU,CAAC;IAExB,mBAAmB,EAAE,WAAW,CAAC;IACvC,QAAQ,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAalD,MAAM,EAAE,MAAM,CAAC;IACgC,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAmC;IAClD,OAAO,EAAE,MAAM,CAAoC;IAC/B,UAAU,UAAS;IACvC,OAAO,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACa,YAAY,EAAE,MAAM,CAAC;IAC3D,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAK3B,OAAO,UAAS;IACZ,KAAK,MAAC;IAC4B,qBAAqB,UAAS;IAE/F,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,6BAA6B,CAAQ;IAC7C,OAAO,CAAC,mBAAmB,CAAS;IAEpC,OAAO,CAAC,IAAI,CAA+B;IAC3C,OAAO,CAAC,aAAa,CAAqB;IAE1C,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,MAAM,CAAwE;IAEtF,iBAAiB;IAuBjB,oBAAoB;IASX,SAAS,IAAI,IAAI;IAO1B,OAAO,KAAK,MAAM,GAEjB;IAGD,OAAO,KAAK,mBAAmB,GAI9B;IAED;;;;OAIG;IACG,IAAI;IA0CV;;;OAGG;IACH,MAAM;IAIN;;;;OAIG;IACH,KAAK;IA6BL;;;OAGG;IACH,OAAO;IAKP;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;YAUP,gBAAgB;IAiD9B,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;IA0C9B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,eAAe;IA0CvB,OAAO,CAAC,aAAa;IAMd,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAK9C,YAAY,CAAC,SAAS,EAAE,MAAM;CAItC"}

package/dist/esm/grid-pro-genesis-datasource/grid-pro-genesis-datasource.js

@@ -1,5 +1,5 @@
 import { __awaiter, __decorate } from "tslib";
-import { Connect, dataServerResultFilter, Datasource, DatasourceDefaults, FieldTypeEnum, MessageType, normaliseCriteria, } from '@genesislcap/foundation-comms';
+import { Connect, dataServerResultFilter, Datasource, DatasourceDefaults, FieldTypeEnum, MessageType, normaliseCriteria, ResourceType, } from '@genesislcap/foundation-comms';
 import { LifecycleMixin } from '@genesislcap/foundation-utils';
 import { attr, customElement, DOM, observable } from '@microsoft/fast-element';
 import { FoundationElement } from '@microsoft/fast-foundation';
@@ -24,8 +24,8 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         this.maxView = DatasourceDefaults.MAX_VIEW_1000;
         this.movingView = false;
         this.reverse = false;
-        this.rowId = 'ROW_REF';
         this.restartOnReconnection = false;
+        this.isRequestServer = false;
         this.requiresFullRowDataAndColDefs = true;
         this.dataSubWasLoggedOff = false;
         this.rows = new Map();
@@ -86,27 +86,41 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         return this.parentElement;
     }
     // Genesis Specific
+    get rowIdByResourceType() {
+        if (this.rowId)
+            return this.rowId; // Allow user to override
+        if (this.isRequestServer)
+            return 'RECORD_ID'; // REQUEST_SERVER default record id
+        return 'ROW_REF'; // DATASERVER default record id
+    }
     /**
      * Initializes the datasource.
      * @public
      * @remarks This method is called automatically when the element is connected to the DOM.
      */
     init() {
-        if (this.agGrid && this.resourceName && this.connect.isConnected) {
-            const gridOptions = Object.assign({ getRowId: (params) => params.data[this.rowId] }, this.deferredGridOptions);
-            this.agGrid.gridOptions = Object.assign({}, gridOptions);
-            this.agGrid.addEventListener('onGridReady', () => __awaiter(this, void 0, void 0, function* () {
-                yield this.loadResourceData();
-            }), { once: true });
-            const filterDebounceTime = 600;
-            this.updateSub = this.update
-                .pipe(skip(1), debounceTime(filterDebounceTime), tap((f) => logger.debug('filters (debounced): ', f)))
-                .subscribe((value) => {
-                this.loadResourceData(withoutFullInit);
-            });
-            return;
-        }
-        logger.warn(`Application not connected, falling back to local columnDefs/rowData`);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.agGrid &&
+                this.datasource.validResourceName(this.resourceName) &&
+                this.connect.isConnected) {
+                const meta = yield this.connect.getMetadata(this.resourceName);
+                this.isRequestServer = meta.TYPE === ResourceType.REQUEST_SERVER;
+                this.rowId = this.rowIdByResourceType;
+                const gridOptions = Object.assign({ getRowId: (params) => params.data[this.rowId] }, this.deferredGridOptions);
+                this.agGrid.gridOptions = Object.assign({}, gridOptions);
+                this.agGrid.addEventListener('onGridReady', () => __awaiter(this, void 0, void 0, function* () {
+                    yield this.loadResourceData();
+                }), { once: true });
+                const filterDebounceTime = 600;
+                this.updateSub = this.update
+                    .pipe(skip(1), debounceTime(filterDebounceTime), tap((f) => logger.debug('filters (debounced): ', f)))
+                    .subscribe((value) => {
+                    this.loadResourceData(withoutFullInit);
+                });
+                return;
+            }
+            logger.warn(`Application not connected, falling back to local columnDefs/rowData`);
+        });
     }
     /**
      * Deinitialises the datasource, resetting it to its initial state.
@@ -133,6 +147,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
             this.connectionSub.unsubscribe();
             this.connectionSub = undefined;
         }
+        this.isRequestServer = false;
         this.requiresFullRowDataAndColDefs = true;
         this.dataSubWasLoggedOff = false;
         this.dataLogoff();
@@ -242,8 +257,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
     handleStreamResult(result) {
         if (!result)
             return;
-        const isRequestServer = result.hasOwnProperty('REPLY');
-        if (isRequestServer) {
+        if (this.isRequestServer) {
             this.applyRequestServerData(result);
         }
         else {
@@ -251,26 +265,35 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         }
     }
     applyRequestServerData(requestServerResult) {
-        var _a, _b;
-        if (!Array.isArray(requestServerResult.REPLY) ||
+        var _a;
+        const requestServerData = requestServerResult.REPLY;
+        if (!Array.isArray(requestServerData) ||
             !((_a = requestServerResult.MESSAGE_TYPE) === null || _a === void 0 ? void 0 : _a.startsWith('REP_'))) {
             logger.error('received invalid RequestServerResult', requestServerResult);
             return;
         }
         if (this.requiresFullRowDataAndColDefs) {
-            if (this.rowId !== 'ROW_REF') {
-                (_b = requestServerResult.REPLY) === null || _b === void 0 ? void 0 : _b.forEach((insertData) => {
-                    this.rows.set(insertData[this.rowId], insertData);
-                });
-            }
-            const rowData = this.rows.size > 0 ? Array.from(this.rows.values()) : requestServerResult.REPLY;
+            requestServerData === null || requestServerData === void 0 ? void 0 : requestServerData.forEach((insertData) => {
+                this.rows.set(insertData[this.rowId], insertData);
+            });
+            const rowData = this.rows.size > 0 ? Array.from(this.rows.values()) : requestServerData;
             this.updateRowData(rowData);
             return;
         }
         this.agTransaction = { add: [], remove: [], update: [] };
-        this.handleStreamInserts(requestServerResult.REPLY);
-        const rowsToDelete = Array.from(this.rows.values()).filter((row) => !requestServerResult.REPLY.includes(row));
+        const rowsToUpdate = [];
+        const rowsToDelete = Array.from(this.rows.values()).filter((row) => {
+            const match = requestServerData.find((data) => data[this.rowId] === row[this.rowId]);
+            if (match) {
+                rowsToUpdate.push(match);
+                return false; // don't delete rows that need to be updated
+            }
+            return true; // delete rows that don't exist in requestServerData
+        });
+        const rowsToInsert = requestServerData.filter((data) => !this.rows.has(data[this.rowId]));
+        this.handleStreamInserts(rowsToInsert);
         this.handleStreamDeletes(rowsToDelete);
+        this.handleStreamUpdates(rowsToUpdate);
         this.agGrid.gridApi.applyTransaction(this.agTransaction);
     }
     applyDataserverData(dataServerResult) {

package/dist/grid-pro.api.json

@@ -6762,9 +6762,14 @@
                   "kind": "Content",
                   "text": "init(): "
                 },
+                {
+                  "kind": "Reference",
+                  "text": "Promise",
+                  "canonicalReference": "!Promise:interface"
+                },
                 {
                   "kind": "Content",
-                  "text": "void"
+                  "text": "<void>"
                 },
                 {
                   "kind": "Content",
@@ -6774,7 +6779,7 @@
               "isStatic": false,
               "returnTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               },
               "releaseTag": "Public",
               "isProtected": false,
@@ -7239,7 +7244,7 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "string"
+                  "text": "any"
                 },
                 {
                   "kind": "Content",

package/dist/grid-pro.d.ts

@@ -1207,11 +1207,12 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     resourceName: string;
     resourceNameChanged(oldValue: string, newValue: string): void;
     reverse: boolean;
-    rowId: string;
+    rowId: any;
     restartOnReconnection: boolean;
     private dataSub;
     private updateSub;
     private connectionSub;
+    private isRequestServer;
     private requiresFullRowDataAndColDefs;
     private dataSubWasLoggedOff;
     private rows;
@@ -1223,12 +1224,13 @@ export declare class GridProGenesisDatasource extends GridProGenesisDatasource_b
     disconnectedCallback(): void;
     deepClone(): Node;
     private get agGrid();
+    private get rowIdByResourceType();
     /**
      * Initializes the datasource.
      * @public
      * @remarks This method is called automatically when the element is connected to the DOM.
      */
-    init(): void;
+    init(): Promise<void>;
     /**
      * Deinitialises the datasource, resetting it to its initial state.
      * @public

package/docs/api/grid-pro.gridprogenesisdatasource.init.md

@@ -9,11 +9,11 @@ Initializes the datasource.
 **Signature:**
 
 ```typescript
-init(): void;
+init(): Promise<void>;
 ```
 **Returns:**
 
-void
+Promise&lt;void&gt;
 
 ## Remarks
 

package/docs/api/grid-pro.gridprogenesisdatasource.md

@@ -35,7 +35,7 @@ Only supports Client-Side Row Model.
 |  [resourceName](./grid-pro.gridprogenesisdatasource.resourcename.md) |  | string |  |
 |  [restartOnReconnection](./grid-pro.gridprogenesisdatasource.restartonreconnection.md) |  | boolean |  |
 |  [reverse](./grid-pro.gridprogenesisdatasource.reverse.md) |  | boolean |  |
-|  [rowId](./grid-pro.gridprogenesisdatasource.rowid.md) |  | string |  |
+|  [rowId](./grid-pro.gridprogenesisdatasource.rowid.md) |  | any |  |
 
 ## Methods
 

package/docs/api/grid-pro.gridprogenesisdatasource.rowid.md

@@ -7,5 +7,5 @@
 **Signature:**
 
 ```typescript
-rowId: string;
+rowId: any;
 ```

package/docs/api-report.md

@@ -639,7 +639,7 @@ export class GridProGenesisDatasource extends GridProGenesisDatasource_base {
     disconnectedCallback(): void;
     // (undocumented)
     fields: string;
-    init(): void;
+    init(): Promise<void>;
     // (undocumented)
     isSnapshot: boolean;
     // (undocumented)
@@ -666,7 +666,7 @@ export class GridProGenesisDatasource extends GridProGenesisDatasource_base {
     // (undocumented)
     reverse: boolean;
     // (undocumented)
-    rowId: string;
+    rowId: any;
     // (undocumented)
     setFilter(fieldName: string, newFilter: string): void;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/grid-pro",
   "description": "Genesis Foundation AG Grid",
-  "version": "14.40.1",
+  "version": "14.41.1",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -21,14 +21,14 @@
     "serve": "genx serve"
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "^14.40.1",
-    "@genesislcap/genx": "^14.40.1",
+    "@genesislcap/foundation-testing": "^14.41.1",
+    "@genesislcap/genx": "^14.41.1",
     "bulma": "^0.9.3"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "^14.40.1",
-    "@genesislcap/foundation-ui": "^14.40.1",
-    "@genesislcap/foundation-utils": "^14.40.1",
+    "@genesislcap/foundation-comms": "^14.41.1",
+    "@genesislcap/foundation-ui": "^14.41.1",
+    "@genesislcap/foundation-utils": "^14.41.1",
     "@microsoft/fast-colors": "^5.1.4",
     "@microsoft/fast-components": "^2.21.3",
     "@microsoft/fast-element": "^1.7.0",
@@ -51,5 +51,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "b2f957496de6a98f8221da5c72ab9a1b6d6ea74b"
+  "gitHead": "7a446acc63c677800d4acbba0e7cd169178c5a3c"
 }