Merge pull request #150 from Arthelon/escape-props

"server-side dependencies such as jsesc were previously being pulled into the client bundle and not being transpiled properly. This patch should prevent this from happening."

src/client/components/pages/entity/creator.js

@@ -21,14 +21,13 @@
 /* eslint strict: 0 */
 
 import * as entityHelper from '../../../helpers/entity';
-import * as propsHelper from '../../../../server/helpers/props';
 import AttributeList from '../parts/attribute-list';
 import EntityPage from '../../../containers/entity';
 import React from 'react';
+import {extractEntityProps} from '../../../helpers/props';
 
 
 const {extractAttribute, getDateAttributes, getTypeAttribute} = entityHelper;
-const {extractEntityProps} = propsHelper;
 
 function CreatorPage(props) {
 	const {entity} = props;

src/client/components/pages/entity/edition.js

@@ -20,15 +20,14 @@
 /* eslint strict: 0 */
 
 import * as entityHelper from '../../../helpers/entity';
-import * as propsHelper from '../../../../server/helpers/props';
 import AttributeList from '../parts/attribute-list';
 import EntityPage from '../../../containers/entity';
 import FontAwesome from 'react-fontawesome';
 import React from 'react';
+import {extractEntityProps} from '../../../helpers/props';
 
 
 const {extractAttribute, getLanguageAttribute} = entityHelper;
-const {extractEntityProps} = propsHelper;
 
 function EditionPage(props) {
 	const {entity} = props;

src/client/components/pages/entity/publication.js

@@ -21,14 +21,13 @@
 /* eslint strict: 0 */
 
 import * as entityHelper from '../../../helpers/entity';
-import * as propsHelper from '../../../../server/helpers/props';
 import AttributeList from '../parts/attribute-list';
 import EntityPage from '../../../containers/entity';
 import React from 'react';
+import {extractEntityProps} from '../../../helpers/props';
 
 
 const {getTypeAttribute, showEntityEditions} = entityHelper;
-const {extractEntityProps} = propsHelper;
 
 function PublicationPage(props) {
 	const {entity} = props;

src/client/components/pages/entity/publisher.js

@@ -21,16 +21,15 @@
 /* eslint strict: 0 */
 
 import * as entityHelper from '../../../helpers/entity';
-import * as propsHelper from '../../../../server/helpers/props';
 import AttributeList from '../parts/attribute-list';
 import EntityPage from '../../../containers/entity';
 import React from 'react';
+import {extractEntityProps} from '../../../helpers/props';
 
 
 const {
 	extractAttribute, getTypeAttribute, getDateAttributes, showEntityEditions
 } = entityHelper;
-const {extractEntityProps} = propsHelper;
 
 function PublisherPage(props) {
 	const {entity} = props;

src/client/components/pages/entity/work.js

@@ -21,14 +21,13 @@
 /* eslint strict: 0 */
 
 import * as entityHelper from '../../../helpers/entity';
-import * as propsHelper from '../../../../server/helpers/props';
 import AttributeList from '../parts/attribute-list';
 import EntityPage from '../../../containers/entity';
 import React from 'react';
+import {extractEntityProps} from '../../../helpers/props';
 
 
 const {getLanguageAttribute, getTypeAttribute} = entityHelper;
-const {extractEntityProps} = propsHelper;
 
 function WorkPage(props) {
 	const {entity} = props;

src/client/controllers/deletion.js

@@ -16,18 +16,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../server/helpers/props';
 import DeletionForm from '../components/forms/deletion';
 import Layout from '../containers/layout';
 import React from 'react';
 import ReactDOM from 'react-dom';
+import {extractLayoutProps} from '../helpers/props';
 
 
 const propsTarget = document.getElementById('props');
 const props = propsTarget ? JSON.parse(propsTarget.innerHTML) : {};
 
 const markup = (
-	<Layout {...propHelpers.extractLayoutProps(props)}>
+	<Layout {...extractLayoutProps(props)}>
 		<DeletionForm entity={props.entity}/>
 	</Layout>
 );

src/client/controllers/editor/achievement.js

@@ -18,7 +18,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../../server/helpers/props';
+import {
+	extractEditorProps,
+	extractLayoutProps
+} from '../../helpers/props';
 import AchievementsTab from '../../components/pages/parts/editor-achievements';
 import EditorContainer from '../../containers/editor';
 import Layout from '../../containers/layout';
@@ -30,9 +33,9 @@ const propsTarget = document.getElementById('props');
 const props = propsTarget ? JSON.parse(propsTarget.innerHTML) : {};
 
 ReactDOM.render(
-	<Layout {...propHelpers.extractLayoutProps(props)}>
+	<Layout {...extractLayoutProps(props)}>
 		<EditorContainer
-			{...propHelpers.extractEditorProps(props)}
+			{...extractEditorProps(props)}
 		>
 			<AchievementsTab
 				achievement={props.achievement}

src/client/controllers/editor/edit.js

@@ -17,18 +17,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../../server/helpers/props';
 import Layout from '../../containers/layout';
 import ProfileForm from '../../components/forms/profile';
 import React from 'react';
 import ReactDOM from 'react-dom';
+import {extractLayoutProps} from '../../helpers/props';
 
 
 const propsTarget = document.getElementById('props');
 const props = propsTarget ? JSON.parse(propsTarget.innerHTML) : {};
 
 ReactDOM.render(
-	<Layout {...propHelpers.extractLayoutProps(props)}>
+	<Layout {...extractLayoutProps(props)}>
 		<ProfileForm
 			editor={props.editor}
 			genders={props.genders}

src/client/controllers/editor/editor.js

@@ -17,7 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../../server/helpers/props';
+import {
+	extractChildProps,
+	extractEditorProps,
+	extractLayoutProps
+} from '../../helpers/props';
 import EditorContainer from '../../containers/editor';
 import Layout from '../../containers/layout';
 import ProfileTab from '../../components/pages/parts/editor-profile';
@@ -41,15 +45,15 @@ else {
 	tab = (
 		<ProfileTab
 			user={props.user}
-			{...propHelpers.extractChildProps(props)}
+			{...extractChildProps(props)}
 		/>
 	);
 }
 
 const markup = (
-	<Layout {...propHelpers.extractLayoutProps(props)} >
+	<Layout {...extractLayoutProps(props)} >
 		<EditorContainer
-			{...propHelpers.extractEditorProps(props)}
+			{...extractEditorProps(props)}
 		>
 			{tab}
 		</EditorContainer>

src/client/controllers/entity/entity.js

@@ -16,7 +16,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../../server/helpers/props';
+import {
+	extractEntityProps,
+	extractLayoutProps
+} from '../../helpers/props';
 import CreatorPage from '../../components/pages/entities/creator';
 import EditionPage from '../../components/pages/entities/edition';
 import EntityRevisions from '../../components/pages/entity-revisions';
@@ -47,7 +50,7 @@ const Child = entityComponents[page] || CreatorPage;
 let markup = null;
 if (page === 'revisions') {
 	markup = (
-		<Layout {...propHelpers.extractLayoutProps(props)}>
+		<Layout {...extractLayoutProps(props)}>
 			<EntityRevisions
 				entity={props.entity}
 				revisions={props.revisions}
@@ -57,8 +60,8 @@ if (page === 'revisions') {
 }
 else {
 	markup = (
-		<Layout {...propHelpers.extractLayoutProps(props)}>
-			<Child {...propHelpers.extractEntityProps(props)}/>
+		<Layout {...extractLayoutProps(props)}>
+			<Child {...extractEntityProps(props)}/>
 		</Layout>
 	);
 }

src/client/controllers/index.js

@@ -16,7 +16,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../server/helpers/props';
+import {
+	extractChildProps,
+	extractLayoutProps
+} from '../helpers/props';
 import AboutPage from '../../client/components/pages/about';
 import ContributePage from '../../client/components/pages/contribute';
 import DevelopPage from '../../client/components/pages/develop';
@@ -46,8 +49,8 @@ const pageMap = {
 const Child = pageMap[page] || Index;
 
 const markup = (
-	<Layout {...propHelpers.extractLayoutProps(props)}>
-		<Child {...propHelpers.extractChildProps(props)}/>
+	<Layout {...extractLayoutProps(props)}>
+		<Child {...extractChildProps(props)}/>
 	</Layout>
 );
 

src/client/controllers/registrationDetails.js

@@ -17,18 +17,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../server/helpers/props';
 import Layout from '../containers/layout';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import RegistrationForm from '../components/forms/registration-details';
+import {extractLayoutProps} from '../helpers/props';
 
 
 const propsTarget = document.getElementById('props');
 const props = propsTarget ? JSON.parse(propsTarget.innerHTML) : {};
 
 const markup = (
-	<Layout {...propHelpers.extractLayoutProps(props)}>
+	<Layout {...extractLayoutProps(props)}>
 		<RegistrationForm
 			gender={props.gender}
 			genders={props.genders}

src/client/controllers/revision.js

@@ -16,17 +16,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../server/helpers/props';
 import Layout from '../containers/layout';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import RevisionPage from '../components/pages/revision';
+import {extractLayoutProps} from '../helpers/props';
 
 
 const propsTarget = document.getElementById('props');
 const props = propsTarget ? JSON.parse(propsTarget.innerHTML) : {};
 const markup = (
-	<Layout {...propHelpers.extractLayoutProps(props)}>
+	<Layout {...extractLayoutProps(props)}>
 		<RevisionPage
 			diffs={props.diffs}
 			revision={props.revision}

src/client/controllers/search.js

@@ -16,18 +16,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import * as propHelpers from '../../server/helpers/props';
 import Layout from '../containers/layout';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import SearchPage from '../components/pages/search';
-
+import {extractLayoutProps} from '../helpers/props';
 
 const propsTarget = document.getElementById('props');
 const props = propsTarget ? JSON.parse(propsTarget.innerHTML) : {};
 
 const markup = (
-	<Layout {...propHelpers.extractLayoutProps(props)}>
+	<Layout {...extractLayoutProps(props)}>
 		<SearchPage initialResults={props.initialResults}/>
 	</Layout>
 );

src/client/entity-editor/controller.js

@@ -21,8 +21,11 @@
  */
 
 import * as helpers from './helpers';
-import * as propHelpers from '../../server/helpers/props';
 import {applyMiddleware, compose, createStore} from 'redux';
+import {
+	extractChildProps,
+	extractLayoutProps
+} from '../helpers/props';
 import EntityEditor from './entity-editor';
 import Immutable from 'immutable';
 import Layout from '../containers/layout';
@@ -58,11 +61,11 @@ const store = createStore(
 );
 
 const markup = (
-	<Layout {...propHelpers.extractLayoutProps(rest)}>
+	<Layout {...extractLayoutProps(rest)}>
 		<Provider store={store}>
 			<EntityEditor
 				validate={getValidator(props.entityType)}
-				{...propHelpers.extractChildProps(rest)}
+				{...extractChildProps(rest)}
 			>
 				<EntitySection/>
 			</EntityEditor>

src/client/helpers/props.js

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2017  Daniel Hsing
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+import {omit, pick} from 'lodash';
+
+const LAYOUT_PROPS = [
+	'hideSearch',
+	'homepage',
+	'repositoryUrl',
+	'requiresJS',
+	'siteRevision',
+	'user'
+];
+
+const EDITOR_PROPS = [
+	'editor',
+	'tabActive'
+];
+
+export function extractLayoutProps(props) {
+	return pick(props, LAYOUT_PROPS);
+}
+
+export function extractEditorProps(props) {
+	return pick(props, EDITOR_PROPS);
+}
+
+export function extractChildProps(props) {
+	return omit(props, LAYOUT_PROPS);
+}
+
+export function extractEntityProps(props) {
+	return {
+		alert: props.alert,
+		entity: props.entity,
+		identifierTypes: props.identifierTypes
+	};
+}