Skip to content

Commit

Permalink
Fix the search in the agent inventory data tables (#5196)
Browse files Browse the repository at this point in the history
* fix: change the search in the agents inventory tables

- Replace search by q API parameter

* changelog: add pull request entry

* fix(agent-inventory): change the search bar placeholder to `Search`

* fix(changelog): fix entry

* fix: replace string

* fix(changelog): moved entry to Fixed

---------

Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
(cherry picked from commit 4fadc4e)
  • Loading branch information
Desvelao committed Mar 31, 2023
1 parent ad396f2 commit d5bfd9d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

All notable changes to the Wazuh app project will be documented in this file.

## Wazuh v4.4.0 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 4400
## Wazuh v4.4.1 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 00

### Fixed

- Fixed the search in the agent inventory data tables [#5196](https://github.com/wazuh/wazuh-kibana-app/pull/5196)
- Fixed the `Anomaly and malware detection` link. [#5329](https://github.com/wazuh/wazuh-kibana-app/pull/5329)
- Fixed the problem that did not allow closing the time picker when the button was clicked again in `Agents` and `Management/Statistics`. [#5341](https://github.com/wazuh/wazuh-kibana-app/pull/5341)

## Wazuh v4.4.0 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 06

### Added

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import { AppState } from '../../../../react-services/app-state';


export function SyscollectorTable({ tableParams }) {
const [params, setParams] = useState({ limit: 10, offset: 0, });
const [params, setParams] = useState<{ limit: number, offset: number, select:string, q?: string}>({
limit: 10,
offset: 0,
select: tableParams.columns.map(({id}) => id).join(",")
});
const [pageIndex, setPageIndex] = useState(0);
const [searchBarValue, setSearchBarValue] = useState("");
const [pageSize, setPageSize] = useState(10);
Expand Down Expand Up @@ -67,7 +71,13 @@ export function SyscollectorTable({ tableParams }) {
setSearchBarValue(value);
timerDelaySearch && clearTimeout(timerDelaySearch);
const timeoutId = setTimeout(() => {
const newParams = { ...params, search: value };
const { q, ...rest} = params;
const newParams = {
...rest,
...(value ? {
q: tableParams.columns.map(({id}) => `${id}~${value}`).join(",")
}: {})
};
setParams(newParams);
setPageIndex(0);
}, 400)
Expand All @@ -85,7 +95,7 @@ export function SyscollectorTable({ tableParams }) {
await AppState.downloadCsv(
tableParams.path,
tableParams.exportFormatted,
!!params.search ? [{ name: 'search', value: params.search }] : []
!!params.q ? [{ name: 'q', value: params.q }] : []
)
}

Expand All @@ -101,11 +111,11 @@ export function SyscollectorTable({ tableParams }) {
<EuiFlexGroup>
<EuiFlexItem>
<EuiFieldSearch
placeholder={`Filter ${tableParams.title.toLowerCase()}...`}
placeholder='Search'
value={searchBarValue}
fullWidth={true}
onChange={onChange}
aria-label={`Filter ${tableParams.title.toLowerCase()}...`}
aria-label='Search'
/>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down

0 comments on commit d5bfd9d

Please sign in to comment.