sysadmin reconstruct info page optimize js code (#3932)

* sysadmin reconstruct info page optimize js code

* optimize code

frontend/src/pages/sys-admin/info.js

@@ -15,8 +15,7 @@ class Info extends Component {
     this.state = {
       loading: true,
       errorMsg: '',
-      sysInfo: {},
+      sysInfo: {}
-      with_license: false
     };
   }
 
@@ -24,8 +23,7 @@ class Info extends Component {
     seafileAPI.getSysInfo().then((res) => {
       this.setState({
         loading: false,
-        sysInfo: res.data,
+        sysInfo: res.data
-        with_license: res.data.with_license
       });
     }).catch((error) => {
       if (error.response) {
@@ -58,10 +56,9 @@ class Info extends Component {
     const file = this.fileInput.current.files[0];
     seafileAPI.uploadLicense(file).then((res) => {
       let info = this.state.sysInfo;
-      Object.assign(info, res.data);
+      Object.assign(info, res.data, {with_license: true});
       this.setState({
-        sysInfo: info,
+        sysInfo: info
-        with_license: true
       });
     }).catch((error) => {
       let errMsg = Utils.getErrorMsg(error);
@@ -91,86 +88,84 @@ class Info extends Component {
     let { license_mode, license_to, license_expiration, org_count,
       repos_count, total_files_count, total_storage, total_devices_count, 
       current_connected_devices_count, license_maxusers, multi_tenancy_enabled,
-      active_users_count, users_count, groups_count } = this.state.sysInfo;
+      active_users_count, users_count, groups_count, with_license } = this.state.sysInfo;
-    let { loading, errorMsg, with_license } = this.state;
+    let { loading, errorMsg } = this.state;
 
-    if (loading) {
+    return (
-      return <Loading />;
+      <Fragment>
-    } else if (errorMsg) {
+        <div className="main-panel-north border-left-show">
-      return <p className="error text-center">{errorMsg}</p>;
+          <div className="cur-view-toolbar">
-    } else {
+            <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu"></span>
-      return (
+          </div>
-        <Fragment>
+          <div className="common-toolbar">
-          <div className="main-panel-north border-left-show">
+            <Account isAdminPanel={true} />
-            <div className="cur-view-toolbar">
+          </div>
-              <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu"></span>
+        </div>
+        <div className="main-panel-center flex-row">
+          <div className="cur-view-container">
+            <div className="cur-view-path">
+              <h3 className="sf-heading">{gettext('Info')}</h3>
             </div>
-            <div className="common-toolbar">
+            <div className="cur-view-content">
-              <Account isAdminPanel={true} />
+              {loading && <Loading />}
+              {errorMsg && <p className="error text-center mt-4">{errorMsg}</p>}
+              {(!loading && !errorMsg) &&
+              <dl>
+                <dt>{gettext('System Info')}</dt>
+                {isPro ?
+                  <dd>
+                    {gettext('Professional Edition')}
+                    {with_license &&
+                      ' ' + this.renderLicenseDescString(license_mode, license_to, license_expiration)
+                    }<br/>
+                    {isDefaultAdmin &&
+                      <Fragment>
+                        <Button type="button" className="mt-2" onClick={this.openFileInput}>{gettext('Upload license')}</Button>
+                        <input className="d-none" type="file" onChange={this.uploadLicenseFile} ref={this.fileInput} />
+                      </Fragment>
+                    }
+                  </dd> :
+                  <dd>
+                    {gettext('Community Edition')}
+                    <a className="ml-1" href="http://manual.seafile.com/deploy_pro/migrate_from_seafile_community_server.html" target="_blank">{gettext('Upgrade to Pro Edition')}</a>
+                  </dd>
+                }
+                <dt>{gettext('Libraries')} / {gettext('Files')}</dt>
+                <dd>{repos_count} / {total_files_count}</dd>
+
+                <dt>{gettext('Storage Used')}</dt>
+                <dd>{Utils.bytesToSize(total_storage)}</dd>
+
+                <dt>{gettext('Total Devices')} / {gettext('Current Connected Devices')}</dt>
+                <dd>{total_devices_count} / {current_connected_devices_count}</dd>
+
+                {isPro ?
+                  <Fragment>
+                    <dt>{gettext('Activated Users')} / {gettext('Total Users')} / {gettext('Limits')}</dt>
+                    <dd>{active_users_count}{' / '}{users_count}{' / '}{with_license ? license_maxusers : '--'}</dd>
+                  </Fragment> :
+                  <Fragment>
+                    <dt>{gettext('Activated Users')} / {gettext('Total Users')}</dt>
+                    <dd>{active_users_count} / {users_count}</dd>
+                  </Fragment>
+                }
+
+                <dt>{gettext('Groups')}</dt>
+                <dd>{groups_count}</dd>
+
+                {multi_tenancy_enabled &&
+                  <Fragment>
+                    <dt>{gettext('Organizations')}</dt>
+                    <dd>{org_count}</dd>
+                  </Fragment>
+                }
+              </dl>
+              }
             </div>
           </div>
-          <div className="main-panel-center flex-row">
+        </div>
-            <div className="cur-view-container">
+      </Fragment>
-              <div className="cur-view-path">
+    );
-                <h3 className="sf-heading">{gettext('Info')}</h3>
-              </div>
-              <div className="cur-view-content">
-                <dl>
-                  <dt>{gettext('System Info')}</dt>
-                  {isPro ?
-                    <dd>
-                      {gettext('Professional Edition')}
-                      {with_license &&
-                        ' ' + this.renderLicenseDescString(license_mode, license_to, license_expiration)
-                      }<br/>
-                      {isDefaultAdmin &&
-                        <Fragment>
-                          <Button type="button" className="mt-2" onClick={this.openFileInput}>{gettext('Upload license')}</Button>
-                          <input className="d-none" type="file" onChange={this.uploadLicenseFile} ref={this.fileInput} />
-                        </Fragment>
-                      }
-                    </dd> :
-                    <dd>
-                      {gettext('Community Edition')}
-                      <a className="ml-1" href="http://manual.seafile.com/deploy_pro/migrate_from_seafile_community_server.html" target="_blank">{gettext('Upgrade to Pro Edition')}</a>
-                    </dd>
-                  }
-                  <dt>{gettext('Libraries')} / {gettext('Files')}</dt>
-                  <dd>{repos_count} / {total_files_count}</dd>
-
-                  <dt>{gettext('Storage Used')}</dt>
-                  <dd>{Utils.bytesToSize(total_storage)}</dd>
-
-                  <dt>{gettext('Total Devices')} / {gettext('Current Connected Devices')}</dt>
-                  <dd>{total_devices_count} / {current_connected_devices_count}</dd>
-
-                  {isPro ?
-                    <Fragment>
-                      <dt>{gettext('Activated Users')} / {gettext('Total Users')} / {gettext('Limits')}</dt>
-                      <dd>{active_users_count}{' / '}{users_count}{' / '}{with_license ? license_maxusers : '--'}</dd>
-                    </Fragment> :
-                    <Fragment>
-                      <dt>{gettext('Activated Users')} / {gettext('Total Users')}</dt>
-                      <dd>{active_users_count} / {users_count}</dd>
-                    </Fragment>
-                  }
-
-                  <dt>{gettext('Groups')}</dt>
-                  <dd>{groups_count}</dd>
-
-                  {multi_tenancy_enabled &&
-                    <Fragment>
-                      <dt>{gettext('Organizations')}</dt>
-                      <dd>{org_count}</dd>
-                    </Fragment>
-                  }
-                </dl>
-              </div>
-            </div>
-          </div>
-        </Fragment>
-      );
-    }
   }
 }