@memberjunction/ng-explorer-core 0.9.38 → 0.9.43

package/dist/lib/favorites/favorites.component.js

@@ -59,12 +59,12 @@ export class FavoritesComponent {
         }).then((favorites) => __awaiter(this, void 0, void 0, function* () {
             this.favorites = favorites.Results; // set the result in the list and let the below happen after async and it will update via data binding when done
             const input = favorites.Results.map((fav) => {
-                return { EntityName: fav.Entity, RecordID: fav.RecordID };
+                return { EntityName: fav.Entity, PrimaryKeyValue: fav.RecordID };
             });
             const results = yield md.GetEntityRecordNames(input);
             if (results)
                 results.forEach((result) => {
-                    const fav = favorites.Results.find((f) => f.Entity == result.EntityName && f.RecordID == result.RecordID);
+                    const fav = favorites.Results.find((f) => f.Entity == result.EntityName && f.RecordID == result.PrimaryKeyValue);
                     if (fav) {
                         fav.RecordName = result.Success ? result.RecordName : fav.Entity + ' ' + fav.RecordID;
                     }

package/dist/lib/generic/base-form-component.js

@@ -44,7 +44,7 @@ export class BaseFormComponent extends BaseRecordComponent {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.record) {
                 const md = new Metadata();
-                this._isFavorite = yield md.GetRecordFavoriteStatus(md.CurrentUser.ID, this.record.EntityInfo.Name, this.record.ID);
+                this._isFavorite = yield md.GetRecordFavoriteStatus(md.CurrentUser.ID, this.record.EntityInfo.Name, this.record.PrimaryKey.Value);
                 this.FavoriteInitDone = true;
             }
         });
@@ -107,7 +107,7 @@ export class BaseFormComponent extends BaseRecordComponent {
     SetFavoriteStatus(isFavorite) {
         return __awaiter(this, void 0, void 0, function* () {
             const md = new Metadata();
-            yield md.SetRecordFavoriteStatus(md.CurrentUser.ID, this.record.EntityInfo.Name, this.record.ID, isFavorite);
+            yield md.SetRecordFavoriteStatus(md.CurrentUser.ID, this.record.EntityInfo.Name, this.record.PrimaryKey.Value, isFavorite);
             this._isFavorite = isFavorite;
         });
     }
@@ -389,13 +389,13 @@ export class BaseFormComponent extends BaseRecordComponent {
         return __awaiter(this, void 0, void 0, function* () {
             // for now dump to console
             const md = new Metadata();
-            const dep = yield md.GetRecordDependencies(this.record.EntityInfo.Name, this.record.ID);
-            console.log('Dependencies for: ' + this.record.EntityInfo.Name + ' ' + this.record.ID);
+            const dep = yield md.GetRecordDependencies(this.record.EntityInfo.Name, this.record.PrimaryKey.Value);
+            console.log('Dependencies for: ' + this.record.EntityInfo.Name + ' ' + this.record.PrimaryKey.Value);
             console.log(dep);
             // if (confirm('Do you want to merge records test?') == true) {
             //   const mergeResult = await md.MergeRecords({
             //     EntityName: this.record.EntityInfo.Name,
-            //     SurvivingRecordID: this.record.ID,
+            //     SurvivingRecordID: this.record.PrimaryKey.Value,
             //     RecordsToMerge: [4],
             //   })
             //   console.log(mergeResult);

package/dist/lib/generic/base-form-section-component.d.ts

@@ -1,6 +1,6 @@
 import { BaseEntity } from "@memberjunction/core";
 import { BaseRecordComponent } from "./base-record-component";
 export declare class BaseFormSectionComponent extends BaseRecordComponent {
-    record: BaseEntity | null;
+    record: BaseEntity;
     EditMode: boolean;
 }

package/dist/lib/generic/base-form-section-component.js

@@ -4,7 +4,6 @@ import { BaseRecordComponent } from "./base-record-component";
 export class BaseFormSectionComponent extends BaseRecordComponent {
     constructor() {
         super(...arguments);
-        this.record = null;
         this.EditMode = false;
     }
 }

package/dist/lib/generic/base-record-component.d.ts

@@ -1,6 +1,6 @@
-import { EntityFieldInfo } from "@memberjunction/core";
+import { BaseEntity, EntityFieldInfo } from "@memberjunction/core";
 export declare abstract class BaseRecordComponent {
-    abstract record: any;
+    abstract record: BaseEntity;
     FormatField(entityFieldInfo: EntityFieldInfo, value: any, decimals?: number, currency?: string): string;
     FormatValue(fieldName: string, decimals?: number, currency?: string): string;
 }

package/dist/lib/generic/base-record-component.js

@@ -5,9 +5,10 @@ export class BaseRecordComponent {
     FormatValue(fieldName, decimals = 2, currency = 'USD') {
         if (!this.record)
             throw new Error('this.record not set');
-        const f = this.record.Fields.find(f => f.Name.trim().toLowerCase() === fieldName.trim().toLowerCase());
+        const r = this.record;
+        const f = r.Fields.find(f => f.Name.trim().toLowerCase() === fieldName.trim().toLowerCase());
         if (!f)
-            throw new Error(`Field ${fieldName} not found in entity ${this.record.EntityInfo.Name}`);
+            throw new Error(`Field ${fieldName} not found in entity ${r.EntityInfo.Name}`);
         return f.FormatValue(decimals, currency);
     }
 }

package/dist/lib/generic/base-resource-component.d.ts

@@ -24,7 +24,7 @@ export declare class ResourceData {
     ID: number;
     Name: string;
     ResourceTypeID: number;
-    ResourceRecordID: number;
+    ResourceRecordID: any;
     Configuration: any;
     /**
      * Returns the name of the resource type based on the ResourceTypeID

package/dist/lib/generic/base-resource-component.js

@@ -45,7 +45,7 @@ export class BaseResourceComponent {
         }
     }
     ResourceRecordSaved(resourceRecordEntity) {
-        this.Data.ResourceRecordID = resourceRecordEntity.ID;
+        this.Data.ResourceRecordID = resourceRecordEntity.PrimaryKey.Value;
         if (this._resourceRecordSavedEvent) {
             this._resourceRecordSavedEvent(resourceRecordEntity);
         }

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

@@ -495,7 +495,7 @@ export class NavigationComponent {
         else {
             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 // make sure that we don't match on null/undefined ResourceRecordID's - these should always be NEW tabs
             );
         }
         return existingTab;
@@ -659,7 +659,7 @@ export class NavigationComponent {
                         yield wsItem.Load(tab.data.ID);
                     else {
                         wsItem.NewRecord();
-                        wsItem.Name = tab.data.Name ? tab.data.Name : tab.data.ResourceType + ' Record ID:' + tab.data.ResourceRecordID;
+                        wsItem.Name = tab.data.Name ? tab.data.Name : tab.data.ResourceType + ' Record:' + tab.data.ResourceRecordID;
                         wsItem.WorkSpaceID = this.workSpace.ID;
                         wsItem.ResourceTypeID = (_a = tab.data) === null || _a === void 0 ? void 0 : _a.ResourceTypeID;
                     }

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

@@ -30,18 +30,19 @@ let EntityRecordResource = class EntityRecordResource extends BaseResourceCompon
             else {
                 const md = new Metadata();
                 const name = yield md.GetEntityRecordName(data.Configuration.Entity, data.ResourceRecordID);
-                return (name ? name : data.Configuration.Entity) + ` (ID: ${data.ResourceRecordID})`;
+                const e = md.Entities.find(e => e.Name === data.Configuration.Entity);
+                return (name ? name : data.Configuration.Entity) + ` (${data.ResourceRecordID.toString().trim()})`;
             }
         });
     }
 };
 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, "recordId", "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, "primaryKeyValue", "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("recordId", ctx.Data.ResourceRecordID)("entityName", ctx.Data.Configuration.Entity);
+        i0.ɵɵproperty("primaryKeyValue", ctx.Data.ResourceRecordID)("entityName", ctx.Data.Configuration.Entity);
     } }, dependencies: [i1.SingleRecordComponent], encapsulation: 2 });
 EntityRecordResource = __decorate([
     RegisterClass(BaseResourceComponent, 'Records')
@@ -51,6 +52,6 @@ export { EntityRecordResource };
         type: Component,
         args: [{
                 selector: 'record-resource',
-                template: `<app-single-record [recordId]="Data.ResourceRecordID" [entityName]="Data.Configuration.Entity" (loadComplete)="NotifyLoadComplete()"></app-single-record>`
+                template: `<app-single-record [primaryKeyValue]="Data.ResourceRecordID" [entityName]="Data.Configuration.Entity" (loadComplete)="NotifyLoadComplete()"></app-single-record>`
             }]
     }], null, null); })();

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

@@ -68,12 +68,12 @@ export class SingleApplicationComponent {
                     }).then((favorites) => __awaiter(this, void 0, void 0, function* () {
                         this.appFavorites = favorites.Results; // set the result in the list and let the below happen after async and it will update via data binding when done
                         const input = favorites.Results.map((fav) => {
-                            return { EntityName: fav.Entity, RecordID: fav.RecordID };
+                            return { EntityName: fav.Entity, PrimaryKeyValue: fav.RecordID };
                         });
                         const results = yield md.GetEntityRecordNames(input);
                         if (results)
                             results.forEach((result) => {
-                                const fav = favorites.Results.find((f) => f.Entity == result.EntityName && f.RecordID == result.RecordID);
+                                const fav = favorites.Results.find((f) => f.Entity === result.EntityName && f.RecordID === result.PrimaryKeyValue);
                                 if (fav) {
                                     fav.RecordName = result.Success ? result.RecordName : fav.Entity + ' ' + fav.RecordID;
                                 }

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

@@ -5,7 +5,7 @@ import * as i0 from "@angular/core";
 export declare class SingleRecordComponent implements OnInit, AfterViewInit {
     private route;
     formContainer: Container;
-    recordId: number;
+    primaryKeyValue: any;
     entityName: string | null;
     loadComplete: EventEmitter<any>;
     constructor(route: ActivatedRoute);
@@ -14,7 +14,7 @@ export declare class SingleRecordComponent implements OnInit, AfterViewInit {
     loading: boolean;
     ngOnInit(): void;
     ngAfterViewInit(): void;
-    LoadForm(recordId: number, entityName: string): Promise<void>;
+    LoadForm(primaryKeyValue: any, entityName: string): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<SingleRecordComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SingleRecordComponent, "app-single-record", never, { "recordId": "recordId"; "entityName": "entityName"; }, { "loadComplete": "loadComplete"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SingleRecordComponent, "app-single-record", never, { "primaryKeyValue": "primaryKeyValue"; "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.recordId = -1;
+        this.primaryKeyValue = null;
         this.entityName = '';
         this.loadComplete = new EventEmitter();
         this.appDescription = '';
@@ -34,14 +34,14 @@ export class SingleRecordComponent {
     ngOnInit() {
     }
     ngAfterViewInit() {
-        this.LoadForm(this.recordId, this.entityName);
+        this.LoadForm(this.primaryKeyValue, this.entityName);
     }
-    LoadForm(recordId, entityName) {
+    LoadForm(primaryKeyValue, entityName) {
         return __awaiter(this, void 0, void 0, function* () {
             // Perform any necessary actions with the ViewID, such as fetching data
-            if (recordId && entityName) {
+            if (primaryKeyValue && entityName) {
                 this.entityName = entityName;
-                this.recordId = recordId;
+                this.primaryKeyValue = primaryKeyValue;
                 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(recordId);
+                        yield record.Load(primaryKeyValue);
                         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 ID ${recordId}`);
+                        throw new Error(`Unable to load entity ${entityName} with primary key value of: ${primaryKeyValue}`);
                 }
                 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: { recordId: "recordId", 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: { 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) {
         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 }]
-        }], recordId: [{
+        }], primaryKeyValue: [{
             type: Input
         }], entityName: [{
             type: Input

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

@@ -100,7 +100,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.recordId], { queryParams: { Entity: args.entityName } });
+            this.router.navigate(['resource', 'record', args.primaryKeyValue], { queryParams: { Entity: args.entityName } });
         });
     }
     LoadView(viewInfo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ng-explorer-core",
-  "version": "0.9.38",
+  "version": "0.9.43",
   "description": "MemberJunction Explorer: Core Angular Components",
   "main": "./dist/public-api.js",
   "typings": "./dist/public-api.d.ts",
@@ -27,12 +27,12 @@
     "@progress/kendo-angular-listview": "^12.1.0"
   },
   "dependencies": {
-    "@memberjunction/global": "^0.9.101",
-    "@memberjunction/core": "^0.9.99",
-    "@memberjunction/ng-compare-records": "^0.9.98",
-    "@memberjunction/ng-record-changes": "^0.9.36",
-    "@memberjunction/ng-container-directives": "^0.9.73",
-    "@memberjunction/ng-user-view-grid": "^0.9.77",
+    "@memberjunction/global": "^0.9.104",
+    "@memberjunction/core": "^0.9.103",
+    "@memberjunction/ng-compare-records": "^0.9.104",
+    "@memberjunction/ng-record-changes": "^0.9.42",
+    "@memberjunction/ng-container-directives": "^0.9.80",
+    "@memberjunction/ng-user-view-grid": "^0.9.83",
     "tslib": "^2.3.0"
   },
   "sideEffects": false