spitfirepm 1.20.93 → 1.20.97

package/dist/sfRESTClient.d.ts

@@ -101,6 +101,10 @@ export declare class WCCData {
 export declare class DataModelRow {
     [key: string]: any;
 }
+export declare class InvokeOptions {
+    ByTask: boolean | undefined;
+    ByAcct: boolean | undefined;
+}
 export declare class DataModelCollection {
     [key: string]: any;
 }
@@ -413,6 +417,7 @@ export declare class sfRestClient {
     IsDocExclusiveToMe(): boolean;
     IsPowerUXPage(): boolean;
     IsHomeDashboardPage(): boolean;
+    IsCatalogPage(): boolean;
     IsDocumentPage(): boolean;
     IsProjectPage(): boolean;
     /** @deprecated use IsPageOfType() */
@@ -444,11 +449,11 @@ export declare class sfRestClient {
      *
      * Actions Supported
      * - vPgPopup(...)
-     * - PopDoc(...)
-     * - PopTXHistory(...)
+     * - PopDoc(...) and PopNewDoc
+     * - PopTXHistory(...) and PopBFAHistory()
      * - Nav To (dcmodules and admin tools)
      */
-    InvokeAction(actionString: string | _SwaggerClientExports.MenuAction, rowData?: DataModelRow): void;
+    InvokeAction(actionString: string | _SwaggerClientExports.MenuAction, rowData?: DataModelRow, options?: InvokeOptions): void;
     /** Creates an exchange token and calls OpenWindowsLinkHelper() */
     FollowLinkViaSFLink(targetURL: string, afterOpenArg?: boolean | string | [string, string] | Function, autoCloseDoc?: boolean): void;
     /**

package/dist/sfRESTClient.js

@@ -1,13 +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.93";
+const ClientPackageVersion = "1.20.97";
 // original script created by Stan York and modified for typescript and linter requirements by Uladzislau Kumakou
 var LoggingLevels;
 (function (LoggingLevels) {
@@ -47,7 +47,7 @@ class PartStorageData {
         PartStorageData._LoadedParts.set(this._ReferenceKey, this);
         this._InitializationResultPromise = null;
         if (!PartStorageData._SiteURL) {
-            var ApplicationPath = window.location.pathname.substring(1, window.location.pathname.substring(1).indexOf("/") + 1);
+            var ApplicationPath = window.__HTTPApplicationName();
             PartStorageData._SiteURL = `${window.location.origin}/${ApplicationPath || 'sfPMS'}`;
         }
     }
@@ -207,6 +207,10 @@ class DataModelRow {
 }
 exports.DataModelRow = DataModelRow;
 ;
+class InvokeOptions {
+}
+exports.InvokeOptions = InvokeOptions;
+;
 class DataModelCollection {
 }
 exports.DataModelCollection = DataModelCollection;
@@ -335,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.substring(1, window.location.pathname.substring(1).indexOf("/") + 1);
+        var ApplicationPath = window.__HTTPApplicationName();
         this._SiteURL = `${window.location.origin}/${ApplicationPath || 'sfPMS'}`;
         this._SiteRootURL = `/${ApplicationPath || 'sfPMS'}`;
         this.exports = _SwaggerClientExports;
@@ -1687,7 +1691,7 @@ class sfRestClient {
                     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);
@@ -2022,6 +2026,9 @@ class sfRestClient {
     IsHomeDashboardPage() {
         return this.IsPageOfType(this.PageTypeNames.HomeDashboard);
     }
+    IsCatalogPage() {
+        return this.IsPageOfType(this.PageTypeNames.Catalog);
+    }
     IsDocumentPage() {
         return this.IsPageOfType(this.PageTypeNames.Document); // "DocDetail") ;
     }
@@ -2071,6 +2078,7 @@ class sfRestClient {
                 result = this.PageTypeNames.Contacts;
                 break;
             case "libview":
+            case "LibView":
                 result = this.PageTypeNames.Catalog;
                 break;
             case "cusysm":
@@ -2097,6 +2105,8 @@ class sfRestClient {
         var pgHash = location.hash;
         if (pgHash.length > 0)
             pgname = pgHash; // for xb style
+        if (pgname.endsWith("pvp.aspx"))
+            pgname = this.GetPageQueryParameterByName("vpg");
         if (pgname.indexOf("/") >= 0)
             pgname = pgname.substring(pgname.lastIndexOf("/") + 1);
         if (pgname.indexOf("?") >= 0)
@@ -2118,7 +2128,7 @@ class sfRestClient {
                 result = "home";
                 break;
             default:
-                console.warn("Unexpected page type: ", classicPageName);
+                console.warn("No XB varient for page type: ", classicPageName);
                 result = classicPageName.toString();
                 break;
         }
@@ -2304,12 +2314,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) {
@@ -2334,7 +2346,9 @@ class sfRestClient {
                 if (ActionString.indexOf("?") > 0) {
                     ActionOptions = "&" + ActionString.substring(ActionString.indexOf("?") + 1);
                 }
+                ActionOptions = ActionOptions.replaceAll("xbia=1", "xbia=2");
                 ActionString = `javascript:vPgPopup('v/LibView.aspx', '${ActionOptions}', 850, 950);`; // ... w,h
+                UseNewTabWindow = true;
             }
             else {
                 this.ModalDialog(ActionString, undefined, undefined, window);
@@ -2354,7 +2368,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);
@@ -2388,17 +2407,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 ||
@@ -2537,10 +2595,10 @@ class sfRestClient {
         if (RESTClient.IsDocumentPage() && typeof afterOpenArg === "boolean" && afterOpenArg) {
             innerScript = "top.ResetUnsavedChanges();";
             if (autoCloseDoc) {
-                innerScript += 'setTimeout(\\\'top.location.href = "about:blank";\\\', 842);';
+                innerScript += "setTimeout('top.location.href = \"about:blank\";', 842);";
                 innerScript += "window.top.close();";
             }
-            xscript = `setTimeout(\'${innerScript};\', 242);` + xscript;
+            xscript = `setTimeout('${innerScript};', 242);` + xscript;
         }
         else if (typeof self.PostbackRefresh === "function" && !afterOpenArg || typeof afterOpenArg === "string" || (Array.isArray(afterOpenArg) && afterOpenArg.length === 2)) {
             if (!afterOpenArg)
@@ -2550,22 +2608,24 @@ class sfRestClient {
                 pbArg = afterOpenArg[1];
                 afterOpenArg = afterOpenArg[0];
             }
-            innerScript = `PostbackRefresh(\\\'${afterOpenArg}\\\',\\\'${pbArg}\\\');`;
+            innerScript = `PostbackRefresh('${afterOpenArg}','${pbArg}');`;
         }
         else if (typeof afterOpenArg === "function")
             afterOpenArg(et);
         else
             console.log("OpenWindowsLinkHelper() - no post action", afterOpenArg);
         if (typeof innerScript === "string" && innerScript.length > 0)
-            xscript = `setTimeout(\'${innerScript};\', ${innerDelay});` + xscript;
+            xscript = `setTimeout('${innerScript};', ${innerDelay});` + xscript;
         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)
+                    if (typeof innerScript === "string" && innerScript.length > 0) {
+                        console.log("Post Activation, Scheduled", innerScript);
                         setTimeout(innerScript, innerDelay);
+                    }
                 }
             }).catch(r => {
                 setTimeout(xscript, 211);
@@ -3811,7 +3871,10 @@ class sfRestClient {
                     return;
                 if (top) {
                     var RESTClient = top.sfClient;
-                    if (top.name.length > 0 && target.sfStartsWithCI(top?.name)) {
+                    var TopName = top.name;
+                    if (TopName && TopName === 'v/LibView.aspx')
+                        TopName = "Dashboard";
+                    if (TopName.length > 0 && target.sfStartsWithCI(TopName)) {
                         if (request.startsWith("javascript:")) {
                             request = request.substring(11);
                             try {
@@ -3827,11 +3890,12 @@ class sfRestClient {
                             }
                         }
                         else if (request.sfStartsWithCI("refresh")) {
-                            if (RESTClient.IsProjectPage()) {
+                            var HasRefreshPageParts = (typeof top?.refreshPageParts === "function");
+                            if (HasRefreshPageParts && RESTClient.IsProjectPage()) {
                                 top.refreshPartbyName('DocSearch', request, 'signalR');
                                 top.refreshPartbyName('ProjTypedDocList', request, 'signalR');
                             }
-                            else if (RESTClient.IsHomeDashboardPage()) {
+                            else if (HasRefreshPageParts && RESTClient.IsHomeDashboardPage()) {
                                 top.refreshPartbyName('actionitems', 'refresh', 'signalR');
                             }
                             else if (typeof top?.refreshPageParts === "function") {
@@ -3842,14 +3906,14 @@ class sfRestClient {
                             top.location.href = request;
                         }
                     }
-                    else if (top?.name.length > 0 && RESTClient.GetPageContextValue("DataPK").endsWith(top.name)
-                        && (RequestForWindowMatches) && typeof RequestForWindowMatches.groups === "object" && RequestForWindowMatches.groups.WindowName === top.name) {
+                    else if (TopName.length > 0 && RESTClient.GetPageContextValue("DataPK").endsWith(TopName)
+                        && (RequestForWindowMatches) && typeof RequestForWindowMatches.groups === "object" && RequestForWindowMatches.groups.WindowName === TopName) {
                         // hey wait, this is about me!  Lets schedule a refresh that might get stomped by re-nav (which is ok)
                         console.log("sfPMSHub queing request RefreshAttachments in 1 second (belt and suspenders)");
                         setTimeout("top.sfDocDetailPostBack('RefreshAttachments','sfLink'); // signalr", 987);
                     }
                     else
-                        console.log(`sfPMSHub ignoring request to [${target}]:${request}`);
+                        console.log(`sfPMSHub ignoring ${request} to [${target}]`);
                 }
             };
             sfHub.client.dashboardRefreshPartByName = function (target) {