[navigation]feat: add `sample data` menu back #8076

SuZhou-Joe · 2024-09-08T06:57:19Z

Description

In release 2.17 we won't make import sample data into a modal so we need to add the menu back.

Issues Resolved

Screenshot

Testing the changes

Changelog

feat: [navigation] Add sample data menu back

Check List

All tests pass
- yarn test:jest
- yarn test:jest_integration
New functionality includes testing.
New functionality has been documented.
Update CHANGELOG.md
Commits are signed per the DCO using --signoff

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

codecov · 2024-09-08T07:13:29Z

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Project coverage is 60.60%. Comparing base (e621422) to head (0dfc827).
Report is 7 commits behind head on main.

Files with missing lines	Patch %	Lines
src/core/server/utils/auth_info.ts	0.00%	1 Missing and 2 partials ⚠️
src/plugins/home/public/plugin.ts	0.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8076      +/-   ##
==========================================
+ Coverage   60.58%   60.60%   +0.01%     
==========================================
  Files        3738     3738              
  Lines       88671    88677       +6     
  Branches    13782    13784       +2     
==========================================
+ Hits        53724    53741      +17     
+ Misses      31662    31650      -12     
- Partials     3285     3286       +1

Flag	Coverage Δ
Linux_1	`28.76% <0.00%> (-0.01%)`	⬇️
Linux_2	`56.26% <0.00%> (-0.01%)`	⬇️
Linux_3	`37.51% <0.00%> (+<0.01%)`	⬆️
Linux_4	`29.60% <0.00%> (-0.01%)`	⬇️
Windows_1	`28.79% <0.00%> (+0.01%)`	⬆️
Windows_2	`56.22% <0.00%> (-0.01%)`	⬇️
Windows_3	`37.52% <0.00%> (+0.01%)`	⬆️
Windows_4	`29.60% <0.00%> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

ruanyl · 2024-09-09T09:51:26Z

src/core/server/utils/auth_info.ts

@@ -31,7 +32,9 @@ export const getPrincipalsFromRequest = (
    if (authState?.authInfo?.backend_roles) {
      payload[PrincipalType.Groups] = authState.authInfo.backend_roles;
    }
-    if (authState?.authInfo?.user_name) {
+    if (authState?.authInfo?.user_id) {


This seems unrelated, is it by accident?

Nope, as the change is minor so I want to include the change into in this PR as well. No need to raise a new PR for such 1 line change.

ruanyl · 2024-09-09T09:54:06Z

src/plugins/workspace/public/services/use_case_service.ts

              category: DEFAULT_APP_CATEGORIES.manageWorkspace,
              order: 300,
            },
            {
-              id: WORKSPACE_DETAIL_APP_ID,
+              id: 'import_sample_data',


Do we still have sample data card in overview pages?

Yes, but we still need the menu in left nav or the bread crumb info of sample data page will be broken.

I am having a hard time finding the Add Sample Data card in the workspaces other than Search. Is this something we added in the past day or two?

opensearch-trigger-bot · 2024-09-10T00:28:39Z

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/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-8076-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 faac756e4c6985e7a3dd7a62dc25e9a3b624b0d9
# Push it to GitHub
git push --set-upstream origin backport/backport-8076-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

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

opensearch-trigger-bot · 2024-09-10T00:28:40Z

The backport to 2.17 failed:

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

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/OpenSearch-Dashboards/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.17
# Create a new branch
git switch --create backport/backport-8076-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 faac756e4c6985e7a3dd7a62dc25e9a3b624b0d9
# Push it to GitHub
git push --set-upstream origin backport/backport-8076-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport/backport-8076-to-2.17.

* feat: add sample data back Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * Changeset file for PR opensearch-project#8076 created/updated * fix: unit test failure Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit faac756)

* feat: add sample data back Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * Changeset file for PR #8076 created/updated * fix: unit test failure Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit faac756)

* feat: add sample data back Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * Changeset file for PR #8076 created/updated * fix: unit test failure Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit faac756) (cherry picked from commit 0a42d64) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* feat: add sample data back * Changeset file for PR #8076 created/updated * fix: unit test failure --------- (cherry picked from commit faac756) (cherry picked from commit 0a42d64) Signed-off-by: SuZhou-Joe <suzhou@amazon.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> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

feat: add sample data back

c91a86f

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

SuZhou-Joe added backport 2.x navigation labels Sep 8, 2024

github-actions bot added the distinguished-contributor label Sep 8, 2024

SuZhou-Joe added v2.17.0 backport 2.17 and removed distinguished-contributor labels Sep 8, 2024

Changeset file for PR opensearch-project#8076 created/updated

415a11b

fix: unit test failure

0dfc827

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

ruanyl reviewed Sep 9, 2024

View reviewed changes

ruanyl approved these changes Sep 9, 2024

View reviewed changes

joshuali925 approved these changes Sep 9, 2024

View reviewed changes

SuZhou-Joe merged commit faac756 into opensearch-project:main Sep 10, 2024
65 of 67 checks passed

opensearch-trigger-bot bot added the failed backport label Sep 10, 2024

SuZhou-Joe removed the failed backport label Sep 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[navigation]feat: add `sample data` menu back #8076

[navigation]feat: add `sample data` menu back #8076

SuZhou-Joe commented Sep 8, 2024 •

edited

Loading

codecov bot commented Sep 8, 2024 •

edited

Loading

ruanyl Sep 9, 2024

SuZhou-Joe Sep 9, 2024

ruanyl Sep 9, 2024

SuZhou-Joe Sep 9, 2024 •

edited

Loading

AMoo-Miki Sep 9, 2024

opensearch-trigger-bot bot commented Sep 10, 2024

opensearch-trigger-bot bot commented Sep 10, 2024

[navigation]feat: add sample data menu back #8076

[navigation]feat: add sample data menu back #8076

Conversation

SuZhou-Joe commented Sep 8, 2024 • edited Loading

Description

Issues Resolved

Screenshot

Testing the changes

Changelog

Check List

codecov bot commented Sep 8, 2024 • edited Loading

Codecov Report

ruanyl Sep 9, 2024

Choose a reason for hiding this comment

SuZhou-Joe Sep 9, 2024

Choose a reason for hiding this comment

ruanyl Sep 9, 2024

Choose a reason for hiding this comment

SuZhou-Joe Sep 9, 2024 • edited Loading

Choose a reason for hiding this comment

AMoo-Miki Sep 9, 2024

Choose a reason for hiding this comment

opensearch-trigger-bot bot commented Sep 10, 2024

opensearch-trigger-bot bot commented Sep 10, 2024

[navigation]feat: add `sample data` menu back #8076

[navigation]feat: add `sample data` menu back #8076

SuZhou-Joe commented Sep 8, 2024 •

edited

Loading

codecov bot commented Sep 8, 2024 •

edited

Loading

SuZhou-Joe Sep 9, 2024 •

edited

Loading