homeflowjs 0.9.34 → 0.9.36

package/.eslintrc.js

@@ -4,6 +4,7 @@ module.exports = {
     fetch: 'readonly',
     Homeflow: 'readonly',
     document: 'readonly',
+    location: 'readonly',
     FormData: 'readonly',
     window: 'readonly',
     describe: 'readonly',

package/README.md

@@ -69,5 +69,5 @@ This is a known issue with peer dependencies, see this comment and containing th
 
 ## Deploy
 
-To create a new version of HomeflowJS when merging to master, keep an eye on the Jenkins build, it pauses and waits for publish confirmation where you can enter the new version number and publish:
+To create a new version of HomeflowJS when merging to master, keep an eye on the Jenkins build, it pauses and waits for publish confirmation where you can enter the new version number and publish.
 

package/actions/user.actions.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-cycle */
 import UserActionTypes from './user.types';
 import { fetchSavedProperties, setSavedProperties } from './properties.actions';
 import { fetchSavedSearches, setSavedSearches } from './search.actions';
@@ -153,11 +154,15 @@ export const signOutUser = () => (dispatch) => (
   fetch('/session', {
     method: 'DELETE',
   })
-    .then(() => {
-      dispatch(setCurrentUser(INITIAL_USER_DATA));
-      dispatch(setLocalUser(INITIAL_USER_DATA));
-      dispatch(setUserCredentials({ email: '', password: '' }));
-      dispatch(setSavedProperties([]));
-      dispatch(setSavedSearches([]));
+    .then((response) => {
+      if (response.ok) {
+        dispatch(setCurrentUser(INITIAL_USER_DATA));
+        dispatch(setLocalUser(INITIAL_USER_DATA));
+        dispatch(setUserCredentials({ email: '', password: '' }));
+        dispatch(setSavedProperties([]));
+        dispatch(setSavedSearches([]));
+      }
+
+      return response.ok;
     })
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.9.34",
+  "version": "0.9.36",
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",
   "scripts": {

package/search/status-checkbox/status-checkbox.component.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Checkbox } from 'pretty-checkbox-react';
 
@@ -37,34 +37,38 @@ const NormalCheckBox = ({
 };
 
 const StatusCheckbox = (props) => {
-  const { pretty, value, uncheckedValue } = props;
-
-  const dispatch = useDispatch();
-
   const defaultSearchStatus = useSelector((state) => state.app.themePreferences.defaultSearchStatus || 'all');
   const currentSearchStatus = useSelector((state) => state.search.currentSearch.status);
 
-  const calculateChecked = () => {
-    // if no current status then checked if value matches default
-    if (currentSearchStatus && currentSearchStatus === value) return true;
+  const { pretty, value: propValue, uncheckedValue: propUncheckedValue } = props;
 
-    if (currentSearchStatus) return false;
+  const calculateValue = (thisValue, otherValue, defaultValue) => {
+    if (thisValue) return thisValue;
+    if (otherValue !== defaultValue) return defaultValue;
 
-    // when there is no status set
-    return value === defaultSearchStatus;
-  };
+    // The other option is the default value and this one is not provided so this one is opposite of default
+    return defaultValue === 'all' ? 'available' : 'all';
+  }
+
+  const value = calculateValue(propValue, propUncheckedValue, defaultSearchStatus);
+  const uncheckedValue = calculateValue(propUncheckedValue, propValue, defaultSearchStatus);
 
-  const [checked, setChecked] = useState(calculateChecked());
+  const dispatch = useDispatch();
 
-  useEffect(() => {
-    setChecked(calculateChecked());
-  }, [defaultSearchStatus, currentSearchStatus]);
+  const calculateChecked = () => {
+    if (typeof currentSearchStatus !== 'undefined') {
+      if (currentSearchStatus === value) return true;
+      if (currentSearchStatus === uncheckedValue) return false;
+    }
 
-  const handleChange = (e) => {
-    const newValue = checked ? (uncheckedValue || '') : value;
+    return value === defaultSearchStatus;  // Unknown search status make checkbox be default
+  };
+
+  const checked = calculateChecked();
 
+  const handleChange = (e) => {
+    const newValue = checked ? uncheckedValue : value;
     dispatch(setSearchField({ status: newValue === defaultSearchStatus ? '' : newValue }));
-    setChecked(calculateChecked());
   };
 
   if (pretty) return <PrettyCheckBox {...props} handleChange={handleChange} checked={checked} />;

package/user/sign-out-button/sign-out-button.component.jsx

@@ -1,23 +1,39 @@
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import { signOutUser } from '../../actions/user.actions';
 import notify from '../../app/notify';
 
-const SignOutButton = ({ signOutUser, children, ...otherProps }) => (
-  <button
-    type="button"
-    onClick={(e) => {
-      e.preventDefault();
-      signOutUser()
-        .then(() => notify('You have been signed out', 'success'));
-    }}
-    {...otherProps}
-  >
-    {children}
-  </button>
-);
+const SignOutButton = ({
+  signOutUser, pushHistory, reload, children, ...otherProps
+}) => {
+  const history = useHistory();
+  const handleClick = (e) => {
+    e.preventDefault();
+    signOutUser()
+      .then((success) => {
+        if (success) {
+          notify('You have been signed out', 'success');
+          if (pushHistory) history.push('/');
+          if (reload) location.reload(false);
+        } else {
+          notify('There was an error signing out', 'error');
+        }
+      });
+  };
+
+  return (
+    <button
+      type="button"
+      onClick={(e) => handleClick(e)}
+      {...otherProps}
+    >
+      {children}
+    </button>
+  );
+};
 
 SignOutButton.propTypes = {
   signOutUser: PropTypes.func.isRequired,
@@ -25,6 +41,13 @@ SignOutButton.propTypes = {
     PropTypes.element,
     PropTypes.string,
   ]).isRequired,
+  pushHistory: PropTypes.bool,
+  reload: PropTypes.bool,
+};
+
+SignOutButton.defaultProps = {
+  pushHistory: false,
+  reload: false,
 };
 
 const mapDispatchToProps = {