yusuketk 5 лет назад
Родитель
Сommit
a2d521c703

+ 2 - 5
src/client/js/components/Admin/Security/BasicSecuritySettingContents.jsx

@@ -34,9 +34,6 @@ class BasicSecurityManagementContents extends React.Component {
     const { t, adminGeneralSecurityContainer, adminBasicSecurityContainer } = this.props;
     const { t, adminGeneralSecurityContainer, adminBasicSecurityContainer } = this.props;
     const { isBasicEnabled } = adminGeneralSecurityContainer.state;
     const { isBasicEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
     return (
     return (
       <React.Fragment>
       <React.Fragment>
 
 
@@ -44,9 +41,9 @@ class BasicSecurityManagementContents extends React.Component {
           { t('security_setting.Basic.name') }
           { t('security_setting.Basic.name') }
         </h2>
         </h2>
 
 
-        {this.state.retrieveError != null && (
+        {adminBasicSecurityContainer.state.retrieveError != null && (
         <div className="alert alert-danger">
         <div className="alert alert-danger">
-          <p>{t('Error occurred')} : {this.state.err}</p>
+          <p>{t('Error occurred')} : {adminBasicSecurityContainer.state.retrieveError}</p>
         </div>
         </div>
         )}
         )}
 
 

+ 2 - 5
src/client/js/components/Admin/Security/GitHubSecuritySettingContents.jsx

@@ -34,9 +34,6 @@ class GitHubSecurityManagementContents extends React.Component {
     const { t, adminGeneralSecurityContainer, adminGitHubSecurityContainer } = this.props;
     const { t, adminGeneralSecurityContainer, adminGitHubSecurityContainer } = this.props;
     const { isGitHubEnabled } = adminGeneralSecurityContainer.state;
     const { isGitHubEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
     return (
     return (
 
 
       <React.Fragment>
       <React.Fragment>
@@ -45,9 +42,9 @@ class GitHubSecurityManagementContents extends React.Component {
           {t('security_setting.OAuth.GitHub.name')}
           {t('security_setting.OAuth.GitHub.name')}
         </h2>
         </h2>
 
 
-        {this.state.retrieveError != null && (
+        {adminGitHubSecurityContainer.state.retrieveError != null && (
           <div className="alert alert-danger">
           <div className="alert alert-danger">
-            <p>{t('Error occurred')} : {this.state.err}</p>
+            <p>{t('Error occurred')} : {adminGitHubSecurityContainer.state.retrieveError}</p>
           </div>
           </div>
         )}
         )}
 
 

+ 2 - 5
src/client/js/components/Admin/Security/GoogleSecuritySettingContents.jsx

@@ -35,9 +35,6 @@ class GoogleSecurityManagementContents extends React.Component {
     const { t, adminGeneralSecurityContainer, adminGoogleSecurityContainer } = this.props;
     const { t, adminGeneralSecurityContainer, adminGoogleSecurityContainer } = this.props;
     const { isGoogleEnabled } = adminGeneralSecurityContainer.state;
     const { isGoogleEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
     return (
     return (
 
 
       <React.Fragment>
       <React.Fragment>
@@ -46,9 +43,9 @@ class GoogleSecurityManagementContents extends React.Component {
           {t('security_setting.OAuth.Google.name')}
           {t('security_setting.OAuth.Google.name')}
         </h2>
         </h2>
 
 
-        {this.state.retrieveError != null && (
+        {adminGoogleSecurityContainer.state.retrieveError != null && (
           <div className="alert alert-danger">
           <div className="alert alert-danger">
-            <p>{t('Error occurred')} : {this.state.err}</p>
+            <p>{t('Error occurred')} : {adminGoogleSecurityContainer.state.retrieveError}</p>
           </div>
           </div>
         )}
         )}
 
 

+ 0 - 3
src/client/js/components/Admin/Security/LdapSecuritySettingContents.jsx

@@ -50,9 +50,6 @@ class LdapSecuritySettingContents extends React.Component {
     const { t, adminGeneralSecurityContainer, adminLdapSecurityContainer } = this.props;
     const { t, adminGeneralSecurityContainer, adminLdapSecurityContainer } = this.props;
     const { isLdapEnabled } = adminGeneralSecurityContainer.state;
     const { isLdapEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
     return (
     return (
       <React.Fragment>
       <React.Fragment>
 
 

+ 2 - 6
src/client/js/components/Admin/Security/LocalSecuritySettingContents.jsx

@@ -35,16 +35,12 @@ class LocalSecuritySettingContents extends React.Component {
     const { registrationMode } = adminLocalSecurityContainer.state;
     const { registrationMode } = adminLocalSecurityContainer.state;
     const { isLocalEnabled } = adminGeneralSecurityContainer.state;
     const { isLocalEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
-
     return (
     return (
       <React.Fragment>
       <React.Fragment>
-        {this.state.retrieveError != null && (
+        {adminLocalSecurityContainer.state.retrieveError != null && (
           <div className="alert alert-danger">
           <div className="alert alert-danger">
             <p>
             <p>
-              {t('Error occurred')} : {this.state.err}
+              {t('Error occurred')} : {adminLocalSecurityContainer.state.retrieveError}
             </p>
             </p>
           </div>
           </div>
         )}
         )}

+ 0 - 4
src/client/js/components/Admin/Security/OidcSecuritySettingContents.jsx

@@ -35,10 +35,6 @@ class OidcSecurityManagementContents extends React.Component {
     const { t, adminGeneralSecurityContainer, adminOidcSecurityContainer } = this.props;
     const { t, adminGeneralSecurityContainer, adminOidcSecurityContainer } = this.props;
     const { isOidcEnabled } = adminGeneralSecurityContainer.state;
     const { isOidcEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
-
     return (
     return (
 
 
       <React.Fragment>
       <React.Fragment>

+ 9 - 12
src/client/js/components/Admin/Security/SamlSecuritySettingContents.jsx

@@ -36,9 +36,6 @@ class SamlSecurityManagementContents extends React.Component {
     const { useOnlyEnvVars } = adminSamlSecurityContainer.state;
     const { useOnlyEnvVars } = adminSamlSecurityContainer.state;
     const { isSamlEnabled } = adminGeneralSecurityContainer.state;
     const { isSamlEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
     return (
     return (
       <React.Fragment>
       <React.Fragment>
 
 
@@ -141,7 +138,7 @@ class SamlSecurityManagementContents extends React.Component {
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envEntryPoint || ''}
+                      value={adminSamlSecurityContainer.state.envEntryPoint || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
@@ -165,7 +162,7 @@ class SamlSecurityManagementContents extends React.Component {
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envIssuer || ''}
+                      value={adminSamlSecurityContainer.state.envIssuer || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
@@ -211,7 +208,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                       type="text"
                       type="text"
                       rows="5"
                       rows="5"
                       readOnly
                       readOnly
-                      value={this.state.envCert || ''}
+                      value={adminSamlSecurityContainer.state.envCert || ''}
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
                       <small dangerouslySetInnerHTML={{ __html: t('security_setting.SAML.Use env var if empty', { env: 'SAML_CERT' }) }} />
                       <small dangerouslySetInnerHTML={{ __html: t('security_setting.SAML.Use env var if empty', { env: 'SAML_CERT' }) }} />
@@ -255,7 +252,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envAttrMapId || ''}
+                      value={adminSamlSecurityContainer.state.envAttrMapId || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
@@ -281,7 +278,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envAttrMapUsername || ''}
+                      value={adminSamlSecurityContainer.state.envAttrMapUsername || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
@@ -307,7 +304,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envAttrMapMail || ''}
+                      value={adminSamlSecurityContainer.state.envAttrMapMail || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
@@ -334,7 +331,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envAttrMapFirstName || ''}
+                      value={adminSamlSecurityContainer.state.envAttrMapFirstName || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
@@ -365,7 +362,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envAttrMapLastName || ''}
+                      value={adminSamlSecurityContainer.state.envAttrMapLastName || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">
@@ -469,7 +466,7 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw==
                     <input
                     <input
                       className="form-control"
                       className="form-control"
                       type="text"
                       type="text"
-                      value={this.state.envABLCRule || ''}
+                      value={adminSamlSecurityContainer.state.envABLCRule || ''}
                       readOnly
                       readOnly
                     />
                     />
                     <p className="form-text text-muted">
                     <p className="form-text text-muted">

+ 2 - 5
src/client/js/components/Admin/Security/TwitterSecuritySettingContents.jsx

@@ -34,9 +34,6 @@ class TwitterSecurityManagementContents extends React.Component {
     const { t, adminGeneralSecurityContainer, adminTwitterSecurityContainer } = this.props;
     const { t, adminGeneralSecurityContainer, adminTwitterSecurityContainer } = this.props;
     const { isTwitterEnabled } = adminGeneralSecurityContainer.state;
     const { isTwitterEnabled } = adminGeneralSecurityContainer.state;
 
 
-    if (this.state.isRetrieving) {
-      return null;
-    }
     return (
     return (
 
 
       <React.Fragment>
       <React.Fragment>
@@ -45,9 +42,9 @@ class TwitterSecurityManagementContents extends React.Component {
           {t('security_setting.OAuth.Twitter.name')}
           {t('security_setting.OAuth.Twitter.name')}
         </h2>
         </h2>
 
 
-        {this.state.retrieveError != null && (
+        {adminTwitterSecurityContainer.state.retrieveError != null && (
           <div className="alert alert-danger">
           <div className="alert alert-danger">
-            <p>{t('Error occurred')} : {this.state.err}</p>
+            <p>{t('Error occurred')} : {adminTwitterSecurityContainer.state.retrieveError}</p>
           </div>
           </div>
         )}
         )}