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.

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

Implement try catch strategy in Groups #3415

Merged
merged 7 commits into from
Jul 7, 2021

Conversation

pablomarga
Copy link
Contributor

Hi team,
This PR implement our new error handling strategy on the Groups section

Close #3411

@pablomarga pablomarga requested a review from a team June 30, 2021 09:39
@pablomarga pablomarga self-assigned this Jun 30, 2021
@pablomarga pablomarga marked this pull request as draft June 30, 2021 09:39
@pablomarga pablomarga marked this pull request as ready for review July 5, 2021 16:08
@@ -72,7 +73,18 @@ class WzGroupsActionButtonsAgents extends Component {
this.props.updateIsProcessing(true);
this.onRefreshLoading();
} catch (error) {
return Promise.reject(error);
const options = {
context: errorContext,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change this context using ${Class.name}.method and remove const errorContext

} catch (error) {}
} catch (error) {
const options = {
context: errorContext,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

error: {
error: error,
message: error.message || error,
title: error.message || error,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here is error.name

error: {
error: error,
message: error.message || error,
title: error.message || error,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here is error.name || error

import { UI_ERROR_SEVERITIES } from '../../../../../react-services/error-orchestrator/types';
import { getErrorOrchestrator } from '../../../../../react-services/common-services';

const errorContext = 'WzGroupAgentsTable';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace this const for Class.name

Copy link
Contributor

@gabiwassan gabiwassan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@gabiwassan gabiwassan merged commit a3433bc into 4.3-7.10 Jul 7, 2021
@gabiwassan gabiwassan deleted the implement/try-catch-groups branch July 7, 2021 21:14
sortiz1191 pushed a commit that referenced this pull request Jul 8, 2021
* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>
sortiz1191 pushed a commit that referenced this pull request Jul 8, 2021
* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>
sortiz1191 pushed a commit that referenced this pull request Jul 8, 2021
* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>
gabiwassan added a commit that referenced this pull request Jul 12, 2021
* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>
gabiwassan added a commit that referenced this pull request Jul 14, 2021
* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>
gabiwassan added a commit that referenced this pull request Jul 16, 2021
* fix(syscollector): Added try catch strategy.

* Implement try catch strategy in Groups (#3415)

* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* doc(changelog): Updated

* Updating test. (#3470)

* test(unittest): Updating test.

* test(unittest): Updating test.

* test(agent-table): Added unit test & fix collectCoverage

Co-authored-by: Pablo Martínez <pablo.martinez@wazuh.com>
Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>
Machi3mfl pushed a commit that referenced this pull request Jul 19, 2021
* fix(syscollector): Added try catch strategy.

* Implement try catch strategy in Groups (#3415)

* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* doc(changelog): Updated

* Updating test. (#3470)

* test(unittest): Updating test.

* test(unittest): Updating test.

* test(agent-table): Added unit test & fix collectCoverage

Co-authored-by: Pablo Martínez <pablo.martinez@wazuh.com>
Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>
gabiwassan added a commit that referenced this pull request Jul 20, 2021
* Implement try catch react-services

* Changes requested

* Change severity to show the toast

* Add changelog

* Solve comments

* Changed all context value of all try-catch implementations (#3432)

* refactor(error-orchestrator): Changed all context value of all try-catch implementations

* docs(error-orchestrator): Updated changelog.

* Implement try catch strategy in Groups (#3415)

* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* Fixing and updating unit-tests. (#3413)

* test(unit-test): Fixing and updating unit-tests.

* test(scheduler-job): Fixing suite scheduler-job tests.

* test(unit-test): Fixing updating unit-tests.

* test(check-result): Fixing uTest of check-result, added error case.

* test(unit-test): Skipped uTest with dependency of API.

* test(prettier): Applied prettier, redux-mock-store dependency

* test(jest): Jest config without dependencies.

* test(git-actions): Added workflow for uTest.

* test(check-result): Update workflow.

* test(git-actions): Updated workflow

* test(gitactions): Dependencies for unit test.

* test(gitactions): Added coverage-comment

* test(gitactions): Changed text to text-summary

* test(gitactions): Show summary

* test(gitactions): Show summary + added dependencies

* test(gitactions): Typo

* test(gitactions): Porcents

* test(gitactions): Typo

* test(gitactions): Testing node version with yarn

* test(gitactions): Update

* test(gitactions): Update

* test(gitactions): testing coverage summary

* test(gitactions): testing coverage summary

* test(gitactions): fix param github-token

* test(gitactions): update

* test(gitactions): testing report.json

* test(gitactions): final test.

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing

* test(actions): testing

* test(actions): test with old config jest.

* test(actions): set node version for jest

* test(actions): testing with bootstrap

* test(actions): rollback dependencies

* test(actions): rollback

* test(groups-main): fixing snapshot test

* test(groups-main): added coverage

* test(groups-main): fix path

* test(groups-main): fix path

* test(git-actions): fix script

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* fix(syscollector): Refactor for agents-sections.

* fix(syscollector): Clean files.

* fix(syscollector): Clean files.

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test comment coverage

* fix(syscollector): test comment coverage

* fix(syscollector): test comment coverage

* fix(actions): test comment coverage

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* fix(actions): add const env

Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>

* Added try-catch strategy in Reporting section (#3427)

* Implemented new try-catch strategy

* Updated context

* Added test file and snapshot

* Updated CHANGELOG

* Requested changes

* Removed blank space in message

* Updated error title and message

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Implement/try catch in Components >  Overview (#3442)

* Techniques and mitre

* Resources

* Update changelog

* Refactor try catch in Management > Statistics (#3429)

* Added error handling implementation

* Changed wrong var err

* Draft statistics test and snapshot

* Updated CHANGELOG

* Updating title and message error

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Refactor try catch in Management > Configuration (#3451)

* Added new try-catch strategy in Management > Configuration

* Updated CHANGELOG

* Requested changes

* doc(changelog): update

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Updating test. (#3470)

* test(unittest): Updating test.

* test(unittest): Updating test.

* feat(orchestratorError): Fixed some options for orchestrator and added on app-state

* Xpack and odfe tests

* Fix test

* Add copyright

* fix(discover): fix conflict

Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>
Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>
Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com>
Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
gabiwassan added a commit that referenced this pull request Jul 30, 2021
* Implement try catch react-services

* Changes requested

* Change severity to show the toast

* Add changelog

* Solve comments

* Changed all context value of all try-catch implementations (#3432)

* refactor(error-orchestrator): Changed all context value of all try-catch implementations

* docs(error-orchestrator): Updated changelog.

* Implement try catch strategy in Groups (#3415)

* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* Fixing and updating unit-tests. (#3413)

* test(unit-test): Fixing and updating unit-tests.

* test(scheduler-job): Fixing suite scheduler-job tests.

* test(unit-test): Fixing updating unit-tests.

* test(check-result): Fixing uTest of check-result, added error case.

* test(unit-test): Skipped uTest with dependency of API.

* test(prettier): Applied prettier, redux-mock-store dependency

* test(jest): Jest config without dependencies.

* test(git-actions): Added workflow for uTest.

* test(check-result): Update workflow.

* test(git-actions): Updated workflow

* test(gitactions): Dependencies for unit test.

* test(gitactions): Added coverage-comment

* test(gitactions): Changed text to text-summary

* test(gitactions): Show summary

* test(gitactions): Show summary + added dependencies

* test(gitactions): Typo

* test(gitactions): Porcents

* test(gitactions): Typo

* test(gitactions): Testing node version with yarn

* test(gitactions): Update

* test(gitactions): Update

* test(gitactions): testing coverage summary

* test(gitactions): testing coverage summary

* test(gitactions): fix param github-token

* test(gitactions): update

* test(gitactions): testing report.json

* test(gitactions): final test.

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing

* test(actions): testing

* test(actions): test with old config jest.

* test(actions): set node version for jest

* test(actions): testing with bootstrap

* test(actions): rollback dependencies

* test(actions): rollback

* test(groups-main): fixing snapshot test

* test(groups-main): added coverage

* test(groups-main): fix path

* test(groups-main): fix path

* test(git-actions): fix script

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* fix(syscollector): Refactor for agents-sections.

* fix(syscollector): Clean files.

* fix(syscollector): Clean files.

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test comment coverage

* fix(syscollector): test comment coverage

* fix(syscollector): test comment coverage

* fix(actions): test comment coverage

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* fix(actions): add const env

Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>

* Added try-catch strategy in Reporting section (#3427)

* Implemented new try-catch strategy

* Updated context

* Added test file and snapshot

* Updated CHANGELOG

* Requested changes

* Removed blank space in message

* Updated error title and message

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Implement/try catch in Components >  Overview (#3442)

* Techniques and mitre

* Resources

* Update changelog

* Refactor try catch in Management > Statistics (#3429)

* Added error handling implementation

* Changed wrong var err

* Draft statistics test and snapshot

* Updated CHANGELOG

* Updating title and message error

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Refactor try catch in Management > Configuration (#3451)

* Added new try-catch strategy in Management > Configuration

* Updated CHANGELOG

* Requested changes

* doc(changelog): update

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Updating test. (#3470)

* test(unittest): Updating test.

* test(unittest): Updating test.

* feat(orchestratorError): Fixed some options for orchestrator and added on app-state

* Xpack and odfe tests

* Fix test

* Add copyright

* fix(discover): fix conflict

Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>
Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>
Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com>
Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
gabiwassan added a commit that referenced this pull request Aug 5, 2021
* fix(syscollector): Added try catch strategy.

* Implement try catch strategy in Groups (#3415)

* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* doc(changelog): Updated

* Updating test. (#3470)

* test(unittest): Updating test.

* test(unittest): Updating test.

* test(agent-table): Added unit test & fix collectCoverage

Co-authored-by: Pablo Martínez <pablo.martinez@wazuh.com>
Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>
gabiwassan added a commit that referenced this pull request Aug 5, 2021
* Implement try catch react-services

* Changes requested

* Change severity to show the toast

* Add changelog

* Solve comments

* Changed all context value of all try-catch implementations (#3432)

* refactor(error-orchestrator): Changed all context value of all try-catch implementations

* docs(error-orchestrator): Updated changelog.

* Implement try catch strategy in Groups (#3415)

* Implement try catch groups

* Add test

* test(groups): Added simple snapshot test.

* Add changelog

* Change context

* Change title

Co-authored-by: gabiwassan <gabriel.wassan@wazuh.com>

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* Fixing and updating unit-tests. (#3413)

* test(unit-test): Fixing and updating unit-tests.

* test(scheduler-job): Fixing suite scheduler-job tests.

* test(unit-test): Fixing updating unit-tests.

* test(check-result): Fixing uTest of check-result, added error case.

* test(unit-test): Skipped uTest with dependency of API.

* test(prettier): Applied prettier, redux-mock-store dependency

* test(jest): Jest config without dependencies.

* test(git-actions): Added workflow for uTest.

* test(check-result): Update workflow.

* test(git-actions): Updated workflow

* test(gitactions): Dependencies for unit test.

* test(gitactions): Added coverage-comment

* test(gitactions): Changed text to text-summary

* test(gitactions): Show summary

* test(gitactions): Show summary + added dependencies

* test(gitactions): Typo

* test(gitactions): Porcents

* test(gitactions): Typo

* test(gitactions): Testing node version with yarn

* test(gitactions): Update

* test(gitactions): Update

* test(gitactions): testing coverage summary

* test(gitactions): testing coverage summary

* test(gitactions): fix param github-token

* test(gitactions): update

* test(gitactions): testing report.json

* test(gitactions): final test.

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing kibana dependencies

* test(actions): testing

* test(actions): testing

* test(actions): test with old config jest.

* test(actions): set node version for jest

* test(actions): testing with bootstrap

* test(actions): rollback dependencies

* test(actions): rollback

* test(groups-main): fixing snapshot test

* test(groups-main): added coverage

* test(groups-main): fix path

* test(groups-main): fix path

* test(git-actions): fix script

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* test(git-actions): fix checkout

* fix(syscollector): Refactor for agents-sections.

* fix(syscollector): Clean files.

* fix(syscollector): Clean files.

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test

* fix(syscollector): test comment coverage

* fix(syscollector): test comment coverage

* fix(syscollector): test comment coverage

* fix(actions): test comment coverage

* Create Cypress Workflow for 4.3-7.10 (#3444)

* Fixed dispatch for updateCurrentAgentData (#3453)

* fix(syscollector): Fixed dispatch for updateCurrentAgentData

* fix(syscollector): Refactor for agents-sections.

* fix(actions): add const env

Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>

* Added try-catch strategy in Reporting section (#3427)

* Implemented new try-catch strategy

* Updated context

* Added test file and snapshot

* Updated CHANGELOG

* Requested changes

* Removed blank space in message

* Updated error title and message

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Implement/try catch in Components >  Overview (#3442)

* Techniques and mitre

* Resources

* Update changelog

* Refactor try catch in Management > Statistics (#3429)

* Added error handling implementation

* Changed wrong var err

* Draft statistics test and snapshot

* Updated CHANGELOG

* Updating title and message error

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Refactor try catch in Management > Configuration (#3451)

* Added new try-catch strategy in Management > Configuration

* Updated CHANGELOG

* Requested changes

* doc(changelog): update

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>

* Updating test. (#3470)

* test(unittest): Updating test.

* test(unittest): Updating test.

* feat(orchestratorError): Fixed some options for orchestrator and added on app-state

* Xpack and odfe tests

* Fix test

* Add copyright

* fix(discover): fix conflict

Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>
Co-authored-by: Matias Ezequiel Moreno <49887871+matiasmoreno876@users.noreply.github.com>
Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com>
Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants