Skip to content

create new address space for properties to trigger redux-persist update #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

create new address space for properties to trigger redux-persist update #37

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7378d05
Merge remote-tracking branch 'DesignmanIO/master'
May 17, 2017
577c6f9
Merge branch 'DesignmanIO/master' into react-native-meteor-redux-2.2.0
May 23, 2017
fd568e4
create new address space for properties to trigger redux-persist upda…
May 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 27 additions & 32 deletions connectMeteorRedux.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,56 +15,51 @@ const meteorReduxReducers = (
const { type, collection, id, fields } = action;
switch (type) {
case 'SET_USRID': {
const newState = _.clone(state);
newState.userId = id;
return newState;
return { ...state, userId: id };
}
case 'RECENTLY_ADDED': {
const newState = _.clone(state);
_.set(
newState,
`reactNativeMeteorOfflineRecentlyAdded.${collection}`,
let tmpReactNativeMeteorOfflineRecentlyAdded = state.reactNativeMeteorOfflineRecentlyAdded ? _.cloneDeep(state.reactNativeMeteorOfflineRecentlyAdded) : {};
_.set(tmpReactNativeMeteorOfflineRecentlyAdded,
`${collection}`,
_.get(
newState,
`reactNativeMeteorOfflineRecentlyAdded.${collection}`,
tmpReactNativeMeteorOfflineRecentlyAdded,
`${collection}`,
[]
)
);
newState.reactNativeMeteorOfflineRecentlyAdded[collection].push(id);
return newState;
tmpReactNativeMeteorOfflineRecentlyAdded[collection].push(id);
return { ...state, reactNativeMeteorOfflineRecentlyAdded: tmpReactNativeMeteorOfflineRecentlyAdded };
}
case 'ADDED': {
let newState;
if (!state[collection]) {
// collection doesn't exist yet, add it with doc and 'new' flag
newState = _.clone(state);
newState[collection] = { [id]: fields };
return newState;
return { ...state, [collection]: { [id]: fields } };
} else if (!state[collection][id]) {
// no doc with _id exists yet, add it
newState = _.clone(state);
newState[collection][id] = fields;
return newState;
const tmpCollection = _.cloneDeep(state[collection]);
tmpCollection[id] = fields;
return { ...state, [collection]: tmpCollection };
} else if (state[collection] && state[collection][id]) {
// duplicate found, update it
// console.warn(`${id} not added to ${collection}, duplicate found`);
if (_.isEqual(state[collection][id], fields)) return state;
newState = _.clone(state);
newState[collection][id] = { ...state[collection][id], ...fields };
return newState;
const tmpCollection = _.cloneDeep(state[collection]);
tmpCollection[id] = fields;
return { ...state, [collection]: tmpCollection };
}
return state;
}
case 'CHANGED': {
const newState = _.clone(state);
newState[collection][id] = _.merge(state[collection][id], fields);
return newState;
const tmpCollection = _.cloneDeep(state[collection]);
tmpCollection[id] = _.merge(tmpCollection[id], fields);
return { ...state, [collection]: tmpCollection };
}
case 'REMOVED':
if (state[collection][id]) {
const newState = _.clone(state);
delete newState[collection][id];
return newState;
const tmpCollection = _.cloneDeep(state[collection]);
delete tmpCollection[id];
return { ...state, [collection]: tmpCollection };
}
// console.error(`Couldn't remove ${id}, not found in ${collection} collection`);
return state;
Expand All @@ -77,12 +72,12 @@ const meteorReduxReducers = (
case 'REMOVE_AFTER_RECONNECT':
// todo: check for removed docs
const { removed } = action;
const newState = _.clone(state);
_.set(newState, `reactNativeMeteorOfflineRecentlyAdded.${collection}`, []);
newState[collection] = _.omit(newState[collection], removed);
console.log('collection now contains ', _.size(newState[collection]));
let tmpReactNativeMeteorOfflineRecentlyAdded = _.cloneDeep(state.reactNativeMeteorOfflineRecentlyAdded);
_.set(tmpReactNativeMeteorOfflineRecentlyAdded, `${collection}`, []);
let tmpCollection = _.cloneDeep(state[collection]);
tmpCollection = _.omit(tmpCollection, removed);
getData().db[collection].remove({ _id: { $in: removed } });
return newState;
return { ...state, [collection]: tmpCollection, reactNativeMeteorOfflineRecentlyAdded: tmpReactNativeMeteorOfflineRecentlyAdded };
case 'persist/REHYDRATE':
if (
typeof Meteor.ddp === 'undefined' ||
Expand Down Expand Up @@ -270,7 +265,7 @@ class MeteorOffline {
}
collection(collection, subscriptionName) {
if (
Meteor.status().connected &&
Meteor.status().connected &&
this.firstConnection &&
_.get(this.subscriptions, `${subscriptionName}.ready`)
) {
Expand Down