Refactoring

web/ASC.Web.Client/src/App.js

@@ -57,8 +57,8 @@ const App = () => {
       </StudioLayout>
     </Router>
   ) : (
-      <Offline />
-    );
+    <Offline />
+  );
 };
 
 export default App;

web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js

@@ -11,7 +11,7 @@ import AdvantagesContainer from "./sub-components/advantages-container";
 import ButtonContainer from "./sub-components/button-container";
 import ContactContainer from "./sub-components/contact-container";
 import {
-  setLicense /*getPortalCultures*/,
+  setLicense,
   getSalesEmail,
   getHelpUrl,
   getBuyUrl,
@@ -20,7 +20,7 @@ import {
   getStandalone,
 } from "../../../store/payments/actions";
 import { createI18N } from "../../../helpers/i18n";
-import moment from "moment";
+
 const i18n = createI18N({
   page: "PaymentsEnterprise",
   localesPath: "pages/PaymentsEnterprise",
@@ -51,8 +51,7 @@ class Body extends React.PureComponent {
     this.state = {
       errorMessage: null,
       isErrorLicense: false,
-      expiresDate: this.props.expiresDate,
-      standAloneMode: this.props.standAloneMode,
+      isLicenseSet: false,
     };
 
     document.title = `${t("Payments")} – ${t("OrganizationName")}`;
@@ -66,26 +65,27 @@ class Body extends React.PureComponent {
       getCurrentLicense,
       getSettings,
       getStandalone,
+      currentProductId,
+      setCurrentProductId,
     } = this.props;
-    this.props.currentProductId !== "payments" &&
-      this.props.setCurrentProductId("payments");
+    currentProductId !== "payments" && setCurrentProductId("payments");
     getSettings();
     // getStandalone();
-    getCurrentLicense().then(() => {
-      this.setState({ expiresDate: this.props.expiresDate });
-    });
+    getCurrentLicense();
   }
 
   componentDidUpdate(prevProps) {
-    if (this.props.currentProductId !== prevProps.currentProductId) {
-      this.fetchData(this.props.currentProductId);
+    const { currentProductId, getCurrentLicense } = this.props;
+    const { isLicenseSet } = this.state;
+    if (currentProductId !== prevProps.currentProductId) {
+      this.fetchData(currentProductId);
     }
-    if (this.state.curr) {
+    if (isLicenseSet) {
       // this.props.getStandalone().then(() => {
       //   this.setState({ standAloneMode: this.props.standAloneMode });
       // });
-      this.props.getCurrentLicense().then(() => {
-        this.setState({ curr: false, expiresDate: this.props.expiresDate });
+      getCurrentLicense().then(() => {
+        this.setState({ isLicenseSet: false });
       });
     }
   }
@@ -109,7 +109,7 @@ class Body extends React.PureComponent {
       })
       .then(() =>
         this.setState({
-          curr: true,
+          isLicenseSet: true,
         })
       );
   };
@@ -130,15 +130,12 @@ class Body extends React.PureComponent {
       salesEmail,
       helpUrl,
       buyUrl,
-      // expiresDate,
+      expiresDate,
       t,
       culture,
       utcHoursOffset,
       trialMode,
     } = this.props;
-    const { languages, select, selectLanguage, expiresDate } = this.state;
-    const { history } = this.props;
-    // console.log(this.state.selectLanguage);
 
     return !isLoaded ? (
       <Loader className="pageLoader" type="rombs" size="40px" />
@@ -149,13 +146,9 @@ class Body extends React.PureComponent {
           onError={this.onError}
           expiresDate={expiresDate}
           trialMode={trialMode}
-          languages={languages}
           culture={culture}
-          select={select}
           utcHoursOffset={utcHoursOffset}
-          selectLanguage={selectLanguage}
           getExpiresDate={this.getExpiresDate}
-          history={history}
         />
         <AdvantagesContainer t={t} />
 

web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/header-container.js

@@ -1,13 +1,10 @@
-import React, { useEffect } from "react";
+import React from "react";
 import PropTypes from "prop-types";
 import styled from "styled-components";
 import { connect } from "react-redux";
-import { Router, Route, Switch, Redirect } from "react-router-dom";
 
-import moment from "moment";
-// import moment "moment/min/moment-with-locales";
 import { Text, utils } from "asc-web-components";
-import { history, store } from "asc-web-common";
+
 const { tablet } = utils.device;
 
 const StyledHeader = styled.div`
@@ -70,7 +67,6 @@ const StyledHeader = styled.div`
   }
 `;
 
-const { setCurrentError } = store.auth.actions;
 const HeaderContainer = ({
   t,
   expiresDate,
@@ -84,7 +80,6 @@ const HeaderContainer = ({
   require("moment/min/locales.min");
   moment.locale(culture);
   const currentUserDate = moment().utcOffset(utcHoursOffset);
-  // this.props.error !== true && this.props.setCurrentError(true);
 
   return moment(
     moment.utc(expiresDate).set("hour", 0).set("minute", 0).set("second", 0)
@@ -123,10 +118,5 @@ HeaderContainer.propTypes = {
   createPortals: PropTypes.string.isRequired,
   t: PropTypes.func.isRequired,
 };
-function mapStateToProps(state) {
-  return {
-    settings: state.auth.settings,
-    modules: state.auth.modules,
-  };
-}
-export default connect(mapStateToProps, { setCurrentError })(HeaderContainer);
+
+export default HeaderContainer;