Skip to content

Adds various features to populates #132

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

Merged
merged 10 commits into from
May 17, 2017
Merged

Adds various features to populates #132

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
26990d8
feat: allow for populates config to be generated from cb with snapsho…
javamonn May 14, 2017
1738640
feat: add support for specifying populates.child as a lodash path
javamonn May 14, 2017
a7033b1
fix: resolve query time issues with populates config as a function
javamonn May 14, 2017
0fd1238
fix: resolve issues with per-item populates in helpers
javamonn May 14, 2017
d998898
test: fix single param tests
javamonn May 14, 2017
fdbdbc5
test: add tests for populates as function and child paths
javamonn May 14, 2017
caee2f0
feat: enable storeAs path alias in populates
javamonn May 15, 2017
31b6692
fix: lint
javamonn May 15, 2017
580e552
fix: add missing param to test usages of promisesForPopulate
javamonn May 15, 2017
096c776
Merge branch 'v1.5.0' into master
prescottprue May 17, 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
Prev Previous commit
Merge branch 'v1.5.0' into master
  • Loading branch information
@prescottprue
prescottprue authored May 17, 2017
commit 096c77616fdd36dd5bf95ff992411cc331ebb435
12 changes: 3 additions & 9 deletions src/actions/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,8 @@ export const watchEvent = (firebase, dispatch, { type, path, populates, queryPar
const dataKey = snapshot.key
promisesForPopulate(firebase, dataKey, data, populates)
.then((results) => {
dispatch({
type: SET,
path: storeAs || resultPath,
data,
timestamp: Date.now(),
requesting: false,
requested: true
})
// dispatch child sets first so isLoaded is only set to true for
// populatedDataToJS after all data is in redux (Issue #121)
forEach(results, (result, path) => {
dispatch({
type: SET,
Expand All @@ -155,7 +149,7 @@ export const watchEvent = (firebase, dispatch, { type, path, populates, queryPar
})
dispatch({
Copy link
Owner

@prescottprue prescottprue May 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got moved to the dispatch after the populate children dispatches (keeps isLoaded from being true before all children are set to redux)

type: SET,
path: resultPath,
path: storeAs || resultPath,
data,
timestamp: Date.now(),
requesting: false,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.