Small fixes

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

@@ -69,9 +69,8 @@ type ParameterOptions = "FIXME";
  */
 export default class Question {
     /**
-     * A Question wrapper requires a metadata object
-     * TODO Atte Keinänen 6/6/17: Check which parts of metadata are actually needed and document them here
-     * The contents of `metadata` could also be asserted in the Question constructor
+     * The Question wrapper requires a metadata object because the queries it contains (like {@link StructuredQuery))
+     * need metadata for accessing databases, tables and metrics.
      */
     _metadata: Metadata;
 
@@ -234,8 +233,9 @@ export default class Question {
      * Returns a list of atomic queries (NativeQuery or StructuredQuery) contained in this question
      */
     atomicQueries(): AtomicQuery[] {
-        if (this.query() instanceof MultiQuery) return this.query().atomicQueries()
-        if (this.query() instanceof AtomicQuery) return [this.query()]
+        const query = this.query();
+        if (query instanceof MultiQuery) return query.atomicQueries()
+        if (query instanceof AtomicQuery) return [query]
         return [];
     }
 

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

@@ -17,14 +17,6 @@ export default class Metric extends Base {
     database: Database;
     table: Table;
 
-    isCompatibleWithBreakoutDimension(dimensionType: typeof Dimension): boolean {
-        if (dimensionType === DatetimeFieldDimension) {
-            return this.table.dateFields().length > 0;
-        } else {
-            return false;
-        }
-    }
-
     newQuestion(): Question {
         // $FlowFixMe
         return new Question();

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

@@ -40,9 +40,9 @@ export function createAtomicQuery(question: Question, datasetQuery: AtomicDatase
 // TODO Atte Keinänen 6/8/17: Write comprehensive unit tests for this class and exported methods
 
 /**
- * Converts the DatasetQuery to a MultiDatasetQuery.
+ * Converts a {@link DatasetQuery} to a {@link MultiDatasetQuery}.
  *
- * Because each query contained by MultiDatasetQuery should have just a single aggregation, StructuredQueries
+ * Because each query contained by MultiDatasetQuery should have just a single aggregation, {@link StructuredQuery}s
  * with two or more aggregations are broken into queries with one of those aggregations in each.
  */
 export function convertToMultiDatasetQuery(question: Question, datasetQuery: DatasetQuery) {
@@ -65,6 +65,8 @@ export function convertToMultiDatasetQuery(question: Question, datasetQuery: Dat
         }
     }
 
+    if (isMultiDatasetQuery(datasetQuery)) return datasetQuery;
+
     return {
         ...MULTI_QUERY_TEMPLATE,
         queries: getConvertedQueries()

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

@@ -117,7 +117,6 @@ export default class NativeQuery extends AtomicQuery {
         return getIn(this.datasetQuery(), ["native", "query"]) || "";
     }
 
-    // TODO:
     updateQueryText(newQueryText: string): Query {
         return new NativeQuery(
             this._originalQuestion,

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

@@ -42,7 +42,6 @@ export default class Query {
         }
     }
 
-    // TODO: Decide the behavior of isEditable for multimetric questions
     isEditable(): boolean {
         return true;
     }

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

@@ -94,6 +94,10 @@ export default class StructuredQuery extends AtomicQuery {
         return true;
     }
 
+    isEditable(): boolean {
+        return !!this.tableMetadata();
+    }
+
     /* AtomicQuery superclass methods */
 
     tables(): ?(Table[]) {
@@ -119,10 +123,6 @@ export default class StructuredQuery extends AtomicQuery {
         return new StructuredQuery(this._originalQuestion);
     }
 
-    isEditable(): boolean {
-        return !!this.tableMetadata();
-    }
-
     query(): StructuredQueryObject {
         // $FlowFixMe
         return this._datasetQuery.query;