Merge pull request dnnsoftware#885 from nbrane/devops/932-rc0-roundup

Update development with fixes from v9.3.2-rc
valadas · Apr 20, 2019 · 815b027 · 815b027
2 parents 0abca10 + f063012
commit 815b027
Show file tree

Hide file tree

Showing 38 changed files with 236 additions and 147 deletions.
diff --git a/.gitignore b/.gitignore
@@ -116,3 +116,4 @@ npm-debug.log
 /**/yarn-error.log
 /**/*-bundle.js
 /Extensions/Manage/Dnn.PersonaBar.Users/admin/personaBar/scripts/exportables/Users/UsersCommon.js
+Extensions/**/*.js.map
diff --git a/EditBar/Dnn.EditBar.UI/editBar/resources/ContentEditorManager/Js/ExistingModuleDialog.js b/EditBar/Dnn.EditBar.UI/editBar/resources/ContentEditorManager/Js/ExistingModuleDialog.js
@@ -135,7 +135,8 @@ if (typeof dnn.ContentEditorManager === "undefined" || dnn.ContentEditorManager
                     moduleId: '',
                     serviceRoot: 'InternalServices',
                     rootId: 'Root',
-                    parameters: { includeAllTypes: "true" }
+                    parameters: { includeAllTypes: "true" },
+                    includeDisabled: true
                 },
                 onSelectionChangedBackScript: selectPageProxyCallback
             };

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Extensions/CreateModuleController.cs
@@ -234,7 +234,7 @@ private int CreateModuleFromManifest(CreateModuleDto createModuleDto, out string
             try
             {
                 var folder = PathUtils.Instance.RemoveTrailingSlash(GetSourceFolder(createModuleDto));
-                var manifest = Path.Combine(Globals.ApplicationMapPath, "~/DesktopModules/" + folder + "/" + createModuleDto.Manifest);
+                var manifest = Path.Combine(Globals.ApplicationMapPath, "DesktopModules", folder, createModuleDto.Manifest);
                 var installer = new Installer(manifest, Globals.ApplicationMapPath, true);
 
                 if (installer.IsValid)

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckBiography.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckBiography.cs
@@ -24,9 +24,9 @@ public CheckResult Execute()
                 foreach (PortalInfo portal in portalController.GetPortals())
                 {
                     var pd = ProfileController.GetPropertyDefinitionByName(portal.PortalID, "Biography");
-                    if (pd != null && pd.DataType == richTextDataType.EntryID)
+                    if (pd != null && pd.DataType == richTextDataType.EntryID && !pd.Deleted)
                     {
-                        result.Severity = SeverityEnum.Failure;
+                        result.Severity = SeverityEnum.Warning;
                         result.Notes.Add("Portal:" + portal.PortalName);
                     }
                 }

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Utility.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Utility.cs
@@ -82,7 +82,7 @@ where FileContainsText(file, searchText)
                     let f = new FileInfo(file)
                     select new SearchFileInfo
                     {
-                        FileName = f.Name,
+                        FileName = f.FullName,
                         LastWriteTime = f.LastWriteTime.ToString(CultureInfo.InvariantCulture)
                     };
             }

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Services/CssEditorController.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Services/CssEditorController.cs
@@ -115,7 +115,7 @@ public HttpResponseMessage UpdateStyleSheet(UpdateCssRequest request)
                     //write CSS file
                     using (var writer = File.CreateText(strUploadDirectory + "portal.css"))
                     {
-                        writer.WriteLine(HttpUtility.UrlDecode(request.StyleSheetContent));
+                        writer.WriteLine(request.StyleSheetContent);
                     }
 
                     //Clear client resource cache

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SeoController.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Services/SeoController.cs
@@ -478,7 +478,7 @@ public HttpResponseMessage GetSitemapProviders()
                 {
                     p.Name,
                     p.Enabled,
-                    p.Priority,
+                    Priority = p.Priority / 100f,
                     p.OverridePriority
                 }).ToList();
 
@@ -518,7 +518,7 @@ public HttpResponseMessage UpdateSitemapProvider(UpdateSitemapProviderRequest re
                     editedProvider.OverridePriority = request.Priority > -1;
                     if (editedProvider.OverridePriority)
                     {
-                        editedProvider.Priority = request.Priority;
+                        editedProvider.Priority = request.Priority * 100;
                     }
                 }
 

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsPerformanceController.cs b/Extensions/Content/Dnn.PersonaBar.Extensions/Services/ServerSettingsPerformanceController.cs
@@ -72,7 +72,7 @@ public HttpResponseMessage GetPerformanceSettings()
                     CacheSetting = Host.PerformanceSetting,
                     AuthCacheability = Host.AuthenticatedCacheability,
                     UnauthCacheability = Host.UnauthenticatedCacheability,
-                    SslForCacheSynchronization = Host.UpgradeForceSsl,
+                    SslForCacheSynchronization = HostController.Instance.GetBoolean(UseSSLKey, false),
                     ClientResourcesManagementMode = PortalController.GetPortalSetting("ClientResourcesManagementMode", portalId, "h"),
 
                     CurrentHostVersion = Host.CrmVersion.ToString(CultureInfo.InvariantCulture),

diff --git a/...naBar.Extensions/WebApps/AdminLogs.Web/src/components/LogSettings/LogSettingRow/index.jsx b/...naBar.Extensions/WebApps/AdminLogs.Web/src/components/LogSettings/LogSettingRow/index.jsx
@@ -54,7 +54,7 @@ class LogSettingRow extends Component {
         const {props} = this;
         let opened = (this.props.openId !== "" && this.props.id === this.props.openId);
         let uniqueId = "settingrow-" + Math.random() + Date.now();
-
+        
         return (
             <div ref={node => this.node = node} className={"collapsible-component-log" + (opened ? " row-opened" : "") } id={uniqueId}>
                 {props.visible && <div className={"collapsible-header-log " + !opened} >
@@ -74,7 +74,7 @@ class LogSettingRow extends Component {
                     }
                 </div>
                 }
-                <Collapse accordion={true} isOpened={opened} style={{ float: "left" }}>{opened && props.children}</Collapse>
+                <Collapse isOpened={opened} style={{width: "100%", height: "auto"}}>{opened && props.children}</Collapse>
             </div>
         );
     }

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web/webpack.config.js b/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/AdminLogs.Web/webpack.config.js
@@ -61,5 +61,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
diff --git a/...ar.Extensions/WebApps/Extensions.Web/src/components/NewModuleModal/FromManifest/index.jsx b/...ar.Extensions/WebApps/Extensions.Web/src/components/NewModuleModal/FromManifest/index.jsx
@@ -10,7 +10,7 @@ const dropdownStyle = { width: "100%", marginBottom: 64 };
 function getValidateRequired(key) {
     switch (key) {
         case "moduleFolder":
-        case "fileName":
+        case "manifest":
             return true;
         default:
             return false;
@@ -22,7 +22,7 @@ const emptyNewModule = {
     moduleFolder: "",
     ownerFolder: "",
     addPage: true,
-    fileName: "",
+    manifest: "",
     moduleName: "",
     description: ""
 };
@@ -41,8 +41,8 @@ class FromManifest extends Component {
     UNSAFE_componentWillReceiveProps(props) {
         if (props.moduleFiles.length > 0) {
             let { newModule } = this.state;
-            newModule.fileName.value = props.moduleFiles[0].value;
-            newModule.fileName.error = false;
+            newModule.manifest.value = props.moduleFiles[0].value;
+            newModule.manifest.error = false;
 
             this.setState({
                 newModule
@@ -54,16 +54,16 @@ class FromManifest extends Component {
         const { props, state } = this;
         let {newModule, triedToSave} = this.state;
         if (key === "ownerFolder") {
-            newModule.fileName.value = "";
-            newModule.fileName.error = true;
+            newModule.manifest.value = "";
+            newModule.manifest.error = true;
             newModule.moduleFolder.value = "";
             newModule.moduleFolder.error = true;
             triedToSave = false;
             props.onSelectOwnerFolder(option.value);
         }
         if (key === "moduleFolder" && option.value !== "") {
-            newModule.fileName.value = "";
-            newModule.fileName.error = true;
+            newModule.manifest.value = "";
+            newModule.manifest.error = true;
             triedToSave = false;
             props.onSelectModuleFolder({
                 ownerFolder: state.newModule.ownerFolder.value,
@@ -134,8 +134,8 @@ class FromManifest extends Component {
         if (type === "moduleFolder") {
             newModule.moduleFolder.value = data.moduleFolder;
             newModule.moduleFolder.error = false;
-            newModule.fileName.value = "";
-            newModule.fileName.error = true;
+            newModule.manifest.value = "";
+            newModule.manifest.error = true;
             this.setState({
                 triedToSave: false
             });
@@ -188,9 +188,9 @@ class FromManifest extends Component {
                             tooltipMessage={Localization.get("NewModule_Resource.HelpText")}
                             style={dropdownStyle}
                             options={props.moduleFiles}
-                            onSelect={this.onFolderSelect.bind(this, "fileName")}
-                            value={state.newModule.fileName.value}
-                            error={state.newModule.fileName.error && state.triedToSave} />
+                            onSelect={this.onFolderSelect.bind(this, "manifest")}
+                            value={state.newModule.manifest.value}
+                            error={state.newModule.manifest.error && state.triedToSave} />
                         <Switch value={state.newModule.addPage.value}
                             tooltipMessage={Localization.get("NewModule_AddTestPage.HelpText")}
                             label={Localization.get("NewModule_AddTestPage.Label")}

diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web/webpack.config.js b/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Extensions.Web/webpack.config.js
@@ -101,5 +101,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
diff --git a/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web/webpack.config.js b/Extensions/Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web/webpack.config.js
@@ -86,5 +86,6 @@ module.exports = {
             new webpack.DefinePlugin({
                 VERSION: JSON.stringify(packageJson.version)
             })
-        ]
+        ],
+    devtool: "source-map"
 };
diff --git a/...nt/Dnn.PersonaBar.Extensions/WebApps/Pages.Web/src/components/PageLocalization/Module.jsx b/...nt/Dnn.PersonaBar.Extensions/WebApps/Pages.Web/src/components/PageLocalization/Module.jsx
@@ -47,12 +47,16 @@ class Module extends Component {
                 {!module.IsDeleted && !isDefault && <div className="icons-container">
                     <span
                         className={`icon float-left ${(module.IsShared ? " disabled" : (module.IsLocalized ? " blue" : ""))}`}
+                        title={module.IsShared ? Localization.get("LocalizedSharedModule_tooltip") : 
+                            (module.IsLocalized ? Localization.get("ClickToDeLocalizeModule_tooltip") : Localization.get("ClickToLocalizeModule_tooltip"))}
                         onClick={this.toggleLink.bind(this) }
                         dangerouslySetInnerHTML={{ __html: SvgIcons.LinkIcon }} />
-                    {module.TranslatedVisible && <Checkbox
-                        style={{ float: "left" }}
-                        value={module.IsTranslated}
-                        onChange={this.onUpdateModules.bind(this, "IsTranslated") } />}
+                    {module.TranslatedVisible && 
+                        <div title={module.IsTranslated ? Localization.get("UnCheckTranslatedModule_tooltip") : Localization.get("CheckToTranslateModule_tooltip")} style={{ float: "left", display: "inline-block" }}>
+                            <Checkbox
+                                value={module.IsTranslated}
+                                onChange={this.onUpdateModules.bind(this, "IsTranslated") } />
+                        </div>}
                 </div>}
             </div>;
         }

diff --git a/....PersonaBar.Extensions/WebApps/Pages.Web/src/components/PageLocalization/PageLanguage.jsx b/....PersonaBar.Extensions/WebApps/Pages.Web/src/components/PageLocalization/PageLanguage.jsx
@@ -132,28 +132,29 @@ class PageLanguage extends Component {
                         <span>{Localization.get("ModulesOnThisPage") }</span>
                         {!this.props.isDefault && <div className="icons-container">
                             <span
+                            title={this.state.allModulesLinked ? Localization.get("ClickToDeLocalizeAllModules_tooltip") : Localization.get("ClickToLocalizeAllModules_tooltip")}
                             className={`icon float-left ${(this.state.allModulesLinked ? " blue" : "")}`}
                             onClick={this.linkAllModules.bind(this)  }
                             dangerouslySetInnerHTML={{ __html: SvgIcons.LinkIcon }} />
+                            <div title={this.state.allModulesSelected ? Localization.get("UnCheckAllTranslatedModules_tooltip") : Localization.get("CheckToTranslateAllModules_tooltip")} style={{ float: "left", display: "inline-block"}}>
                             <Checkbox
-                            style={{ float: "left" }}
                             value={this.state.allModulesSelected}
-                            onChange={this.selectAllModules.bind(this) } />
+                            onChange={this.selectAllModules.bind(this) } /></div>
                         </div>}
                     </div>
                     {moduleComponents }
                     <div className="module-row footer">
+                        <div title={page.IsTranslated ? Localization.get("UnCheckTransaledPage_tooltip") : Localization.get("CheckToTransalePage_tooltip")} style={{float: "right", display: "inline-block" }}>
                         <Checkbox
-                            style={{ float: "right" }}
                             value={page.IsTranslated}
-                            onChange={this.onUpdatePages.bind(this, "IsTranslated") } />
+                            onChange={this.onUpdatePages.bind(this, "IsTranslated") } /></div>
                         <div>{Localization.get("TranslatedCheckbox") }</div>
                     </div>
                     <div className="module-row footer">
+                        <div title={page.IsPublished ? Localization.get("UnCheckPublishedPage_tooltip") : Localization.get("CheckToPublishPage_tooltip")} style={{ float: "right", display: "inline-block" }}>
                         <Checkbox
-                            style={{ float: "right" }}
                             value={page.IsPublished}
-                            onChange={this.onUpdatePages.bind(this, "IsPublished") } />
+                            onChange={this.onUpdatePages.bind(this, "IsPublished") } /></div>
                         <div>{Localization.get("PublishedCheckbox") }</div>
                     </div>
                 </div>
@@ -174,4 +175,4 @@ PageLanguage.propTypes = {
     isDefault: PropTypes.bool
 };
 
-export default PageLanguage;
+export default PageLanguage;
diff --git a/...n.PersonaBar.Extensions/WebApps/Pages.Web/src/components/SearchPage/LazyLoad/LazyLoad.jsx b/...n.PersonaBar.Extensions/WebApps/Pages.Web/src/components/SearchPage/LazyLoad/LazyLoad.jsx
@@ -40,7 +40,7 @@ class LazyLoad extends Component {
         return (
             <div>
                 <div>{this.props.children}</div>
-                {this.props.hasMore?<div style={{"text-align":"center"}}>{this.props.loadingComponent}</div>:null}
+                {this.props.hasMore?<div style={{textAlign:"center"}}>{this.props.loadingComponent}</div>:null}
             </div>
         );
     }