Merge branch '4.9.0' into feat/6825-add-view-document-discover

wazuh · Jul 19, 2024 · 3b50d81 · 3b50d81
2 parents 30a98e2 + eb91b82
commit 3b50d81
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
-## Wazuh v4.9.0 - OpenSearch Dashboards 2.13.0 - Revision 02
+## Wazuh v4.9.0 - OpenSearch Dashboards 2.13.0 - Revision 03
 
 ### Added
 
@@ -42,7 +42,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Upgraded versions of `follow-redirects` and `es5-ext` [#6626](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6626)
 - Changed agent log collector socket API response controller component [#6660](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6660)
 - Improve margins and paddings in the Events, Inventory and Control tabs [#6708](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6708)
-- Refactored the search bar to correctly handle fixed and user-added filters [#6716](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6716) [#6755](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6755)
+- Refactored the search bar to correctly handle fixed and user-added filters [#6716](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6716) [#6755](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6755) [#6833](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6833)
 - Generate URL with predefined filters [#6745](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6745)
 - Migrated AngularJS routing to ReactJS [#6689](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6689) [#6775](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6775) [#6790](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6790
 - Improvement of the filter management system by implementing new standard modules [#6534](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6534) [#6772](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6772)
@@ -68,7 +68,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed custom EuiSuggestItem component in favor of OUI's native component [#6714](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6714)
 - Removed API endpoint unused endpoints from creation of old visualisations: GET /elastic/visualizations/{tab}/{pattern} and GET /elastic/visualizations/{tab}/{pattern} [#6782](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6782)
 
-## Wazuh v4.8.1 - OpenSearch Dashboards 2.10.0 - Revision 02
+## Wazuh v4.8.1 - OpenSearch Dashboards 2.10.0 - Revision 04
 
 ### Added
 
@@ -79,6 +79,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed the unexpected `delay` parameter on the server API requests [#6778](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6778)
 - Fixed home KPI links with custom or index pattern whose title is different to the id [#6777](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6777)
 - Fixed colors related to vulnerability severity levels on Vulnerability Detection dashboard [#6793](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6793)
+- Fixed pinned agent error in vulnerabilities events tab [#6827](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6827)
 
 ## Wazuh v4.8.0 - OpenSearch Dashboards 2.10.0 - Revision 12
 

diff --git a/plugins/main/opensearch_dashboards.json b/plugins/main/opensearch_dashboards.json
@@ -1,6 +1,6 @@
 {
   "id": "wazuh",
-  "version": "4.9.0-02",
+  "version": "4.9.0-03",
   "opensearchDashboardsVersion": "opensearchDashboards",
   "configPath": ["wazuh"],
   "requiredPlugins": [

diff --git a/plugins/main/package.json b/plugins/main/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wazuh",
   "version": "4.9.0",
-  "revision": "02",
+  "revision": "03",
   "pluginPlatform": {
     "version": "2.13.0"
   },

diff --git a/plugins/main/public/components/common/search-bar/search-bar.scss b/plugins/main/public/components/common/search-bar/search-bar.scss
@@ -1,3 +1,13 @@
 .wz-search-bar-no-padding .globalQueryBar:not(:empty) {
   padding: 0px !important;
 }
+
+.wz-search-bar {
+  > .euiFlexGroup {
+    &:first-child {
+      #GlobalFilterGroup {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/plugins/main/public/components/common/search-bar/search-bar.tsx b/plugins/main/public/components/common/search-bar/search-bar.tsx
@@ -6,7 +6,6 @@ import {
   SearchBarProps,
   Filter,
 } from '../../../../../../src/plugins/data/public';
-import useSearchBar from './use-search-bar';
 
 export interface WzSearchBarProps extends SearchBarProps {
   fixedFilters?: Filter[];
@@ -49,9 +48,7 @@ export const WzSearchBar = ({
         >
           {preQueryBar ? <EuiFlexItem>{preQueryBar}</EuiFlexItem> : null}
           <EuiFlexItem grow={!preQueryBar}>
-            <SearchBar
-              {...restProps}
-              showFilterBar={false} />
+            <SearchBar {...restProps} />
           </EuiFlexItem>
         </EuiFlexGroup>
       ) : null}
@@ -68,10 +65,11 @@ export const WzSearchBar = ({
                 {fixedFilters?.map((filter, idx) => (
                   <EuiFlexItem grow={false} key={idx}>
                     <EuiBadge className='globalFilterItem' color='hollow'>
-                      {`${filter.meta.key}: ${typeof filter.meta.value === 'function'
-                        ? filter.meta.value()
-                        : filter.meta.value
-                        }`}
+                      {`${filter.meta.key}: ${
+                        typeof filter.meta.value === 'function'
+                          ? filter.meta.value()
+                          : filter.meta.value
+                      }`}
                     </EuiBadge>
                   </EuiFlexItem>
                 ))}

diff --git a/plugins/wazuh-check-updates/opensearch_dashboards.json b/plugins/wazuh-check-updates/opensearch_dashboards.json
@@ -1,6 +1,6 @@
 {
   "id": "wazuhCheckUpdates",
-  "version": "4.9.0-02",
+  "version": "4.9.0-03",
   "opensearchDashboardsVersion": "opensearchDashboards",
   "server": true,
   "ui": true,

diff --git a/plugins/wazuh-check-updates/package.json b/plugins/wazuh-check-updates/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wazuh-check-updates",
   "version": "4.9.0",
-  "revision": "02",
+  "revision": "03",
   "pluginPlatform": {
     "version": "2.13.0"
   },

diff --git a/plugins/wazuh-core/opensearch_dashboards.json b/plugins/wazuh-core/opensearch_dashboards.json
@@ -1,6 +1,6 @@
 {
   "id": "wazuhCore",
-  "version": "4.9.0-02",
+  "version": "4.9.0-03",
   "opensearchDashboardsVersion": "opensearchDashboards",
   "server": true,
   "ui": true,

diff --git a/plugins/wazuh-core/package.json b/plugins/wazuh-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wazuh-core",
   "version": "4.9.0",
-  "revision": "02",
+  "revision": "03",
   "pluginPlatform": {
     "version": "2.13.0"
   },