datajunction-ui 0.0.1-rc.11 → 0.0.1-rc.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datajunction-ui",
-  "version": "0.0.1-rc.11",
+  "version": "0.0.1-rc.12",
   "description": "DataJunction Metrics Platform UI",
   "module": "src/index.tsx",
   "repository": {

package/src/app/pages/SQLBuilderPage/index.jsx

@@ -59,7 +59,7 @@ export function SQLBuilderPage() {
         setData(queryInfo.results);
         queryInfo.numRows = queryInfo.results[0].rows.length;
         setViewData(true);
-        setShowNumRows(100);
+        setShowNumRows(10);
       }
     };
     fetchData().catch(console.error);
@@ -126,7 +126,7 @@ export function SQLBuilderPage() {
       if (selectedMetrics.length && selectedDimensions.length) {
         const query = await djClient.sqls(selectedMetrics, selectedDimensions);
         setShowHelp(false);
-        setQuery(query);
+        setQuery(query.sql);
       } else {
         resetView();
         setShowHelp(true);
@@ -175,7 +175,7 @@ export function SQLBuilderPage() {
               onChange={handleMetricSelect}
               onMenuClose={handleMetricSelectorClose}
             />
-            <h4>Group By</h4>
+            <h4>Shared Dimensions</h4>
             <Select
               name="dimensions"
               formatOptionLabel={formatOptionLabel}
@@ -190,32 +190,6 @@ export function SQLBuilderPage() {
               onChange={handleDimensionSelect}
               onMenuClose={handleDimensionSelectorClose}
             />
-            <h4>Filter By</h4>
-            <Select
-              name="filters"
-              className="filters"
-              formatOptionLabel={formatOptionLabel}
-              options={commonDimensionsList}
-              noOptionsMessage={() =>
-                'No shared dimensions found. Try selecting different metrics.'
-              }
-              placeholder={`${commonDimensionsList.length} Shared Dimensions`}
-              isClearable
-              closeMenuOnSelect={true}
-              // onChange={handleDimensionSelect}
-              // onMenuClose={handleDimensionSelectorClose}
-            />
-            <Select
-              name="filters"
-              className="filters-operator"
-              // formatOptionLabel={formatOptionLabel}
-              options={[{value: '=', label: '='}, {value: '>', label: '>'}, {value: '>', label: '>'}]}
-              placeholder={`Operator`}
-              closeMenuOnSelect={true}
-              // onChange={handleDimensionSelect}
-              // onMenuClose={handleDimensionSelectorClose}
-            />
-            <input value={`Value`}></input>
           </div>
           <div className="card-header">
             {showHelp ? (
@@ -277,7 +251,7 @@ export function SQLBuilderPage() {
                       <span style={{ display: 'inline-block' }}>
                         <Select
                           name="num-rows"
-                          defaultValue={numRowsOptions[1]}
+                          defaultValue={numRowsOptions[0]}
                           options={numRowsOptions}
                           onChange={e => setShowNumRows(e.value)}
                         />
@@ -300,10 +274,9 @@ export function SQLBuilderPage() {
             )}
             {submittedQueryInfo ? <QueryInfo {...submittedQueryInfo} /> : <></>}
             <div>
-              {/*{query.dialect}*/}
               {query && !viewData ? (
                 <SyntaxHighlighter language="sql" style={foundation}>
-                  {format(query.sql, {
+                  {format(query, {
                     language: 'spark',
                     tabWidth: 2,
                     keywordCase: 'upper',

package/src/styles/index.css

@@ -865,13 +865,3 @@ pre {
 .inactive {
   display: none;
 }
-
-.filters {
-  width: 500px;
-  display: inline-table;
-}
-
-.filters-operator {
-  width: 200px;
-  display: inline-table;
-}