@memberjunction/ng-user-view-grid 0.9.99 → 0.9.101

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

@@ -1,7 +1,7 @@
 import { ElementRef, EventEmitter, OnInit, AfterViewInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
-import { BaseEntity, RunViewParams, EntityFieldInfo, EntityInfo } from '@memberjunction/core';
+import { BaseEntity, RunViewParams, EntityFieldInfo, EntityInfo, PrimaryKeyValue } from '@memberjunction/core';
 import { ViewColumnInfo, UserViewEntityExtended } from '@memberjunction/core-entities';
 import { CellClickEvent, GridDataResult, PageChangeEvent, GridComponent, CellCloseEvent, ColumnReorderEvent, ColumnResizeArgs, SelectionEvent, SelectableSettings } from "@progress/kendo-angular-grid";
 import { ExcelExportComponent } from '@progress/kendo-angular-excel-export';
@@ -10,7 +10,7 @@ import * as i0 from "@angular/core";
 export type GridRowClickedEvent = {
     entityId: number;
     entityName: string;
-    primaryKeyValue: any;
+    primaryKeyValues: PrimaryKeyValue[];
 };
 export type GridRowEditedEvent = {
     record: BaseEntity;
@@ -82,6 +82,7 @@ export declare class UserViewGridComponent implements OnInit, AfterViewInit {
     columnResize(args: ColumnResizeArgs[]): Promise<void>;
     sortChanged(sort: any): Promise<void>;
     cellClickHandler(args: CellClickEvent): Promise<void>;
+    GeneratePrimaryKeyValueString(pkVals: PrimaryKeyValue[]): string;
     createFormGroup(dataItem: any): FormGroup;
     getEditor(ef: EntityFieldInfo): "boolean" | "text" | "numeric" | "date";
     cellCloseHandler(args: CellCloseEvent): Promise<void>;

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

@@ -515,11 +515,14 @@ export class UserViewGridComponent {
             if (this.compareMode || this.mergeMode)
                 return;
             if (this._entityInfo) {
-                const pkeyVal = this.viewData[args.rowIndex][this._entityInfo.PrimaryKey.Name];
+                const pkeyVals = [];
+                this._entityInfo.PrimaryKeys.forEach((pkey) => {
+                    pkeyVals.push({ FieldName: pkey.Name, Value: this.viewData[args.rowIndex][pkey.Name] });
+                });
                 this.rowClicked.emit({
                     entityId: this._entityInfo.ID,
                     entityName: this._entityInfo.Name,
-                    primaryKeyValue: pkeyVal
+                    primaryKeyValues: pkeyVals
                 });
                 if (this._entityInfo.AllowUpdateAPI &&
                     this.EditMode !== "None") {
@@ -531,11 +534,15 @@ export class UserViewGridComponent {
                 }
                 if (!this.InEditMode && this.AutoNavigate) {
                     // tell app router to go to this record
-                    this.router.navigate(['resource', 'record', pkeyVal], { queryParams: { Entity: this._entityInfo.Name } });
+                    const pkVals = this.GeneratePrimaryKeyValueString(pkeyVals);
+                    this.router.navigate(['resource', 'record', pkVals], { queryParams: { Entity: this._entityInfo.Name } });
                 }
             }
         });
     }
+    GeneratePrimaryKeyValueString(pkVals) {
+        return pkVals.length > 1 ? pkVals.map(pk => pk.FieldName + '|' + pk.Value).join('||') : pkVals[0].Value;
+    }
     createFormGroup(dataItem) {
         const groupFields = {};
         this.viewColumns.forEach((vc) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ng-user-view-grid",
-  "version": "0.9.99",
+  "version": "0.9.101",
   "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.88",
+    "@memberjunction/core-entities": "^0.9.89",
     "@memberjunction/global": "^0.9.107",
-    "@memberjunction/core": "^0.9.114",
-    "@memberjunction/ng-compare-records": "^0.9.118",
-    "@memberjunction/ng-container-directives": "^0.9.91",
+    "@memberjunction/core": "^0.9.115",
+    "@memberjunction/ng-compare-records": "^0.9.119",
+    "@memberjunction/ng-container-directives": "^0.9.92",
     "tslib": "^2.3.0"
   },
   "sideEffects": false