additional functionality

apache · May 6, 2022 · ed88c67 · ed88c67
1 parent 51455c8
commit ed88c67
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/superset-frontend/src/addSlice/AddSliceContainer.test.tsx b/superset-frontend/src/addSlice/AddSliceContainer.test.tsx
@@ -81,7 +81,7 @@ describe('AddSliceContainer', () => {
       visType: 'table',
     });
     const formattedUrl =
-      '/superset/explore/?form_data=%7B%22viz_type%22%3A%22table%22%2C%22datasource%22%3A%221%22%7D';
+      '/superset/explore/?form_data=%7B%22viz_type%22%3A%22table%22%2C%22datasource%22%3A%221%22%7D&';
     expect(wrapper.instance().exploreUrl()).toBe(formattedUrl);
   });
 });
diff --git a/superset-frontend/src/addSlice/AddSliceContainer.tsx b/superset-frontend/src/addSlice/AddSliceContainer.tsx
@@ -195,13 +195,13 @@ export default class AddSliceContainer extends React.PureComponent<
   }
 
   exploreUrl() {
-    const url = window.location.href;
-    const dashboardTitleIndex = url.search('dashboardTitle:');
-    const dashboardExists = dashboardTitleIndex !== -1;
+    const url = window.location.search;
+    const urlParams = new URLSearchParams(url);
+    const dashboardExists = urlParams.has('dashboardInfo');
+    const dashboardInfo = urlParams.get('dashboardInfo');
     const dashboardTitle = dashboardExists
-      ? `dashboardTitle: ${url.slice(dashboardTitleIndex + 15)}`
+      ? `dashboardInfo=${dashboardInfo}`
       : '';
-    // 15 is how long dashboardtitle: is//
     const formData = encodeURIComponent(
       JSON.stringify({
         viz_type: this.state.visType,

diff --git a/superset-frontend/src/dashboard/components/DashboardGrid.jsx b/superset-frontend/src/dashboard/components/DashboardGrid.jsx
@@ -154,6 +154,12 @@ class DashboardGrid extends React.PureComponent {
     const shouldDisplayTopLevelTabEmptyState =
       shouldDisplayEmptyState && gridComponent.type === TAB_TYPE;
 
+    const dashboardProps = encodeURIComponent(
+      JSON.stringify({
+        value: this.props.dashboardId,
+      }),
+    );
+
     const dashboardEmptyState = editMode && (
       <EmptyStateBig
         title={t('Drag and drop components and charts to the dashboard')}
@@ -168,7 +174,7 @@ class DashboardGrid extends React.PureComponent {
         }
         buttonAction={() => {
           window.open(
-            `/chart/add?dashboardTitle:${this.props.dashboardTitle}`,
+            `/chart/add?dashboardInfo=${dashboardProps}`,
             '_blank',
             'noopener noreferrer',
           );
@@ -190,11 +196,7 @@ class DashboardGrid extends React.PureComponent {
           </>
         }
         buttonAction={() => {
-          window.open(
-            `/chart/add?${this.props.dashboardTitle}`,
-            '_blank',
-            'noopener noreferrer',
-          );
+          window.open('/chart/add', '_blank', 'noopener noreferrer');
         }}
         image="chart.svg"
       />

diff --git a/superset-frontend/src/dashboard/containers/DashboardGrid.jsx b/superset-frontend/src/dashboard/containers/DashboardGrid.jsx
@@ -30,7 +30,7 @@ function mapStateToProps({ dashboardState, dashboardInfo }) {
   return {
     editMode: dashboardState.editMode,
     canEdit: dashboardInfo.dash_edit_perm,
-    dashboardTitle: dashboardInfo.dashboard_title,
+    dashboardId: dashboardInfo.id,
   };
 }
 

diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx
@@ -32,7 +32,9 @@ import { connect } from 'react-redux';
 
 // Session storage key for recent dashboard
 const SK_DASHBOARD_ID = 'save_chart_recent_dashboard';
-const SELECT_PLACEHOLDER = t('**Select** a dashboard OR **create** a new one');
+const SELECT_PLACEHOLDER = t(
+  '**Select** a dashboard OR type in a title to **create** a new one',
+);
 
 type SaveModalProps = {
   onHide: () => void;
@@ -55,6 +57,7 @@ type SaveModalState = {
   newDashboardName?: string;
   alert: string | null;
   action: ActionType;
+  newlyCreatedDashboard?: number;
 };
 
 export const StyledModal = styled(Modal)`
@@ -174,9 +177,20 @@ class SaveModal extends React.Component<SaveModalProps, SaveModalState> {
     this.setState({ alert: null });
   }
 
+  newlyCreatedDashboardName(): number | null {
+    const url = window.location.search;
+    const urlParams = new URLSearchParams(url);
+    const dashInfoExists = urlParams.has('dashboardInfo');
+    const stringifiedDash = dashInfoExists && urlParams.get('dashboardInfo');
+    const dashboardInfo = stringifiedDash && JSON.parse(stringifiedDash);
+    return dashboardInfo.value;
+  }
+
   render() {
     const dashboardSelectValue =
-      this.state.saveToDashboardId || this.state.newDashboardName;
+      this.state.saveToDashboardId ||
+      this.state.newDashboardName ||
+      this.newlyCreatedDashboardName();
     return (
       <StyledModal
         show