Merge pull request #7027 from bdukes/no-useless-assignment

Resolve no-useless-assignment ESLint errors

Author: valadas

Dnn.AdminExperience/ClientSide/Dnn.React.Common/src/Tooltip/CustomIcon.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
 
- const CustomIcon = props => {
+const CustomIcon = props => {
     let Icon = props.icon;
     return <div><Icon /></div>;
 };

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/AvailableExtensions/index.jsx

@@ -105,7 +105,7 @@ class AvailableExtensions extends Component {
             <p>{Localization.get("Loading.Tooltip")}</p>
             <div><FetchingIcon /></div>
         </div>;
-        /* eslint-enable no-undef */
+         
     }
 
     render() {

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/InstalledExtensions/index.jsx

@@ -71,13 +71,13 @@ class InstalledExtensions extends Component {
 
     renderLoading() {
 
-        /* eslint-disable no-undef */
+         
         return <div className="loading-extensions">
             <h2>{Localization.get("Loading")}</h2>
             <p>{Localization.get("Loading.Tooltip")}</p>
             <div><FetchingIcon /></div>
         </div>;
-        /* eslint-enable no-undef */
+         
     }
 
     render() {

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/Body/index.jsx

@@ -71,10 +71,10 @@ class Body extends Component {
     createExtension() {
         const { props } = this;
         let _newExtension = Object.assign(newExtension, ModuleCustomSettings);
-        _newExtension = Object.assign(newExtension, CoreLanguagePack);
-        _newExtension = Object.assign(newExtension, ExtensionLanguagePack);
-        _newExtension = Object.assign(newExtension, { locales: props.locales });
-        _newExtension = Object.assign(newExtension, { packages: props.localePackages });
+        _newExtension = Object.assign(_newExtension, CoreLanguagePack);
+        _newExtension = Object.assign(_newExtension, ExtensionLanguagePack);
+        _newExtension = Object.assign(_newExtension, { locales: props.locales });
+        _newExtension = Object.assign(_newExtension, { packages: props.localePackages });
         props.dispatch(ExtensionActions.addExtension(validationMapExtensionBeingEdited(_newExtension), () => {
             this.selectPanel(2);
         }));

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/EditExtension/CustomSettings/Module/ModuleDefinitions/ModuleDefinitionRow/Controls/index.jsx

@@ -97,8 +97,8 @@ class Controls extends Component {
     }
     onSave() {
         const { props, state } = this;
-        let { triedToSave, error } = state;
-        triedToSave = true;
+        let { error, } = state;
+        let triedToSave = true;
         this.setState({
             triedToSave
         });

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/EditExtension/CustomSettings/Module/ModuleDefinitions/index.jsx

@@ -111,8 +111,8 @@ class ModuleDefinitions extends Component {
     }
     onSave() {
         const { props, state } = this;
-        let { triedToSave, error } = state;
-        triedToSave = true;
+        let { error, } = state;
+        let triedToSave = true;
         this.setState({
             triedToSave
         });

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/InstallExtensionModal/FileUpload/UploadBar.jsx

@@ -55,8 +55,12 @@ export default class UploadBar extends Component {
         let percent = props.errorText ? 0 : this.state.percent;
         let text = props.uploadComplete ? props.uploadCompleteText : props.uploadingText;
         text = props.errorText ? props.errorText : text;
-        let UploadIcon = props.uploadComplete ? Checkmark : Upload;
-        UploadIcon = props.errorText ? ErrorIcon : UploadIcon;
+        let UploadIcon =
+            props.errorText
+                ? ErrorIcon
+                : props.uploadComplete
+                    ? Checkmark
+                    : Upload;
         const className = "file-upload-container dnn-upload-bar" + (props.uploadComplete ? " complete" : "") + (props.errorText ? " upload-error" : "");
 
         return <div className={className}>

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/NewModuleModal/FromControl/index.jsx

@@ -96,14 +96,14 @@ class FromControl extends Component {
     }
 
     validateFields() {
-        let {triedToSave, newModule} = this.state;
+        let {newModule} = this.state;
         let errorCount = 0;
         Object.keys(newModule).forEach((key) => {
             if (newModule[key].error) {
                 errorCount++;
             }
         });
-        triedToSave = true;
+        let triedToSave = true;
         this.setState({
             newModule,
             triedToSave
@@ -113,8 +113,7 @@ class FromControl extends Component {
 
     onCreateNewModule() {
         let {state, props} = this;
-        let {triedToSave} = state;
-        triedToSave = true;
+        let triedToSave = true;
         if (!this.validateFields()) {
             return;
         }

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/NewModuleModal/FromManifest/index.jsx

@@ -94,14 +94,14 @@ class FromManifest extends Component {
     }
 
     validateFields() {
-        let {triedToSave, newModule} = this.state;
+        let {newModule} = this.state;
         let errorCount = 0;
         Object.keys(newModule).forEach((key) => {
             if (newModule[key].error) {
                 errorCount++;
             }
         });
-        triedToSave = true;
+        let triedToSave = true;
         this.setState({
             newModule,
             triedToSave
@@ -111,8 +111,7 @@ class FromManifest extends Component {
 
     onCreateNewModule() {
         let {state, props} = this;
-        let {triedToSave} = state;
-        triedToSave = true;
+        let triedToSave = true;
         if (!this.validateFields()) {
             return;
         }

Dnn.AdminExperience/ClientSide/Extensions.Web/src/components/NewModuleModal/FromNew/index.jsx

@@ -75,14 +75,14 @@ class FromNew extends Component {
     }
 
     validateFields() {
-        let {triedToSave, newModule} = this.state;
+        let {newModule} = this.state;
         let errorCount = 0;
         Object.keys(newModule).forEach((key) => {
             if (newModule[key].error) {
                 errorCount++;
             }
         });
-        triedToSave = true;
+        let triedToSave = true;
         this.setState({
             newModule,
             triedToSave
@@ -92,8 +92,7 @@ class FromNew extends Component {
 
     onCreateNewModule() {
         let {state, props} = this;
-        let {triedToSave} = state;
-        triedToSave = true;
+        let triedToSave = true;
         if (!this.validateFields()) {
             return;
         }