Skip to content

[WIP][dashboard scoped filter] part 3: merge filter scope settings into dashboard redux state #8522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graceguo-supercat merged 7 commits into from
Nov 15, 2019
Merged

[WIP][dashboard scoped filter] part 3: merge filter scope settings into dashboard redux state #8522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d67e404
merge filter scope settings into dashboard redux state
Nov 11, 2019
5025b24
fix/add unit tests
Nov 11, 2019
edd4b28
minor bug fixes
Nov 11, 2019
83269e9
fix save filter Scopes behavior
Nov 12, 2019
43e1715
resolve review comments
Nov 14, 2019
5f42413
fix save filter scope settings
Nov 14, 2019
320bb3c
minor comments
Nov 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 49 additions & 21 deletions superset/assets/spec/javascripts/dashboard/actions/dashboardLayout_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
} from '../../../../src/dashboard/actions/dashboardLayout';

import { setUnsavedChanges } from '../../../../src/dashboard/actions/dashboardState';
import * as dashboardFilters from '../../../../src/dashboard/actions/dashboardFilters';
import {
addWarningToast,
ADD_TOAST,
Expand Down Expand Up @@ -80,6 +81,12 @@ describe('dashboardLayout actions', () => {

return { getState, dispatch, state };
}
beforeEach(() => {
sinon.spy(dashboardFilters, 'updateLayoutComponents');
});
afterEach(() => {
dashboardFilters.updateLayoutComponents.restore();
});

describe('updateComponents', () => {
it('should dispatch an updateLayout action', () => {
Expand All @@ -92,6 +99,9 @@ describe('dashboardLayout actions', () => {
type: UPDATE_COMPONENTS,
payload: { nextComponents },
});

// update component should not trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
});

it('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
Expand All @@ -101,8 +111,10 @@ describe('dashboardLayout actions', () => {
const nextComponents = { 1: {} };
const thunk = updateComponents(nextComponents);
thunk(dispatch, getState);
expect(dispatch.callCount).toBe(2);
expect(dispatch.getCall(1).args[0]).toEqual(setUnsavedChanges(true));

// update component should not trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
});
});

Expand All @@ -111,11 +123,13 @@ describe('dashboardLayout actions', () => {
const { getState, dispatch } = setup();
const thunk = deleteComponent('id', 'parentId');
thunk(dispatch, getState);
expect(dispatch.callCount).toBe(1);
expect(dispatch.getCall(0).args[0]).toEqual({
type: DELETE_COMPONENT,
payload: { id: 'id', parentId: 'parentId' },
});

// delete components should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});

it('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
Expand All @@ -124,8 +138,10 @@ describe('dashboardLayout actions', () => {
});
const thunk = deleteComponent('id', 'parentId');
thunk(dispatch, getState);
expect(dispatch.callCount).toBe(2);
expect(dispatch.getCall(1).args[0]).toEqual(setUnsavedChanges(true));
expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));

// delete components should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});
});

Expand All @@ -149,7 +165,8 @@ describe('dashboardLayout actions', () => {
},
});

expect(dispatch.callCount).toBe(2);
// update dashboard title should not trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
});
});

Expand All @@ -159,11 +176,13 @@ describe('dashboardLayout actions', () => {
const dropResult = {};
const thunk = createTopLevelTabs(dropResult);
thunk(dispatch, getState);
expect(dispatch.callCount).toBe(1);
expect(dispatch.getCall(0).args[0]).toEqual({
type: CREATE_TOP_LEVEL_TABS,
payload: { dropResult },
});

// create top level tabs should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});

it('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
Expand All @@ -173,8 +192,10 @@ describe('dashboardLayout actions', () => {
const dropResult = {};
const thunk = createTopLevelTabs(dropResult);
thunk(dispatch, getState);
expect(dispatch.callCount).toBe(2);
expect(dispatch.getCall(1).args[0]).toEqual(setUnsavedChanges(true));
expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));

// create top level tabs should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});
});

Expand All @@ -184,11 +205,13 @@ describe('dashboardLayout actions', () => {
const dropResult = {};
const thunk = deleteTopLevelTabs(dropResult);
thunk(dispatch, getState);
expect(dispatch.callCount).toBe(1);
expect(dispatch.getCall(0).args[0]).toEqual({
type: DELETE_TOP_LEVEL_TABS,
payload: {},
});

// delete top level tabs should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});

it('should dispatch a setUnsavedChanges action if hasUnsavedChanges=false', () => {
Expand All @@ -198,8 +221,10 @@ describe('dashboardLayout actions', () => {
const dropResult = {};
const thunk = deleteTopLevelTabs(dropResult);
thunk(dispatch, getState);
expect(dispatch.callCount).toBe(2);
expect(dispatch.getCall(1).args[0]).toEqual(setUnsavedChanges(true));
expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));

// delete top level tabs should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});
});

Expand Down Expand Up @@ -261,6 +286,9 @@ describe('dashboardLayout actions', () => {
thunk2(dispatch, getState);

expect(dispatch.callCount).toBe(3);

// resize components should not trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(0);
});
});

Expand All @@ -286,7 +314,8 @@ describe('dashboardLayout actions', () => {
},
});

expect(dispatch.callCount).toBe(2);
// create components should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});

it('should move a component if the component is not new', () => {
Expand Down Expand Up @@ -315,7 +344,8 @@ describe('dashboardLayout actions', () => {
},
});

expect(dispatch.callCount).toBe(2);
// create components should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});

it('should dispatch a toast if the drop overflows the destination', () => {
Expand Down Expand Up @@ -379,9 +409,6 @@ describe('dashboardLayout actions', () => {
parentId: 'parentId',
},
});

// move thunk, delete thunk, delete result actions
expect(dispatch.callCount).toBe(3);
});

it('should create top-level tabs if dropped on root', () => {
Expand All @@ -404,8 +431,6 @@ describe('dashboardLayout actions', () => {
dropResult,
},
});

expect(dispatch.callCount).toBe(2);
});

it('should dispatch a toast if drop top-level tab into nested tab', () => {
Expand Down Expand Up @@ -497,8 +522,10 @@ describe('dashboardLayout actions', () => {
const thunk = redoLayoutAction();
thunk(dispatch, getState);

expect(dispatch.callCount).toBe(1);
expect(dispatch.getCall(0).args[0]).toEqual(UndoActionCreators.redo());

// redo/undo should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});

it('should dispatch a setUnsavedChanges(true) action if hasUnsavedChanges=false', () => {
Expand All @@ -507,9 +534,10 @@ describe('dashboardLayout actions', () => {
});
const thunk = redoLayoutAction();
thunk(dispatch, getState);
expect(dispatch.getCall(2).args[0]).toEqual(setUnsavedChanges(true));

expect(dispatch.callCount).toBe(2);
expect(dispatch.getCall(1).args[0]).toEqual(setUnsavedChanges(true));
// redo/undo should trigger action for dashboardFilters
expect(dashboardFilters.updateLayoutComponents.callCount).toEqual(1);
});
});
});
Loading