Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

[RFR] Upgrade to latest aor #21

Merged
merged 1 commit into from
Sep 13, 2017
Merged

[RFR] Upgrade to latest aor #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
"react-scripts": "1.0.5"
},
"dependencies": {
"admin-on-rest": "~1.2.0",
"admin-on-rest": "~1.3.0",
"aor-language-french": "^1.8.0",
"aor-rich-text-input": "^1.0.0",
"material-ui": "~0.17.4",
"material-ui": "~0.19.0",
"prop-types": "~15.5.7",
"react": "~15.5.4",
"react-dom": "~15.5.4",
"react-redux": "~5.0.4",
"react-router-dom": "~4.1.0",
"react-tap-event-plugin": "~2.0.1",
"redux-form": "~6.6.2",
"redux-saga": "~0.14.6"
"redux-form": "~7.0.3",
"redux-saga": "~0.15.0"
},
"scripts": {
"start": "react-scripts start",
Expand Down
10 changes: 6 additions & 4 deletions src/categories/LinkToRelatedProducts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ const LinkToRelatedProducts = ({ record, translate }) => (
primary
label={translate('resources.categories.fields.products')}
icon={<ProductIcon />}
containerElement={<Link to={{
pathname: '/products',
search: stringify({ filter: JSON.stringify({ category_id: record.id }) }),
}} />}
containerElement={<Link
to={{
pathname: '/products',
search: stringify({ page: 1, perPage: 25, filter: JSON.stringify({ category_id: record.id }) }),
}}
/>}
/>
);

Expand Down
167 changes: 98 additions & 69 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,33 +58,31 @@ address@1.0.1, address@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/address/-/address-1.0.1.tgz#363f5d3f2be26d0655d8afd5a9562e4fc2194537"

admin-on-rest@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/admin-on-rest/-/admin-on-rest-1.1.0.tgz#5443a1e29666a37fc5e683f98bfcacb4fadccea4"
admin-on-rest@~1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/admin-on-rest/-/admin-on-rest-1.3.0.tgz#33314b2337507bd4461db6c7ffbf2d4a8d3ae8db"
dependencies:
babel-runtime "~6.18.0"
babel-runtime "~6.26.0"
inflection "~1.12.0"
lodash.debounce "~4.0.8"
lodash.defaultsdeep "~4.6.0"
lodash.get "~4.4.2"
lodash.isequal "~4.5.0"
lodash.set "~4.3.2"
material-ui "~0.17.4"
material-ui-chip-input "~0.13.5"
material-ui "~0.19.0"
material-ui-chip-input "~0.17.0"
node-polyglot "2.2.2"
prop-types "~15.5.7"
query-string "~4.3.2"
react "~15.5.4"
react-dom "~15.5.4"
react-dropzone "~3.13.1"
query-string "~5.0.0"
react-dropzone "~4.0.1"
react-redux "~5.0.4"
react-router "~4.1.0"
react-router-dom "~4.1.0"
react-router-redux "~5.0.0-alpha.5"
react-tap-event-plugin "~2.0.1"
recompose "~0.23.1"
redux "~3.6.0"
redux-form "~6.6.3"
redux-saga "~0.14.6"
react-router-redux "~5.0.0-alpha.6"
recompose "~0.25.0"
redux "~3.7.2"
redux-form "~7.0.3"
redux-saga "~0.15.0"
reselect "~3.0.0"

ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
Expand Down Expand Up @@ -967,12 +965,12 @@ babel-runtime@6.23.0, babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtim
core-js "^2.4.0"
regenerator-runtime "^0.10.0"

babel-runtime@~6.18.0:
version "6.18.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.18.0.tgz#0f4177ffd98492ef13b9f823e9994a02584c9078"
babel-runtime@~6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.9.5"
regenerator-runtime "^0.11.0"

babel-template@^6.16.0, babel-template@^6.24.1:
version "6.24.1"
Expand Down Expand Up @@ -1285,6 +1283,10 @@ center-align@^0.1.1:
align-text "^0.1.3"
lazy-cache "^1.0.3"

chain-function@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"

chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
Expand Down Expand Up @@ -1793,6 +1795,10 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"

decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"

deep-equal@^1.0.1, deep-equal@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
Expand Down Expand Up @@ -1899,6 +1905,10 @@ dom-converter@~0.1:
dependencies:
utila "~0.3"

dom-helpers@^3.2.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"

dom-serializer@0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
Expand Down Expand Up @@ -2929,6 +2939,10 @@ hoist-non-react-statics@^1.0.0, hoist-non-react-statics@^1.0.3, hoist-non-react-
version "1.2.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"

hoist-non-react-statics@^2.2.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"

home-or-tmp@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
Expand Down Expand Up @@ -3927,6 +3941,10 @@ lodash.get@~4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"

lodash.isequal@~4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"

lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
Expand Down Expand Up @@ -4010,26 +4028,25 @@ map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"

material-ui-chip-input@~0.13.5:
version "0.13.6"
resolved "https://registry.yarnpkg.com/material-ui-chip-input/-/material-ui-chip-input-0.13.6.tgz#ca5f50c85da1f7a3e02532513f95cc471fd15d30"
material-ui-chip-input@~0.17.0:
version "0.17.2"
resolved "https://registry.yarnpkg.com/material-ui-chip-input/-/material-ui-chip-input-0.17.2.tgz#4d1c065cad8d9b96ad6b0b3d3fa916fc27b66da8"
dependencies:
prop-types "^15.5.7"

material-ui@~0.17.4:
version "0.17.4"
resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.17.4.tgz#193999ecb49c3ec15ae0abb4e90fdf9a7bd343e0"
material-ui@~0.19.0:
version "0.19.1"
resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.19.1.tgz#6be8072c3d1df9a2c93a840afab47952f2af5653"
dependencies:
babel-runtime "^6.23.0"
inline-style-prefixer "^3.0.2"
keycode "^2.1.8"
lodash.merge "^4.6.0"
lodash.throttle "^4.1.1"
prop-types "^15.5.7"
react-addons-create-fragment "^15.4.0"
react-addons-transition-group "^15.4.0"
react-event-listener "^0.4.5"
recompose "^0.23.0"
react-transition-group "^1.1.2"
recompose "0.24.0"
simple-assign "^0.1.0"
warning "^3.0.0"

Expand Down Expand Up @@ -4964,7 +4981,7 @@ promise@7.1.1, promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@~15.5.7:
prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.9, prop-types@~15.5.7:
version "15.5.10"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
dependencies:
Expand Down Expand Up @@ -5027,13 +5044,21 @@ qs@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-1.2.2.tgz#19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"

query-string@^4.1.0, query-string@~4.3.2:
query-string@^4.1.0:
version "4.3.4"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
dependencies:
object-assign "^4.1.0"
strict-uri-encode "^1.0.0"

query-string@~5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.0.tgz#fbdf7004b4d2aff792f9871981b7a2794f555947"
dependencies:
decode-uri-component "^0.2.0"
object-assign "^4.1.0"
strict-uri-encode "^1.0.0"

querystring-es3@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
Expand Down Expand Up @@ -5093,21 +5118,6 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-addons-create-fragment@^15.4.0:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react-addons-create-fragment/-/react-addons-create-fragment-15.5.4.tgz#048acb2f332a3f450beae0be66824ed91e66e122"
dependencies:
fbjs "^0.8.4"
loose-envify "^1.3.1"
object-assign "^4.1.0"

react-addons-transition-group@^15.4.0:
version "15.5.2"
resolved "https://registry.yarnpkg.com/react-addons-transition-group/-/react-addons-transition-group-15.5.2.tgz#da6989d9cffe27dffacaedc862000ffb09ae2206"
dependencies:
fbjs "^0.8.4"
object-assign "^4.1.0"

react-dev-utils@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-2.0.1.tgz#5843504d89f038f046258a871fc26071775fc065"
Expand Down Expand Up @@ -5161,9 +5171,9 @@ react-dom@~15.5.4:
object-assign "^4.1.0"
prop-types "~15.5.7"

react-dropzone@~3.13.1:
version "3.13.2"
resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-3.13.2.tgz#318745c03007ca6b948cdd4431abc009b16a6588"
react-dropzone@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-4.0.1.tgz#4d71d6f0fc5d7ac8a50dfa46582c96fe35ae3ca4"
dependencies:
attr-accept "^1.0.3"
prop-types "^15.5.7"
Expand Down Expand Up @@ -5209,7 +5219,7 @@ react-router-dom@~4.1.0:
prop-types "^15.5.4"
react-router "^4.1.1"

react-router-redux@~5.0.0-alpha.5:
react-router-redux@~5.0.0-alpha.6:
version "5.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.6.tgz#7418663c2ecd3c51be856fcf28f3d1deecc1a576"
dependencies:
Expand Down Expand Up @@ -5278,6 +5288,16 @@ react-tap-event-plugin@~2.0.1:
dependencies:
fbjs "^0.8.6"

react-transition-group@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.0.tgz#b51fc921b0c3835a7ef7c571c79fc82c73e9204f"
dependencies:
chain-function "^1.0.0"
dom-helpers "^3.2.0"
loose-envify "^1.3.1"
prop-types "^15.5.6"
warning "^3.0.0"

react@~15.4.0:
version "15.4.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
Expand Down Expand Up @@ -5376,9 +5396,18 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"

recompose@^0.23.0, recompose@~0.23.1:
version "0.23.4"
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.23.4.tgz#af09e4e08424effa449c9b793037166f7b30644a"
recompose@0.24.0:
version "0.24.0"
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.24.0.tgz#262e93f974439eb17e7779824d88cce90492a5dd"
dependencies:
change-emitter "^0.1.2"
fbjs "^0.8.1"
hoist-non-react-statics "^1.0.0"
symbol-observable "^1.0.4"

recompose@~0.25.0:
version "0.25.0"
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.25.0.tgz#e2ec723692ff0fdab3d62bd22c1da69af1985acd"
dependencies:
change-emitter "^0.1.2"
fbjs "^0.8.1"
Expand Down Expand Up @@ -5412,31 +5441,31 @@ reduce-function-call@^1.0.1:
dependencies:
balanced-match "^0.4.2"

redux-form@~6.6.2, redux-form@~6.6.3:
version "6.6.3"
resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-6.6.3.tgz#62362654f2214c83a8f9fcb8313702bb46f92205"
redux-form@~7.0.3:
version "7.0.4"
resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-7.0.4.tgz#2297b6bed40fda8bb58132e261ba0976fb4e530c"
dependencies:
deep-equal "^1.0.1"
es6-error "^4.0.0"
hoist-non-react-statics "^1.2.0"
hoist-non-react-statics "^2.2.1"
invariant "^2.2.2"
is-promise "^2.1.0"
lodash "^4.17.3"
lodash-es "^4.17.3"
prop-types "^15.5.6"
prop-types "^15.5.9"

redux-saga@~0.14.6:
version "0.14.8"
resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.14.8.tgz#ad01afabe02ec41a17df54e2e09aa236b30a7732"
redux-saga@~0.15.0:
version "0.15.6"
resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.15.6.tgz#8638dc522de6c6c0a496fe8b2b5466287ac2dc4d"

redux@~3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/redux/-/redux-3.6.0.tgz#887c2b3d0b9bd86eca2be70571c27654c19e188d"
redux@~3.7.2:
version "3.7.2"
resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
dependencies:
lodash "^4.2.1"
lodash-es "^4.2.1"
loose-envify "^1.1.0"
symbol-observable "^1.0.2"
symbol-observable "^1.0.3"

regenerate@^1.2.1:
version "1.3.2"
Expand All @@ -5446,9 +5475,9 @@ regenerator-runtime@^0.10.0:
version "0.10.5"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"

regenerator-runtime@^0.9.5:
version "0.9.6"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
regenerator-runtime@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"

regenerator-transform@0.9.11:
version "0.9.11"
Expand Down Expand Up @@ -6090,7 +6119,7 @@ sw-toolbox@^3.4.0:
path-to-regexp "^1.0.1"
serviceworker-cache-polyfill "^4.0.0"

symbol-observable@^1.0.2, symbol-observable@^1.0.4:
symbol-observable@^1.0.3, symbol-observable@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"

Expand Down