Merge pull request #3484 from metabase/fix-persistent-qb-newb-modal-2

Don't show 'qbnewb' modal more than once.

frontend/src/metabase/query_builder/reducers.js

@@ -37,13 +37,6 @@ import {
     SET_CURRENT_STATE
 } from "./actions";
 
-
-// TODO: once we are using the global redux store we can get this from there
-export const user = handleActions({
-    [CLOSE_QB_NEWB_MODAL]: { next: (state, { payload }) => ({...state, is_qbnewb: false}) }
-}, null);
-
-
 // various ui state options
 export const uiControls = handleActions({
     [INITIALIZE_QB]: { next: (state, { payload }) => ({ ...state, ...payload.uiControls }) },

frontend/src/metabase/user.js

 import { createAction } from "redux-actions";
 import { handleActions } from 'redux-actions';
 
+import { CLOSE_QB_NEWB_MODAL } from "metabase/query_builder/actions";
 
 export const setUser = createAction("SET_USER");
 
@@ -19,5 +20,6 @@ export const refreshCurrentUser = createAction("REFRESH_CURRENT_USER", async fun
 export const currentUser = handleActions({
     ["SET_USER"]: { next: (state, { payload }) => payload },
     ["REFRESH_CURRENT_USER"]: { next: (state, { payload }) => payload },
-    ["AUTH_LOGOUT"]: { next: (state, { payload }) => null }
+    ["AUTH_LOGOUT"]: { next: (state, { payload }) => null },
+    [CLOSE_QB_NEWB_MODAL]: { next: (state, { payload }) => ({ ...state, is_qbnewb: false }) },
 }, null);