Shun Miyazawa 3 лет назад
Родитель
Сommit
7e9ba6777d
1 измененных файлов с 6 добавлено и 11 удалено
  1. 6 11
      packages/app/src/components/Admin/AuditLog/ActivityTable.tsx

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

@@ -23,8 +23,7 @@ export const ActivityTable : FC<Props> = (props: Props) => {
       <table className="table table-default table-bordered table-user-list">
       <table className="table table-default table-bordered table-user-list">
         <thead>
         <thead>
           <tr>
           <tr>
-            <th scope="col"></th>
-            <th scope="col">{t('admin:audit_log_management.username')}</th>
+            <th scope="col">{t('admin:audit_log_management.user')}</th>
             <th scope="col">{t('admin:audit_log_management.date')}</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.action')}</th>
             <th scope="col">{t('admin:audit_log_management.ip')}</th>
             <th scope="col">{t('admin:audit_log_management.ip')}</th>
@@ -36,17 +35,13 @@ export const ActivityTable : FC<Props> = (props: Props) => {
             return (
             return (
               <tr data-testid="activity-table" key={activity._id}>
               <tr data-testid="activity-table" key={activity._id}>
                 <td>
                 <td>
-                  {activity.user != null && (
-                    <UserPicture user={activity.user} className="picture rounded-circle" />
+                  { activity.user != null && (
+                    <>
+                      <UserPicture user={activity.user} className="picture rounded-circle" />
+                      <a className="ml-2" href={pagePathUtils.userPageRoot(activity.user)}>{activity.snapshot?.username}</a>
+                    </>
                   )}
                   )}
                 </td>
                 </td>
-                <td>
-                  {
-                    activity.user != null
-                      ? (<a href={pagePathUtils.userPageRoot(activity.user)}>{activity.snapshot?.username}</a>)
-                      : (<>{activity.snapshot?.username}</>)
-                  }
-                </td>
                 <td>{formatDate(activity.createdAt)}</td>
                 <td>{formatDate(activity.createdAt)}</td>
                 <td>{t(`admin:audit_log_action.${activity.action}`)}</td>
                 <td>{t(`admin:audit_log_action.${activity.action}`)}</td>
                 <td>{activity.ip}</td>
                 <td>{activity.ip}</td>