From 5c8f47e8d2505712a7a4d37c1bf56ba93830c99f Mon Sep 17 00:00:00 2001
From: Benjamin Piouffle <benjamin.piouffle@gmail.com>
Date: Wed, 7 Feb 2024 16:36:49 +0100
Subject: [PATCH] fix: Misc activity log fixes (#1195)

---
 .eslintrc.yml                                         |  1 -
 app/components/Users/ActivityLog.jsx                  | 10 ++++------
 app/components/UsersActions/ActionIcon.jsx            |  1 +
 app/components/UsersActions/ActionsDirectionFilter.js |  2 +-
 app/i18n/en/history.json                              |  5 ++++-
 app/i18n/fr/history.json                              |  5 ++++-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index ced811ef4..d3e1924e2 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -40,7 +40,6 @@ rules:
   no-plusplus: off
   radix: off
   eol-last: ['warn']
-  no-nested-ternary: ['warn']
   prefer-const: ['warn']
   no-restricted-globals: ['error', 'event', 'fdescribe']
   no-mixed-operators: ['warn']
diff --git a/app/components/Users/ActivityLog.jsx b/app/components/Users/ActivityLog.jsx
index a7339bc3b..1ab3ddc78 100644
--- a/app/components/Users/ActivityLog.jsx
+++ b/app/components/Users/ActivityLog.jsx
@@ -87,11 +87,7 @@ const ActivityLog = ({ match, t, location }) => {
           return <ErrorView error={error} />
         }
 
-        if (!loading && get(data, 'user.actions.entries.length') === 0) {
-          return <MessageView>{t('noActivity')}</MessageView>
-        }
-
-        const paginationMenu = renderPaginationMenu(loading, get(data, 'user'), fetchMore)
+        const isEmpty = get(data, 'user.actions.entries.length') === 0
         return (
           <div>
             <div className="activity-log container">
@@ -101,6 +97,8 @@ const ActivityLog = ({ match, t, location }) => {
                 <div className="panel-block">
                   <LoadingFrame />
                 </div>
+              ) : isEmpty ? (
+                <MessageView>{t('noActivity')}</MessageView>
               ) : (
                 data.user.actions.entries.map((a) => (
                   <UserAction
@@ -111,7 +109,7 @@ const ActivityLog = ({ match, t, location }) => {
                   />
                 ))
               )}
-              {paginationMenu}
+              {!isEmpty && renderPaginationMenu(loading, get(data, 'user'), fetchMore)}
             </div>
           </div>
         )
diff --git a/app/components/UsersActions/ActionIcon.jsx b/app/components/UsersActions/ActionIcon.jsx
index 033c15f5f..12a47e477 100644
--- a/app/components/UsersActions/ActionIcon.jsx
+++ b/app/components/UsersActions/ActionIcon.jsx
@@ -10,6 +10,7 @@ const ACTIONS_ICONS = {
   add: 'plus',
   revert: 'undo',
   flag: 'flag',
+  confirmed_flag: 'flag',
   vote_up: 'chevron-up',
   vote_down: 'chevron-down',
   self_vote: 'chevron-up',
diff --git a/app/components/UsersActions/ActionsDirectionFilter.js b/app/components/UsersActions/ActionsDirectionFilter.js
index 4c2f61e21..569c431a9 100644
--- a/app/components/UsersActions/ActionsDirectionFilter.js
+++ b/app/components/UsersActions/ActionsDirectionFilter.js
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom'
 import UserAppellation from '../Users/UserAppellation'
 
 const ActionsDirectionFilter = ({ user, value, t }) => {
-  const baseLink = `/u/${user.username}/activity`
+  const baseLink = `/u/${user.username}`
   const getLinkProps = (filterValue) => ({
     className: filterValue === value ? 'is-active' : '',
     to: filterValue === 'ALL' ? baseLink : `${baseLink}?direction=${filterValue}`,
diff --git a/app/i18n/en/history.json b/app/i18n/en/history.json
index 654461f61..c7240b696 100644
--- a/app/i18n/en/history.json
+++ b/app/i18n/en/history.json
@@ -37,7 +37,10 @@
     "action_banned_bad_language": "Moderated ($t(moderation:reason.1))",
     "action_banned_spam": "Moderated ($t(moderation:reason.2))",
     "action_banned_irrelevant": "Moderated ($t(moderation:reason.3))",
-    "action_banned_not_constructive": "Moderated ($t(moderation:reason.4))"
+    "action_banned_not_constructive": "Moderated ($t(moderation:reason.4))",
+    "confirmed_flag": "Confirmed a flag",
+    "abused_flag": "Refuted a flag",
+    "social_network_linked": "Linked a social network account"
   },
   "actionTarget": {
     "vote_up": "Received a positive vote",
diff --git a/app/i18n/fr/history.json b/app/i18n/fr/history.json
index 063d5b62f..d99bd738b 100644
--- a/app/i18n/fr/history.json
+++ b/app/i18n/fr/history.json
@@ -37,7 +37,10 @@
     "action_banned_bad_language": "Modéré ($t(moderation:reason.1))",
     "action_banned_spam": "Modéré ($t(moderation:reason.2))",
     "action_banned_irrelevant": "Modéré ($t(moderation:reason.3))",
-    "action_banned_not_constructive": "Modéré ($t(moderation:reason.4))"
+    "action_banned_not_constructive": "Modéré ($t(moderation:reason.4))",
+    "confirmed_flag": "A confirmé un signalement",
+    "abused_flag": "A réfuté d'un signalement",
+    "social_network_linked": "Compte lié à un réseau social"
   },
   "actionTarget": {
     "vote_up": "Reçu un vote positif",