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

Update 2.x with latest commits on main #1070

Merged
merged 30 commits into from
Oct 5, 2023

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Oct 4, 2023

Description

[Describe what this change achieves]

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.

Swiddis and others added 16 commits October 4, 2023 18:42
* Update mocha

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Update mocha to 10.2.0

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Revert mocha to 10.1.0 for OSD compat.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove random added yaml dep

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
opensearch-project#928)

* added code for the change of design of the sidebar, fixed overriding spinner bug, changed font size

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* addressed PR comments

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* code for overriding pattern

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

* updated snapshots

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>

---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
* remove unused files

Signed-off-by: Eric Wei <menwe@amazon.com>

* missing snapshots

Signed-off-by: Eric Wei <menwe@amazon.com>

* minimal changes to remove log explorer tab

Signed-off-by: Eric <menwe@amazon.com>

* skip tab related tests

Signed-off-by: Eric <menwe@amazon.com>

* update snapshots

Signed-off-by: Eric <menwe@amazon.com>

* remove missed logging

Signed-off-by: Eric <menwe@amazon.com>

* add path to constant

Signed-off-by: Eric <menwe@amazon.com>

---------

Signed-off-by: Eric Wei <menwe@amazon.com>
Signed-off-by: Eric <menwe@amazon.com>
* horizontal to vertical hits/timechart
* Added timespan to the header
* Color and y-axis name change

---------

Signed-off-by: Paul Sebastian <paulstn@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Signed-off-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
* Empty bucket addition proof of concept

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* Use the page's interval period for empty buckets

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* redid empty bucket loop design to be more intuitive

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* Added dynamic start and end datetime info to new count distribution

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* use interval period to align count distribution rebucketing

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* count distribution snapshot
Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* moved empty bucket adding functionality out to a util file and generalized

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* util func tests

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* added stricter types for input and return in util func

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* needed to update util test

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

---------

Signed-off-by: Paul Sebastian <paulstn@amazon.com>
* refactored classnames for sidebar
---------

Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
…1009)

* Stub catalog reader interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add basic catalog functionality to new catalog reader

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor validation logic with a deeper interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor validation logic with a deeper interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove redundant test.

This test is unneeded after 12c4bcf

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for new validators

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Make better failure mode for invalid objects

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Generalize Result type

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Convert backend to use catalog reader (unstable)

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Repair tests for integrations class (unstable)

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor repository for new integration interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix outer repository and backend tests

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for sample data

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add CatalogReader JavaDocs

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Repair integrations builder

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove extra commented test

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove unnecessary log statement

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Repair getSchemas behavior to return correct type

Let it be known at on this day, with this commit,
I have truly grokked why we don't use `any` in typescript.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for getSchemas

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for asset and sample data backend methods

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Break flyout validation methods out of constructing method

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for extracted flyout methods

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Switch validation method to use ValidationResult

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Swap out flyout for hello-world setup page

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add basic step incrementing

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add basic field skeleton for each step

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add a cancel button

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add config type to developing form

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Flatten integration config

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add sample data table modal

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add toggle for standard and advanced asset config

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Simplify imports

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor major class names

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* (WIP) begin refactoring functionality into adaptor

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Finish migrating functionality to data adaptor

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Rename integration types for more clarity

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor component usage

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Connect forms to config state

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix filetype selector

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove hardcoded name in path

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Write one snapshot test

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add more tests

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix test naming

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Update obsolete snapshots

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
…roject#1035)

* Manage datasources (opensearch-project#967)

* fix name change bug and modify test to test behavior

Signed-off-by: Derek Ho <dxho@amazon.com>

* get rid of lint

Signed-off-by: Derek Ho <dxho@amazon.com>

* test for flyout

Signed-off-by: Derek Ho <dxho@amazon.com>

* flyout to medium size

Signed-off-by: Derek Ho <dxho@amazon.com>

* make accelerate extensible

Signed-off-by: Derek Ho <dxho@amazon.com>

* get datasources and hook up to pplservice

Signed-off-by: Derek Ho <dxho@amazon.com>

* get flint working

Signed-off-by: Derek Ho <dxho@amazon.com>

* add datasource page with steps and buttons on bottom bar

Signed-off-by: Derek Ho <dxho@amazon.com>

* datasources as a new plugin and mostly working

Signed-off-by: Derek Ho <dxho@amazon.com>

* hook up manage to show datasources call

Signed-off-by: Derek Ho <dxho@amazon.com>

* update two tables with descriptions

Signed-off-by: Derek Ho <dxho@amazon.com>

* make some updates to the page

Signed-off-by: Derek Ho <dxho@amazon.com>

* cleanup unused files for data connections

Signed-off-by: Derek Ho <dxho@amazon.com>

* cleanup and add overview panel columns

Signed-off-by: Derek Ho <dxho@amazon.com>

* render tabs

Signed-off-by: Derek Ho <dxho@amazon.com>

* add unit tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* update data test subj and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add datasources to management overview

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove spark logo and update snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* refactor routes out

Signed-off-by: Derek Ho <dxho@amazon.com>

* separate out the roles

Signed-off-by: Derek Ho <dxho@amazon.com>

* bump version back to 3.0

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add acceleration management UI  (opensearch-project#989)

* add acceleration management UI skeleton

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Create new documentation link for acc

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* fix typos and minor bugs

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update snapshot

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update window location to hash

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove unused headers

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Rename data sources to data connections (opensearch-project#1004)

* rename data sources to data connections

Signed-off-by: Derek Ho <dxho@amazon.com>

* final cleanup

Signed-off-by: Derek Ho <dxho@amazon.com>

* update acceleration breadcrumb

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix API call for data connection page

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix integ test and data test subj and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add fallback to show if user does not have datasource API permissions (opensearch-project#1008)

* add fallback ui for manage and view datasources

Signed-off-by: Derek Ho <dxho@amazon.com>

* always show datasources via pplservice

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add access control tab content (opensearch-project#992)

* basic rendering for the access control tab

Signed-off-by: Derek Ho <dxho@amazon.com>

* hook up basic radio groups and euicombo boxes for query and acceleration permissions

Signed-off-by: Derek Ho <dxho@amazon.com>

* refactor and clean up unuseed inports

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove unused import

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix import and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove unused files and variables

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Delete datasource and Connection Configuration Tab (opensearch-project#1024)

* Address previous PR comments and implement rudimentary delete

Signed-off-by: Derek Ho <dxho@amazon.com>

* Implement modal and instant delete showing up in list

Signed-off-by: Derek Ho <dxho@amazon.com>

* Refactor save or cancel to a shared component, implement hard coded datasource configurations tab

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update test with mock role data

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add most functionality of edit connectiondetails

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove acceleration components

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Paul Sebastian <paulstn@amazon.com>
* Manage datasources (opensearch-project#967)

* fix name change bug and modify test to test behavior

Signed-off-by: Derek Ho <dxho@amazon.com>

* get rid of lint

Signed-off-by: Derek Ho <dxho@amazon.com>

* test for flyout

Signed-off-by: Derek Ho <dxho@amazon.com>

* flyout to medium size

Signed-off-by: Derek Ho <dxho@amazon.com>

* make accelerate extensible

Signed-off-by: Derek Ho <dxho@amazon.com>

* get datasources and hook up to pplservice

Signed-off-by: Derek Ho <dxho@amazon.com>

* get flint working

Signed-off-by: Derek Ho <dxho@amazon.com>

* add datasource page with steps and buttons on bottom bar

Signed-off-by: Derek Ho <dxho@amazon.com>

* datasources as a new plugin and mostly working

Signed-off-by: Derek Ho <dxho@amazon.com>

* hook up manage to show datasources call

Signed-off-by: Derek Ho <dxho@amazon.com>

* update two tables with descriptions

Signed-off-by: Derek Ho <dxho@amazon.com>

* make some updates to the page

Signed-off-by: Derek Ho <dxho@amazon.com>

* cleanup unused files for data connections

Signed-off-by: Derek Ho <dxho@amazon.com>

* cleanup and add overview panel columns

Signed-off-by: Derek Ho <dxho@amazon.com>

* render tabs

Signed-off-by: Derek Ho <dxho@amazon.com>

* add unit tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* update data test subj and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add datasources to management overview

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove spark logo and update snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* refactor routes out

Signed-off-by: Derek Ho <dxho@amazon.com>

* separate out the roles

Signed-off-by: Derek Ho <dxho@amazon.com>

* bump version back to 3.0

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add acceleration management UI  (opensearch-project#989)

* add acceleration management UI skeleton

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Create new documentation link for acc

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* fix typos and minor bugs

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update snapshot

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update window location to hash

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove unused headers

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Rename data sources to data connections (opensearch-project#1004)

* rename data sources to data connections

Signed-off-by: Derek Ho <dxho@amazon.com>

* final cleanup

Signed-off-by: Derek Ho <dxho@amazon.com>

* update acceleration breadcrumb

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix API call for data connection page

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix integ test and data test subj and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add fallback to show if user does not have datasource API permissions (opensearch-project#1008)

* add fallback ui for manage and view datasources

Signed-off-by: Derek Ho <dxho@amazon.com>

* always show datasources via pplservice

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add access control tab content (opensearch-project#992)

* basic rendering for the access control tab

Signed-off-by: Derek Ho <dxho@amazon.com>

* hook up basic radio groups and euicombo boxes for query and acceleration permissions

Signed-off-by: Derek Ho <dxho@amazon.com>

* refactor and clean up unuseed inports

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove unused import

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix import and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove unused files and variables

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Delete datasource and Connection Configuration Tab (opensearch-project#1024)

* Address previous PR comments and implement rudimentary delete

Signed-off-by: Derek Ho <dxho@amazon.com>

* Implement modal and instant delete showing up in list

Signed-off-by: Derek Ho <dxho@amazon.com>

* Refactor save or cancel to a shared component, implement hard coded datasource configurations tab

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update test with mock role data

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add most functionality of edit connectiondetails

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Get most of the workflow working for configure datasource

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove acceleration components

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Update data connection to datasources in a few more places and update tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* Rename and re-organize in folders

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix import path in testing file

Signed-off-by: Derek Ho <dxho@amazon.com>

* Get Initial S3 configuration working

Signed-off-by: Derek Ho <dxho@amazon.com>

* Configure S3 Data Source Working

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix query permissions display

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix merge conflict

Signed-off-by: Derek Ho <dxho@amazon.com>

* Clean up PR

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add s3 logo in manage table

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix up PR according to UX feedback

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove successfully

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update test in accordance to useLocation

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
…rch-project#1041)

* initial data grid column change with hardcoded vals

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* basic render cell data added

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* added memoization for all components and redid cell rendering

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* allow for any kind of field to be shown

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* basic pagination only with queried data

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* sorting and pagination effect onto query support

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* fully functional flyout

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* removed unneeded code and fixed typing errors

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* fixed field sorting/paginating issue with sidebar integration and expfield storing

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* code cleanup

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* fixed a lot of tests

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* reduce sidebar code redundancy

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* remove commented code

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* test constant

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* flyout testing code

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* fixed small sidebar init issue

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* changed default page size from 25 to 100

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* updated snapshot

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* small changes + source column prettied + snapshot

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* small todos and code coverage change

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* moved redo query to util function

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* redoQuery testing

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* redoQuery testing

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* redoQuery testing

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* modified redo func in utils test

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

* small pr changes

Signed-off-by: Paul Sebastian <paulstn@amazon.com>

---------

Signed-off-by: Paul Sebastian <paulstn@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho
Copy link
Collaborator Author

derek-ho commented Oct 4, 2023

Cherry-picks all commits in main up to ae399e2 onto 2.x line

derek-ho and others added 11 commits October 4, 2023 18:59
* Manage datasources (opensearch-project#967)

* fix name change bug and modify test to test behavior

Signed-off-by: Derek Ho <dxho@amazon.com>

* get rid of lint

Signed-off-by: Derek Ho <dxho@amazon.com>

* test for flyout

Signed-off-by: Derek Ho <dxho@amazon.com>

* flyout to medium size

Signed-off-by: Derek Ho <dxho@amazon.com>

* make accelerate extensible

Signed-off-by: Derek Ho <dxho@amazon.com>

* get datasources and hook up to pplservice

Signed-off-by: Derek Ho <dxho@amazon.com>

* get flint working

Signed-off-by: Derek Ho <dxho@amazon.com>

* add datasource page with steps and buttons on bottom bar

Signed-off-by: Derek Ho <dxho@amazon.com>

* datasources as a new plugin and mostly working

Signed-off-by: Derek Ho <dxho@amazon.com>

* hook up manage to show datasources call

Signed-off-by: Derek Ho <dxho@amazon.com>

* update two tables with descriptions

Signed-off-by: Derek Ho <dxho@amazon.com>

* make some updates to the page

Signed-off-by: Derek Ho <dxho@amazon.com>

* cleanup unused files for data connections

Signed-off-by: Derek Ho <dxho@amazon.com>

* cleanup and add overview panel columns

Signed-off-by: Derek Ho <dxho@amazon.com>

* render tabs

Signed-off-by: Derek Ho <dxho@amazon.com>

* add unit tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* update data test subj and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add datasources to management overview

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove spark logo and update snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* refactor routes out

Signed-off-by: Derek Ho <dxho@amazon.com>

* separate out the roles

Signed-off-by: Derek Ho <dxho@amazon.com>

* bump version back to 3.0

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add acceleration management UI  (opensearch-project#989)

* add acceleration management UI skeleton

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Create new documentation link for acc

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* fix typos and minor bugs

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update snapshot

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update window location to hash

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove unused headers

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Rename data sources to data connections (opensearch-project#1004)

* rename data sources to data connections

Signed-off-by: Derek Ho <dxho@amazon.com>

* final cleanup

Signed-off-by: Derek Ho <dxho@amazon.com>

* update acceleration breadcrumb

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix API call for data connection page

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix integ test and data test subj and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add fallback to show if user does not have datasource API permissions (opensearch-project#1008)

* add fallback ui for manage and view datasources

Signed-off-by: Derek Ho <dxho@amazon.com>

* always show datasources via pplservice

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add access control tab content (opensearch-project#992)

* basic rendering for the access control tab

Signed-off-by: Derek Ho <dxho@amazon.com>

* hook up basic radio groups and euicombo boxes for query and acceleration permissions

Signed-off-by: Derek Ho <dxho@amazon.com>

* refactor and clean up unuseed inports

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove unused import

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix import and snapshot

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove unused files and variables

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Delete datasource and Connection Configuration Tab (opensearch-project#1024)

* Address previous PR comments and implement rudimentary delete

Signed-off-by: Derek Ho <dxho@amazon.com>

* Implement modal and instant delete showing up in list

Signed-off-by: Derek Ho <dxho@amazon.com>

* Refactor save or cancel to a shared component, implement hard coded datasource configurations tab

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update test with mock role data

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add most functionality of edit connectiondetails

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>

* Get most of the workflow working for configure datasource

Signed-off-by: Derek Ho <dxho@amazon.com>

* remove acceleration components

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Update data connection to datasources in a few more places and update tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* Rename and re-organize in folders

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix import path in testing file

Signed-off-by: Derek Ho <dxho@amazon.com>

* Get Initial S3 configuration working

Signed-off-by: Derek Ho <dxho@amazon.com>

* Configure S3 Data Source Working

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix query permissions display

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix merge conflict

Signed-off-by: Derek Ho <dxho@amazon.com>

* Clean up PR

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add s3 logo in manage table

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix up PR according to UX feedback

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove successfully

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Initial commit adding prometheus logo and icon

Signed-off-by: Derek Ho <dxho@amazon.com>

* Get the major flow working

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix app navigation

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix up PR

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove management redirection for now and fix test and add cards

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove type filter and update test according to UX feedback

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add link and update test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Address PR comments

Signed-off-by: Derek Ho <dxho@amazon.com>

* Include useful info in the error toast

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update actions in manage table according to UX feedback

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add update button and update tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove unused code until further implementation

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix router files

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
* Stub catalog reader interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add basic catalog functionality to new catalog reader

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor validation logic with a deeper interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor validation logic with a deeper interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove redundant test.

This test is unneeded after 12c4bcf

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for new validators

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Make better failure mode for invalid objects

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Generalize Result type

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Convert backend to use catalog reader (unstable)

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Repair tests for integrations class (unstable)

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor repository for new integration interface

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix outer repository and backend tests

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for sample data

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add CatalogReader JavaDocs

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Repair integrations builder

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove extra commented test

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove unnecessary log statement

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Repair getSchemas behavior to return correct type

Let it be known at on this day, with this commit,
I have truly grokked why we don't use `any` in typescript.

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for getSchemas

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for asset and sample data backend methods

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Break flyout validation methods out of constructing method

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add tests for extracted flyout methods

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Switch validation method to use ValidationResult

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Swap out flyout for hello-world setup page

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add basic step incrementing

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add basic field skeleton for each step

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add a cancel button

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add config type to developing form

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Flatten integration config

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add sample data table modal

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add toggle for standard and advanced asset config

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Simplify imports

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor major class names

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* (WIP) begin refactoring functionality into adaptor

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Finish migrating functionality to data adaptor

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Rename integration types for more clarity

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Refactor component usage

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Connect forms to config state

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix filetype selector

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove hardcoded name in path

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Write one snapshot test

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add more tests

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Fix test naming

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Update obsolete snapshots

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Move integration creation helpers to own file

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Break out integration creation methods

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Isolate more create_integration helpers

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Simplify setup form

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add data source picker items

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add better selector logic

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add queries for data sources

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Switch from selector to combobox

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Update snapshots

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Connect validation button to data source validation method

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Reimplement add integration button

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Temporarily remove validate button

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Simplify dynamic table term selection

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove unused validate code

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Undo wildcard import

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Switch from proxy to dataconnections endpoint

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Remove unused table fields

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Switch dataconnections base to const

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Add console proxy to route constants

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Update snapshots

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Move color to constants

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Move index name validation to constants and improve matching

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

* Move test constants to test constants

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>

---------

Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
* Make UI changes based on UX feedback

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove notifications pass through props

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix steps

Signed-off-by: Derek Ho <dxho@amazon.com>

* Remove edit buttons, delete files, update tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* Finish fixing promtheus flow

Signed-off-by: Derek Ho <dxho@amazon.com>

* fix up s3 flow

Signed-off-by: Derek Ho <dxho@amazon.com>

* Hook up fields to actual call

Signed-off-by: Derek Ho <dxho@amazon.com>

* Update according to UX feedback and tests

Signed-off-by: Derek Ho <dxho@amazon.com>

* Add test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Finish up test coverage for manage flow

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho marked this pull request as ready for review October 4, 2023 23:08
@derek-ho
Copy link
Collaborator Author

derek-ho commented Oct 4, 2023

Cherry-picks all PRs on main except e21dcf2, which will be backported separately

Swiddis and others added 2 commits October 4, 2023 17:48
Signed-off-by: Simeon Widdis <sawiddis@gmail.com>
Signed-off-by: Simeon Widdis <sawiddis@amazon.com>
@codecov
Copy link

codecov bot commented Oct 5, 2023

Codecov Report

Merging #1070 (95c3e14) into 2.x (ed572dc) will increase coverage by 0.40%.
Report is 2 commits behind head on 2.x.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.x    #1070      +/-   ##
==========================================
+ Coverage   43.55%   43.96%   +0.40%     
==========================================
  Files         313      325      +12     
  Lines       18708    19366     +658     
  Branches     4517     4626     +109     
==========================================
+ Hits         8149     8514     +365     
- Misses      10517    10808     +291     
- Partials       42       44       +2     
Flag Coverage Δ
dashboards-observability 43.96% <ø> (+0.40%) ⬆️

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

see 53 files with indirect coverage changes

Signed-off-by: Derek Ho <dxho@amazon.com>
@pjfitzgibbons pjfitzgibbons merged commit 171acde into opensearch-project:2.x Oct 5, 2023
6 of 8 checks passed
amsiglan pushed a commit to amsiglan/dashboards-observability that referenced this pull request Jun 7, 2024
* Update mocha (opensearch-project#960)
* added code for the change of design of the sidebar, fixed overriding … (opensearch-project#928)
* Refactor add_integration_flyout to break out nested methods (opensearch-project#956)
* [Log Explorer] Remove top level tabs (opensearch-project#970)
* Explorer's timeheader & color change (opensearch-project#959)
* Update caching (opensearch-project#965)
* Move query_utils to /public (opensearch-project#983)
* Remove Zeppelin Parser from Notebook (opensearch-project#985)
* Explorer empty bucket (opensearch-project#990)
* refactored classnames for sidebar (opensearch-project#933)
* Refactor Integrations Backend to abstract IO (opensearch-project#947)
* Create React component for Integrations Setup UI (opensearch-project#1009)
* Create Data sources plugin with Manage Datasources Flow  (opensearch-project#1035)
* Manage datasources (opensearch-project#967)
* Add acceleration management UI  (opensearch-project#989)
* Rename data sources to data connections (opensearch-project#1004)
* Add fallback to show if user does not have datasource API permissions (opensearch-project#1008)
* Add access control tab content (opensearch-project#992)
* Delete datasource and Connection Configuration Tab (opensearch-project#1024)
* adjust explorer chart color and spacing (opensearch-project#1051)
* Configure S3 datasource flow (opensearch-project#1049)
* Manage datasources (opensearch-project#967)
* Add acceleration management UI  (opensearch-project#989)
* Rename data sources to data connections (opensearch-project#1004)
* Add fallback to show if user does not have datasource API permissions (opensearch-project#1008)
* Add access control tab content (opensearch-project#992)
* Delete datasource and Connection Configuration Tab (opensearch-project#1024)
* modified explorer data grid to follow discover look and feel (opensearch-project#1041)
* Create prometheus datasource flow (opensearch-project#1054)
* Manage datasources (opensearch-project#967)
* Add acceleration management UI  (opensearch-project#989)
* Rename data sources to data connections (opensearch-project#1004)
* Add fallback to show if user does not have datasource API permissions (opensearch-project#1008)
* Add access control tab content (opensearch-project#992)
* Delete datasource and Connection Configuration Tab (opensearch-project#1024)
* added design changes for sidebar (opensearch-project#1061)
* updated snapshots (opensearch-project#1062)
* Update UI for integrations setup (opensearch-project#1052)
* Data sources UI improvements (opensearch-project#1059)
* adding redirection to datasources (opensearch-project#1063)
* Move convertDateTime, refactor query_utils (opensearch-project#1064)
* Setup S3 connection with integrations (opensearch-project#1057)
* Use approved svg from UX (opensearch-project#1066)
* Fix missing import 'moment' on query_utils. (opensearch-project#1067)

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
Signed-off-by: Eric Wei <menwe@amazon.com>
Signed-off-by: Paul Sebastian <paulstn@amazon.com>
Signed-off-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Simeon Widdis <sawiddis@gmail.com>
Co-authored-by: sumukhswamy <sumukhhs@amazon.com>
Co-authored-by: Eric Wei <menwe@amazon.com>
Co-authored-by: Paul Sebastian <paul_sebastian@live.com>
Co-authored-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Co-authored-by: Paul Sebastian <paulstn@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
Co-authored-by: Simeon Widdis <sawiddis@amazon.com>
(cherry picked from commit 171acde)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants