Merge branch 'master' into merge-master-0.33.x

frontend/src/metabase/admin/datamodel/components/database/MetadataTableList.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import Icon from "metabase/components/Icon.jsx";
+import Icon from "metabase/components/Icon";
 
 import { t, ngettext, msgid } from "ttag";
 

frontend/src/metabase/admin/datamodel/components/database/MetadataTablePicker.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import MetadataTableList from "./MetadataTableList.jsx";
-import MetadataSchemaList from "./MetadataSchemaList.jsx";
+import MetadataTableList from "./MetadataTableList";
+import MetadataSchemaList from "./MetadataSchemaList";
 
 import Tables from "metabase/entities/tables";
 

frontend/src/metabase/admin/datamodel/components/database/MetricItem.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import ObjectActionSelect from "../ObjectActionSelect.jsx";
+import ObjectActionSelect from "../ObjectActionSelect";
 
 import * as Q_DEPRECATED from "metabase/lib/query";
 

frontend/src/metabase/admin/datamodel/components/database/MetricsList.jsx

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Link } from "react-router";
 import { t } from "ttag";
-import MetricItem from "./MetricItem.jsx";
+import MetricItem from "./MetricItem";
 
 export default class MetricsList extends Component {
   static propTypes = {

frontend/src/metabase/admin/datamodel/components/database/SegmentItem.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import ObjectActionSelect from "../ObjectActionSelect.jsx";
+import ObjectActionSelect from "../ObjectActionSelect";
 
 import * as Q_DEPRECATED from "metabase/lib/query";
 

frontend/src/metabase/admin/datamodel/components/database/SegmentsList.jsx

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Link } from "react-router";
 import { t } from "ttag";
-import SegmentItem from "./SegmentItem.jsx";
+import SegmentItem from "./SegmentItem";
 
 export default class SegmentsList extends Component {
   static propTypes = {

frontend/src/metabase/admin/datamodel/components/revisions/QueryDiff.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
+import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
 
-import FilterList from "metabase/query_builder/components/FilterList.jsx";
-import AggregationWidget from "metabase/query_builder/components/AggregationWidget.jsx";
+import FilterList from "metabase/query_builder/components/FilterList";
+import AggregationWidget from "metabase/query_builder/components/AggregationWidget";
 
 import * as Query from "metabase/lib/query/query";
 

frontend/src/metabase/admin/datamodel/components/revisions/Revision.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import RevisionDiff from "./RevisionDiff.jsx";
+import RevisionDiff from "./RevisionDiff";
 import { t } from "ttag";
-import UserAvatar from "metabase/components/UserAvatar.jsx";
+import UserAvatar from "metabase/components/UserAvatar";
 
 import moment from "moment";
 

frontend/src/metabase/admin/datamodel/components/revisions/RevisionDiff.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import TextDiff from "./TextDiff.jsx";
-import QueryDiff from "./QueryDiff.jsx";
+import TextDiff from "./TextDiff";
+import QueryDiff from "./QueryDiff";
 
-import Icon from "metabase/components/Icon.jsx";
+import Icon from "metabase/components/Icon";
 
 export default class RevisionDiff extends Component {
   static propTypes = {

frontend/src/metabase/admin/datamodel/components/revisions/RevisionHistory.jsx

 import React, { Component } from "react";
 import PropTypes from "prop-types";
 
-import Revision from "./Revision.jsx";
+import Revision from "./Revision";
 import { t } from "ttag";
-import Breadcrumbs from "metabase/components/Breadcrumbs.jsx";
-import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
+import Breadcrumbs from "metabase/components/Breadcrumbs";
+import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
 import Tables from "metabase/entities/tables";
 
 import { assignUserColors } from "metabase/lib/formatting";

frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx

@@ -22,11 +22,8 @@ import SaveStatus from "metabase/components/SaveStatus";
 import Breadcrumbs from "metabase/components/Breadcrumbs";
 import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
 
-import AdminLayout from "metabase/components/AdminLayout.jsx";
-import {
-  LeftNavPane,
-  LeftNavPaneItem,
-} from "metabase/components/LeftNavPane.jsx";
+import AdminLayout from "metabase/components/AdminLayout";
+import { LeftNavPane, LeftNavPaneItem } from "metabase/components/LeftNavPane";
 import Section, { SectionHeader } from "../components/Section";
 import SelectSeparator from "../components/SelectSeparator";
 
@@ -47,7 +44,7 @@ import { rescanFieldValues, discardFieldValues } from "../field";
 // LIB
 import Metadata from "metabase-lib/lib/metadata/Metadata";
 import { has_field_values_options } from "metabase/lib/core";
-import colors from "metabase/lib/colors";
+import { color } from "metabase/lib/colors";
 import { getGlobalSettingsForColumn } from "metabase/visualizations/lib/settings/column";
 import { isCurrency } from "metabase/lib/schema_metadata";
 
@@ -392,7 +389,7 @@ export const BackButton = ({
   <Link
     to={`/admin/datamodel/database/${databaseId}/table/${tableId}`}
     className="circle text-white p2 flex align-center justify-center inline"
-    style={{ backgroundColor: colors["bg-dark"] }}
+    style={{ backgroundColor: color("bg-dark") }}
   >
     <Icon name="arrow_back" />
   </Link>

frontend/src/metabase/admin/datamodel/containers/MetadataEditorApp.jsx

@@ -6,11 +6,11 @@ import { push } from "react-router-redux";
 import { t } from "ttag";
 import MetabaseAnalytics from "metabase/lib/analytics";
 
-import AdminEmptyText from "metabase/components/AdminEmptyText.jsx";
-import MetadataHeader from "../components/database/MetadataHeader.jsx";
-import MetadataTablePicker from "../components/database/MetadataTablePicker.jsx";
-import MetadataTable from "../components/database/MetadataTable.jsx";
-import MetadataSchema from "../components/database/MetadataSchema.jsx";
+import AdminEmptyText from "metabase/components/AdminEmptyText";
+import MetadataHeader from "../components/database/MetadataHeader";
+import MetadataTablePicker from "../components/database/MetadataTablePicker";
+import MetadataTable from "../components/database/MetadataTable";
+import MetadataSchema from "../components/database/MetadataSchema";
 import {
   metrics as Metrics,
   segments as Segments,

frontend/src/metabase/admin/datamodel/containers/MetricApp.jsx

@@ -10,7 +10,7 @@ import Tables from "metabase/entities/tables";
 import { updatePreviewSummary } from "../datamodel";
 import { getPreviewSummary } from "../selectors";
 import withTableMetadataLoaded from "../withTableMetadataLoaded";
-import MetricForm from "./MetricForm.jsx";
+import MetricForm from "./MetricForm";
 
 const mapDispatchToProps = {
   updatePreviewSummary,

frontend/src/metabase/admin/datamodel/containers/MetricForm.jsx

 import React, { Component } from "react";
 import { Link } from "react-router";
 
-import FormLabel from "../components/FormLabel.jsx";
-import FormInput from "../components/FormInput.jsx";
-import FormTextArea from "../components/FormTextArea.jsx";
-import FieldSet from "metabase/components/FieldSet.jsx";
-import PartialQueryBuilder from "../components/PartialQueryBuilder.jsx";
+import FormLabel from "../components/FormLabel";
+import FormInput from "../components/FormInput";
+import FormTextArea from "../components/FormTextArea";
+import FieldSet from "metabase/components/FieldSet";
+import PartialQueryBuilder from "../components/PartialQueryBuilder";
 import { t } from "ttag";
 import { formatValue } from "metabase/lib/formatting";
 

frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.jsx

 import React, { Component } from "react";
 import { connect } from "react-redux";
 
-import RevisionHistory from "../components/revisions/RevisionHistory.jsx";
+import RevisionHistory from "../components/revisions/RevisionHistory";
 import Metrics from "metabase/entities/metrics";
 import Segments from "metabase/entities/segments";
 

frontend/src/metabase/admin/datamodel/containers/SegmentApp.jsx

@@ -4,7 +4,7 @@ import { push } from "react-router-redux";
 
 import MetabaseAnalytics from "metabase/lib/analytics";
 
-import SegmentForm from "./SegmentForm.jsx";
+import SegmentForm from "./SegmentForm";
 
 import { updatePreviewSummary } from "../datamodel";
 import { getPreviewSummary } from "../selectors";

frontend/src/metabase/admin/datamodel/containers/SegmentForm.jsx

 import React, { Component } from "react";
 import { Link } from "react-router";
 
-import FormLabel from "../components/FormLabel.jsx";
-import FormInput from "../components/FormInput.jsx";
-import FormTextArea from "../components/FormTextArea.jsx";
-import FieldSet from "metabase/components/FieldSet.jsx";
-import PartialQueryBuilder from "../components/PartialQueryBuilder.jsx";
+import FormLabel from "../components/FormLabel";
+import FormInput from "../components/FormInput";
+import FormTextArea from "../components/FormTextArea";
+import FieldSet from "metabase/components/FieldSet";
+import PartialQueryBuilder from "../components/PartialQueryBuilder";
 import { t } from "ttag";
 import { formatValue } from "metabase/lib/formatting";
 
@@ -64,7 +64,7 @@ export default class SegmentForm extends Component {
       ...datasetQuery,
       query: {
         ...datasetQuery.query,
-        aggregation: ["count"],
+        aggregation: [["count"]],
       },
     });
   }

frontend/src/metabase/admin/datamodel/containers/TableSettingsApp.jsx

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import { t } from "ttag";
 import Breadcrumbs from "metabase/components/Breadcrumbs";
 import { BackButton } from "metabase/admin/datamodel/containers/FieldApp";
-import ActionButton from "metabase/components/ActionButton.jsx";
+import ActionButton from "metabase/components/ActionButton";
 import Section, { SectionHeader } from "../components/Section";
 
 import Databases from "metabase/entities/databases";

frontend/src/metabase/admin/people/components/GroupDetail.jsx

@@ -10,22 +10,22 @@ import {
   getGroupNameLocalized,
 } from "metabase/lib/groups";
 
-import colors from "metabase/lib/colors";
+import { color } from "metabase/lib/colors";
 
 import { PermissionsApi } from "metabase/services";
 import { t } from "ttag";
-import Icon from "metabase/components/Icon.jsx";
-import Popover from "metabase/components/Popover.jsx";
-import UserAvatar from "metabase/components/UserAvatar.jsx";
-import AdminEmptyText from "metabase/components/AdminEmptyText.jsx";
-import Alert from "metabase/components/Alert.jsx";
+import Icon from "metabase/components/Icon";
+import Popover from "metabase/components/Popover";
+import UserAvatar from "metabase/components/UserAvatar";
+import AdminEmptyText from "metabase/components/AdminEmptyText";
+import Alert from "metabase/components/Alert";
 
-import AdminContentTable from "metabase/components/AdminContentTable.jsx";
-import AdminPaneLayout from "metabase/components/AdminPaneLayout.jsx";
+import AdminContentTable from "metabase/components/AdminContentTable";
+import AdminPaneLayout from "metabase/components/AdminPaneLayout";
 
-import Typeahead from "metabase/hoc/Typeahead.jsx";
+import Typeahead from "metabase/hoc/Typeahead";
 
-import AddRow from "./AddRow.jsx";
+import AddRow from "./AddRow";
 
 const GroupDescription = ({ group }) =>
   isDefaultGroup(group) ? (
@@ -71,11 +71,11 @@ const AddMemberAutocompleteSuggestion = ({
 );
 
 const COLORS = [
-  colors["brand"],
-  colors["accent1"],
-  colors["accent2"],
-  colors["accent3"],
-  colors["accent4"],
+  color("brand"),
+  color("accent1"),
+  color("accent2"),
+  color("accent3"),
+  color("accent4"),
 ];
 
 const AddMemberTypeahead = Typeahead({

frontend/src/metabase/admin/people/components/GroupSelect.jsx

 import React from "react";
 
-import CheckBox from "metabase/components/CheckBox.jsx";
+import CheckBox from "metabase/components/CheckBox";
 
 import {
   isDefaultGroup,