Disable multimetrics feature, cleanup imports, add comments

frontend/src/metabase-lib/lib/QueryResult.js

-/* @flow weak */
-
-export class QueryResult {}

frontend/src/metabase-lib/lib/Question.js

@@ -7,7 +7,7 @@ import Table from "./metadata/Table";
 import Field from "./metadata/Field";
 
 import MultiQuery, { convertToMultiDatasetQuery } from "./queries/MultiQuery";
-import StructuredQuery from "./queries/StructuredQuery";
+import StructuredQuery, { STRUCTURED_QUERY_TEMPLATE } from "./queries/StructuredQuery";
 import NativeQuery from "./queries/NativeQuery";
 
 import { memoize } from "metabase-lib/lib/utils";
@@ -37,8 +37,7 @@ import type {
 } from "metabase/meta/types/Parameter";
 import type {
     DatasetQuery,
-    Card as CardObject,
-    StructuredDatasetQuery as StructuredDatasetQueryObject
+    Card as CardObject
 } from "metabase/meta/types/Card";
 
 import type {
@@ -47,13 +46,11 @@ import type {
     QueryMode
 } from "metabase/meta/types/Visualization";
 import { MetabaseApi, CardApi } from "metabase/services";
-import { DatetimeFieldDimension } from "metabase-lib/lib/Dimension";
 import AtomicQuery from "metabase-lib/lib/queries/AtomicQuery";
 
 import type { Dataset } from "metabase/meta/types/Dataset";
 import type { TableId } from "metabase/meta/types/Table";
 import type { DatabaseId } from "metabase/meta/types/Database";
-import { STRUCTURED_QUERY_TEMPLATE } from "metabase-lib/lib/queries/StructuredQuery";
 
 // TODO: move these
 type DownloadFormat = "csv" | "json" | "xlsx";

frontend/src/metabase-lib/lib/metadata/Metric.js

@@ -4,7 +4,6 @@ import Base from "./Base";
 import Question from "../Question";
 import Database from "./Database";
 import Table from "./Table";
-import Dimension, { DatetimeFieldDimension } from "metabase-lib/lib/Dimension";
 import type { Aggregation } from "metabase/meta/types/Query";
 
 /**

frontend/src/metabase-lib/lib/queries/Aggregation.js

@@ -3,11 +3,11 @@ import { AggregationClause as AggregationClause_DEPRECATED } from "metabase/lib/
 import { MetricId } from "metabase/meta/types/Metric";
 import { AggregationOption, Operator } from "metabase/meta/types/Metadata";
 import { FieldId } from "metabase/meta/types/Field";
-import Metadata from "metabase-lib/lib/metadata/Metadata";
 import StructuredQuery from "metabase-lib/lib/queries/StructuredQuery";
 
-// TODO Atte Keinänen 6/11/17: Add a docstring about the purpose of Aggregations
-
+/**
+ * Wrapper for an aggregation contained by a {@link StructuredQuery}
+ */
 export default class Aggregation {
     _query: ?StructuredQuery;
 

frontend/src/metabase-lib/lib/queries/MultiQuery.js

@@ -9,7 +9,7 @@ import StructuredQuery from "./StructuredQuery";
 import NativeQuery from "./NativeQuery";
 import { memoize } from "metabase-lib/lib/utils";
 import Action, { ActionClick } from "../Action";
-import Dimension, { DatetimeFieldDimension } from "metabase-lib/lib/Dimension";
+import Dimension from "metabase-lib/lib/Dimension";
 
 import type {
     AtomicDatasetQuery,
@@ -216,9 +216,11 @@ export default class MultiQuery extends Query {
         }
 
         const baseField = this.baseBreakoutDimension().field();
-        const field = compatibleFields.find((compatibleField) => {
+
+        const isEqualOrCloseToBaseField = (compatibleField) => {
             return compatibleField.id === baseField.id || compatibleField.name === baseField.name
-        }) || compatibleFields[0];
+        }
+        const field = compatibleFields.find(isEqualOrCloseToBaseField) || compatibleFields[0];
 
         return this.addQuery(query.addBreakout(this.breakoutDimensionFor(field).mbql()));
     }

frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx

@@ -9,7 +9,6 @@ import cx from "classnames";
 
 import * as Query from "metabase/lib/query/query";
 import Question from "metabase-lib/lib/Question";
-import Table from "metabase-lib/lib/metadata/Table";
 
 export default class PartialQueryBuilder extends Component {
     static propTypes = {

frontend/src/metabase/qb/components/actions/index.js

 /* @flow */
 
-import AddMetricAction from "./AddMetricAction";
+// import AddMetricAction from "./AddMetricAction";
 import UnderlyingDataAction from "./UnderlyingDataAction";
 import UnderlyingRecordsAction from "./UnderlyingRecordsAction";
 
-export const DEFAULT_ACTIONS = [AddMetricAction, UnderlyingDataAction, UnderlyingRecordsAction];
+// With multimetrics: export const DEFAULT_ACTIONS = [AddMetricAction, UnderlyingDataAction, UnderlyingRecordsAction];
+export const DEFAULT_ACTIONS = [UnderlyingDataAction, UnderlyingRecordsAction];

frontend/src/metabase/query_builder/components/FieldName.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import Icon from "metabase/components/Icon.jsx";
 import Clearable from "./Clearable.jsx";
 
 import Query from "metabase/lib/query";
-import { formatBucketing } from "metabase/lib/query_time";
-import { stripId } from "metabase/lib/formatting";
 
 import Dimension from "metabase-lib/lib/Dimension";
 

frontend/src/metabase/query_builder/components/MetricDimensionOptions.jsx

@@ -3,7 +3,7 @@ import React, { Component } from "react";
 import Select, { Option } from "metabase/components/Select";
 import MultiQuery from "metabase-lib/lib/queries/MultiQuery";
 import StructuredQuery from "metabase-lib/lib/queries/StructuredQuery";
-import Dimension, { DatetimeFieldDimension, FieldIDDimension } from "metabase-lib/lib/Dimension";
+import Dimension from "metabase-lib/lib/Dimension";
 import MetricWidget from "metabase/query_builder/components/MetricWidget";
 import Field from "metabase-lib/lib/metadata/Field";
 

frontend/src/metabase/query_builder/containers/QueryBuilder.jsx

@@ -59,8 +59,6 @@ import { push } from "react-router-redux";
 import { MetabaseApi } from "metabase/services";
 import QuestionBuilder from "metabase/query_builder/containers/QuestionBuilder";
 
-import NewQueryBar from "metabase/new_query/containers/NewQueryBar";
-import NewQueryOptions from "metabase/new_query/containers/NewQueryOptions";
 import NativeQuery from "metabase-lib/lib/queries/NativeQuery";
 import StructuredQuery from "metabase-lib/lib/queries/StructuredQuery";
 
@@ -232,7 +230,7 @@ class LegacyQueryBuilder extends Component {
     }
 
     render() {
-        const { question, query, card, isDirty, databases, uiControls, mode } = this.props;
+        const { query, card, isDirty, databases, uiControls, mode } = this.props;
 
         // if we don't have a card at all or no databases then we are initializing, so keep it simple
         if (!card || !databases) {
@@ -244,7 +242,8 @@ class LegacyQueryBuilder extends Component {
         const showDrawer = uiControls.isShowingDataReference || uiControls.isShowingTemplateTagsEditor;
         const ModeFooter = mode && mode.ModeFooter;
 
-        const showNewQueryFlow = question && question.isEmpty();
+        // Fo showing the new question flow:
+        // const showNewQueryFlow = question && question.isEmpty();
 
         return (
             <div className="flex-full relative">
@@ -262,23 +261,25 @@ class LegacyQueryBuilder extends Component {
                             />
                         : (query instanceof StructuredQuery) ?
                             <div className="wrapper">
-                                { showNewQueryFlow
+                                { /* For showing the new question flow:
+                                     showNewQueryFlow
                                         ?  <NewQueryBar />
-                                        : (
+                                        : */
                                             <GuiQueryEditor
                                                 {...this.props}
                                                 datasetQuery={card && card.dataset_query}
                                             />
-                                        )
+
                                 }
                             </div>
                         : null }
                     </div>
 
                     <div ref="viz" id="react_qb_viz" className="flex z1" style={{ "transition": "opacity 0.25s ease-in-out" }}>
-                        { showNewQueryFlow
+                        { /* For showing the new question flow:
+                            showNewQueryFlow
                             ? <NewQueryOptions question={question} onComplete={this.onNewQueryFlowCompleted} />
-                            : <QueryVisualization {...this.props}  className="full wrapper mb2 z1" />
+                            :*/ <QueryVisualization {...this.props}  className="full wrapper mb2 z1" />
                         }
                     </div>