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

Merge main to 2.x #146

Merged
merged 41 commits into from
Oct 5, 2023
Merged

Merge main to 2.x #146

merged 41 commits into from
Oct 5, 2023

Conversation

ps48
Copy link
Member

@ps48 ps48 commented Oct 5, 2023

Description

This PR lifts 2.x with commit history from main

Issues Resolved

#122

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.

dblock and others added 30 commits January 6, 2023 10:12
Co-authored-by: mend-for-github.aaakk.us.kg[bot] <50673670+mend-for-github.aaakk.us.kg[bot]@users.noreply.github.com>
Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v2.2.1...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Shenoy Pratik <[email protected]>

Signed-off-by: Shenoy Pratik <[email protected]>
(cherry picked from commit 5dde647)

Co-authored-by: Shenoy Pratik <[email protected]>
…ensearch-project#50)

* add release notes for 2.6 query workbench

Signed-off-by: Derek Ho <[email protected]>

* add CI item in infra

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit 5cecd8d)

Co-authored-by: Derek Ho <[email protected]>
* update maintainers and code owners

Signed-off-by: Derek Ho <[email protected]>

* add ani to codeowners

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
* Add release notes for 2.8

Signed-off-by: Joshua Li <[email protected]>

* Update release notes

Signed-off-by: Joshua Li <[email protected]>

---------

Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>
* Upgrade tough-cookie to fix CVE-2023-26136

Signed-off-by: Rupal Mahajan <[email protected]>

* Add semver resolution to patch CVE-2022-25883

Signed-off-by: Rupal Mahajan <[email protected]>

---------

Signed-off-by: Rupal Mahajan <[email protected]>
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add table acceleration flyout

Signed-off-by: Shenoy Pratik <[email protected]>

* comment on hardcoded elements

Signed-off-by: Shenoy Pratik <[email protected]>

* additional comment on hardcoded

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console logs

Signed-off-by: Shenoy Pratik <[email protected]>

* review fixes

Signed-off-by: Shenoy Pratik <[email protected]>

* revert version changes, inline type declare

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>
…roject#129)

* add materialized view visual builder and query builders

Signed-off-by: Shenoy Pratik <[email protected]>

* organize header and PR comments

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
sumukhswamy and others added 11 commits September 29, 2023 16:29
* added changes for sidebar

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

* added side bar with tables indexed

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

* added dynamic element for tree view, addressed pr comments

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

* made a few design and panel changes, addressed pr comments

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

* changed the constants file

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

* added changes for search bar removal, pr comments

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

* readded console.log

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

* updated test suites, removed search field

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

* added changes for Data connection and combo box

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

* updated mock for http query

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

* updated mock template name in tests

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

* addressed pr comments

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

* addressed more comments

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

* added error message for sidebar

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

* updated snapshots

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

---------

Signed-off-by: sumukhswamy <[email protected]>
…t#133)

* update form validaitons

Signed-off-by: Shenoy Pratik <[email protected]>

* update snapshots, add skipping validator

Signed-off-by: Shenoy Pratik <[email protected]>

* update sqlpage snapshot

Signed-off-by: Shenoy Pratik <[email protected]>

* add tests for acceleration create

Signed-off-by: Shenoy Pratik <[email protected]>

* update acceleration builder tests

Signed-off-by: Shenoy Pratik <[email protected]>

* update PR comments

Signed-off-by: Shenoy Pratik <[email protected]>

* adding fix for windows snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* update snapshot files

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
* successfully getting async post requests

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

* get query with hardcoded job id working

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

* working spark query after constant time wait

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

* added polling with some hardcoded values

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

* ability to switch between sources implemented

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

* implemented basic spinner

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

* small pr asks and cancellation implemented

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

* fixing small clear state issues

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

* reduce route name redundancy

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

* remove multiple query implementation for async

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

* needed to modify the endpoint

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

* default data source being Opensearch and updated snapshots

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

---------

Signed-off-by: Paul Sebastian <[email protected]>
opensearch-project#134)

* added the skipping index queries, covering index queries,updates the data picker

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

* added the skipping index queries, covering index queries,updates the data picker

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

* reverted updates to yarn

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

* updated tests, snapshots

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

---------

Signed-off-by: sumukhswamy <[email protected]>
* add acc index flyout

Signed-off-by: Shenoy Pratik <[email protected]>

* remove [if not exists] from acc creation

Signed-off-by: Shenoy Pratik <[email protected]>

* merge tableview from main

Signed-off-by: Shenoy Pratik <[email protected]>

* adding acc index flyout

Signed-off-by: Shenoy Pratik <[email protected]>

* add hash router

Signed-off-by: Shenoy Pratik <[email protected]>

* hide materialized view index type

Signed-off-by: Shenoy Pratik <[email protected]>

* update snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* loading combo boxes for acc flyout

Signed-off-by: Shenoy Pratik <[email protected]>

* adding acceleration backend integ

Signed-off-by: Shenoy Pratik <[email protected]>

* update jest tests for acc flyout

Signed-off-by: Shenoy Pratik <[email protected]>

* add redirection support for home page

Signed-off-by: Shenoy Pratik <[email protected]>

* fix primary shards count and replica validation

Signed-off-by: Shenoy Pratik <[email protected]>

* remove the caution callout for acc flyout

Signed-off-by: Shenoy Pratik <[email protected]>

* support acc flyout redirection from data sources

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
* disable most buttons

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

* code editor read only

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

* disabled accelerate button

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

---------

Signed-off-by: Paul Sebastian <[email protected]>
…h-project#138)

* added changes for loading, create button

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

* removed comments, updated snapshots

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

* addressed pr comments

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

* addressed pr comments

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

* addressed pr comments

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

* updated snapshots, constant for skipping index

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

---------

Signed-off-by: sumukhswamy <[email protected]>
* load table fields after table is selected

Signed-off-by: Shenoy Pratik <[email protected]>

* simplify the map function

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
* adding minor updates to acceleration ui

Signed-off-by: Shenoy Pratik <[email protected]>

* edits to acceleration index flyout

Signed-off-by: Shenoy Pratik <[email protected]>

* adding minor edits to table view

Signed-off-by: Shenoy Pratik <[email protected]>

* update snapshots

Signed-off-by: Shenoy Pratik <[email protected]>

* remove console log

Signed-off-by: Shenoy Pratik <[email protected]>

* minor fixes to namings and tableview

Signed-off-by: Shenoy Pratik <[email protected]>

* update tableview clear db

Signed-off-by: Shenoy Pratik <[email protected]>

---------

Signed-off-by: Shenoy Pratik <[email protected]>
@codecov
Copy link

codecov bot commented Oct 5, 2023

Codecov Report

Merging #146 (febfd88) into 2.x (35948be) will decrease coverage by 7.98%.
Report is 2 commits behind head on 2.x.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.x     #146      +/-   ##
==========================================
- Coverage   62.76%   54.79%   -7.98%     
==========================================
  Files          10       33      +23     
  Lines         658     1356     +698     
  Branches      119      210      +91     
==========================================
+ Hits          413      743     +330     
- Misses        192      535     +343     
- Partials       53       78      +25     
Flag Coverage Δ
dashboards-query-workbench 54.79% <ø> (-7.98%) ⬇️

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

see 29 files with indirect coverage changes

@ps48 ps48 changed the title [Test] 2.x merge from main Merge main to 2.x Oct 5, 2023
@sumukhswamy
Copy link
Collaborator

looks good to me!

@rishabh6788 rishabh6788 merged commit 3e45ef7 into opensearch-project:2.x Oct 5, 2023
5 of 8 checks passed
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.