Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Watcher] Retain query in watcher list #163297

Merged
merged 6 commits into from
Aug 8, 2023
Merged

[Watcher] Retain query in watcher list #163297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
660ed13
Retain query when auto-refreshing
sabarasaba Aug 7, 2023
dc34b68
commit with @elastic email
sabarasaba Aug 7, 2023
7472851
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Aug 7, 2023
4de061d
Rename as variable already exist
sabarasaba Aug 8, 2023
66b1809
Merge branch 'main' into WATCHER_retain_query
kibanamachine Aug 8, 2023
1165b25
Surface error to UI
sabarasaba Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/plugins/watcher/__jest__/client_integration/helpers/watch_list_page.helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export type TestSubjects =
| 'appTitle'
| 'documentationLink'
| 'watchesTable'
| 'watcherListSearchError'
| 'cell'
| 'row'
| 'deleteWatchButton'
Expand Down
8 changes: 8 additions & 0 deletions x-pack/plugins/watcher/__jest__/client_integration/watch_list_page.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ describe('<WatchListPage />', () => {
testBed.component.update();
});

test('should show error callout if search is invalid', async () => {
const { exists, actions } = testBed;

actions.searchWatches('or');

expect(exists('watcherListSearchError')).toBe(true);
});

test('should retain the search query', async () => {
const { table, actions } = testBed;

Expand Down
35 changes: 35 additions & 0 deletions x-pack/plugins/watcher/public/application/sections/watch_list_page/watch_list_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
EuiIcon,
EuiLink,
EuiPageContent_Deprecated as EuiPageContent,
EuiCallOut,
EuiSpacer,
EuiText,
EuiToolTip,
Expand All @@ -24,6 +25,7 @@ import {
EuiContextMenuPanel,
EuiContextMenuItem,
EuiPageHeader,
EuiSearchBarOnChangeArgs,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
Expand Down Expand Up @@ -53,6 +55,9 @@ export const WatchListPage = () => {
history,
links: { watcherGettingStartedUrl },
} = useAppContext();
const [query, setQuery] = useState('');
const [queryError, setQueryError] = useState<string | null>(null);

const [selection, setSelection] = useState([]);
const [watchesToDelete, setWatchesToDelete] = useState<string[]>([]);
// Filter out deleted watches on the client, because the API will return 200 even though some watches
Expand Down Expand Up @@ -446,7 +451,18 @@ export const WatchListPage = () => {
: '',
};

const handleOnChange = ({ queryText, error: searchError }: EuiSearchBarOnChangeArgs) => {
if (!searchError) {
setQuery(queryText);
setQueryError(null);
} else {
setQueryError(searchError.message);
}
};

const searchConfig = {
onChange: handleOnChange,
query,
box: {
incremental: true,
},
Expand Down Expand Up @@ -498,6 +514,25 @@ export const WatchListPage = () => {
}}
selection={selectionConfig}
isSelectable={true}
childrenBetween={
queryError && (
<>
<EuiCallOut
data-test-subj="watcherListSearchError"
iconType="warning"
color="danger"
title={
<FormattedMessage
id="xpack.watcher.sections.watchList.watchTable.errorOnSearch"
defaultMessage="Invalid search: {queryError}"
values={{ queryError }}
/>
}
/>
<EuiSpacer />
</>
)
}
message={
<FormattedMessage
id="xpack.watcher.sections.watchList.watchTable.noWatchesMessage"
Expand Down