feat: prep for modern challenges (#15781)
* feat(seed): Add modern challenge * chore(react): Use prop-types package * feat: Initial refactor to redux-first-router BREAKING CHANGE: Everything is different! * feat: First rendering * feat(routes): Challenges view render but failing * fix(Challenges): Remove contain HOC * fix(RFR): Add params selector * fix(RFR): :en should be :lang * fix: Update berks utils for redux * fix(Map): Challenge link to arg * fix(Map): Add trailing slash to map page * fix(RFR): Use FCC Link Use fcc Link to get around issue of lang being undefined * fix(Router): Link to is required * fix(app): Rely on RFR state for app lang * chore(RFR): Remove unused RFR Link * fix(RFR): Hydrate initial challenge using RFR and RO * fix: Casing issue * fix(RFR): Undefined links * fix(RFR): Use onRoute<name> convention for route types * feat(server/react): Add helpful redux logging/throwing * fix(server/react): Strip out nonjson from state This prevents thunks in routesMap from breaking serialization * fix(RFR/Link): Should accept any renderable * fix(RFR): Get redirects working * fix(RFR): Redirects and not found's * fix(Map): Move challenge onClick handler * fix(Map): Allow Router.link to handle clicks after onClick * fix(routes): Remove react-router-redux * feat(Router): Add lang to all route actions by default * fix(entities): Only fetch challenge if not already loaded * fix(Files): Move files to own feature * chore(Challenges): Remove vestigial hints logic * fix(RFR): Update challenges on route challenges * fix(code-storage): Should use events instead of commands * fix(Map): ClickOnMap should not hold on to event * chore(lint): Use eslint-config-freecodecamp Closes #15938 * feat(Panes): Update panes on route instead of render * fix(Panes): Store panesmap and update on fetchchallenges * fix(Panes): Normalize panesmaps * fix(Panes): Remove filter from createpanemap * fix(Panes): Middleware on location meta object * feat(Panes): Filter preview on nonhtml challenges * build(babel): Add lodash babel plugin * chore(lint): Lint js files * fix(server/user-stats): Remove use of lodash chain this interferes with babel-plugin-lodash * feat(dev): Add remote redux devtools for ssr * fix(Panes): Dispatch mount action this is needed to trigger window/divider epics * fix(Panes): Getpane to use new panesmap format * fix(Panes): Always update panes after state this lets the panes logic be affected by changes in state
This commit is contained in:
committed by
Quincy Larson
parent
2e46e60557
commit
dbecdc5618
@@ -1,23 +1,22 @@
|
||||
import { createTypes } from 'redux-create-types';
|
||||
import { createAction, handleActions } from 'redux-actions';
|
||||
import {
|
||||
composeReducers,
|
||||
createAction,
|
||||
createTypes,
|
||||
handleActions
|
||||
} from 'berkeleys-redux-utils';
|
||||
|
||||
import { types as app } from '../routes/Challenges/redux';
|
||||
|
||||
export const ns = 'entities';
|
||||
export const getNS = state => state[ns];
|
||||
export const entitiesSelector = getNS;
|
||||
export const types = createTypes([
|
||||
'updateUserPoints',
|
||||
'updateUserFlag',
|
||||
'updateUserEmail',
|
||||
'updateUserLang',
|
||||
'updateUserChallenge',
|
||||
'updateUserCurrentChallenge'
|
||||
], ns);
|
||||
|
||||
// updateUserPoints(username: String, points: Number) => Action
|
||||
export const updateUserPoints = createAction(
|
||||
types.updateUserPoints,
|
||||
(username, points) => ({ username, points })
|
||||
);
|
||||
// updateUserFlag(username: String, flag: String) => Action
|
||||
export const updateUserFlag = createAction(
|
||||
types.updateUserFlag,
|
||||
@@ -34,21 +33,12 @@ export const updateUserLang = createAction(
|
||||
(username, lang) => ({ username, languageTag: lang })
|
||||
);
|
||||
|
||||
// updateUserChallenge(
|
||||
// username: String,
|
||||
// challengeInfo: Object
|
||||
// ) => Action
|
||||
export const updateUserChallenge = createAction(
|
||||
types.updateUserChallenge,
|
||||
(username, challengeInfo) => ({ username, challengeInfo })
|
||||
);
|
||||
|
||||
export const updateUserCurrentChallenge = createAction(
|
||||
types.updateUserCurrentChallenge
|
||||
);
|
||||
|
||||
|
||||
const initialState = {
|
||||
const defaultState = {
|
||||
superBlock: {},
|
||||
block: {},
|
||||
challenge: {},
|
||||
@@ -69,14 +59,33 @@ export function makeSuperBlockSelector(name) {
|
||||
};
|
||||
}
|
||||
|
||||
export default function createReducer() {
|
||||
const userReducer = handleActions(
|
||||
{
|
||||
[types.updateUserPoints]: (state, { payload: { username, points } }) => ({
|
||||
export const isChallengeLoaded = (state, { dashedName }) =>
|
||||
!!challengeMapSelector(state)[dashedName];
|
||||
|
||||
export default composeReducers(
|
||||
ns,
|
||||
function metaReducer(state = defaultState, action) {
|
||||
if (action.meta && action.meta.entities) {
|
||||
return {
|
||||
...state,
|
||||
...action.meta.entities
|
||||
};
|
||||
}
|
||||
return state;
|
||||
},
|
||||
handleActions(
|
||||
() => ({
|
||||
[
|
||||
app.submitChallenge.complete
|
||||
]: (state, { payload: { username, points, challengeInfo } }) => ({
|
||||
...state,
|
||||
[username]: {
|
||||
...state[username],
|
||||
points
|
||||
points,
|
||||
challengeMap: {
|
||||
...state[username].challengeMap,
|
||||
[challengeInfo.id]: challengeInfo
|
||||
}
|
||||
}
|
||||
}),
|
||||
[types.updateUserFlag]: (state, { payload: { username, flag } }) => ({
|
||||
@@ -118,46 +127,8 @@ export default function createReducer() {
|
||||
...state[username],
|
||||
currentChallengeId
|
||||
}
|
||||
}),
|
||||
[types.updateUserChallenge]:
|
||||
(
|
||||
state,
|
||||
{
|
||||
payload: { username, challengeInfo }
|
||||
}
|
||||
) => ({
|
||||
...state,
|
||||
[username]: {
|
||||
...state[username],
|
||||
challengeMap: {
|
||||
...state[username].challengeMap,
|
||||
[challengeInfo.id]: challengeInfo
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
initialState.user
|
||||
);
|
||||
|
||||
function metaReducer(state = initialState, action) {
|
||||
if (action.meta && action.meta.entities) {
|
||||
return {
|
||||
...state,
|
||||
...action.meta.entities
|
||||
};
|
||||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
function entitiesReducer(state, action) {
|
||||
const newState = metaReducer(state, action);
|
||||
const user = userReducer(newState.user, action);
|
||||
if (newState.user !== user) {
|
||||
return { ...newState, user };
|
||||
}
|
||||
return newState;
|
||||
}
|
||||
|
||||
entitiesReducer.toString = () => ns;
|
||||
return entitiesReducer;
|
||||
}
|
||||
}),
|
||||
defaultState
|
||||
)
|
||||
);
|
||||
|
Reference in New Issue
Block a user