Add versionHelpers and its use; clean up extra spaces (#12)

Author: JEAxero

src/app/_components/top-app/top-app.component.ts

@@ -4,6 +4,7 @@ import { interval } from "rxjs/internal/observable/interval";
 import { analyzeAndValidateNgModules } from '@angular/compiler';
 import { Subscribable, Subscription } from 'rxjs';
 import { NgZone } from '@angular/core';
+import { compareSdkPCoreVersions } from 'src/app/_helpers/versionHelpers';
 
 
 @Component({
@@ -35,37 +36,39 @@ export class TopAppComponent implements OnInit {
 
 
   constructor(private cdRef: ChangeDetectorRef,
-              private ngZone: NgZone) { 
+              private ngZone: NgZone) {
 
   }
 
   ngOnInit() {
-    
+
     this.doSubscribe();
   }
-  
+
   doSubscribe() {
 
 
-  
+
     window.PCore.onPCoreReady( (renderObj: any) => {
-    
+      // Check that we're seeing the PCore version we expect
+      compareSdkPCoreVersions();
+
       // Change to reflect new use of arg in the callback:
       const { props /*, domContainerID = null */ } = renderObj;
 
       this.ngZone.run( () => {
         this.props$ = props;
 
         this.pConn$ = this.props$.getPConnect();
-    
+
         this.sComponentName$ = this.pConn$.getComponentName();
-  
+
         this.store = window.PCore.getStore();
         this.PCore$ = window.PCore;
-  
+
         this.arChildren$ = this.pConn$.getChildren();
-  
-  
+
+
         this.bPCoreReady$ = true;
 
       });

src/app/_helpers/versionHelpers.ts

@@ -0,0 +1,46 @@
+/**
+ * versionHelpers.ts
+ *
+ * Container helper functions that can identify which version of
+ * PCore/PConnect is being run
+ */
+
+declare const PCore;
+
+export const sdkVersion = "8.6";
+
+export function is86(): boolean {
+  let bRet = false;
+  const theVer = PCore.getPCoreVersion();
+
+  if (theVer.includes("1.0") || theVer.includes("8.6")) {
+    bRet = true;
+  }
+
+  return bRet;
+}
+
+export function is87(): boolean {
+  let bRet = false;
+  const theVer = PCore.getPCoreVersion();
+
+  if (theVer.includes("8.7")) {
+    bRet = true;
+  }
+
+  return bRet;
+}
+
+export function compareSdkPCoreVersions() {
+  if (is86() && sdkVersion.includes("8.6")) {
+    // eslint-disable-next-line no-console
+    console.log(
+      `sdkVersion: ${sdkVersion} matches PCore version: ${PCore.getPCoreVersion()}`
+    );
+  } else {
+    // eslint-disable-next-line no-console
+    console.error(
+      `sdkVersion: ${sdkVersion} does NOT match PCore version: ${PCore.getPCoreVersion()}`
+    );
+  }
+}

src/app/_samples/full-portal/top-app-mashup/top-app-mashup.component.ts

@@ -12,6 +12,7 @@ import { endpoints } from '../../../_services/endpoints';
 import { UpdateWorklistService } from '../../../_messages/update-worklist.service';
 import { NgZone } from '@angular/core';
 import { ServerConfigService } from '../../../_services/server-config.service';
+import { compareSdkPCoreVersions } from '../../../_helpers/versionHelpers';
 
 
 declare global {
@@ -56,7 +57,7 @@ export class TopAppMashupComponent implements OnInit {
   props$: any;
   PCore$: any;
 
-  
+
 
   storeUnsubscribe : any;
   store: any;
@@ -81,7 +82,7 @@ export class TopAppMashupComponent implements OnInit {
 
 
 
-  constructor(private glsservice: GetLoginStatusService, 
+  constructor(private glsservice: GetLoginStatusService,
     private cdRef: ChangeDetectorRef,
     private snackBar: MatSnackBar,
     private settingsDialog: MatDialog,
@@ -90,25 +91,25 @@ export class TopAppMashupComponent implements OnInit {
     private uwservice: UpdateWorklistService,
     private ngZone: NgZone,
     private scservice: ServerConfigService
-    ) { 
+    ) {
 
 
   }
 
   ngOnInit() {
-    
+
     this.scservice.getServerConfig().then( () => {
       this.initialize();
     });
- 
+
   }
 
   ngOnDestroy() {
     this.subscription.unsubscribe();
     this.progressSpinnerSubscription.unsubscribe();
     this.resetPConnectSubscription.unsubscribe();
   }
-  
+
 
   initialize() {
     if (sessionStorage.getItem("userFullName") && sessionStorage.getItem("userPortal")) {
@@ -129,7 +130,7 @@ export class TopAppMashupComponent implements OnInit {
               this.bLoggedIn$ = true;
               this.userName$ = sessionStorage.getItem("userFullName");
             });
-        
+
             this.getPConnectAndUpdate();
 
           }
@@ -148,7 +149,7 @@ export class TopAppMashupComponent implements OnInit {
             setTimeout(() => {
               window.location.reload();
             })
-           
+
           }
 
 
@@ -157,7 +158,7 @@ export class TopAppMashupComponent implements OnInit {
     );
 
     // handle showing and hiding the progress spinner
-    this.progressSpinnerSubscription = this.psservice.getMessage().subscribe(message => { 
+    this.progressSpinnerSubscription = this.psservice.getMessage().subscribe(message => {
       this.progressSpinnerMessage = message;
 
       this.showHideProgress(this.progressSpinnerMessage.show);
@@ -183,10 +184,10 @@ export class TopAppMashupComponent implements OnInit {
       //     // update the worklist
       //     this.uwservice.sendMessage(true);
 
-          
+
       //   });
 
-       
+
       // }
 
     });
@@ -232,7 +233,7 @@ export class TopAppMashupComponent implements OnInit {
         // OATH
         oHeaders["Authorization"] = sessionStorage.getItem("oauthUser");
       }
-      
+
 
       oConfig["additionalHeaders"] = oHeaders;
 
@@ -259,8 +260,10 @@ export class TopAppMashupComponent implements OnInit {
   pConnectUpdate(oConfig: any, bootstrapShell: any) {
     bootstrapShell.bootstrap(oConfig).then( () => {
 
-        
+
       window.PCore.onPCoreReady( (renderObj) => {
+        // Check that we're seeing the PCore version we expect
+        compareSdkPCoreVersions();
 
 
         // Change to reflect new use of arg in the callback:
@@ -283,24 +286,24 @@ export class TopAppMashupComponent implements OnInit {
 
 
         this.ngZone.run( () => {
-          
+
           this.props$ = props;
-  
+
           this.pConn$ = this.props$.getPConnect();
-      
+
           this.sComponentName$ = this.pConn$.getComponentName();
-    
+
           this.store = window.PCore.getStore();
           this.PCore$ = window.PCore;
-    
+
           this.arChildren$ = this.pConn$.getChildren();
-    
-    
+
+
           this.bPCoreReady$ = true;
 
-  
-  
-        }); 
+
+
+        });
 
 
       } );
@@ -317,15 +320,15 @@ export class TopAppMashupComponent implements OnInit {
     (err) => {
       alert("error");
     }
-    
+
     );
   }
-  
+
 
   showHideProgress(bShow: boolean) {
 
     return;
-    
+
     if (bShow) {
 
       if (!this.isProgress$) {
@@ -361,7 +364,7 @@ export class TopAppMashupComponent implements OnInit {
         });
       }
 
-      
+
     }
   }
 
@@ -374,25 +377,27 @@ export class TopAppMashupComponent implements OnInit {
   doSubscribe() {
 
 
-  
+
     window.PCore.onPCoreReady( (renderObj: any) => {
-    
+      // Check that we're seeing the PCore version we expect
+      compareSdkPCoreVersions();
+
       // Change to reflect new use of arg in the callback:
       const { props /*, domContainerID = null */ } = renderObj;
 
       this.ngZone.run( () => {
         this.props$ = props;
 
         this.pConn$ = this.props$.getPConnect();
-    
+
         this.sComponentName$ = this.pConn$.getComponentName();
-  
+
         this.store = window.PCore.getStore();
         this.PCore$ = window.PCore;
-  
+
         this.arChildren$ = this.pConn$.getChildren();
-  
-  
+
+
         this.bPCoreReady$ = true;
 
       });
@@ -416,7 +421,7 @@ export class TopAppMashupComponent implements OnInit {
     //     timer.unsubscribe();
 
     //   }
-  
+
     //   });
 
  }