Skip to content
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

Jump to bottom

fix bug where error at import dashboard fails to show toast in "welcome" app #9714

Merged
merged 13 commits into from
May 8, 2020
Merged

fix bug where error at import dashboard fails to show toast in "welcome" app #9714

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5fbb5a9
fix bug where error at import dashboard fails
May 2, 2020
36f838b
remove console
May 4, 2020
ae95d5b
Merge branch 'master' of github.com:preset-io/incubator-superset into…
May 4, 2020
fbc4496
fix: make reusable component for messages and bring to app level
May 4, 2020
fbd82d7
fix: add liscence
May 5, 2020
ce88af2
fix: lint errors and tests
May 5, 2020
76b9462
Merge branch 'master' of github.com:preset-io/incubator-superset into…
May 5, 2020
fa828c6
fix
May 6, 2020
a2e6c65
fix: lint
May 7, 2020
280d740
Merge branch 'master' of github.com:preset-io/incubator-superset into…
May 7, 2020
7d42c3d
fix: lint error
May 7, 2020
16e09f9
add suggestions
May 7, 2020
d685820
add suggestions
May 7, 2020
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
10 changes: 9 additions & 1 deletion superset-frontend/spec/javascripts/views/dashboardList/DashboardList_spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,17 @@ fetchMock.get(dashboardsEndpoint, {
dashboard_count: 3,
});

const common = {
pkdotson marked this conversation as resolved.
Show resolved Hide resolved
config: {},
feature_flags: {},
language_pack: {},
local: '',
flash_messages: [],
}

describe('DashboardList', () => {
const mockedProps = {};
const wrapper = mount(<DashboardList {...mockedProps} />, {
const wrapper = mount(<DashboardList {...mockedProps} common={common}/>, {
context: { store },
});

Expand Down
9 changes: 8 additions & 1 deletion superset-frontend/src/views/dashboardList/DashboardList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ const PAGE_SIZE = 25;
interface Props {
addDangerToast: (msg: string) => void;
addSuccessToast: (msg: string) => void;
common: {
flash_messages: any[];
pkdotson marked this conversation as resolved.
Show resolved Hide resolved
};
}

interface State {
Expand Down Expand Up @@ -82,6 +85,11 @@ class DashboardList extends React.PureComponent<Props, State> {
};

componentDidMount() {
let messages = this.props.common.flash_messages;
if(messages.length > 0){
pkdotson marked this conversation as resolved.
Show resolved Hide resolved
let text = messages[0][1]
this.props.addDangerToast(text)
pkdotson marked this conversation as resolved.
Show resolved Hide resolved
}
Promise.all([
SupersetClient.get({
endpoint: `/api/v1/dashboard/_info`,
Expand Down Expand Up @@ -461,7 +469,6 @@ class DashboardList extends React.PureComponent<Props, State> {
filters,
dashboardToEdit,
} = this.state;

return (
<div className="container welcome">
<Panel>
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/src/welcome/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const container = document.getElementById('app');
const bootstrap = JSON.parse(container.getAttribute('data-bootstrap'));
const user = { ...bootstrap.user };
const menu = { ...bootstrap.common.menu_data };

const common = {...bootstrap.common}
initFeatureFlags(bootstrap.common.feature_flags);

const store = createStore(
Expand All @@ -56,7 +56,7 @@ const store = createStore(
{},
compose(applyMiddleware(thunk), initEnhancer(false)),
);

console.log('store', store)
pkdotson marked this conversation as resolved.
Show resolved Hide resolved
const App = () => (
<Provider store={store}>
<ThemeProvider theme={supersetTheme}>
Expand All @@ -68,7 +68,7 @@ const App = () => (
<Welcome user={user} />
</Route>
<Route path="/dashboard/list/">
<DashboardList user={user} />
<DashboardList user={user} common={common} />
pkdotson marked this conversation as resolved.
Show resolved Hide resolved
</Route>
<Route path="/chart/list/">
<ChartList user={user} />
Expand Down