Просмотр исходного кода

Merge pull request #6027 from weseek/imprv/activity-table

imprv: Activity table
Shun Miyazawa 3 лет назад
Родитель
Сommit
9195f8f9e8

+ 3 - 2
packages/app/resource/locales/en_US/admin/admin.json

@@ -517,8 +517,9 @@
   },
   "audit_log_management": {
     "username": "Username",
-    "target_model": "Target Model",
+    "date": "Date",
     "action": "Action",
-    "date": "Date"
+    "ip": "IP Address",
+    "url": "URL"
   }
 }

+ 3 - 2
packages/app/resource/locales/ja_JP/admin/admin.json

@@ -516,8 +516,9 @@
   },
   "audit_log_management": {
     "username": "ユーザー名",
-    "target_model": "ターゲットモデル",
+    "date": "日付",
     "action": "アクション",
-    "date": "日付"
+    "ip": "IPアドレス",
+    "url": "URL"
   }
 }

+ 3 - 2
packages/app/resource/locales/zh_CN/admin/admin.json

@@ -526,8 +526,9 @@
   },
   "audit_log_management": {
     "username": "帐号",
-    "target_model": "目标模型",
+    "date": "日期",
     "action": "行动",
-    "date": "日期"
+    "ip": "IP地址",
+    "url": "URL"
   }
 }

+ 6 - 4
packages/app/src/components/Admin/AuditLog/ActivityTable.tsx

@@ -22,9 +22,10 @@ export const ActivityTable : FC<Props> = (props: Props) => {
         <thead>
           <tr>
             <th scope="col">{t('admin:audit_log_management.username')}</th>
-            <th scope="col">{t('admin:audit_log_management.target_model')}</th>
-            <th scope="col">{t('admin:audit_log_management.action')}</th>
             <th scope="col">{t('admin:audit_log_management.date')}</th>
+            <th scope="col">{t('admin:audit_log_management.action')}</th>
+            <th scope="col">{t('admin:audit_log_management.ip')}</th>
+            <th scope="col">{t('admin:audit_log_management.url')}</th>
           </tr>
         </thead>
         <tbody>
@@ -32,9 +33,10 @@ export const ActivityTable : FC<Props> = (props: Props) => {
             return (
               <tr data-testid="activity-table" key={activity._id}>
                 <td>{activity.snapshot?.username}</td>
-                <td>{activity.targetModel}</td>
-                <td>{activity.action}</td>
                 <td>{formatDate(activity.createdAt)}</td>
+                <td>{activity.action}</td>
+                <td>{activity.ip}</td>
+                <td>{activity.endpoint}</td>
               </tr>
             );
           })}