spitfirepm 1.20.91 → 1.20.95

package/dist/sfRESTClient.js

@@ -1,21 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sfRestClient = exports.DataModelCollection = exports.DataModelRow = exports.WCCData = exports.NVPair = exports.LoggingLevels = void 0;
+exports.sfRestClient = exports.DataModelCollection = exports.InvokeOptions = exports.DataModelRow = exports.WCCData = exports.NVPair = exports.LoggingLevels = void 0;
 //import  { sfApplicationRootPath } from "./string.extensions";
 const SwaggerClients_1 = require("./SwaggerClients");
 const _SwaggerClientExports = require("./SwaggerClients");
 const $ = require("jquery");
 const BrowserExtensionChecker_1 = require("./BrowserExtensionChecker");
 //import {dialog}    from "jquery-ui";
-const ClientPackageVersion = "1.20.91";
-//export type GUID = string //& { isGuid: true };
-/* eslint-disable prefer-template */
-/* eslint-disable no-extend-native */
-/* eslint-disable prefer-spread */
-/* eslint-disable no-undef */
-/* eslint-disable prefer-arrow-callback */
-/* eslint-disable vars-on-top */
-/* eslint-disable no-var */
+const ClientPackageVersion = "1.20.95";
 // original script created by Stan York and modified for typescript and linter requirements by Uladzislau Kumakou
 var LoggingLevels;
 (function (LoggingLevels) {
@@ -55,7 +47,7 @@ class PartStorageData {
         PartStorageData._LoadedParts.set(this._ReferenceKey, this);
         this._InitializationResultPromise = null;
         if (!PartStorageData._SiteURL) {
-            var ApplicationPath = window.location.pathname.substr(1, window.location.pathname.substr(1).indexOf("/"));
+            var ApplicationPath = window.__HTTPApplicationName();
             PartStorageData._SiteURL = `${window.location.origin}/${ApplicationPath || 'sfPMS'}`;
         }
     }
@@ -215,6 +207,10 @@ class DataModelRow {
 }
 exports.DataModelRow = DataModelRow;
 ;
+class InvokeOptions {
+}
+exports.InvokeOptions = InvokeOptions;
+;
 class DataModelCollection {
 }
 exports.DataModelCollection = DataModelCollection;
@@ -343,7 +339,7 @@ class sfRestClient {
         this.EmptyKey = "00000000-0000-0000-0000-000000000000";
         this._CachedDVRequests = new Map();
         this.ThisInstanceID = sfRestClient.InstanceSerialNumberSource++;
-        var ApplicationPath = window.location.pathname.substr(1, window.location.pathname.substr(1).indexOf("/"));
+        var ApplicationPath = window.__HTTPApplicationName();
         this._SiteURL = `${window.location.origin}/${ApplicationPath || 'sfPMS'}`;
         this._SiteRootURL = `/${ApplicationPath || 'sfPMS'}`;
         this.exports = _SwaggerClientExports;
@@ -372,6 +368,10 @@ class sfRestClient {
                 console.log(`sfClient#${this.ThisInstanceID} ${this.ClientVersion}; Window[${window.name}];  ${ThisIsGlobal ? "Global" : ""}`);
             if (ThisIsGlobal) {
                 var RESTClient = this;
+                if (!$.hasData)
+                    $.fn.extend({ hasData: function (name) {
+                            return this.data(name) !== undefined;
+                        } });
                 sfRestClient.ExternalToolsLoadedPromise = RESTClient.AssureJQUITools($("div").first());
                 if ($("title").text().length === 0)
                     $("title").text("Spitfire PM");
@@ -1175,6 +1175,53 @@ class sfRestClient {
         // });
         return forElement;
     }
+    AdjustFluidDialog(dialog, $this) {
+        if (!$this)
+            $this = dialog.closest("ui-dialog");
+        var $DialogContent = $this.find(".ui-dialog-content");
+        // if fluid option == true
+        if (dialog.options.fluid) {
+            dialog.option("width", "auto"); // temp...to calc required size
+            var wWidth = $(window).width();
+            var dWidth = $DialogContent.width();
+            // check window width against dialog width
+            if (wWidth < (dWidth + 50)) {
+                // keep dialog from filling entire screen
+                $this.css("max-width", "90%");
+            }
+            else {
+                // fix maxWidth bug
+                dialog.option("width", dWidth);
+            }
+            //reposition dialog
+            dialog.option("position", dialog.options.position);
+        }
+    }
+    UpdateFluidDialogs() {
+        var RESTClient = this;
+        var $visible = $(".ui-dialog:visible");
+        if ($visible.length === 0)
+            $visible = self.top.$(".ui-dialog:visible");
+        // each open dialog
+        $visible.each(function () {
+            var $this = $(this);
+            var dialog = $this.find(".ui-dialog-content").data("ui-dialog");
+            RESTClient.AdjustFluidDialog(dialog, $this);
+        });
+    }
+    AutoSizeDialog($D) {
+        var RESTClient = this;
+        var dialogOptions = {
+            width: 400,
+            minWidth: 250,
+            height: "auto",
+            fluid: true
+        };
+        $D.dialog(dialogOptions);
+        //$D.dialog("options","width", $D.width());
+        RESTClient.UpdateFluidDialogs();
+        return $D;
+    }
     /** checks with server up to 5 times a second.  promise resolves when task has ended or callback returns true;
      * @param taskKey guid key for task
      * @param sessionClient optional existing SessionClient
@@ -1209,6 +1256,97 @@ class sfRestClient {
             result(taskResult);
         });
     }
+    ExportCompetitiveBidData() {
+        var PostBackArgs = "";
+        var TemplateTypeCode = "BA";
+        var RESTClient = this;
+        console.log(`sfExportCobra(${TemplateTypeCode}) ${PostBackArgs}`);
+        $("DIV#divDialogExportGrid").remove();
+        var $Box = $("<div id='divDialogExportGrid' />");
+        var $Dialog;
+        $Dialog = $Box.load(`${RESTClient._SiteURL}/ajhx/ExportGridDialog.html`, function PopFromParentDialogLoaded() {
+            // after loaded
+            var $TemplateDocument = $Box.find("#txtTemplate");
+            var $ButtonPane = $Box.parent().find(".ui-dialog-buttonpane");
+            var $CancelBTN = $ButtonPane.find("#btnDismiss");
+            RESTClient.sfAC($TemplateDocument, "TemplateList", TemplateTypeCode);
+            $TemplateDocument.autocomplete("option", "minLength", 0).autocomplete("option", "delay", 200);
+            $TemplateDocument.data("acPostbackKey", false); // prevent Auto complete from stuffing the key into our input field
+            $TemplateDocument.on("sfAutoCompletedKV sfLookup.Stored", function (e, kv) {
+                console.log(`ExportGrid Template-on:${e.type} = ${kv}`);
+                $TemplateDocument.data("TemplateKey", kv);
+                PostBackArgs = kv;
+            }).on("sfAC.response", function (e, choices) {
+                if (choices.content.length === 1) {
+                    var newChoice = choices.content[0];
+                    $TemplateDocument.val(newChoice.value).data("acKey", newChoice.key).data("acChange", true);
+                }
+            }).on("focus", () => {
+                $TemplateDocument.autocomplete("search", $TemplateDocument.val());
+                $TemplateDocument.trigger("select");
+            });
+            $TemplateDocument.trigger("focus");
+            RESTClient.AutoSizeDialog($Dialog);
+            return false;
+        }).dialog({
+            title: "Export Competitive Bid Data...",
+            close: function () { $Dialog.dialog('destroy'); }
+        });
+        var DialogButtons = [{
+                text: "Export",
+                "id": "btnExport",
+                click: function () {
+                    RESTClient.GADialogEvent("Completed", "ExportCobra");
+                    $Dialog.dialog("close");
+                    RESTClient.HeyPleaseWait();
+                    var api = new _SwaggerClientExports.ExcelToolsClient();
+                    api.getCobraExport(PostBackArgs, RESTClient.GetPageContextValue("dsCacheKey")).then(crt => {
+                        RESTClient.WaitForTask(crt).then((crtResult) => {
+                            RESTClient.ClearPleaseWaitDialog();
+                            if (crtResult.ThisReason.indexOf("Failed!") >= 0) {
+                                RESTClient.DisplayUserNotification(crtResult.ThisReason);
+                            }
+                            else {
+                                console.log(crtResult.ThisReason);
+                                var fn = "CobraExport.xlsx";
+                                if (crtResult.ThisReason?.startsWith("{")) {
+                                    var result = JSON.parse(crtResult.ThisReason);
+                                    if (result.fn)
+                                        fn = result.fn;
+                                }
+                                RESTClient.DisplayUserNotification();
+                                window.open(`${top.sfClient._SiteURL}/sfImg.ashx/CRT/${crt}/${fn}`);
+                            }
+                        });
+                    });
+                    //setTimeout("top.sfClient.ClearPleaseWaitDialog(); if (top.sfClient.ClearInClientSidePostbackFlag) top.sfClient.ClearInClientSidePostbackFlag(); //ExportCobra", 2345);
+                }
+            }, {
+                "id": "btnDismiss",
+                text: "Dismiss",
+                click: function () {
+                    $Dialog.dialog("close");
+                }
+            }];
+        $Dialog.dialog('option', 'buttons', DialogButtons);
+        //return false; // do not return false, IE anchor href issue
+    }
+    HeyPleaseWait() {
+        // this variant applies inside a frame
+        if (sfRestClient.$CurrentPleaseWaitDialog && sfRestClient.$CurrentPleaseWaitDialog.is(":visible"))
+            return sfRestClient.$CurrentPleaseWaitDialog;
+        sfRestClient.$CurrentPleaseWaitDialog = this.jqAlert("Please wait...", "Working", "ui-icon-locked").addClass("sfPleaseWait");
+        var DialogButtons = {};
+        if (DialogButtons)
+            sfRestClient.$CurrentPleaseWaitDialog.dialog('option', 'buttons', DialogButtons);
+        return sfRestClient.$CurrentPleaseWaitDialog;
+    }
+    ClearPleaseWaitDialog() {
+        if (sfRestClient.$CurrentPleaseWaitDialog) {
+            sfRestClient.$CurrentPleaseWaitDialog.dialog("close");
+            sfRestClient.$CurrentPleaseWaitDialog = null;
+        }
+    }
     /**
      * Converts traditional .NET date formats to Webix formats
      * @param dotNetFormat something like d or m/d/yyyy
@@ -1550,16 +1688,16 @@ class sfRestClient {
                 var UseID;
                 var url = sfRestClient._Options.PopNewDocLegacyURL;
                 if (options?.indexOf("&UseID")) {
-                    UseID = options.substr(options?.indexOf("&UseID") + 7, 36);
+                    UseID = options.substring(options?.indexOf("&UseID") + 7, 36);
                 }
                 else
-                    UseID = await this.NewGuid(); // todo: fix this!!!
+                    UseID = await this.NewGuid();
                 if (sfRestClient._Options.PopDocForceXBUI)
                     url = sfRestClient._Options.PopNewDocXBURL;
                 url = url.sfFormat(thisRestClient._SiteURL, dtk, project, options);
                 if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
                     console.log("PopNewDoc opening {0} DTK {1} using {2}".sfFormat(UseID, dtk, url));
-                var TargetTab = UseID.substr(UseID.lastIndexOf("-") + 1).toLowerCase();
+                var TargetTab = UseID.substring(UseID.lastIndexOf("-") + 1).toLowerCase();
                 //todo: determine if we need the "how many tabs" logic and dialog
                 if (!window) {
                     console.error("PopNewDoc() Must be called from a browser window");
@@ -1603,7 +1741,7 @@ class sfRestClient {
                 url = url.sfFormat(thisRestClient._SiteURL, id);
                 if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
                     console.log("PopDoc opening DMK {0} DTK {1} using {2}".sfFormat(id, thisDocType, url));
-                var TargetTab = url.substr(url.lastIndexOf("-") + 1).toLowerCase();
+                var TargetTab = url.substring(url.lastIndexOf("-") + 1).toLowerCase();
                 //todo: determine if we need the "how many tabs" logic and dialog
                 if (!window) {
                     console.error("PopDoc() Must be called from a browser window");
@@ -1964,11 +2102,11 @@ class sfRestClient {
         if (pgHash.length > 0)
             pgname = pgHash; // for xb style
         if (pgname.indexOf("/") >= 0)
-            pgname = pgname.substr(pgname.lastIndexOf("/") + 1);
+            pgname = pgname.substring(pgname.lastIndexOf("/") + 1);
         if (pgname.indexOf("?") >= 0)
-            pgname = pgname.substr(0, pgname.indexOf("?"));
+            pgname = pgname.substring(0, pgname.indexOf("?"));
         if (pgname.indexOf(".") >= 0)
-            pgname = pgname.substr(0, pgname.indexOf("."));
+            pgname = pgname.substring(0, pgname.indexOf("."));
         return pgname;
     }
     XBVariantOfPageName(classicPageName) {
@@ -2084,7 +2222,7 @@ class sfRestClient {
                 rItem = `Unexpected ${typeof rItemRaw}`;
             sortPad = ((isGuid || (index.endsWith("ID")) || isJS) ? "" : " ");
             if (isJS) {
-                rItem = `<i class="fas fa-boxes sfShowPointer" data-js="${rItem.substr(11)}"></i>`;
+                rItem = `<i class="fas fa-boxes sfShowPointer" data-js="${rItem.substring(11)}"></i>`;
             }
             else if (isGuid && rItem !== RESTClient.EmptyKey) {
                 rItem = `${rItem} &nbsp;<i class="far fa-clipboard clsEnabledImgBtn" title="Copy" data-text="${rItem}"></i>`;
@@ -2170,12 +2308,14 @@ class sfRestClient {
      *
      * Actions Supported
      * - vPgPopup(...)
-     * - PopDoc(...)
-     * - PopTXHistory(...)
+     * - PopDoc(...) and PopNewDoc
+     * - PopTXHistory(...) and PopBFAHistory()
      * - Nav To (dcmodules and admin tools)
      */
-    InvokeAction(actionString, rowData) {
+    InvokeAction(actionString, rowData, options) {
         var ActionString = "";
+        var UseNewTabWindow = false;
+        var RESTClient = this;
         if (typeof actionString === "string")
             ActionString = actionString;
         if (actionString instanceof _SwaggerClientExports.MenuAction) {
@@ -2201,6 +2341,7 @@ class sfRestClient {
                     ActionOptions = "&" + ActionString.substring(ActionString.indexOf("?") + 1);
                 }
                 ActionString = `javascript:vPgPopup('v/LibView.aspx', '${ActionOptions}', 850, 950);`; // ... w,h
+                UseNewTabWindow = true;
             }
             else {
                 this.ModalDialog(ActionString, undefined, undefined, window);
@@ -2220,7 +2361,12 @@ class sfRestClient {
                 var ActionArgs = this.ExpandActionMarkers(match.groups.args, rowData);
                 if (ActionArgs && ActionArgs.indexOf("&Project") < 0)
                     ActionArgs += "&Project=" + this.GetPageProjectKey();
-                this.VModalPage(match.groups.vpgName, ActionArgs, parseInt(match.groups.width), parseInt(match.groups.height), match.groups.default);
+                if (UseNewTabWindow) {
+                    var url = `${RESTClient._SiteRootURL}/pvp.aspx?vpg=${match.groups.vpgName}${ActionArgs}`;
+                    self.open(url, match.groups.vpgName);
+                }
+                else
+                    this.VModalPage(match.groups.vpgName, ActionArgs, parseInt(match.groups.width), parseInt(match.groups.height), match.groups.default);
             }
             else {
                 console.warn("InvokeAction::VPg failed match", ActionString);
@@ -2254,17 +2400,56 @@ class sfRestClient {
                 console.warn("InvokeAction::PopNewDoc failed match", actionString);
             }
         }
-        else if (ActionString.indexOf("PopTXHistory(") >= 0) {
+        else if (ActionString.indexOf("PopTXHistory(") + ActionString.indexOf("PopBFAHistory(") >= 0) {
             console.warn("InvokeAction::TXH not really done", ActionString);
+            var rx;
+            var vpgName;
+            var Project = this.GetPageProjectKey();
+            var Task = "%", Acct = "%", Period = "%";
+            var BFAMode = false;
+            var mode = "";
+            var PageDSK = "";
+            if (!options)
+                options = { ByTask: true, ByAcct: true };
+            if (ActionString.indexOf("PopBFAHistory(") >= 0) {
+                rx = /PopBFAHistory\(['"](?<PGDSK>.*?)['"],\s*?(?<project>.*?),\s*?(?<task>.*?),\s*?(?<acct>.*?),['"](?<mode>.*?)['"]\s*?\)/gm;
+                vpgName = "BFANotes";
+                BFAMode = true;
+            }
+            else {
+                // this rx does not remove quotes from period
+                rx = /PopTXHistory\(\\?['"](?<pgname>.*?)\\?['"],\s*?(?<task>.*?),\s*?(?<acct>.*?) (,\s*?(?<period>.*?)|\));/gm;
+                vpgName = "TranHistory";
+            }
+            var match = rx.exec(ActionString);
+            if (match && match.groups) {
+                // we ignore the task and account in the invoice action string - see InvokeOptions
+                if (match.groups.project)
+                    Project = match.groups.project;
+                if (match.groups.mode)
+                    mode = match.groups.mode;
+                if (match.groups.PGDSK)
+                    PageDSK = match.groups.PGDSK;
+                if (match.groups.period)
+                    Period = match.groups.period;
+            }
+            var ModalOptions;
+            if (BFAMode) {
+                ModalOptions = `&project=${Project}&ds=1&task=${Task}&acct=${Acct}&period=${Period}`;
+            }
+            else {
+                ModalOptions = `&project=${Project}&task=${Task}&acct=${Acct}&period=%`;
+            }
             // sample action: javascript:PopTXHistory(\"TranHistory\", ifByTask() ? Row.task.trim() : \"%\", ifByAcct() ? Row.acct.trim() :\"%\" );
+            // sample javascript:PopBFAHistory('$$PDSID$$',row.Project, ifByTask() ? Row.task.trim() : \"%\", ifByAcct() ? Row.acct.trim() :\"%\" ,'PA');
             // sample http://stany2017/SFPMS/pvp.aspx?vpg=TranHistory&project=GC003&ds=1f573cce-ddd8-4463-a6a6-40c641357f47_ProjectCA_dsData&task=01000&acct=%25&period=%
-            var Project = this.GetPageProjectKey();
-            var Task = "%", Acct = "%";
-            if (rowData && rowData["task"])
+            if (options && options.ByTask && rowData && rowData["task"])
                 Task = rowData["task"];
-            if (rowData && rowData["acct"])
+            if (options && options.ByAcct && rowData && rowData["acct"])
                 Acct = rowData["acct"];
-            this.VModalPage("TranHistory", "&project={0}&task={1}&acct={2}&period=%".sfFormat(Project, Task, Acct), 999, 444, undefined);
+            if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
+                console.log(`InvokeAction: VModalPage(${vpgName})`, ModalOptions);
+            this.VModalPage(vpgName, ModalOptions, 999, 444, undefined);
         }
         else if (ActionString.indexOf("PopXLTool(") >= 0 ||
             ActionString.indexOf("PopFVC(") >= 0 ||
@@ -2284,7 +2469,7 @@ class sfRestClient {
                 var rx = /javascript:(PopMSWindowTool|PopXLTool|PopAuditTool)\(['"`](?<URL>.*)[`'"]\)/gm;
                 var match = rx.exec(ActionString);
                 if (match && match.groups) {
-                    targetURL = match.groups.URL;
+                    targetURL = this.ExpandActionMarkers(match.groups.URL, rowData);
                 }
                 else
                     console.warn("InvokeAction() could not parse", actionString);
@@ -2295,9 +2480,12 @@ class sfRestClient {
             console.warn("InvokeAction::tools not really done", ActionString);
             top.location.href = ActionString;
         }
+        else if (ActionString.startsWith("javascript:sfExportCompetitiveBidData")) {
+            this.ExportCompetitiveBidData();
+        }
         else if (ActionString.startsWith("javascript:")) {
             try {
-                eval(ActionString.substr(11));
+                eval(ActionString.substring(11));
             }
             catch (ex) {
                 console.warn("InvokeAction::failed javascript ", ActionString, ex.message);
@@ -2312,10 +2500,14 @@ class sfRestClient {
             console.warn("InvokeAction() could not handle ", actionString);
         }
     }
+    /** Creates an exchange token and calls OpenWindowsLinkHelper() */
     FollowLinkViaSFLink(targetURL, afterOpenArg, autoCloseDoc) {
         var RESTClient = this;
         if (targetURL.endsWith("&Project="))
             targetURL += RESTClient.GetPageProjectKey();
+        console.log(`sfLink(${targetURL})`);
+        if (targetURL.indexOf("$$") > 0)
+            targetURL = this.ExpandActionMarkers(targetURL);
         if (!top?.ClickOnceExtension.HasDotNetApplicationExtension()) {
             var RetryLater = `FollowLinkViaSFLink('${targetURL}'`;
             if (typeof afterOpenArg !== "undefined") {
@@ -2380,7 +2572,7 @@ class sfRestClient {
     /**
      *
      * @param et token passed to sfLink
-     * @param afterOpenArg  boolean/true: closes document page; false/0: posts back default refresh; ['e','a']: posts back e with a;
+     * @param afterOpenArg  boolean/true: closes document page; false/0: posts back default refresh; ['e','a']: posts back e with a; callback function is passed et
      * @param autoCloseDoc
      */
     OpenWindowsLinkHelper(et, afterOpenArg, autoCloseDoc) {
@@ -2401,7 +2593,7 @@ class sfRestClient {
             }
             xscript = `setTimeout(\'${innerScript};\', 242);` + xscript;
         }
-        else if (!afterOpenArg || typeof afterOpenArg === "string" || (Array.isArray(afterOpenArg) && afterOpenArg.length === 2)) {
+        else if (typeof self.PostbackRefresh === "function" && !afterOpenArg || typeof afterOpenArg === "string" || (Array.isArray(afterOpenArg) && afterOpenArg.length === 2)) {
             if (!afterOpenArg)
                 afterOpenArg = "ibtnRefreshAttachList";
             var pbArg = 'AfterPopFVC';
@@ -2417,20 +2609,46 @@ class sfRestClient {
             console.log("OpenWindowsLinkHelper() - no post action", afterOpenArg);
         if (typeof innerScript === "string" && innerScript.length > 0)
             xscript = `setTimeout(\'${innerScript};\', ${innerDelay});` + xscript;
-        setTimeout(xscript, 211);
+        try {
+            $.connection.sfPMSHub.server.activateExchangeToken(openURL).then(ok => {
+                if (!ok)
+                    setTimeout(xscript, 211);
+                else {
+                    console.log("Activated via SignalR");
+                    if (typeof innerScript === "string" && innerScript.length > 0)
+                        setTimeout(innerScript, innerDelay);
+                }
+            }).catch(r => {
+                setTimeout(xscript, 211);
+            });
+        }
+        catch (x) {
+            console.warn(x);
+            setTimeout(xscript, 211);
+        }
     }
-    /** Finds $$ and other replacable values */
+    /** Finds $$ markers and other replacable values.
+     * Markers are case sensative
+     */
     ExpandActionMarkers(rawAction, rowData) {
         if (rawAction.indexOf("$$PROJECT") >= 0) {
             rawAction = rawAction.replaceAll("$$PROJECT", this.GetActionMarkerReplacement("$$PROJECT", rowData));
         }
+        if (rawAction.indexOf("$$PDSKEY") >= 0) {
+            rawAction = rawAction.replaceAll("$$PDSKEY", this.GetActionMarkerReplacement("$$PDSKEY", rowData));
+        }
         // general case: regex??
         return rawAction;
     }
+    /** given a mark name, returns the replacement value
+     * @see ExpandActionMarkers()
+     * @argument markerName such as $$Project or $$PDSKEY
+     * @argument rowData object containing row data - first source for value to replace the marker
+     */
     GetActionMarkerReplacement(markerName, rowData) {
         var result = "";
         if (markerName.startsWith("$$")) {
-            markerName = markerName.substr(2, 1) + markerName.substr(3).toLowerCase();
+            markerName = markerName.substring(2, 3) + markerName.substring(3).toLowerCase();
         }
         if (rowData)
             result = this.FieldValueFromRow(rowData, markerName);
@@ -2438,6 +2656,9 @@ class sfRestClient {
             if (markerName === "Project") {
                 result = this.GetPageProjectKey();
             }
+            if (markerName === "Pdskey") {
+                result = this.GetPageContextValue("dsCacheKey");
+            }
         }
         return result;
     }
@@ -2590,14 +2811,13 @@ class sfRestClient {
         });
     }
     GAMonitorPageHit(propertyID, clientID, url, title) {
-        if (sfRestClient.GAPageHitSent)
-            return;
+        var RESTClient = this;
         if (!url) {
-            url = `${top?.location?.origin}${top?.location?.pathname}`;
-            var s = top?.location.search;
-            if (s && (!s.startsWith("?id=")) && (!s.startsWith("?add=")))
-                url = url + s;
+            url = `${RESTClient._SiteURL}/${RESTClient.ResolvePageName()}`;
         }
+        var pageHash = url.sfHashCode();
+        if (sfRestClient.GALastPageHitSent === pageHash)
+            return;
         if (!title)
             title = $('title').text();
         var payload = {
@@ -2608,14 +2828,14 @@ class sfRestClient {
             dl: url,
             dt: title,
         };
-        sfRestClient.GAPageHitSent = true;
+        sfRestClient.GALastPageHitSent = pageHash;
         return this.GAMonitorSend(payload)
             .done(function (data, textStatus, jqXHR) {
-            console.log(`GAMonitor(pageview:${top?.location.pathname}) ok`);
+            console.log(`GAMonitor(pageview:${url}) ok`);
         })
             .fail(function (jqXHR, textStatus) {
             sfRestClient.GAMonitorSendFailed = true;
-            console.warn(`GAMonitor(pgvw:${top?.location.pathname}) failed: ${jqXHR.responseText} `);
+            console.warn(`GAMonitor(pgvw:${url}) failed: ${jqXHR.responseText} `);
         });
     }
     GAMonitorSend(payload) {
@@ -2634,8 +2854,7 @@ class sfRestClient {
         });
     }
     GAMonitorEvent(propertyID, clientID, category, action, label, value) {
-        if (!sfRestClient.GAPageHitSent)
-            this.GAMonitorPageHit(propertyID, clientID);
+        this.GAMonitorPageHit(propertyID, clientID);
         var payload = {
             v: 1,
             t: "event",
@@ -2648,13 +2867,14 @@ class sfRestClient {
         };
         return this.GAMonitorSend(payload)
             .done(function (data, textStatus, jqXHR) {
-            console.log(`GAMonitor(${category}:${action}) ok`);
+            console.log(`GAMonitor(${category}:${action}) ${label} ok`);
         })
             .fail(function (jqXHR, textStatus) {
             console.warn(`GAMonitor(${category}:${action}) failed: ${jqXHR.responseText}`);
         });
     }
-    sfGAEvent(category, action, label, value) {
+    /** Google Analytics Event */
+    GAEvent(category, action, label, value) {
         if (!value)
             value = 0;
         if (sfRestClient._WCC.GAFMOptOut) {
@@ -2663,8 +2883,9 @@ class sfRestClient {
         }
         this.GAMonitorEvent('UA-6465434-4', sfRestClient._WCC.SiteID, category, action, label, value);
     }
-    sfGADialogEvent(action, dialogName) {
-        this.sfGAEvent("Dialog", action, dialogName, 1);
+    /** Shortcut that calls GAEvent("dialog",action, dialogName,1) */
+    GADialogEvent(action, dialogName) {
+        this.GAEvent("Dialog", action, dialogName, 1);
     }
     ValueHasWildcard(theVal) {
         if (theVal.indexOf("%") >= 0)
@@ -3448,10 +3669,10 @@ class sfRestClient {
                     var ThisSuffix = "_dv";
                     if (item.DataField?.startsWith("cmp_")) {
                         // cmp_realfieldname_suffix
-                        var RealFieldName = item.DataField.substr(4);
+                        var RealFieldName = item.DataField.substring(4);
                         if (!(RealFieldName in rawRow)) {
                             if (RealFieldName.indexOf("_") > 0)
-                                RealFieldName = RealFieldName.substr(0, RealFieldName.indexOf("_"));
+                                RealFieldName = RealFieldName.substring(0, RealFieldName.indexOf("_"));
                             if ((RealFieldName in rawRow && !(item.DataField in rawRow))) {
                                 var FieldValue = thisPart.RestClient.FieldValueFromRow(rawRow, RealFieldName);
                                 var DependsOn;
@@ -4037,7 +4258,7 @@ sfRestClient._Options = {
     ProjectXBURL: '{0}/spax.html#!/main/projectDashboard?project={1}',
     TaskStatePollInterval: 357
 };
-sfRestClient.GAPageHitSent = false; // !!! this needs work
+sfRestClient.GALastPageHitSent = 0; // !!! this needs work
 sfRestClient.GAMonitorSendFailed = false;
 sfRestClient.$LookupDialogStack = [];
 sfRestClient._NextPingTimerID = undefined;