Merge 4.12.0 into master (#469)

Signed-off-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Chantal Belén kelm <[email protected]> Co-authored-by: Guido Modarelli <[email protected]>
wazuh · Dec 27, 2024 · b44f459 · b44f459
1 parent 8e8bb4f
commit b44f459
Show file tree

Hide file tree

Showing 15 changed files with 302 additions and 114 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,19 +2,19 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
-## Wazuh dashboard v5.0.0 - OpenSearch Dashboards 2.16.0 - Revision 00
+## Wazuh dashboard v5.0.0 - OpenSearch Dashboards 2.18.0 - Revision 00
 
 ### Changed
 
 - Changed the reportingDashboards platform plugin to a customized one and adapt the build tools [#340](https://github.com/wazuh/wazuh-dashboard/pull/340)
 
-## Wazuh dashboard v4.10.2 - OpenSearch Dashboards 2.16.0 - Revision 00
+## Wazuh dashboard v4.12.0 - OpenSearch Dashboards 2.16.0 - Revision 00
 
 ### Added
 
 - Support for Wazuh 4.10.2
 
-## Wazuh dashboard v4.10.1 - OpenSearch Dashboards 2.16.0 - Revision 00
+## Wazuh dashboard v4.11.0 - OpenSearch Dashboards 2.16.0 - Revision 00
 
 ### Added
 
@@ -28,7 +28,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ### Removed
 
-- Removed the setting home:useNewHomePage from the advanced settings because the views are not finished. [#282](https://github.com/wazuh/wazuh-dashboard/pull/282)
+- Removed the setting home:useNewHomePage from the advanced settings because the views are not finished [#282](https://github.com/wazuh/wazuh-dashboard/pull/282)
 
 ## Wazuh dashboard v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 01
 

diff --git a/dev-tools/build-packages/base/base-builder.sh b/dev-tools/build-packages/base/base-builder.sh
@@ -112,7 +112,7 @@ sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}
 sed -i -e "s|category:{id:\"opensearch\",label:\"OpenSearch Plugins\",order:2e3}|category:${category_explore}|" ./plugins/customImportMapDashboards/target/public/customImportMapDashboards.plugin.js
 
 # Replace app category to Notifications app
-sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
+sed -i -e "s|category:(_core\$chrome=core.chrome)!==null&&_core\$chrome!==void 0&&(_core\$chrome=_core\$chrome.navGroup)!==null&&_core\$chrome!==void 0&&_core\$chrome.getNavGroupEnabled()?undefined:DEFAULT_APP_CATEGORIES.management|category:${category_explore}|" ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
 
 # Replace app category to Index Management app
 sed -i -e "s|category:DEFAULT_APP_CATEGORIES.management|category:${category_dashboard_management}|g" ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js

diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
@@ -297,6 +297,7 @@ export class ChromeService {
                 opensearchDashboardsVersion={injectedMetadata.getOpenSearchDashboardsVersion()}
                 surveyLink={injectedMetadata.getSurvey()}
                 useUpdatedAppearance
+                darkmode={uiSettings.get('theme:darkMode')}
               />
             </I18nProvider>,
             element
@@ -401,6 +402,7 @@ export class ChromeService {
           currentWorkspace$={workspaces.currentWorkspace$}
           useUpdatedHeader={this.useUpdatedHeader}
           globalSearchCommands={globalSearch.getAllSearchCommands()}
+          darkmode={uiSettings.get('theme:darkMode')}
         />
       ),
 

diff --git a/src/core/public/chrome/constants.ts b/src/core/public/chrome/constants.ts
@@ -27,6 +27,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import wazuh from '../../../../package.json';
+
+export const WAZUH_MAJOR = wazuh.wazuh.version.split('.')[0];
+export const WAZUH_MINOR = wazuh.wazuh.version.split('.')[1];
 
 export const OPENSEARCH_DASHBOARDS_FEEDBACK_LINK = 'https://wazuh.com/community/join-us-on-slack';
 export const OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK = OPENSEARCH_DASHBOARDS_FEEDBACK_LINK;
@@ -51,3 +55,4 @@ export enum HeaderVariant {
   PAGE = 'page',
   APPLICATION = 'application',
 }
+export const WAZUH_DOCUMENTATION_URL = `https://documentation.wazuh.com/${WAZUH_MAJOR}.${WAZUH_MINOR}/`;
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap