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

Fix creation of json file after a ui log #3378

Merged
merged 1 commit into from
Jun 18, 2021
Merged

Conversation

pablomarga
Copy link
Contributor

Hi team this PR fix a problem related with the creation of the logs files (app and ui).

@pablomarga pablomarga requested a review from a team June 18, 2021 11:33
@pablomarga pablomarga self-assigned this Jun 18, 2021
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 ! 👍🏼

Copy link
Member

@mpRegalado mpRegalado left a comment

Choose a reason for hiding this comment

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

CR: LGTM! ✔️

Copy link
Contributor

@eze9252 eze9252 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 d2c08fe into 4.3-7.10 Jun 18, 2021
@gabiwassan gabiwassan deleted the fix/create-ui-logs branch June 18, 2021 11:45
gabiwassan added a commit that referenced this pull request Jun 23, 2021
* feat(error-orchestrator): Implement try catch strategy on WzLog + Prettier

* feat(error-orchestrator): Fixed contexts

* feat(error-orchestrator): Improved use of ErrorOrchestratorService

* bugfix(error-orchestrator): Fixed error message.

* Added lowercase levels in storeError (#3377)

* Added lowercase levels in storeError

* Updated CHANGELOG

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>

* [Feature] Mitre Att&ck Intelligence + adapt Framework (#3368)

* refactor in vulnerabilities table component

* refactor code in vuls inventory and add new table component with export csv

* adapat table

* finished refactor table component

* delete console logs and fix wrong version

* add new fields in suggestions

* add changelog

* changes in component table and remove status and type columns

* fix columns position

* feat(mitre): Add Mitre Att&ck intelligence section
  - Created Intelligence tab in Mitre Att&ck Module
  - Created left and right panel
  - Created resource button for the left panel
  - Created search bar for searhin in all resources
  - Created list of each resource

* feat(mitre_intelligence): Modify the search results view and another
improvements
  - Modify the Search results view
  - Improve useAsyncAction hook
  - Add Mitre Att&ck Intelligence to Agent modules component
  - Improve TableWithSearchBar component to accept filters as props
  - Refactor Mitre Atta&ck resources
  - Refator PanelSplit component
  - Fix filtersToObject helper
  - Update test

* feat(mitre_att&ck_intelligence): Render description as markdown
  - Create Markdown component
  - Apply the Markdown component to the resource description in the resouce table

* feat(mitre_atta&ck_intelligence): Add like operator to search resource
by description

* change endpoint and adapt component in mitre

* fix flyout

* feat(mirte_att&ck_integillence): Add the References resource
  - Added to left panel
  - Added resource view

* add redirect to intelligence

* fix merge

* fix merge flyout

* fix package version

* fix(mitre_att&ck_intelligence): Organize resource suggestions and remove Reference resource

* fix PR comments and add intelligence section redirect

* Created new Mitre flyout

* Changelog

* fix comments PR

* add redirect values in query params

* apply prettier

* Resolving comments and upgrading code

* Applying comments upgrades to references table

* Applying more upgrade comments

* fix(mitre_intelligence): Remove the Promise.reject in resource details flyout

* clear comments and imports

* fix error handler techniques

* delete session storage

* delete files and fix get techniques data

* Created new Mitre flyout (#3344)

* Created new Mitre flyout

* Changelog

* Erasing comments

* Erasing console.log

* Resolving comments and upgrading code

* Applying comments upgrades to references table

* Applying more upgrade comments

* fix(mitre_intelligence): Remove the Promise.reject in resource details flyout

Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>

* fix redirect flyout to rules

* feat(frontend/mitre_att&ck_intelligence): Removed welcome intelligence
  - Removed welcome intelligence view and adjustments when doing a general search
  - Set a resource type as selected
  - Update test

* fix comments PR

* fix(mitre_att&ck_intelligence): Change how to open the resource details flyout
  - Change how to open the resource details flyout
  - Refactor some componentes properties
  - Removed not used code

* changelog: Added PR to chengelog

* Update CHANGELOG.md

* fix(mitre_att&ck_intelligence): Fix error in table-default.tsx

* fix(mitre_att&ck_intelligence): PR request changes:
  - Add tests for:
    - Components: Markdown, PanelSplit
    - React Hooks: useAsyncAction
  - Renamed files
  - Add justification for using dangerouslySetInnerHTML property
  - Refactor requests to get mitre techniques
  - Fix tooltips to open tactic/technique details in Framework
  - Added some missing semicolon
  - Fix CSS class wz-markdown-wrapper name

* fix get mitre Techniques from api

Co-authored-by: eze9252 <eze9252@gmail.com>
Co-authored-by: CPAlejandro <cuellarpeinado@gmail.com>
Co-authored-by: Alejandro Cuéllar Peinado <alejandro.cuellar@wazuh.com>
Co-authored-by: Ezequiel Airaudo <36004787+eze9252@users.noreply.github.com>
Co-authored-by: Franco Charriol <franco.charriol@wazuh.com>

* feat(error-orchestrator): Improved on createGetterSetter (#3376)

* feat(error-orchestrator): Improved on createGetterSetter

* bugfix(error-orchestrator): Added default value of disaply and store, remove location of types and fixed toastMessage of addError

* feat(error-orchestrator): Added creatorGetterSetter on wazuh-app to avoid dependence on Kibana.

* feat(error-orchestrator): Rebase 4.3 and apply new implementation getErrorOrchestrator. PR comments.

* feat(error-orchestrator): Removed unnecessary parameter.

* Fix creation of json file after a ui log (#3378)

* feat(error-orchestrator): Removed unnecessary parameter.

* fix(error-orchestrator): Fixed imports.

* doc(error-orchestrator): Added README.md

* doc(error-orchestrator): Added README.md

Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com>
Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: eze9252 <eze9252@gmail.com>
Co-authored-by: CPAlejandro <cuellarpeinado@gmail.com>
Co-authored-by: Alejandro Cuéllar Peinado <alejandro.cuellar@wazuh.com>
Co-authored-by: Ezequiel Airaudo <36004787+eze9252@users.noreply.github.com>
Co-authored-by: Franco Charriol <franco.charriol@wazuh.com>
Co-authored-by: Pablo Martínez <pablo.martinez@wazuh.com>
gabiwassan added a commit that referenced this pull request Jun 30, 2021
* Applied new strategy try-catch error handling in ManagementController

* Added lowercase levels in storeError (#3377)

* Added lowercase levels in storeError

* Updated CHANGELOG

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>

* [Feature] Mitre Att&ck Intelligence + adapt Framework (#3368)

* refactor in vulnerabilities table component

* refactor code in vuls inventory and add new table component with export csv

* adapat table

* finished refactor table component

* delete console logs and fix wrong version

* add new fields in suggestions

* add changelog

* changes in component table and remove status and type columns

* fix columns position

* feat(mitre): Add Mitre Att&ck intelligence section
  - Created Intelligence tab in Mitre Att&ck Module
  - Created left and right panel
  - Created resource button for the left panel
  - Created search bar for searhin in all resources
  - Created list of each resource

* feat(mitre_intelligence): Modify the search results view and another
improvements
  - Modify the Search results view
  - Improve useAsyncAction hook
  - Add Mitre Att&ck Intelligence to Agent modules component
  - Improve TableWithSearchBar component to accept filters as props
  - Refactor Mitre Atta&ck resources
  - Refator PanelSplit component
  - Fix filtersToObject helper
  - Update test

* feat(mitre_att&ck_intelligence): Render description as markdown
  - Create Markdown component
  - Apply the Markdown component to the resource description in the resouce table

* feat(mitre_atta&ck_intelligence): Add like operator to search resource
by description

* change endpoint and adapt component in mitre

* fix flyout

* feat(mirte_att&ck_integillence): Add the References resource
  - Added to left panel
  - Added resource view

* add redirect to intelligence

* fix merge

* fix merge flyout

* fix package version

* fix(mitre_att&ck_intelligence): Organize resource suggestions and remove Reference resource

* fix PR comments and add intelligence section redirect

* Created new Mitre flyout

* Changelog

* fix comments PR

* add redirect values in query params

* apply prettier

* Resolving comments and upgrading code

* Applying comments upgrades to references table

* Applying more upgrade comments

* fix(mitre_intelligence): Remove the Promise.reject in resource details flyout

* clear comments and imports

* fix error handler techniques

* delete session storage

* delete files and fix get techniques data

* Created new Mitre flyout (#3344)

* Created new Mitre flyout

* Changelog

* Erasing comments

* Erasing console.log

* Resolving comments and upgrading code

* Applying comments upgrades to references table

* Applying more upgrade comments

* fix(mitre_intelligence): Remove the Promise.reject in resource details flyout

Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>

* fix redirect flyout to rules

* feat(frontend/mitre_att&ck_intelligence): Removed welcome intelligence
  - Removed welcome intelligence view and adjustments when doing a general search
  - Set a resource type as selected
  - Update test

* fix comments PR

* fix(mitre_att&ck_intelligence): Change how to open the resource details flyout
  - Change how to open the resource details flyout
  - Refactor some componentes properties
  - Removed not used code

* changelog: Added PR to chengelog

* Update CHANGELOG.md

* fix(mitre_att&ck_intelligence): Fix error in table-default.tsx

* fix(mitre_att&ck_intelligence): PR request changes:
  - Add tests for:
    - Components: Markdown, PanelSplit
    - React Hooks: useAsyncAction
  - Renamed files
  - Add justification for using dangerouslySetInnerHTML property
  - Refactor requests to get mitre techniques
  - Fix tooltips to open tactic/technique details in Framework
  - Added some missing semicolon
  - Fix CSS class wz-markdown-wrapper name

* fix get mitre Techniques from api

Co-authored-by: eze9252 <eze9252@gmail.com>
Co-authored-by: CPAlejandro <cuellarpeinado@gmail.com>
Co-authored-by: Alejandro Cuéllar Peinado <alejandro.cuellar@wazuh.com>
Co-authored-by: Ezequiel Airaudo <36004787+eze9252@users.noreply.github.com>
Co-authored-by: Franco Charriol <franco.charriol@wazuh.com>

* feat(error-orchestrator): Improved on createGetterSetter (#3376)

* feat(error-orchestrator): Improved on createGetterSetter

* bugfix(error-orchestrator): Added default value of disaply and store, remove location of types and fixed toastMessage of addError

* feat(error-orchestrator): Added creatorGetterSetter on wazuh-app to avoid dependence on Kibana.

* Fix creation of json file after a ui log (#3378)

* Updated error orchestrator implemetation

* Update import errorOchestratorService

* Updated imported orchestrator getter

* Added context ManagementeController

* Updated CHANGELOG

Co-authored-by: Ibarra Maximiliano <maximiliano.ibarra@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: eze9252 <eze9252@gmail.com>
Co-authored-by: CPAlejandro <cuellarpeinado@gmail.com>
Co-authored-by: Alejandro Cuéllar Peinado <alejandro.cuellar@wazuh.com>
Co-authored-by: Ezequiel Airaudo <36004787+eze9252@users.noreply.github.com>
Co-authored-by: Franco Charriol <franco.charriol@wazuh.com>
Co-authored-by: Gabriel Wassan <gabriel.wassan@wazuh.com>
Co-authored-by: Pablo Martínez <pablo.martinez@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.

None yet

4 participants