@memberjunction/ng-user-view-grid 0.9.78 → 0.9.84

package/dist/lib/ng-user-view-grid.component.d.ts

@@ -10,7 +10,7 @@ import * as i0 from "@angular/core";
 export type GridRowClickedEvent = {
     entityId: number;
     entityName: string;
-    recordId: number;
+    primaryKeyValue: any;
 };
 export type GridRowEditedEvent = {
     record: BaseEntity;

package/dist/lib/ng-user-view-grid.component.js

@@ -518,7 +518,7 @@ export class UserViewGridComponent {
                 this.rowClicked.emit({
                     entityId: this._entityInfo.ID,
                     entityName: this._entityInfo.Name,
-                    recordId: args.dataItem.ID
+                    primaryKeyValue: args.dataItem[this._entityInfo.PrimaryKey.Name]
                 });
                 if (this._entityInfo.AllowUpdateAPI &&
                     this.EditMode !== "None") {
@@ -530,7 +530,7 @@ export class UserViewGridComponent {
                 }
                 if (!this.InEditMode && this.AutoNavigate) {
                     // tell app router to go to this record
-                    this.router.navigate(['resource', 'record', args.dataItem.ID], { queryParams: { Entity: this._entityInfo.Name } });
+                    this.router.navigate(['resource', 'record', args.dataItem[this._entityInfo.PrimaryKey.Name]], { queryParams: { Entity: this._entityInfo.Name } });
                 }
             }
         });
@@ -573,21 +573,22 @@ export class UserViewGridComponent {
                         // update the data item with the new values - this drives UI refresh while we save the record...
                         Object.assign(dataItem, formGroup.value);
                         const md = new Metadata();
+                        const pkey = this._entityInfo.PrimaryKey.Name;
                         let record;
                         let bSaved = false;
                         if (this.EditMode === "Save") {
                             record = yield md.GetEntityObject(this._entityInfo.Name);
-                            yield record.Load(dataItem.ID);
+                            yield record.Load(dataItem[pkey]);
                             record.SetMany(formGroup.value);
                             bSaved = yield record.Save();
                             if (!bSaved)
-                                this.CreateSimpleNotification("Error saving record: " + record.ID, 'error', 5000);
+                                this.CreateSimpleNotification("Error saving record: " + record.Get(pkey), 'error', 5000);
                         }
                         else {
-                            record = (_a = this._pendingRecords.find((r) => r.record.ID === dataItem.ID)) === null || _a === void 0 ? void 0 : _a.record;
+                            record = (_a = this._pendingRecords.find((r) => r.record.Get(pkey) === dataItem[pkey])) === null || _a === void 0 ? void 0 : _a.record;
                             if (!record) { // haven't edited this one before 
                                 record = yield md.GetEntityObject(this._viewEntity.Get('Entity'));
-                                yield record.Load(dataItem.ID);
+                                yield record.Load(dataItem[pkey]);
                                 this._pendingRecords.push({ record,
                                     row: args.rowIndex,
                                     dataItem }); // don't save - put the changed record on a queue for saving later by our container
@@ -816,10 +817,11 @@ export class UserViewGridComponent {
             if (event === 'yes') {
                 if (this._entityInfo && this.recordCompareComponent) {
                     const md = new Metadata();
+                    const pkey = this._entityInfo.PrimaryKey.Name;
                     const result = yield md.MergeRecords({
                         EntityName: this._entityInfo.Name,
-                        RecordsToMerge: this.recordsToCompare.map((r) => r.ID).filter((id) => { var _a; return id !== ((_a = this.recordCompareComponent) === null || _a === void 0 ? void 0 : _a.selectedRecordId); }),
-                        SurvivingRecordID: this.recordCompareComponent.selectedRecordId,
+                        RecordsToMerge: this.recordsToCompare.map((r) => r.Get(pkey)).filter((pkeyVal) => { var _a; return pkeyVal !== ((_a = this.recordCompareComponent) === null || _a === void 0 ? void 0 : _a.selectedRecordPKeyVal); }),
+                        SurvivingRecordPrimaryKeyValue: this.recordCompareComponent.selectedRecordPKeyVal,
                         FieldMap: this.recordCompareComponent.fieldMap.map((fm) => {
                             return {
                                 FieldName: fm.fieldName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ng-user-view-grid",
-  "version": "0.9.78",
+  "version": "0.9.84",
   "description": "MemberJunction: Angular Grid to display dynamic and saved user views for any entity in MemberJunction.",
   "main": "./dist/public-api.js",
   "typings": "./dist/public-api.d.ts",
@@ -26,11 +26,11 @@
     "@progress/kendo-angular-grid": "^12.1.0"
   },
   "dependencies": {
-    "@memberjunction/core-entities": "^0.9.71",
-    "@memberjunction/global": "^0.9.102",
-    "@memberjunction/core": "^0.9.99",
-    "@memberjunction/ng-compare-records": "^0.9.99",
-    "@memberjunction/ng-container-directives": "^0.9.74",
+    "@memberjunction/core-entities": "^0.9.75",
+    "@memberjunction/global": "^0.9.104",
+    "@memberjunction/core": "^0.9.103",
+    "@memberjunction/ng-compare-records": "^0.9.105",
+    "@memberjunction/ng-container-directives": "^0.9.80",
     "tslib": "^2.3.0"
   },
   "sideEffects": false