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

Deprecate maps multi data source display #651

Merged

Conversation

junqiu-lei
Copy link
Member

@junqiu-lei junqiu-lei commented Aug 5, 2024

Description

Deprecate maps multi data source display when data_source is enabled based on Trineo Maps UX mock.

Issues Resolved

Part of #649

UI Changes

Before

Screenshot 2024-08-05 at 2 26 24 PM Screenshot 2024-08-05 at 2 26 39 PM

After

Screenshot 2024-08-05 at 2 27 04 PM Screenshot 2024-08-05 at 2 27 11 PM Screenshot 2024-08-05 at 2 41 15 PM

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: Junqiu Lei <[email protected]>
@kgcreative
Copy link
Member

@junqiu-lei LGTM!

@junqiu-lei
Copy link
Member Author

The E2E test failure is due to new version cypress using higher memory crashes the github CI runner.

Copy link
Member

@VijayanB VijayanB left a comment

Choose a reason for hiding this comment

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

LGTM

@junqiu-lei junqiu-lei merged commit a433766 into opensearch-project:main Aug 5, 2024
15 of 17 checks passed
@junqiu-lei junqiu-lei deleted the deprecate-mds-display branch August 5, 2024 22:42
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-651-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a433766e74dd2ac1583d376c48ca3b6f4a8935a3
# Push it to GitHub
git push --set-upstream origin backport/backport-651-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

junqiu-lei added a commit to junqiu-lei/dashboards-maps that referenced this pull request Aug 5, 2024
Signed-off-by: Junqiu Lei <[email protected]>

(cherry picked from commit a433766)
Signed-off-by: Junqiu Lei <[email protected]>
junqiu-lei added a commit that referenced this pull request Aug 5, 2024
(cherry picked from commit a433766)

Signed-off-by: Junqiu Lei <[email protected]>
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.

4 participants