Merge branch 'master' of https://github.com/relax/relax

lib/shared/helpers/configure-store.js

@@ -2,19 +2,27 @@ import combineActionsMiddleware from 'redux-combine-actions';
 import thunkMiddleware from 'redux-thunk';
 import {applyMiddleware, compose, createStore} from 'redux';
 
+const IS_DEV_MODE = process.env.NODE_ENV === 'development';
+const WINDOW_EXISTS = typeof window !== 'undefined';
+
 const middleware = [];
 
+const composeEnhancers =
+  IS_DEV_MODE && WINDOW_EXISTS && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+  ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+  : compose;
+
 middleware.push(combineActionsMiddleware);
 middleware.push(thunkMiddleware);
 
-if (process.env.NODE_ENV === 'development' && typeof window !== 'undefined') {
+if (IS_DEV_MODE && WINDOW_EXISTS) {
   const createLogger = require('redux-logger');
   const logger = createLogger();
   middleware.push(logger);
 }
 
 export default function configureStore (routerMiddleware, reducers, initialState) {
-  const store = compose(
+  const store = composeEnhancers(
     applyMiddleware(
       ...middleware
     ),

lib/shared/screens/admin/screens/schemas/screens/data/shared/components/data-form-content/index.js

@@ -15,7 +15,7 @@ import DataSchemaForm from './form';
   }),
   (dispatch) => bindActionCreators(schemaEntryActions, dispatch),
   (props) => {
-    let result;
+    let result = {};
 
     if (props.entryId) {
       result = {

lib/shared/screens/admin/shared/components/page-builder/elements-menu/autocomplete.jsx

@@ -9,7 +9,7 @@ export default class Autocomplete extends Component {
     autoFocus: React.PropTypes.bool,
     value: React.PropTypes.string.isRequired,
     onChange: React.PropTypes.func.isRequired,
-    suggestion: React.PropTypes.string
+    suggestion: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.bool]).isRequired
   };
 
   static defaultProps = {
@@ -60,6 +60,7 @@ export default class Autocomplete extends Component {
       <div className={styles.autocomplete}>
         <span onClick={this.focus}>{before}</span>
         <span
+          suppressContentEditableWarning
           ref='editable'
           className={styles.editable}
           onInput={this.onInput}

lib/shared/screens/admin/shared/components/page-builder/elements-menu/elements-menu.jsx

@@ -20,7 +20,7 @@ export default class ElementsMenu extends Component {
   };
 
   static propTypes = {
-    symbols: PropTypes.array.isRequired,
+    symbols: PropTypes.array,
     pageBuilderActions: PropTypes.object.isRequired,
     elementsMenuOptions: PropTypes.object.isRequired,
     categories: PropTypes.array.isRequired

lib/shared/screens/admin/shared/components/page-builder/elements-menu/index.js

@@ -9,7 +9,6 @@ import ElementsMenu from './elements-menu';
 
 @dataConnect(
   (state) => ({
-    symbols: state.symbols,
     elementsMenuOptions: state.pageBuilder.elementsMenuOptions,
     categories: state.pageBuilder.categories,
     categoriesCollapsed: state.pageBuilder.categoriesCollapsed
@@ -23,7 +22,7 @@ import ElementsMenu from './elements-menu';
 )
 export default class ElementsMenuContainer extends Component {
   static propTypes = {
-    symbols: PropTypes.object.isRequired,
+    symbols: PropTypes.array,
     pageBuilderActions: PropTypes.object.isRequired
   };
 

lib/shared/screens/admin/shared/components/page-builder/elements-menu/list.jsx

@@ -13,11 +13,15 @@ export default class List extends Component {
     addElement: PropTypes.func.isRequired,
     addSymbol: PropTypes.func.isRequired,
     toggleCategory: PropTypes.func.isRequired,
-    symbols: PropTypes.object.isRequired,
-    categories: PropTypes.object.isRequired,
+    symbols: PropTypes.array,
+    categories: PropTypes.array.isRequired,
     categoriesCollapsed: PropTypes.object.isRequired
   };
 
+  static defaultProps = {
+    symbols: []
+  };
+
   toggleCategory (category, event) {
     event.preventDefault();
     this.props.toggleCategory(category);

lib/shared/screens/admin/shared/components/page-builder/elements-menu/search.jsx

@@ -16,10 +16,14 @@ export default class Search extends Component {
     addSymbol: PropTypes.func.isRequired,
     onSearchChange: PropTypes.func.isRequired,
     suggestions: PropTypes.array.isRequired,
-    suggestion: PropTypes.string.isRequired,
+    suggestion: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]).isRequired,
     search: PropTypes.string.isRequired,
-    symbols: PropTypes.object.isRequired,
-    categories: PropTypes.object.isRequired
+    symbols: PropTypes.array.isRequired,
+    categories: PropTypes.array.isRequired
+  };
+
+  static defaultProps = {
+    suggestion: false
   };
 
   componentDidMount () {

lib/shared/screens/public/screens/page/index.js

@@ -41,6 +41,18 @@ export default class PageContainer extends Component {
     pageSlug: PropTypes.string
   };
 
+  componentWillReceiveProps (nextProps) {
+    if (nextProps.pageSlug !== this.props.pageSlug) {
+      this.props.relate.setVariables({
+        page: {
+          slug: nextProps.pageSlug,
+          state: 'published',
+          public: true
+        }
+      });
+    }
+  }
+
   render () {
     const {page} = this.props;