From 010474e31c4df297fb720affab32c3a54b78c50a Mon Sep 17 00:00:00 2001 From: David Poindexter Date: Sun, 30 May 2021 23:46:31 -0400 Subject: [PATCH] Commit linter auto-fixes across JS and JSX files Some dependency bot, somewhere along the way, turned on auto-fix. This is simply to commit those auto-fixes by the linter. This will help prevent huge diffs on every local build. Yay! --- .../components/AdminLog/EmailPanel/index.jsx | 10 +- .../src/components/AdminLog/index.jsx | 16 +- .../src/components/LogSettings/index.jsx | 2 +- .../src/components/BackTo/BackTo.jsx | 2 +- .../Pages.Web/src/actions/pageSeoActions.js | 2 +- .../src/components/AddPages/AddPages.jsx | 2 +- .../Pages.Web/src/components/App.jsx | 78 +- .../src/components/Appearance/Appearance.jsx | 20 +- .../DropdownDayPicker/DropdownDayPicker.jsx | 62 +- .../Modules/ModuleEdit/ModuleEdit.jsx | 24 +- .../Modules/ModuleRow/ModuleRow.jsx | 2 +- .../src/components/Modules/Modules.jsx | 14 +- .../Pages.Web/src/components/More/More.jsx | 10 +- .../PageDetailsFooter/DisplayInMenu.jsx | 2 +- .../PageDetailsFooter/EnableScheduling.jsx | 2 +- .../PageDetailsFooter/Template.jsx | 2 +- .../PageDetails/PageUrl/PageFile/PageFile.jsx | 2 +- .../PageUrl/PageUrlCommons/PageUrlCommons.jsx | 4 +- .../components/PageLocalization/Module.jsx | 2 +- .../components/PageLocalization/Notify.jsx | 2 +- .../PageLocalization/PageLanguage.jsx | 34 +- .../PageLocalization/PageLocalization.jsx | 10 +- .../components/PageSettings/PageSettings.jsx | 4 +- .../PageTypeSelector/PageTypeSelector.jsx | 14 +- .../SearchPage/LazyLoad/LazyLoad.jsx | 2 +- .../components/SearchPage/SearchAdvanced.jsx | 4 +- .../SearchPage/SearchAdvancedDetails.jsx | 8 +- .../components/SearchPage/SearchResult.jsx | 76 +- .../src/components/Seo/PageUrls/EditUrl.jsx | 6 +- .../src/components/Seo/PageUrls/UrlRow.jsx | 2 +- .../Pages.Web/src/components/Seo/Seo.jsx | 2 +- .../components/common/Scheduler/Scheduler.jsx | 2 +- .../src/PersonaBarPageTreeParentExpand.jsx | 14 +- .../src/_PersonaBarDraftPencilIcon.jsx | 4 +- .../src/_PersonaBarExpandCollapseIcon.jsx | 4 +- .../src/_PersonaBarPageIcon.jsx | 4 +- .../src/_PersonaBarSelectionArrow.jsx | 10 +- .../src/_PersonaBarTreeInContextMenu.jsx | 6 +- .../RoleEditor/RoleGroupEditor/index.jsx | 2 +- .../components/roles/UsersInRole/index.jsx | 2 +- .../Roles.Web/src/components/roles/index.jsx | 2 +- .../ipFilters/ipFilterEditor/index.jsx | 36 +- .../src/components/memberManagement/index.jsx | 2 +- .../SiteGroups.Web/src/components/App.jsx | 190 ++--- .../src/components/AssignedSelector.jsx | 178 ++-- .../SiteGroups.Web/src/components/Editor.jsx | 240 +++--- .../src/components/NewGroup.jsx | 104 +-- .../SiteGroups.Web/src/components/Row.jsx | 460 +++++------ .../SiteGroups.Web/src/components/Table.jsx | 198 ++--- .../SiteSettings.Web/src/components/App.jsx | 2 +- .../components/basicSearchSettings/index.jsx | 2 +- .../src/components/basicSettings/index.jsx | 2 +- .../components/defaultPagesSettings/index.jsx | 4 +- .../resourceEditor/index.jsx | 2 +- .../languages/languageEditor/index.jsx | 2 +- .../languageEditor/roles/RoleRow/index.jsx | 2 +- .../src/components/moreSettings/index.jsx | 772 +++++++++--------- .../src/components/privacySettings/index.jsx | 742 ++++++++--------- .../profilePropertyEditor/index.jsx | 4 +- .../siteAliasSettings/siteAliases/index.jsx | 2 +- .../siteAliases/siteAliasEditor/index.jsx | 4 +- .../components/siteLanguageSelector/index.jsx | 2 +- .../src/Components/ExportPortal/index.jsx | 744 ++++++++--------- .../ListView/PortalListItem/MainLabel.jsx | 12 +- .../ListView/PortalListItem/index.jsx | 4 +- .../ListView/PortalListItem/statistic.jsx | 2 +- .../src/Components/ListView/index.jsx | 12 +- .../Sites.Web/src/components/App.jsx | 134 +-- .../src/components/CreatePortal/index.jsx | 28 +- .../src/components/PortalList/index.jsx | 152 ++-- .../src/components/CreateUserBox/index.jsx | 34 +- .../src/components/FiltersBar/index.jsx | 4 +- .../UserTable/ChangePassword/index.jsx | 2 +- .../components/UserTable/DetailRow/index.jsx | 6 +- .../UserTable/EditProfile/index.jsx | 6 +- .../components/UserTable/HeaderRow/index.jsx | 62 +- .../components/UserTable/UserMenu/index.jsx | 18 +- .../UserTable/UserMenu/menu/Menu.jsx | 2 +- .../UserTable/UserMenu/menu/MenuItem.jsx | 2 +- .../UserTable/UserSettings/index.jsx | 2 +- .../UserTable/UsersRoles/RoleRow/index.jsx | 2 +- .../common/CollapsibleSwitcher/index.jsx | 2 +- .../src/components/common/Password/index.jsx | 2 +- .../Users.Web/src/_exportables/src/helpers.js | 4 +- .../Users.Web/src/components/App.jsx | 2 +- .../Users.Web/src/components/Body/index.jsx | 4 +- 86 files changed, 2332 insertions(+), 2332 deletions(-) diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/EmailPanel/index.jsx b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/EmailPanel/index.jsx index 12f39a551f4..18d4d7774ac 100644 --- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/EmailPanel/index.jsx +++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/EmailPanel/index.jsx @@ -106,7 +106,7 @@ class EmailPanel extends Component { labelType="inline" tooltipMessage={Localization.get("plEmailAddress.Help")} label={Localization.get("plEmailAddress")} - /> + /> + /> + />
diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/index.jsx b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/index.jsx index f5519737492..02701ca9d8d 100644 --- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/index.jsx +++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/index.jsx @@ -1,4 +1,4 @@ -import PropTypes from 'prop-types'; +import PropTypes from "prop-types"; import React, { Component } from "react"; import { connect } from "react-redux"; import { @@ -6,7 +6,7 @@ import { } from "../../actions"; import LogItemRow from "./LogItemRow"; import EmailPanel from "./EmailPanel"; -import { Checkbox, Dropdown, Pager, TextOverflowWrapper } from "@dnnsoftware/dnn-react-common" +import { Checkbox, Dropdown, Pager, TextOverflowWrapper } from "@dnnsoftware/dnn-react-common"; import "./style.less"; import util from "../../utils"; import Localization from "localization"; @@ -272,7 +272,7 @@ class AdminLogPanelBody extends Component { pageSizeOptionText={"{0} results per page"} summaryText={"Showing {0}-{1} of {2} results"} culture={util.utilities.getCulture() } - /> + />
); } @@ -319,7 +319,7 @@ class AdminLogPanelBody extends Component { options={portalOptions} withBorder={false} onSelect={this.onSelectPortal.bind(this) } - /> + /> } {state.logTypeList.length > 0 && @@ -330,7 +330,7 @@ class AdminLogPanelBody extends Component { options={logTypeOptions} withBorder={false} onSelect={this.onSelectLogType.bind(this) } - /> + /> } {(canEdit || util.settings.isAdmin) && @@ -340,7 +340,7 @@ class AdminLogPanelBody extends Component { text={Localization.get("btnEmail") } maxWidth={100} enabled={canEdit || util.settings.isAdmin} - /> + />
+ />
} {isHost &&
+ />
} diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/LogSettings/index.jsx b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/LogSettings/index.jsx index 708fe4cbbf5..c76fde1c3eb 100644 --- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/LogSettings/index.jsx +++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/LogSettings/index.jsx @@ -1,4 +1,4 @@ -import PropTypes from 'prop-types'; +import PropTypes from "prop-types"; import React, { Component } from "react"; import { connect } from "react-redux"; import { diff --git a/Dnn.AdminExperience/ClientSide/Bundle.Web/src/components/BackTo/BackTo.jsx b/Dnn.AdminExperience/ClientSide/Bundle.Web/src/components/BackTo/BackTo.jsx index e6416668df4..ef0443e9744 100644 --- a/Dnn.AdminExperience/ClientSide/Bundle.Web/src/components/BackTo/BackTo.jsx +++ b/Dnn.AdminExperience/ClientSide/Bundle.Web/src/components/BackTo/BackTo.jsx @@ -1,4 +1,4 @@ -import PropTypes from 'prop-types'; +import PropTypes from "prop-types"; import React from "react"; import styles from "./style.less"; import { ArrowBack } from "@dnnsoftware/dnn-react-common"; diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/actions/pageSeoActions.js b/Dnn.AdminExperience/ClientSide/Pages.Web/src/actions/pageSeoActions.js index 6b8fc55a28f..d7447e36098 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/actions/pageSeoActions.js +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/actions/pageSeoActions.js @@ -62,7 +62,7 @@ const pageSeoActions = { utils.notifyError(response.ErrorMessage); // DNN-30998: Adding SuggestedUrl returned by the server in case of validation errors - if(response.SuggestedUrlPath) + if (response.SuggestedUrlPath) { dispatch({ type: ActionTypes.SEO_CHANGE_URL, diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/AddPages/AddPages.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/AddPages/AddPages.jsx index be339759656..5a679bea551 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/AddPages/AddPages.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/AddPages/AddPages.jsx @@ -10,7 +10,7 @@ import DisplayInMenu from "./DisplayInMenu"; import EnableScheduling from "./EnableScheduling"; class AddPages extends Component { - constructor(props){ + constructor(props) { super(props); this._isFinishLoad = false; diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx index b12a9168c90..532d5f77292 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/App.jsx @@ -157,7 +157,7 @@ class App extends Component { } componentDidUpdate(prevProps) { - if (this.props.error && this.props.error && this.props.error !== prevProps.error){ + if (this.props.error && this.props.error && this.props.error !== prevProps.error) { const errorMessage = (this.props.error && this.props.error.message) || Localization.get("AnErrorOccurred"); utils.notifyError(errorMessage); } @@ -259,19 +259,19 @@ class App extends Component { } break; case Array.isArray(item.childListItems) === true: { - const lastIndex = item.childListItems.length - 1; - if (item.childListItems[lastIndex].name === page.name) { - item.childListItems.pop(); - } - item.childListItems.push(page); - item.childCount = item.childListItems.length; - if (page.canAddContentToPage) - this.onLoadPage(page.id); - else { - this.onNoPermissionSelection(page.id); - } - break; + const lastIndex = item.childListItems.length - 1; + if (item.childListItems[lastIndex].name === page.name) { + item.childListItems.pop(); } + item.childListItems.push(page); + item.childCount = item.childListItems.length; + if (page.canAddContentToPage) + this.onLoadPage(page.id); + else { + this.onNoPermissionSelection(page.id); + } + break; + } } item.isOpen = true; updateStore(list); @@ -426,7 +426,7 @@ class App extends Component { let runUpdateStore = null; let pageList = null; - if(parentId !== null && parentId !== -1) { + if (parentId !== null && parentId !== -1) { this._traverse((item, list, updateStore) => { if (item.id === parentId) { item.isOpen = true; @@ -531,18 +531,18 @@ class App extends Component { this.props.getNewPage(parentPage).then(()=>{ if (parentPage && parentPage.id) { this.props.getChildPageList(parentPage.id) - .then(pageChildItems => { - this._traverse((item, list, update) => { - const updateChildItems = () => { - const newPageChildItems = pageChildItems.concat(this.props.selectedPage); - item.childListItems = newPageChildItems; - item.isOpen = true; - item.hasChildren = true; - update(list); - }; - (item.id === parentPage.id) ? updateChildItems() : null; + .then(pageChildItems => { + this._traverse((item, list, update) => { + const updateChildItems = () => { + const newPageChildItems = pageChildItems.concat(this.props.selectedPage); + item.childListItems = newPageChildItems; + item.isOpen = true; + item.hasChildren = true; + update(list); + }; + (item.id === parentPage.id) ? updateChildItems() : null; + }); }); - }); } else { this._traverse((item, list, updateStore) => { pageList = list; @@ -782,19 +782,19 @@ class App extends Component { this.props.selectPageSettingTab(index); } - onSaveMultiplePages(){ + onSaveMultiplePages() { return this.props.onSaveMultiplePages(()=>{ this.props.getPageList(); }); } - onValidateMultiplePages(){ + onValidateMultiplePages() { return this.props.onValidateMultiplePages(()=>{ // stay on same page }); } - onCancelAddMultiplePages(){ + onCancelAddMultiplePages() { const { props } = this; if (props.dirtyBulkPage) { @@ -815,13 +815,13 @@ class App extends Component { getAddPages() { const { props } = this; return ( - ); + ); } onCancelSaveCustomDetail(onCancelSave) { @@ -867,8 +867,8 @@ class App extends Component { getSaveAsTemplatePage() { return ( - ); + ); } @@ -1210,7 +1210,7 @@ class App extends Component { },()=>this.onSearch(this.state.searchTerm)); } - clearAdvancedSearchDateInterval(){ + clearAdvancedSearchDateInterval() { let date = new Date(); this.setState({ startDate:date, @@ -1554,7 +1554,7 @@ class App extends Component { const { inSearch } = this.state; const isListPagesAllowed = securityService.canSeePagesList(); - /* eslint-disable react/no-danger */ + /* eslint-disable react/no-danger */ return (
this.node = node} className="pages-app personaBar-mainContainer"> diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Appearance/Appearance.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Appearance/Appearance.jsx index 236af88535f..65b01b6e8e2 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Appearance/Appearance.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Appearance/Appearance.jsx @@ -17,16 +17,16 @@ class Appearance extends Component { const { page, onRetrieveThemes, onRetrieveThemeFiles } = this.props; onRetrieveThemes().then(data => { - if(!data || data.success === false) { - return; - } - const { defaultPortalThemeName, defaultPortalThemeLevel } = this.props; - const selectedThemeName = page.themeName || defaultPortalThemeName; - const selectedThemeLevel = page.themeLevel || defaultPortalThemeLevel; - if (selectedThemeName) { - onRetrieveThemeFiles(selectedThemeName, selectedThemeLevel); - } - }); + if (!data || data.success === false) { + return; + } + const { defaultPortalThemeName, defaultPortalThemeLevel } = this.props; + const selectedThemeName = page.themeName || defaultPortalThemeName; + const selectedThemeLevel = page.themeLevel || defaultPortalThemeLevel; + if (selectedThemeName) { + onRetrieveThemeFiles(selectedThemeName, selectedThemeLevel); + } + }); } componentDidUpdate(prevProps) { diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/DropdownDayPicker/DropdownDayPicker.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/DropdownDayPicker/DropdownDayPicker.jsx index 69dfc2065cb..bf009ff4c90 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/DropdownDayPicker/DropdownDayPicker.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/DropdownDayPicker/DropdownDayPicker.jsx @@ -42,39 +42,39 @@ class DropdownDayPicker extends Component {
toggleDropdownCalendar() }/> + className="calendar-icon" + dangerouslySetInnerHTML={{__html:CalendarIcon}} + onClick={()=>toggleDropdownCalendar() }/> -
- - - onDayClick(data, false) }/> - - - onDayClick(data, true) }/> - - -
- - -
- +
+ + + onDayClick(data, false) }/> -
- -
- ); + + onDayClick(data, true) }/> + + +
+ + +
+ + +
+ +
+ ); } } diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleEdit/ModuleEdit.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleEdit/ModuleEdit.jsx index 9425496bbb3..3848656c8dc 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleEdit/ModuleEdit.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleEdit/ModuleEdit.jsx @@ -26,8 +26,8 @@ class ModuleEdit extends Component { onIFrameLoad() { const iframe = this.iframeRef; const location = iframe.contentWindow.location.href; - if(location.toLowerCase().indexOf("popup") === -1){ - if(this.closeOnEndRequest){ + if (location.toLowerCase().indexOf("popup") === -1) { + if (this.closeOnEndRequest) { this.props.onUpdatedModuleSettings(); } else { this.redirectUrl(location); @@ -48,16 +48,16 @@ class ModuleEdit extends Component { beginRequestHandler(pageRequestManager, beginRequestEventArgs) { const postBackElement = beginRequestEventArgs._postBackElement; this.closeOnEndRequest = postBackElement.id === ("dnn_ctr" + this.props.module.id + "_ModuleSettings_cmdUpdate"); - if(!this.closeOnEndRequest){ + if (!this.closeOnEndRequest) { this.closeOnEndRequest = postBackElement.id.indexOf("dnn_ctr" + this.props.module.id) > -1 && postBackElement.id.match(/Close$|Cancel$|Save$/) !== null; } } - checkUrlType(){ + checkUrlType() { const {props} = this; let editUrl = ""; - switch(props.editType){ + switch (props.editType) { case "content": editUrl = props.module.editContentUrl; break; @@ -66,8 +66,8 @@ class ModuleEdit extends Component { break; } - if(editUrl !== ""){ - if(editUrl.toLowerCase().indexOf('popup') === -1){ + if (editUrl !== "") { + if (editUrl.toLowerCase().indexOf('popup') === -1) { this.redirectUrl(editUrl); } else { editUrl = utils.url.appendQueryString(editUrl, queryString); @@ -77,22 +77,22 @@ class ModuleEdit extends Component { } } - redirectUrl(url){ + redirectUrl(url) { utils.getUtilities().closePersonaBar(function () { window.parent.location = url; }); } - addEventListener(){ + addEventListener() { const iframe = this.iframeRef; - if(iframe){ + if (iframe) { iframe.addEventListener("load", this.onIFrameLoad); } } - removeEventListener(){ + removeEventListener() { const iframe = this.iframeRef; - if(iframe){ + if (iframe) { iframe.removeEventListener("load", this.onIFrameLoad); } } diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleRow/ModuleRow.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleRow/ModuleRow.jsx index 2078a222ba4..2869492c131 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleRow/ModuleRow.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/ModuleRow/ModuleRow.jsx @@ -25,7 +25,7 @@ class ModuleRow extends Component { {showCopySettings && + onChange={onCopyChange.bind(this, module.id, "includedInCopy")} /> } diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/Modules.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/Modules.jsx index aa95665abfb..7f1923e955b 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/Modules.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Modules/Modules.jsx @@ -28,7 +28,7 @@ class Modules extends Component { }); } - onEditingModule(editType, module){ + onEditingModule(editType, module) { const { onEditingModule } = this.props; this.setState({editType: editType}, () => { onEditingModule(module); @@ -40,8 +40,8 @@ class Modules extends Component { if (modules.length === 0) { return - {Localization.get("NoModules")} - ; + {Localization.get("NoModules")} + ; } return modules.map((module, index) => { @@ -69,9 +69,9 @@ class Modules extends Component { /* eslint-disable react/no-danger */
-
-
{Localization.get("ModulesOnThisPage")}
-
+
+
{Localization.get("ModulesOnThisPage")}
+
{showCopySettings && @@ -96,7 +96,7 @@ class Modules extends Component { editType={state.editType} onUpdatedModuleSettings={onCancelEditingModule} selectedPage={selectedPage} - /> } + /> }
/* eslint-enable react/no-danger */ diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/More/More.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/More/More.jsx index f3e311aee98..12c0a278ba0 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/More/More.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/More/More.jsx @@ -64,7 +64,7 @@ class More extends Component { labelType="inline" tooltipMessage={Localization.get("SecureConnection_tooltip") } label={Localization.get("SecureConnection") } - /> + /> + /> + /> {cacheProviderOptions && + />
{moduleComponents }
-
+
{Localization.get("TranslatedCheckbox") }
-
+
{Localization.get("PublishedCheckbox") }
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageLocalization/PageLocalization.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageLocalization/PageLocalization.jsx index 071833f998f..329974b5ebe 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageLocalization/PageLocalization.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageLocalization/PageLocalization.jsx @@ -41,22 +41,22 @@ class PageLocalization extends Component { this.setState({ Pages }); } - removeLocaleFromState(cultureCode){ + removeLocaleFromState(cultureCode) { const {Locales} = this.state; let index = Locales.findIndex(l => l.CultureCode === cultureCode); - if(index > -1){ + if (index > -1) { Locales.splice(index, 1); this.setState({ Locales }); } } - onDeletePage(page){ + onDeletePage(page) { return new Promise((resolve) => { this.props.onDeletePage({tabId: page.TabId}); resolve(); }).then(() => { this.removeLocaleFromState(page.CultureCode); - if(page.TabId === utils.getCurrentPageId()){ + if (page.TabId === utils.getCurrentPageId()) { let panelId = window.$('.socialpanel:visible').attr('id'); utils.getUtilities().panelViewData(panelId, {tab: [0]}); window.top.location.href = utils.getDefaultPageUrl(); @@ -160,7 +160,7 @@ class PageLocalization extends Component { onUpdatePages={this.onUpdatePages.bind(this) } onUpdateModules={this.onUpdateModules.bind(this) } onDeletePage={this.onDeletePage.bind(this)} - />; + />; } renderDefaultPageLanguage() { diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageSettings/PageSettings.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageSettings/PageSettings.jsx index 274f31ed189..e577e70a05e 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageSettings/PageSettings.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageSettings/PageSettings.jsx @@ -16,9 +16,9 @@ import permissionTypes from "../../services/permissionTypes"; class PageSettings extends Component { - constructor(){ + constructor() { super(); - this.state = { selectedPageName: "" } + this.state = { selectedPageName: "" }; } hasPageErrors() { diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageTypeSelector/PageTypeSelector.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageTypeSelector/PageTypeSelector.jsx index ecb0b4fff93..8c3a6361167 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageTypeSelector/PageTypeSelector.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/PageTypeSelector/PageTypeSelector.jsx @@ -58,8 +58,8 @@ class PageTypeSelector extends Component { render() { const { page, onChangePageType } = this.props; const createdDate = Localization.get("CreatedValue") - .replace("[CREATEDDATE]", utils.formatDateNoTime(page.createdOnDate)) - .replace("[CREATEDUSER]", page.created || "System"); + .replace("[CREATEDDATE]", utils.formatDateNoTime(page.createdOnDate)) + .replace("[CREATEDUSER]", page.created || "System"); const hierarchy = this._getHierarchyLabel(); const components = this.getComponents(); @@ -87,7 +87,7 @@ class PageTypeSelector extends Component { {Localization.get("PageParent") + ": "} - this._calculateParentPageSize(parentPageRef)} > + this._calculateParentPageSize(parentPageRef)} > {hierarchy} @@ -102,7 +102,7 @@ class PageTypeSelector extends Component {
- {Localization.get("PageId") + ": "} + {Localization.get("PageId") + ": "} {page.tabId} @@ -117,9 +117,9 @@ class PageTypeSelector extends Component { diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/LazyLoad/LazyLoad.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/LazyLoad/LazyLoad.jsx index f282bb9bc61..254f206beb3 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/LazyLoad/LazyLoad.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/LazyLoad/LazyLoad.jsx @@ -10,7 +10,7 @@ class LazyLoad extends Component { }; } - componentDidUpdate(prevProps){ + componentDidUpdate(prevProps) { if (this.props.filtersUpdated !== prevProps.filtersUpdated) { this.setState({ page:0 diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvanced.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvanced.jsx index a853a9c2d14..b7e3fe21a4f 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvanced.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvanced.jsx @@ -37,7 +37,7 @@ class SearchAdvanced extends Component {
- {this.state.collapsed && + {this.state.collapsed && - } + } ); diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvancedDetails.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvancedDetails.jsx index 219119dcaa1..7898efb1477 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvancedDetails.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchAdvancedDetails.jsx @@ -43,10 +43,10 @@ class SearchAdvancedDetails extends Component { getPageStatusLabel() { return ( this.props.filterByPublishStatus ? - this.props.getFilterByPageStatusOptions().find( - x => x.value === this.props.filterByPublishStatus.toLowerCase() - ).label : - Localization.get("FilterbyPublishStatusText")); + this.props.getFilterByPageStatusOptions().find( + x => x.value === this.props.filterByPublishStatus.toLowerCase() + ).label : + Localization.get("FilterbyPublishStatusText")); } onClear() { diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchResult.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchResult.jsx index 1ba1ce8d3e6..2c6f2e944cf 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchResult.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/SearchPage/SearchResult.jsx @@ -53,48 +53,48 @@ class SearchResult extends Component {

{searchResult.TotalResults === 0 ? Localization.get("NoPageFound").toUpperCase() : (`${searchResult.TotalResults} ` + Localization.get(searchResult.TotalResults > 1 ? "lblPagesFound" : "lblPageFound").toUpperCase())}

-
- - {searchList.map((item,index) => { - return ( - - );})} - +
+ + {searchList.map((item,index) => { + return ( + + );})} +
- :null); + :null); } } diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/EditUrl.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/EditUrl.jsx index 55d52656d4e..b446b0c2313 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/EditUrl.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/EditUrl.jsx @@ -113,9 +113,9 @@ class EditUrl extends Component { tooltipMessage={Localization.get("Pages_Seo_SelectedAliasUsage.Help")} label={Localization.get("Pages_Seo_SelectedAliasUsage")} /> + options={siteAliasUsageOptions} + onChange={this.onChangeField.bind(this, "siteAliasUsage")} + value={url.siteAliasUsage}/> } diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/UrlRow.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/UrlRow.jsx index 8b13a62e10b..710099e45e4 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/UrlRow.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/PageUrls/UrlRow.jsx @@ -43,7 +43,7 @@ class UrlRow extends Component { /* eslint-disable react/no-danger */
- {url.path} + {url.path} {url.statusCode.Value} diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/Seo.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/Seo.jsx index 5e3f87b33d9..fef55623043 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/Seo.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/Seo/Seo.jsx @@ -64,7 +64,7 @@ class Seo extends Component { labelType="inline" tooltipMessage={Localization.get("AllowIndexing_tooltip") } label={Localization.get("AllowIndexing") } - /> + /> + /> + ); } - render_parentExpandIcon(item){ + render_parentExpandIcon(item) { return ( ); } - render_parentExpandButton(item){ + render_parentExpandButton(item) { const {getChildListItems} = this.props; return (
{getChildListItems(item.id);}} > - { item.childCount > 0 ? this.render_parentExpandIcon(item) :
} + { item.childCount > 0 ? this.render_parentExpandIcon(item) :
}
); } @@ -47,7 +47,7 @@ export class PersonaBarPageTreeParentExpand extends Component { style={{height:"28px"}}>
- {this.render_parentExpandButton(item)} + {this.render_parentExpandButton(item)}
{ item.childListItems && item.isOpen ? this.render_tree(item.childListItems) : null } diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarDraftPencilIcon.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarDraftPencilIcon.jsx index 2b478016529..7cbc7e5c39b 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarDraftPencilIcon.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarDraftPencilIcon.jsx @@ -5,14 +5,14 @@ import { SvgIcons } from "@dnnsoftware/dnn-react-common"; export default class PersonaBarPageIcon extends Component { - render_icon(hasUnpublishedChanges){ + render_icon(hasUnpublishedChanges) { /*eslint-disable react/no-danger*/ switch (true) { case hasUnpublishedChanges === true: return (
); case hasUnpublishedChanges === false: - return (
); + return (
); default: return (
); } diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarExpandCollapseIcon.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarExpandCollapseIcon.jsx index 55661dc3eeb..c24109a8849 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarExpandCollapseIcon.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarExpandCollapseIcon.jsx @@ -5,10 +5,10 @@ import { SvgIcons } from "@dnnsoftware/dnn-react-common"; export default class PersonaBarExpandCollapseIcon extends Component { - render(){ + render() { const {isOpen, item} = this.props; /*eslint-disable react/no-danger*/ - return( + return (
{isOpen ?
:
}
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarPageIcon.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarPageIcon.jsx index a91d27423c9..4d556fa6a9c 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarPageIcon.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarPageIcon.jsx @@ -7,8 +7,8 @@ export default class PersonaBarPageIcon extends Component { /* eslint-disable react/no-danger */ selectIcon(number) { - /*eslint-disable react/no-danger*/ - switch(number) { + /*eslint-disable react/no-danger*/ + switch (number) { case "normal": return (
); diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarSelectionArrow.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarSelectionArrow.jsx index 9ced3eed7d5..3ffc74d2108 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarSelectionArrow.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarSelectionArrow.jsx @@ -14,7 +14,7 @@ export default class PersonaBarSelectionArrow extends Component { }; } - hasAtLeastOnePermission(item){ + hasAtLeastOnePermission(item) { switch (true) { case item.canViewPage: case item.canManagePage: @@ -51,10 +51,10 @@ export default class PersonaBarSelectionArrow extends Component { return
-
- {this.state.showMenu && +
+ {this.state.showMenu && - } + }
; } @@ -63,7 +63,7 @@ export default class PersonaBarSelectionArrow extends Component { /*eslint-disable react/no-danger*/ return (
+ className="selection-arrow"> {item.selected ?
:
} {item.selected ? this.renderMoreActions() :
}
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarTreeInContextMenu.jsx b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarTreeInContextMenu.jsx index 87a063cce52..5c8eb861178 100644 --- a/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarTreeInContextMenu.jsx +++ b/Dnn.AdminExperience/ClientSide/Pages.Web/src/components/dnn-persona-bar-page-treeview/src/_PersonaBarTreeInContextMenu.jsx @@ -56,7 +56,7 @@ export class PersonaBarTreeInContextMenu extends Component { const editable = item.canAddContentToPage && (item.pageType !== "tab" && item.pageType !== "url" && item.pageType !== "file"); - if(item.canAddPage) { + if (item.canAddPage) { visibleMenus.push({ key: "Add", title: Localization.get("AddPage"), @@ -65,7 +65,7 @@ export class PersonaBarTreeInContextMenu extends Component { onClick: this.onItemClick }); } - if(item.canViewPage) { + if (item.canViewPage) { visibleMenus.push({ key: "View", title: Localization.get("View"), @@ -75,7 +75,7 @@ export class PersonaBarTreeInContextMenu extends Component { }); } - if(editable) { + if (editable) { visibleMenus.push({ key: "Edit", title: Localization.get("Edit"), diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx index e91a9df1772..f2b25b8ab5c 100644 --- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx +++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/RoleEditor/RoleGroupEditor/index.jsx @@ -39,7 +39,7 @@ class RoleGroupEditor extends Component { // before the handleClick handler is called, but in spite of that, the handleClick is executed. To avoid // the "findDOMNode was called on an unmounted component." error we need to check if the component is mounted before execute this code if (!this._isMounted) { return; } - var node = this.rootElement !== undefined ? this.rootElement.current : null; + let node = this.rootElement !== undefined ? this.rootElement.current : null; if (node && !node.contains(event.target) && (event.target.firstChild !== null && typeof event.target.firstChild.className === "string" && event.target.firstChild.className.indexOf("do-not-close") === -1)) { if (typeof this.props.onCancel === "function") { diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/index.jsx index 40768929d73..9c95e266c34 100644 --- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/index.jsx +++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/UsersInRole/index.jsx @@ -177,7 +177,7 @@ class UsersInRole extends Component { totalRecords={this.props.totalRecords} onPageChanged={this.onPageChanged.bind(this) } culture={util.utilities.getCulture()} - />; + />; } render() { const {state} = this; diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/index.jsx b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/index.jsx index 9c7f8d3839a..a054b00131e 100644 --- a/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/index.jsx +++ b/Dnn.AdminExperience/ClientSide/Roles.Web/src/components/roles/index.jsx @@ -227,7 +227,7 @@ class RolesPanel extends Component { roleGroups={this.props.roleGroups} onKeywordChanged={this.onKeywordChanged.bind(this)} DeleteAllowed={state.deleteAllowed} - /> + />
{this.renderHeader()}
diff --git a/Dnn.AdminExperience/ClientSide/Security.Web/src/components/ipFilters/ipFilterEditor/index.jsx b/Dnn.AdminExperience/ClientSide/Security.Web/src/components/ipFilters/ipFilterEditor/index.jsx index 461c1cebd84..172120d8e78 100644 --- a/Dnn.AdminExperience/ClientSide/Security.Web/src/components/ipFilters/ipFilterEditor/index.jsx +++ b/Dnn.AdminExperience/ClientSide/Security.Web/src/components/ipFilters/ipFilterEditor/index.jsx @@ -39,18 +39,18 @@ class IpFilterEditor extends Component { const {props} = this; if (props.ipFilterId) { props.dispatch(SecurityActions.getIpFilter({ - filterId: props.ipFilterId - }, (data) => { - let ipFilter = Object.assign({}, data.Results); - this.setState({ - error: { - ip: false, - mask: false - }, - ruleSpecificity: ipFilter.SubnetMask === "" ? SINGLE_IP : IP_RANGE, - ipFilter - }); - })); + filterId: props.ipFilterId + }, (data) => { + let ipFilter = Object.assign({}, data.Results); + this.setState({ + error: { + ip: false, + mask: false + }, + ruleSpecificity: ipFilter.SubnetMask === "" ? SINGLE_IP : IP_RANGE, + ipFilter + }); + })); } } @@ -87,7 +87,7 @@ class IpFilterEditor extends Component { triedToSubmit: true }); - if(this.validateIPAddressContainsError()) { + if (this.validateIPAddressContainsError()) { return; } @@ -128,11 +128,11 @@ class IpFilterEditor extends Component { labelType="inline" tooltipMessage={resx.get("plRuleSpecifity.Help") } label={resx.get("plRuleSpecifity") } /> - +