Bump pr-branch to v1.3 (#21)

* Opendistro-1.3 compatible with ES and Kibana 7.3 (#8) * updated kibana version (#9) * Fixed the issue that response failed to be delivered in the console (#10) * Fixed the issue that response failed to be delivered in the console * Updated the version info in package file Co-authored-by: Francesca Paoletti <[email protected]>
amazon-archives · Jan 15, 2020 · 0c11d66 · 0c11d66
1 parent b0e915e
commit 0c11d66
Show file tree

Hide file tree

Showing 9 changed files with 4,277 additions and 713 deletions.
diff --git a/main.tsx b/main.tsx
@@ -156,7 +156,7 @@ export class Main extends React.Component<MainProps, MainState> {
     }
     return {
       fulfilled: true,
-      data: JSON.parse(response.data.resp),
+      data: response.data.resp,
     };
   }
 

diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "opendistro-sql-kibana",
-  "version": "1.0.0.0",
+  "version": "1.3.0.0",
   "description": "SQL Console",
   "main": "index.js",
   "license": "Apache-2.0",
   "homepage": "https://github.com/opendistro-for-elasticsearch/sql-kibana-plugin",
   "kibana": {
-    "version": "6.5.4",
-    "templateVersion": "1.0.0"
+    "version": "7.3.2",
+    "templateVersion": "6.3.3"
   },
   "repository": {
     "type": "git",
@@ -77,7 +77,7 @@
     "typescript": "3.0.3"
   },
   "engines": {
-    "node": "8.14.0",
+    "node": "10.15.2",
     "yarn": "^1.10.1"
   },
   "resolutions": {

diff --git a/public/components/Main/main.tsx b/public/components/Main/main.tsx
@@ -1,4 +1,4 @@
-/*
+  /*
  *   Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License").
@@ -166,7 +166,7 @@ export class Main extends React.Component<MainProps, MainState> {
     }
     return {
       fulfilled: true,
-      data: JSON.parse(response.data.resp)
+      data: response.data.resp
     };
   }
 

diff --git a/public/components/QueryEditor/QueryEditor.tsx b/public/components/QueryEditor/QueryEditor.tsx
@@ -64,7 +64,7 @@ class QueryEditor extends React.Component<QueryEditorProps, QueryEditorState> {
               mode="mysql"
               theme="sql_console"
               width="100%"
-              height="20em"
+              height="18.5rem"
               value={this.state.sqlQueriesString}
               onChange={this.updateSQLQueries}
               showPrintMargin={false}
@@ -89,7 +89,7 @@ class QueryEditor extends React.Component<QueryEditorProps, QueryEditorState> {
               mode="json"
               theme="sql_console"
               width="100%"
-              height="20em"
+              height="18.5rem"
               value={this.props.queryTranslations
                 .map((queryTranslation: any) =>
                   JSON.stringify(queryTranslation.data, null, 2)
@@ -107,8 +107,7 @@ class QueryEditor extends React.Component<QueryEditorProps, QueryEditorState> {
             />
           </EuiFlexItem>
         </EuiFlexGroup>
-
-        <div className="action-container">
+        <div>
           <EuiFlexGroup className="action-container" gutterSize="m">
             <EuiFlexItem
               grow={false}

diff --git a/public/components/QueryResults/QueryResultsBody.test.tsx b/public/components/QueryResults/QueryResultsBody.test.tsx
@@ -84,13 +84,7 @@ describe("<QueryResultsBody /> spec", () => {
       ""
     );
 
-    const emptyQueryResult = {
-      fields: [''],
-      records: [{}],
-      message: ''
-    };
-
-    const { queryByTestId } = renderQueryResultsBody(emptyQueryResult, '', mockSortableProperties, mockErrorMessage, onSort, onQueryChange, updateExpandedMap, onChangeItemsPerPage);
+    const { queryByTestId } = renderQueryResultsBody(undefined, undefined, mockSortableProperties, mockErrorMessage, onSort, onQueryChange, updateExpandedMap, onChangeItemsPerPage);
 
     // Download buttons, pagination, search area, table should not be visible when there is no data
     expect(queryByTestId('Download')).toBeNull();

diff --git a/public/icons/sql.svg b/public/icons/sql.svg
diff --git a/public/utils/utils.ts b/public/utils/utils.ts
@@ -46,6 +46,7 @@ export function getDefaultTabId ( queryResults: ResponseDetail<string>[]) : stri
 }
 
 export function getDefaultTabLabel ( queryResults: ResponseDetail<string>[], queryString: string  ) : string {
+
   return queryResults && queryResults.length > 0 && queryResults[0].fulfilled ? getQueryIndex(queryString) : MESSAGE_TAB_LABEL
 }
 
@@ -71,7 +72,7 @@ export function capitalizeFirstLetter(name: string): string {
 }
 
 export function getMessageString(messages: QueryMessage[], tabNames: string[]): string {
-  return messages && messages.length > 0 && tabNames ? messages.reduce( (finalMessage, message, currentIndex) => finalMessage.concat(capitalizeFirstLetter(tabNames[currentIndex]), ': ', messages[currentIndex].text, '\n\n'), '' ) : '';
+  return messages && messages.length > 0 && tabNames && tabNames.length > 0 ? messages.reduce( (finalMessage, message, currentIndex) => finalMessage.concat(capitalizeFirstLetter(tabNames[currentIndex]), ': ', messages[currentIndex].text, '\n\n'), '' ) : '';
 }
 
 export function scrollToNode(nodeId: string): void {

diff --git a/test/setup.jest.ts b/test/setup.jest.ts
@@ -40,21 +40,3 @@ window.URL = {
     return "";
   },
 };
-
-jest.mock("ui/notify", () => ({
-  toastNotifications: {
-    addDanger: jest.fn().mockName("addDanger"),
-    addSuccess: jest.fn().mockName("addSuccess"),
-  },
-}));
-
-jest.mock("ui/chrome", () => ({
-  breadcrumbs: (() => {
-    const breadcrumbs = () => {};
-    // @ts-ignore
-    breadcrumbs.set = jest.fn();
-    // @ts-ignore
-    breadcrumbs.push = jest.fn();
-    return breadcrumbs;
-  })(),
-}));