From 1c2200b2a2a81fabf6ce08fc6a7134b591ef5942 Mon Sep 17 00:00:00 2001 From: Vadim Ogievetsky Date: Fri, 16 Apr 2021 08:44:21 -0700 Subject: [PATCH 1/3] better highlight --- licenses.yaml | 2 +- web-console/lib/keywords.js | 1 + web-console/package-lock.json | 6 +++--- web-console/package.json | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index 7144496da4b2..034b463ffa21 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -5143,7 +5143,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Imply Data -version: 0.10.5 +version: 0.10.7 --- diff --git a/web-console/lib/keywords.js b/web-console/lib/keywords.js index e476dfbd27a6..4a8c249ed0eb 100644 --- a/web-console/lib/keywords.js +++ b/web-console/lib/keywords.js @@ -45,6 +45,7 @@ exports.SQL_KEYWORDS = [ 'RIGHT', 'OUTER', 'FULL', + 'CROSS', ]; exports.SQL_EXPRESSION_PARTS = [ diff --git a/web-console/package-lock.json b/web-console/package-lock.json index ca1ce60f1593..850b7c165bc9 100644 --- a/web-console/package-lock.json +++ b/web-console/package-lock.json @@ -7374,9 +7374,9 @@ } }, "druid-query-toolkit": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-0.10.5.tgz", - "integrity": "sha512-qdH1FsjxAgGnXHtk9F88j3XT+/KLYfuPcVCMxBBolYE1/O1O6in5FDW+id8ek0JT/+astNMGKjfh6IUk9s/YkQ==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-0.10.7.tgz", + "integrity": "sha512-+1f8LrGTi0FML8H5Rfou6fJGlEtex7gWwsS9fDgxL1fs7eJkdaTrgvCUT/sFxfR3HmcEBktbmS4mShiBZztLoQ==", "requires": { "tslib": "^2.0.2" } diff --git a/web-console/package.json b/web-console/package.json index a58149d567ec..cf7f69fdfab1 100644 --- a/web-console/package.json +++ b/web-console/package.json @@ -73,7 +73,7 @@ "d3-axis": "^1.0.12", "d3-scale": "^3.2.0", "d3-selection": "^1.4.0", - "druid-query-toolkit": "^0.10.5", + "druid-query-toolkit": "^0.10.7", "file-saver": "^2.0.2", "fontsource-open-sans": "^3.0.9", "has-own-prop": "^2.0.0", From 7578950deddf06d74ecb042a3102cc223d7b77e7 Mon Sep 17 00:00:00 2001 From: Vadim Ogievetsky Date: Sun, 18 Apr 2021 15:53:36 -0700 Subject: [PATCH 2/3] better highlighting --- pom.xml | 5 +- web-console/lib/sql-docs.d.ts | 13 +- web-console/script/create-sql-docs.js | 23 ++-- .../__snapshots__/query-input.spec.tsx.snap | 119 ------------------ .../query-view/query-input/query-input.scss | 11 +- .../query-input/query-input.spec.tsx | 2 +- .../query-view/query-input/query-input.tsx | 56 ++++----- 7 files changed, 50 insertions(+), 179 deletions(-) delete mode 100644 web-console/src/views/query-view/query-input/__snapshots__/query-input.spec.tsx.snap diff --git a/pom.xml b/pom.xml index 568d81527851..c47e04ab69a3 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,7 @@ com.amazonaws aws-java-sdk-sts ${aws.sdk.version} - + com.ning compress-lzf @@ -1312,7 +1312,7 @@ org/apache/druid/query/TruncatedResponseContextException.class - org/apache/druid/common/aws/AWSCredentials* + org/apache/druid/common/aws/AWSCredentials* @@ -1970,7 +1970,6 @@ .github/pull_request_template.md git.version node_modules/** - coordinator-console/** src/**/*.snap examples/conf/** .asf.yaml diff --git a/web-console/lib/sql-docs.d.ts b/web-console/lib/sql-docs.d.ts index c4c9c34b3a21..8c30d0c7021c 100644 --- a/web-console/lib/sql-docs.d.ts +++ b/web-console/lib/sql-docs.d.ts @@ -16,14 +16,5 @@ * limitations under the License. */ -export interface SyntaxDescription { - name: string; - description: string; -} - -export interface FunctionSyntaxDescription extends SyntaxDescription { - arguments: string; -} - -export const SQL_DATA_TYPES: SyntaxDescription[]; -export const SQL_FUNCTIONS: FunctionSyntaxDescription[]; +export const SQL_DATA_TYPES: [name: string, runtime: string, description: string][]; +export const SQL_FUNCTIONS: [name: string, args: string, description: string][]; diff --git a/web-console/script/create-sql-docs.js b/web-console/script/create-sql-docs.js index 86ec0d70d754..05abeb4c4290 100755 --- a/web-console/script/create-sql-docs.js +++ b/web-console/script/create-sql-docs.js @@ -34,23 +34,22 @@ const readDoc = async () => { const functionDocs = []; const dataTypeDocs = []; for (let line of lines) { - const functionMatch = line.match(/^\|`(\w+)(\(.*\))`\|(.+)\|$/); + const functionMatch = line.match(/^\|`(\w+)\((.*)\)`\|(.+)\|$/); if (functionMatch) { - functionDocs.push({ - name: functionMatch[1], - arguments: functionMatch[2], - description: unwrapMarkdownLinks(functionMatch[3]), - }); + functionDocs.push([ + functionMatch[1], + functionMatch[2], + unwrapMarkdownLinks(functionMatch[3]), + ]); } const dataTypeMatch = line.match(/^\|([A-Z]+)\|([A-Z]+)\|(.*)\|(.*)\|$/); if (dataTypeMatch) { - dataTypeDocs.push({ - name: dataTypeMatch[1], - description: unwrapMarkdownLinks( - dataTypeMatch[4] || `Druid runtime type: ${dataTypeMatch[2]}`, - ), - }); + dataTypeDocs.push([ + dataTypeMatch[1], + dataTypeMatch[2], + unwrapMarkdownLinks(dataTypeMatch[4]), + ]); } } diff --git a/web-console/src/views/query-view/query-input/__snapshots__/query-input.spec.tsx.snap b/web-console/src/views/query-view/query-input/__snapshots__/query-input.spec.tsx.snap deleted file mode 100644 index d3616a032984..000000000000 --- a/web-console/src/views/query-view/query-input/__snapshots__/query-input.spec.tsx.snap +++ /dev/null @@ -1,119 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`query input correctly formats helper HTML 1`] = ` -" -
-
- COUNT -
-
-
- Syntax: -
-
COUNT(*)
-
-
- Description: -
-
Counts the number of things
-
" -`; - -exports[`query input matches snapshot 1`] = ` -
-
-
-