spitfirepm 23.8711.3 → 23.8711.5

package/dist/globals.d.ts

@@ -118,12 +118,39 @@ declare global {
                 type?: "alert-warning" | "alert-error";
             }): Promise<boolean>;
         };
+        confirm: {
+            (options: {
+                title: string;
+                ok?: string;
+                text: string;
+                type?: "alert-warning" | "alert-error";
+            }): Promise<boolean>;
+        };
+        message: {
+            (msg: string | iWebixMessage): void;
+        };
     }
     export interface iWebixSpinner {
         show: {
             (): void;
         };
     }
+    export type iWebixMessageType = 'info' | 'debug' | 'success' | 'error';
+    export interface iWebixMessage {
+        text: string;
+        type: iWebixMessageType;
+        expire: number;
+        id: string;
+    }
+    export interface iRouteHelperService {
+        _appContext: object;
+        helpers: {
+            OpenEmail: {
+                (to: string, subject: string, cc?: string, body?: string): void;
+            };
+            GenerateMessage(what: string, type: iWebixMessageType): iWebixMessage;
+        };
+    }
     export interface iPowerUXDocumentUI {
         ReallyReady: Promise<boolean>;
         app: object;

package/dist/sfRESTClient.d.ts

@@ -256,8 +256,9 @@ export declare class sfRestClient {
         Document: number;
         Unknown: number;
         Unauthenticated: number;
-        Login: number;
-        RouteWizard: number;
+        UnauthenticatedLogin: number;
+        UnauthenticatedWizard: number;
+        UnauthenticatedLink: number;
         UserAccountRecovery: number;
         DiagUtilities: number;
         PopupAdminTool: number;
@@ -661,6 +662,8 @@ export declare class sfRestClient {
     /** returns a references to the page document UI, including header */
     GetPowerUXDocumentUI(): iPowerUXDocumentUI | undefined;
     isWebix(): boolean;
+    /** requires isWebix() to be true */
+    GetPowerUXRouteHelper(): iRouteHelperService;
     IsDocExclusiveToMe(): boolean;
     static IsPowerUXPage(): boolean;
     IsPowerUXPage(): boolean;
@@ -982,6 +985,7 @@ export declare class sfRestClient {
     heartbeat(): void;
     ResetUnsavedChangesAndCloseThisWindow(): void;
     protected static _NextPingTimerID: number | undefined;
+    protected static _RepeatedPingRetryDelay: number;
     pingServer(): Promise<void>;
     static PageServerPingAttempts: number;
     static PageServerPingOK: number;
@@ -1003,7 +1007,7 @@ export declare class sfRestClient {
      * @comment Turn DevMode on or off from console: top.sfClient.exports.sfRestClient._WCC.DevMode = false; (or true)
      */
     DevMode(minVerbosity?: LoggingLevels): boolean;
-    /** Returns an object for working with a database field */
+    /** Returns a UI object for working with a database field */
     DBF2TableandTblField(source: string | JQuery<HTMLElement>): TableAndFieldInfo;
     /** returns true if Event Tracing is on (1) or if Dev Mode (0) AND the event name is not filtered out by Options.WxEventFilter
      *

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.8711.3";
+const ClientPackageVersion = "23.8711.5";
 // originally modified for typescript and linter requirements by Uladzislau Kumakou
 var LoggingLevels;
 (function (LoggingLevels) {
@@ -1867,7 +1867,7 @@ class sfRestClient {
                 console.log(`LoadUserSessionInfo(getWCC) catch`, x);
                 if (RESTClient.IsRESTErrorResponse(x)) {
                     if (x.ThisStatus === 401) {
-                        let IsLoginRelatedPage = RESTClient.IsPageOfType(RESTClient.PageTypeNames.Login);
+                        let IsLoginRelatedPage = RESTClient.IsPageOfType(RESTClient.PageTypeNames.UnauthenticatedLogin);
                         if (!IsLoginRelatedPage && RESTClient.IsPageOfType(RESTClient.PageTypeNames.UserAccountRecovery))
                             IsLoginRelatedPage = true;
                         if (!IsLoginRelatedPage && (top?.name === "Dashboard" || this.IsHomeDashboardPage())) { // do we need more here?  
@@ -2687,6 +2687,10 @@ class sfRestClient {
     isWebix() {
         return typeof self.$$ === "function";
     }
+    /** requires isWebix() to be true */
+    GetPowerUXRouteHelper() {
+        return self.$$("$layout1").$scope.app._services.routetools;
+    }
     IsDocExclusiveToMe() {
         return ((!this.IsDocumentPage()) || (sfRestClient._WCC.DataLockFlag >= "2"));
     }
@@ -2724,7 +2728,11 @@ class sfRestClient {
         if (typeof pageWanted === "string") {
             pageWanted = this.ResolveStringPageNametoPageTypeName(pageWanted);
         }
-        return (this.ResolvePageTypeName() === pageWanted);
+        const pageType = this.ResolvePageTypeName();
+        let result = (pageType === pageWanted);
+        if (!result && pageWanted === this.PageTypeNames.Unauthenticated)
+            result = ((this.ResolvePageTypeName() & pageWanted) === pageWanted);
+        return result;
     }
     IsGlobalInstance() {
         return (window.sfClient && window.sfClient === this);
@@ -2772,11 +2780,14 @@ class sfRestClient {
             case "login":
             case "Logout":
             case "loginRequired":
-                result = this.PageTypeNames.Login;
+                result = this.PageTypeNames.UnauthenticatedLogin;
                 break;
             case "arr":
             case "sscontent":
-                result = this.PageTypeNames.RouteWizard;
+                result = this.PageTypeNames.UnauthenticatedWizard;
+                break;
+            case "go":
+                result = this.PageTypeNames.UnauthenticatedLink;
                 break;
             case "dxutil":
             case "diagnostic-tools":
@@ -2807,7 +2818,8 @@ class sfRestClient {
                 result = this.PageTypeNames.RichTextEdit;
                 break;
             default:
-                console.warn("Unexpected page type: ", pageNameString);
+                console.warn("Unrecognized page type: ", pageNameString);
+                //debugger;
                 result = this.PageTypeNames.Unknown;
                 break;
         }
@@ -2827,16 +2839,21 @@ class sfRestClient {
             return sfRestClient.ResolvedPageInfo.LastResolvedPageName;
         const prefixLength = sfRestClient.__SiteRootURL.length + self.location.hostname.length + 1;
         const hashPos = fromHref.indexOf("#");
-        var pgname = fromHref.substring(prefixLength, hashPos);
-        var pgHash = fromHref.substring(hashPos);
+        let pgname = fromHref.substring(prefixLength, hashPos);
+        let pgHash = fromHref.substring(hashPos);
         if (pgHash.length > 0)
             pgname = pgHash; // for xb style
+        if (pgname.includes("ReturnUrl"))
+            pgname = this.SetNameValuePairInString(pgname, "ReturnUrl", "1");
         if (pgname.endsWith("pvp.aspx"))
             pgname = this.GetPageQueryParameterByName("vpg");
-        if (pgname.toLowerCase().includes("arr.aspx"))
+        const lowerPG = pgname.toLowerCase();
+        if (lowerPG.includes("arr.aspx"))
             pgname = "arr"; // maps to RouteWizard
-        if (pgname.toLowerCase().includes("sscontent.aspx"))
+        else if (lowerPG.includes("sscontent.aspx"))
             pgname = "sscontent"; // maps to RouteWizard
+        else if (lowerPG.includes("go.aspx"))
+            pgname = "go"; // external
         if (pgname.indexOf("/") >= 0)
             pgname = pgname.substring(pgname.lastIndexOf("/") + 1);
         if (pgname.indexOf("?") >= 0)
@@ -2961,7 +2978,7 @@ class sfRestClient {
             result = sfRestClient._WCC.Project;
         else {
             const pageName = this.ResolvePageName();
-            if (["executiveDashboard", "catalog", "home", "pivot", "diagnostic-tools"].find(el => el === pageName))
+            if (["executiveDashboard", "catalog", "home", "pivot", "diagnostic-tools", "go"].find(el => el === pageName))
                 noResultOK = true;
         }
         if (!result && !noResultOK)
@@ -5303,12 +5320,22 @@ class sfRestClient {
                 sfRestClient._NextPingTimerID = setTimeout(() => { RESTClient.pingServer(); /*  wait for hub */ }, 123);
                 return;
             }
-            if (this.IsPageOfType(this.PageTypeNames.Login)) {
+            const isWebix = RESTClient.isWebix();
+            if (this.IsPageOfType(this.PageTypeNames.Unauthenticated)) {
                 if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
-                    console.log("pingServer() Log in pending (ignored)");
+                    console.log(`pingServer() Log in pending (ignored ${sfRestClient._RepeatedPingRetryDelay})`);
                 this.CheckForSystemNotification();
-                sfRestClient._NextPingTimerID = setTimeout(() => { RESTClient.pingServer(); /*  wait for login */ }, 2345);
-                //sfRestClient._NextPingTimerID = setTimeout("RESTClient.pingServer(); // wait for login ", 2345);
+                const returnTo = RESTClient.GetPageQueryParameterByName("ReturnUrl");
+                if (returnTo) {
+                    const m = RESTClient.GetPowerUXRouteHelper().helpers.GenerateMessage("FYI:The requested resource requires authentication...", "debug");
+                    if (isWebix) {
+                        self.webix?.message(m);
+                    }
+                    else
+                        RESTClient.DisplayUserNotification(m.text);
+                }
+                sfRestClient._RepeatedPingRetryDelay++;
+                sfRestClient._NextPingTimerID = setTimeout(() => { RESTClient.pingServer(); /*  wait for login */ }, 2345 + (sfRestClient._RepeatedPingRetryDelay * 555));
                 return;
             }
             const isDocumentPage = RESTClient.IsDocumentPage();
@@ -5324,6 +5351,7 @@ class sfRestClient {
                 sfRestClient._NextPingTimerID = setTimeout(() => { RESTClient.pingServer(); /*  wait for doc context */ }, 345);
                 return;
             }
+            sfRestClient._RepeatedPingRetryDelay = 0;
             var retryInterval = (sfRestClient._Options.BasicPingServerInterval * (1.1 + Math.random()));
             var $ALERT;
             var ActionAfterAlert = "";
@@ -5518,16 +5546,34 @@ class sfRestClient {
                                 console.log("pingServer() NAK persists....");
                                 const AuthenticationMessage = sfRestClient.PageNotificationCount < 2 ? 'Authentication required' : 'Lost authentication.';
                                 RESTClient.DisplayUserNotification(AuthenticationMessage, 65432);
-                                if (self.webix)
-                                    self.webix
-                                        .alert({ title: "Connection Check",
-                                        ok: 'Dismiss',
-                                        text: `Authentication ${sfRestClient.PageNotificationCount < 2 ? 'Required' : 'Revoked'}. <br/> Returning to login page!`,
-                                        type: "alert-warning",
-                                    }).then((r) => {
-                                        this.NavigateToLogout("auth-lost-immediate");
-                                    });
-                                this.NavigateToLogout("auth-lost", 9753);
+                                let defaultLogoutOnTimer = true;
+                                if (self.webix) {
+                                    if (1 === 1) { //RESTClient.DevMode()
+                                        self.webix
+                                            .confirm({ title: "Connection Check",
+                                            ok: 'Logout',
+                                            text: `Authentication ${sfRestClient.PageNotificationCount < 2 ? 'Required' : 'Revoked'}. <br/> Returning to login page!`,
+                                            type: "alert-warning",
+                                        }).then((r) => {
+                                            if (r)
+                                                this.NavigateToLogout("auth-lost-immediate");
+                                            else
+                                                self.webix?.message("ok...");
+                                        });
+                                        defaultLogoutOnTimer = false;
+                                    }
+                                    else
+                                        self.webix
+                                            .alert({ title: "Connection Check",
+                                            ok: 'Dismiss',
+                                            text: `Authentication ${sfRestClient.PageNotificationCount < 2 ? 'Required' : 'Revoked'}. <br/> Returning to login page!`,
+                                            type: "alert-warning",
+                                        }).then((r) => {
+                                            this.NavigateToLogout("auth-lost-immediate");
+                                        });
+                                }
+                                if (defaultLogoutOnTimer)
+                                    this.NavigateToLogout("auth-lost", 19753);
                             }
                             else {
                                 responseText = "NAK:Rejuvinated";
@@ -5696,12 +5742,14 @@ class sfRestClient {
      */
     DevMode(minVerbosity) {
         let result = top?.sfClient?.GetPageContextValue("DevMode", false);
+        if (!result && !location.hostname.includes("."))
+            result = true;
         if (minVerbosity && result) {
             result = (sfRestClient._Options.LogLevel >= minVerbosity);
         }
         return result;
     }
-    /** Returns an object for working with a database field */
+    /** Returns a UI object for working with a database field */
     DBF2TableandTblField(source) {
         var result = { isValid: false, table: "", field: "", dbf: "", isRO: false };
         let dbf = "";
@@ -5819,8 +5867,9 @@ class sfRestClient {
             Document: 1024,
             Unknown: 8092,
             Unauthenticated: 16384,
-            Login: 16385,
-            RouteWizard: 16386,
+            UnauthenticatedLogin: 16385,
+            UnauthenticatedWizard: 16386,
+            UnauthenticatedLink: 16388,
             UserAccountRecovery: 16387,
             DiagUtilities: 32768,
             PopupAdminTool: 131072,
@@ -6066,6 +6115,7 @@ sfRestClient.ResolvedIntlFormat = {
     NumericGroupSeparator: ","
 };
 sfRestClient._NextPingTimerID = undefined;
+sfRestClient._RepeatedPingRetryDelay = 0;
 sfRestClient.PageServerPingAttempts = 0;
 sfRestClient.PageServerPingOK = 0;
 sfRestClient.PageServerPingFailRunCount = 0;