From c4d214632676a05d3e1cb33efb3bb6d99c7e0488 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Wed, 16 Aug 2023 22:32:58 +0200
Subject: Use more basic tooltip wording

---
 modern/src/other/GeofencesList.js                   | 4 +---
 modern/src/resources/l10n/en.json                   | 3 +--
 modern/src/settings/CalendarsPage.js                | 2 +-
 modern/src/settings/CommandsPage.js                 | 2 +-
 modern/src/settings/ComputedAttributesPage.js       | 2 +-
 modern/src/settings/DevicesPage.js                  | 2 --
 modern/src/settings/DriversPage.js                  | 2 +-
 modern/src/settings/GroupsPage.js                   | 8 +-------
 modern/src/settings/MaintenancesPage.js             | 2 +-
 modern/src/settings/NotificationsPage.js            | 2 +-
 modern/src/settings/UsersPage.js                    | 3 ---
 modern/src/settings/components/CollectionActions.js | 8 ++++----
 12 files changed, 13 insertions(+), 27 deletions(-)

(limited to 'modern/src')

diff --git a/modern/src/other/GeofencesList.js b/modern/src/other/GeofencesList.js
index a7858ce5..d26eff09 100644
--- a/modern/src/other/GeofencesList.js
+++ b/modern/src/other/GeofencesList.js
@@ -8,7 +8,6 @@ import {
 import { geofencesActions } from '../store';
 import CollectionActions from '../settings/components/CollectionActions';
 import { useCatchCallback } from '../reactHelper';
-import { useTranslation } from '../common/components/LocalizationProvider';
 
 const useStyles = makeStyles(() => ({
   list: {
@@ -25,7 +24,6 @@ const useStyles = makeStyles(() => ({
 const GeofencesList = ({ onGeofenceSelected }) => {
   const classes = useStyles();
   const dispatch = useDispatch();
-  const t = useTranslation();
 
   const items = useSelector((state) => state.geofences.items);
 
@@ -44,7 +42,7 @@ const GeofencesList = ({ onGeofenceSelected }) => {
         <Fragment key={item.id}>
           <ListItemButton key={item.id} onClick={() => onGeofenceSelected(item.id)}>
             <ListItemText primary={item.name} />
-            <CollectionActions itemId={item.id} editPath="/settings/geofence" endpoint="geofences" collectionTitle={t('sharedGeofence')} setTimestamp={refreshGeofences} />
+            <CollectionActions itemId={item.id} editPath="/settings/geofence" endpoint="geofences" setTimestamp={refreshGeofences} />
           </ListItemButton>
           {index < list.length - 1 ? <Divider /> : null}
         </Fragment>
diff --git a/modern/src/resources/l10n/en.json b/modern/src/resources/l10n/en.json
index 384e31e3..057c1655 100644
--- a/modern/src/resources/l10n/en.json
+++ b/modern/src/resources/l10n/en.json
@@ -8,8 +8,6 @@
     "sharedEdit": "Edit",
     "sharedRemove": "Remove",
     "sharedRemoveConfirm": "Remove item?",
-    "sharedPublish": "Publish",
-    "sharedLink": "Link",
     "sharedNoData": "No data",
     "sharedYes": "Yes",
     "sharedNo": "No",
@@ -381,6 +379,7 @@
     "stateValue": "Value",
     "commandTitle": "Command",
     "commandSend": "Send",
+    "commandSendTitle": "Send Command",
     "commandSent": "Command sent",
     "commandQueued": "Command queued",
     "commandUnit": "Unit",
diff --git a/modern/src/settings/CalendarsPage.js b/modern/src/settings/CalendarsPage.js
index e0b957e4..de27a451 100644
--- a/modern/src/settings/CalendarsPage.js
+++ b/modern/src/settings/CalendarsPage.js
@@ -50,7 +50,7 @@ const CalendarsPage = () => {
             <TableRow key={item.id}>
               <TableCell>{item.name}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" collectionTitle={t('sharedCalendar')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={2} endAction />)}
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.js
index 7a330874..1b893831 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.js
@@ -59,7 +59,7 @@ const CommandsPage = () => {
               <TableCell>{formatBoolean(item.textChannel, t)}</TableCell>
               {!limitCommands && (
                 <TableCell className={classes.columnAction} padding="none">
-                  <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" collectionTitle={t('sharedSavedCommand')} setTimestamp={setTimestamp} />
+                  <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" setTimestamp={setTimestamp} />
                 </TableCell>
               )}
             </TableRow>
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index d252bc4d..6d098547 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -59,7 +59,7 @@ const ComputedAttributesPage = () => {
               <TableCell>{item.type}</TableCell>
               {administrator && (
                 <TableCell className={classes.columnAction} padding="none">
-                  <CollectionActions itemId={item.id} editPath="/settings/attribute" endpoint="attributes/computed" collectionTitle={t('sharedComputedAttribute')} setTimestamp={setTimestamp} />
+                  <CollectionActions itemId={item.id} editPath="/settings/attribute" endpoint="attributes/computed" setTimestamp={setTimestamp} />
                 </TableCell>
               )}
             </TableRow>
diff --git a/modern/src/settings/DevicesPage.js b/modern/src/settings/DevicesPage.js
index 6a285429..5ef5aae5 100644
--- a/modern/src/settings/DevicesPage.js
+++ b/modern/src/settings/DevicesPage.js
@@ -51,7 +51,6 @@ const DevicesPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
-    tooltip: t('sharedLink').concat(' ').concat(t('reportDevice')),
     icon: <LinkIcon fontSize="small" />,
     handler: (deviceId) => navigate(`/settings/device/${deviceId}/connections`),
   };
@@ -87,7 +86,6 @@ const DevicesPage = () => {
                   itemId={item.id}
                   editPath="/settings/device"
                   endpoint="devices"
-                  collectionTitle={t('reportDevice')}
                   setTimestamp={setTimestamp}
                   customActions={[actionConnections]}
                   readonly={deviceReadonly}
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.js
index dcd3f9fb..72834860 100644
--- a/modern/src/settings/DriversPage.js
+++ b/modern/src/settings/DriversPage.js
@@ -52,7 +52,7 @@ const DriversPage = () => {
               <TableCell>{item.name}</TableCell>
               <TableCell>{item.uniqueId}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" collectionTitle={t('sharedDriver')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={3} endAction />)}
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js
index e009b06b..7148184b 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.js
@@ -45,11 +45,7 @@ const GroupsPage = () => {
   const actionCommand = {
     key: 'command',
     title: t('deviceCommand'),
-    tooltip: t('commandSend')
-      .concat(' ')
-      .concat(t('reportGroup'))
-      .concat(' ')
-      .concat(t('commandTitle')),
+    tooltip: t('commandSendTitle'),
     icon: <PublishIcon fontSize="small" />,
     handler: (groupId) => navigate(`/settings/group/${groupId}/command`),
   };
@@ -57,7 +53,6 @@ const GroupsPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
-    tooltip: t('sharedLink').concat(' ').concat(t('reportGroup')),
     icon: <LinkIcon fontSize="small" />,
     handler: (groupId) => navigate(`/settings/group/${groupId}/connections`),
   };
@@ -81,7 +76,6 @@ const GroupsPage = () => {
                   itemId={item.id}
                   editPath="/settings/group"
                   endpoint="groups"
-                  collectionTitle={t('reportGroup')}
                   setTimestamp={setTimestamp}
                   customActions={limitCommands ? [actionConnections] : [actionConnections, actionCommand]}
                 />
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js
index 4776deb6..2a66590c 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.js
@@ -79,7 +79,7 @@ const MaintenacesPage = () => {
               <TableCell>{convertAttribute(item.type, item.start)}</TableCell>
               <TableCell>{convertAttribute(item.type, item.period)}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" collectionTitle={t('sharedMaintenance')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={5} endAction />)}
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.js
index 7d6197c0..f1e70a85 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.js
@@ -69,7 +69,7 @@ const NotificationsPage = () => {
               <TableCell>{formatList('alarm', item.attributes.alarms)}</TableCell>
               <TableCell>{formatList('notificator', item.notificators)}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" collectionTitle={t('sharedNotification')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={5} endAction />)}
diff --git a/modern/src/settings/UsersPage.js b/modern/src/settings/UsersPage.js
index b4176763..d04f2a2b 100644
--- a/modern/src/settings/UsersPage.js
+++ b/modern/src/settings/UsersPage.js
@@ -44,7 +44,6 @@ const UsersPage = () => {
   const actionLogin = {
     key: 'login',
     title: t('loginLogin'),
-    tooltip: t('settingsUser').concat(' ').concat(t('loginTitle')),
     icon: <LoginIcon fontSize="small" />,
     handler: handleLogin,
   };
@@ -52,7 +51,6 @@ const UsersPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
-    tooltip: t('sharedLink').concat(' ').concat(t('settingsUser')),
     icon: <LinkIcon fontSize="small" />,
     handler: (userId) => navigate(`/settings/user/${userId}/connections`),
   };
@@ -98,7 +96,6 @@ const UsersPage = () => {
                   itemId={item.id}
                   editPath="/settings/user"
                   endpoint="users"
-                  collectionTitle={t('settingsUser')}
                   setTimestamp={setTimestamp}
                   customActions={manager ? [actionLogin, actionConnections] : [actionConnections]}
                 />
diff --git a/modern/src/settings/components/CollectionActions.js b/modern/src/settings/components/CollectionActions.js
index bf8eb257..87ffe7af 100644
--- a/modern/src/settings/components/CollectionActions.js
+++ b/modern/src/settings/components/CollectionActions.js
@@ -18,7 +18,7 @@ const useStyles = makeStyles(() => ({
 }));
 
 const CollectionActions = ({
-  itemId, editPath, endpoint, collectionTitle, setTimestamp, customActions, readonly,
+  itemId, editPath, endpoint, setTimestamp, customActions, readonly,
 }) => {
   const theme = useTheme();
   const classes = useStyles();
@@ -74,7 +74,7 @@ const CollectionActions = ({
       ) : (
         <div className={classes.row}>
           {customActions && customActions.map((action) => (
-            <Tooltip title={action.tooltip} enterDelay={500} enterNextDelay={500}>
+            <Tooltip title={action.tooltip || action.title} enterDelay={500} enterNextDelay={500}>
               <IconButton size="small" onClick={() => handleCustom(action)} key={action.key}>
                 {action.icon}
               </IconButton>
@@ -82,12 +82,12 @@ const CollectionActions = ({
           ))}
           {!readonly && (
             <>
-              <Tooltip title={t('sharedEdit').concat(' ').concat(collectionTitle || '')} enterDelay={500} enterNextDelay={500}>
+              <Tooltip title={t('sharedEdit')} enterDelay={500} enterNextDelay={500}>
                 <IconButton size="small" onClick={handleEdit}>
                   <EditIcon fontSize="small" />
                 </IconButton>
               </Tooltip>
-              <Tooltip title={t('sharedRemove').concat(' ').concat(collectionTitle || '')} enterDelay={500} enterNextDelay={500}>
+              <Tooltip title={t('sharedRemove')} enterDelay={500} enterNextDelay={500}>
                 <IconButton size="small" onClick={handleRemove}>
                   <DeleteIcon fontSize="small" />
                 </IconButton>
-- 
cgit v1.2.3