Move admin/datamodel/metadata.js to admin/datamodel/datamodel.js

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

@@ -17,7 +17,7 @@ import {
     getEditingDatabaseWithTableMetadataStrengths,
     getEditingTable
 } from "../selectors";
-import * as metadataActions from "../metadata";
+import * as metadataActions from "../datamodel";
 
 const mapStateToProps = (state, props) => {
     return {

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

@@ -7,7 +7,7 @@ import MetabaseAnalytics from "metabase/lib/analytics";
 import MetricForm from "./MetricForm.jsx";
 
 import { metricEditSelectors } from "../selectors";
-import * as actions from "../metadata";
+import * as actions from "../datamodel";
 import { clearRequestState } from "metabase/redux/requests";
 
 const mapDispatchToProps = {

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

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import RevisionHistory from "../components/revisions/RevisionHistory.jsx";
 
 import { revisionHistorySelectors } from "../selectors";
-import * as actions from "../metadata";
+import * as actions from "../datamodel";
 
 const mapStateToProps = (state, props) => {
     return {

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

@@ -7,7 +7,7 @@ import MetabaseAnalytics from "metabase/lib/analytics";
 import SegmentForm from "./SegmentForm.jsx";
 
 import { segmentEditSelectors } from "../selectors";
-import * as actions from "../metadata";
+import * as actions from "../datamodel";
 import { clearRequestState } from "metabase/redux/requests";
 
 const mapDispatchToProps = {

frontend/src/metabase/admin/datamodel/metadata.js → frontend/src/metabase/admin/datamodel/datamodel.js

@@ -4,7 +4,6 @@ import { handleActions, combineReducers, AngularResourceProxy, createAction, cre
 import { push } from "react-router-redux";
 
 import MetabaseAnalytics from "metabase/lib/analytics";
-import { augmentTable } from "metabase/lib/table";
 import { loadTableAndForeignKeys } from "metabase/lib/table";
 import { isFK } from "metabase/lib/types";
 

frontend/src/metabase/reducers.js

@@ -11,7 +11,7 @@ import requests from "metabase/redux/requests";
 import settings from "metabase/admin/settings/settings";
 import people from "metabase/admin/people/people";
 import databases from "metabase/admin/databases/database";
-import datamodel from "metabase/admin/datamodel/metadata";
+import datamodel from "metabase/admin/datamodel/datamodel";
 import permissions from "metabase/admin/permissions/permissions";
 
 /* dashboards */