spitfirepm 1.10.67 → 1.10.71

package/dist/sfRESTClient.d.ts

@@ -159,6 +159,7 @@ export declare class sfRestClient {
     BuildViewModelForContext(partName: string, context: string, forDocType: GUID | undefined, rawData: [{}] | {}): Promise<DataModelCollection>;
     /**
      *  Legacy version of BuildViewModelForContext  - use .done()
+     *  @deprecated use BuildViewModelForContext()
      */
     BuildViewModel(partName: string, context: string, rawData: any, unusedCfgData: undefined, forDocType: GUID | undefined): JQueryPromise<any>;
     /**
@@ -373,7 +374,7 @@ export declare class sfRestClient {
     FindRowIndexByKey(rawData: DataModelCollection, keyName: string, keyValue: string): number | undefined;
     /**
      * Builds a string array of values that help define the context of a lookup or evaluation
-     * @param dependsOnList semicolon separated list of related field and constants. eg #DocMasterDetail.Project;=Subtype
+     * @param dependsOnList semicolon separated list of related field and constants. eg #DocMasterDetail.Project;=Subtype (# is optional)
      * @param rawRow primary source of data
      */
     GatherDependsOnValues(dependsOnList: string, rawRow: any): string[] | undefined;
@@ -425,9 +426,18 @@ export declare class sfRestClient {
      * - Nav To (dcmodules and admin tools)
      */
     InvokeAction(actionString: string | _SwaggerClientExports.MenuAction, rowData?: DataModelRow): void;
+    FollowLinkViaSFLink(targetURL: string, afterOpenArg?: boolean | string | [string, string] | Function, autoCloseDoc?: boolean): void;
+    /**
+     *
+     * @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 autoCloseDoc
+     */
+    OpenWindowsLinkHelper(et: string, afterOpenArg?: boolean | string | [string, string] | Function, autoCloseDoc?: boolean): void;
     /** Finds $$ and other replacable values */
     protected ExpandActionMarkers(rawAction: string, rowData?: DataModelRow): string;
     protected GetActionMarkerReplacement(markerName: string, rowData?: DataModelRow): string;
+    protected getCookie(cname: string): string;
     /**
      * Figures out the type of page and the amount of viewable height (without scrolling)
      * @returns height of top frame
@@ -484,6 +494,12 @@ export declare class sfRestClient {
      * @param dep4
      */
     sfAC($AC: string | JQuery<HTMLInputElement>, lookupName: string, depends1: string | string[], dep2?: string, dep3?: string, dep4?: string): void;
+    /** Displays a modal dialog and returns a reference to the dialog for further manipulation
+     * @argument msg the text for the dialog message.  Can include html
+     * @argument title optional title
+     * @argument uiAlertIcon if specified, and not false, ui-icon class name (see https://api.jqueryui.com/theming/icons/)
+     */
+    jqAlert(msg: string, title?: string, uiAlertIcon?: string): JQuery<HTMLElement>;
     ModalDialog(url: string, eventId: string, eventArg: string, eventContext: Window): Promise<boolean | undefined> | undefined;
     protected $LookupDialog: JQuery<HTMLDivElement> | undefined;
     protected $LookupDialogStack: JQuery<HTMLDivElement>[];
@@ -502,6 +518,13 @@ export declare class sfRestClient {
      * this is the lookup DIV
      */
     protected sfModelDialogResizedHandler(): void;
+    /**
+     * (OBSOLETE) Resize parent sfDash window
+     * @deprecated We cannot change the size of the parent window (dates back to sfDash)
+     * @param canShrink
+     * @param DesiredWidth
+     * @param DesiredHeight
+     */
     protected sfSetParentWindowSize(canShrink: boolean, DesiredWidth: number, DesiredHeight: number): void;
     private sfLookupHeightChangeTo;
     private _LookupViewPortAdjustments;

package/dist/sfRESTClient.js

@@ -9,7 +9,7 @@ const BrowserExtensionChecker_1 = require("./BrowserExtensionChecker");
 //import localForage from "localforage"; requires --allowSyntheticDefaultImports in tsconfig
 const localForage = require("localforage");
 //import {dialog}    from "jquery-ui";
-const ClientPackageVersion = "1.10.67";
+const ClientPackageVersion = "1.10.71";
 //export type GUID = string //& { isGuid: true };
 /* eslint-disable prefer-template */
 /* eslint-disable no-extend-native */
@@ -515,6 +515,7 @@ class sfRestClient {
     }
     /**
      *  Legacy version of BuildViewModelForContext  - use .done()
+     *  @deprecated use BuildViewModelForContext()
      */
     BuildViewModel(partName, context, rawData, unusedCfgData, forDocType) {
         if (!sfRestClient._z.WCCLoaded)
@@ -957,6 +958,13 @@ class sfRestClient {
         }
         else if (dependsOn)
             DependsOnSet[0] = dependsOn;
+        //removed all "undefined" from the end, leaving at least one
+        for (let index = DependsOnSet.length - 1; index >= 1; index--) {
+            if (DependsOnSet[index - 1] != "undefined")
+                break;
+            if (DependsOnSet[index] == "undefined")
+                DependsOnSet.pop();
+        }
         var DVFilters = new SwaggerClients_1.QueryFilters();
         DVFilters.MatchingSeed = keyValue;
         DVFilters.DependsOn = DependsOnSet;
@@ -1702,7 +1710,7 @@ class sfRestClient {
     }
     /**
      * Builds a string array of values that help define the context of a lookup or evaluation
-     * @param dependsOnList semicolon separated list of related field and constants. eg #DocMasterDetail.Project;=Subtype
+     * @param dependsOnList semicolon separated list of related field and constants. eg #DocMasterDetail.Project;=Subtype (# is optional)
      * @param rawRow primary source of data
      */
     GatherDependsOnValues(dependsOnList, rawRow) {
@@ -1712,8 +1720,9 @@ class sfRestClient {
         dependsOnList.split(";").forEach(element => {
             if (element.startsWith("="))
                 result.push(element.substring(1));
-            if (element.startsWith("#")) {
-                element = element.substring(1);
+            else {
+                if (element.startsWith("#"))
+                    element = element.substring(1);
                 if (element.indexOf(".") > 0) {
                     var ElementNameParts = element.split(".");
                     var TableName = ElementNameParts[0];
@@ -2058,6 +2067,31 @@ class sfRestClient {
                 Acct = rowData["acct"];
             this.VModalPage("TranHistory", "&project={0}&task={1}&acct={2}&period=%".sfFormat(Project, Task, Acct), 999, 444, undefined);
         }
+        else if (ActionString.indexOf("PopXLTool(") >= 0 ||
+            ActionString.indexOf("PopFVC(") >= 0 ||
+            ActionString.indexOf("PopMSWindowTool(") >= 0 ||
+            ActionString.indexOf("PopAuditTool(") >= 0) {
+            var targetURL = "";
+            if (ActionString.indexOf("PopFVC(") >= 0) {
+                var rx = /javascript:PopFVC\(['"`](?<URL>.*)[`'"],['"`](?<fileKey>.*)[`'"],['"`](?<idname>.*)[`'"],['"`](?<command>.*)[`'"]/gm;
+                var match = rx.exec(ActionString);
+                if (match && match.groups) {
+                    targetURL = `${this._SiteRootURL}/cabs/FileVersion.application?key=${match.groups.fileKey}&id=${match.groups.idname}&cmd=${match.groups.command}`;
+                }
+                else
+                    console.warn("InvokeAction() could not parse PopFVC() ", actionString);
+            }
+            else {
+                var rx = /javascript:(PopMSWindowTool|PopXLTool|PopAuditTool)\(['"`](?<URL>.*)[`'"]\)/gm;
+                var match = rx.exec(ActionString);
+                if (match && match.groups) {
+                    targetURL = match.groups.URL;
+                }
+                else
+                    console.warn("InvokeAction() could not parse", actionString);
+            }
+            this.FollowLinkViaSFLink(targetURL, false);
+        }
         else if (ActionString.indexOf("/dcmodules/") >= 0 || ActionString.indexOf("/admin/") >= 0) {
             console.warn("InvokeAction::tools not really done", ActionString);
             top.location.href = ActionString;
@@ -2079,6 +2113,113 @@ class sfRestClient {
             console.warn("InvokeAction() could not handle ", actionString);
         }
     }
+    FollowLinkViaSFLink(targetURL, afterOpenArg, autoCloseDoc) {
+        var RESTClient = this;
+        if (targetURL.endsWith("&Project="))
+            targetURL += RESTClient.GetPageProjectKey();
+        if (!top?.ClickOnceExtension.HasDotNetApplicationExtension()) {
+            var RetryLater = `FollowLinkViaSFLink('${targetURL}'`;
+            if (typeof afterOpenArg !== "undefined") {
+                RetryLater = RetryLater + `,${afterOpenArg}`;
+                if (typeof autoCloseDoc !== "undefined")
+                    RetryLater = RetryLater + `,${autoCloseDoc}`;
+            }
+            RetryLater = RetryLater + ");";
+            setTimeout(RetryLater, 222);
+            return;
+        }
+        if (!top.ClickOnceExtension.HasDotNetApplicationExtension()) {
+            var DialogButtons = [];
+            DialogButtons.push({
+                text: "Install",
+                "id": "btnOK",
+                click: function () {
+                    RESTClient.InvokeAction(BrowserExtensionChecker_1.BrowserExtensionChecker.WRemixWebstoreLink);
+                    $(this).dialog("close");
+                }
+            });
+            DialogButtons.push({
+                text: "Ignore",
+                "id": "btnIgnore",
+                click: function () {
+                    top?.ClickOnceExtension.IgnoreMissingExtension();
+                    $(this).dialog("close");
+                    RESTClient.jqAlert("Please try your action again.  If you see a prompt to keep or open (at the bottom), click to proceed!", ".NET Link Helper Recommended");
+                    return;
+                }
+            });
+            var $A = RESTClient.jqAlert(`ClickOnce Helper is required.  Please install <a href='${BrowserExtensionChecker_1.BrowserExtensionChecker.WRemixWebstoreLink}' style='text-decoration: underline' target='_blank'>this extension</a>!`, ".NET Link Helper Required");
+            $A.dialog('option', 'buttons', DialogButtons);
+            return;
+        }
+        if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
+            console.log("FollowLinkViaSFLink() xt for: " + targetURL);
+        var api = new SwaggerClients_1.SessionClient(RESTClient._SiteURL);
+        var tokeArgs = new _SwaggerClientExports.TokenRequest();
+        tokeArgs.Args = targetURL;
+        tokeArgs.UserKey = RESTClient.GetPageContextValue("UserKey");
+        tokeArgs.LoginSessionKey = RESTClient.GetPageContextValue("LoginSessionKey");
+        tokeArgs.DataLockFlag = RESTClient.GetPageContextValue("DataLockFlag");
+        tokeArgs.DataPK = RESTClient.GetPageContextValue("DataPK");
+        tokeArgs.DocSessionKey = RESTClient.GetPageContextValue("DocSessionKey");
+        tokeArgs.dsCacheKey = RESTClient.GetPageContextValue("dsCacheKey");
+        tokeArgs.SiteID = RESTClient.GetPageContextValue("SiteID");
+        tokeArgs.PageName = RESTClient.GetPageContextValue("PageName");
+        tokeArgs.PartName = RESTClient.GetPageContextValue("PartName");
+        tokeArgs.TZOffset = RESTClient.GetPageContextValue("TZOffset");
+        api.createExchangeToken(tokeArgs).then((xToken) => {
+            if (xToken && xToken?.length > 3) {
+                if (!autoCloseDoc && typeof autoCloseDoc !== "boolean")
+                    autoCloseDoc = false;
+                RESTClient.OpenWindowsLinkHelper(xToken, afterOpenArg, autoCloseDoc);
+            }
+            else {
+                RESTClient.jqAlert("Could not get link exchange token - contact support");
+            }
+        });
+    }
+    /**
+     *
+     * @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 autoCloseDoc
+     */
+    OpenWindowsLinkHelper(et, afterOpenArg, autoCloseDoc) {
+        var RESTClient = this;
+        var openURL = `${this._SiteURL}/cabs/sflink/sfLink.application?et=${et}&ak=${this.getCookie("ARRAffinity")}`;
+        if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
+            console.log("OpenWindowsLinkHelper() to: " + openURL);
+        var xscript = "";
+        var innerScript = "";
+        var innerDelay = 255 + (BrowserExtensionChecker_1.BrowserExtensionChecker.browser.isEdge ? 789 : 0);
+        xscript = `top.location.href = '${openURL}';`;
+        // afterOpenArg: boolean/true: closes document page; false/0: posts back default refresh; ['e','a']: posts back e with a;
+        if (RESTClient.IsDocumentPage() && typeof afterOpenArg === "boolean" && afterOpenArg) {
+            innerScript = "top.ResetUnsavedChanges();";
+            if (autoCloseDoc) {
+                innerScript += 'setTimeout(\\\'top.location.href = "about:blank";\\\', 842);';
+                innerScript += "window.top.close();";
+            }
+            xscript = `setTimeout(\'${innerScript};\', 242);` + xscript;
+        }
+        else if (!afterOpenArg || typeof afterOpenArg === "string" || (Array.isArray(afterOpenArg) && afterOpenArg.length === 2)) {
+            if (!afterOpenArg)
+                afterOpenArg = "ibtnRefreshAttachList";
+            var pbArg = 'AfterPopFVC';
+            if (Array.isArray(afterOpenArg) && afterOpenArg.length === 2) {
+                pbArg = afterOpenArg[1];
+                afterOpenArg = afterOpenArg[0];
+            }
+            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;
+        setTimeout(xscript, 211);
+    }
     /** Finds $$ and other replacable values */
     ExpandActionMarkers(rawAction, rowData) {
         if (rawAction.indexOf("$$PROJECT") >= 0) {
@@ -2101,6 +2242,18 @@ class sfRestClient {
         }
         return result;
     }
+    getCookie(cname) {
+        var name = cname + "=";
+        var ca = document.cookie.split(';');
+        for (var i = 0; i < ca.length; i++) {
+            var c = ca[i]; //.trim() did not work in IE
+            while (c.length > 0 && c.charAt(0) === ' ')
+                c = c.substring(1, c.length);
+            if (c.indexOf(name) === 0)
+                return c.substring(name.length, c.length);
+        }
+        return "";
+    }
     /**
      * Figures out the type of page and the amount of viewable height (without scrolling)
      * @returns height of top frame
@@ -2455,6 +2608,51 @@ class sfRestClient {
                 console.log(`sfAC Key ${e.which}; autofocus off`);
         }).data("acOpen", false).data("acChange", false);
     }
+    /** Displays a modal dialog and returns a reference to the dialog for further manipulation
+     * @argument msg the text for the dialog message.  Can include html
+     * @argument title optional title
+     * @argument uiAlertIcon if specified, and not false, ui-icon class name (see https://api.jqueryui.com/theming/icons/)
+     */
+    jqAlert(msg, title, uiAlertIcon) {
+        console.log("jqAlert: " + msg);
+        var $ALERT;
+        if (!title)
+            title = "Message from Web Application";
+        if ((typeof uiAlertIcon === "undefined") || (typeof uiAlertIcon === "boolean" && uiAlertIcon)) {
+            uiAlertIcon = '<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>';
+        }
+        else if ((typeof uiAlertIcon === "boolean" && !uiAlertIcon))
+            uiAlertIcon = "";
+        else if ((typeof uiAlertIcon === "string") && (uiAlertIcon.length > 1))
+            uiAlertIcon = `<span class="ui-icon ${uiAlertIcon}" style="float: left; margin: 0 7px 20px 0;"></span>`;
+        var fullMsg = `<div id="sfUI-Dialog-Alert" title="${title}" style="font-size: 0.8em">${uiAlertIcon}<span id="AlertMsgText">${msg}</span></div>`;
+        var dialogOptions = {
+            modal: true,
+            minWidth: 250,
+            width: "300",
+            height: 'auto',
+            show: {
+                effect: "blind",
+                duration: 444
+            },
+            hide: {
+                effect: "puff",
+                duration: 333
+            },
+            buttons: {
+                Ok: function () {
+                    $(this).dialog("close");
+                }
+            },
+            open: function () {
+                $(this).parent('DIV').find('.ui-dialog-buttonpane button:eq(0)').trigger("focus");
+            }
+        };
+        if (msg.length > 20)
+            dialogOptions.width = "auto";
+        $ALERT = $(fullMsg).dialog(dialogOptions);
+        return ($ALERT);
+    }
     ModalDialog(url, eventId, eventArg, eventContext) {
         var newValue;
         var formName = "0";
@@ -2486,7 +2684,8 @@ class sfRestClient {
             if (!this.$LookupDialog) {
                 this.$LookupDialog = $(`<div class='clsJQLookup' autofocus='autofocus' ><iframe id='sfClassicUIHolder' src='${sfRestClient._Options.BlankPageURI}' style='width: 100%; height: 150px;border:0;' seamless='seamless' autofocus='autofocus' /></div>`)
                     .dialog({ autoOpen: false, modal: true, title: 'Lookup Dialog', width: DefaultWidth, height: 200, close: top.sfClient.sfModalDialogClosed, dialogClass: "lookup",
-                    resizeStop: top?.sfClient.sfModelDialogResizedHandler });
+                    resizeStop: top?.sfClient.sfModelDialogResizedHandler,
+                    dragStop: top?.sfClient.sfModelDialogResizedHandler });
                 top?.sfClient.AddDialogTitleButton(top.sfClient.$LookupDialog, "btnMaximizeDialog", "Maximize", "ui-icon-arrow-4-diag").on("click", function () {
                     var $BTN = $(this);
                     var $DialogDiv = $(top.sfClient.$LookupDialog).closest("DIV.ui-dialog");
@@ -2569,6 +2768,8 @@ class sfRestClient {
                 var ThisURLHash = OpenUrl.sfHashCode();
                 if (sfRestClient._DialogCoordinateCache.has(ThisURLHash)) {
                     var TargetSizeData = sfRestClient._DialogCoordinateCache.get(ThisURLHash);
+                    if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
+                        console.log('ModalDialog() Target size/loc', TargetSizeData);
                     var $DialogDiv = $(top.sfClient.$LookupDialog).closest("DIV.ui-dialog");
                     top?.sfClient.sfLookupHeightChangeTo(top.sfClient.$LookupDialog, TargetSizeData.height);
                     top?.sfClient.sfLookupWidthChangeTo(top.sfClient.$LookupDialog, TargetSizeData.width);
@@ -2760,6 +2961,10 @@ class sfRestClient {
         $LookupDialog.dialog('destroy');
         this.$LookupDialog?.remove();
         this.$LookupDialog = undefined;
+        if (!Array.isArray(this.$LookupDialogStack)) {
+            console.warn("sfModalDialogClosed: re-init $LookupDialogStack");
+            this.$LookupDialogStack = [];
+        }
         if (this.$LookupDialogStack.length > 0)
             this.$LookupDialog = this.$LookupDialogStack.pop();
         if (dialogMode == 'modalDialog') {
@@ -2823,6 +3028,13 @@ class sfRestClient {
         }
         top?.sfClient.sfModelDialogResized($LookupDialog);
     }
+    /**
+     * (OBSOLETE) Resize parent sfDash window
+     * @deprecated We cannot change the size of the parent window (dates back to sfDash)
+     * @param canShrink
+     * @param DesiredWidth
+     * @param DesiredHeight
+     */
     sfSetParentWindowSize(canShrink, DesiredWidth, DesiredHeight) {
         console.warn("sfSetParentWindowSize not implemented");
         // if (top == window) {
@@ -2834,37 +3046,45 @@ class sfRestClient {
     }
     sfLookupHeightChangeTo(ld, newValue) {
         // here newValue represents the intended size for the inner iFrame's rendering area
+        if (typeof newValue === "undefined")
+            newValue = 890;
+        if (typeof newValue === "string")
+            newValue = Number.parseInt(newValue);
+        if (newValue === NaN)
+            newValue = 789;
         if ($("HTML").css("font-size") > "16px") {
             newValue = newValue * 1.1;
         } //"Enlarged" theme is 18px
-        if (($(window).height() < (newValue + this._LookupViewPortAdjustments.outsidExtraH)))
-            this.sfSetParentWindowSize(false, -1, newValue + this._LookupViewPortAdjustments.outsidExtraH);
+        //  if (($(window).height()! < (newValue + this._LookupViewPortAdjustments.outsidExtraH))) this.sfSetParentWindowSize(false, -1, newValue + this._LookupViewPortAdjustments.outsidExtraH);
         if (($(window).height() < (newValue + this._LookupViewPortAdjustments.outsidExtraH))) {
             // requested size still too large
             var requestedH = newValue;
             newValue = $(window).height() - this._LookupViewPortAdjustments.outsidExtraH;
-            console.log('dialog height requested cannot be accomidated by window, reduce from ' + requestedH + ' to ' + newValue);
+            if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
+                console.log('dialog height requested cannot be accomidated by window, reduce from ' + requestedH + ' to ' + newValue);
         }
         var tdh = newValue + this._LookupViewPortAdjustments.vpExtraH + this._LookupViewPortAdjustments.frameExtraH;
         ld.dialog('option', "height", tdh);
         //var LookupFrame = $(ld.children("iframe").get(0))
         top?.sfClient.sfModelDialogResized(ld);
         ld.dialog('option', 'position', 'center');
-        console.log('dialog height explicitly set to ' + newValue);
+        if (sfRestClient._Options.LogLevel >= LoggingLevels.Debug)
+            console.log('dialog height explicitly set to ' + newValue);
     }
     sfLookupWidthChangeTo(ld, newValue) {
-        if (($(window).width() < (newValue + this._LookupViewPortAdjustments.outsidExtraW)))
-            this.sfSetParentWindowSize(false, newValue + this._LookupViewPortAdjustments.outsidExtraW + this._LookupViewPortAdjustments.vpExtraW, -1);
+        //  if (($(window).width()! < (newValue + this._LookupViewPortAdjustments.outsidExtraW))) this.sfSetParentWindowSize(false, newValue + this._LookupViewPortAdjustments.outsidExtraW + this._LookupViewPortAdjustments.vpExtraW, -1);
         if (($(window).width() < (newValue + this._LookupViewPortAdjustments.outsidExtraW))) {
             // requested size still too wide
             var requestedW = newValue;
             newValue = $(window).width() - this._LookupViewPortAdjustments.outsidExtraW;
-            console.log('dialog width requested cannot be accomidated by window, reduce from ' + requestedW + ' to ' + newValue);
+            if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
+                console.log('dialog width requested cannot be accomidated by window, reduce from ' + requestedW + ' to ' + newValue);
         }
         ld.dialog('option', "width", newValue + this._LookupViewPortAdjustments.vpExtraW);
         top?.sfClient.sfModelDialogResized(ld);
         setTimeout(function () { ld.dialog('option', 'position', 'center'); }, 259); // need this to happen after above has all completed
-        console.log('dialog width explicitly set to ' + newValue);
+        if (sfRestClient._Options.LogLevel >= LoggingLevels.Debug)
+            console.log('dialog width explicitly set to ' + newValue);
     }
     /**
      * Updates internal sizes after the dialog frame size is changed
@@ -2872,7 +3092,7 @@ class sfRestClient {
      * @returns
      */
     sfModelDialogResized(forDialog) {
-        // this is called after a user resizes the dialog
+        // this is called after a user resizes or moves the dialog
         var dg = forDialog;
         if (!$(window))
             return;
@@ -2881,15 +3101,14 @@ class sfRestClient {
         var height = dg.height(); // actual content area
         var width = Math.round(dg.width() + 1); // actual content area
         var fh = dg.height() - this.DialogViewPortAdjustments.frameExtraH;
-        console.log('sfDialogResized resized to {0}w, {1}h inside {2}x{3}, frame h={4}'.sfFormat(width, height, tdw, tdh, fh));
-        if ((($(window).width() < (width + this.DialogViewPortAdjustments.outsidExtraW)) || ($(window).height() < (height + this.DialogViewPortAdjustments.outsidExtraH))))
-            this.sfSetParentWindowSize(false, width + this.DialogViewPortAdjustments.outsidExtraW, height + this.DialogViewPortAdjustments.outsidExtraH);
+        // console.log('sfDialogResized resized to {0}w, {1}h inside {2}x{3}, frame h={4}'.sfFormat( width ,height , tdw , tdh, fh));
+        // if ((($(window).width()! < (width + this.DialogViewPortAdjustments.outsidExtraW)) || ($(window).height()! < (height + this.DialogViewPortAdjustments.outsidExtraH)))) this.sfSetParentWindowSize(false, width + this.DialogViewPortAdjustments.outsidExtraW, height + this.DialogViewPortAdjustments.outsidExtraH);
         var $DFrame = $(dg.children("iframe").get(0)); // what if there is no frame???
         // $($DFrame).contents().find("html").outerHeight()  -- but not a good place to force the height
         $DFrame.css('height', fh); // also iframe
         $DFrame.css('width', '100%'); // also iframe
         var NewSizeData;
-        var PositionNow = dg.position();
+        var PositionNow = dg.closest("DIV.ui-dialog").position();
         NewSizeData = { top: PositionNow.top,
             left: PositionNow.left, width: dg.width(),
             height: dg.height()
@@ -2897,6 +3116,8 @@ class sfRestClient {
         var DialogURL = $DFrame.attr("src");
         var DialogURLHash = DialogURL.sfHashCode();
         sfRestClient._DialogCoordinateCache.set(DialogURLHash, NewSizeData);
+        if (sfRestClient._Options.LogLevel >= LoggingLevels.Verbose)
+            console.log(`sfDialogResized(${width}w,${height}h) size cache `, NewSizeData);
     }
     /**
      * Applies UI CFG to all rows in a dataset