update ui

haiwen · Dec 24, 2024 · 2285bc0 · 2285bc0
1 parent c9e568e
commit 2285bc0
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/frontend/src/pages/sys-admin/orgs/orgs-content.js b/frontend/src/pages/sys-admin/orgs/orgs-content.js
@@ -38,6 +38,7 @@ class Content extends Component {
 
   render() {
     const { loading, errorMsg, items } = this.props;
+    const colCreatedText = `${gettext('Created At')} / ${gettext('Last Access')}`;
     if (loading) {
       return <Loading />;
     } else if (errorMsg) {
@@ -52,12 +53,11 @@ class Content extends Component {
           <table>
             <thead>
               <tr>
-                <th width="15%">{gettext('Name')}</th>
-                <th width="15%">{gettext('Creator')}</th>
-                <th width="15%">{gettext('Role')}</th>
+                <th width="20%">{gettext('Name')}</th>
+                <th width="20%">{gettext('Creator')}</th>
+                <th width="20%">{gettext('Role')}</th>
                 <th width="15%">{gettext('Space Used')}</th>
-                <th width="20%">{gettext('Created At')}</th>
-                <th width="20%">{gettext('Last Access')}</th>
+                <th width="20%">{colCreatedText}</th>
                 <th width="5%">{/* Operations */}</th>
               </tr>
             </thead>
@@ -200,11 +200,11 @@ class Item extends Component {
             />
           </td>
           <td>{`${Utils.bytesToSize(item.quota_usage)} / ${item.quota > 0 ? Utils.bytesToSize(item.quota) : '--'}`}</td>
-          <td>{dayjs(item.ctime).format('YYYY-MM-DD HH:mm:ss')}</td>
-          {item.last_activity_time ?
-            <td>{dayjs(item.last_activity_time).format('YYYY-MM-DD HH:mm:ss')}</td> :
-            <td>{'--'}</td>
-          }
+          <td>
+            {`${dayjs(item.ctime).format('YYYY-MM-DD HH:mm:ss')} /`}
+            <br />
+            {`${item.last_activity_time ? dayjs(item.last_activity_time).fromNow() : '--'} `}
+          </td>
           <td>
             <a href="#" className={`action-icon sf3-font-delete1 sf3-font ${highlighted ? '' : 'invisible'}`} title={gettext('Delete')} onClick={this.toggleDeleteDialog}></a>
           </td>