[superset] branch master updated: fix(Dashboard): Only apply changes when editing properties (#17392)

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

diegopucci pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 0712be4  fix(Dashboard): Only apply changes when editing properties (#17392)
0712be4 is described below

commit 0712be4c124ff90152d80c8bb11444415db4a7c7
Author: Geido <60...@users.noreply.github.com>
AuthorDate: Fri Nov 12 19:34:21 2021 +0200

    fix(Dashboard): Only apply changes when editing properties (#17392)
    
    * Apply only
    
    * Test apply button
    
    * Update Cypress
    
    * Rename test
---
 .../cypress/integration/dashboard/edit_properties.test.ts     |  2 +-
 .../HeaderActionsDropdown/HeaderActionsDropdown.test.tsx      | 11 ++++++++++-
 superset-frontend/src/dashboard/components/Header/index.jsx   |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
index 9e2fe49..1cb84b3 100644
--- a/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/dashboard/edit_properties.test.ts
@@ -103,7 +103,7 @@ describe('Dashboard edit action', () => {
 
     // save edit changes
     cy.get('.ant-modal-footer')
-      .contains('Save')
+      .contains('Apply')
       .click()
       .then(() => {
         // assert that modal edit window has closed
diff --git a/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx b/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx
index 1b1cb30..d6d20c8 100644
--- a/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx
+++ b/superset-frontend/src/dashboard/components/Header/HeaderActionsDropdown/HeaderActionsDropdown.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
 import fetchMock from 'fetch-mock';
 import { HeaderDropdownProps } from 'src/dashboard/components/Header/types';
@@ -198,3 +198,12 @@ test('should show the properties modal', async () => {
   userEvent.click(screen.getByText('Edit dashboard properties'));
   expect(editModeOnProps.showPropertiesModal).toHaveBeenCalledTimes(1);
 });
+
+test('should display the Apply button when opening the modal', async () => {
+  render(setup(editModeOnProps));
+  await openDropdown();
+  userEvent.click(screen.getByText('Edit dashboard properties'));
+  waitFor(() => {
+    expect(screen.getByRole('button', { name: 'Apply' })).toBeInTheDocument();
+  });
+});
diff --git a/superset-frontend/src/dashboard/components/Header/index.jsx b/superset-frontend/src/dashboard/components/Header/index.jsx
index 1fb26eb..4dff0e4 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -629,6 +629,7 @@ class Header extends React.PureComponent {
                   );
                 }
               }}
+              onlyApply
             />
           )}