Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.7.3 into 4.8.0 #6466

Merged
merged 3 commits into from Mar 1, 2024
Merged

Merge 4.7.3 into 4.8.0 #6466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97aa0ed
Bump revision 02 for 4.7.3 RC2 (#6456)
asteriscos Feb 29, 2024
568f1e2
Remove relative_dirname from CDB List (#6458)
asteriscos Feb 29, 2024
7155cab
merge: merge 4.7.3 into 4.8.0
asteriscos Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions plugins/main/public/controllers/management/components/management/common/resources-handler.ts
View file
Open in desktop
Expand Up @@ -93,7 +93,7 @@ export class ResourcesHandler {
fileName: string,
content: string,
overwrite: boolean,
relativeDirname: string,
relativeDirname?: string,
) {
try {
const result = await WzRequest.apiReq(
Expand All @@ -102,7 +102,9 @@ export class ResourcesHandler {
{
params: {
overwrite: overwrite,
relative_dirname: relativeDirname,
...(this.resource !== 'lists'
? { relative_dirname: relativeDirname }
: {}),
},
body: content.toString(),
origin: 'raw',
Expand All @@ -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',
Expand Down