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

Fix reports path in toast #6226

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Fix reports path in toast #6226

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
8143ff6
Fix reports path in toast
Tostti Dec 15, 2023
091de39
Update changelog
Tostti Dec 15, 2023
6f45e29
Update changelog
Tostti Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ All notable changes to the Wazuh app project will be documented in this file.

### Changed

- Moved the plugin menu to platform applications into the side menu [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Moved the plugin menu to platform applications into the side menu [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840) [#6226](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6226)
- Changed dashboards. [#6035](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6035)
- Change the display order of tabs in all modules. [#6067](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6067)
- Upgraded the `axios` dependency to `1.6.1` [#5062](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5062)
Expand All @@ -34,7 +34,7 @@ All notable changes to the Wazuh app project will be documented in this file.

- Removed the `disabled_roles` and `customization.logo.sidebar` settings [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Removed the ability to configure the visibility of modules and removed `extensions.*` settings [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Removed the application menu in the IT Hygiene application [6176](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6176)
- Removed the application menu in the IT Hygiene application [#6176](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6176)
- Removed the implicit filter of WQL language of the search bar UI [#6174](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6174)

## Wazuh v4.7.1 - OpenSearch Dashboards 2.8.0 - Revision 01
Expand All @@ -55,7 +55,7 @@ All notable changes to the Wazuh app project will be documented in this file.

- Support for Wazuh 4.7.0
- Added `status detail` column in the agents table. [#5680](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5680)
- Added agent register wizard handle properly special characters in password [5738](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5738)
- Added agent register wizard handle properly special characters in password [#5738](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5738)

### Changed

Expand Down
6 changes: 3 additions & 3 deletions plugins/main/public/react-services/reporting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class ReportingService {
const visualizationIDList = [];
for (const item of idArray) {
const tmpHTMLElement = $(`#${item}`);
if(tmpHTMLElement[0]){
if (tmpHTMLElement[0]) {
this.vis2png.assignHTMLItem(item, tmpHTMLElement);
visualizationIDList.push(item);
}
Expand Down Expand Up @@ -120,7 +120,7 @@ export class ReportingService {
this.showToast(
'success',
'Created report',
'Success. Go to Wazuh > Management > Reporting',
'Success. Go to Indexer/dashboard management > Reporting',
4000
);
return;
Expand Down Expand Up @@ -167,7 +167,7 @@ export class ReportingService {
this.showToast(
'success',
'Created report',
'Success. Go to Wazuh > Management > Reporting',
'Success. Go to Indexer/dashboard management > Reporting',
4000
);
return;
Expand Down
9 changes: 4 additions & 5 deletions plugins/main/public/services/reporting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ export class ReportingService {
const appliedFilters = await this.visHandlers.getAppliedFilters(syscollectorFilters);

const array = await this.vis2png.checkArray(idArray);
const name = `wazuh-${isAgents ? 'agents' : 'overview'}-${tab}-${
(Date.now() / 1000) | 0
}.pdf`;
const name = `wazuh-${isAgents ? 'agents' : 'overview'}-${tab}-${(Date.now() / 1000) | 0
}.pdf`;

const browserTimezone = moment.tz.guess(true);

Expand All @@ -96,7 +95,7 @@ export class ReportingService {
this.$rootScope.reportBusy = false;
this.$rootScope.reportStatus = false;
this.$rootScope.$applyAsync();
ErrorHandler.info('Success. Go to Wazuh > Management > Reporting', 'Reporting');
ErrorHandler.info('Success. Go to Indexer/dashboard management > Reporting', 'Reporting');

return;
} catch (error) {
Expand Down Expand Up @@ -134,7 +133,7 @@ export class ReportingService {
this.$rootScope.reportBusy = false;
this.$rootScope.reportStatus = false;
this.$rootScope.$applyAsync();
ErrorHandler.info('Success. Go to Wazuh > Management > Reporting', 'Reporting');
ErrorHandler.info('Success. Go to Indexer/dashboard management > Reporting', 'Reporting');

return;
} catch (error) {
Expand Down
Loading