wappsto-redux
Advanced tools
Comparing version 3.1.2 to 3.2.0
@@ -185,3 +185,3 @@ import querystring from 'query-string'; | ||
const parsedUrl = querystring.parseUrl(url); | ||
const rQuery = { ...stateRequest.query, ...rUrl.query }; | ||
const rQuery = { ...stateRequest.query, ...rUrl.query, ...(stateRequest.options.query || {}) }; | ||
const query = options.query ? { ...options.query, ...parsedUrl.query } : parsedUrl.query; | ||
@@ -188,0 +188,0 @@ if (stateRequest.status === 'pending' |
{ | ||
"name": "wappsto-redux", | ||
"version": "3.1.2", | ||
"version": "3.2.0", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -141,2 +141,16 @@ import { createSelector } from "reselect"; | ||
if(entities){ | ||
let filters; | ||
if(options instanceof Array){ | ||
filters = options.map(id => ({meta: {id}})); | ||
} else { | ||
filters = options.filter; | ||
if(filters){ | ||
if(!(filters instanceof Array)){ | ||
filters = [filters]; | ||
} | ||
if(!(filters[0] instanceof Object)){ | ||
filters = filters.map(id => ({meta: {id}})); | ||
} | ||
} | ||
} | ||
if(options.parent){ | ||
@@ -148,7 +162,3 @@ result = []; | ||
if(found){ | ||
if(options.filter){ | ||
let filters = options.filter; | ||
if(!(filters instanceof Array)){ | ||
filters = [filters]; | ||
} | ||
if(filters){ | ||
for(let i = 0; i < filters.length; i++){ | ||
@@ -167,8 +177,4 @@ if(matchObject(found, filters[i])){ | ||
} else { | ||
if(options.filter){ | ||
let filters = options.filter; | ||
if(filters){ | ||
result = []; | ||
if(!(filters instanceof Array)){ | ||
filters = [filters]; | ||
} | ||
filters.forEach(filter => { | ||
@@ -175,0 +181,0 @@ for(let key in entities){ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
49814
1272