From 239109e3ddc71067f06f04c28f395d217fb68340 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 27 Jun 2023 01:18:03 +0300 Subject: [PATCH] New: Improve empty list messaging (cherry picked from commit ee843259bca2d9764a3919b123524a51a3a16cce) Closes #8738 --- frontend/src/Settings/Tags/Tags.js | 6 ++++-- frontend/src/System/Events/LogsTable.js | 7 ++++--- frontend/src/System/Logs/Files/LogFiles.js | 6 +++--- frontend/src/System/Updates/Updates.js | 5 +++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/frontend/src/Settings/Tags/Tags.js b/frontend/src/Settings/Tags/Tags.js index 453860426..c5f3d8706 100644 --- a/frontend/src/Settings/Tags/Tags.js +++ b/frontend/src/Settings/Tags/Tags.js @@ -1,7 +1,9 @@ import PropTypes from 'prop-types'; import React from 'react'; +import Alert from 'Components/Alert'; import FieldSet from 'Components/FieldSet'; import PageSectionContent from 'Components/Page/PageSectionContent'; +import { kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import TagConnector from './TagConnector'; import styles from './Tags.css'; @@ -14,9 +16,9 @@ function Tags(props) { if (!items.length) { return ( -
+ {translate('NoTagsHaveBeenAddedYet')} -
+ ); } diff --git a/frontend/src/System/Events/LogsTable.js b/frontend/src/System/Events/LogsTable.js index b146f818d..1c37a03ba 100644 --- a/frontend/src/System/Events/LogsTable.js +++ b/frontend/src/System/Events/LogsTable.js @@ -1,5 +1,6 @@ import PropTypes from 'prop-types'; import React from 'react'; +import Alert from 'Components/Alert'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FilterMenu from 'Components/Menu/FilterMenu'; import PageContent from 'Components/Page/PageContent'; @@ -11,7 +12,7 @@ import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper'; import TablePager from 'Components/Table/TablePager'; -import { align, icons } from 'Helpers/Props'; +import { align, icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import LogsTableRow from './LogsTableRow'; @@ -82,9 +83,9 @@ function LogsTable(props) { { isPopulated && !error && !items.length && -
+ {translate('NoEventsFound')} -
+ } { diff --git a/frontend/src/System/Logs/Files/LogFiles.js b/frontend/src/System/Logs/Files/LogFiles.js index 52f001ea6..20ee3bc95 100644 --- a/frontend/src/System/Logs/Files/LogFiles.js +++ b/frontend/src/System/Logs/Files/LogFiles.js @@ -11,7 +11,7 @@ import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection'; import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import { icons } from 'Helpers/Props'; +import { icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import LogsNavMenu from '../LogsNavMenu'; import LogFilesTableRow from './LogFilesTableRow'; @@ -118,9 +118,9 @@ class LogFiles extends Component { { !isFetching && !items.length && -
+ {translate('NoLogFiles')} -
+ } diff --git a/frontend/src/System/Updates/Updates.js b/frontend/src/System/Updates/Updates.js index 429e74e04..f2c78811d 100644 --- a/frontend/src/System/Updates/Updates.js +++ b/frontend/src/System/Updates/Updates.js @@ -1,6 +1,7 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import React, { Component, Fragment } from 'react'; +import Alert from 'Components/Alert'; import Icon from 'Components/Icon'; import Label from 'Components/Label'; import SpinnerButton from 'Components/Link/SpinnerButton'; @@ -61,9 +62,9 @@ class Updates extends Component { { noUpdates && -
+ {translate('NoUpdatesAreAvailable')} -
+ } {