From 078c6acbd1af5936fab29431dc27e03aaed34a7b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 3 Jul 2022 13:11:46 -0700 Subject: Option to hide groups (fix #693) --- modern/src/common/attributes/useCommonUserAttributes.js | 4 ++++ modern/src/common/util/useFeatures.js | 2 ++ modern/src/settings/components/SettingsMenu.js | 14 ++++++++------ 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'modern/src') diff --git a/modern/src/common/attributes/useCommonUserAttributes.js b/modern/src/common/attributes/useCommonUserAttributes.js index ddd5d970..81ceaca7 100644 --- a/modern/src/common/attributes/useCommonUserAttributes.js +++ b/modern/src/common/attributes/useCommonUserAttributes.js @@ -33,6 +33,10 @@ export default (t) => useMemo(() => ({ name: t('attributeNotificationTokens'), type: 'string', }, + 'ui.disableGroups': { + name: t('attributeUiDisableGroups'), + type: 'boolean', + }, 'ui.disableEvents': { name: t('attributeUiDisableEvents'), type: 'boolean', diff --git a/modern/src/common/util/useFeatures.js b/modern/src/common/util/useFeatures.js index 7a7ffcd2..995fbf86 100644 --- a/modern/src/common/util/useFeatures.js +++ b/modern/src/common/util/useFeatures.js @@ -19,6 +19,7 @@ export default () => useSelector((state) => { const disableVehicleFetures = get(server, user, 'ui.disableVehicleFetures'); const disableDrivers = disableVehicleFetures || get(server, user, 'ui.disableDrivers'); const disableMaintenance = disableVehicleFetures || get(server, user, 'ui.disableMaintenance'); + const disableGroups = get(server, user, 'ui.disableGroups'); const disableEvents = get(server, user, 'ui.disableEvents'); const disableComputedAttributes = get(server, user, 'ui.disableComputedAttributes'); const disableCalendars = get(server, user, 'ui.disableCalendars'); @@ -26,6 +27,7 @@ export default () => useSelector((state) => { return { disableDrivers, disableMaintenance, + disableGroups, disableEvents, disableComputedAttributes, disableCalendars, diff --git a/modern/src/settings/components/SettingsMenu.js b/modern/src/settings/components/SettingsMenu.js index 181cd74c..51d9b8fc 100644 --- a/modern/src/settings/components/SettingsMenu.js +++ b/modern/src/settings/components/SettingsMenu.js @@ -67,12 +67,14 @@ const SettingsMenu = () => { icon={} selected={location.pathname.startsWith('/settings/geofence')} /> - } - selected={location.pathname.startsWith('/settings/group')} - /> + {!features.disableGroups && ( + } + selected={location.pathname.startsWith('/settings/group')} + /> + )} {!features.disableDrivers && (