* fix(files): Decouple files from challenges * feat(server/react): Remove action logger use redux remote devtools instead! * feat(Challenges): Disable js on edit, enable on execute * feat(Challenge/Preview): Show message when js is disabled * refactor(frameEpic): Reduce code by using lodash * feat(frameEpic): Disable js in preview by state * feat(frameEpic): Colocate epic in Challenges/redux * refactor(ExecuteChallengeEpic): CoLocated with Challenges * refactor(executeChallengesEpic): Separate tests from main logic * feat(Challenge/Preview): Update main on edit * feat(frameEpuc): Replace frame on edit/execute This allows for sandbox to work properly * fix(Challenges/Utils): Require utisl * revert(frameEpic): Hoist function to mount code in frame * fix(frameEpic): Ensure new frame is given classname * feat(executeChallenge): Update main on code unlocked * fix(frameEpic): Filter out empty test message * fix(Challenge/Preview): Remove unnessary quote in classname * feat(codeStorageEpic): Separate localstorage from solutions loading * fix(fetchUser): Merge user actions into one prefer many effects from one action over one action to one effect * fix(themes): Centralize theme utils and defs * fix(entities.user): Fix user reducer namespacing * feat(frame): Refactor frameEpic to util * feat(Challenges.redux): Should not attempt to update main from storage * fix(loadPreviousChallengeEpic): Refactor for RFR * fix(Challenges.Modern): Show preview plane
96 lines
2.4 KiB
JavaScript
96 lines
2.4 KiB
JavaScript
import _ from 'lodash';
|
|
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import { createSelector } from 'reselect';
|
|
import { addNS } from 'berkeleys-redux-utils';
|
|
|
|
import ns from './ns.json';
|
|
import Editor from './Editor.jsx';
|
|
import { showPreviewSelector, types } from '../../redux';
|
|
import SidePanel from '../../Side-Panel.jsx';
|
|
import Preview from '../../Preview.jsx';
|
|
import _Map from '../../../../Map';
|
|
import Panes from '../../../../Panes';
|
|
import ChildContainer from '../../../../Child-Container.jsx';
|
|
import { filesSelector } from '../../../../files';
|
|
|
|
const createModernEditorToggleType = fileKey =>
|
|
types.toggleModernEditor + `(${fileKey})`;
|
|
|
|
const propTypes = {
|
|
nameToFileKey: PropTypes.object
|
|
};
|
|
|
|
const mapStateToProps = createSelector(
|
|
filesSelector,
|
|
files => ({
|
|
nameToFileKey: _.reduce(files, (map, file) => {
|
|
map[file.name] = file.key;
|
|
return map;
|
|
}, {})
|
|
})
|
|
);
|
|
|
|
const mapDispatchToProps = null;
|
|
|
|
export const mapStateToPanes = addNS(
|
|
ns,
|
|
createSelector(
|
|
filesSelector,
|
|
showPreviewSelector,
|
|
(files, showPreview)=> {
|
|
// create panes map here
|
|
// must include map
|
|
// side panel
|
|
// editors are created based on state
|
|
// so pane component can have multiple panes based on state
|
|
const panesMap = _.reduce(files, (map, file) => {
|
|
map[createModernEditorToggleType(file.fileKey)] = file.name;
|
|
return map;
|
|
}, {
|
|
[types.toggleMap]: 'Map',
|
|
[types.toggleSidePanel]: 'Side Panel'
|
|
});
|
|
|
|
if (showPreview) {
|
|
panesMap[types.togglePreview] = 'Preview';
|
|
}
|
|
return panesMap;
|
|
}
|
|
)
|
|
);
|
|
|
|
const nameToComponent = {
|
|
Map: _Map,
|
|
'Side Panel': SidePanel,
|
|
Preview: Preview
|
|
};
|
|
|
|
export function ShowModern({ nameToFileKey }) {
|
|
return (
|
|
<ChildContainer isFullWidth={ true }>
|
|
<Panes
|
|
render={ name => {
|
|
const Comp = nameToComponent[name];
|
|
if (Comp) {
|
|
return <Comp />;
|
|
}
|
|
if (nameToFileKey[name]) {
|
|
return <Editor fileKey={ nameToFileKey[name] } />;
|
|
}
|
|
return <span>Could not find Component for { name }</span>;
|
|
}}
|
|
/>
|
|
</ChildContainer>
|
|
);
|
|
}
|
|
|
|
ShowModern.displayName = 'ShowModern';
|
|
ShowModern.propTypes = propTypes;
|
|
|
|
export default connect(
|
|
mapStateToProps,
|
|
mapDispatchToProps
|
|
)(ShowModern);
|