spitfirepm 23.8774.2 → 23.8780.2

package/dist/sfRESTClient.d.ts

@@ -356,7 +356,7 @@ export declare class sfRestClient {
      * Get Display Value using DV-Name and key value, with 0 to 4 dependencies.
      * @param displayName the name of a display value rule (eg sfUser, RoleName, etc)
      * @param keyValue the primary or most significant key
-     * @param dependsOn optional array of context values (multi-part key); 0 to 4 elements allowed
+     * @param dependsOn optional array of context values (multi-part key); 0 to 4 elements allowed; hint: use 'empty' for an empty value
      * @param autoVary force bypass of cache
      * @returns Promise for String
      */
@@ -487,6 +487,7 @@ export declare class sfRestClient {
      * @param locationHash when omitted, location.toString is used
     */
     LoadUserSessionInfo(bypassCache?: boolean, newHref?: string): Promise<WCCData>;
+    IsLoginRelatedPage(): boolean;
     protected static _SessionClientGetWCC: _SessionClientGetWCCShare | null;
     protected static _SessionClientGetUCFKMap: JQueryXHR | null;
     private static _MakeFakeWCC;
@@ -790,6 +791,7 @@ export declare class sfRestClient {
      * @param hashCode help with getting freshest
     */
     DisplaySysNotification(hashCode: string | number, timeOutMS?: number): Promise<JQuery<HTMLElement>>;
+    private lastNotificationCheckPromise;
     /** Checks backend for a new system notification and displays it */
     CheckForSystemNotification(): void;
     private static lastNotificationCheck;
@@ -993,6 +995,7 @@ export declare class sfRestClient {
      * Called by the global instance to connect to SignalR
      */
     protected static StartSignalRClientHub(): void;
+    NavigateToServerUnavailable(reason: string, delayMs?: number): void;
     NavigateToLogout(reason: string, delayMs?: number): void;
     private _navigateToLogoutTimerEvent;
     protected static LogoutPageURL(mValue: string): string;

package/dist/sfRESTClient.js

@@ -8,7 +8,7 @@ const BrowserExtensionChecker_1 = require("./BrowserExtensionChecker");
 const RESTClientBase = require("./APIClientBase"); // avoid conflict with same in SwaggerClient when loaded by classic UI
 const string_extensions_1 = require("./string.extensions");
 //import {dialog}    from "jquery-ui";
-const ClientPackageVersion = "23.8774.2";
+const ClientPackageVersion = "23.8780.2";
 // originally modified for typescript and linter requirements by Uladzislau Kumakou
 var LoggingLevels;
 (function (LoggingLevels) {
@@ -848,7 +848,7 @@ class sfRestClient {
      * Get Display Value using DV-Name and key value, with 0 to 4 dependencies.
      * @param displayName the name of a display value rule (eg sfUser, RoleName, etc)
      * @param keyValue the primary or most significant key
-     * @param dependsOn optional array of context values (multi-part key); 0 to 4 elements allowed
+     * @param dependsOn optional array of context values (multi-part key); 0 to 4 elements allowed; hint: use 'empty' for an empty value
      * @param autoVary force bypass of cache
      * @returns Promise for String
      */
@@ -1806,7 +1806,7 @@ class sfRestClient {
      * @param locationHash when omitted, location.toString is used
     */
     LoadUserSessionInfo(bypassCache, newHref) {
-        var RESTClient = this;
+        const RESTClient = this;
         var api;
         var apiResult = null;
         sfRestClient._z.WCCLoaded = false; // required to make CheckPermit() (etc) wait for this to complete
@@ -1868,13 +1868,7 @@ class sfRestClient {
                 console.log(`LoadUserSessionInfo(getWCC) catch`, x);
                 if (RESTClient.IsRESTErrorResponse(x)) {
                     if (x.ThisStatus === 401) {
-                        let IsLoginRelatedPage = sfRestClient.NextHrefIsPending && sfRestClient.NextHrefIsUnauthenticated;
-                        if (!IsLoginRelatedPage && RESTClient.IsPageOfType(RESTClient.PageTypeNames.UnauthenticatedLogin))
-                            IsLoginRelatedPage = true;
-                        if (!IsLoginRelatedPage && RESTClient.IsPageOfType(RESTClient.PageTypeNames.UserAccountRecovery))
-                            IsLoginRelatedPage = true;
-                        if (!IsLoginRelatedPage && RESTClient.IsPageOfType(RESTClient.PageTypeNames.UnauthenticatedDefault))
-                            IsLoginRelatedPage = true;
+                        let IsLoginRelatedPage = RESTClient.IsLoginRelatedPage();
                         if (!IsLoginRelatedPage && (top?.name === "Dashboard" || this.IsHomeDashboardPage())) { // do we need more here?  
                             // goal is to not redirect document pages, etc
                             if (sfRestClient._Options.LogLevel >= LoggingLevels.None)
@@ -1888,6 +1882,17 @@ class sfRestClient {
             });
         });
     }
+    IsLoginRelatedPage() {
+        const RESTClient = this;
+        let IsLoginRelatedPage = sfRestClient.NextHrefIsPending && sfRestClient.NextHrefIsUnauthenticated;
+        if (!IsLoginRelatedPage && RESTClient.IsPageOfType(RESTClient.PageTypeNames.UnauthenticatedLogin))
+            IsLoginRelatedPage = true;
+        if (!IsLoginRelatedPage && RESTClient.IsPageOfType(RESTClient.PageTypeNames.UserAccountRecovery))
+            IsLoginRelatedPage = true;
+        if (!IsLoginRelatedPage && RESTClient.IsPageOfType(RESTClient.PageTypeNames.UnauthenticatedDefault))
+            IsLoginRelatedPage = true;
+        return IsLoginRelatedPage;
+    }
     static _MakeFakeWCC() {
         let FakeWCC = new WCCData();
         FakeWCC.AdminLevel = 0;
@@ -3731,7 +3736,14 @@ class sfRestClient {
         const thisRestClient = this;
         if ((Date.now() - sfRestClient.lastNotificationCheck) < 34567)
             return;
-        SystemAPI.getSystemNotification("")
+        if (thisRestClient.lastNotificationCheckPromise !== null) {
+            if (thisRestClient.DevMode())
+                console.log("Prior notification check still pending...");
+            return;
+        }
+        ;
+        thisRestClient.lastNotificationCheckPromise = SystemAPI.getSystemNotification("");
+        thisRestClient.lastNotificationCheckPromise
             .then((theNotification) => {
             if (theNotification)
                 thisRestClient.DisplaySysNotification(theNotification.sfHashCode().toString());
@@ -3744,6 +3756,8 @@ class sfRestClient {
             if ("status" in reason && reason.status > 500) {
                 // DisplayThisNotification() requiers a functional server
                 if (thisRestClient.isWebix()) {
+                    if (this.IsLoginRelatedPage())
+                        thisRestClient.NavigateToServerUnavailable(showMsg);
                     const m = {
                         text: showMsg,
                         type: 'debug',
@@ -3758,6 +3772,7 @@ class sfRestClient {
             }
         })
             .finally(() => {
+            thisRestClient.lastNotificationCheckPromise = null;
             sfRestClient.lastNotificationCheck = Date.now();
         });
     }
@@ -5337,6 +5352,11 @@ class sfRestClient {
             });
         }
     }
+    NavigateToServerUnavailable(reason, delayMs = 222) {
+        const RESTClient = this;
+        const url = `${RESTClient._SiteRootURL}/wx/#!/server-unavailable`;
+        setTimeout(`top.location="${url}";`, delayMs);
+    }
     NavigateToLogout(reason, delayMs = 222) {
         if (this._navigateToLogoutTimerEvent) {
             console.log(`${new Date().toSFLogTimeString()} NavigateToLogout already pending, redundant ${reason} ignored...`);
@@ -6048,6 +6068,7 @@ class sfRestClient {
         this.rxPopWhatURL = new RegExp(/javascript:(?<popWhat>PopMSWindowTool|PopXLTool|PopAuditTool|popWin|popNewDoc)\(['"`](?<URL>.+?)[`'"](,|\))(['"`](?<TARGET>.+?)[`'"](,|\)))?(['"`](?<OPTIONS>.+?)[`'"](,|\)))?/gmi);
         this.rxPopWindowName = new RegExp(/javascript:(?<popWhat>popWin)\(['"`](?<URL>.+?)[`'"],\s?['"`](?<WindowName>.+?)[`'"],.*\)/gmi);
         this.rxOfficeLink = new RegExp(/(?<popWhat>OfficeLink.application|(PopXLTool|PopFVC|PopMSWindowTool|PopAuditTool)\()/gmi);
+        this.lastNotificationCheckPromise = null;
         this._LookupViewPortAdjustments = { outsidExtraW: 48, outsidExtraH: 64, vpExtraW: 16, vpExtraH: 32, frameExtraH: 8 };
         //var $LookupFrame = $($LookupDialog.children("iframe").get(0))
         this.DialogViewPortAdjustments = { outsidExtraW: 65, outsidExtraH: 64, vpExtraW: 16, vpExtraH: 32, frameExtraH: 8 };