Web console: Better build experience (apache#8389)

* rename sql docs * rm old file * add old files
himanshug · Aug 24, 2019 · c948422 · c948422
1 parent efbf1a5
commit c948422
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/web-console/.gitignore b/web-console/.gitignore
@@ -10,7 +10,7 @@ coordinator-console/
 pages/
 /index.html
 
-lib/sql-function-doc.js
+lib/sql-docs.js
 
 .tscache
 tscommand-*.tmp.txt

diff --git a/web-console/lib/sql-function-doc.d.ts → web-console/lib/sql-docs.d.ts b/web-console/lib/sql-function-doc.d.ts → web-console/lib/sql-docs.d.ts
diff --git a/web-console/script/build b/web-console/script/build
@@ -23,8 +23,8 @@ cp -r ./node_modules/druid-console/coordinator-console .
 cp -r ./node_modules/druid-console/pages .
 cp ./node_modules/druid-console/index.html .
 
-echo "Adding SQL function doc..."
-PATH="./target/node:$PATH" ./script/create-sql-function-doc.js
+echo "Adding SQL docs..."
+PATH="./target/node:$PATH" ./script/create-sql-docs.js
 
 echo "Transpiling ReactTable CSS..."
 PATH="./target/node:$PATH" ./node_modules/.bin/stylus lib/react-table.styl -o lib/react-table.css

diff --git a/web-console/script/clean b/web-console/script/clean
@@ -16,9 +16,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# remove lib/sql-function-doc.* for back compat cleanup
 rm -rf \
   lib/react-table.css \
-  lib/sql-function-doc.js \
+  lib/sql-docs.js \
+  lib/sql-function-doc.* \
   node_modules \
   coordinator-console \
   pages \

diff --git a/...console/script/create-sql-function-doc.js → web-console/script/create-sql-docs.js b/...console/script/create-sql-function-doc.js → web-console/script/create-sql-docs.js
@@ -21,7 +21,7 @@
 const fs = require('fs-extra');
 
 const readfile = '../docs/querying/sql.md';
-const writefile = 'lib/sql-function-doc.js';
+const writefile = 'lib/sql-docs.js';
 
 const readDoc = async () => {
   const data = await fs.readFile(readfile, 'utf-8');

diff --git a/web-console/src/ace-modes/dsql.js b/web-console/src/ace-modes/dsql.js
@@ -22,7 +22,7 @@
 // This file was modified to make the list of keywords more closely adhere to what is found in DruidSQL
 
 var druidKeywords = require('../../lib/keywords');
-var druidFunctions = require('../../lib/sql-function-doc');
+var druidFunctions = require('../../lib/sql-docs');
 
 ace.define(
   'ace/mode/dsql_highlight_rules',

diff --git a/web-console/src/views/query-view/query-input/query-input.tsx b/web-console/src/views/query-view/query-input/query-input.tsx
@@ -28,7 +28,7 @@ import {
   SQL_EXPRESSION_PARTS,
   SQL_KEYWORDS,
 } from '../../../../lib/keywords';
-import { SQL_DATA_TYPES, SQL_FUNCTIONS } from '../../../../lib/sql-function-doc';
+import { SQL_DATA_TYPES, SQL_FUNCTIONS } from '../../../../lib/sql-docs';
 import { uniq } from '../../../utils';
 import { ColumnMetadata } from '../../../utils/column-metadata';
 

diff --git a/web-console/src/views/query-view/query-view.tsx b/web-console/src/views/query-view/query-view.tsx
@@ -38,7 +38,7 @@ import memoizeOne from 'memoize-one';
 import React from 'react';
 import SplitterLayout from 'react-splitter-layout';
 
-import { SQL_FUNCTIONS } from '../../../lib/sql-function-doc';
+import { SQL_FUNCTIONS } from '../../../lib/sql-docs';
 import { QueryPlanDialog } from '../../dialogs';
 import { EditContextDialog } from '../../dialogs/edit-context-dialog/edit-context-dialog';
 import {

diff --git a/web-console/tsconfig.json b/web-console/tsconfig.json
@@ -20,5 +20,5 @@
     "jsx": "react",
     "rootDirs": ["lib", "src"]
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "lib/sql-function-doc.ts"]
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
 }