Merge tag 'v4.7.3-2.8.0' of https://github.com/wazuh/wazuh-kibana-app …

…into cloud/4.7-hl Wazuh plugins for Wazuh dashboard v4.7.3-2.8.0
wazuh · Mar 6, 2024 · de97b8b · de97b8b
2 parents d19840e + 568f1e2
commit de97b8b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
+## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 02-hl
+
+### Added
+
+- Support for Wazuh 4.7.3
+
+### Fixed
+
+- Fixed CDB List import file feature [#6458](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6458)
+
 ## Wazuh v4.7.2 - OpenSearch Dashboards 2.8.0 - Revision 02-hl
 
 ### Added

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

diff --git a/plugins/main/package.json b/plugins/main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wazuh",
-  "version": "4.7.2",
+  "version": "4.7.3",
   "revision": "02-hl",
   "pluginPlatform": {
     "version": "2.8.0"
@@ -83,4 +83,4 @@
     "redux-mock-store": "^1.5.4",
     "swagger-client": "^3.19.11"
   }
-}
+}
diff --git a/plugins/main/public/controllers/management/components/management/common/resources-handler.ts b/plugins/main/public/controllers/management/components/management/common/resources-handler.ts
@@ -93,7 +93,7 @@ export class ResourcesHandler {
     fileName: string,
     content: string,
     overwrite: boolean,
-    relativeDirname: string,
+    relativeDirname?: string,
   ) {
     try {
       const result = await WzRequest.apiReq(
@@ -102,7 +102,9 @@ export class ResourcesHandler {
         {
           params: {
             overwrite: overwrite,
-            relative_dirname: relativeDirname,
+            ...(this.resource !== 'lists'
+              ? { relative_dirname: relativeDirname }
+              : {}),
           },
           body: content.toString(),
           origin: 'raw',
@@ -119,7 +121,7 @@ export class ResourcesHandler {
    * @param {Resource} resource
    * @param {String} fileName
    */
-  async deleteFile(fileName: string, relativeDirname: string = '') {
+  async deleteFile(fileName: string, relativeDirname?: string) {
     try {
       const result = await WzRequest.apiReq(
         'DELETE',