You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ly...@apache.org on 2022/08/11 13:07:31 UTC
[superset] 02/04: elizabeth review
This is an automated email from the ASF dual-hosted git repository.
lyndsi pushed a commit to branch lyndsi/create-dataset-blank-state
in repository https://gitbox.apache.org/repos/asf/superset.git
commit d1ac6b04b80208860586bba3a88cb0b984d84da2
Author: AAfghahi <ar...@gmail.com>
AuthorDate: Thu Jul 28 10:55:11 2022 -0400
elizabeth review
---
.../DatasetPanel/index.tsx} | 0
.../Footer.tsx => DatasetCreator/Footer/index.tsx} | 0
.../LeftPanel/index.tsx} | 0
.../DatasetPanel.tsx => DatasetCreator/index.tsx} | 19 ++++++++++++++--
.../DatasetPanel/{DatasetPanel.tsx => index.tsx} | 0
.../LeftPanel.tsx => RightPanel/index.tsx} | 2 +-
.../CRUD/data/dataset/DatasetEditor/index.tsx | 26 +++++++++-------------
.../Header/Header.tsx => Header/index.tsx} | 0
superset/views/datasource/views.py | 5 +----
9 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/DatasetPanel.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/DatasetPanel/index.tsx
similarity index 100%
copy from superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/DatasetPanel.tsx
copy to superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/DatasetPanel/index.tsx
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/Footer/Footer.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/Footer/index.tsx
similarity index 100%
rename from superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/Footer/Footer.tsx
rename to superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/Footer/index.tsx
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/LeftPanel/LeftPanel.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/LeftPanel/index.tsx
similarity index 100%
copy from superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/LeftPanel/LeftPanel.tsx
copy to superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/LeftPanel/index.tsx
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/DatasetPanel.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/index.tsx
similarity index 68%
copy from superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/DatasetPanel.tsx
copy to superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/index.tsx
index 9fe93b8fb5..93fc0db408 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/DatasetPanel.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetCreator/index.tsx
@@ -17,7 +17,22 @@
* under the License.
*/
import React from 'react';
+import DatasetPanel from './DatasetPanel';
+import Footer from './Footer';
+import LeftPanel from './LeftPanel';
+import Header from '../Header';
-export default function DatasetPanel() {
- return <div>Dataset Panel</div>;
+export default function DatasetCreator() {
+ return (
+ <div>
+ <Header />
+ <div css={{ display: 'flex' }}>
+ <LeftPanel />
+ <div>
+ <DatasetPanel />
+ <Footer />
+ </div>
+ </div>
+ </div>
+ );
}
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/DatasetPanel.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/index.tsx
similarity index 100%
rename from superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/DatasetPanel.tsx
rename to superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/DatasetPanel/index.tsx
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/LeftPanel/LeftPanel.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/RightPanel/index.tsx
similarity index 96%
rename from superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/LeftPanel/LeftPanel.tsx
rename to superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/RightPanel/index.tsx
index 5ffb6a12c9..b4f7df73a2 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/LeftPanel/LeftPanel.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/RightPanel/index.tsx
@@ -19,5 +19,5 @@
import React from 'react';
export default function LeftPanel() {
- return <div>Left Panel</div>;
+ return <div>Right Panel</div>;
}
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/index.tsx
index f57e4c3c63..8e7ab900ac 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/index.tsx
@@ -17,24 +17,18 @@
* under the License.
*/
import React from 'react';
-import DatasetPanel from './DatasetPanel/DatasetPanel';
-import Footer from './Footer/Footer';
-import LeftPanel from './LeftPanel/LeftPanel';
-import Header from './Header/Header';
+import Header from '../Header';
+import DatasetPanel from './DatasetPanel';
+import RightPanel from './RightPanel';
-export default function DatasetEditor() {
+export default function DatasetCreator() {
return (
- <>
- <div>
- <Header />
- <div css={{ display: 'flex' }}>
- <LeftPanel />
- <div>
- <DatasetPanel />
- <Footer />
- </div>
- </div>
+ <div>
+ <Header />
+ <div css={{ display: 'flex' }}>
+ <DatasetPanel />
+ <RightPanel />
</div>
- </>
+ </div>
);
}
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/Header/Header.tsx b/superset-frontend/src/views/CRUD/data/dataset/Header/index.tsx
similarity index 100%
rename from superset-frontend/src/views/CRUD/data/dataset/DatasetEditor/Header/Header.tsx
rename to superset-frontend/src/views/CRUD/data/dataset/Header/index.tsx
diff --git a/superset/views/datasource/views.py b/superset/views/datasource/views.py
index 2c137fab79..2dbe81e289 100644
--- a/superset/views/datasource/views.py
+++ b/superset/views/datasource/views.py
@@ -19,7 +19,7 @@ from collections import Counter
from typing import Any
from flask import redirect, request
-from flask_appbuilder import expose, permission_name
+from flask_appbuilder import expose
from flask_appbuilder.api import rison
from flask_appbuilder.security.decorators import has_access, has_access_api
from flask_babel import _
@@ -207,11 +207,9 @@ class Datasource(BaseSupersetView):
class DatasetEditor(BaseSupersetView):
route_base = "/dataset"
- class_permission_name = "Dataset"
@expose("/add/")
@has_access
- @permission_name("read")
def root(self) -> FlaskResponse:
dev = request.args.get("testing")
if dev is not None:
@@ -220,7 +218,6 @@ class DatasetEditor(BaseSupersetView):
@expose("/<pk>", methods=["GET"])
@has_access
- @permission_name("read")
# pylint: disable=unused-argument
def show(self, pk: int) -> FlaskResponse:
dev = request.args.get("testing")