Downgrade blueprintjs version in the web console to one with a vanilla Apache 2.0 license (apache#7139)

* revert bp

* fix tests

* move @types/hjson to dev dep

* removed all the package upgrades

Author: vogievetsky

services/src/main/java/org/apache/druid/cli/RouterJettyServerInitializer.java

@@ -66,6 +66,7 @@ public class RouterJettyServerInitializer implements JettyServerInitializer
       "/",
       "/coordinator-console/*",
       "/public/*",
+      "/assets/*",
       "/old-console/*",
       "/pages/*",
       "/unified-console.html",

web-console/.gitignore

@@ -2,6 +2,7 @@ node/
 node_modules/
 resources/
 public/
+assets/
 lib/*.css
 
 coordinator-console/

web-console/package-lock.json

@@ -17,9 +17,9 @@
     "start": "webpack-dev-server --hot --open"
   },
   "dependencies": {
-    "@blueprintjs/core": "^3.12.0",
-    "@types/hjson": "^2.4.0",
+    "@blueprintjs/core": "1.0.1",
     "axios": "^0.18.0",
+    "brace": "^0.11.1",
     "classnames": "^2.2.6",
     "d3-array": "^2.0.3",
     "druid-console": "^0.0.2",
@@ -28,16 +28,20 @@
     "hjson": "^3.1.2",
     "lodash.debounce": "^4.0.8",
     "numeral": "^2.0.6",
-    "react": "^16.7.0",
-    "react-dom": "^16.7.0",
+    "prop-types": "^15.7.2",
+    "react": "^16.8.3",
+    "react-ace": "^6.4.0",
+    "react-addons-css-transition-group": "^15.6.2",
+    "react-dom": "^16.8.3",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
-    "react-table": "^6.8.6",
+    "react-table": "^6.9.2",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.7",
     "@types/d3-array": "^1.2.4",
+    "@types/hjson": "^2.4.0",
     "@types/jest": "^23.3.13",
     "@types/lodash.debounce": "^4.0.4",
     "@types/mocha": "^5.2.5",

web-console/package.json

@@ -23,6 +23,10 @@ cp -r ./node_modules/druid-console/coordinator-console .
 cp -r ./node_modules/druid-console/pages .
 cp ./node_modules/druid-console/index.html .
 
+echo "Copying blueprint assets in..."
+sed 's|url("assets|url("/assets|g' "./node_modules/@blueprintjs/core/dist/blueprint.css" > lib/blueprint.css
+cp -r "./node_modules/@blueprintjs/core/dist/assets" .
+
 echo "Transpiling ReactTable CSS..."
 PATH="./target/node:$PATH" ./node_modules/.bin/stylus lib/react-table.styl -o lib/react-table.css
 

web-console/script/build

@@ -17,9 +17,10 @@
 # limitations under the License.
 
 rm -rf \
-  lib/react-table.css \
+  lib/*.css \
   node_modules \
   coordinator-console \
   pages \
   public \
+  assets \
   index.html

web-console/script/clean

@@ -24,3 +24,4 @@ cp -r coordinator-console "$1"
 cp -r old-console "$1"
 cp -r pages "$1"
 cp -r public "$1"
+cp -r assets "$1"

web-console/script/cp-to

@@ -19,20 +19,8 @@
 import { resolveSrv } from 'dns';
 import * as React from 'react';
 import axios from 'axios';
-import {
-  FormGroup,
-  Button,
-  InputGroup,
-  Dialog,
-  NumericInput,
-  Classes,
-  Tooltip,
-  AnchorButton,
-  TagInput,
-  Intent,
-  ButtonGroup,
-  HTMLSelect
-} from "@blueprintjs/core";
+import { InputGroup } from "@blueprintjs/core";
+import { HTMLSelect, FormGroup, NumericInput, TagInput } from "../components/filler";
 
 interface Field {
   name: string;
@@ -67,7 +55,7 @@ export class AutoForm<T> extends React.Component<AutoFormProps<T>, AutoFormState
     const { model, onChange } = this.props;
     return <NumericInput
       value={(model as any)[field.name]}
-      onValueChange={v => {
+      onValueChange={(v: any) => {
         if (isNaN(v)) return;
         onChange(Object.assign({}, model, { [field.name]: v }));
       }}
@@ -79,7 +67,7 @@ export class AutoForm<T> extends React.Component<AutoFormProps<T>, AutoFormState
     const { model, onChange } = this.props;
     return <NumericInput
       value={(model as any)[field.name]}
-      onValueChange={v => {
+      onValueChange={(v: number) => {
         if (isNaN(v)) return;
         onChange(Object.assign({}, model, { [field.name]: v }));
       }}
@@ -102,12 +90,14 @@ export class AutoForm<T> extends React.Component<AutoFormProps<T>, AutoFormState
   private renderBooleanInput(field: Field): JSX.Element {
     const { model, onChange } = this.props;
     return <HTMLSelect
-      options={["True", "False"]}
       value={(model as any)[field.name] === true ? "True" : "False"}
-      onChange={e => {
+      onChange={(e: any) => {
         onChange(Object.assign({}, model, { [field.name]: e.currentTarget.value === "True" }));
       }}
-    />
+    >
+      <option value="True">True</option>
+      <option value="False">False</option>
+    </HTMLSelect>
   }
 
   private renderStringArrayInput(field: Field): JSX.Element {
@@ -118,7 +108,7 @@ export class AutoForm<T> extends React.Component<AutoFormProps<T>, AutoFormState
       onChange={(v: any) => {
         onChange(Object.assign({}, model, { [field.name]: v }));
       }}
-      addOnBlur={true}
+      fill
     />;
   }
 

web-console/src/components/auto-form.tsx

@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.pt-select {
+  &.pt-fill {
+    flex: 1;
+  }
+}
+
+.form-group {
+  margin: 0 0 15px;
+}