Merge 4.7.3 into 4.8.0 (#6466)

Merge 4.7.3 into 4.8.0
wazuh · Mar 1, 2024 · 6fcfe2e · 6fcfe2e
2 parents 8c39829 + 7155cab
commit 6fcfe2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -55,12 +55,16 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed compilation date field from the app [#6366](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6366)
 - Removed WAZUH_REGISTRATION_SERVER from Windows agent deployment command [#6361](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6361)
 
-## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 01
+## Wazuh v4.7.3 - OpenSearch Dashboards 2.8.0 - Revision 02
 
 ### 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
 
 ### Added

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',