From 0038d0a4551ff5521c1dd0a23dd5d4a98c328e8e Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Mon, 30 Mar 2020 14:42:44 -0600
Subject: [PATCH 01/13] use auto form

---
 .../lookup-edit-dialog.scss                   |  4 +-
 .../lookup-edit-dialog.spec.tsx               |  2 +-
 .../lookup-edit-dialog/lookup-edit-dialog.tsx | 74 ++++++++++++-------
 .../src/views/lookups-view/lookups-view.tsx   | 13 ++--
 4 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
index e2de177e3255..df604f25616a 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss
@@ -23,8 +23,8 @@
     width: 600px;
   }
 
-  .ace_editor {
-    margin: 0px 20px 10px;
+  .auto-form {
+    margin: 5px 20px 10px;
   }
 
   .lookup-label {
diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
index b243f145db11..06fa64968090 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
@@ -31,7 +31,7 @@ describe('lookup edit dialog', () => {
         lookupName={'test'}
         lookupTier={'test'}
         lookupVersion={'test'}
-        lookupSpec={'test'}
+        lookupSpec={{ type: 'test', map: {} }}
         isEdit={false}
         allLookupTiers={['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']}
       />
diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index 6c93ec82b0e7..18bdbf652024 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -26,20 +26,27 @@ import {
   Intent,
 } from '@blueprintjs/core';
 import React from 'react';
-import AceEditor from 'react-ace';
 
-import { validJson } from '../../utils';
+import { AutoForm } from '../../components';
+// import { validJson } from '../../utils';
 
 import './lookup-edit-dialog.scss';
+// import AceEditor from 'react-ace';
 
+// import {SnitchDialog} from "..";
+
+export interface LookupSpec {
+  type: string;
+  map?: {};
+}
 export interface LookupEditDialogProps {
   onClose: () => void;
   onSubmit: () => void;
-  onChange: (field: string, value: string) => void;
+  onChange: (field: string, value: string | LookupSpec) => void;
   lookupName: string;
   lookupTier: string;
   lookupVersion: string;
-  lookupSpec: string;
+  lookupSpec: LookupSpec;
   isEdit: boolean;
   allLookupTiers: string[];
 }
@@ -57,6 +64,20 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
     allLookupTiers,
   } = props;
 
+  function isValidMap(map: object) {
+    try {
+      if (typeof map !== 'object') return false;
+      const entries = Object.entries(map);
+      for (let i = 0; i < entries.length; i++) {
+        if (typeof entries[i][1] !== 'string') return false;
+      }
+      return true;
+    } catch {
+      return false;
+    }
+    return true;
+  }
+
   function addISOVersion() {
     const currentDate = new Date();
     const ISOString = currentDate.toISOString();
@@ -94,7 +115,13 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
   }
 
   const disableSubmit =
-    lookupName === '' || lookupVersion === '' || lookupTier === '' || !validJson(lookupSpec);
+    lookupName === '' ||
+    lookupVersion === '' ||
+    lookupTier === '' ||
+    lookupSpec.type === '' ||
+    lookupSpec.type === undefined ||
+    lookupSpec.map === undefined ||
+    !isValidMap(lookupSpec.map);
 
   return (
     <Dialog
@@ -111,9 +138,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
           placeholder="Enter the lookup name"
         />
       </FormGroup>
-
       {renderTierInput()}
-
       <FormGroup className="lookup-label" label="Version:">
         <InputGroup
           value={lookupVersion}
@@ -124,27 +149,24 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
           }
         />
       </FormGroup>
-
-      <FormGroup className="lookup-label" label="Spec:" />
-
-      <AceEditor
-        className="lookup-edit-dialog-textarea"
-        mode="hjson"
-        theme="solarized_dark"
-        onChange={(e: any) => onChange('lookupEditSpec', e)}
-        fontSize={12}
-        height="40vh"
-        width="auto"
-        showPrintMargin={false}
-        showGutter={false}
-        value={lookupSpec}
-        editorProps={{ $blockScrolling: Infinity }}
-        setOptions={{
-          tabSize: 2,
+      <AutoForm
+        fields={[
+          {
+            name: 'type',
+            type: 'string',
+            label: 'Type :',
+          },
+          {
+            name: 'map',
+            type: 'json',
+            label: 'Map :',
+          },
+        ]}
+        model={lookupSpec}
+        onChange={m => {
+          onChange('lookupEditSpec', m);
         }}
-        style={{}}
       />
-
       <div className={Classes.DIALOG_FOOTER}>
         <div className={Classes.DIALOG_FOOTER_ACTIONS}>
           <Button text="Close" onClick={onClose} />
diff --git a/web-console/src/views/lookups-view/lookups-view.tsx b/web-console/src/views/lookups-view/lookups-view.tsx
index b9c4071fd353..061ca76d5a6f 100644
--- a/web-console/src/views/lookups-view/lookups-view.tsx
+++ b/web-console/src/views/lookups-view/lookups-view.tsx
@@ -32,6 +32,7 @@ import {
   ViewControlBar,
 } from '../../components';
 import { AsyncActionDialog, LookupEditDialog } from '../../dialogs/';
+import { LookupSpec } from '../../dialogs/lookup-edit-dialog/lookup-edit-dialog';
 import { LookupTableActionDialog } from '../../dialogs/lookup-table-action-dialog/lookup-table-action-dialog';
 import { AppToaster } from '../../singletons/toaster';
 import { getDruidErrorMessage, LocalStorageKeys, QueryManager } from '../../utils';
@@ -55,7 +56,7 @@ export interface LookupsViewState {
   lookupEditName: string;
   lookupEditTier: string;
   lookupEditVersion: string;
-  lookupEditSpec: string;
+  lookupEditSpec: LookupSpec;
   isEdit: boolean;
   allLookupTiers: string[];
 
@@ -81,7 +82,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
       lookupEditTier: '',
       lookupEditName: '',
       lookupEditVersion: '',
-      lookupEditSpec: '',
+      lookupEditSpec: { type: '' },
       isEdit: false,
       allLookupTiers: [],
       actions: [],
@@ -162,7 +163,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
         lookupEditName: '',
         lookupEditTier: prevState.allLookupTiers[0],
         lookupEditDialogOpen: true,
-        lookupEditSpec: '',
+        lookupEditSpec: { type: '' },
         lookupEditVersion: new Date().toISOString(),
         isEdit: false,
       }));
@@ -171,14 +172,14 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
         lookupEditName: id,
         lookupEditTier: tier,
         lookupEditDialogOpen: true,
-        lookupEditSpec: JSON.stringify(target.spec, null, 2),
+        lookupEditSpec: target.spec,
         lookupEditVersion: target.version,
         isEdit: true,
       });
     }
   }
 
-  private handleChangeLookup = (field: string, value: string) => {
+  private handleChangeLookup = (field: string, value: string | LookupSpec) => {
     this.setState({
       [field]: value,
     } as any);
@@ -193,7 +194,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
       isEdit,
     } = this.state;
     let endpoint = '/druid/coordinator/v1/lookups/config';
-    const specJson: any = JSON.parse(lookupEditSpec);
+    const specJson: any = lookupEditSpec;
     let dataJson: any;
     if (isEdit) {
       endpoint = `${endpoint}/${lookupEditTier}/${lookupEditName}`;

From 4c3385b14dc889983a946b0aee94d09ab4de4b30 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Mon, 30 Mar 2020 14:50:33 -0600
Subject: [PATCH 02/13] jest -u

---
 .../lookup-edit-dialog.spec.tsx.snap          | 209 ++++++++++--------
 1 file changed, 120 insertions(+), 89 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap b/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
index cb608233d7e5..9e5aa88dcb65 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
@@ -215,107 +215,140 @@ exports[`lookup edit dialog matches snapshot 1`] = `
           </div>
         </div>
         <div
-          class="bp3-form-group lookup-label"
-        >
-          <label
-            class="bp3-label"
-          >
-            Spec:
-             
-            <span
-              class="bp3-text-muted"
-            />
-          </label>
-          <div
-            class="bp3-form-content"
-          />
-        </div>
-        <div
-          class=" ace_editor ace-tm lookup-edit-dialog-textarea"
-          id="brace-editor"
-          style="width: auto; height: 40vh;"
+          class="auto-form"
         >
-          <textarea
-            autocapitalize="off"
-            autocorrect="off"
-            class="ace_text-input"
-            spellcheck="false"
-            style="opacity: 0;"
-            wrap="off"
-          />
-          <div
-            aria-hidden="true"
-            class="ace_gutter"
-            style="display: none;"
-          >
-            <div
-              class="ace_layer ace_gutter-layer ace_folding-enabled"
-            />
-            <div
-              class="ace_gutter-active-line"
-            />
-          </div>
           <div
-            class="ace_scroller"
+            class="bp3-form-group form-group-with-info"
           >
-            <div
-              class="ace_content"
+            <label
+              class="bp3-label"
             >
-              <div
-                class="ace_layer ace_print-margin-layer"
-              >
-                <div
-                  class="ace_print-margin"
-                  style="left: 4px; visibility: hidden;"
-                />
-              </div>
-              <div
-                class="ace_layer ace_marker-layer"
-              />
-              <div
-                class="ace_layer ace_text-layer"
-                style="padding: 0px 4px;"
-              />
-              <div
-                class="ace_layer ace_marker-layer"
+              Type :
+               
+              <span
+                class="bp3-text-muted"
               />
+            </label>
+            <div
+              class="bp3-form-content"
+            >
               <div
-                class="ace_layer ace_cursor-layer ace_hidden-cursors"
+                class="bp3-input-group suggestible-input"
               >
-                <div
-                  class="ace_cursor"
+                <input
+                  class="bp3-input"
+                  placeholder=""
+                  style="padding-right: 10px;"
+                  type="text"
+                  value="test"
                 />
               </div>
             </div>
           </div>
           <div
-            class="ace_scrollbar ace_scrollbar-v"
-            style="display: none; width: 20px;"
+            class="bp3-form-group form-group-with-info"
           >
+            <label
+              class="bp3-label"
+            >
+              Map :
+               
+              <span
+                class="bp3-text-muted"
+              />
+            </label>
             <div
-              class="ace_scrollbar-inner"
-              style="width: 20px;"
-            />
-          </div>
-          <div
-            class="ace_scrollbar ace_scrollbar-h"
-            style="display: none; height: 20px;"
-          >
-            <div
-              class="ace_scrollbar-inner"
-              style="height: 20px;"
-            />
-          </div>
-          <div
-            style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
-          >
-            <div
-              style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
-            />
-            <div
-              style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
+              class="bp3-form-content"
             >
-              XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              <div
+                class=" ace_editor ace-tm json-input"
+                id="brace-editor"
+                style="width: 100%; height: 8vh;"
+              >
+                <textarea
+                  autocapitalize="off"
+                  autocorrect="off"
+                  class="ace_text-input"
+                  spellcheck="false"
+                  style="opacity: 0;"
+                  wrap="off"
+                />
+                <div
+                  aria-hidden="true"
+                  class="ace_gutter"
+                  style="display: none;"
+                >
+                  <div
+                    class="ace_layer ace_gutter-layer ace_folding-enabled"
+                  />
+                  <div
+                    class="ace_gutter-active-line"
+                  />
+                </div>
+                <div
+                  class="ace_scroller"
+                >
+                  <div
+                    class="ace_content"
+                  >
+                    <div
+                      class="ace_layer ace_print-margin-layer"
+                    >
+                      <div
+                        class="ace_print-margin"
+                        style="left: 4px; visibility: hidden;"
+                      />
+                    </div>
+                    <div
+                      class="ace_layer ace_marker-layer"
+                    />
+                    <div
+                      class="ace_layer ace_text-layer"
+                      style="padding: 0px 4px;"
+                    />
+                    <div
+                      class="ace_layer ace_marker-layer"
+                    />
+                    <div
+                      class="ace_layer ace_cursor-layer ace_hidden-cursors"
+                    >
+                      <div
+                        class="ace_cursor"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="ace_scrollbar ace_scrollbar-v"
+                  style="display: none; width: 20px;"
+                >
+                  <div
+                    class="ace_scrollbar-inner"
+                    style="width: 20px;"
+                  />
+                </div>
+                <div
+                  class="ace_scrollbar ace_scrollbar-h"
+                  style="display: none; height: 20px;"
+                >
+                  <div
+                    class="ace_scrollbar-inner"
+                    style="height: 20px;"
+                  />
+                </div>
+                <div
+                  style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: hidden;"
+                >
+                  <div
+                    style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
+                  />
+                  <div
+                    style="height: auto; width: auto; top: 0px; left: 0px; visibility: hidden; position: absolute; white-space: pre; overflow: visible;"
+                  >
+                    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -336,9 +369,7 @@ exports[`lookup edit dialog matches snapshot 1`] = `
               </span>
             </button>
             <button
-              class="bp3-button bp3-disabled bp3-intent-primary"
-              disabled=""
-              tabindex="-1"
+              class="bp3-button bp3-intent-primary"
               type="button"
             >
               <span

From 9a6d603e6ca9160a0d14d749013be11b4bddba0f Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Mon, 30 Mar 2020 15:01:21 -0600
Subject: [PATCH 03/13] fix unreachable statment

---
 .../src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index 18bdbf652024..2d0968d2ac26 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -75,7 +75,6 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
     } catch {
       return false;
     }
-    return true;
   }
 
   function addISOVersion() {

From 0b068c34a4a69714ca80e0a5518dd7718c50a7b2 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Thu, 2 Apr 2020 01:17:03 -0600
Subject: [PATCH 04/13] complete the owl

---
 .../lookup-edit-dialog/lookup-edit-dialog.tsx | 373 ++++++++++++++++--
 .../src/views/lookups-view/lookups-view.tsx   |   9 +-
 2 files changed, 354 insertions(+), 28 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index 2d0968d2ac26..25cd3a9a9910 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -35,13 +35,44 @@ import './lookup-edit-dialog.scss';
 
 // import {SnitchDialog} from "..";
 
+export interface ExtractionNamespaceSpec {
+  type?: string;
+  uri?: string;
+  uriPrefix?: string;
+  namespaceParseSpec: NamespaceParseSpec;
+  namespace?: string;
+  connectorConfig?: string;
+  table?: string;
+  keyColumn?: string;
+  valueColumn?: string;
+  filter?: any;
+  tsColumn?: string;
+  pollPeriod?: string;
+}
+
+export interface NamespaceParseSpec {
+  format: string;
+  columns?: string[];
+  keyColumn?: string;
+  valueColumn?: string;
+  hasHeaderRow?: boolean;
+  skipHeaderRows?: number;
+  keyFieldName?: string;
+  valueFieldName?: string;
+  delimiter?: string;
+  listDelimiter?: string;
+}
+
 export interface LookupSpec {
   type: string;
   map?: {};
+  extractionNamespace?: ExtractionNamespaceSpec;
+  firstCacheTimeout?: number;
+  injective?: boolean;
 }
 export interface LookupEditDialogProps {
   onClose: () => void;
-  onSubmit: () => void;
+  onSubmit: (updateLookupVersion: boolean) => void;
   onChange: (field: string, value: string | LookupSpec) => void;
   lookupName: string;
   lookupTier: string;
@@ -64,18 +95,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
     allLookupTiers,
   } = props;
 
-  function isValidMap(map: object) {
-    try {
-      if (typeof map !== 'object') return false;
-      const entries = Object.entries(map);
-      for (let i = 0; i < entries.length; i++) {
-        if (typeof entries[i][1] !== 'string') return false;
-      }
-      return true;
-    } catch {
-      return false;
-    }
-  }
+  let updateVersionOnSubmit = true;
 
   function addISOVersion() {
     const currentDate = new Date();
@@ -86,17 +106,20 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
   function renderTierInput() {
     if (isEdit) {
       return (
-        <FormGroup className="lookup-label" label="Tier: ">
+        <FormGroup className="lookup-label" label="Tier">
           <InputGroup
             value={lookupTier}
-            onChange={(e: any) => onChange('lookupEditTier', e.target.value)}
+            onChange={(e: any) => {
+              updateVersionOnSubmit = false;
+              onChange('lookupEditTier', e.target.value);
+            }}
             disabled
           />
         </FormGroup>
       );
     } else {
       return (
-        <FormGroup className="lookup-label" label="Tier:">
+        <FormGroup className="lookup-label" label="Tier">
           <HTMLSelect
             disabled={isEdit}
             value={lookupTier}
@@ -113,14 +136,45 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
     }
   }
 
-  const disableSubmit =
+  let disableSubmit =
     lookupName === '' ||
     lookupVersion === '' ||
     lookupTier === '' ||
     lookupSpec.type === '' ||
     lookupSpec.type === undefined ||
-    lookupSpec.map === undefined ||
-    !isValidMap(lookupSpec.map);
+    (lookupSpec.type === 'map' && lookupSpec.map === undefined) ||
+    (lookupSpec.type === 'cachedNamespace' && lookupSpec.extractionNamespace === undefined);
+
+  if (!disableSubmit && lookupSpec.type === 'cachedNamespace' && lookupSpec.extractionNamespace) {
+    const namespaceParseSpec = lookupSpec.extractionNamespace.namespaceParseSpec;
+
+    switch (lookupSpec.extractionNamespace.type) {
+      case 'uri':
+        disableSubmit = !lookupSpec.extractionNamespace.namespaceParseSpec;
+        if (!disableSubmit) break;
+        switch (namespaceParseSpec.format) {
+          case 'csv':
+            disableSubmit = !namespaceParseSpec.columns && !namespaceParseSpec.skipHeaderRows;
+            break;
+          case 'tsv':
+            disableSubmit = !namespaceParseSpec.columns;
+            break;
+          case 'customJson':
+            disableSubmit = !namespaceParseSpec.keyFieldName && !namespaceParseSpec.valueFieldName;
+            break;
+        }
+        break;
+      case 'jdbc':
+        const extractionNamespace = lookupSpec.extractionNamespace;
+        disableSubmit =
+          !extractionNamespace.namespace ||
+          !extractionNamespace.connectorConfig ||
+          !extractionNamespace.table ||
+          !extractionNamespace.keyColumn ||
+          !extractionNamespace.valueColumn;
+        break;
+    }
+  }
 
   return (
     <Dialog
@@ -129,7 +183,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       onClose={onClose}
       title={isEdit ? 'Edit lookup' : 'Add lookup'}
     >
-      <FormGroup className="lookup-label" label="Name: ">
+      <FormGroup className="lookup-label" label="Name">
         <InputGroup
           value={lookupName}
           onChange={(e: any) => onChange('lookupEditName', e.target.value)}
@@ -138,7 +192,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
         />
       </FormGroup>
       {renderTierInput()}
-      <FormGroup className="lookup-label" label="Version:">
+      <FormGroup className="lookup-label" label="Version">
         <InputGroup
           value={lookupVersion}
           onChange={(e: any) => onChange('lookupEditVersion', e.target.value)}
@@ -153,12 +207,281 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
           {
             name: 'type',
             type: 'string',
-            label: 'Type :',
+            suggestions: ['map', 'cachedNamespace'],
+            adjustment: model => {
+              if (
+                model.type === 'map' &&
+                model.extractionNamespace &&
+                model.extractionNamespace.type
+              ) {
+                return model;
+              }
+              model.extractionNamespace = { type: 'uri', namespaceParseSpec: { format: 'csv' } };
+              return model;
+            },
           },
           {
             name: 'map',
             type: 'json',
-            label: 'Map :',
+            defined: model => {
+              return model.type === 'map';
+            },
+          },
+          {
+            name: 'extractionNamespace.type',
+            type: 'string',
+            label: 'Globally cached lookup type',
+            placeholder: 'uri',
+            suggestions: ['uri', 'jdbc'],
+            defined: model => model.type === 'cachedNamespace',
+          },
+          {
+            name: 'extractionNamespace.uriPrefix',
+            type: 'string',
+            label: 'URI prefix',
+            info:
+              'A URI which specifies a directory (or other searchable resource) in which to search for files',
+            placeholder: 's3://bucket/some/key/prefix/',
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri',
+          },
+          {
+            name: 'extractionNamespace.fileRegex',
+            type: 'string',
+            label: 'File regex',
+            placeholder: 'renames-[0-9]*\\.gz',
+            info:
+              'Optional regex for matching the file name under uriPrefix. Only used if uriPrefix is used',
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri',
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.format',
+            type: 'string',
+            label: 'Format',
+            defaultValue: 'csv',
+            suggestions: ['csv', 'tsv', 'customJson', 'simpleJson'],
+            // todo needs info
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri',
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.columns',
+            type: 'string-array',
+            label: 'Columns',
+            placeholder: `["key", "value"]`,
+            info: 'The list of columns in the csv file',
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.keyColumn',
+            type: 'string',
+            label: 'Key column',
+            placeholder: 'Key',
+            info: 'The name of the column containing the key',
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.valueColumn',
+            type: 'string',
+            label: 'Value column',
+            placeholder: 'Value',
+            info: 'The name of the column containing the value',
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.hasHeaderRow',
+            type: 'boolean',
+            label: 'Has header row',
+            defaultValue: false,
+            info: `A flag to indicate that column information can be extracted from the input files' header row`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.skipHeaderRows',
+            type: 'number',
+            label: 'Skip header rows',
+            placeholder: '0',
+            info: `Number of header rows to be skipped`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.delimiter',
+            type: 'string',
+            label: 'Delimiter',
+            placeholder: `\t`,
+            info: `The delimiter in the file`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              model.extractionNamespace.namespaceParseSpec.format === 'tsv',
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.listDelimiter',
+            type: 'string',
+            label: 'List delimiter',
+            placeholder: `\u0001`,
+            info: `The list delimiter in the file\t`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              model.extractionNamespace.namespaceParseSpec.format === 'tsv',
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.keyFieldName',
+            type: 'string',
+            label: 'Key field name',
+            placeholder: `key`,
+            info: `The field name of the key`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              model.extractionNamespace.namespaceParseSpec.format === 'customJson',
+          },
+          {
+            name: 'extractionNamespace.namespaceParseSpec.valueFieldName',
+            type: 'string',
+            label: 'Value field name',
+            placeholder: `value`,
+            info: `The field name of the value`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri' &&
+              model.extractionNamespace.namespaceParseSpec &&
+              model.extractionNamespace.namespaceParseSpec.format === 'customJson',
+          },
+          {
+            name: 'extractionNamespace.namespace',
+            type: 'string',
+            label: 'Namespace',
+            placeholder: 'some_lookup',
+            info: `The namespace to define`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'jdbc',
+          },
+          {
+            name: 'extractionNamespace.table',
+            type: 'string',
+            label: 'Table',
+            placeholder: 'some_lookup_table',
+            info: `The table which contains the key value pairs`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'jdbc',
+          },
+          {
+            name: 'extractionNamespace.keyColumn',
+            type: 'string',
+            label: 'Key column',
+            placeholder: 'the_old_dim_value',
+            info: `The column in table which contains the keys`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'jdbc',
+          },
+          {
+            name: 'extractionNamespace.valueColumn',
+            type: 'string',
+            label: 'Value column',
+            placeholder: 'the_new_dim_value',
+            info: `The column in table which contains the values`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'jdbc',
+          },
+          {
+            name: 'extractionNamespace.filter',
+            type: 'json',
+            label: 'Filter',
+            info: `The filter to use when selecting lookups, this is used to create a where clause on lookup population`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'jdbc',
+          },
+          {
+            name: 'extractionNamespace.tsColumn',
+            type: 'string',
+            label: 'TsColumn',
+            info: `The column in table which contains when the key was updated`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'jdbc',
+          },
+          {
+            name: 'extractionNamespace.pollPeriod',
+            type: 'string',
+            label: 'Poll Period',
+            placeholder: 'PT5M',
+            info: `Period between polling for updates`,
+            defined: model =>
+              model.type === 'cachedNamespace' &&
+              !!model.extractionNamespace &&
+              model.extractionNamespace.type === 'uri',
+          },
+          {
+            name: 'firstCacheTimeout',
+            type: 'number',
+            label: 'First cache timeout',
+            placeholder: '0',
+            info: `How long to wait (in ms) for the first run of the cache to populate. 0 indicates to not wait`,
+            defined: model => model.type === 'cachedNamespace',
+          },
+          {
+            name: 'injective',
+            type: 'boolean',
+            defaultValue: false,
+            info: `If the underlying map is injective (keys and values are unique) then optimizations can occur internally by setting this to true`,
+            defined: model => model.type === 'cachedNamespace',
           },
         ]}
         model={lookupSpec}
@@ -172,7 +495,9 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
           <Button
             text="Submit"
             intent={Intent.PRIMARY}
-            onClick={() => onSubmit()}
+            onClick={() => {
+              onSubmit(updateVersionOnSubmit && isEdit);
+            }}
             disabled={disableSubmit}
           />
         </div>
diff --git a/web-console/src/views/lookups-view/lookups-view.tsx b/web-console/src/views/lookups-view/lookups-view.tsx
index 061ca76d5a6f..659094e3eac7 100644
--- a/web-console/src/views/lookups-view/lookups-view.tsx
+++ b/web-console/src/views/lookups-view/lookups-view.tsx
@@ -185,7 +185,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
     } as any);
   };
 
-  private async submitLookupEdit() {
+  private async submitLookupEdit(updatelookupEditVersion: boolean) {
     const {
       lookupEditTier,
       lookupEditName,
@@ -193,20 +193,21 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
       lookupEditVersion,
       isEdit,
     } = this.state;
+    const version = updatelookupEditVersion ? new Date().toISOString() : lookupEditVersion;
     let endpoint = '/druid/coordinator/v1/lookups/config';
     const specJson: any = lookupEditSpec;
     let dataJson: any;
     if (isEdit) {
       endpoint = `${endpoint}/${lookupEditTier}/${lookupEditName}`;
       dataJson = {
-        version: lookupEditVersion,
+        version: version,
         lookupExtractorFactory: specJson,
       };
     } else {
       dataJson = {
         [lookupEditTier]: {
           [lookupEditName]: {
-            version: lookupEditVersion,
+            version: version,
             lookupExtractorFactory: specJson,
           },
         },
@@ -375,7 +376,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
     return (
       <LookupEditDialog
         onClose={() => this.setState({ lookupEditDialogOpen: false })}
-        onSubmit={() => this.submitLookupEdit()}
+        onSubmit={updateLookupVersion => this.submitLookupEdit(updateLookupVersion)}
         onChange={this.handleChangeLookup}
         lookupSpec={lookupEditSpec}
         lookupName={lookupEditName}

From 56a5c86960890ba59f52378d019bd7254f9a61f8 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Mon, 6 Apr 2020 12:12:18 -0600
Subject: [PATCH 05/13] jest -u

---
 .../lookup-edit-dialog.spec.tsx.snap          | 51 ++++++++++++--
 .../lookup-edit-dialog.spec.tsx               |  2 +-
 .../number-menu-items.spec.tsx                |  4 ++
 .../number-menu-items/number-menu-items.tsx   | 68 ++++++++++++++++++-
 .../string-menu-items.spec.tsx                |  4 ++
 .../string-menu-items/string-menu-items.tsx   | 59 ++++++++++++++++
 .../time-menu-items/time-menu-items.spec.tsx  |  4 ++
 .../time-menu-items/time-menu-items.tsx       | 59 ++++++++++++++++
 .../query-view/column-tree/column-tree.tsx    | 59 +++++++++++++++-
 9 files changed, 300 insertions(+), 10 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap b/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
index 9e5aa88dcb65..eb627359295d 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/lookup-edit-dialog/__snapshots__/lookup-edit-dialog.spec.tsx.snap
@@ -58,7 +58,7 @@ exports[`lookup edit dialog matches snapshot 1`] = `
           <label
             class="bp3-label"
           >
-            Name: 
+            Name
              
             <span
               class="bp3-text-muted"
@@ -86,7 +86,7 @@ exports[`lookup edit dialog matches snapshot 1`] = `
           <label
             class="bp3-label"
           >
-            Tier:
+            Tier
              
             <span
               class="bp3-text-muted"
@@ -178,7 +178,7 @@ exports[`lookup edit dialog matches snapshot 1`] = `
           <label
             class="bp3-label"
           >
-            Version:
+            Version
              
             <span
               class="bp3-text-muted"
@@ -223,7 +223,7 @@ exports[`lookup edit dialog matches snapshot 1`] = `
             <label
               class="bp3-label"
             >
-              Type :
+              Type
                
               <span
                 class="bp3-text-muted"
@@ -238,10 +238,47 @@ exports[`lookup edit dialog matches snapshot 1`] = `
                 <input
                   class="bp3-input"
                   placeholder=""
-                  style="padding-right: 10px;"
+                  style="padding-right: 0px;"
+                  suggestions="map,cachedNamespace"
                   type="text"
-                  value="test"
+                  value="map"
                 />
+                <span
+                  class="bp3-input-action"
+                >
+                  <span
+                    class="bp3-popover-wrapper"
+                  >
+                    <span
+                      class="bp3-popover-target"
+                    >
+                      <button
+                        class="bp3-button bp3-minimal"
+                        type="button"
+                      >
+                        <span
+                          class="bp3-icon bp3-icon-caret-down"
+                          icon="caret-down"
+                        >
+                          <svg
+                            data-icon="caret-down"
+                            height="16"
+                            viewBox="0 0 16 16"
+                            width="16"
+                          >
+                            <desc>
+                              caret-down
+                            </desc>
+                            <path
+                              d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
+                              fill-rule="evenodd"
+                            />
+                          </svg>
+                        </span>
+                      </button>
+                    </span>
+                  </span>
+                </span>
               </div>
             </div>
           </div>
@@ -251,7 +288,7 @@ exports[`lookup edit dialog matches snapshot 1`] = `
             <label
               class="bp3-label"
             >
-              Map :
+              Map
                
               <span
                 class="bp3-text-muted"
diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
index 06fa64968090..3d6438e86648 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
@@ -31,7 +31,7 @@ describe('lookup edit dialog', () => {
         lookupName={'test'}
         lookupTier={'test'}
         lookupVersion={'test'}
-        lookupSpec={{ type: 'test', map: {} }}
+        lookupSpec={{ type: 'map', map: {} }}
         isEdit={false}
         allLookupTiers={['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']}
       />
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
index 3ca046e6d6fa..52ec0268e55c 100644
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
@@ -28,6 +28,8 @@ describe('number menu', () => {
   it('matches snapshot when menu is opened for column not inside group by', () => {
     const numberMenu = (
       <NumberMenuItems
+        table={'table'}
+        schema={'schema'}
         columnName={'added'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
@@ -41,6 +43,8 @@ describe('number menu', () => {
   it('matches snapshot when menu is opened for column inside group by', () => {
     const numberMenu = (
       <NumberMenuItems
+        table={'table'}
+        schema={'schema'}
         columnName={'added'}
         parsedQuery={parser(`SELECT added, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
index db5485363d22..082bc136a800 100644
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
@@ -18,10 +18,19 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlAliasRef, SqlFunction, SqlLiteral, SqlQuery, SqlRef } from 'druid-query-toolkit';
+import {
+  SqlAliasRef,
+  SqlFunction,
+  SqlLiteral,
+  SqlMulti,
+  SqlQuery,
+  SqlRef,
+} from 'druid-query-toolkit';
 import React from 'react';
 
 export interface NumberMenuItemsProps {
+  schema: string;
+  table: string;
   columnName: string;
   parsedQuery: SqlQuery;
   onQueryChange: (queryString: SqlQuery, run?: boolean) => void;
@@ -175,6 +184,62 @@ export const NumberMenuItems = React.memo(function NumberMenuItems(props: Number
     );
   }
 
+  function renderJoinMenu(): JSX.Element | undefined {
+    const { parsedQuery, schema, table, onQueryChange } = props;
+    if (parsedQuery && schema !== 'lookup') return;
+    return (
+      <>
+        <MenuItem
+          icon={IconNames.LEFT_JOIN}
+          text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
+        >
+          <MenuItem
+            text={'Left Join'}
+            onClick={() =>
+              onQueryChange(
+                parsedQuery.addJoin(
+                  'LEFT',
+                  SqlRef.fromName(table, schema),
+                  SqlMulti.sqlMultiFactory('=', [
+                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                  ]),
+                ),
+                false,
+              )
+            }
+          />
+          <MenuItem
+            text={'Inner Join'}
+            onClick={() =>
+              onQueryChange(
+                parsedQuery.addJoin(
+                  'INNER',
+                  SqlRef.fromName(table, schema),
+                  SqlMulti.sqlMultiFactory('=', [
+                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                  ]),
+                ),
+                false,
+              )
+            }
+          />
+        </MenuItem>
+        {parsedQuery.onExpression instanceof SqlMulti &&
+          parsedQuery.onExpression.containsColumn(table) && (
+            <MenuItem
+              icon={IconNames.CROSS}
+              text="Remove Join"
+              onClick={() => {
+                onQueryChange(parsedQuery.removeJoin(), true);
+              }}
+            />
+          )}
+      </>
+    );
+  }
+
   return (
     <>
       {renderFilterMenu()}
@@ -182,6 +247,7 @@ export const NumberMenuItems = React.memo(function NumberMenuItems(props: Number
       {renderGroupByMenu()}
       {renderRemoveGroupBy()}
       {renderAggregateMenu()}
+      {renderJoinMenu()}
     </>
   );
 });
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
index e952810b3a42..3f3c54fc318b 100644
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
@@ -28,6 +28,8 @@ describe('string menu', () => {
   it('matches snapshot when menu is opened for column not inside group by', () => {
     const stringMenu = (
       <StringMenuItems
+        table={'table'}
+        schema={'schema'}
         columnName={'cityName'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
@@ -41,6 +43,8 @@ describe('string menu', () => {
   it('matches snapshot when menu is opened for column inside group by', () => {
     const stringMenu = (
       <StringMenuItems
+        table={'table'}
+        schema={'schema'}
         columnName={'channel'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
index 25b823333a53..dd862ca1b552 100644
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
@@ -29,6 +29,8 @@ import {
 import React from 'react';
 
 export interface StringMenuItemsProps {
+  schema: string;
+  table: string;
   columnName: string;
   parsedQuery: SqlQuery;
   onQueryChange: (queryString: SqlQuery, run?: boolean) => void;
@@ -163,6 +165,62 @@ export const StringMenuItems = React.memo(function StringMenuItems(props: String
     );
   }
 
+  function renderJoinMenu(): JSX.Element | undefined {
+    const { parsedQuery, schema, table, onQueryChange } = props;
+    if (parsedQuery && schema !== 'lookup') return;
+    return (
+      <>
+        <MenuItem
+          icon={IconNames.LEFT_JOIN}
+          text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
+        >
+          <MenuItem
+            text={'Left Join'}
+            onClick={() =>
+              onQueryChange(
+                parsedQuery.addJoin(
+                  'LEFT',
+                  SqlRef.fromName(table, schema),
+                  SqlMulti.sqlMultiFactory('=', [
+                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                  ]),
+                ),
+                false,
+              )
+            }
+          />
+          <MenuItem
+            text={'Inner Join'}
+            onClick={() =>
+              onQueryChange(
+                parsedQuery.addJoin(
+                  'INNER',
+                  SqlRef.fromName(table, schema),
+                  SqlMulti.sqlMultiFactory('=', [
+                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                  ]),
+                ),
+                false,
+              )
+            }
+          />
+        </MenuItem>
+        {parsedQuery.onExpression instanceof SqlMulti &&
+          parsedQuery.onExpression.containsColumn(table) && (
+            <MenuItem
+              icon={IconNames.CROSS}
+              text="Remove Join"
+              onClick={() => {
+                onQueryChange(parsedQuery.removeJoin(), true);
+              }}
+            />
+          )}
+      </>
+    );
+  }
+
   return (
     <>
       {renderFilterMenu()}
@@ -170,6 +228,7 @@ export const StringMenuItems = React.memo(function StringMenuItems(props: String
       {renderGroupByMenu()}
       {renderRemoveGroupBy()}
       {renderAggregateMenu()}
+      {renderJoinMenu()}
     </>
   );
 });
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
index a6a1c9adefdf..a8d5ee77ed05 100644
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
@@ -28,6 +28,8 @@ describe('time menu', () => {
   it('matches snapshot when menu is opened for column not inside group by', () => {
     const timeMenu = (
       <TimeMenuItems
+        table={'table'}
+        schema={'schema'}
         columnName={'__time'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
@@ -41,6 +43,8 @@ describe('time menu', () => {
   it('matches snapshot when menu is opened for column inside group by', () => {
     const timeMenu = (
       <TimeMenuItems
+        table={'table'}
+        schema={'schema'}
         columnName={'__time'}
         parsedQuery={parser(`SELECT __time, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
index 310fea8a49f6..c2467bbb9557 100644
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
@@ -91,6 +91,8 @@ function nextYear(dt: Date): Date {
 }
 
 export interface TimeMenuItemsProps {
+  schema: string;
+  table: string;
   columnName: string;
   parsedQuery: SqlQuery;
   onQueryChange: (queryString: SqlQuery, run?: boolean) => void;
@@ -408,6 +410,62 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
     );
   }
 
+  function renderJoinMenu(): JSX.Element | undefined {
+    const { parsedQuery, schema, table, onQueryChange } = props;
+    if (parsedQuery && schema !== 'lookup') return;
+    return (
+      <>
+        <MenuItem
+          icon={IconNames.LEFT_JOIN}
+          text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
+        >
+          <MenuItem
+            text={'Left Join'}
+            onClick={() =>
+              onQueryChange(
+                parsedQuery.addJoin(
+                  'LEFT',
+                  SqlRef.fromName(table, schema),
+                  SqlMulti.sqlMultiFactory('=', [
+                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                  ]),
+                ),
+                false,
+              )
+            }
+          />
+          <MenuItem
+            text={'Inner Join'}
+            onClick={() =>
+              onQueryChange(
+                parsedQuery.addJoin(
+                  'INNER',
+                  SqlRef.fromName(table, schema),
+                  SqlMulti.sqlMultiFactory('=', [
+                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                  ]),
+                ),
+                false,
+              )
+            }
+          />
+        </MenuItem>
+        {parsedQuery.onExpression instanceof SqlMulti &&
+          parsedQuery.onExpression.containsColumn(table) && (
+            <MenuItem
+              icon={IconNames.CROSS}
+              text="Remove Join"
+              onClick={() => {
+                onQueryChange(parsedQuery.removeJoin(), true);
+              }}
+            />
+          )}
+      </>
+    );
+  }
+
   return (
     <>
       {renderFilterMenu()}
@@ -415,6 +473,7 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
       {renderGroupByMenu()}
       {renderRemoveGroupBy()}
       {renderAggregateMenu()}
+      {renderJoinMenu()}
     </>
   );
 });
diff --git a/web-console/src/views/query-view/column-tree/column-tree.tsx b/web-console/src/views/query-view/column-tree/column-tree.tsx
index fd98ccf3dbdc..5b2a92a47ac5 100644
--- a/web-console/src/views/query-view/column-tree/column-tree.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree.tsx
@@ -27,7 +27,7 @@ import {
   Tree,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery } from 'druid-query-toolkit';
+import { SqlMulti, SqlQuery, SqlRef } from 'druid-query-toolkit';
 import React, { ChangeEvent } from 'react';
 
 import { Loader } from '../../../components';
@@ -179,6 +179,57 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                 copyAndAlert(table, `${table} query copied to clipboard`);
                               }}
                             />
+                            {parsedQuery && schema === 'lookup' && (
+                              <MenuItem
+                                icon={IconNames.LEFT_JOIN}
+                                text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
+                              >
+                                <MenuItem
+                                  text={'Left Join'}
+                                  onClick={() =>
+                                    props.onQueryStringChange(
+                                      parsedQuery.addJoin(
+                                        'LEFT',
+                                        SqlRef.fromName(table, schema),
+                                        SqlMulti.sqlMultiFactory('=', [
+                                          SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                                          SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                                        ]),
+                                      ),
+                                      false,
+                                    )
+                                  }
+                                />
+                                <MenuItem
+                                  text={'Inner Join'}
+                                  onClick={() =>
+                                    props.onQueryStringChange(
+                                      parsedQuery.addJoin(
+                                        'INNER',
+                                        SqlRef.fromName(table, schema),
+                                        SqlMulti.sqlMultiFactory('=', [
+                                          SqlRef.fromName(SqlRef.fromName('v', table), schema),
+                                          SqlRef.fromName('XXX', parsedQuery.getTableName()),
+                                        ]),
+                                      ),
+                                      false,
+                                    )
+                                  }
+                                />
+                              </MenuItem>
+                            )}
+                            {parsedQuery &&
+                              schema === 'lookup' &&
+                              parsedQuery.onExpression instanceof SqlMulti &&
+                              parsedQuery.onExpression.containsColumn(table) && (
+                                <MenuItem
+                                  icon={IconNames.CROSS}
+                                  text="Remove Join"
+                                  onClick={() => {
+                                    props.onQueryStringChange(parsedQuery.removeJoin(), true);
+                                  }}
+                                />
+                              )}
                             {parsedQuery && (
                               <MenuItem
                                 icon={IconNames.EXCHANGE}
@@ -234,6 +285,8 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                     (columnData.DATA_TYPE === 'BIGINT' ||
                                       columnData.DATA_TYPE === 'FLOAT') && (
                                       <NumberMenuItems
+                                        schema={schema}
+                                        table={table}
                                         columnName={columnData.COLUMN_NAME}
                                         parsedQuery={parsedQuery}
                                         onQueryChange={props.onQueryStringChange}
@@ -241,6 +294,8 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                     )}
                                   {parsedQuery && columnData.DATA_TYPE === 'VARCHAR' && (
                                     <StringMenuItems
+                                      schema={schema}
+                                      table={table}
                                       columnName={columnData.COLUMN_NAME}
                                       parsedQuery={parsedQuery}
                                       onQueryChange={props.onQueryStringChange}
@@ -248,6 +303,8 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                   )}
                                   {parsedQuery && columnData.DATA_TYPE === 'TIMESTAMP' && (
                                     <TimeMenuItems
+                                      schema={schema}
+                                      table={table}
                                       columnName={columnData.COLUMN_NAME}
                                       parsedQuery={parsedQuery}
                                       onQueryChange={props.onQueryStringChange}

From 1ac504dc92aefaf2f6956ff4ce22874ff65b9e2f Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Mon, 6 Apr 2020 16:28:17 -0600
Subject: [PATCH 06/13] remove changes to query-view

---
 .../__snapshots__/query-view.spec.tsx.snap    |  0
 .../__snapshots__/column-tree.spec.tsx.snap   |  0
 .../column-tree/column-tree-menu/index.ts     |  0
 .../number-menu-items.spec.tsx.snap           |  0
 .../number-menu-items.spec.tsx                |  4 --
 .../number-menu-items/number-menu-items.tsx   | 68 +------------------
 .../string-menu-items.spec.tsx.snap           |  0
 .../string-menu-items.spec.tsx                |  4 --
 .../string-menu-items/string-menu-items.tsx   | 59 ----------------
 .../time-menu-items.spec.tsx.snap             |  0
 .../time-menu-items/time-menu-items.spec.tsx  |  4 --
 .../time-menu-items/time-menu-items.tsx       | 59 ----------------
 .../query-view/column-tree/column-tree.scss   |  0
 .../column-tree/column-tree.spec.tsx          |  0
 .../query-view/column-tree/column-tree.tsx    | 59 +---------------
 .../query-extra-info.spec.tsx.snap            |  0
 .../query-extra-info/query-extra-info.scss    |  0
 .../query-extra-info.spec.tsx                 |  0
 .../query-extra-info/query-extra-info.tsx     |  0
 .../__snapshots__/query-input.spec.tsx.snap   |  0
 .../query-view/query-input/query-input.scss   |  0
 .../query-input/query-input.spec.tsx          |  0
 .../query-view/query-input/query-input.tsx    |  0
 .../__snapshots__/query-output.spec.tsx.snap  |  0
 .../query-view/query-output/query-output.scss |  0
 .../query-output/query-output.spec.tsx        |  0
 .../query-view/query-output/query-output.tsx  |  0
 .../src/views/query-view/query-view.scss      |  0
 .../src/views/query-view/query-view.spec.tsx  |  0
 .../src/views/query-view/query-view.tsx       |  0
 .../__snapshots__/run-button.spec.tsx.snap    |  0
 .../query-view/run-button/run-button.spec.tsx |  0
 .../query-view/run-button/run-button.tsx      |  0
 33 files changed, 2 insertions(+), 255 deletions(-)
 mode change 100644 => 100755 web-console/src/views/query-view/__snapshots__/query-view.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/__snapshots__/column-tree.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/index.ts
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/__snapshots__/number-menu-items.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/__snapshots__/string-menu-items.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/__snapshots__/time-menu-items.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree.scss
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/column-tree/column-tree.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-extra-info/__snapshots__/query-extra-info.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/query-extra-info/query-extra-info.scss
 mode change 100644 => 100755 web-console/src/views/query-view/query-extra-info/query-extra-info.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-extra-info/query-extra-info.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-input/__snapshots__/query-input.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/query-input/query-input.scss
 mode change 100644 => 100755 web-console/src/views/query-view/query-input/query-input.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-input/query-input.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-output/__snapshots__/query-output.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/query-output/query-output.scss
 mode change 100644 => 100755 web-console/src/views/query-view/query-output/query-output.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-output/query-output.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-view.scss
 mode change 100644 => 100755 web-console/src/views/query-view/query-view.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/query-view.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/run-button/__snapshots__/run-button.spec.tsx.snap
 mode change 100644 => 100755 web-console/src/views/query-view/run-button/run-button.spec.tsx
 mode change 100644 => 100755 web-console/src/views/query-view/run-button/run-button.tsx

diff --git a/web-console/src/views/query-view/__snapshots__/query-view.spec.tsx.snap b/web-console/src/views/query-view/__snapshots__/query-view.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/__snapshots__/column-tree.spec.tsx.snap b/web-console/src/views/query-view/column-tree/__snapshots__/column-tree.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/index.ts b/web-console/src/views/query-view/column-tree/column-tree-menu/index.ts
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/__snapshots__/number-menu-items.spec.tsx.snap b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/__snapshots__/number-menu-items.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
old mode 100644
new mode 100755
index 52ec0268e55c..3ca046e6d6fa
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
@@ -28,8 +28,6 @@ describe('number menu', () => {
   it('matches snapshot when menu is opened for column not inside group by', () => {
     const numberMenu = (
       <NumberMenuItems
-        table={'table'}
-        schema={'schema'}
         columnName={'added'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
@@ -43,8 +41,6 @@ describe('number menu', () => {
   it('matches snapshot when menu is opened for column inside group by', () => {
     const numberMenu = (
       <NumberMenuItems
-        table={'table'}
-        schema={'schema'}
         columnName={'added'}
         parsedQuery={parser(`SELECT added, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
old mode 100644
new mode 100755
index 082bc136a800..db5485363d22
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
@@ -18,19 +18,10 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import {
-  SqlAliasRef,
-  SqlFunction,
-  SqlLiteral,
-  SqlMulti,
-  SqlQuery,
-  SqlRef,
-} from 'druid-query-toolkit';
+import { SqlAliasRef, SqlFunction, SqlLiteral, SqlQuery, SqlRef } from 'druid-query-toolkit';
 import React from 'react';
 
 export interface NumberMenuItemsProps {
-  schema: string;
-  table: string;
   columnName: string;
   parsedQuery: SqlQuery;
   onQueryChange: (queryString: SqlQuery, run?: boolean) => void;
@@ -184,62 +175,6 @@ export const NumberMenuItems = React.memo(function NumberMenuItems(props: Number
     );
   }
 
-  function renderJoinMenu(): JSX.Element | undefined {
-    const { parsedQuery, schema, table, onQueryChange } = props;
-    if (parsedQuery && schema !== 'lookup') return;
-    return (
-      <>
-        <MenuItem
-          icon={IconNames.LEFT_JOIN}
-          text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
-        >
-          <MenuItem
-            text={'Left Join'}
-            onClick={() =>
-              onQueryChange(
-                parsedQuery.addJoin(
-                  'LEFT',
-                  SqlRef.fromName(table, schema),
-                  SqlMulti.sqlMultiFactory('=', [
-                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                  ]),
-                ),
-                false,
-              )
-            }
-          />
-          <MenuItem
-            text={'Inner Join'}
-            onClick={() =>
-              onQueryChange(
-                parsedQuery.addJoin(
-                  'INNER',
-                  SqlRef.fromName(table, schema),
-                  SqlMulti.sqlMultiFactory('=', [
-                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                  ]),
-                ),
-                false,
-              )
-            }
-          />
-        </MenuItem>
-        {parsedQuery.onExpression instanceof SqlMulti &&
-          parsedQuery.onExpression.containsColumn(table) && (
-            <MenuItem
-              icon={IconNames.CROSS}
-              text="Remove Join"
-              onClick={() => {
-                onQueryChange(parsedQuery.removeJoin(), true);
-              }}
-            />
-          )}
-      </>
-    );
-  }
-
   return (
     <>
       {renderFilterMenu()}
@@ -247,7 +182,6 @@ export const NumberMenuItems = React.memo(function NumberMenuItems(props: Number
       {renderGroupByMenu()}
       {renderRemoveGroupBy()}
       {renderAggregateMenu()}
-      {renderJoinMenu()}
     </>
   );
 });
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/__snapshots__/string-menu-items.spec.tsx.snap b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/__snapshots__/string-menu-items.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
old mode 100644
new mode 100755
index 3f3c54fc318b..e952810b3a42
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
@@ -28,8 +28,6 @@ describe('string menu', () => {
   it('matches snapshot when menu is opened for column not inside group by', () => {
     const stringMenu = (
       <StringMenuItems
-        table={'table'}
-        schema={'schema'}
         columnName={'cityName'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
@@ -43,8 +41,6 @@ describe('string menu', () => {
   it('matches snapshot when menu is opened for column inside group by', () => {
     const stringMenu = (
       <StringMenuItems
-        table={'table'}
-        schema={'schema'}
         columnName={'channel'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
old mode 100644
new mode 100755
index dd862ca1b552..25b823333a53
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
@@ -29,8 +29,6 @@ import {
 import React from 'react';
 
 export interface StringMenuItemsProps {
-  schema: string;
-  table: string;
   columnName: string;
   parsedQuery: SqlQuery;
   onQueryChange: (queryString: SqlQuery, run?: boolean) => void;
@@ -165,62 +163,6 @@ export const StringMenuItems = React.memo(function StringMenuItems(props: String
     );
   }
 
-  function renderJoinMenu(): JSX.Element | undefined {
-    const { parsedQuery, schema, table, onQueryChange } = props;
-    if (parsedQuery && schema !== 'lookup') return;
-    return (
-      <>
-        <MenuItem
-          icon={IconNames.LEFT_JOIN}
-          text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
-        >
-          <MenuItem
-            text={'Left Join'}
-            onClick={() =>
-              onQueryChange(
-                parsedQuery.addJoin(
-                  'LEFT',
-                  SqlRef.fromName(table, schema),
-                  SqlMulti.sqlMultiFactory('=', [
-                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                  ]),
-                ),
-                false,
-              )
-            }
-          />
-          <MenuItem
-            text={'Inner Join'}
-            onClick={() =>
-              onQueryChange(
-                parsedQuery.addJoin(
-                  'INNER',
-                  SqlRef.fromName(table, schema),
-                  SqlMulti.sqlMultiFactory('=', [
-                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                  ]),
-                ),
-                false,
-              )
-            }
-          />
-        </MenuItem>
-        {parsedQuery.onExpression instanceof SqlMulti &&
-          parsedQuery.onExpression.containsColumn(table) && (
-            <MenuItem
-              icon={IconNames.CROSS}
-              text="Remove Join"
-              onClick={() => {
-                onQueryChange(parsedQuery.removeJoin(), true);
-              }}
-            />
-          )}
-      </>
-    );
-  }
-
   return (
     <>
       {renderFilterMenu()}
@@ -228,7 +170,6 @@ export const StringMenuItems = React.memo(function StringMenuItems(props: String
       {renderGroupByMenu()}
       {renderRemoveGroupBy()}
       {renderAggregateMenu()}
-      {renderJoinMenu()}
     </>
   );
 });
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/__snapshots__/time-menu-items.spec.tsx.snap b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/__snapshots__/time-menu-items.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
old mode 100644
new mode 100755
index a8d5ee77ed05..a6a1c9adefdf
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
@@ -28,8 +28,6 @@ describe('time menu', () => {
   it('matches snapshot when menu is opened for column not inside group by', () => {
     const timeMenu = (
       <TimeMenuItems
-        table={'table'}
-        schema={'schema'}
         columnName={'__time'}
         parsedQuery={parser(`SELECT channel, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
@@ -43,8 +41,6 @@ describe('time menu', () => {
   it('matches snapshot when menu is opened for column inside group by', () => {
     const timeMenu = (
       <TimeMenuItems
-        table={'table'}
-        schema={'schema'}
         columnName={'__time'}
         parsedQuery={parser(`SELECT __time, count(*) as cnt FROM wikipedia GROUP BY 1`)}
         onQueryChange={() => {}}
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
old mode 100644
new mode 100755
index c2467bbb9557..310fea8a49f6
--- a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
@@ -91,8 +91,6 @@ function nextYear(dt: Date): Date {
 }
 
 export interface TimeMenuItemsProps {
-  schema: string;
-  table: string;
   columnName: string;
   parsedQuery: SqlQuery;
   onQueryChange: (queryString: SqlQuery, run?: boolean) => void;
@@ -410,62 +408,6 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
     );
   }
 
-  function renderJoinMenu(): JSX.Element | undefined {
-    const { parsedQuery, schema, table, onQueryChange } = props;
-    if (parsedQuery && schema !== 'lookup') return;
-    return (
-      <>
-        <MenuItem
-          icon={IconNames.LEFT_JOIN}
-          text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
-        >
-          <MenuItem
-            text={'Left Join'}
-            onClick={() =>
-              onQueryChange(
-                parsedQuery.addJoin(
-                  'LEFT',
-                  SqlRef.fromName(table, schema),
-                  SqlMulti.sqlMultiFactory('=', [
-                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                  ]),
-                ),
-                false,
-              )
-            }
-          />
-          <MenuItem
-            text={'Inner Join'}
-            onClick={() =>
-              onQueryChange(
-                parsedQuery.addJoin(
-                  'INNER',
-                  SqlRef.fromName(table, schema),
-                  SqlMulti.sqlMultiFactory('=', [
-                    SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                    SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                  ]),
-                ),
-                false,
-              )
-            }
-          />
-        </MenuItem>
-        {parsedQuery.onExpression instanceof SqlMulti &&
-          parsedQuery.onExpression.containsColumn(table) && (
-            <MenuItem
-              icon={IconNames.CROSS}
-              text="Remove Join"
-              onClick={() => {
-                onQueryChange(parsedQuery.removeJoin(), true);
-              }}
-            />
-          )}
-      </>
-    );
-  }
-
   return (
     <>
       {renderFilterMenu()}
@@ -473,7 +415,6 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
       {renderGroupByMenu()}
       {renderRemoveGroupBy()}
       {renderAggregateMenu()}
-      {renderJoinMenu()}
     </>
   );
 });
diff --git a/web-console/src/views/query-view/column-tree/column-tree.scss b/web-console/src/views/query-view/column-tree/column-tree.scss
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/column-tree.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree.spec.tsx
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/column-tree/column-tree.tsx b/web-console/src/views/query-view/column-tree/column-tree.tsx
old mode 100644
new mode 100755
index 5b2a92a47ac5..fd98ccf3dbdc
--- a/web-console/src/views/query-view/column-tree/column-tree.tsx
+++ b/web-console/src/views/query-view/column-tree/column-tree.tsx
@@ -27,7 +27,7 @@ import {
   Tree,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlMulti, SqlQuery, SqlRef } from 'druid-query-toolkit';
+import { SqlQuery } from 'druid-query-toolkit';
 import React, { ChangeEvent } from 'react';
 
 import { Loader } from '../../../components';
@@ -179,57 +179,6 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                 copyAndAlert(table, `${table} query copied to clipboard`);
                               }}
                             />
-                            {parsedQuery && schema === 'lookup' && (
-                              <MenuItem
-                                icon={IconNames.LEFT_JOIN}
-                                text={parsedQuery.onExpression ? 'Replace Join' : `Join: ${table}`}
-                              >
-                                <MenuItem
-                                  text={'Left Join'}
-                                  onClick={() =>
-                                    props.onQueryStringChange(
-                                      parsedQuery.addJoin(
-                                        'LEFT',
-                                        SqlRef.fromName(table, schema),
-                                        SqlMulti.sqlMultiFactory('=', [
-                                          SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                                          SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                                        ]),
-                                      ),
-                                      false,
-                                    )
-                                  }
-                                />
-                                <MenuItem
-                                  text={'Inner Join'}
-                                  onClick={() =>
-                                    props.onQueryStringChange(
-                                      parsedQuery.addJoin(
-                                        'INNER',
-                                        SqlRef.fromName(table, schema),
-                                        SqlMulti.sqlMultiFactory('=', [
-                                          SqlRef.fromName(SqlRef.fromName('v', table), schema),
-                                          SqlRef.fromName('XXX', parsedQuery.getTableName()),
-                                        ]),
-                                      ),
-                                      false,
-                                    )
-                                  }
-                                />
-                              </MenuItem>
-                            )}
-                            {parsedQuery &&
-                              schema === 'lookup' &&
-                              parsedQuery.onExpression instanceof SqlMulti &&
-                              parsedQuery.onExpression.containsColumn(table) && (
-                                <MenuItem
-                                  icon={IconNames.CROSS}
-                                  text="Remove Join"
-                                  onClick={() => {
-                                    props.onQueryStringChange(parsedQuery.removeJoin(), true);
-                                  }}
-                                />
-                              )}
                             {parsedQuery && (
                               <MenuItem
                                 icon={IconNames.EXCHANGE}
@@ -285,8 +234,6 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                     (columnData.DATA_TYPE === 'BIGINT' ||
                                       columnData.DATA_TYPE === 'FLOAT') && (
                                       <NumberMenuItems
-                                        schema={schema}
-                                        table={table}
                                         columnName={columnData.COLUMN_NAME}
                                         parsedQuery={parsedQuery}
                                         onQueryChange={props.onQueryStringChange}
@@ -294,8 +241,6 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                     )}
                                   {parsedQuery && columnData.DATA_TYPE === 'VARCHAR' && (
                                     <StringMenuItems
-                                      schema={schema}
-                                      table={table}
                                       columnName={columnData.COLUMN_NAME}
                                       parsedQuery={parsedQuery}
                                       onQueryChange={props.onQueryStringChange}
@@ -303,8 +248,6 @@ export class ColumnTree extends React.PureComponent<ColumnTreeProps, ColumnTreeS
                                   )}
                                   {parsedQuery && columnData.DATA_TYPE === 'TIMESTAMP' && (
                                     <TimeMenuItems
-                                      schema={schema}
-                                      table={table}
                                       columnName={columnData.COLUMN_NAME}
                                       parsedQuery={parsedQuery}
                                       onQueryChange={props.onQueryStringChange}
diff --git a/web-console/src/views/query-view/query-extra-info/__snapshots__/query-extra-info.spec.tsx.snap b/web-console/src/views/query-view/query-extra-info/__snapshots__/query-extra-info.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-extra-info/query-extra-info.scss b/web-console/src/views/query-view/query-extra-info/query-extra-info.scss
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-extra-info/query-extra-info.spec.tsx b/web-console/src/views/query-view/query-extra-info/query-extra-info.spec.tsx
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-extra-info/query-extra-info.tsx b/web-console/src/views/query-view/query-extra-info/query-extra-info.tsx
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-input/query-input.scss b/web-console/src/views/query-view/query-input/query-input.scss
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-input/query-input.spec.tsx b/web-console/src/views/query-view/query-input/query-input.spec.tsx
old mode 100644
new mode 100755
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
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-output/__snapshots__/query-output.spec.tsx.snap b/web-console/src/views/query-view/query-output/__snapshots__/query-output.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-output/query-output.scss b/web-console/src/views/query-view/query-output/query-output.scss
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-output/query-output.spec.tsx b/web-console/src/views/query-view/query-output/query-output.spec.tsx
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-output/query-output.tsx b/web-console/src/views/query-view/query-output/query-output.tsx
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-view.scss b/web-console/src/views/query-view/query-view.scss
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-view.spec.tsx b/web-console/src/views/query-view/query-view.spec.tsx
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/query-view.tsx b/web-console/src/views/query-view/query-view.tsx
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/run-button/__snapshots__/run-button.spec.tsx.snap b/web-console/src/views/query-view/run-button/__snapshots__/run-button.spec.tsx.snap
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/run-button/run-button.spec.tsx b/web-console/src/views/query-view/run-button/run-button.spec.tsx
old mode 100644
new mode 100755
diff --git a/web-console/src/views/query-view/run-button/run-button.tsx b/web-console/src/views/query-view/run-button/run-button.tsx
old mode 100644
new mode 100755

From 7473a61f5fce10e64c80266ca7d4800af6c64b88 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Tue, 7 Apr 2020 14:52:02 -0600
Subject: [PATCH 07/13] fix permissions

---
 .../src/views/query-view/__snapshots__/query-view.spec.tsx.snap   | 0
 .../column-tree/__snapshots__/column-tree.spec.tsx.snap           | 0
 .../src/views/query-view/column-tree/column-tree-menu/index.ts    | 0
 .../__snapshots__/number-menu-items.spec.tsx.snap                 | 0
 .../column-tree-menu/number-menu-items/number-menu-items.spec.tsx | 0
 .../column-tree-menu/number-menu-items/number-menu-items.tsx      | 0
 .../__snapshots__/string-menu-items.spec.tsx.snap                 | 0
 .../column-tree-menu/string-menu-items/string-menu-items.spec.tsx | 0
 .../column-tree-menu/string-menu-items/string-menu-items.tsx      | 0
 .../time-menu-items/__snapshots__/time-menu-items.spec.tsx.snap   | 0
 .../column-tree-menu/time-menu-items/time-menu-items.spec.tsx     | 0
 .../column-tree-menu/time-menu-items/time-menu-items.tsx          | 0
 web-console/src/views/query-view/column-tree/column-tree.scss     | 0
 web-console/src/views/query-view/column-tree/column-tree.spec.tsx | 0
 web-console/src/views/query-view/column-tree/column-tree.tsx      | 0
 .../query-extra-info/__snapshots__/query-extra-info.spec.tsx.snap | 0
 .../src/views/query-view/query-extra-info/query-extra-info.scss   | 0
 .../views/query-view/query-extra-info/query-extra-info.spec.tsx   | 0
 .../src/views/query-view/query-extra-info/query-extra-info.tsx    | 0
 .../query-input/__snapshots__/query-input.spec.tsx.snap           | 0
 web-console/src/views/query-view/query-input/query-input.scss     | 0
 web-console/src/views/query-view/query-input/query-input.spec.tsx | 0
 web-console/src/views/query-view/query-input/query-input.tsx      | 0
 .../query-output/__snapshots__/query-output.spec.tsx.snap         | 0
 web-console/src/views/query-view/query-output/query-output.scss   | 0
 .../src/views/query-view/query-output/query-output.spec.tsx       | 0
 web-console/src/views/query-view/query-output/query-output.tsx    | 0
 web-console/src/views/query-view/query-view.scss                  | 0
 web-console/src/views/query-view/query-view.spec.tsx              | 0
 web-console/src/views/query-view/query-view.tsx                   | 0
 .../query-view/run-button/__snapshots__/run-button.spec.tsx.snap  | 0
 web-console/src/views/query-view/run-button/run-button.spec.tsx   | 0
 web-console/src/views/query-view/run-button/run-button.tsx        | 0
 33 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 web-console/src/views/query-view/__snapshots__/query-view.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/__snapshots__/column-tree.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/index.ts
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/__snapshots__/number-menu-items.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/__snapshots__/string-menu-items.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/__snapshots__/time-menu-items.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree.scss
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/column-tree/column-tree.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-extra-info/__snapshots__/query-extra-info.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/query-extra-info/query-extra-info.scss
 mode change 100755 => 100644 web-console/src/views/query-view/query-extra-info/query-extra-info.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-extra-info/query-extra-info.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-input/__snapshots__/query-input.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/query-input/query-input.scss
 mode change 100755 => 100644 web-console/src/views/query-view/query-input/query-input.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-input/query-input.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-output/__snapshots__/query-output.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/query-output/query-output.scss
 mode change 100755 => 100644 web-console/src/views/query-view/query-output/query-output.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-output/query-output.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-view.scss
 mode change 100755 => 100644 web-console/src/views/query-view/query-view.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/query-view.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/run-button/__snapshots__/run-button.spec.tsx.snap
 mode change 100755 => 100644 web-console/src/views/query-view/run-button/run-button.spec.tsx
 mode change 100755 => 100644 web-console/src/views/query-view/run-button/run-button.tsx

diff --git a/web-console/src/views/query-view/__snapshots__/query-view.spec.tsx.snap b/web-console/src/views/query-view/__snapshots__/query-view.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/__snapshots__/column-tree.spec.tsx.snap b/web-console/src/views/query-view/column-tree/__snapshots__/column-tree.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/index.ts b/web-console/src/views/query-view/column-tree/column-tree-menu/index.ts
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/__snapshots__/number-menu-items.spec.tsx.snap b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/__snapshots__/number-menu-items.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/__snapshots__/string-menu-items.spec.tsx.snap b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/__snapshots__/string-menu-items.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/__snapshots__/time-menu-items.spec.tsx.snap b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/__snapshots__/time-menu-items.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx b/web-console/src/views/query-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree.scss b/web-console/src/views/query-view/column-tree/column-tree.scss
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree.spec.tsx b/web-console/src/views/query-view/column-tree/column-tree.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/column-tree/column-tree.tsx b/web-console/src/views/query-view/column-tree/column-tree.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-extra-info/__snapshots__/query-extra-info.spec.tsx.snap b/web-console/src/views/query-view/query-extra-info/__snapshots__/query-extra-info.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-extra-info/query-extra-info.scss b/web-console/src/views/query-view/query-extra-info/query-extra-info.scss
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-extra-info/query-extra-info.spec.tsx b/web-console/src/views/query-view/query-extra-info/query-extra-info.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-extra-info/query-extra-info.tsx b/web-console/src/views/query-view/query-extra-info/query-extra-info.tsx
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-input/query-input.scss b/web-console/src/views/query-view/query-input/query-input.scss
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-input/query-input.spec.tsx b/web-console/src/views/query-view/query-input/query-input.spec.tsx
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-output/__snapshots__/query-output.spec.tsx.snap b/web-console/src/views/query-view/query-output/__snapshots__/query-output.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-output/query-output.scss b/web-console/src/views/query-view/query-output/query-output.scss
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-output/query-output.spec.tsx b/web-console/src/views/query-view/query-output/query-output.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-output/query-output.tsx b/web-console/src/views/query-view/query-output/query-output.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-view.scss b/web-console/src/views/query-view/query-view.scss
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-view.spec.tsx b/web-console/src/views/query-view/query-view.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/query-view.tsx b/web-console/src/views/query-view/query-view.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/run-button/__snapshots__/run-button.spec.tsx.snap b/web-console/src/views/query-view/run-button/__snapshots__/run-button.spec.tsx.snap
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/run-button/run-button.spec.tsx b/web-console/src/views/query-view/run-button/run-button.spec.tsx
old mode 100755
new mode 100644
diff --git a/web-console/src/views/query-view/run-button/run-button.tsx b/web-console/src/views/query-view/run-button/run-button.tsx
old mode 100755
new mode 100644

From 511fe04fd37da2797a407612a2e53ac290c693b6 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Tue, 7 Apr 2020 17:21:22 -0600
Subject: [PATCH 08/13] add test, fix info

---
 .../lookup-edit-dialog.spec.tsx               | 432 ++++++++++-
 .../lookup-edit-dialog/lookup-edit-dialog.tsx | 715 ++++++++++--------
 2 files changed, 817 insertions(+), 330 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
index 3d6438e86648..6a2028109fac 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.spec.tsx
@@ -19,7 +19,7 @@
 import { render } from '@testing-library/react';
 import React from 'react';
 
-import { LookupEditDialog } from './lookup-edit-dialog';
+import { isDisabled, LookupEditDialog } from './lookup-edit-dialog';
 
 describe('lookup edit dialog', () => {
   it('matches snapshot', () => {
@@ -41,3 +41,433 @@ describe('lookup edit dialog', () => {
     expect(document.body.lastChild).toMatchSnapshot();
   });
 });
+
+describe('Type Map Should be disabled', () => {
+  it('Missing LookupName', () => {
+    expect(isDisabled(undefined, 'v1', '__default', { type: '' })).toBe(true);
+  });
+
+  it('Empty version', () => {
+    expect(isDisabled('lookup', '', '__default', { type: '' })).toBe(true);
+  });
+
+  it('Missing version', () => {
+    expect(isDisabled('lookup', undefined, '__default', { type: '' })).toBe(true);
+  });
+
+  it('Empty tier', () => {
+    expect(isDisabled('lookup', 'v1', '', { type: '' })).toBe(true);
+  });
+
+  it('Missing tier', () => {
+    expect(isDisabled('lookup', 'v1', undefined, { type: '' })).toBe(true);
+  });
+
+  it('Missing spec', () => {
+    expect(isDisabled('lookup', 'v1', '__default', {})).toBe(true);
+  });
+
+  it('Type undefined', () => {
+    expect(isDisabled('lookup', 'v1', '__default', { type: undefined })).toBe(true);
+  });
+
+  it('Lookup of type map with no map', () => {
+    expect(isDisabled('lookup', 'v1', '__default', { type: 'map' })).toBe(true);
+  });
+
+  it('Lookup of type cachedNamespace with no extractionNamespace', () => {
+    expect(isDisabled('lookup', 'v1', '__default', { type: 'cachedNamespace' })).toBe(true);
+  });
+
+  it('Lookup of type cachedNamespace with extractionNamespace type uri, format csv, no namespaceParseSpec', () => {
+    expect(
+      isDisabled('lookup', 'v1', '__default', {
+        type: 'cachedNamespace',
+        extractionNamespace: {
+          type: 'uri',
+          uriPrefix: 's3://bucket/some/key/prefix/',
+          fileRegex: 'renames-[0-9]*\\.gz',
+          pollPeriod: 'PT5M',
+        },
+      }),
+    ).toBe(true);
+  });
+
+  it('Lookup of type cachedNamespace with extractionNamespace type uri, format csv, no columns and skipHeaderRows', () => {
+    expect(
+      isDisabled('lookup', 'v1', '__default', {
+        type: 'cachedNamespace',
+        extractionNamespace: {
+          type: 'uri',
+          uriPrefix: 's3://bucket/some/key/prefix/',
+          fileRegex: 'renames-[0-9]*\\.gz',
+          namespaceParseSpec: {
+            format: 'csv',
+          },
+          pollPeriod: 'PT5M',
+        },
+      }),
+    ).toBe(true);
+  });
+
+  it('Lookup of type cachedNamespace with extractionNamespace type uri, format tsv, no columns', () => {
+    expect(
+      isDisabled('lookup', 'v1', '__default', {
+        type: 'cachedNamespace',
+        extractionNamespace: {
+          type: 'uri',
+          uriPrefix: 's3://bucket/some/key/prefix/',
+          fileRegex: 'renames-[0-9]*\\.gz',
+          namespaceParseSpec: {
+            format: 'tsv',
+            skipHeaderRows: 0,
+          },
+          pollPeriod: 'PT5M',
+        },
+      }),
+    ).toBe(true);
+  });
+
+  it('Lookup of type cachedNamespace with extractionNamespace type customJson, format tsv, no keyFieldName', () => {
+    expect(
+      isDisabled('lookup', 'v1', '__default', {
+        type: 'cachedNamespace',
+        extractionNamespace: {
+          type: 'uri',
+          uriPrefix: 's3://bucket/some/key/prefix/',
+          fileRegex: 'renames-[0-9]*\\.gz',
+          namespaceParseSpec: {
+            format: 'customJson',
+            valueFieldName: 'value',
+          },
+          pollPeriod: 'PT5M',
+        },
+      }),
+    ).toBe(true);
+  });
+
+  it('Lookup of type cachedNamespace with extractionNamespace type customJson, format customJson, no valueFieldName', () => {
+    expect(
+      isDisabled('lookup', 'v1', '__default', {
+        type: 'cachedNamespace',
+        extractionNamespace: {
+          type: 'uri',
+          uriPrefix: 's3://bucket/some/key/prefix/',
+          fileRegex: 'renames-[0-9]*\\.gz',
+          namespaceParseSpec: {
+            format: 'customJson',
+            keyFieldName: 'key',
+          },
+          pollPeriod: 'PT5M',
+        },
+      }),
+    ).toBe(true);
+  });
+});
+
+describe('Type cachedNamespace should be disabled', () => {
+  it('No extractionNamespace', () => {
+    expect(isDisabled('lookup', 'v1', '__default', { type: 'cachedNamespace' })).toBe(true);
+  });
+
+  describe('ExtractionNamespace type URI', () => {
+    it('Format csv, no namespaceParseSpec', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            pollPeriod: 'PT5M',
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('Format csv, no columns and skipHeaderRows', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'csv',
+            },
+            pollPeriod: 'PT5M',
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('Format tsv, no columns', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'tsv',
+              skipHeaderRows: 0,
+            },
+            pollPeriod: 'PT5M',
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('Format tsv, no keyFieldName', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'customJson',
+              valueFieldName: 'value',
+            },
+            pollPeriod: 'PT5M',
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('Format customJson, no valueFieldName', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'customJson',
+              keyFieldName: 'key',
+            },
+            pollPeriod: 'PT5M',
+          },
+        }),
+      ).toBe(true);
+    });
+  });
+
+  describe('ExtractionNamespace type JDBC', () => {
+    it('No namespace', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'jdbc',
+            namespace: undefined,
+            connectorConfig: {
+              createTables: true,
+              connectURI: 'jdbc:mysql://localhost:3306/druid',
+              user: 'druid',
+              password: 'diurd',
+            },
+            table: 'some_lookup_table',
+            keyColumn: 'the_old_dim_value',
+            valueColumn: 'the_new_dim_value',
+            tsColumn: 'timestamp_column',
+            pollPeriod: 600000,
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('No connectorConfig', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'jdbc',
+            namespace: 'some_lookup',
+            connectorConfig: undefined,
+            table: 'some_lookup_table',
+            keyColumn: 'the_old_dim_value',
+            valueColumn: 'the_new_dim_value',
+            tsColumn: 'timestamp_column',
+            pollPeriod: 600000,
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('No table', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'jdbc',
+            namespace: 'some_lookup',
+            connectorConfig: {
+              createTables: true,
+              connectURI: 'jdbc:mysql://localhost:3306/druid',
+              user: 'druid',
+              password: 'diurd',
+            },
+            table: undefined,
+            keyColumn: 'the_old_dim_value',
+            valueColumn: 'the_new_dim_value',
+            tsColumn: 'timestamp_column',
+            pollPeriod: 600000,
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('No keyColumn', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'jdbc',
+            namespace: 'some_lookup',
+            connectorConfig: {
+              createTables: true,
+              connectURI: 'jdbc:mysql://localhost:3306/druid',
+              user: 'druid',
+              password: 'diurd',
+            },
+            table: 'some_lookup_table',
+            keyColumn: undefined,
+            valueColumn: 'the_new_dim_value',
+            tsColumn: 'timestamp_column',
+            pollPeriod: 600000,
+          },
+        }),
+      ).toBe(true);
+    });
+
+    it('No keyColumn', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'jdbc',
+            namespace: 'some_lookup',
+            connectorConfig: {
+              createTables: true,
+              connectURI: 'jdbc:mysql://localhost:3306/druid',
+              user: 'druid',
+              password: 'diurd',
+            },
+            table: 'some_lookup_table',
+            keyColumn: 'the_old_dim_value',
+            valueColumn: undefined,
+            tsColumn: 'timestamp_column',
+            pollPeriod: 600000,
+          },
+        }),
+      ).toBe(true);
+    });
+  });
+});
+
+describe('Type Map Should be enabled', () => {
+  it('Has type and has Map', () => {
+    expect(isDisabled('lookup', 'v1', '__default', { type: 'map', map: { a: 'b' } })).toBe(false);
+  });
+});
+
+describe('Type cachedNamespace Should be enabled', () => {
+  describe('ExtractionNamespace type URI', () => {
+    it('Format csv with columns', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'csv',
+              columns: ['key', 'value'],
+            },
+          },
+        }),
+      ).toBe(false);
+    });
+
+    it('Format csv with skipHeaderRows', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'csv',
+              skipHeaderRows: 1,
+            },
+          },
+        }),
+      ).toBe(false);
+    });
+
+    it('Format tsv, only columns', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'tsv',
+              columns: ['key', 'value'],
+            },
+          },
+        }),
+      ).toBe(false);
+    });
+
+    it('Format tsv, keyFieldName and valueFieldName', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'uri',
+            uriPrefix: 's3://bucket/some/key/prefix/',
+            fileRegex: 'renames-[0-9]*\\.gz',
+            namespaceParseSpec: {
+              format: 'customJson',
+              valueFieldName: 'value',
+              keyFieldName: 'value',
+            },
+          },
+        }),
+      ).toBe(false);
+    });
+  });
+
+  describe('ExtractionNamespace type JDBC', () => {
+    it('No namespace', () => {
+      expect(
+        isDisabled('lookup', 'v1', '__default', {
+          type: 'cachedNamespace',
+          extractionNamespace: {
+            type: 'jdbc',
+            namespace: 'lookup',
+            connectorConfig: {
+              createTables: true,
+              connectURI: 'jdbc:mysql://localhost:3306/druid',
+              user: 'druid',
+              password: 'diurd',
+            },
+            table: 'some_lookup_table',
+            keyColumn: 'the_old_dim_value',
+            valueColumn: 'the_new_dim_value',
+          },
+        }),
+      ).toBe(false);
+    });
+  });
+});
diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index 25cd3a9a9910..4642af8af4b6 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -27,27 +27,29 @@ import {
 } from '@blueprintjs/core';
 import React from 'react';
 
-import { AutoForm } from '../../components';
-// import { validJson } from '../../utils';
+import { AutoForm, Field } from '../../components';
 
 import './lookup-edit-dialog.scss';
-// import AceEditor from 'react-ace';
-
-// import {SnitchDialog} from "..";
 
 export interface ExtractionNamespaceSpec {
   type?: string;
   uri?: string;
   uriPrefix?: string;
-  namespaceParseSpec: NamespaceParseSpec;
+  fileRegex?: string;
+  namespaceParseSpec?: NamespaceParseSpec;
   namespace?: string;
-  connectorConfig?: string;
+  connectorConfig?: {
+    createTables: boolean;
+    connectURI: string;
+    user: string;
+    password: string;
+  };
   table?: string;
   keyColumn?: string;
   valueColumn?: string;
   filter?: any;
   tsColumn?: string;
-  pollPeriod?: string;
+  pollPeriod?: number | string;
 }
 
 export interface NamespaceParseSpec {
@@ -64,7 +66,7 @@ export interface NamespaceParseSpec {
 }
 
 export interface LookupSpec {
-  type: string;
+  type?: string;
   map?: {};
   extractionNamespace?: ExtractionNamespaceSpec;
   firstCacheTimeout?: number;
@@ -82,6 +84,62 @@ export interface LookupEditDialogProps {
   allLookupTiers: string[];
 }
 
+export function isDisabled(
+  lookupName?: string,
+  lookupVersion?: string,
+  lookupTier?: string,
+  lookupSpec?: LookupSpec,
+) {
+  let disableSubmit =
+    !lookupName ||
+    !lookupVersion ||
+    !lookupTier ||
+    !lookupSpec ||
+    !lookupName ||
+    lookupName === '' ||
+    lookupVersion === '' ||
+    lookupTier === '' ||
+    lookupSpec.type === '' ||
+    lookupSpec.type === undefined ||
+    (lookupSpec.type === 'map' && lookupSpec.map === undefined) ||
+    (lookupSpec.type === 'cachedNamespace' && lookupSpec.extractionNamespace === undefined);
+
+  if (
+    !disableSubmit &&
+    lookupSpec &&
+    lookupSpec.type === 'cachedNamespace' &&
+    lookupSpec.extractionNamespace
+  ) {
+    switch (lookupSpec.extractionNamespace.type) {
+      case 'uri':
+        const namespaceParseSpec = lookupSpec.extractionNamespace.namespaceParseSpec;
+        disableSubmit = !namespaceParseSpec;
+        if (!namespaceParseSpec) break;
+        switch (namespaceParseSpec.format) {
+          case 'csv':
+            disableSubmit = !namespaceParseSpec.columns && !namespaceParseSpec.skipHeaderRows;
+            break;
+          case 'tsv':
+            disableSubmit = !namespaceParseSpec.columns;
+            break;
+          case 'customJson':
+            disableSubmit = !namespaceParseSpec.keyFieldName || !namespaceParseSpec.valueFieldName;
+            break;
+        }
+        break;
+      case 'jdbc':
+        const extractionNamespace = lookupSpec.extractionNamespace;
+        disableSubmit =
+          !extractionNamespace.namespace ||
+          !extractionNamespace.connectorConfig ||
+          !extractionNamespace.table ||
+          !extractionNamespace.keyColumn ||
+          !extractionNamespace.valueColumn;
+        break;
+    }
+  }
+  return disableSubmit;
+}
 export const LookupEditDialog = React.memo(function LookupEditDialog(props: LookupEditDialogProps) {
   const {
     onClose,
@@ -136,45 +194,324 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
     }
   }
 
-  let disableSubmit =
-    lookupName === '' ||
-    lookupVersion === '' ||
-    lookupTier === '' ||
-    lookupSpec.type === '' ||
-    lookupSpec.type === undefined ||
-    (lookupSpec.type === 'map' && lookupSpec.map === undefined) ||
-    (lookupSpec.type === 'cachedNamespace' && lookupSpec.extractionNamespace === undefined);
-
-  if (!disableSubmit && lookupSpec.type === 'cachedNamespace' && lookupSpec.extractionNamespace) {
-    const namespaceParseSpec = lookupSpec.extractionNamespace.namespaceParseSpec;
-
-    switch (lookupSpec.extractionNamespace.type) {
-      case 'uri':
-        disableSubmit = !lookupSpec.extractionNamespace.namespaceParseSpec;
-        if (!disableSubmit) break;
-        switch (namespaceParseSpec.format) {
-          case 'csv':
-            disableSubmit = !namespaceParseSpec.columns && !namespaceParseSpec.skipHeaderRows;
-            break;
-          case 'tsv':
-            disableSubmit = !namespaceParseSpec.columns;
-            break;
-          case 'customJson':
-            disableSubmit = !namespaceParseSpec.keyFieldName && !namespaceParseSpec.valueFieldName;
-            break;
+  const fields = [
+    {
+      name: 'type',
+      type: 'string',
+      suggestions: ['map', 'cachedNamespace'],
+      adjustment: (model: LookupSpec) => {
+        if (model.type === 'map' && model.extractionNamespace && model.extractionNamespace.type) {
+          return model;
         }
-        break;
-      case 'jdbc':
-        const extractionNamespace = lookupSpec.extractionNamespace;
-        disableSubmit =
-          !extractionNamespace.namespace ||
-          !extractionNamespace.connectorConfig ||
-          !extractionNamespace.table ||
-          !extractionNamespace.keyColumn ||
-          !extractionNamespace.valueColumn;
-        break;
-    }
-  }
+        model.extractionNamespace = { type: 'uri', namespaceParseSpec: { format: 'csv' } };
+        return model;
+      },
+    },
+    {
+      name: 'map',
+      type: 'json',
+      defined: (model: LookupSpec) => {
+        return model.type === 'map';
+      },
+    },
+    {
+      name: 'extractionNamespace.type',
+      type: 'string',
+      label: 'Globally cached lookup type',
+      placeholder: 'uri',
+      suggestions: ['uri', 'jdbc'],
+      defined: (model: LookupSpec) => model.type === 'cachedNamespace',
+    },
+    {
+      name: 'extractionNamespace.uriPrefix',
+      type: 'string',
+      label: 'URI prefix',
+      info:
+        'A URI which specifies a directory (or other searchable resource) in which to search for files',
+      placeholder: 's3://bucket/some/key/prefix/',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri',
+    },
+    {
+      name: 'extractionNamespace.fileRegex',
+      type: 'string',
+      label: 'File regex',
+      placeholder: 'renames-[0-9]*\\.gz',
+      info:
+        'Optional regex for matching the file name under uriPrefix. Only used if uriPrefix is used',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri',
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.format',
+      type: 'string',
+      label: 'Format',
+      defaultValue: 'csv',
+      suggestions: ['csv', 'tsv', 'customJson', 'simpleJson'],
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri',
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.columns',
+      type: 'string-array',
+      label: 'Columns',
+      placeholder: `["key", "value"]`,
+      info: 'The list of columns in the csv file',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+          model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.keyColumn',
+      type: 'string',
+      label: 'Key column',
+      placeholder: 'Key',
+      info: 'The name of the column containing the key',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+          model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.valueColumn',
+      type: 'string',
+      label: 'Value column',
+      placeholder: 'Value',
+      info: 'The name of the column containing the value',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+          model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.hasHeaderRow',
+      type: 'boolean',
+      label: 'Has header row',
+      defaultValue: false,
+      info: `A flag to indicate that column information can be extracted from the input files' header row`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+          model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.skipHeaderRows',
+      type: 'number',
+      label: 'Skip header rows',
+      placeholder: '0',
+      info: `Number of header rows to be skipped. The default number of header rows to be skipped is 0.`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
+          model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.delimiter',
+      type: 'string',
+      label: 'Delimiter',
+      placeholder: `\t`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        model.extractionNamespace.namespaceParseSpec.format === 'tsv',
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.listDelimiter',
+      type: 'string',
+      label: 'List delimiter',
+      placeholder: `\u0001`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        model.extractionNamespace.namespaceParseSpec.format === 'tsv',
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.keyFieldName',
+      type: 'string',
+      label: 'Key field name',
+      placeholder: `key`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        model.extractionNamespace.namespaceParseSpec.format === 'customJson',
+    },
+    {
+      name: 'extractionNamespace.namespaceParseSpec.valueFieldName',
+      type: 'string',
+      label: 'Value field name',
+      placeholder: `value`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri' &&
+        model.extractionNamespace.namespaceParseSpec &&
+        model.extractionNamespace.namespaceParseSpec.format === 'customJson',
+    },
+    {
+      name: 'extractionNamespace.namespace',
+      type: 'string',
+      label: 'Namespace',
+      placeholder: 'some_lookup',
+      info: `The namespace value in the SLQ query:
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.connectorConfig.createTables',
+      type: 'boolean',
+      label: 'CreateTables',
+      info: 'Defines the connectURI value on the The connector config to used',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.connectorConfig.connectURI',
+      type: 'string',
+      label: 'ConnectURI',
+      info: 'Defines the connectURI value on the The connector config to used',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.connectorConfig.user',
+      type: 'string',
+      label: 'User',
+      info: 'Defines the user too be used by the connector config',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.connectorConfig.password',
+      type: 'string',
+      label: 'Password',
+      info: 'Defines the password too be used by the connector config',
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.table',
+      type: 'string',
+      label: 'Table',
+      placeholder: 'some_lookup_table',
+      info: `The table which contains the key value pairs. This will become the table value in the SLQ query:
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter\``,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.keyColumn',
+      type: 'string',
+      label: 'Key column',
+      placeholder: 'my_key_value',
+      info: `The column in table which contains the keys. This will become the keyColumn value in the sql query: 
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.valueColumn',
+      type: 'string',
+      label: 'Value column',
+      placeholder: 'my_column_value',
+      info: `The column in table which contains the values. This will become the valueColumn value in the sql query: 
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.filter',
+      type: 'string',
+      label: 'Filter',
+      info: `The filter to use when selecting lookups, this is used to create a where clause on lookup population. This will become the expression filter  in the sql query: 
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter\``,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.tsColumn',
+      type: 'string',
+      label: 'TsColumn',
+      info: `The column in table which contains when the key was updated. This is become the TsColumn Value in the SQL query: 
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'jdbc',
+    },
+    {
+      name: 'extractionNamespace.pollPeriod',
+      type: 'string',
+      label: 'Poll period',
+      placeholder: 'PT5M',
+      info: `Period between polling for updates`,
+      defined: (model: LookupSpec) =>
+        model.type === 'cachedNamespace' &&
+        !!model.extractionNamespace &&
+        model.extractionNamespace.type === 'uri',
+    },
+    {
+      name: 'firstCacheTimeout',
+      type: 'number',
+      label: 'First cache timeout',
+      placeholder: '0',
+      info: `How long to wait (in ms) for the first run of the cache to populate. 0 indicates to not wait`,
+      defined: (model: LookupSpec) => model.type === 'cachedNamespace',
+    },
+    {
+      name: 'injective',
+      type: 'boolean',
+      defaultValue: false,
+      info: `If the underlying map is injective (keys and values are unique) then optimizations can occur internally by setting this to true`,
+      defined: (model: LookupSpec) => model.type === 'cachedNamespace',
+    },
+  ];
 
   return (
     <Dialog
@@ -203,287 +540,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
         />
       </FormGroup>
       <AutoForm
-        fields={[
-          {
-            name: 'type',
-            type: 'string',
-            suggestions: ['map', 'cachedNamespace'],
-            adjustment: model => {
-              if (
-                model.type === 'map' &&
-                model.extractionNamespace &&
-                model.extractionNamespace.type
-              ) {
-                return model;
-              }
-              model.extractionNamespace = { type: 'uri', namespaceParseSpec: { format: 'csv' } };
-              return model;
-            },
-          },
-          {
-            name: 'map',
-            type: 'json',
-            defined: model => {
-              return model.type === 'map';
-            },
-          },
-          {
-            name: 'extractionNamespace.type',
-            type: 'string',
-            label: 'Globally cached lookup type',
-            placeholder: 'uri',
-            suggestions: ['uri', 'jdbc'],
-            defined: model => model.type === 'cachedNamespace',
-          },
-          {
-            name: 'extractionNamespace.uriPrefix',
-            type: 'string',
-            label: 'URI prefix',
-            info:
-              'A URI which specifies a directory (or other searchable resource) in which to search for files',
-            placeholder: 's3://bucket/some/key/prefix/',
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri',
-          },
-          {
-            name: 'extractionNamespace.fileRegex',
-            type: 'string',
-            label: 'File regex',
-            placeholder: 'renames-[0-9]*\\.gz',
-            info:
-              'Optional regex for matching the file name under uriPrefix. Only used if uriPrefix is used',
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri',
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.format',
-            type: 'string',
-            label: 'Format',
-            defaultValue: 'csv',
-            suggestions: ['csv', 'tsv', 'customJson', 'simpleJson'],
-            // todo needs info
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri',
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.columns',
-            type: 'string-array',
-            label: 'Columns',
-            placeholder: `["key", "value"]`,
-            info: 'The list of columns in the csv file',
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
-                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.keyColumn',
-            type: 'string',
-            label: 'Key column',
-            placeholder: 'Key',
-            info: 'The name of the column containing the key',
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
-                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.valueColumn',
-            type: 'string',
-            label: 'Value column',
-            placeholder: 'Value',
-            info: 'The name of the column containing the value',
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
-                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.hasHeaderRow',
-            type: 'boolean',
-            label: 'Has header row',
-            defaultValue: false,
-            info: `A flag to indicate that column information can be extracted from the input files' header row`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
-                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.skipHeaderRows',
-            type: 'number',
-            label: 'Skip header rows',
-            placeholder: '0',
-            info: `Number of header rows to be skipped`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              (model.extractionNamespace.namespaceParseSpec.format === 'csv' ||
-                model.extractionNamespace.namespaceParseSpec.format === 'tsv'),
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.delimiter',
-            type: 'string',
-            label: 'Delimiter',
-            placeholder: `\t`,
-            info: `The delimiter in the file`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              model.extractionNamespace.namespaceParseSpec.format === 'tsv',
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.listDelimiter',
-            type: 'string',
-            label: 'List delimiter',
-            placeholder: `\u0001`,
-            info: `The list delimiter in the file\t`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              model.extractionNamespace.namespaceParseSpec.format === 'tsv',
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.keyFieldName',
-            type: 'string',
-            label: 'Key field name',
-            placeholder: `key`,
-            info: `The field name of the key`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              model.extractionNamespace.namespaceParseSpec.format === 'customJson',
-          },
-          {
-            name: 'extractionNamespace.namespaceParseSpec.valueFieldName',
-            type: 'string',
-            label: 'Value field name',
-            placeholder: `value`,
-            info: `The field name of the value`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri' &&
-              model.extractionNamespace.namespaceParseSpec &&
-              model.extractionNamespace.namespaceParseSpec.format === 'customJson',
-          },
-          {
-            name: 'extractionNamespace.namespace',
-            type: 'string',
-            label: 'Namespace',
-            placeholder: 'some_lookup',
-            info: `The namespace to define`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'jdbc',
-          },
-          {
-            name: 'extractionNamespace.table',
-            type: 'string',
-            label: 'Table',
-            placeholder: 'some_lookup_table',
-            info: `The table which contains the key value pairs`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'jdbc',
-          },
-          {
-            name: 'extractionNamespace.keyColumn',
-            type: 'string',
-            label: 'Key column',
-            placeholder: 'the_old_dim_value',
-            info: `The column in table which contains the keys`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'jdbc',
-          },
-          {
-            name: 'extractionNamespace.valueColumn',
-            type: 'string',
-            label: 'Value column',
-            placeholder: 'the_new_dim_value',
-            info: `The column in table which contains the values`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'jdbc',
-          },
-          {
-            name: 'extractionNamespace.filter',
-            type: 'json',
-            label: 'Filter',
-            info: `The filter to use when selecting lookups, this is used to create a where clause on lookup population`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'jdbc',
-          },
-          {
-            name: 'extractionNamespace.tsColumn',
-            type: 'string',
-            label: 'TsColumn',
-            info: `The column in table which contains when the key was updated`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'jdbc',
-          },
-          {
-            name: 'extractionNamespace.pollPeriod',
-            type: 'string',
-            label: 'Poll Period',
-            placeholder: 'PT5M',
-            info: `Period between polling for updates`,
-            defined: model =>
-              model.type === 'cachedNamespace' &&
-              !!model.extractionNamespace &&
-              model.extractionNamespace.type === 'uri',
-          },
-          {
-            name: 'firstCacheTimeout',
-            type: 'number',
-            label: 'First cache timeout',
-            placeholder: '0',
-            info: `How long to wait (in ms) for the first run of the cache to populate. 0 indicates to not wait`,
-            defined: model => model.type === 'cachedNamespace',
-          },
-          {
-            name: 'injective',
-            type: 'boolean',
-            defaultValue: false,
-            info: `If the underlying map is injective (keys and values are unique) then optimizations can occur internally by setting this to true`,
-            defined: model => model.type === 'cachedNamespace',
-          },
-        ]}
+        fields={fields as Field<LookupSpec>[]}
         model={lookupSpec}
         onChange={m => {
           onChange('lookupEditSpec', m);
@@ -498,7 +555,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
             onClick={() => {
               onSubmit(updateVersionOnSubmit && isEdit);
             }}
-            disabled={disableSubmit}
+            disabled={isDisabled(lookupName, lookupVersion, lookupTier, lookupSpec)}
           />
         </div>
       </div>

From 3a2582b4c9e5af0b9f763f1292e7f37968080342 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Tue, 7 Apr 2020 17:44:28 -0600
Subject: [PATCH 09/13] add cool highlights

---
 .../lookup-edit-dialog/lookup-edit-dialog.tsx | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index 4642af8af4b6..a5ff90ada359 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -380,8 +380,8 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Namespace',
       placeholder: 'some_lookup',
-      info: `The namespace value in the SLQ query:
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      info: `The namespace value in the SQl query:
+      SELECT keyColumn, valueColumn, tsColumn? FROM <strong>namespace</strong>.table WHERE filter`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -432,8 +432,8 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Table',
       placeholder: 'some_lookup_table',
-      info: `The table which contains the key value pairs. This will become the table value in the SLQ query:
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter\``,
+      info: `The table which contains the key value pairs. This will become the table value in the SQL query:
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.<strong>table</strong> WHERE filter\``,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -444,8 +444,8 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Key column',
       placeholder: 'my_key_value',
-      info: `The column in table which contains the keys. This will become the keyColumn value in the sql query: 
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      info: `The column in table which contains the keys. This will become the keyColumn value in the SQL query: 
+      SELECT <strong>keyColumn</strong>, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -456,8 +456,8 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Value column',
       placeholder: 'my_column_value',
-      info: `The column in table which contains the values. This will become the valueColumn value in the sql query: 
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      info: `The column in table which contains the values. This will become the valueColumn value in the SQL query: 
+      SELECT keyColumn, <strong>valueColumn</strong>, tsColumn? FROM namespace.table WHERE filter`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -467,8 +467,8 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.filter',
       type: 'string',
       label: 'Filter',
-      info: `The filter to use when selecting lookups, this is used to create a where clause on lookup population. This will become the expression filter  in the sql query: 
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter\``,
+      info: `The filter to use when selecting lookups, this is used to create a where clause on lookup population. This will become the expression filter in the SQL query: 
+      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE <strong>filter</strong>`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -479,7 +479,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'TsColumn',
       info: `The column in table which contains when the key was updated. This is become the TsColumn Value in the SQL query: 
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      SELECT keyColumn, valueColumn, <strong>tsColumn</strong>? FROM namespace.table WHERE filter`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&

From 85b75af47276b2bd9ecce9855e30ac4ca6326213 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Tue, 7 Apr 2020 20:17:05 -0600
Subject: [PATCH 10/13] fix formatting

---
 .../lookup-edit-dialog/lookup-edit-dialog.tsx | 65 +++++++++++++++----
 1 file changed, 53 insertions(+), 12 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index a5ff90ada359..93eff5f95dd1 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -380,8 +380,14 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Namespace',
       placeholder: 'some_lookup',
-      info: `The namespace value in the SQl query:
-      SELECT keyColumn, valueColumn, tsColumn? FROM <strong>namespace</strong>.table WHERE filter`,
+      info: (
+        <p>
+          The namespace value in the SQl query:
+          <br />
+          SELECT keyColumn, valueColumn, tsColumn? FROM <strong>namespace</strong>.table WHERE
+          filter
+        </p>
+      ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -432,8 +438,15 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Table',
       placeholder: 'some_lookup_table',
-      info: `The table which contains the key value pairs. This will become the table value in the SQL query:
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.<strong>table</strong> WHERE filter\``,
+      info: (
+        <p>
+          The table which contains the key value pairs. This will become the table value in the SQL
+          query:
+          <br />
+          SELECT keyColumn, valueColumn, tsColumn? FROM namespace.<strong>table</strong> WHERE
+          filter
+        </p>
+      ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -444,8 +457,15 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Key column',
       placeholder: 'my_key_value',
-      info: `The column in table which contains the keys. This will become the keyColumn value in the SQL query: 
-      SELECT <strong>keyColumn</strong>, valueColumn, tsColumn? FROM namespace.table WHERE filter`,
+      info: (
+        <p>
+          The column in the table which contains the keys. This will become the keyColumn value in
+          the SQL query:
+          <br />
+          SELECT <strong>keyColumn</strong>, valueColumn, tsColumn? FROM namespace.table WHERE
+          filter
+        </p>
+      ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -456,8 +476,15 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       type: 'string',
       label: 'Value column',
       placeholder: 'my_column_value',
-      info: `The column in table which contains the values. This will become the valueColumn value in the SQL query: 
-      SELECT keyColumn, <strong>valueColumn</strong>, tsColumn? FROM namespace.table WHERE filter`,
+      info: (
+        <p>
+          The column in table which contains the values. This will become the valueColumn value in
+          the SQL query:
+          <br />
+          SELECT keyColumn, <strong>valueColumn</strong>, tsColumn? FROM namespace.table WHERE
+          filter
+        </p>
+      ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -467,8 +494,15 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.filter',
       type: 'string',
       label: 'Filter',
-      info: `The filter to use when selecting lookups, this is used to create a where clause on lookup population. This will become the expression filter in the SQL query: 
-      SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE <strong>filter</strong>`,
+      info: (
+        <p>
+          The filter to be used when selecting lookups, this is used to create a where clause on
+          lookup population. This will become the expression filter in the SQL query:
+          <br />
+          SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE{' '}
+          <strong>filter</strong>
+        </p>
+      ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -478,8 +512,15 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.tsColumn',
       type: 'string',
       label: 'TsColumn',
-      info: `The column in table which contains when the key was updated. This is become the TsColumn Value in the SQL query: 
-      SELECT keyColumn, valueColumn, <strong>tsColumn</strong>? FROM namespace.table WHERE filter`,
+      info: (
+        <p>
+          The column in table which contains when the key was updated. This will become the TsColumn
+          Value in the SQL query:
+          <br />
+          SELECT keyColumn, valueColumn, <strong>tsColumn</strong>? FROM namespace.table WHERE
+          filter
+        </p>
+      ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&

From 8e5e64ce7e0867c4cece2b29a650afe9b9e41b12 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Tue, 7 Apr 2020 20:20:43 -0600
Subject: [PATCH 11/13] fix capitalization

---
 .../src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index 93eff5f95dd1..cefc9e8c4042 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -382,7 +382,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       placeholder: 'some_lookup',
       info: (
         <p>
-          The namespace value in the SQl query:
+          The namespace value in the SQL query:
           <br />
           SELECT keyColumn, valueColumn, tsColumn? FROM <strong>namespace</strong>.table WHERE
           filter

From da36e6a5585c163346c7effab17d3cde6dffb49b Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Wed, 8 Apr 2020 10:23:47 -0600
Subject: [PATCH 12/13] add optional placeholder

---
 .../lookup-edit-dialog/lookup-edit-dialog.tsx | 116 ++++++++++--------
 1 file changed, 67 insertions(+), 49 deletions(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index cefc9e8c4042..0c2607b3a7dc 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -238,7 +238,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.fileRegex',
       type: 'string',
       label: 'File regex',
-      placeholder: 'renames-[0-9]*\\.gz',
+      placeholder: '(optional)',
       info:
         'Optional regex for matching the file name under uriPrefix. Only used if uriPrefix is used',
       defined: (model: LookupSpec) =>
@@ -317,7 +317,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.namespaceParseSpec.skipHeaderRows',
       type: 'number',
       label: 'Skip header rows',
-      placeholder: '0',
+      placeholder: '(optional)',
       info: `Number of header rows to be skipped. The default number of header rows to be skipped is 0.`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -331,7 +331,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.namespaceParseSpec.delimiter',
       type: 'string',
       label: 'Delimiter',
-      placeholder: `\t`,
+      placeholder: `(optional)`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -343,7 +343,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.namespaceParseSpec.listDelimiter',
       type: 'string',
       label: 'List delimiter',
-      placeholder: `\u0001`,
+      placeholder: `(optional)`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -381,12 +381,13 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       label: 'Namespace',
       placeholder: 'some_lookup',
       info: (
-        <p>
-          The namespace value in the SQL query:
-          <br />
-          SELECT keyColumn, valueColumn, tsColumn? FROM <strong>namespace</strong>.table WHERE
-          filter
-        </p>
+        <>
+          <p>The namespace value in the SQL query:</p>
+          <p>
+            SELECT keyColumn, valueColumn, tsColumn? FROM <strong>namespace</strong>.table WHERE
+            filter
+          </p>
+        </>
       ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -417,7 +418,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.connectorConfig.user',
       type: 'string',
       label: 'User',
-      info: 'Defines the user too be used by the connector config',
+      info: 'Defines the user to be used by the connector config',
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -427,7 +428,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.connectorConfig.password',
       type: 'string',
       label: 'Password',
-      info: 'Defines the password too be used by the connector config',
+      info: 'Defines the password to be used by the connector config',
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
         !!model.extractionNamespace &&
@@ -439,13 +440,16 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       label: 'Table',
       placeholder: 'some_lookup_table',
       info: (
-        <p>
-          The table which contains the key value pairs. This will become the table value in the SQL
-          query:
-          <br />
-          SELECT keyColumn, valueColumn, tsColumn? FROM namespace.<strong>table</strong> WHERE
-          filter
-        </p>
+        <>
+          <p>
+            The table which contains the key value pairs. This will become the table value in the
+            SQL query:
+          </p>
+          <p>
+            SELECT keyColumn, valueColumn, tsColumn? FROM namespace.<strong>table</strong> WHERE
+            filter
+          </p>
+        </>
       ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -458,13 +462,16 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       label: 'Key column',
       placeholder: 'my_key_value',
       info: (
-        <p>
-          The column in the table which contains the keys. This will become the keyColumn value in
-          the SQL query:
-          <br />
-          SELECT <strong>keyColumn</strong>, valueColumn, tsColumn? FROM namespace.table WHERE
-          filter
-        </p>
+        <>
+          <p>
+            The column in the table which contains the keys. This will become the keyColumn value in
+            the SQL query:
+          </p>
+          <p>
+            SELECT <strong>keyColumn</strong>, valueColumn, tsColumn? FROM namespace.table WHERE
+            filter
+          </p>
+        </>
       ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -477,13 +484,16 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       label: 'Value column',
       placeholder: 'my_column_value',
       info: (
-        <p>
-          The column in table which contains the values. This will become the valueColumn value in
-          the SQL query:
-          <br />
-          SELECT keyColumn, <strong>valueColumn</strong>, tsColumn? FROM namespace.table WHERE
-          filter
-        </p>
+        <>
+          <p>
+            The column in table which contains the values. This will become the valueColumn value in
+            the SQL query:
+          </p>
+          <p>
+            SELECT keyColumn, <strong>valueColumn</strong>, tsColumn? FROM namespace.table WHERE
+            filter
+          </p>
+        </>
       ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -494,14 +504,18 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.filter',
       type: 'string',
       label: 'Filter',
+      placeholder: '(optional)',
       info: (
-        <p>
-          The filter to be used when selecting lookups, this is used to create a where clause on
-          lookup population. This will become the expression filter in the SQL query:
-          <br />
-          SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE{' '}
-          <strong>filter</strong>
-        </p>
+        <>
+          <p>
+            The filter to be used when selecting lookups, this is used to create a where clause on
+            lookup population. This will become the expression filter in the SQL query:
+          </p>
+          <p>
+            SELECT keyColumn, valueColumn, tsColumn? FROM namespace.table WHERE{' '}
+            <strong>filter</strong>
+          </p>
+        </>
       ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -512,14 +526,18 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.tsColumn',
       type: 'string',
       label: 'TsColumn',
+      placeholder: '(optional)',
       info: (
-        <p>
-          The column in table which contains when the key was updated. This will become the TsColumn
-          Value in the SQL query:
-          <br />
-          SELECT keyColumn, valueColumn, <strong>tsColumn</strong>? FROM namespace.table WHERE
-          filter
-        </p>
+        <>
+          <p>
+            The column in table which contains when the key was updated. This will become the Value
+            in the SQL query:
+          </p>
+          <p>
+            SELECT keyColumn, valueColumn, <strong>tsColumn</strong>? FROM namespace.table WHERE
+            filter
+          </p>
+        </>
       ),
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -530,7 +548,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'extractionNamespace.pollPeriod',
       type: 'string',
       label: 'Poll period',
-      placeholder: 'PT5M',
+      placeholder: '(optional)',
       info: `Period between polling for updates`,
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&
@@ -541,7 +559,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
       name: 'firstCacheTimeout',
       type: 'number',
       label: 'First cache timeout',
-      placeholder: '0',
+      placeholder: '(optional)',
       info: `How long to wait (in ms) for the first run of the cache to populate. 0 indicates to not wait`,
       defined: (model: LookupSpec) => model.type === 'cachedNamespace',
     },

From 50778c0ce1fdc80ad0ded63bf28af82d7ac89f78 Mon Sep 17 00:00:00 2001
From: Maggie Brewster <maggie.brewster@imply.io>
Date: Wed, 8 Apr 2020 12:38:14 -0600
Subject: [PATCH 13/13] add space

---
 .../src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
index 0c2607b3a7dc..513bd8d6e01e 100644
--- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
+++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.tsx
@@ -407,7 +407,7 @@ export const LookupEditDialog = React.memo(function LookupEditDialog(props: Look
     {
       name: 'extractionNamespace.connectorConfig.connectURI',
       type: 'string',
-      label: 'ConnectURI',
+      label: 'Connect URI',
       info: 'Defines the connectURI value on the The connector config to used',
       defined: (model: LookupSpec) =>
         model.type === 'cachedNamespace' &&