2
0
yusuketk 6 жил өмнө
parent
commit
0547744da1

+ 1 - 12
src/client/js/components/LoginForm.jsx

@@ -3,9 +3,6 @@ import PropTypes from 'prop-types';
 
 
 import { withTranslation } from 'react-i18next';
 import { withTranslation } from 'react-i18next';
 
 
-import LoginContainer from '../services/LoginContainer';
-import { createSubscribedElement } from './UnstatedUtils';
-
 class LoginForm extends React.Component {
 class LoginForm extends React.Component {
 
 
   constructor(props) {
   constructor(props) {
@@ -273,17 +270,9 @@ class LoginForm extends React.Component {
 
 
 }
 }
 
 
-/**
- * Wrapper component for using unstated
- */
-const LoginFormWrapper = (props) => {
-  return createSubscribedElement(LoginForm, props, [LoginContainer]);
-};
-
 LoginForm.propTypes = {
 LoginForm.propTypes = {
   // i18next
   // i18next
   t: PropTypes.func.isRequired,
   t: PropTypes.func.isRequired,
-  loginContainer: PropTypes.instanceOf(LoginContainer).isRequired,
   isRegistering: PropTypes.bool,
   isRegistering: PropTypes.bool,
   username: PropTypes.string,
   username: PropTypes.string,
   name: PropTypes.string,
   name: PropTypes.string,
@@ -297,4 +286,4 @@ LoginForm.propTypes = {
   objOfIsExternalAuthEnableds: PropTypes.object,
   objOfIsExternalAuthEnableds: PropTypes.object,
 };
 };
 
 
-export default withTranslation()(LoginFormWrapper);
+export default withTranslation()(LoginForm);

+ 13 - 23
src/client/js/nologin.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactDOM from 'react-dom';
-import { Provider } from 'unstated';
 import { I18nextProvider } from 'react-i18next';
 import { I18nextProvider } from 'react-i18next';
 
 
 import i18nFactory from './util/i18n';
 import i18nFactory from './util/i18n';
@@ -8,11 +7,6 @@ import i18nFactory from './util/i18n';
 import InstallerForm from './components/InstallerForm';
 import InstallerForm from './components/InstallerForm';
 import LoginForm from './components/LoginForm';
 import LoginForm from './components/LoginForm';
 
 
-import AppContainer from './services/AppContainer';
-import LoginContainer from './services/LoginContainer';
-
-const appContainer = new AppContainer();
-
 const i18n = i18nFactory();
 const i18n = i18nFactory();
 
 
 // render InstallerForm
 // render InstallerForm
@@ -33,8 +27,6 @@ if (installerFormElem) {
 // render loginForm
 // render loginForm
 const loginFormElem = document.getElementById('login-form');
 const loginFormElem = document.getElementById('login-form');
 if (loginFormElem) {
 if (loginFormElem) {
-  const loginContainer = new LoginContainer(appContainer);
-
   const isRegistering = loginFormElem.dataset.isRegistering === 'true';
   const isRegistering = loginFormElem.dataset.isRegistering === 'true';
   const username = loginFormElem.dataset.username;
   const username = loginFormElem.dataset.username;
   const name = loginFormElem.dataset.name;
   const name = loginFormElem.dataset.name;
@@ -58,21 +50,19 @@ if (loginFormElem) {
 
 
   ReactDOM.render(
   ReactDOM.render(
     <I18nextProvider i18n={i18n}>
     <I18nextProvider i18n={i18n}>
-      <Provider inject={[loginContainer]}>
-        <LoginForm
-          isRegistering={isRegistering}
-          username={username}
-          name={name}
-          email={email}
-          csrf={csrf}
-          isRegistrationEnabled={isRegistrationEnabled}
-          registrationMode={registrationMode}
-          registrationWhiteList={registrationWhiteList}
-          isLocalStrategySetup={isLocalStrategySetup}
-          isLdapStrategySetup={isLdapStrategySetup}
-          objOfIsExternalAuthEnableds={objOfIsExternalAuthEnableds}
-        />
-      </Provider>
+      <LoginForm
+        isRegistering={isRegistering}
+        username={username}
+        name={name}
+        email={email}
+        csrf={csrf}
+        isRegistrationEnabled={isRegistrationEnabled}
+        registrationMode={registrationMode}
+        registrationWhiteList={registrationWhiteList}
+        isLocalStrategySetup={isLocalStrategySetup}
+        isLdapStrategySetup={isLdapStrategySetup}
+        objOfIsExternalAuthEnableds={objOfIsExternalAuthEnableds}
+      />
     </I18nextProvider>,
     </I18nextProvider>,
     loginFormElem,
     loginFormElem,
   );
   );

+ 0 - 22
src/client/js/services/LoginContainer.js

@@ -1,22 +0,0 @@
-import { Container } from 'unstated';
-
-/**
- * Service container for login form (LoginForm.jsx)
- * @extends {Container} unstated Container
- */
-export default class LoginForm extends Container {
-
-  constructor(appContainer) {
-    super();
-
-    this.appContainer = appContainer;
-  }
-
-  /**
-   * Workaround for the mangling in production build to break constructor.name
-   */
-  static getClassName() {
-    return 'LoginContainer';
-  }
-
-}