From dcd3962fe7ad4f1e99d4ac3102711c94f9f74831 Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Fri, 6 Nov 2020 10:14:18 +0100
Subject: [PATCH] Implement EnablePopups switch in portal settings PB module

---
 .../src/components/moreSettings/index.jsx     |  73 ++++---
 .../src/components/moreSettings/style.less    | 183 +++++++++++-------
 .../UpdateOtherSettingsRequest.cs             |   4 +-
 .../Services/SiteSettingsController.cs        |   7 +-
 .../App_LocalResources/SiteSettings.resx      |   9 +
 5 files changed, 173 insertions(+), 103 deletions(-)

diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/index.jsx b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/index.jsx
index 1f4ca809448..f0f3ff12666 100644
--- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/index.jsx
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/index.jsx
@@ -8,7 +8,8 @@ import {
   GridSystem,
   InputGroup,
   Label,
-  MultiLineInputWithError
+  MultiLineInputWithError,
+  Switch,
 } from "@dnnsoftware/dnn-react-common";
 import "./style.less";
 import util from "../../utils";
@@ -17,7 +18,7 @@ import styles from "./style.less";
 
 function getError(errors) {
   let hasError = false;
-  Object.keys(errors).forEach(key => {
+  Object.keys(errors).forEach((key) => {
     if (errors[key] === true) {
       hasError = true;
     }
@@ -34,7 +35,7 @@ class MoreSettingsPanelBody extends Component {
       otherSettings: undefined,
       siteBehaviorExtrasRendered: true,
       errorInSave: false,
-      whitelistOption: 0
+      whitelistOption: 0,
     };
     isHost = util.settings.isHost;
   }
@@ -42,7 +43,7 @@ class MoreSettingsPanelBody extends Component {
   loadData() {
     const { props } = this;
     props.dispatch(
-      SiteBehaviorActions.getOtherSettings(props.portalId, data => {
+      SiteBehaviorActions.getOtherSettings(props.portalId, (data) => {
         var whitelistOption = 1;
         if (
           data.Settings.AllowedExtensionsWhitelist ==
@@ -50,13 +51,14 @@ class MoreSettingsPanelBody extends Component {
         ) {
           whitelistOption = 0;
         } else if (
-          data.Settings.AllowedExtensionsWhitelist == data.Settings.ImageExtensionsList
+          data.Settings.AllowedExtensionsWhitelist ==
+          data.Settings.ImageExtensionsList
         ) {
           whitelistOption = 2;
         }
         this.setState({
           otherSettings: Object.assign({}, data.Settings),
-          whitelistOption: whitelistOption
+          whitelistOption: whitelistOption,
         });
       })
     );
@@ -66,13 +68,13 @@ class MoreSettingsPanelBody extends Component {
     const { props } = this;
     if (props.otherSettings) {
       this.setState({
-        otherSettings: props.otherSettings
+        otherSettings: props.otherSettings,
       });
       return;
     }
     this.setState({
       siteBehaviorExtrasRendered: true,
-      whitelistOption: 0
+      whitelistOption: 0,
     });
     this.loadData();
   }
@@ -112,7 +114,7 @@ class MoreSettingsPanelBody extends Component {
     otherSettings[key] = typeof event === "object" ? event.target.value : event;
 
     this.setState({
-      otherSettings: otherSettings
+      otherSettings: otherSettings,
     });
 
     props.dispatch(
@@ -132,7 +134,7 @@ class MoreSettingsPanelBody extends Component {
         () => {},
         () => {
           this.setState({
-            errorInSave: true
+            errorInSave: true,
           });
         }
       )
@@ -147,19 +149,19 @@ class MoreSettingsPanelBody extends Component {
       resx.get("No"),
       () => {
         props.dispatch(
-          SiteBehaviorActions.getOtherSettings(data => {
+          SiteBehaviorActions.getOtherSettings((data) => {
             this.setState({
-              otherSettings: Object.assign({}, data.Settings)
+              otherSettings: Object.assign({}, data.Settings),
             });
           })
         );
         this.setState(
           {
-            siteBehaviorExtrasRendered: false
+            siteBehaviorExtrasRendered: false,
           },
           () => {
             this.setState({
-              siteBehaviorExtrasRendered: true
+              siteBehaviorExtrasRendered: true,
             });
           }
         );
@@ -173,11 +175,11 @@ class MoreSettingsPanelBody extends Component {
     if (!SiteBehaviorExtras || SiteBehaviorExtras.length === 0) {
       return;
     }
-    return SiteBehaviorExtras.sort(function(a, b) {
+    return SiteBehaviorExtras.sort(function (a, b) {
       if (a.RenderOrder < b.RenderOrder) return -1;
       if (a.RenderOrder > b.RenderOrder) return 1;
       return 0;
-    }).map(data => {
+    }).map((data) => {
       return data.Component;
     });
   }
@@ -189,7 +191,7 @@ class MoreSettingsPanelBody extends Component {
 
     if (SiteBehaviorExtras && SiteBehaviorExtras.length > 0) {
       //First, loop through and check there are no errors.
-      SiteBehaviorExtras.forEach(extra => {
+      SiteBehaviorExtras.forEach((extra) => {
         const currentReducer = this.props[extra.ReducerKey];
 
         if (currentReducer.errors && getError(currentReducer.errors)) {
@@ -204,7 +206,7 @@ class MoreSettingsPanelBody extends Component {
 
       //Only go through the save if none of them have an error.
       if (!_errorInSave) {
-        SiteBehaviorExtras.forEach(extra => {
+        SiteBehaviorExtras.forEach((extra) => {
           if (typeof extra.SaveMethod === "function") {
             const currentReducer = this.props[extra.ReducerKey];
 
@@ -236,7 +238,7 @@ class MoreSettingsPanelBody extends Component {
     if (this.state.errorInSave) {
       util.utilities.notifyError(resx.get("SettingsError"));
       this.setState({
-        errorInSave: false
+        errorInSave: false,
       });
     } else {
       util.utilities.notify(resx.get("SettingsUpdateSuccess"));
@@ -248,7 +250,7 @@ class MoreSettingsPanelBody extends Component {
     const SiteBehaviorExtras =
       window.dnn.SiteSettings && window.dnn.SiteSettings.SiteBehaviorExtras;
     if (SiteBehaviorExtras && SiteBehaviorExtras.length > 0) {
-      SiteBehaviorExtras.forEach(extra => {
+      SiteBehaviorExtras.forEach((extra) => {
         if (
           this.props[extra.ReducerKey] &&
           this.props[extra.ReducerKey].formDirty
@@ -267,7 +269,7 @@ class MoreSettingsPanelBody extends Component {
     return [
       { label: resx.get("Default"), value: 0 },
       { label: resx.get("Custom"), value: 1 },
-      { label: resx.get("OnlyImages"), value: 2 }
+      { label: resx.get("OnlyImages"), value: 2 },
     ];
   }
 
@@ -317,9 +319,28 @@ class MoreSettingsPanelBody extends Component {
           {state.siteBehaviorExtrasRendered &&
             this.renderSiteBehaviorExtensions()}
           {htmlEditor}
-          <div className="sectionTitle">{resx.get("WhitelistSettings")}</div>
+          <div className="sectionTitle">{resx.get("MoreSettings")}</div>
           <GridSystem numberOfColumns={2}>
             <div key="column-one-left" className="left-column">
+              <InputGroup>
+                <Label
+                  labelType="inline"
+                  tooltipMessage={resx.get("plEnablePopups.Help")}
+                  label={resx.get("plEnablePopups")}
+                />
+                <Switch
+                  onText={resx.get("SwitchOn")}
+                  offText={resx.get("SwitchOff")}
+                  value={state.otherSettings.EnablePopups}
+                  onChange={this.onSettingChange.bind(this, "EnablePopups")}
+                />
+              </InputGroup>
+            </div>
+            <div key="column-one-right" className="left-column"></div>
+          </GridSystem>
+          <div className="sectionTitle">{resx.get("WhitelistSettings")}</div>
+          <GridSystem numberOfColumns={2}>
+            <div key="column-two-left" className="left-column">
               <InputGroup>
                 <Label
                   tooltipMessage={resx.get("plWhitelistOption.Help")}
@@ -328,11 +349,11 @@ class MoreSettingsPanelBody extends Component {
                 <Dropdown
                   options={this.getWhiteListOptions()}
                   value={state.whitelistOption}
-                  onSelect={e => this.onWhitelistOptionChange(e)}
+                  onSelect={(e) => this.onWhitelistOptionChange(e)}
                 />
               </InputGroup>
             </div>
-            <div key="column-one-right" className="right-column">
+            <div key="column-two-right" className="right-column">
               <InputGroup>
                 <Label
                   tooltipMessage={resx.get("plAllowedExtensionsWhitelist.Help")}
@@ -376,14 +397,14 @@ MoreSettingsPanelBody.propTypes = {
   portalId: PropTypes.number,
   openHtmlEditorManager: PropTypes.func,
   otherSettings: PropTypes.object,
-  otherSettingsClientModified: PropTypes.bool
+  otherSettingsClientModified: PropTypes.bool,
 };
 
 function mapStateToProps(state) {
   return {
     ...state,
     otherSettings: state.siteBehavior.otherSettings,
-    otherSettingsClientModified: state.siteBehavior.otherSettingsClientModified
+    otherSettingsClientModified: state.siteBehavior.otherSettingsClientModified,
   };
 }
 
diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/style.less b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/style.less
index e608ada49bb..21fb128da48 100644
--- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/style.less
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/src/components/moreSettings/style.less
@@ -1,88 +1,123 @@
-
 @import "~@dnnsoftware/dnn-react-common/styles/index.less";
 :local(.moreSettings) {
-    margin: 30px 30px;
-    .sectionTitle {
+  margin: 30px 30px;
+  .dnn-ui-common-input-group {
+    padding: 0 0 15px 0;
+    .dnn-label {
+      label {
         font-weight: bolder;
         float: left;
-        width: 100%;
-        padding: 30px 0 15px 0;
-        margin: 20px 0 0 0;
-        text-transform: uppercase;
-        &:first-child {
-            border-top: 0;
-            padding: 0 0 15px 0;
-            margin: 0;
-        }
+      }
     }
-    .messageBox {
-        border: 1px solid @alto;
-        background-color: @gallery;
-        margin: 20px 0;
-        clear: both;
-        padding: 10px 30px;
-        display: inline-block;
+    .dnn-label-long {
+      width: 70%;
+      label {
+        width: 70%;
+      }
     }
-    .dnn-multi-line-input-with-error {
-        display: block;
+    .dnn-single-line-input-with-error {
+      width: 100%;
+      float: left;
     }
-    .dnn-grid-system {
-        .left-column {
-            padding-right: 30px;
-            .dnn-dropdown {
-                width: 100%;
-            }
-        }
-        .right-column {
-            padding-left: 30px;
-            border-left: 1px solid @alto;
-        }
+    .dnn-dropdown {
+      width: 681px;
     }
-    .buttons-box {
-        float: left;
+    input {
+      width: auto;
+    }
+    .dnn-switch-container {
+      float: right;
+    }
+    .privacySettings-row_switch {
+      border-bottom: 1px solid @alto;
+      margin: 10px 0 0 0;
+      display: table;
+      width: 100%;
+      padding: 0 0 10px 0;
+    }
+  }
+  .sectionTitle {
+    font-weight: bolder;
+    float: left;
+    width: 100%;
+    padding: 0 0 10px 0;
+    text-transform: uppercase;
+    border-bottom: 1px solid #c8c8c8;
+    margin-bottom: 6px;
+    &:first-child {
+      border-top: 0;
+      padding: 0 0 15px 0;
+      margin: 0;
+    }
+  }
+  .messageBox {
+    border: 1px solid @alto;
+    background-color: @gallery;
+    margin: 20px 0;
+    clear: both;
+    padding: 10px 30px;
+    display: inline-block;
+  }
+  .dnn-multi-line-input-with-error {
+    display: block;
+  }
+  .dnn-grid-system {
+    .left-column {
+      padding-right: 30px;
+      .dnn-dropdown {
         width: 100%;
-        text-align: center;
-        margin: 20px 0;
-        .dnn-ui-common-button {
-            margin: 5px;
-        }
+      }
+    }
+    .right-column {
+      padding-left: 30px;
+      border-left: 1px solid @alto;
+    }
+  }
+  .buttons-box {
+    float: left;
+    width: 100%;
+    text-align: center;
+    margin: 20px 0;
+    .dnn-ui-common-button {
+      margin: 5px;
     }
-    .htmlEditorWrapper {
+  }
+  .htmlEditorWrapper {
+    float: left;
+    border: 1px solid @alto;
+    background-color: @gallery;
+    width: 100%;
+    margin: 0 0 20px 0;
+    .htmlEditorWrapper-left {
+      width: 70%;
+      float: left;
+      padding: 0 30px;
+      margin: 20px 0;
+      box-sizing: border-box;
+      .searchIndexWarning {
         float: left;
-        border: 1px solid @alto;
-        background-color: @gallery;
-        width: 100%;
-        margin: 0 0 20px 0;
-        .htmlEditorWrapper-left {
-            width: 70%;
-            float: left;
-            padding: 0 30px;
-            margin: 20px 0;
-            box-sizing: border-box;
-            .searchIndexWarning {
-                float: left;
-                font-weight: bolder;
-                margin: 10px 30px 30px 30px;
-                color: @thunder;
-            }
+        font-weight: bolder;
+        margin: 10px 30px 30px 30px;
+        color: @thunder;
+      }
+    }
+    .htmlEditorWrapper-right {
+      width: 30%;
+      float: right;
+      .dnn-ui-common-button {
+        float: right;
+        height: auto;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        margin: 0 30px 15px 0;
+        width: 70%;
+        &:first-child {
+          margin-top: 15px;
         }
-        .htmlEditorWrapper-right {
-            width: 30%;
-            float: right;
-            .dnn-ui-common-button {
-                float: right;
-                height: auto;
-                padding-top: 6px;
-                padding-bottom: 6px;
-                margin: 0 30px 15px 0;
-                width: 70%;
-                &:first-child {
-                    margin-top: 15px;
-                }
-                &:last-child {
-                    float: right;
-                }
-            }
+        &:last-child {
+          float: right;
         }
+      }
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateOtherSettingsRequest.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateOtherSettingsRequest.cs
index 397d2904db5..9e541f1aaf1 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateOtherSettingsRequest.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/DTO/SiteSettings/UpdateOtherSettingsRequest.cs
@@ -11,6 +11,8 @@ public class UpdateOtherSettingsRequest
 
         public string CultureCode { get; set; }
 
-        public string AllowedExtensionsWhitelist { get; set; }
+        public string AllowedExtensionsWhitelist { get; set; }
+
+        public bool EnablePopups { get; set; }
     }
 }
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
index 14a2676a60c..b92b910a1c8 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/SiteSettingsController.cs
@@ -3159,8 +3159,9 @@ public HttpResponseMessage GetOtherSettings(int? portalId)
                     {
                         AllowedExtensionsWhitelist = portalSettings.AllowedExtensionsWhitelist.ToStorageString(),
                         HostAllowedExtensionsWhitelists = Host.DefaultEndUserExtensionWhitelist.ToStorageString(),
-                        ImageExtensionsList = Globals.glbImageFileTypes
-                    }
+                        ImageExtensionsList = Globals.ImageFileTypes,
+                        EnablePopups = portalSettings.EnablePopUps,
+                    },
                 });
             }
             catch (Exception exc)
@@ -3184,6 +3185,7 @@ public HttpResponseMessage UpdateOtherSettings(UpdateOtherSettingsRequest reques
             try
             {
                 var pid = request.PortalId ?? this.PortalId;
+                PortalController.Instance.UpdatePortalSetting(pid, "EnablePopups", request.EnablePopups.ToString(), false, null, false);
                 if (request.AllowedExtensionsWhitelist == Host.DefaultEndUserExtensionWhitelist.ToStorageString())
                 {
                     PortalController.Instance.UpdatePortalSetting(pid, "AllowedExtensionsWhitelist", null, false, null, false);
@@ -3194,6 +3196,7 @@ public HttpResponseMessage UpdateOtherSettings(UpdateOtherSettingsRequest reques
                     whitelist = whitelist.RestrictBy(Host.AllowedExtensionWhitelist);
                     PortalController.Instance.UpdatePortalSetting(pid, "AllowedExtensionsWhitelist", whitelist.ToStorageString(), false, null, false);
                 }
+
                 DataCache.ClearCache();
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Success = true });
             }
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
index c5dc5276a8a..fc81cca08b7 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.SiteSettings/App_LocalResources/SiteSettings.resx
@@ -1470,4 +1470,13 @@
   <data name="Redirect_AfterRegistration.Text" xml:space="preserve">
     <value>Redirect After Registration</value>
   </data>
+  <data name="MoreSettings.Text" xml:space="preserve">
+    <value>More Settings</value>
+  </data>
+  <data name="plEnablePopups.Help" xml:space="preserve">
+    <value>When enabled DNN will load some standard controls in a popup. Otherwise it will reload the page and show the control embedded on a page.</value>
+  </data>
+  <data name="plEnablePopups.Text" xml:space="preserve">
+    <value>Enable Popups</value>
+  </data>
 </root>
\ No newline at end of file