[dashboard] Fix save issue at Force_V2_Edit mode #5360

graceguo-supercat · 2018-07-07T00:00:14Z

Fix 2 issues for dashboard when set config
CAN_FALLBACK_TO_DASH_V1_EDIT_MODE = False

if dashboard is still in v1 mode:

for dashboard owner/viewer, can see/edit dashboard in v1 mode.
for dashboard owner/viewer, cannot save/save-as dashboard to v1 mode.
for dashboard owner, if they click on Edit dashboard button in V1 mode, we will show dashboard in v2 preview mode, and user can convert and save dashboard to v2 mode.

williaster · 2018-07-07T00:15:41Z

superset/assets/src/dashboard/deprecated/v1/components/Controls.jsx

@@ -144,6 +144,7 @@ class Controls extends React.PureComponent {
            }
          />
          {dashboard.dash_save_perm &&
+            dashboard.force_v2_edit &&


should this be negated? !dashboard.force_v2_edit

force_v2_edit is true when CAN_FALLBACK_TO_DASH_V1_EDIT_MODE is false. Here is to overrule user level save_perm and hide save button.

williaster · 2018-07-07T00:19:28Z

superset/assets/src/dashboard/deprecated/v1/components/Header.jsx

@@ -43,25 +43,11 @@ class Header extends React.PureComponent {
      showV2PromptModal: props.dashboard.promptV2Conversion,
    };
    this.toggleShowV2PromptModal = this.toggleShowV2PromptModal.bind(this);
-    this.handleConvertToV2 = this.handleConvertToV2.bind(this);
+    this.handleConvertToV2 = props.handleConvertToV2.bind(this);


why do you need to bind a props func? it's already bound at the dashboard level right?

handleConvertToV2 is refactored out into Dashboard component

right but you don't need to bind a function that comes from props.

yes.... fixed.

williaster · 2018-07-07T00:21:19Z

superset/views/core.py

@@ -2169,6 +2169,8 @@ def dashboard(self, dashboard_id):
            else:
                dashboard_view = 'v1'
                prompt_v2_conversion = not force_v1
+                if force_v2_edit:


is this needed for removing the save as dropdown option in a v1 app? Does this still allow you to click edit when viewing a v1 dashboard to go to the v2 page?

williaster

thanks for working on a fix for this! I had a couple questions.

codecov-io · 2018-07-07T00:23:03Z

Codecov Report

Merging #5360 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #5360      +/-   ##
==========================================
- Coverage   61.32%   61.31%   -0.01%     
==========================================
  Files         369      369              
  Lines       23494    23497       +3     
  Branches     2714     2715       +1     
==========================================
  Hits        14407    14407              
- Misses       9075     9078       +3     
  Partials       12       12

Impacted Files	Coverage Δ
.../src/dashboard/deprecated/v1/components/Header.jsx	`0% <ø> (ø)`	⬆️
...c/dashboard/deprecated/v1/components/Dashboard.jsx	`0% <0%> (ø)`	⬆️
superset/views/core.py	`72.86% <0%> (-0.11%)`	⬇️
...rc/dashboard/deprecated/v1/components/Controls.jsx	`0% <0%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7222c6f...b392e6a. Read the comment docs.

graceguo-supercat · 2018-07-07T02:49:06Z

superset/assets/src/dashboard/deprecated/v1/components/Header.jsx

  }
  handleSaveTitle(title) {
    this.props.updateDashboardTitle(title);
  }
-  handleConvertToV2(editMode) {


here, handleConvertToV2 is refactored out into Dashboard component, since this function is called from both Dashboard and Header component.

graceguo-supercat · 2018-07-07T03:00:54Z

superset/views/core.py

@@ -2169,6 +2169,8 @@ def dashboard(self, dashboard_id):
            else:
                dashboard_view = 'v1'
                prompt_v2_conversion = not force_v1
+                if force_v2_edit:
+                    dash_edit_perm = False


this line disallow owner to save original v1 dashboard copy. Edit dashboard button in Header controls used dash_save_perm, which is not affected.

williaster

nice! thanks again for looking at this 🙌

(cherry picked from commit a17f714)

graceguo-supercat requested a review from williaster July 7, 2018 00:03

williaster reviewed Jul 7, 2018

View reviewed changes

graceguo-supercat commented Jul 7, 2018

View reviewed changes

[dashboard] Fix save issue at Force_V2_Edit mode

b392e6a

graceguo-supercat force-pushed the gg-DisableDashV1Edit branch from 84838f7 to b392e6a Compare July 7, 2018 03:13

williaster approved these changes Jul 7, 2018

View reviewed changes

graceguo-supercat merged commit a17f714 into apache:master Jul 7, 2018

graceguo-supercat deleted the gg-DisableDashV1Edit branch July 7, 2018 03:53

graceguo-supercat pushed a commit to graceguo-supercat/superset that referenced this pull request Jul 9, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

c32300d

(cherry picked from commit a17f714)

xumiao pushed a commit to xumiao/supernorm that referenced this pull request Jul 16, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

424be6f

timifasubaa pushed a commit to airbnb/superset-fork that referenced this pull request Jul 25, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

c13c7f1

mistercrunch pushed a commit to lyft/incubator-superset that referenced this pull request Jul 27, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

43d19cb

(cherry picked from commit a17f714)

mistercrunch pushed a commit to lyft/incubator-superset that referenced this pull request Jul 31, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

a117036

(cherry picked from commit a17f714)

mistercrunch pushed a commit to lyft/incubator-superset that referenced this pull request Aug 3, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

bdb4dbc

(cherry picked from commit a17f714)

mistercrunch pushed a commit to lyft/incubator-superset that referenced this pull request Aug 3, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

3f04bb5

(cherry picked from commit a17f714)

mistercrunch pushed a commit to lyft/incubator-superset that referenced this pull request Aug 4, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

fd94f75

(cherry picked from commit a17f714)

mistercrunch pushed a commit to lyft/incubator-superset that referenced this pull request Aug 4, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

4385e81

(cherry picked from commit a17f714)

mistercrunch pushed a commit that referenced this pull request Aug 12, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (#5360)

67b1386

wenchma pushed a commit to wenchma/incubator-superset that referenced this pull request Nov 16, 2018

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

be2e95a

mistercrunch added 🍒 0.27.0 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 0.28.0 labels Feb 27, 2024

cccs-rc pushed a commit to CybercentreCanada/superset that referenced this pull request Mar 6, 2024

[dashboard] Fix save issue at Force_V2_Edit mode (apache#5360)

1600f30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[dashboard] Fix save issue at Force_V2_Edit mode #5360

[dashboard] Fix save issue at Force_V2_Edit mode #5360

graceguo-supercat commented Jul 7, 2018 •

edited

Loading

williaster Jul 7, 2018

graceguo-supercat Jul 7, 2018 •

edited

Loading

williaster Jul 7, 2018 •

edited

Loading

graceguo-supercat Jul 7, 2018

williaster Jul 7, 2018

graceguo-supercat Jul 7, 2018

williaster Jul 7, 2018

williaster left a comment •

edited

Loading

codecov-io commented Jul 7, 2018 •

edited

Loading

graceguo-supercat Jul 7, 2018

graceguo-supercat Jul 7, 2018 •

edited

Loading

williaster left a comment

[dashboard] Fix save issue at Force_V2_Edit mode #5360

[dashboard] Fix save issue at Force_V2_Edit mode #5360

Conversation

graceguo-supercat commented Jul 7, 2018 • edited Loading

williaster Jul 7, 2018

Choose a reason for hiding this comment

graceguo-supercat Jul 7, 2018 • edited Loading

Choose a reason for hiding this comment

williaster Jul 7, 2018 • edited Loading

Choose a reason for hiding this comment

graceguo-supercat Jul 7, 2018

Choose a reason for hiding this comment

williaster Jul 7, 2018

Choose a reason for hiding this comment

graceguo-supercat Jul 7, 2018

Choose a reason for hiding this comment

williaster Jul 7, 2018

Choose a reason for hiding this comment

williaster left a comment • edited Loading

Choose a reason for hiding this comment

codecov-io commented Jul 7, 2018 • edited Loading

Codecov Report

graceguo-supercat Jul 7, 2018

Choose a reason for hiding this comment

graceguo-supercat Jul 7, 2018 • edited Loading

Choose a reason for hiding this comment

williaster left a comment

Choose a reason for hiding this comment

graceguo-supercat commented Jul 7, 2018 •

edited

Loading

graceguo-supercat Jul 7, 2018 •

edited

Loading

williaster Jul 7, 2018 •

edited

Loading

williaster left a comment •

edited

Loading

codecov-io commented Jul 7, 2018 •

edited

Loading

graceguo-supercat Jul 7, 2018 •

edited

Loading