Revert "2x main merge (#1)"

This reverts commit ce5412b.

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @pjfitzgibbons @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az @MaxKsyunz @Yury-Fridlyand @anirudha
+*   @opensearch-project/sql

.github/workflows/sql-workbench-test-build-workflow.yml

@@ -12,14 +12,14 @@ on:
 env:
   PLUGIN_NAME: dashboards-query-workbench
   OPENSEARCH_VERSION: '2.x'
-  OPENSEARCH_PLUGIN_VERSION: 2.11.0.0
+  OPENSEARCH_PLUGIN_VERSION: 2.10.0.0
 
 jobs:
   tests:
     name: Run unit tests
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       # Enable longer filenames for windows

MAINTAINERS.md

@@ -4,32 +4,13 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer        | GitHub ID                                           | Affiliation |
-| ----------------- | -------------------------------------------------   | ----------- |
-| Eric Wei          | [mengweieric](https://github.com/mengweieric)       | Amazon      |
-| Joshua Li         | [joshuali925](https://github.com/joshuali925)       | Amazon      |
-| Shenoy Pratik     | [ps48](https://github.com/ps48)                     | Amazon      |
-| Kavitha Mohan     | [kavithacm](https://github.com/kavithacm)           | Amazon      |
-| Rupal Mahajan     | [rupal-bq](https://github.com/rupal-bq)             | Amazon      |
-| Derek Ho          | [derek-ho](https://github.com/derek-ho)             | Amazon      |
-| Lior Perry        | [YANG-DB](https://github.com/YANG-DB)               | Amazon      |
-| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons)   | Amazon      |
-| Simeon Widdis     | [swiddis](https://github.com/swiddis)               | Amazon      |
-| Chen Dai          | [dai-chen](https://github.com/dai-chen)             | Amazon      |
-| Vamsi Manohar     | [vamsi-amazon](https://github.com/vamsi-amazon)     | Amazon      |
-| Peng Huo          | [penghuo](https://github.com/penghuo)               | Amazon      |
-| Sean Kao          | [seankao-az](https://github.com/seankao-az)         | Amazon      |
-| Max Ksyunz        | [MaxKsyunz](https://github.com/MaxKsyunz)           | BitQuill    |
-| Yury Fridlyand    | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | BitQuill    |
-| Anirudha Jadhav   | [anirudha](https://github.com/anirudha)             | Amazon      |
-
-## Emeritus Maintainers
-
-| Maintainer        | GitHub ID                                               | Affiliation |
-| ----------------- | ------------------------------------------------------- | ----------- |
-| Charlotte Henkle  | [CEHENKLE](https://github.com/CEHENKLE)                 | Amazon      |
-| Nick Knize        | [nknize](https://github.com/nknize)                     | Amazon      |
-| David Cui         | [davidcui1225](https://github.com/davidcui1225)         | Amazon      |
-| Eugene Lee        | [eugenesk24](https://github.com/eugenesk24)             | Amazon      |
-| Zhongnan Su       | [zhongnansu](https://github.com/zhongnansu)             | Amazon      |
-| Chloe Zhang       | [chloe-zh](https://github.com/chloe-zh)                 | Amazon      |
+| Maintainer            | GitHub ID                                           | Affiliation |
+| --------------------- | --------------------------------------------------- | ----------- |
+| Anirudha (Ani) Jadhav | [anirudha](https://github.com/anirudha)             | Amazon      |
+| Peng Huo              | [penghuo](https://github.com/penghuo)               | Amazon      |
+| Chen Dai              | [dai-chen](https://github.com/dai-chen)             | Amazon      |
+| Chloe Zhang           | [chloe-zh](https://github.com/chloe-zh)             | Amazon      |
+| Nick Knize            | [nknize](https://github.com/nknize)                 | Amazon      |
+| Charlotte Henkle      | [CEHENKLE](https://github.com/CEHENKLE)             | Amazon      |
+| Max Ksyunz            | [MaxKsyunz](https://github.com/MaxKsyunz)           | BitQuill    |
+| Yury Fridlyand        | [Yury-Fridlyand](https://github.com/Yury-Fridlyand) | BitQuill    |

common/constants/index.ts

@@ -8,20 +8,20 @@ export const PLUGIN_NAME = 'Query Workbench';
 export const OPENSEARCH_ACC_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest';
 export const ACC_INDEX_TYPE_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest';
 
-export const SKIPPING_INDEX = `skipping_index`;
+export const SKIPPING_INDEX = `skipping_index`
 export const ON_LOAD_QUERY = `SHOW tables LIKE '%';`;
 export const SKIPPING_INDEX_QUERY = `CREATE SKIPPING INDEX ON myS3.logs_db.http_logs 
 (status VALUE_SET) 
 WITH (
   auto_refresh = true
-  )`;
-export const COVERING_INDEX_QUERY = `CREATE INDEX covering_idx ON myS3.logs_db.http_logs
+  )`
+export const COVERING_INDEX_QUERY =`CREATE INDEX covering_idx ON myS3.logs_db.http_logs
  (status) 
  WITH (
   auto_refresh = true
-  )`;
-export const CREATE_DATABASE_QUERY = `CREATE DATABASE myS3.logs_db`;
-export const CREATE_TABLE_QUERY = `CREATE EXTERNAL TABLE myS3.logs_db.logs (
+  )`
+export const CREATE_DATABASE_QUERY =`CREATE DATABASE myS3.logs_db`
+export const CREATE_TABLE_QUERY =`CREATE EXTERNAL TABLE logs (
   key BIGINT,
   status INTEGER,
   size FLOAT,
@@ -32,7 +32,7 @@ USING JSON
 OPTIONS (
   path 's3://test/path',
   compression 'gzip'
-);`;
+);`
 
 export const ACCELERATION_INDEX_TYPES = [
   { label: 'Skipping Index', value: 'skipping' },
@@ -80,5 +80,3 @@ export const ACCELERATION_INDEX_NAME_INFO = `All OpenSearch acceleration indices
 ##### Note:
 - All user given index names must be in lowercase letters. Cannot begin with underscores or hyphens. Spaces, commas, and characters :, ", *, +, /, \, |, ?, #, >, or < are not allowed.  
   `;
-
-export const SIDEBAR_POLL_INTERVAL_MS = 5000;

opensearch_dashboards.json

@@ -4,6 +4,8 @@
   "opensearchDashboardsVersion": "2.11.0",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["navigation"],
+  "requiredPlugins": [
+    "navigation"
+  ],
   "optionalPlugins": []
-}
+}

package.json

@@ -44,7 +44,6 @@
     "json-schema": "^0.4.0",
     "yaml": "^2.2.2",
     "tough-cookie": "^4.1.3",
-    "semver": "^7.5.2",
-    "@cypress/request": "^3.0.0"
+    "semver": "^7.5.2"
   }
 }

public/components/Main/__snapshots__/main.test.tsx.snap

@@ -193,7 +193,6 @@ exports[`<Main /> spec click clear button 1`] = `
     >
       <div
         class="euiPageSideBar"
-        style="max-width: 400px; width: 400px;"
       >
         <div
           class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -753,7 +752,6 @@ exports[`<Main /> spec click run button, and response causes an error 1`] = `
     >
       <div
         class="euiPageSideBar"
-        style="max-width: 400px; width: 400px;"
       >
         <div
           class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -1313,7 +1311,6 @@ exports[`<Main /> spec click run button, and response is not ok 1`] = `
     >
       <div
         class="euiPageSideBar"
-        style="max-width: 400px; width: 400px;"
       >
         <div
           class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -1873,7 +1870,6 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
     >
       <div
         class="euiPageSideBar"
-        style="max-width: 400px; width: 400px;"
       >
         <div
           class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -1978,15 +1974,7 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
                           class="euiTreeView__nodeLabel"
                         >
                           <div>
-                            <span
-                              class="euiToolTipAnchor"
-                            >
-                              <div
-                                class="euiText euiText--medium"
-                              >
-                                2
-                              </div>
-                            </span>
+                            2
                              
                           </div>
                         </span>
@@ -2027,15 +2015,7 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
                           class="euiTreeView__nodeLabel"
                         >
                           <div>
-                            <span
-                              class="euiToolTipAnchor"
-                            >
-                              <div
-                                class="euiText euiText--medium"
-                              >
-                                2
-                              </div>
-                            </span>
+                            2
                              
                           </div>
                         </span>
@@ -2521,7 +2501,6 @@ exports[`<Main /> spec click run button, response fills null and missing values
     >
       <div
         class="euiPageSideBar"
-        style="max-width: 400px; width: 400px;"
       >
         <div
           class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -2626,13 +2605,6 @@ exports[`<Main /> spec click run button, response fills null and missing values
                           class="euiTreeView__nodeLabel"
                         >
                           <div>
-                            <span
-                              class="euiToolTipAnchor"
-                            >
-                              <div
-                                class="euiText euiText--medium"
-                              />
-                            </span>
                              
                           </div>
                         </span>
@@ -2673,13 +2645,6 @@ exports[`<Main /> spec click run button, response fills null and missing values
                           class="euiTreeView__nodeLabel"
                         >
                           <div>
-                            <span
-                              class="euiToolTipAnchor"
-                            >
-                              <div
-                                class="euiText euiText--medium"
-                              />
-                            </span>
                              
                           </div>
                         </span>
@@ -3168,7 +3133,6 @@ exports[`<Main /> spec click translation button, and response is ok 1`] = `
     >
       <div
         class="euiPageSideBar"
-        style="max-width: 400px; width: 400px;"
       >
         <div
           class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -3719,7 +3683,6 @@ exports[`<Main /> spec renders the component 1`] = `
     >
       <div
         class="euiPageSideBar"
-        style="max-width: 400px; width: 400px;"
       >
         <div
           class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
@@ -3815,15 +3778,7 @@ exports[`<Main /> spec renders the component 1`] = `
                           class="euiTreeView__nodeLabel"
                         >
                           <div>
-                            <span
-                              class="euiToolTipAnchor"
-                            >
-                              <div
-                                class="euiText euiText--medium"
-                              >
-                                .kibana_1
-                              </div>
-                            </span>
+                            .kibana_1
                              
                           </div>
                         </span>

public/components/Main/main.tsx

@@ -14,7 +14,7 @@ import {
   EuiPageSideBar,
   EuiPanel,
   EuiSpacer,
-  EuiText,
+  EuiText
 } from '@elastic/eui';
 import { IHttpResponse } from 'angular';
 import _ from 'lodash';
@@ -790,9 +790,6 @@ export class Main extends React.Component<MainProps, MainState> {
   }
 
   handleDataSelect = (selectedItems: []) => {
-    if (selectedItems[0].label !== 'OpenSearch' && this.state.language === 'SQL') {
-      this.updateSQLQueries('');
-    }
     this.setState({
       selectedDatasource: selectedItems,
     });
@@ -915,11 +912,13 @@ export class Main extends React.Component<MainProps, MainState> {
         <EuiPage paddingSize="none">
           {this.state.language === 'SQL' && (
             <EuiPanel>
-              <EuiPageSideBar style={{ maxWidth: '400px', width: '400px' }}>
+              <EuiPageSideBar>
                 <EuiFlexGroup direction="column">
                   <EuiFlexItem>
                     <EuiFlexItem grow={false}>
-                      <CreateButton updateSQLQueries={this.updateSQLQueries} />
+                      <CreateButton
+                        updateSQLQueries={this.updateSQLQueries}
+                      />
                     </EuiFlexItem>
                     <EuiSpacer />
                     <TableView

public/components/PPLPage/PPLPage.tsx

@@ -3,24 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import React from 'react';
 import {
+  EuiPanel,
   EuiButton,
-  EuiCodeBlock,
-  EuiCodeEditor,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiText,
+  EuiCodeEditor,
+  EuiSpacer,
+  EuiCodeBlock,
   EuiModal,
   EuiModalBody,
   EuiModalFooter,
   EuiModalHeader,
   EuiModalHeaderTitle,
   EuiOverlayMask,
-  EuiPanel,
-  EuiSpacer,
-  EuiText,
 } from '@elastic/eui';
-import React from 'react';
 import { ResponseDetail, TranslateResult } from '../Main/main';
+import _ from 'lodash';
 
 interface PPLPageProps {
   onRun: (query: string) => void;
@@ -106,7 +107,7 @@ export class PPLPage extends React.Component<PPLPageProps, PPLPageState> {
         <EuiCodeEditor
           theme="sql_console"
           width="100%"
-          height="7rem"
+          height="5rem"
           value={this.props.pplQuery}
           onChange={this.props.updatePPLQueries}
           showPrintMargin={false}

public/components/PPLPage/__snapshots__/PPLPage.test.tsx.snap

@@ -18,7 +18,7 @@ exports[`<PPLPage /> spec renders the component 1`] = `
     <div
       class="euiCodeEditorWrapper"
       data-test-subj="codeEditorContainer"
-      style="width: 100%; height: 7rem;"
+      style="width: 100%; height: 5rem;"
     >
       <button
         class="euiCodeEditorKeyboardHint"
@@ -39,7 +39,7 @@ exports[`<PPLPage /> spec renders the component 1`] = `
       <div
         class=" ace_editor ace-tm"
         id="some_html_id"
-        style="width: 100%; height: 7rem; font-size: 14px;"
+        style="width: 100%; height: 5rem; font-size: 14px;"
       >
         <textarea
           aria-label="Code Editor"
@@ -211,7 +211,7 @@ exports[`<PPLPage /> spec tests the action buttons 1`] = `
     <div
       class="euiCodeEditorWrapper"
       data-test-subj="codeEditorContainer"
-      style="width: 100%; height: 7rem;"
+      style="width: 100%; height: 5rem;"
     >
       <button
         class="euiCodeEditorKeyboardHint"
@@ -232,7 +232,7 @@ exports[`<PPLPage /> spec tests the action buttons 1`] = `
       <div
         class=" ace_editor ace-tm"
         id="some_html_id"
-        style="width: 100%; height: 7rem; font-size: 14px;"
+        style="width: 100%; height: 5rem; font-size: 14px;"
       >
         <textarea
           aria-label="Code Editor"