@memberjunction/ng-explorer-core 0.9.60 → 0.9.63

package/dist/lib/navigation/navigation.component.js

@@ -476,13 +476,12 @@ export class NavigationComponent {
         }
         else if (data.ResourceType.trim().toLowerCase() === 'user views') {
             // a viwe can be either saved (where we have a view id) or dyanmic (where we have an entity name, and optionally, an extra filter)
-            if (data.ResourceRecordID > 0) {
+            if (data.ResourceRecordID) {
                 // saved view
                 existingTab = this.tabs.find(t => t.data.ResourceTypeID === data.ResourceTypeID &&
                     t.data.ResourceRecordID === data.ResourceRecordID &&
                     data.ResourceRecordID !== null &&
-                    data.ResourceRecordID !== undefined &&
-                    data.ResourceRecordID > 0 // make sure that we don't match on null/undefined/0 ResourceRecordID's - these should always be NEW tabs
+                    data.ResourceRecordID !== undefined // make sure that we don't match on null/undefined ResourceRecordID's - these should always be NEW tabs
                 );
             }
             else {

package/dist/lib/resource-wrappers/record-resource.component.d.ts

@@ -1,7 +1,9 @@
 import { BaseResourceComponent, ResourceData } from '../generic/base-resource-component';
+import { PrimaryKeyValue } from '@memberjunction/core';
 import * as i0 from "@angular/core";
 export declare function LoadRecordResource(): void;
 export declare class EntityRecordResource extends BaseResourceComponent {
+    get primaryKeyValues(): PrimaryKeyValue[];
     GetResourceDisplayName(data: ResourceData): Promise<string>;
     static ɵfac: i0.ɵɵFactoryDeclaration<EntityRecordResource, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<EntityRecordResource, "record-resource", never, {}, {}, never, never, false, never>;

package/dist/lib/resource-wrappers/record-resource.component.js

@@ -17,12 +17,21 @@ import { Component } from '@angular/core';
 import { BaseResourceComponent } from '../generic/base-resource-component';
 import { RegisterClass } from '@memberjunction/global';
 import { Metadata } from '@memberjunction/core';
+import { SharedService } from '../../public-api';
 import * as i0 from "@angular/core";
 import * as i1 from "../single-record/single-record.component";
 export function LoadRecordResource() {
     const test = new EntityRecordResource(); // this looks really dumb. Thing is, in production builds, tree shaking causes the class below to not be included in the bundle. This is a hack to force it to be included.
 }
 let EntityRecordResource = class EntityRecordResource extends BaseResourceComponent {
+    get primaryKeyValues() {
+        const md = new Metadata();
+        const e = md.Entities.find(e => e.Name.trim().toLowerCase() === this.Data.Configuration.Entity.trim().toLowerCase());
+        if (!e)
+            throw new Error(`Entity ${this.Data.Configuration.Entity} not found in metadata`);
+        const pKeys = SharedService.ParsePrimaryKeys(e, this.Data.ResourceRecordID);
+        return pKeys;
+    }
     GetResourceDisplayName(data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!data.Configuration.Entity)
@@ -37,12 +46,12 @@ let EntityRecordResource = class EntityRecordResource extends BaseResourceCompon
     }
 };
 EntityRecordResource.ɵfac = /*@__PURE__*/ function () { let ɵEntityRecordResource_BaseFactory; return function EntityRecordResource_Factory(t) { return (ɵEntityRecordResource_BaseFactory || (ɵEntityRecordResource_BaseFactory = i0.ɵɵgetInheritedFactory(EntityRecordResource)))(t || EntityRecordResource); }; }();
-EntityRecordResource.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: EntityRecordResource, selectors: [["record-resource"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 1, vars: 2, consts: [[3, "primaryKeyValue", "entityName", "loadComplete"]], template: function EntityRecordResource_Template(rf, ctx) { if (rf & 1) {
+EntityRecordResource.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: EntityRecordResource, selectors: [["record-resource"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 1, vars: 2, consts: [[3, "primaryKeyValues", "entityName", "loadComplete"]], template: function EntityRecordResource_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelementStart(0, "app-single-record", 0);
         i0.ɵɵlistener("loadComplete", function EntityRecordResource_Template_app_single_record_loadComplete_0_listener() { return ctx.NotifyLoadComplete(); });
         i0.ɵɵelementEnd();
     } if (rf & 2) {
-        i0.ɵɵproperty("primaryKeyValue", ctx.Data.ResourceRecordID)("entityName", ctx.Data.Configuration.Entity);
+        i0.ɵɵproperty("primaryKeyValues", ctx.primaryKeyValues)("entityName", ctx.Data.Configuration.Entity);
     } }, dependencies: [i1.SingleRecordComponent], encapsulation: 2 });
 EntityRecordResource = __decorate([
     RegisterClass(BaseResourceComponent, 'Records')
@@ -52,6 +61,6 @@ export { EntityRecordResource };
         type: Component,
         args: [{
                 selector: 'record-resource',
-                template: `<app-single-record [primaryKeyValue]="Data.ResourceRecordID" [entityName]="Data.Configuration.Entity" (loadComplete)="NotifyLoadComplete()"></app-single-record>`
+                template: `<app-single-record [primaryKeyValues]="this.primaryKeyValues" [entityName]="Data.Configuration.Entity" (loadComplete)="NotifyLoadComplete()"></app-single-record>`
             }]
     }], null, null); })();

package/dist/lib/single-record/single-record.component.d.ts

@@ -1,11 +1,12 @@
 import { AfterViewInit, EventEmitter, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { PrimaryKeyValue } from '@memberjunction/core';
 import { Container } from '@memberjunction/ng-container-directives';
 import * as i0 from "@angular/core";
 export declare class SingleRecordComponent implements OnInit, AfterViewInit {
     private route;
     formContainer: Container;
-    primaryKeyValue: any;
+    primaryKeyValues: PrimaryKeyValue[];
     entityName: string | null;
     loadComplete: EventEmitter<any>;
     constructor(route: ActivatedRoute);
@@ -14,7 +15,7 @@ export declare class SingleRecordComponent implements OnInit, AfterViewInit {
     loading: boolean;
     ngOnInit(): void;
     ngAfterViewInit(): void;
-    LoadForm(primaryKeyValue: any, entityName: string): Promise<void>;
+    LoadForm(primaryKeyValues: PrimaryKeyValue[], entityName: string): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<SingleRecordComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SingleRecordComponent, "app-single-record", never, { "primaryKeyValue": "primaryKeyValue"; "entityName": "entityName"; }, { "loadComplete": "loadComplete"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SingleRecordComponent, "app-single-record", never, { "primaryKeyValues": "primaryKeyValues"; "entityName": "entityName"; }, { "loadComplete": "loadComplete"; }, never, never, false, never>;
 }

package/dist/lib/single-record/single-record.component.js

@@ -24,7 +24,7 @@ function SingleRecordComponent_ng_template_1_Template(rf, ctx) { }
 export class SingleRecordComponent {
     constructor(route) {
         this.route = route;
-        this.primaryKeyValue = null;
+        this.primaryKeyValues = [];
         this.entityName = '';
         this.loadComplete = new EventEmitter();
         this.appDescription = '';
@@ -34,14 +34,14 @@ export class SingleRecordComponent {
     ngOnInit() {
     }
     ngAfterViewInit() {
-        this.LoadForm(this.primaryKeyValue, this.entityName);
+        this.LoadForm(this.primaryKeyValues, this.entityName);
     }
-    LoadForm(primaryKeyValue, entityName) {
+    LoadForm(primaryKeyValues, entityName) {
         return __awaiter(this, void 0, void 0, function* () {
             // Perform any necessary actions with the ViewID, such as fetching data
-            if (primaryKeyValue && entityName) {
+            if (primaryKeyValues && entityName) {
                 this.entityName = entityName;
-                this.primaryKeyValue = primaryKeyValue;
+                this.primaryKeyValues = primaryKeyValues;
                 const formReg = MJGlobal.Instance.ClassFactory.GetRegistration(BaseFormComponent, entityName);
                 const md = new Metadata();
                 const entity = md.Entities.find(e => {
@@ -51,7 +51,7 @@ export class SingleRecordComponent {
                 if (formReg) {
                     const record = yield md.GetEntityObject(entityName);
                     if (record) {
-                        yield record.Load(primaryKeyValue);
+                        yield record.InnerLoad(primaryKeyValues);
                         const viewContainerRef = this.formContainer.viewContainerRef;
                         viewContainerRef.clear();
                         const componentRef = viewContainerRef.createComponent(formReg.SubClass);
@@ -61,7 +61,7 @@ export class SingleRecordComponent {
                         this.loadComplete.emit();
                     }
                     else
-                        throw new Error(`Unable to load entity ${entityName} with primary key value of: ${primaryKeyValue}`);
+                        throw new Error(`Unable to load entity ${entityName} with primary key values: ${primaryKeyValues.map(p => p.FieldName + ': ' + p.Value).join(', ')}`);
                 }
                 this.loading = false;
             }
@@ -74,7 +74,7 @@ SingleRecordComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Singl
     } if (rf & 2) {
         let _t;
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.formContainer = _t.first);
-    } }, inputs: { primaryKeyValue: "primaryKeyValue", entityName: "entityName" }, outputs: { loadComplete: "loadComplete" }, decls: 2, vars: 1, consts: [["type", "converging-spinner", 4, "ngIf"], ["mjContainer", ""], ["type", "converging-spinner"]], template: function SingleRecordComponent_Template(rf, ctx) { if (rf & 1) {
+    } }, inputs: { primaryKeyValues: "primaryKeyValues", entityName: "entityName" }, outputs: { loadComplete: "loadComplete" }, decls: 2, vars: 1, consts: [["type", "converging-spinner", 4, "ngIf"], ["mjContainer", ""], ["type", "converging-spinner"]], template: function SingleRecordComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵtemplate(0, SingleRecordComponent_kendo_loader_0_Template, 1, 0, "kendo-loader", 0);
         i0.ɵɵtemplate(1, SingleRecordComponent_ng_template_1_Template, 0, 0, "ng-template", 1);
     } if (rf & 2) {
@@ -86,7 +86,7 @@ SingleRecordComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Singl
     }], function () { return [{ type: i1.ActivatedRoute }]; }, { formContainer: [{
             type: ViewChild,
             args: [Container, { static: true }]
-        }], primaryKeyValue: [{
+        }], primaryKeyValues: [{
             type: Input
         }], entityName: [{
             type: Input

package/dist/lib/single-view/single-view.component.js

@@ -13,6 +13,7 @@ import { Metadata, LogError } from '@memberjunction/core';
 import { distinctUntilChanged, Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { ViewInfo } from '@memberjunction/core-entities';
+import { SharedService } from '../../shared/shared.service';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/router";
 import * as i2 from "../../shared/shared.service";
@@ -100,7 +101,7 @@ export class SingleViewComponent {
     handleRowClick(args) {
         return __awaiter(this, void 0, void 0, function* () {
             // tell the router to navigate instead of raising an event directly. router will in turn handle raising the event as required
-            this.router.navigate(['resource', 'record', args.primaryKeyValue], { queryParams: { Entity: args.entityName } });
+            this.router.navigate(['resource', 'record', SharedService.GeneratePrimaryKeyValueString(args.primaryKeyValues)], { queryParams: { Entity: args.entityName } });
         });
     }
     LoadView(viewInfo) {

package/dist/shared/shared.service.d.ts

@@ -1,3 +1,4 @@
+import { EntityInfo, PrimaryKeyValue } from '@memberjunction/core';
 import { ResourceTypeEntity, UserNotificationEntity, ViewColumnInfo } from '@memberjunction/core-entities';
 import { Observable } from 'rxjs';
 import { NotificationService } from "@progress/kendo-angular-notification";
@@ -24,6 +25,8 @@ export declare class SharedService {
     ResourceTypeByID(id: number): ResourceTypeEntity | undefined;
     ResourceTypeByName(name: string): ResourceTypeEntity | undefined;
     static RefreshData(): Promise<void>;
+    static GeneratePrimaryKeyValueString(pkVals: PrimaryKeyValue[]): string;
+    static ParsePrimaryKeys(entity: EntityInfo, routeSegment: string): PrimaryKeyValue[];
     FormatColumnValue(col: ViewColumnInfo, value: any, maxLength?: number, trailingChars?: string): any;
     ConvertMarkdownStringToHtmlList(listType: HtmlListType, text: string): string;
     InvokeManualResize(delay?: number): void;

package/dist/shared/shared.service.js

@@ -123,6 +123,24 @@ export class SharedService {
             SharedService.RefreshUserNotifications(); // also call this initially when refreshing the dataset...
         });
     }
+    static GeneratePrimaryKeyValueString(pkVals) {
+        return pkVals.map(pk => pk.FieldName + '|' + pk.Value).join('||');
+    }
+    static ParsePrimaryKeys(entity, routeSegment) {
+        if (!routeSegment.includes('|')) {
+            // If not, return a single element array with a default field name
+            return [{ FieldName: entity.PrimaryKey.Name, Value: routeSegment }];
+        }
+        else {
+            const parts = routeSegment.split('||');
+            const pkVals = [];
+            for (let p of parts) {
+                const kv = p.split('|');
+                pkVals.push({ FieldName: kv[0], Value: kv[1] });
+            }
+            return pkVals;
+        }
+    }
     FormatColumnValue(col, value, maxLength = 0, trailingChars = "...") {
         if (value === null || value === undefined)
             return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ng-explorer-core",
-  "version": "0.9.60",
+  "version": "0.9.63",
   "description": "MemberJunction Explorer: Core Angular Components",
   "main": "./dist/public-api.js",
   "typings": "./dist/public-api.d.ts",
@@ -28,11 +28,11 @@
   },
   "dependencies": {
     "@memberjunction/global": "^0.9.107",
-    "@memberjunction/core": "^0.9.114",
-    "@memberjunction/ng-compare-records": "^0.9.118",
-    "@memberjunction/ng-record-changes": "^0.9.52",
-    "@memberjunction/ng-container-directives": "^0.9.91",
-    "@memberjunction/ng-user-view-grid": "^0.9.99",
+    "@memberjunction/core": "^0.9.115",
+    "@memberjunction/ng-compare-records": "^0.9.119",
+    "@memberjunction/ng-record-changes": "^0.9.53",
+    "@memberjunction/ng-container-directives": "^0.9.92",
+    "@memberjunction/ng-user-view-grid": "^0.9.101",
     "tslib": "^2.3.0"
   },
   "sideEffects": false