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

[Feature] Match discover look and feel #1135

Merged

Conversation

mengweieric
Copy link
Collaborator

@mengweieric mengweieric commented Oct 16, 2023

Description

This PR contains changes for

  • Match discover 2.0 look and feel
  • Saved object fixes based on look and feel changes
  • Bug bash item fixes based on look and feel changes

To-dos with following PRs in progress related to this

  • Enhancement to redux store -> currently only have time to do search meta data
  • few refactoring on saved object loader and query fetcher
  • State cleanup on some components
  • i18n
  • use more constants for strings

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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.

mengweieric and others added 30 commits October 15, 2023 22:52
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric <[email protected]>
…cover, so that field type icons look the same and field action buttons disappear if not hovered over

Signed-off-by: Paul Sebastian <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
changed data grid sort page query logic, added sidebar drag drop, added viz config panel changes
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric Wei <[email protected]>
@mengweieric mengweieric merged commit ea2fb2c into opensearch-project:main Oct 24, 2023
9 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/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1135-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ea2fb2c1669a229f4a58de145db81247eaec6b18
# Push it to GitHub
git push --set-upstream origin backport/backport-1135-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2023
* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* missing snapshots

Signed-off-by: Eric Wei <[email protected]>

* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* move sidebar out of explorer for match look and feel

Signed-off-by: Eric <[email protected]>

* sidebar panel always with full height

Signed-off-by: Eric <[email protected]>

* adjust padding

Signed-off-by: Eric <[email protected]>

* make search components wrappable

Signed-off-by: Eric <[email protected]>

* adjust noresult/novisualize page

Signed-off-by: Eric <[email protected]>

* add padding to datagrid

Signed-off-by: Eric <[email protected]>

* restructured sidebar fields to use exact same spacing/paneling as discover, so that field type icons look the same and field action buttons disappear if not hovered over

Signed-off-by: Paul Sebastian <[email protected]>

* address datasource persistency issue

Signed-off-by: Eric <[email protected]>

* code changes preparing for integration with app analytics

Signed-off-by: Eric <[email protected]>

* resolve page crash and hide datasource for app analytics

Signed-off-by: Eric <[email protected]>

* saved object supports datasources, query language, and direct query

Signed-off-by: Eric <[email protected]>

* change saved object icon

Signed-off-by: Eric <[email protected]>

* bulk delete for saved query

Signed-off-by: Eric <[email protected]>

* change data grid to separate sort/page query to not interfere with other components

Signed-off-by: Paul Sebastian <[email protected]>

* basic drag and drop added

Signed-off-by: Paul Sebastian <[email protected]>

* viz config changes

Signed-off-by: Paul Sebastian <[email protected]>

* add margin to resizable

Signed-off-by: Paul Sebastian <[email protected]>

* wrap countdistribution with panel

Signed-off-by: Eric <[email protected]>

* pr requested changes

Signed-off-by: Paul Sebastian <[email protected]>

* remove panel wrapper for inner countdistribution

Signed-off-by: Eric <[email protected]>

* change datasource selector to only showopensearch/ default cluste

Signed-off-by: Eric <[email protected]>

* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* missing snapshots

Signed-off-by: Eric Wei <[email protected]>

* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* url datasource data prsing and clean up

Signed-off-by: Eric <[email protected]>

* minor format

Signed-off-by: Eric <[email protected]>

* query bar issue when loading direct query saved object

Signed-off-by: Eric <[email protected]>

* minor cleanup

Signed-off-by: Eric <[email protected]>

* update snapshots

Signed-off-by: Eric <[email protected]>

* fix minor query bar issue and add types to searchMeta slice

Signed-off-by: Eric <[email protected]>

* stop polling when load from saved object and few related minor changes

Signed-off-by: Eric <[email protected]>

* fix polling cleanup issue

Signed-off-by: Eric <[email protected]>

* save will not trigger reload

Signed-off-by: Eric <[email protected]>

* add language enum

Signed-off-by: Eric <[email protected]>

* direct query status indicator

Signed-off-by: Paul Sebastian <[email protected]>

* turn default timestamp/pattern mark to badge and on hover

Signed-off-by: Paul Sebastian <[email protected]>

* flyout resize button margin fix

Signed-off-by: Paul Sebastian <[email protected]>

* direct query data grid fixes

Signed-off-by: Paul Sebastian <[email protected]>

* pr changes and added test

Signed-off-by: Paul Sebastian <[email protected]>

* removed console logs

Signed-off-by: Paul Sebastian <[email protected]>

* searchMetaData type change

Signed-off-by: Paul Sebastian <[email protected]>

* use datasource variable

Signed-off-by: Paul Sebastian <[email protected]>

* fixed types and reduced redundancy

Signed-off-by: Paul Sebastian <[email protected]>

* fixed when data grix shows

Signed-off-by: Paul Sebastian <[email protected]>

* simplify condition checking for datagrid

Signed-off-by: Eric <[email protected]>

* update snapshot

Signed-off-by: Eric <[email protected]>

---------

Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
Co-authored-by: Paul Sebastian <[email protected]>
(cherry picked from commit ea2fb2c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2023
* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* missing snapshots

Signed-off-by: Eric Wei <[email protected]>

* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* move sidebar out of explorer for match look and feel

Signed-off-by: Eric <[email protected]>

* sidebar panel always with full height

Signed-off-by: Eric <[email protected]>

* adjust padding

Signed-off-by: Eric <[email protected]>

* make search components wrappable

Signed-off-by: Eric <[email protected]>

* adjust noresult/novisualize page

Signed-off-by: Eric <[email protected]>

* add padding to datagrid

Signed-off-by: Eric <[email protected]>

* restructured sidebar fields to use exact same spacing/paneling as discover, so that field type icons look the same and field action buttons disappear if not hovered over

Signed-off-by: Paul Sebastian <[email protected]>

* address datasource persistency issue

Signed-off-by: Eric <[email protected]>

* code changes preparing for integration with app analytics

Signed-off-by: Eric <[email protected]>

* resolve page crash and hide datasource for app analytics

Signed-off-by: Eric <[email protected]>

* saved object supports datasources, query language, and direct query

Signed-off-by: Eric <[email protected]>

* change saved object icon

Signed-off-by: Eric <[email protected]>

* bulk delete for saved query

Signed-off-by: Eric <[email protected]>

* change data grid to separate sort/page query to not interfere with other components

Signed-off-by: Paul Sebastian <[email protected]>

* basic drag and drop added

Signed-off-by: Paul Sebastian <[email protected]>

* viz config changes

Signed-off-by: Paul Sebastian <[email protected]>

* add margin to resizable

Signed-off-by: Paul Sebastian <[email protected]>

* wrap countdistribution with panel

Signed-off-by: Eric <[email protected]>

* pr requested changes

Signed-off-by: Paul Sebastian <[email protected]>

* remove panel wrapper for inner countdistribution

Signed-off-by: Eric <[email protected]>

* change datasource selector to only showopensearch/ default cluste

Signed-off-by: Eric <[email protected]>

* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* missing snapshots

Signed-off-by: Eric Wei <[email protected]>

* remove unused files

Signed-off-by: Eric Wei <[email protected]>

* url datasource data prsing and clean up

Signed-off-by: Eric <[email protected]>

* minor format

Signed-off-by: Eric <[email protected]>

* query bar issue when loading direct query saved object

Signed-off-by: Eric <[email protected]>

* minor cleanup

Signed-off-by: Eric <[email protected]>

* update snapshots

Signed-off-by: Eric <[email protected]>

* fix minor query bar issue and add types to searchMeta slice

Signed-off-by: Eric <[email protected]>

* stop polling when load from saved object and few related minor changes

Signed-off-by: Eric <[email protected]>

* fix polling cleanup issue

Signed-off-by: Eric <[email protected]>

* save will not trigger reload

Signed-off-by: Eric <[email protected]>

* add language enum

Signed-off-by: Eric <[email protected]>

* direct query status indicator

Signed-off-by: Paul Sebastian <[email protected]>

* turn default timestamp/pattern mark to badge and on hover

Signed-off-by: Paul Sebastian <[email protected]>

* flyout resize button margin fix

Signed-off-by: Paul Sebastian <[email protected]>

* direct query data grid fixes

Signed-off-by: Paul Sebastian <[email protected]>

* pr changes and added test

Signed-off-by: Paul Sebastian <[email protected]>

* removed console logs

Signed-off-by: Paul Sebastian <[email protected]>

* searchMetaData type change

Signed-off-by: Paul Sebastian <[email protected]>

* use datasource variable

Signed-off-by: Paul Sebastian <[email protected]>

* fixed types and reduced redundancy

Signed-off-by: Paul Sebastian <[email protected]>

* fixed when data grix shows

Signed-off-by: Paul Sebastian <[email protected]>

* simplify condition checking for datagrid

Signed-off-by: Eric <[email protected]>

* update snapshot

Signed-off-by: Eric <[email protected]>

---------

Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
Co-authored-by: Paul Sebastian <[email protected]>
(cherry picked from commit ea2fb2c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
mengweieric pushed a commit that referenced this pull request Oct 25, 2023
* remove unused files



* missing snapshots



* remove unused files



* move sidebar out of explorer for match look and feel



* sidebar panel always with full height



* adjust padding



* make search components wrappable



* adjust noresult/novisualize page



* add padding to datagrid



* restructured sidebar fields to use exact same spacing/paneling as discover, so that field type icons look the same and field action buttons disappear if not hovered over



* address datasource persistency issue



* code changes preparing for integration with app analytics



* resolve page crash and hide datasource for app analytics



* saved object supports datasources, query language, and direct query



* change saved object icon



* bulk delete for saved query



* change data grid to separate sort/page query to not interfere with other components



* basic drag and drop added



* viz config changes



* add margin to resizable



* wrap countdistribution with panel



* pr requested changes



* remove panel wrapper for inner countdistribution



* change datasource selector to only showopensearch/ default cluste



* remove unused files



* missing snapshots



* remove unused files



* url datasource data prsing and clean up



* minor format



* query bar issue when loading direct query saved object



* minor cleanup



* update snapshots



* fix minor query bar issue and add types to searchMeta slice



* stop polling when load from saved object and few related minor changes



* fix polling cleanup issue



* save will not trigger reload



* add language enum



* direct query status indicator



* turn default timestamp/pattern mark to badge and on hover



* flyout resize button margin fix



* direct query data grid fixes



* pr changes and added test



* removed console logs



* searchMetaData type change



* use datasource variable



* fixed types and reduced redundancy



* fixed when data grix shows



* simplify condition checking for datagrid



* update snapshot



---------





(cherry picked from commit ea2fb2c)

Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
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: Paul Sebastian <[email protected]>
mengweieric pushed a commit that referenced this pull request Oct 25, 2023
* remove unused files



* missing snapshots



* remove unused files



* move sidebar out of explorer for match look and feel



* sidebar panel always with full height



* adjust padding



* make search components wrappable



* adjust noresult/novisualize page



* add padding to datagrid



* restructured sidebar fields to use exact same spacing/paneling as discover, so that field type icons look the same and field action buttons disappear if not hovered over



* address datasource persistency issue



* code changes preparing for integration with app analytics



* resolve page crash and hide datasource for app analytics



* saved object supports datasources, query language, and direct query



* change saved object icon



* bulk delete for saved query



* change data grid to separate sort/page query to not interfere with other components



* basic drag and drop added



* viz config changes



* add margin to resizable



* wrap countdistribution with panel



* pr requested changes



* remove panel wrapper for inner countdistribution



* change datasource selector to only showopensearch/ default cluste



* remove unused files



* missing snapshots



* remove unused files



* url datasource data prsing and clean up



* minor format



* query bar issue when loading direct query saved object



* minor cleanup



* update snapshots



* fix minor query bar issue and add types to searchMeta slice



* stop polling when load from saved object and few related minor changes



* fix polling cleanup issue



* save will not trigger reload



* add language enum



* direct query status indicator



* turn default timestamp/pattern mark to badge and on hover



* flyout resize button margin fix



* direct query data grid fixes



* pr changes and added test



* removed console logs



* searchMetaData type change



* use datasource variable



* fixed types and reduced redundancy



* fixed when data grix shows



* simplify condition checking for datagrid



* update snapshot



---------





(cherry picked from commit ea2fb2c)

Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
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: Paul Sebastian <[email protected]>
mengweieric added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 8, 2023
mengweieric added a commit to mengweieric/dashboards-observability that referenced this pull request Nov 8, 2023
mengweieric added a commit that referenced this pull request Nov 13, 2023
* Revert "Update empty allowed roles to admin only (#1217) (#1220)"

This reverts commit 4288504.

Signed-off-by: Eric <[email protected]>

* Revert "Increment version to 2.11.1.0 (#1190)"

This reverts commit ccd5fb8.

Signed-off-by: Eric <[email protected]>

* Revert "Add S3 integration for Nginx and VPC (#1214) (#1216)"

This reverts commit e0a509c.

Signed-off-by: Eric <[email protected]>

* Revert "disabling inspect and default pattern/timestamp buttons when using async data sources (#1205) (#1212)"

This reverts commit ca5ad02.

Signed-off-by: Eric <[email protected]>

* Revert "Saved object datasource backward compatibility fixes (#1208) (#1210)"

This reverts commit 467a0b3.

Signed-off-by: Eric <[email protected]>

* Revert "Link integrations from datasources UI (#1203) (#1207)"

This reverts commit 8e9fe5e.

Signed-off-by: Eric <[email protected]>

* Revert "[Explorer] Fixes for cancel button and saved object loading (#1197) (#1201)"

This reverts commit f0e7a9d.

Signed-off-by: Eric <[email protected]>

* Revert "Correct query schema for ELB mview generation (#1196) (#1199)"

This reverts commit 0b7be95.

Signed-off-by: Eric <[email protected]>

* Revert "[Backport 2.11] Add integrations queries for Flint (#1195)"

This reverts commit 97f46ba.

Signed-off-by: Eric <[email protected]>

* Revert "remove husky pre-commit checks (#1192) (#1193)"

This reverts commit 25d52f3.

Signed-off-by: Eric <[email protected]>

* Revert "Bug fixes for observability count distribution and application analytics (#1187) (#1189)"

This reverts commit e2440d2.

Signed-off-by: Eric <[email protected]>

* Revert "Support cancellation of async queries (#1177) (#1186)"

This reverts commit 6b495f3.

Signed-off-by: Eric <[email protected]>

* Revert "[Explorer] Supports session for s3 direct query (#1178) (#1183)"

This reverts commit d50047f.

Signed-off-by: Eric <[email protected]>

* Revert "[Explorer] Modify text in empty prompt (#1172) (#1182)"

This reverts commit 95a60cc.

Signed-off-by: Eric <[email protected]>

* Revert "[Feature] Match discover look and feel (#1135) (#1179)"

This reverts commit b69801e.

Signed-off-by: Eric <[email protected]>

* Revert "config panel dark mode fix (#1169) (#1176)"

This reverts commit 34696b3.

Signed-off-by: Eric <[email protected]>

* Revert "Fix events home table and toast life time (#1170)"

This reverts commit a9b36fc.

Signed-off-by: Eric <[email protected]>

* Revert "Quiet react-dnd draggableId/droppableId warnings. (#1147) (#1166)"

This reverts commit a2f9a00.

Signed-off-by: Eric <[email protected]>

* Revert "Fix integration labeling to identify S3 integrations (#1157) (#1164)"

This reverts commit 9de9aea.

Signed-off-by: Eric <[email protected]>

* Revert "Remove loading progress for integration setup (#1156) (#1162)"

This reverts commit a08721b.

Signed-off-by: Eric <[email protected]>

* Revert "Switch from toast to callout for integration set up failures (#1155) (#1159)"

This reverts commit e6a474a.

Signed-off-by: Eric <[email protected]>

* Revert "Disable integration set up button if invalid (#1152) (#1161)"

This reverts commit 74aae17.

Signed-off-by: Eric <[email protected]>

* Revert "Update URL of create datasources, fix spacing (#1149) (#1154)"

This reverts commit 0b66d83.

Signed-off-by: Eric <[email protected]>

* Revert "Allow patch on allowedRoles (#1143) (#1145)"

This reverts commit 0acc0f3.

Signed-off-by: Eric <[email protected]>

* Revert "fix for explorer data grid not paginating (#1139) (#1141)"

This reverts commit c5ead50.

Signed-off-by: Eric <[email protected]>

---------

Signed-off-by: Eric <[email protected]>
@mengweieric mengweieric deleted the feature/match-look-and-feel branch February 14, 2024 18:29
amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024
…nsearch-project#1180)

* remove unused files

* missing snapshots

* remove unused files

* move sidebar out of explorer for match look and feel

* sidebar panel always with full height

* adjust padding

* make search components wrappable

* adjust noresult/novisualize page

* add padding to datagrid

* restructured sidebar fields to use exact same spacing/paneling as discover, so that field type icons look the same and field action buttons disappear if not hovered over

* address datasource persistency issue

* code changes preparing for integration with app analytics

* resolve page crash and hide datasource for app analytics

* saved object supports datasources, query language, and direct query

* change saved object icon

* bulk delete for saved query

* change data grid to separate sort/page query to not interfere with other components

* basic drag and drop added

* viz config changes

* add margin to resizable

* wrap countdistribution with panel

* pr requested changes

* remove panel wrapper for inner countdistribution

* change datasource selector to only showopensearch/ default cluste

* remove unused files

* missing snapshots

* remove unused files

* url datasource data prsing and clean up

* minor format

* query bar issue when loading direct query saved object

* minor cleanup

* update snapshots

* fix minor query bar issue and add types to searchMeta slice

* stop polling when load from saved object and few related minor changes

* fix polling cleanup issue

* save will not trigger reload

* add language enum

* direct query status indicator

* turn default timestamp/pattern mark to badge and on hover

* flyout resize button margin fix

* direct query data grid fixes

* pr changes and added test

* removed console logs

* searchMetaData type change

* use datasource variable

* fixed types and reduced redundancy

* fixed when data grix shows

* simplify condition checking for datagrid

* update snapshot

---------

(cherry picked from commit ea2fb2c)

Signed-off-by: Eric Wei <[email protected]>
Signed-off-by: Eric <[email protected]>
Signed-off-by: Paul Sebastian <[email protected]>
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: Paul Sebastian <[email protected]>
(cherry picked from commit b2ff898)
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.

5 participants