add js showDialog() html5 href support

convert dojo/form api to native js

webapp/src/main/webapp/public/resources/js/configeditor.js

@@ -641,63 +641,55 @@ PWM_CFGEDIT.showMacroHelp = function() {
         };
         PWM_MAIN.ajaxRequest(url,loadFunction,{content:sendData});
     };
-    require(["dijit/Dialog"],function(Dialog) {
-        var idName = 'macroPopup';
-        PWM_MAIN.clearDijitWidget(idName);
-        var theDialog = new Dialog({
-            id: idName,
-            title: 'Macro Help',
-            style: "width: 750px",
-            href: PWM_GLOBAL['url-resources'] + "/text/macroHelp.html"
-        });
-        var attempts = 0;
-        // iframe takes indeterminate amount of time to load, so just retry till it appears
-        var loadFunction = function() {
-            if (PWM_MAIN.getObject('input-testMacroInput')) {
-                console.log('connected to macroHelpDiv');
-                setTimeout(function(){
-                    PWM_MAIN.getObject('input-testMacroInput').focus();
-                    PWM_MAIN.addEventHandler('input-testMacroInput','input',processExampleFunction);
-                    processExampleFunction();
-                },500);
-            } else {
-                if (attempts < 50) {
-                    attempts++;
-                    setTimeout(loadFunction,100);
-                }
+
+    var loadFunction = function() {
+        if (PWM_MAIN.getObject('input-testMacroInput')) {
+            console.log('connected to macroHelpDiv');
+            setTimeout(function(){
+                PWM_MAIN.addEventHandler('input-testMacroInput','input',processExampleFunction);
+                processExampleFunction();
+                PWM_MAIN.getObject('input-testMacroInput').focus();
+                PWM_MAIN.getObject('input-testMacroInput').setSelectionRange(-1, -1);
+            },500);
+        } else {
+            if (attempts < 50) {
+                attempts++;
+                setTimeout(loadFunction,100);
             }
-        };
-        theDialog.show();
-        loadFunction();
-    });
+        }
+    };
+
+    var options = {};
+    options['title'] = 'Macro Help'
+    options['id'] = 'id-dialog-macroHelp'
+    options['dialogClass'] = 'wide';
+    options['dojoStyle'] = 'width: 750px';
+    options['showClose'] = true;
+    options['href'] = PWM_GLOBAL['url-resources'] + "/text/macroHelp.html"
+    options['loadFunction'] = loadFunction;
+    PWM_MAIN.showDialog( options );
 };
 
 PWM_CFGEDIT.showTimezoneList = function() {
-    require(["dijit/Dialog"],function(Dialog) {
-        var idName = 'timezonePopup';
-        PWM_MAIN.clearDijitWidget(idName);
-        var theDialog = new Dialog({
-            id: idName,
-            title: 'Timezones',
-            style: "width: 750px",
-            href: PWM_GLOBAL['url-context'] + "/public/reference/timezones.jsp"
-        });
-        theDialog.show();
-    });
+    var options = {};
+    options['title'] = 'Timezones'
+    options['id'] = 'id-dialog-timeZoneHelp'
+    options['dialogClass'] = 'wide';
+    options['dojoStyle'] = 'width: 750px';
+    options['showClose'] = true;
+    options['href'] = PWM_GLOBAL['url-context'] + "/public/reference/timezones.jsp"
+    PWM_MAIN.showDialog( options );
 };
 
 PWM_CFGEDIT.showDateTimeFormatHelp = function() {
-    require(["dijit/Dialog"],function(Dialog) {
-        var idName = 'dateTimePopup';
-        PWM_MAIN.clearDijitWidget(idName);
-        var theDialog = new Dialog({
-            id: idName,
-            title: 'Macro Help',
-            style: "width: 700px",
-            href: PWM_GLOBAL['url-resources'] + "/text/datetimeFormatHelp.html"
-        });
-        theDialog.show();
-    });
+    var options = {};
+    options['title'] = 'Date & Time Formatting'
+    options['id'] = 'id-dialog-dateTimePopup'
+    options['dialogClass'] = 'wide';
+    options['dojoStyle'] = 'width: 750px';
+    options['showClose'] = true;
+    options['href'] = PWM_GLOBAL['url-resources'] + "/text/datetimeFormatHelp.html"
+    PWM_MAIN.showDialog( options );
 };
 
 PWM_CFGEDIT.ldapHealthCheck = function() {
@@ -754,59 +746,55 @@ PWM_CFGEDIT.httpsCertificateView = function() {
 };
 
 PWM_CFGEDIT.smsHealthCheck = function() {
-    require(["dojo/dom-form"], function(domForm){
-        var dialogBody = '<p>' + PWM_CONFIG.showString('Warning_SmsTestData') + '</p><form id="smsCheckParametersForm"><table>';
-        dialogBody += '<tr><td>To</td><td><input name="to" type="text" value="555-1212"/></td></tr>';
-        dialogBody += '<tr><td>Message</td><td><input name="message" type="text" value="Test Message"/></td></tr>';
-        dialogBody += '</table></form>';
-        PWM_MAIN.showDialog({text:dialogBody,showCancel:true,title:'Test SMS connection',closeOnOk:false,okAction:function(){
-                var formElement = PWM_MAIN.getObject("smsCheckParametersForm");
-                var formData = domForm.toObject(formElement);
-                var url =  "editor?processAction=smsHealthCheck";
-                PWM_MAIN.showWaitDialog({loadFunction:function(){
-                        var loadFunction = function(data) {
-                            if (data['error']) {
-                                PWM_MAIN.showErrorDialog(data);
-                            } else {
-                                var bodyText = PWM_ADMIN.makeHealthHtml(data['data'],false,false);
-                                var titleText = 'SMS Send Message Status';
-                                PWM_MAIN.showDialog({text:bodyText,title:titleText,showCancel:true});
-                            }
-
-                        };
-                        PWM_MAIN.ajaxRequest(url,loadFunction,{content:formData});
-                    }});
-            }});
-    });
+    var dialogBody = '<p>' + PWM_CONFIG.showString('Warning_SmsTestData') + '</p><form id="smsCheckParametersForm"><table>';
+    dialogBody += '<tr><td>To</td><td><input name="to" type="text" value="555-1212"/></td></tr>';
+    dialogBody += '<tr><td>Message</td><td><input name="message" type="text" value="Test Message"/></td></tr>';
+    dialogBody += '</table></form>';
+    PWM_MAIN.showDialog({text:dialogBody,showCancel:true,title:'Test SMS connection',closeOnOk:false,okAction:function(){
+            var formElement = PWM_MAIN.getObject("smsCheckParametersForm");
+            var formData = PWM_MAIN.JSLibrary.formToValueMap(formElement);
+            var url =  "editor?processAction=smsHealthCheck";
+            PWM_MAIN.showWaitDialog({loadFunction:function(){
+                    var loadFunction = function(data) {
+                        if (data['error']) {
+                            PWM_MAIN.showErrorDialog(data);
+                        } else {
+                            var bodyText = PWM_ADMIN.makeHealthHtml(data['data'],false,false);
+                            var titleText = 'SMS Send Message Status';
+                            PWM_MAIN.showDialog({text:bodyText,title:titleText,showCancel:true});
+                        }
+
+                    };
+                    PWM_MAIN.ajaxRequest(url,loadFunction,{content:formData});
+                }});
+        }});
 };
 
 PWM_CFGEDIT.emailHealthCheck = function() {
-    require(["dojo/dom-form"], function(domForm){
-        var dialogBody = '<p>' + PWM_CONFIG.showString('Warning_EmailTestData') + '</p><form id="emailCheckParametersForm"><table>';
-        dialogBody += '<tr><td>To</td><td><input name="to" type="text" value="test@example.com"/></td></tr>';
-        dialogBody += '<tr><td>From</td><td><input name="from" type="text" value="@DefaultEmailFromAddress@"/></td></tr>';
-        dialogBody += '<tr><td>Subject</td><td><input name="subject" type="text" value="Test Email"/></td></tr>';
-        dialogBody += '<tr><td>Body</td><td><input name="body" type="text" value="Test Email""/></td></tr>';
-        dialogBody += '</table></form>';
-        PWM_MAIN.showDialog({text:dialogBody,showCancel:true,title:'Test Email Connection',closeOnOk:false,okAction:function(){
-                var formElement = PWM_MAIN.getObject("emailCheckParametersForm");
-                var formData = domForm.toObject(formElement);
-                var url =  "editor?processAction=emailHealthCheck";
-                url = PWM_MAIN.addParamToUrl(url,'profile',PWM_CFGEDIT.readCurrentProfile());
-                PWM_MAIN.showWaitDialog({loadFunction:function(){
-                        var loadFunction = function(data) {
-                            if (data['error']) {
-                                PWM_MAIN.showErrorDialog(data);
-                            } else {
-                                var bodyText = PWM_ADMIN.makeHealthHtml(data['data'],false,false);
-                                var titleText = 'Email Send Message Status';
-                                PWM_MAIN.showDialog({text:bodyText,title:titleText,showCancel:true});
-                            }
-                        };
-                        PWM_MAIN.ajaxRequest(url,loadFunction,{content:formData});
-                    }});
-            }});
-    });
+    var dialogBody = '<p>' + PWM_CONFIG.showString('Warning_EmailTestData') + '</p><form id="emailCheckParametersForm"><table>';
+    dialogBody += '<tr><td>To</td><td><input name="to" type="text" value="test@example.com"/></td></tr>';
+    dialogBody += '<tr><td>From</td><td><input name="from" type="text" value="@DefaultEmailFromAddress@"/></td></tr>';
+    dialogBody += '<tr><td>Subject</td><td><input name="subject" type="text" value="Test Email"/></td></tr>';
+    dialogBody += '<tr><td>Body</td><td><input name="body" type="text" value="Test Email""/></td></tr>';
+    dialogBody += '</table></form>';
+    PWM_MAIN.showDialog({text:dialogBody,showCancel:true,title:'Test Email Connection',closeOnOk:false,okAction:function(){
+            var formElement = PWM_MAIN.getObject("emailCheckParametersForm");
+            var formData = PWM_MAIN.JSLibrary.formToValueMap(formElement);
+            var url = "editor?processAction=emailHealthCheck";
+            url = PWM_MAIN.addParamToUrl(url,'profile',PWM_CFGEDIT.readCurrentProfile());
+            PWM_MAIN.showWaitDialog({loadFunction:function(){
+                    var loadFunction = function(data) {
+                        if (data['error']) {
+                            PWM_MAIN.showErrorDialog(data);
+                        } else {
+                            var bodyText = PWM_ADMIN.makeHealthHtml(data['data'],false,false);
+                            var titleText = 'Email Send Message Status';
+                            PWM_MAIN.showDialog({text:bodyText,title:titleText,showCancel:true});
+                        }
+                    };
+                    PWM_MAIN.ajaxRequest(url,loadFunction,{content:formData});
+                }});
+        }});
 };
 
 PWM_CFGEDIT.selectTemplate = function(newTemplate) {

webapp/src/main/webapp/public/resources/js/configguide.js

@@ -41,7 +41,7 @@ PWM_GUIDE.selectTemplate = function(template) {
 };
 
 PWM_GUIDE.updateForm = function() {
-    require(["dojo","dijit/registry","dojo/dom-form"],function(dojo,registry,domForm){
+    require(["dojo"],function(dojo){
         var formJson = dojo.formToJson('configForm');
         var url = PWM_MAIN.addParamToUrl(window.location.href,'processAction','updateForm');
         url = PWM_MAIN.addPwmFormIDtoURL(url);

webapp/src/main/webapp/public/resources/js/main.js

@@ -376,45 +376,43 @@ PWM_MAIN.handleLoginFormSubmit = function(form, event) {
     PWM_MAIN.log('entering handleLoginFormSubmit');
     PWM_MAIN.cancelEvent(event);
 
-    require(["dojo","dojo/dom-form"], function(dojo, domForm) {
-        PWM_MAIN.showWaitDialog({loadFunction: function () {
-                var options = {};
-                options['content'] = domForm.toObject(form);
-                delete options['content']['processAction'];
-                delete options['content']['pwmFormID'];
-                var url = 'login?processAction=restLogin';
-                if (options['content']['skipCaptcha'])
-                {
-                    PWM_MAIN.addParamToUrl( url, 'skipCaptcha', options['content']['skipCaptcha']);
+    PWM_MAIN.showWaitDialog({loadFunction: function () {
+            var options = {};
+            options['content'] = PWM_MAIN.JSLibrary.formToValueMap(form);
+            delete options['content']['processAction'];
+            delete options['content']['pwmFormID'];
+            var url = 'login?processAction=restLogin';
+            if (options['content']['skipCaptcha'])
+            {
+                PWM_MAIN.addParamToUrl( url, 'skipCaptcha', options['content']['skipCaptcha']);
+            }
+            var loadFunction = function(data) {
+                if (data['error'] === true) {
+                    PWM_MAIN.getObject('password').value = '';
+                    PWM_MAIN.showErrorDialog(data,{
+                        okAction:function(){
+                            setTimeout(function(){
+                                PWM_MAIN.getObject('password').focus();
+                            },50);
+                        }
+                    });
+                    return;
                 }
-                var loadFunction = function(data) {
-                    if (data['error'] === true) {
-                        PWM_MAIN.getObject('password').value = '';
-                        PWM_MAIN.showErrorDialog(data,{
-                            okAction:function(){
-                                setTimeout(function(){
-                                    PWM_MAIN.getObject('password').focus();
-                                },50);
-                            }
-                        });
-                        return;
-                    }
-                    PWM_MAIN.log('authentication success');
-                    var nextURL = data['data']['nextURL'];
-                    if (nextURL) {
-                        PWM_MAIN.gotoUrl(nextURL, {noContext: true});
-                    }
-                };
-                PWM_MAIN.ajaxRequest(url,loadFunction,options);
-                if(typeof grecaptcha !== 'undefined'){
-                    try {
-                        grecaptcha.reset(); // reset the
-                    } catch (e) {
-                        PWM_MAIN.log("error resetting the captcha: " + e)
-                    }
+                PWM_MAIN.log('authentication success');
+                var nextURL = data['data']['nextURL'];
+                if (nextURL) {
+                    PWM_MAIN.gotoUrl(nextURL, {noContext: true});
                 }
-            }});
-    });
+            };
+            PWM_MAIN.ajaxRequest(url,loadFunction,options);
+            if(typeof grecaptcha !== 'undefined'){
+                try {
+                    grecaptcha.reset(); // reset the
+                } catch (e) {
+                    PWM_MAIN.log("error resetting the captcha: " + e)
+                }
+            }
+        }});
 };
 
 PWM_MAIN.log = function(text) {
@@ -794,8 +792,10 @@ PWM_MAIN.showDialog = function(options) {
     var allowMove = 'allowMove' in options ? options['allowMove'] : false;
     var idName = 'id' in options ? options['id'] : 'dialogPopup';
     var dialogClass = 'dialogClass' in options ? options['dialogClass'] : null;
+    var dojoStyle = 'dojoStyle' in options ? options['dojoStyle'] : null;
     var okLabel = 'okLabel' in options ? options['okLabel'] : PWM_MAIN.showString('Button_OK');
     var buttonHtml = 'buttonHtml' in options ? options['buttonHtml'] : '';
+    var href = 'href' in options ? options['href'] : null;
 
     var okAction = function(){
         if (closeOnOk) {
@@ -843,38 +843,51 @@ PWM_MAIN.showDialog = function(options) {
     bodyText = '<div class="' + dialogClassText + '">' + bodyText + '</div>';
 
     if (html5Dialog) {
-        PWM_MAIN.closeWaitDialog();
-        var dialogElement = document.createElement("dialog");
-        dialogElement.setAttribute("id", 'html5Dialog');
-        //dialogElement.setAttribute("draggable","true");
-        var html5DialogHtml = '<div class="titleBar">' + title;
-        if (showClose) {
-            html5DialogHtml += '<div id="icon-closeDialog" class="closeIcon pwm-icon pwm-icon-times"></div>'
-        }
-        html5DialogHtml += '</div><div class="body">' + bodyText + '</div>';
-        dialogElement.innerHTML = html5DialogHtml;
-        document.body.appendChild(dialogElement);
-        dialogElement.showModal();
-
-        setTimeout(function () {
-            if (showOk) {
-                PWM_MAIN.addEventHandler('dialog_ok_button', 'click', function () {
-                    okAction()
-                });
-            }
+        var doDialogDisplay = function(){
+            PWM_MAIN.closeWaitDialog();
+            var dialogElement = document.createElement("dialog");
+            dialogElement.setAttribute("id", 'html5Dialog');
+            var html5DialogHtml = '<div class="titleBar">' + title;
             if (showClose) {
-                PWM_MAIN.addEventHandler('icon-closeDialog', 'click', function () {
-                    PWM_MAIN.closeWaitDialog();
-                });
+                html5DialogHtml += '<div id="icon-closeDialog" class="closeIcon pwm-icon pwm-icon-times"></div>'
             }
+            html5DialogHtml += '</div><div class="body">' + bodyText + '</div>';
+            dialogElement.innerHTML = html5DialogHtml;
+            document.body.appendChild(dialogElement);
+            dialogElement.showModal();
 
-            if (showCancel) {
-                PWM_MAIN.addEventHandler('dialog_cancel_button', 'click', function () {
-                    cancelAction()
-                });
-            }
-            setTimeout(loadFunction, 100);
-        }, 100);
+            setTimeout(function () {
+                if (showOk) {
+                    PWM_MAIN.addEventHandler('dialog_ok_button', 'click', function () {
+                        okAction()
+                    });
+                }
+                if (showClose) {
+                    PWM_MAIN.addEventHandler('icon-closeDialog', 'click', function () {
+                        PWM_MAIN.closeWaitDialog();
+                    });
+                }
+
+                if (showCancel) {
+                    PWM_MAIN.addEventHandler('dialog_cancel_button', 'click', function () {
+                        cancelAction()
+                    });
+                }
+                setTimeout(loadFunction, 100);
+            }, 100);
+        }
+
+        if (href) {
+            var hrefContentHandler = function( value ) {
+                bodyText = '<div class="' + dialogClassText + '">' + value + '</div>';
+                doDialogDisplay();
+            };
+            PWM_MAIN.showWaitDialog({loadFunction:function(){
+                    PWM_MAIN.ajaxRequest(href,hrefContentHandler,{method:'GET',responseMimeType:'text/html',handleAs:'html'});
+                }});
+        } else {
+            doDialogDisplay();
+        }
     } else {
         require(["dojo", "dijit/Dialog"], function (dojo, Dialog) {
             PWM_MAIN.clearDijitWidget(idName);
@@ -883,7 +896,9 @@ PWM_MAIN.showDialog = function(options) {
                 closable: showClose,
                 draggable: allowMove,
                 title: title,
-                content: bodyText
+                style: dojoStyle,
+                content: bodyText,
+                href: href
             });
             if (!showClose) {
                 dojo.style(theDialog.closeButtonNode, "display", "none");
@@ -1356,6 +1371,23 @@ PWM_MAIN.JSLibrary.setValueOfSelectElement = function(nodeID, value) {
     }
 };
 
+PWM_MAIN.JSLibrary.formToValueMap = function(formElement) {
+    var formData = new FormData( formElement );
+    var returnData = {};
+    formData.forEach((value, key) => {
+        // Reflect.has in favor of: object.hasOwnProperty(key)
+        if(!Reflect.has(returnData, key)){
+            returnData[key] = value;
+            return;
+        }
+        if(!Array.isArray(returnData[key])){
+            returnData[key] = [returnData[key]];
+        }
+        returnData[key].push(value);
+    });
+    return returnData;
+};
+
 PWM_MAIN.JSLibrary.removeElementFromDom = function(elementID) {
     var element = PWM_MAIN.getObject(elementID);
     if (element) {
@@ -1801,6 +1833,8 @@ PWM_MAIN.ajaxRequest = function(url,loadFunction,options) {
     options = options === undefined ? {} : options;
     var content = 'content' in options ? options['content'] : null;
     var method = 'method' in options ? options['method'] : 'POST';
+    var responseMimeType = 'responseMimeType' in options ? options['responseMimeType'] : 'application/json';
+    var handleAs = 'handleAs' in options ? options['handleAs'] : 'json';
     var errorFunction = 'errorFunction' in options ? options['errorFunction'] : function(error){
         var status = error['response']['status'];
         if (status === 0 || status < 200 || status >= 300) {
@@ -1816,9 +1850,9 @@ PWM_MAIN.ajaxRequest = function(url,loadFunction,options) {
     var addPwmFormID = 'addPwmFormID' in options ? options['addPwmFormID'] : true;
     var ajaxTimeout = options['ajaxTimeout'] ? options['ajaxTimeout'] : PWM_MAIN.ajaxTimeout;
     var requestHeaders = {};
-    requestHeaders['Accept'] = "application/json";
+    requestHeaders['Accept'] = responseMimeType;
     if (hasContent) {
-        requestHeaders['Content-Type'] = "application/json";
+        requestHeaders['Content-Type'] = responseMimeType;
     }
 
     require(["dojo/request/xhr","dojo","dojo/json"], function (xhr,dojo,dojoJson) {
@@ -1836,7 +1870,7 @@ PWM_MAIN.ajaxRequest = function(url,loadFunction,options) {
             //encoding: "utf-8",
             method: method,
             preventCache: false,
-            handleAs: "json",
+            handleAs: handleAs,
             timeout: ajaxTimeout
         };
 

webapp/src/main/webapp/public/resources/js/responses.js

@@ -30,28 +30,26 @@ PWM_VAR['simpleRandomOptions'] = [];
 // takes response values in the fields, sends an http request to the servlet
 // and then parses (and displays) the response from the servlet.
 PWM_RESPONSES.validateResponses=function() {
-    require(["dojo/dom-form"], function(domForm){
-        var serviceUrl = PWM_MAIN.addParamToUrl(window.location.href,"processAction","validateResponses");
-        if (PWM_GLOBAL['responseMode']) {
-            serviceUrl += "&responseMode=" + PWM_GLOBAL['responseMode'];
+    var serviceUrl = PWM_MAIN.addParamToUrl(window.location.href,"processAction","validateResponses");
+    if (PWM_GLOBAL['responseMode']) {
+        serviceUrl += "&responseMode=" + PWM_GLOBAL['responseMode'];
+    }
+    var validationProps = {};
+    validationProps['messageWorking'] = PWM_MAIN.showString('Display_CheckingResponses');
+    validationProps['serviceURL'] = serviceUrl;
+    validationProps['readDataFunction'] = function(){
+        return PWM_MAIN.JSLibrary.formToValueMap(PWM_MAIN.getObject('form-setupResponses'));
+    };
+    validationProps['processResultsFunction'] = function(data){
+        if (data) {
+            PWM_RESPONSES.updateDisplay(data['data']);
+        } else {
+            console.log('did not receive valid response for validation check from server');
+            PWM_MAIN.getObject("button-setResponses").disabled = false;
         }
-        var validationProps = {};
-        validationProps['messageWorking'] = PWM_MAIN.showString('Display_CheckingResponses');
-        validationProps['serviceURL'] = serviceUrl;
-        validationProps['readDataFunction'] = function(){
-            return domForm.toObject('form-setupResponses');
-        };
-        validationProps['processResultsFunction'] = function(data){
-            if (data) {
-                PWM_RESPONSES.updateDisplay(data['data']);
-            } else {
-                console.log('did not receive valid response for validation check from server');
-                PWM_MAIN.getObject("button-setResponses").disabled = false;
-            }
-        };
+    };
 
-        PWM_MAIN.pwmFormValidator(validationProps);
-    });
+    PWM_MAIN.pwmFormValidator(validationProps);
 };
 
 PWM_RESPONSES.updateDisplay=function(resultInfo) {

webapp/src/main/webapp/public/resources/style.css

@@ -1041,8 +1041,7 @@ progress[value] {
 }
 
 .dialogBody.wide {
-    width: 95%;
-    max-width: 100%;
+    width: 750vw;
     min-width: 800px;
 }