@memberjunction/ng-explorer-core 0.9.172 → 0.9.174

package/dist/lib/navigation/navigation.component.d.ts

@@ -2,7 +2,7 @@ import { ElementRef, OnInit, OnDestroy, AfterViewInit, Renderer2, ChangeDetector
 import { Location } from '@angular/common';
 import { Router, ActivatedRoute } from '@angular/router';
 import { DrawerItem, DrawerSelectEvent, DrawerComponent, DrawerMode, TabCloseEvent, TabStripComponent, SelectEvent } from "@progress/kendo-angular-layout";
-import { Metadata, ApplicationInfo, EntityInfo } from '@memberjunction/core';
+import { Metadata, ApplicationInfo, EntityInfo, TransactionGroupBase } from '@memberjunction/core';
 import { MJEvent } from '@memberjunction/global';
 import { SharedService } from '@memberjunction/ng-shared';
 import { UserViewEntity, ViewInfo } from '@memberjunction/core-entities';
@@ -82,7 +82,7 @@ export declare class NavigationComponent implements OnInit, OnDestroy, AfterView
     SaveSingleWorkspaceItem(tab: Tab): Promise<boolean>;
     setTabContentLoadingStatus(tab: Tab, bLoading: boolean): void;
     onClose(ev: TabCloseEvent): Promise<void>;
-    removeWorkspaceItem(tab: Tab): Promise<void>;
+    removeWorkspaceItem(tab: Tab, transGroup: TransactionGroupBase | null): Promise<void>;
     onTabSelect(e: SelectEvent): void;
     getActiveTabId(): any;
     isTabActive(tabId: number): boolean;

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

@@ -230,17 +230,23 @@ export class NavigationComponent {
                     break;
             }
             this.contextMenuVisible = false;
+            const md = new Metadata();
+            const transGroup = yield md.CreateTransactionGroup();
             for (let i = 0; i < this.closedTabs.length; ++i) {
                 const tab = this.closedTabs[i];
-                yield this.removeWorkspaceItem(tab);
+                yield this.removeWorkspaceItem(tab, transGroup);
             }
-            this.activeTabIndex = 0;
+            yield transGroup.Submit();
+            if (this.activeTabIndex > this.tabs.length)
+                this.activeTabIndex = this.tabs.length - 1;
             this.tabstrip.selectTab(this.activeTabIndex);
-            // in this situation we have the home tab showing, so we need to update the URL path based on what's selected in the drawer
-            let url = this.selectedDrawerItem ? this.selectedDrawerItem.path : '/home';
-            this.router.navigate([url]);
-            //this.location.go(url); // update the browser URL if needed  
-            this._mostRecentURL = url;
+            if (this.activeTabIndex === 0) {
+                // in this situation we have the home tab showing, so we need to update the URL path based on what's selected in the drawer
+                let url = this.selectedDrawerItem ? this.selectedDrawerItem.path : '/home';
+                this.router.navigate([url]);
+                //this.location.go(url); // update the browser URL if needed  
+                this._mostRecentURL = url;
+            }
         });
     }
     checkViewportSize() {
@@ -435,7 +441,8 @@ export class NavigationComponent {
                 this.workSpace = workspaceRecord;
                 const workspaceItemParams = {
                     EntityName: "Workspace Items",
-                    ExtraFilter: `WorkspaceID='${this.workSpace.ID}'`
+                    ExtraFilter: `WorkspaceID='${this.workSpace.ID}'`,
+                    ResultType: "entity_object" /*we want entity objects back so that we can modify them as needed*/
                 };
                 const workspaceItems = yield rv.RunView(workspaceItemParams);
                 if (workspaceItems.Success) {
@@ -463,7 +470,7 @@ export class NavigationComponent {
                     labelLoading: true,
                     contentLoading: false,
                     data: resourceData,
-                    workspaceItem: null, // let this get populated later from the ID if we need to modify it
+                    workspaceItem: item, // provide the entity object here so we can modify it later if needed
                     icon: resourceData.ResourceIcon
                 };
                 this.tabs.push(newTab);
@@ -709,7 +716,7 @@ export class NavigationComponent {
             if (ev.tab.selected) {
                 setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                     // find the closest tab to the one we just closed
-                    yield this.removeWorkspaceItem(this.tabs[ev.index - 1]);
+                    yield this.removeWorkspaceItem(this.tabs[ev.index - 1], null /*no transaction group*/);
                     if (ev.index < this.tabs.length + 1) {
                         // NOT the last tab, kendo by defulat will show the next tab, so let that be, but we need to update our routing info
                         // dont need to update active tab index or call selectTab() here because kendo does this and activetab index stays the same since we're closing the tab
@@ -751,7 +758,7 @@ export class NavigationComponent {
             }
         });
     }
-    removeWorkspaceItem(tab) {
+    removeWorkspaceItem(tab, transGroup) {
         return __awaiter(this, void 0, void 0, function* () {
             // remove the tab from the tabs collection
             const index = this.tabs.indexOf(tab);
@@ -764,9 +771,16 @@ export class NavigationComponent {
                 yield tab.workspaceItem.Load(tab.id);
             }
             if (tab.workspaceItem) {
-                if (!(yield tab.workspaceItem.Delete())) {
-                    // error deleting the workspace item, alert the user
-                    this.sharedService.CreateSimpleNotification('Error deleting workspace item ' + tab.workspaceItem.Name + ' from the database. Please contact your system administrator.', 'error', 5000);
+                const entity = tab.workspaceItem;
+                if (!transGroup) {
+                    if (!(yield entity.Delete())) {
+                        // error deleting the workspace item, alert the user
+                        this.sharedService.CreateSimpleNotification('Error deleting workspace item ' + tab.workspaceItem.Name + ' from the database. Please contact your system administrator.', 'error', 5000);
+                    }
+                }
+                else {
+                    entity.TransactionGroup = transGroup;
+                    entity.Delete(); // no await here, we're in a transaction group so we don't want to block
                 }
             }
         });

package/dist/lib/user-notifications/user-notifications.component.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Component, ViewChild } from '@angular/core';
 import { SharedService } from '@memberjunction/ng-shared';
+import { UserNotificationEntity } from '@memberjunction/core-entities';
 import { Metadata } from '@memberjunction/core';
 import * as i0 from "@angular/core";
 import * as i1 from "@memberjunction/ng-shared";
@@ -252,11 +253,20 @@ export class UserNotificationsComponent {
     markAsRead(notification, bRead, transGroup) {
         return __awaiter(this, void 0, void 0, function* () {
             if (notification) {
+                const notificationId = notification.ID;
                 notification.Unread = !bRead;
-                const md = new Metadata();
-                const notificationEntity = yield md.GetEntityObject('User Notifications');
-                yield notificationEntity.Load(notification.ID);
-                notificationEntity.Unread = notification.Unread; //copy from local object
+                let notificationEntity;
+                if (notification instanceof UserNotificationEntity) {
+                    // the passed in param truly is a UserNotificationEntity or subclass, so just use it, saves a DB round trip
+                    notificationEntity = notification;
+                }
+                else {
+                    // the passed in param is just a plain object, so we need to load the entity
+                    const md = new Metadata();
+                    notificationEntity = yield md.GetEntityObject('User Notifications');
+                    yield notificationEntity.Load(notificationId);
+                    notificationEntity.Unread = !bRead;
+                }
                 // part of a transaction group, if so, add it as that will defer the actual network traffic/save
                 if (transGroup) {
                     notificationEntity.TransactionGroup = transGroup;
@@ -265,7 +275,7 @@ export class UserNotificationsComponent {
                 }
                 else {
                     if (yield notificationEntity.Save()) {
-                        SharedService.RefreshUserNotifications();
+                        //SharedService.RefreshUserNotifications(); don't need to save because angular binding already updtes the UI from the objects
                         return true;
                     }
                     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ng-explorer-core",
-  "version": "0.9.172",
+  "version": "0.9.174",
   "description": "MemberJunction Explorer: Core Angular Components",
   "main": "./dist/public-api.js",
   "typings": "./dist/public-api.d.ts",
@@ -37,14 +37,14 @@
   },
   "dependencies": {
     "@memberjunction/global": "^0.9.146",
-    "@memberjunction/core": "^0.9.162",
-    "@memberjunction/ng-compare-records": "^0.9.161",
-    "@memberjunction/ng-record-changes": "^0.9.95",
-    "@memberjunction/ng-container-directives": "^0.9.129",
-    "@memberjunction/ng-user-view-grid": "^0.9.186",
-    "@memberjunction/ng-query-grid": "^0.9.41",
-    "@memberjunction/ng-shared": "^0.9.15",
-    "@memberjunction/ng-ask-skip": "^0.9.57",
+    "@memberjunction/core": "^0.9.164",
+    "@memberjunction/ng-compare-records": "^0.9.163",
+    "@memberjunction/ng-record-changes": "^0.9.97",
+    "@memberjunction/ng-container-directives": "^0.9.131",
+    "@memberjunction/ng-user-view-grid": "^0.9.188",
+    "@memberjunction/ng-query-grid": "^0.9.43",
+    "@memberjunction/ng-shared": "^0.9.17",
+    "@memberjunction/ng-ask-skip": "^0.9.59",
     "tslib": "^2.3.0"
   },
   "sideEffects": false