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

Change the order of the sections #622

Conversation

jovancacvetkovic
Copy link

@jovancacvetkovic jovancacvetkovic commented Jun 7, 2023

Description

Sort and reorder the Creation detection rule UX components

Issues Resolved

Resolves #586
Resolves #601
Resolves #613
Resolves #589
Resolves #602
Resolves #620

Screenshots

Screenshot from 2023-05-17 16-52-59
Screenshot from 2023-05-17 16-53-17
Screenshot from 2023-05-17 16-53-27
Screenshot from 2023-05-17 16-53-39

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>
…-analytics-dashboards-plugin into Change_the_order_of_the_sections

# Conflicts:
#	public/app.scss
#	public/pages/Rules/components/RuleEditor/RuleEditorForm.scss
#	public/pages/Rules/components/RuleEditor/components/YamlRuleEditorComponent/RuleTagsComboBox.tsx
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
Signed-off-by: Jovan Cvetkovic <[email protected]>
…ule" page opensearch-project#586

[FEATURE] Improve the Create detection rules - selection panel fields error notifications opensearch-project#601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission opensearch-project#613

Signed-off-by: Jovan Cvetkovic <[email protected]>
…ule" page opensearch-project#586

[FEATURE] Improve the Create detection rules - selection panel fields error notifications opensearch-project#601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission opensearch-project#613

Signed-off-by: Jovan Cvetkovic <[email protected]>
…-analytics-dashboards-plugin into Improve_list_text_area_UX

# Conflicts:
#	cypress/integration/2_rules.spec.js
#	public/app.scss
#	public/pages/Rules/components/RuleEditor/DetectionVisualEditor.tsx
…acvetkovic/security-analytics-dashboards-plugin into Change_the_order_of_the_sections

# Conflicts:
#	public/pages/Rules/components/RuleEditor/DetectionVisualEditor.tsx
#	public/pages/Rules/components/RuleEditor/RuleEditorForm.tsx
…cacvetkovic/security-analytics-dashboards-plugin into Change_the_order_of_the_sections

# Conflicts:
#	public/pages/Rules/components/RuleEditor/components/YamlRuleEditorComponent/RuleTagsComboBox.tsx
@codecov
Copy link

codecov bot commented Jun 7, 2023

Codecov Report

Merging #622 (8c19090) into main (d2e78c5) will increase coverage by 1.35%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #622      +/-   ##
==========================================
+ Coverage   31.48%   32.84%   +1.35%     
==========================================
  Files         138      139       +1     
  Lines        4335     4451     +116     
  Branches      721      744      +23     
==========================================
+ Hits         1365     1462      +97     
+ Misses       2832     2812      -20     
- Partials      138      177      +39     

see 16 files with indirect coverage changes

@jovancacvetkovic
Copy link
Author

@amsiglan, @AWSHurneyt should be backported to 2.x

Copy link
Collaborator

@AWSHurneyt AWSHurneyt left a comment

Choose a reason for hiding this comment

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

@jovancacvetkovic PR opensearch-project/opensearch-dashboards-functional-test#657 will need to be updated as well I imagine, correct? It may be worthwhile to try running these test updates locally in the FTR to get an idea of whether any changes are needed for them to execute successfully. That way we can minimize differences between the tests maintained in both repos.

@jovancacvetkovic
Copy link
Author

@jovancacvetkovic PR opensearch-project/opensearch-dashboards-functional-test#657 will need to be updated as well I imagine, correct? It may be worthwhile to try running these test updates locally in the FTR to get an idea of whether any changes are needed for them to execute successfully. That way we can minimize differences between the tests maintained in both repos.

We had many redesigns for the rules, so I expect FTR to fail, but I will also try and find some time to test these changes locally. Anyway, I'll have to wait for the changes to be applied before moving these to FTR.

@AWSHurneyt
Copy link
Collaborator

@jovancacvetkovic PR opensearch-project/opensearch-dashboards-functional-test#657 will need to be updated as well I imagine, correct? It may be worthwhile to try running these test updates locally in the FTR to get an idea of whether any changes are needed for them to execute successfully. That way we can minimize differences between the tests maintained in both repos.

We had many redesigns for the rules, so I expect FTR to fail, but I will also try and find some time to test these changes locally. Anyway, I'll have to wait for the changes to be applied before moving these to FTR.

That makes sense, I mostly just wanted to be mindful of the FTR. We had to provide manual sign off for the frontend during the 2.8 release, which was time consuming; so we should strive to have the FTR updated for the 2.9 release.

}
);

Cypress.Commands.add(
Copy link
Collaborator

Choose a reason for hiding this comment

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

Just a quick note:
When these test updates are eventually added to the functional test repo, it'll be important to confirm that these custom cypress command names overlap with those used by the other plugins in the FTR.

Copy link
Author

Choose a reason for hiding this comment

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

Correct, thanks for the reminder.

@AWSHurneyt AWSHurneyt merged commit e3c103e into opensearch-project:main Jun 21, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 21, 2023
* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Change the order of the sections in the "Create detection rule" page #586

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* bugfix for tags validation

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Improve text area ux and add expression UI #603

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review Change the order of the sections #622

Signed-off-by: Jovan Cvetkovic <[email protected]>

---------

Signed-off-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit e3c103e)
amsiglan pushed a commit that referenced this pull request Jul 12, 2023
* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Change the order of the sections in the "Create detection rule" page #586

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* bugfix for tags validation

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Improve text area ux and add expression UI #603

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review Change the order of the sections #622

Signed-off-by: Jovan Cvetkovic <[email protected]>

---------

Signed-off-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit e3c103e)

Co-authored-by: Jovan Cvetkovic <[email protected]>
opensearch-trigger-bot bot added a commit that referenced this pull request Jul 12, 2023
* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Change the order of the sections in the "Create detection rule" page #586

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* bugfix for tags validation

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Improve text area ux and add expression UI #603

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review Change the order of the sections #622

Signed-off-by: Jovan Cvetkovic <[email protected]>

---------

Signed-off-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit e3c103e)

Co-authored-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit c2ff25f)
amsiglan pushed a commit that referenced this pull request Jul 12, 2023
* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX #589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Change the order of the sections in the "Create detection rule" page #586

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* bugfix for tags validation

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page #586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications #601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission #613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor #602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Improve text area ux and add expression UI #603

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review Change the order of the sections #622

Signed-off-by: Jovan Cvetkovic <[email protected]>

---------

Signed-off-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit e3c103e)

Co-authored-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit c2ff25f)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
AWSHurneyt pushed a commit to AWSHurneyt/security-analytics-dashboards-plugin that referenced this pull request Oct 12, 2023
…-project#634) (opensearch-project#644)

* [FEATURE] Improve "list" text area UX opensearch-project#589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX opensearch-project#589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX opensearch-project#589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Improve "list" text area UX opensearch-project#589
Use expression builder instead of code editor

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Change the order of the sections in the "Create detection rule" page opensearch-project#586

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review

Signed-off-by: Jovan Cvetkovic <[email protected]>

* bugfix for tags validation

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page opensearch-project#586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications opensearch-project#601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission opensearch-project#613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Change the order of the sections in the "Create detection rule" page opensearch-project#586
[FEATURE] Improve the Create detection rules - selection panel fields error notifications opensearch-project#601
[FEATURE] Improve the Create detection rules - selection panel condition field is not marked as invalid after submission opensearch-project#613

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor opensearch-project#602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* [FEATURE] Replace code editor with expression editor opensearch-project#602

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Improve text area ux and add expression UI opensearch-project#603

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Cypress cases for detectors and rules, validate forms and fields

Signed-off-by: Jovan Cvetkovic <[email protected]>

* Code review Change the order of the sections opensearch-project#622

Signed-off-by: Jovan Cvetkovic <[email protected]>

---------

Signed-off-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit e3c103e)

Co-authored-by: Jovan Cvetkovic <[email protected]>
(cherry picked from commit c2ff25f)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Signed-off-by: AWSHurneyt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants