From 060a7eb2590b4ea3aaefec17a7f1d1228071d8d7 Mon Sep 17 00:00:00 2001
From: Anton Kulyk <kuliks.anton@gmail.com>
Date: Thu, 12 Jan 2023 14:33:28 +0000
Subject: [PATCH] Merge `new_model` with `models` (#27645)
---
.../components/NewModelOption.jsx | 0
.../NewModelOptions}/NewModelOptions.jsx | 16 +++++++++-------
.../NewModelOptions}/NewModelOptions.styled.tsx | 0
.../models/containers/NewModelOptions/index.ts | 1 +
frontend/src/metabase/routes.jsx | 2 +-
5 files changed, 11 insertions(+), 8 deletions(-)
rename frontend/src/metabase/{new_model => models}/components/NewModelOption.jsx (100%)
rename frontend/src/metabase/{new_model/containers => models/containers/NewModelOptions}/NewModelOptions.jsx (94%)
rename frontend/src/metabase/{new_model/containers => models/containers/NewModelOptions}/NewModelOptions.styled.tsx (100%)
create mode 100644 frontend/src/metabase/models/containers/NewModelOptions/index.ts
diff --git a/frontend/src/metabase/new_model/components/NewModelOption.jsx b/frontend/src/metabase/models/components/NewModelOption.jsx
similarity index 100%
rename from frontend/src/metabase/new_model/components/NewModelOption.jsx
rename to frontend/src/metabase/models/components/NewModelOption.jsx
diff --git a/frontend/src/metabase/new_model/containers/NewModelOptions.jsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.jsx
similarity index 94%
rename from frontend/src/metabase/new_model/containers/NewModelOptions.jsx
rename to frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.jsx
index ee750cf955a..8be81fc942b 100644
--- a/frontend/src/metabase/new_model/containers/NewModelOptions.jsx
+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.jsx
@@ -3,13 +3,17 @@ import React, { Component } from "react";
import { connect } from "react-redux";
import { push } from "react-router-redux";
import { t } from "ttag";
+
+import { Grid } from "metabase/components/Grid";
+import NewModelOption from "metabase/models/components/NewModelOption";
+
import MetabaseSettings from "metabase/lib/settings";
import * as Urls from "metabase/lib/urls";
-import { Grid } from "metabase/components/Grid";
-import NewModelOption from "metabase/new_model/components/NewModelOption";
-import NoDatabasesEmptyState from "metabase/reference/databases/NoDatabasesEmptyState";
-import { getHasDataAccess, getHasNativeWrite } from "metabase/selectors/data";
import Database from "metabase/entities/databases";
+import { getHasDataAccess, getHasNativeWrite } from "metabase/selectors/data";
+
+import NoDatabasesEmptyState from "metabase/reference/databases/NoDatabasesEmptyState";
+
import {
OptionsGridItem,
OptionsRoot,
@@ -59,9 +63,7 @@ class NewModelOptions extends Component {
);
}
- {
- /* Determine how many items will be shown based on permissions etc so we can make sure the layout adapts */
- }
+ // Determine how many items will be shown based on permissions etc so we can make sure the layout adapts
const itemsCount = (hasDataAccess ? 1 : 0) + (hasNativeWrite ? 1 : 0);
return (
diff --git a/frontend/src/metabase/new_model/containers/NewModelOptions.styled.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
similarity index 100%
rename from frontend/src/metabase/new_model/containers/NewModelOptions.styled.tsx
rename to frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx
diff --git a/frontend/src/metabase/models/containers/NewModelOptions/index.ts b/frontend/src/metabase/models/containers/NewModelOptions/index.ts
new file mode 100644
index 00000000000..1c22815eb48
--- /dev/null
+++ b/frontend/src/metabase/models/containers/NewModelOptions/index.ts
@@ -0,0 +1 @@
+export { default } from "./NewModelOptions";
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index f04ab1b7c3c..17ad1c4b7e2 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -40,7 +40,7 @@ import UserCollectionList from "metabase/containers/UserCollectionList";
import PulseEditApp from "metabase/pulse/containers/PulseEditApp";
import SetupApp from "metabase/setup/containers/SetupApp";
-import NewModelOptions from "metabase/new_model/containers/NewModelOptions";
+import NewModelOptions from "metabase/models/containers/NewModelOptions";
import { Unauthorized } from "metabase/containers/ErrorPages";
import NotFoundFallbackPage from "metabase/containers/NotFoundFallbackPage";
--
GitLab