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

Bug fixes PageHeader and SideNav #1123

Merged
merged 7 commits into from
Sep 3, 2024

Conversation

riysaxen-amzn
Copy link
Collaborator

@riysaxen-amzn riysaxen-amzn commented Aug 30, 2024

Description

  • Bug fix in plugin version decoupling, installePlugins list has opensearch-security-analytics not opensearch_security_analytics
  • Persist data SourceId when side nav changes
  • Title changes
  • correlations in correlation page should not be in breadcrumb
  • log types has no detectors in breadcrumb
  • Took detectors out create log type page
  • edit rule page should have the rule name in breadcrumb

Issues Resolved

SA-mds.mov

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.

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
riysaxen-amzn and others added 3 commits August 30, 2024 16:48
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
@riysaxen-amzn
Copy link
Collaborator Author

UTs passing locally

 PASS  public/pages/Overview/utils/helper.test.ts (103.978 s)
 PASS  public/components/Modal/Modal.test.tsx (105.276 s)
 PASS  public/pages/Detectors/components/UpdateBasicDetails/UpdateDetectorBasicDetails.test.tsx (110.9 s)
 › 1 snapshot updated.
 PASS  public/pages/Rules/components/RuleEditor/RuleEditorForm.test.tsx (111.939 s)
 › 1 snapshot updated.
 PASS  public/pages/Rules/components/RuleEditor/RuleEditorContainer.test.tsx (112.085 s)
 › 1 snapshot updated.
 PASS  public/components/ContentPanel/ContentPanel.test.tsx (22.855 s)
 PASS  public/pages/Detectors/components/UpdateFieldMappings/UpdateFieldMappings.test.tsx (24.177 s)
 PASS  public/pages/Detectors/components/UpdateAlertConditions/UpdateAlertConditions.test.tsx (24.766 s)
 › 1 snapshot updated.
 PASS  public/pages/Detectors/containers/AlertTriggersView/AlertTriggersView.test.tsx (25.672 s)
 › 1 snapshot updated.
 PASS  public/pages/Detectors/containers/Detectors/Detectors.test.tsx (26.966 s)
 › 1 snapshot updated.
 PASS  public/pages/Detectors/containers/DetectorDetailsView/DetectorDetailsView.test.tsx (24.984 s)
 › 1 snapshot updated.
 PASS  public/pages/Detectors/containers/Detector/DetectorDetails.test.tsx (29.277 s)
 › 1 snapshot updated.
 PASS  public/pages/Alerts/containers/Alerts/Alerts.test.tsx (31.871 s)
 › 1 snapshot updated.
 PASS  public/pages/Detectors/containers/FieldMappings/EditFieldMappings.test.tsx (22.402 s)
 › 1 snapshot updated.
 PASS  public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.test.tsx (22.633 s)
 PASS  public/pages/Detectors/components/DetectorRulesView/DetectorRulesView.test.tsx (24.052 s)
 › 1 snapshot updated.
 PASS  public/pages/Rules/components/RuleEditor/DetectionVisualEditor.test.tsx (17.14 s)
 PASS  public/pages/CreateDetector/components/ConfigureAlerts/components/AlertCondition/AlertConditionPanel.test.tsx (19.781 s)
 PASS  public/pages/Detectors/components/FieldMappingsView/FieldMappingsView.test.tsx (16.821 s)
 PASS  public/pages/Detectors/components/UpdateRules/UpdateDetectorRules.test.tsx (18.249 s)
 PASS  public/pages/Rules/components/RuleEditor/components/SelectionExpField.test.tsx (16.242 s)
 PASS  public/pages/Detectors/components/AlertTriggerView/AlertTriggerView.test.tsx (16.589 s)
 PASS  public/pages/Rules/components/RuleEditor/components/FieldTextArray.test.tsx (17.582 s)
 PASS  public/pages/Rules/components/RulesTable/RulesTable.test.tsx (18.368 s)
 PASS  public/components/DeleteModal/DeleteModal.test.tsx (19.355 s)
 PASS  public/pages/Rules/components/DeleteModal/DeleteRuleModal.test.tsx (19.557 s)
 PASS  public/pages/Alerts/components/AlertFlyout/AlertFlyout.test.tsx (19.884 s)
 PASS  public/pages/Rules/components/RuleEditor/FormSubmissionErrorToastNotification.test.tsx (14.734 s)
 PASS  public/components/FormFieldHeader/FormFieldHeader.test.tsx (14.7 s)
 PASS  public/components/NotificationsCallOut/NotificationsCallOut.test.tsx (14.647 s)

Snapshot Summary
 › 11 snapshots updated from 11 test suites.

Test Suites: 36 passed, 36 total
Tests:       63 passed, 63 total
Snapshots:   11 updated, 26 passed, 37 total
Time:        172.833 s
Ran all test suites.
✨  Done in 175.68s.

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
@riysaxen-amzn riysaxen-amzn changed the title [Part 1] Bug fixes PageHeader and SideNav Bug fixes PageHeader and SideNav Sep 3, 2024
@amsiglan amsiglan merged commit dad5ee2 into opensearch-project:main Sep 3, 2024
6 of 8 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security-analytics-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security-analytics-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1123-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dad5ee2ebbffa897e2b6c4fca8b26f6fca16289b
# Push it to GitHub
git push --set-upstream origin backport-1123-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics-dashboards-plugin/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1123-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 3, 2024
* bug fixes related to mds suppport

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* bug fixes related to mds suppport

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixes with mds

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* routes changed

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* routes changed

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* updated snapshot files

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit dad5ee2)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
riysaxen-amzn pushed a commit that referenced this pull request Sep 3, 2024
* bug fixes related to mds suppport



* bug fixes related to mds suppport



* fixes with mds



* routes changed



* routes changed



* updated snapshot files



---------



(cherry picked from commit dad5ee2)

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.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.

3 participants