homeflowjs 0.13.64 → 0.14.0

package/actions/properties.actions.js

@@ -3,6 +3,7 @@ import PropertiesActionTypes from './properties.types';
 import { buildQueryString } from '../search/property-search/property-search';
 import { setSearch } from './search.actions';
 import { setLoading } from './app.actions';
+import { getOfflineSavedProperties } from '../utils';
 
 export const setPropertyLinks = (payload) => ({
   type: PropertiesActionTypes.SET_PROPERTY_LINKS,
@@ -214,33 +215,36 @@ export const postLocalSavedProperties = () => (dispatch, getState) => {
   });
 };
 
+const fetchSaveProperty = (data) => fetch('/saved_properties.ljson', {
+  method: 'POST',
+  headers: { 'Content-Type': 'application/json' },
+  body: JSON.stringify({ property_ids: data.toString() }),
+});
+
 export const addSavedProperty = (payload) => (dispatch, getState) => {
   const userLoggedIn = !!getState().user.currentUser.user_id;
 
   dispatch(toggleSavedProperty({ propertyId: payload, userLoggedIn }));
 
   if (userLoggedIn) {
-    fetch('/saved_properties.ljson', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ property_ids: payload.toString() }),
-    });
+    fetchSaveProperty(payload);
   }
 };
 
+const fetchRemoveProperties = (data) => fetch(`/saved_properties/${data}`, {
+  method: 'POST',
+  headers: {
+    'X-Http-Method-Override': 'delete',
+  },
+});
+
 export const removeSavedProperty = (payload) => (dispatch, getState) => {
   const userLoggedIn = !!getState().user.currentUser.user_id;
 
   dispatch(toggleSavedProperty({ propertyId: payload, userLoggedIn }));
 
   if (userLoggedIn) {
-    fetch(`/saved_properties/${payload}`,
-      {
-        method: 'POST',
-        headers: {
-          'X-Http-Method-Override': 'delete',
-        },
-      });
+    fetchRemoveProperties(payload);
   }
 };
 
@@ -249,17 +253,88 @@ export const setSavedProperties = (payload) => ({
   payload,
 });
 
+const setPropertyDataLoadingStatus = (payload) => ({
+  type: PropertiesActionTypes.SET_PROPERTY_DATA_LOADING,
+  payload,
+});
+
+const getPropertyIdList = (properties) => properties.map((property) => property.id);
+const filterMissingPropertiesInIdList = ({ propertyList, idList }) => propertyList
+  .filter((property) => !idList.includes(property.id));
+
+const saveOfflineProperties = () => (dispatch) => {
+  const offlineSavedProperties = getOfflineSavedProperties();
+  if (offlineSavedProperties.length > 0) {
+    fetchSaveProperty(getPropertyIdList(offlineSavedProperties));
+  }
+  dispatch(setSavedProperties(offlineSavedProperties));
+};
+
 export const fetchSavedProperties = () => (dispatch) => {
+  const offlineSavedProperties = getOfflineSavedProperties();
+  dispatch(setPropertyDataLoadingStatus(true));
+
   fetch('/saved_properties.ljson')
     .then((response) => response.json())
     .then((json) => {
       if (json) {
-        dispatch(setSavedProperties(json.properties));
+        const requestedPropertyIds = getPropertyIdList(json.properties);
+        const offlinePropertyIds = getPropertyIdList(offlineSavedProperties);
+        const isCurrentSavedPropertyListSynced = localStorage.getItem('is_synced_saved_properties_list');
+
+        const propertiesToAddOnInit = filterMissingPropertiesInIdList({
+          propertyList: offlineSavedProperties,
+          idList: requestedPropertyIds,
+        });
+
+        if (propertiesToAddOnInit.length > 0) {
+          fetchSaveProperty(getPropertyIdList(propertiesToAddOnInit));
+        }
+
+        const propertiesToRemoveOnInit = [];
+
+        if (isCurrentSavedPropertyListSynced) {
+          filterMissingPropertiesInIdList({
+            propertyList: json.properties,
+            idList: offlinePropertyIds,
+          }).forEach((property) => {
+            propertiesToRemoveOnInit.push(property);
+            fetchRemoveProperties(property.id);
+          });
+        }
+
+        let userSavedProperties = [
+          ...json.properties,
+          ...propertiesToAddOnInit,
+        ];
+
+        if (propertiesToRemoveOnInit.length > 0) {
+          const propertyIdListToRemoveOnInit = getPropertyIdList(propertiesToRemoveOnInit);
+          userSavedProperties = userSavedProperties.reduce(
+            (updatedPropertyList, property) => (propertyIdListToRemoveOnInit.includes(property.id)
+              ? updatedPropertyList
+              : [
+                ...updatedPropertyList,
+                property,
+              ]),
+            [],
+          );
+        }
+
+        dispatch(setSavedProperties(userSavedProperties));
+
+        if (!isCurrentSavedPropertyListSynced) {
+          localStorage.setItem('is_synced_saved_properties_list', true);
+          localStorage.setItem('savedProperties', JSON.stringify(userSavedProperties));
+        }
       } else {
-        dispatch(setSavedProperties([]));
+        dispatch(saveOfflineProperties());
       }
     })
-    .catch(() => dispatch(setSavedProperties([])));
+    .catch(() => {
+      dispatch(saveOfflineProperties());
+    })
+    .finally(() => dispatch(setPropertyDataLoadingStatus(false)));
 };
 
 export const setSelectedMarker = (payload) => ({

package/actions/properties.types.js

@@ -9,6 +9,7 @@ const PropertiesActionTypes = {
   SET_PROPERTY_LINKS: 'SET_PROPERTY_LINKS',
   SET_SELECTED_MARKER: 'SET_SELECTED_MARKER',
   SET_GEONAMES: 'SET_GEONAMES',
+  SET_PROPERTY_DATA_LOADING: 'SET_PROPERTY_DATA_LOADING' 
 };
 
 export default PropertiesActionTypes;

package/actions/user.actions.js

@@ -6,7 +6,7 @@ import { setLoading } from './app.actions';
 import { INITIAL_USER_DATA } from '../reducers/user.reducer';
 
 import { buildQueryString } from '../search/property-search/property-search';
-import { objectDiff, compact } from '../utils';
+import { objectDiff, compact, getOfflineSavedProperties } from '../utils';
 
 export const setCurrentUser = (payload) => ({
   type: UserActionTypes.SET_CURRENT_USER,
@@ -163,12 +163,15 @@ export const signOutUser = () => (dispatch) => (
     },
   })
     .then((response) => {
+      const offlineSavedProperties = getOfflineSavedProperties();
+
       if (response.ok) {
         dispatch(setCurrentUser(INITIAL_USER_DATA));
         dispatch(setLocalUser(INITIAL_USER_DATA));
         dispatch(setUserCredentials({ email: '', password: '' }));
-        dispatch(setSavedProperties([]));
+        dispatch(setSavedProperties(offlineSavedProperties));
         dispatch(setSavedSearches([]));
+        Homeflow.kickEvent('user_signed_out');
       }
 
       return response.ok;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.13.64",
+  "version": "0.14.0",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/reducers/properties.reducer.js

@@ -6,6 +6,7 @@ const INITIAL_STATE = {
   savedProperties: [],
   pagination: {},
   selectedMarker: null,
+  isPropertyDataLoading: false,
   propertyLinks: {
     next: '',
     previous: '',
@@ -54,9 +55,7 @@ const propertiesReducer = (state = INITIAL_STATE, action) => {
       if (index > -1) {
         newSavedProperties.splice(index, 1);
 
-        if (!action.payload.userLoggedIn) {
-          localStorage.setItem('savedProperties', JSON.stringify(newSavedProperties));
-        }
+        localStorage.setItem('savedProperties', JSON.stringify(newSavedProperties));
 
         return {
           ...state,
@@ -70,9 +69,7 @@ const propertiesReducer = (state = INITIAL_STATE, action) => {
 
       newSavedProperties.push(property || state.property);
 
-      if (!action.payload.userLoggedIn) {
-        localStorage.setItem('savedProperties', JSON.stringify(newSavedProperties));
-      }
+      localStorage.setItem('savedProperties', JSON.stringify(newSavedProperties));
 
       return {
         ...state,
@@ -90,6 +87,11 @@ const propertiesReducer = (state = INITIAL_STATE, action) => {
         geonames: action.payload,
       }
     };
+    case PropertiesActionTypes.SET_PROPERTY_DATA_LOADING:
+      return {
+        ...state,
+        isPropertyDataLoading: action.payload,
+      }
     default:
       return state;
   }

package/user/default-profile/account/sign-in-form.component.test.jsx

@@ -31,7 +31,7 @@ const server = setupServer(
     res(ctx.json({ user }))
   )),
   rest.get('/saved_properties.ljson', (req, res, ctx) => (
-    res(ctx.json({ properties: [] }))
+    res(ctx.json({ properties: '' }))
   )),
   rest.get('/saved_searches.ljson', (req, res, ctx) => (
     res(ctx.json([]))

package/utils/index.js

@@ -133,4 +133,12 @@ export const uniqueGeonamesByNameAndArea = (geonames) => {
 
   // Finally remove if they have the same area
   return [...new Map(uniqueNamesOnly.map(item => [item['area'], item])).values()]
-};
+};
+
+export const getOfflineSavedProperties = () => {
+  const offlineSavedProperties = JSON.parse(localStorage.getItem('savedProperties'));
+  
+  return Array.isArray(offlineSavedProperties)
+    ? offlineSavedProperties
+    : [];
+}