Merge pull request #53 from progress/develop

Merge from Develop branch to Master branch
progress · Dec 19, 2018 · 4d996ca · 4d996ca
2 parents 94d96c2 + d2e4058
commit 4d996ca
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/customers/customer-list/customer-list.component.ts b/customers/customer-list/customer-list.component.ts
@@ -52,18 +52,7 @@ export class CustomerListComponent implements OnInit {
         private _routerExtensions: RouterExtensions,
         private _changeDetectionRef: ChangeDetectorRef,
         private _progressService: ProgressService
-    ) {
-        this._progressService.isLoggedin$.subscribe((isLoggedIn) => {
-            if (!isLoggedIn) {
-                this._routerExtensions.navigate(["/login"], {
-                    clearHistory: true,
-                    transition: {
-                        name: "fade"
-                    }
-                });
-            }
-        });
-    }
+    ) { }
 
     /* ***********************************************************
     * Use the "ngOnInit" handler to get the data and assign it to the
@@ -154,8 +143,8 @@ export class CustomerListComponent implements OnInit {
             message: "\"" + customerName + "\" will be deleted forever.",
             okButtonText: "Delete",
             title: "Delete"
-
         };
+
         confirm(options)
             .then((result: boolean) => {
                 // result can be true/false
@@ -255,9 +244,9 @@ export class CustomerListComponent implements OnInit {
             if (this.timer) {
                 clearTimeout(this.timer);
             }
-            if (args.object.loadOnDemandMode === ListViewLoadOnDemandMode[ListViewLoadOnDemandMode.None]) {
+            if (args.object.loadOnDemandMode === ListViewLoadOnDemandMode.None) {
                 this._skipRec = 0; // Because listView.loadOnDemandMode navigates to its function and makes read call
-                listView.loadOnDemandMode = ListViewLoadOnDemandMode[ListViewLoadOnDemandMode.Auto];
+                listView.loadOnDemandMode = ListViewLoadOnDemandMode.Auto;
             }
 
             this.timer = setTimeout(() => {
@@ -306,17 +295,18 @@ export class CustomerListComponent implements OnInit {
             this._skipRec = params.skip;
 
             this._recCount = this._customers.length;
+            const listView: RadListView = args.object;
 
             // If max record count is available/specified in the settings or if the number of records
             //  loaded in client reaches to max count then send an alert
             if (params.maxRecCount && (((this.scrollCount) * (params.pageSize) === params.maxRecCount)
-                && (this._recCount) === (params.maxRecCount))) {
+                && (this._recCount) === (params.maxRecCount))) {                
                 this._isLoading = false;
-                args.object.notifyLoadOnDemandFinished();
+                args.object.notifyLoadOnDemandFinished();                
                 alert("Reached max size. Increase limit.");
+                listView.loadOnDemandMode = ListViewLoadOnDemandMode.None;
             } else {
-
-                const listView: RadListView = args.object;
+
                 this._customerService.load(params)
                     .finally(() => {
                         this._isLoading = false;
@@ -328,7 +318,7 @@ export class CustomerListComponent implements OnInit {
 
                         // Setting the loadOnDemandMode to None if the last resultset from server is empty
                         if (this._customerService.dataSource._isLastResultSetEmpty) {
-                            listView.loadOnDemandMode = ListViewLoadOnDemandMode[ListViewLoadOnDemandMode.None];
+                            listView.loadOnDemandMode = ListViewLoadOnDemandMode.None;
                             this._isLoading = false;
                         }
 

diff --git a/customers/shared/customer.service.ts b/customers/shared/customer.service.ts
@@ -24,15 +24,15 @@ export class CustomerService {
     private jsdoSettings: JsdoSettings = new JsdoSettings();
 
     constructor(private _ngZone: NgZone,
-                private _progressService: ProgressService) {
-        // Basically, if a logout event is triggered by our progress service,
-        // we clear out the data source. Because we're good people
-        this._progressService.isLoggedin$.subscribe((isLoggedIn) => {
-            if (!isLoggedIn) {
-                this.dataSource = undefined;
-            }
-        });
-     }
+                private _progressService: ProgressService
+                ) { }
+
+    // Clear out the datasource when we logout because we're good people
+    // Place any other cleanup code for logging out here
+    logout() {
+        this.dataSource = undefined;
+        this._progressService.logout();
+    }
 
     getCustomerById(id: string): Customer {
         if (!id) {
@@ -72,7 +72,7 @@ export class CustomerService {
                         resolve(myData.data);
                     }, (error) => {
                         if (error.toString() === "Error: Error: HTTP Status 401 Unauthorized") {
-                            this._progressService.logout();
+                            this.logout();
                             reject(new Error("Your session is no longer valid. Please log in to continue."));
                         } else {
                             reject(new Error("Error reading records: " + error.message));
@@ -88,7 +88,7 @@ export class CustomerService {
                         resolve(myData.data);
                     }, (error) => {
                         if (error.toString() === "Error: Error: HTTP Status 401 Unauthorized") {
-                            this._progressService.logout();
+                            this.logout();
                             reject(new Error("Your session is no longer valid. Please log in to continue."));
 
                         } else {
@@ -145,7 +145,7 @@ export class CustomerService {
                     resolve();
                 }, (error) => {
                     if (error.toString() === "Error: Error: HTTP Status 401 Unauthorized") {
-                        this._progressService.logout();
+                        this.logout();
                         reject(new Error("Your session is no longer valid. Please log in to continue."));
                     } else {
                         reject(error);

diff --git a/shared/progress.service.ts b/shared/progress.service.ts
@@ -3,6 +3,7 @@ import { progress } from "@progress/jsdo-core";
 import { JsdoSettings } from "./jsdo.settings";
 
 import { Component, Injectable } from "@angular/core";
+import { RouterExtensions } from "nativescript-angular/router";
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 
 /* *************************************************************************************
@@ -30,6 +31,10 @@ export class ProgressService {
 
   private jsdosession: progress.data.JSDOSession;
 
+  constructor(
+    private _routerExtensions: RouterExtensions,
+  ) { }
+
   isLoggedIn() {
     if (this.jsdosession) {
       return true;
@@ -61,6 +66,13 @@ export class ProgressService {
     this.jsdosession = undefined;
     this.isLoggedin$.next(false);
 
+    this._routerExtensions.navigate(["/login"], {
+      clearHistory: true,
+      transition: {
+          name: "fade"
+      }
+    });
+
     return promise;
   }