diff --git a/assets/js/common/ActivityLogsConfig/ActivityLogsConfig.jsx b/assets/js/common/ActivityLogsConfig/ActivityLogsConfig.jsx index 6a8fb65cfd..d9a81c61de 100644 --- a/assets/js/common/ActivityLogsConfig/ActivityLogsConfig.jsx +++ b/assets/js/common/ActivityLogsConfig/ActivityLogsConfig.jsx @@ -35,17 +35,14 @@ function ActivityLogsConfig({ retentionTime, onEditClick = noop }) {

Activity Logs

-
-

+

+ Configure data retention times for log entries. +

Retention Time
diff --git a/assets/js/common/ActivityLogsSettingsModal/ActivityLogsSettingsModal.jsx b/assets/js/common/ActivityLogsSettingsModal/ActivityLogsSettingsModal.jsx index ee6a157b38..1784683e77 100644 --- a/assets/js/common/ActivityLogsSettingsModal/ActivityLogsSettingsModal.jsx +++ b/assets/js/common/ActivityLogsSettingsModal/ActivityLogsSettingsModal.jsx @@ -7,7 +7,7 @@ import { InputNumber } from '@common/Input'; import Select from '@common/Select'; import Label from '@common/Label'; -import { getError } from '@lib/api/validationErrors'; +import { getError, getGlobalError } from '@lib/api/validationErrors'; const defaultErrors = []; @@ -22,16 +22,14 @@ const toRetentionTimeErrorMessage = (errors) => .filter(Boolean) .join('; '); -const toGenericErrorMessage = (errors) => - // the first error of type string is considered the generic error - errors.find((error) => typeof error === 'string'); +const toGlobalErrorMessage = (errors) => capitalize(getGlobalError(errors)); function TimeSpan({ time: initialTime, error = false, onChange = noop }) { const [time, setTime] = useState(initialTime); return ( -
-
+
+
-
+