diff --git a/package-lock.json b/package-lock.json
index 0f925a208b94775c3cb6836d16685b82ddb5c14c..8fa57d5cc8f13b0fb16bf5bcdbf51fa3efed22bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2836,11 +2836,6 @@
}
}
},
- "@types/invariant": {
- "version": "2.2.29",
- "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.29.tgz",
- "integrity": "sha512-lRVw09gOvgviOfeUrKc/pmTiRZ7g7oDOU6OAutyuSHpm1/o2RaBQvRhgK8QEdu+FFuw/wnWb29A/iuxv9i8OpQ=="
- },
"@types/jss": {
"version": "9.5.7",
"resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.7.tgz",
@@ -2850,11 +2845,6 @@
"indefinite-observable": "^1.0.1"
}
},
- "@types/lodash": {
- "version": "4.14.118",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.118.tgz",
- "integrity": "sha512-iiJbKLZbhSa6FYRip/9ZDX6HXhayXLDGY2Fqws9cOkEQ6XeKfaxB0sC541mowZJueYyMnVUmmG+al5/4fCDrgw=="
- },
"@types/node": {
"version": "10.11.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz",
@@ -2883,14 +2873,6 @@
"@types/react": "*"
}
},
- "@types/redux": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/@types/redux/-/redux-3.6.0.tgz",
- "integrity": "sha1-8evh5UEVGAcuT9/KXHbhbnTBOZo=",
- "requires": {
- "redux": "*"
- }
- },
"@webassemblyjs/ast": {
"version": "1.7.11",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
@@ -3154,9 +3136,9 @@
}
},
"ajv-errors": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz",
- "integrity": "sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+ "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
"dev": true
},
"ajv-keywords": {
@@ -3200,9 +3182,9 @@
"dev": true
},
"ansi-colors": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.1.tgz",
- "integrity": "sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==",
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+ "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
"dev": true
},
"ansi-escapes": {
@@ -3462,11 +3444,6 @@
"integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw==",
"dev": true
},
- "autobind-decorator": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/autobind-decorator/-/autobind-decorator-2.2.1.tgz",
- "integrity": "sha512-XXC/B4Cm5X/Rv8etlFcpxUHdIhcs4U3tf8bsg50gUV8J6kq1Uij25xeBoSeuUwdKs2NMhwy+p9T4VNS8/ujp9w=="
- },
"autoprefixer": {
"version": "6.7.7",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
@@ -3481,14 +3458,6 @@
"postcss-value-parser": "^3.2.3"
}
},
- "autosuggest-highlight": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/autosuggest-highlight/-/autosuggest-highlight-3.1.1.tgz",
- "integrity": "sha512-MQ6GNIGMMZbeA5FlBLXXgkZEthysCdYNkMV4MahB2/qB/9cwBnVsePUPnIqkMuzjzclTtDa67xln7cgLDu2f/g==",
- "requires": {
- "diacritic": "0.0.2"
- }
- },
"aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -3972,9 +3941,9 @@
},
"dependencies": {
"array-flatten": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
- "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
"dev": true
}
}
@@ -4923,9 +4892,9 @@
}
},
"connect-history-api-fallback": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
- "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=",
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
"dev": true
},
"console-browserify": {
@@ -5663,11 +5632,6 @@
"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
"dev": true
},
- "diacritic": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/diacritic/-/diacritic-0.0.2.tgz",
- "integrity": "sha1-/CqIe1pbwKCoVPthTHwvIJBh7gQ="
- },
"diff": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -5718,25 +5682,14 @@
"integrity": "sha1-NsamdEdfVaLWkTVnpgFETkh7S24="
},
"dnd-core": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-3.0.2.tgz",
- "integrity": "sha1-6UdXdiBTHH7jelGM1d3hfQ798PM=",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-7.0.2.tgz",
+ "integrity": "sha512-InwRBi6zTndtE3+3nTYpLJkYMEr7utSR7OziAoSFhtQsbUfJE1KeqxM+ZFRIMKn6ehxUTAC+QU6QC7IG9u86Mg==",
"requires": {
- "@types/invariant": "^2.2.29",
- "@types/lodash": "^4.14.107",
- "@types/node": "^8.10.11",
- "@types/redux": "^3.6.0",
"asap": "^2.0.6",
- "invariant": "^2.0.0",
- "lodash": "^4.2.0",
- "redux": "^4.0.0"
- },
- "dependencies": {
- "@types/node": {
- "version": "8.10.37",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.37.tgz",
- "integrity": "sha512-Jp39foY8Euv/PG4OGPyzxis82mnjcUtXLEMA8oFMCE4ilmuJgZPdV2nZNV1moz+99EJTtcpOSgDCgATUwABKig=="
- }
+ "invariant": "^2.2.4",
+ "lodash": "^4.17.11",
+ "redux": "^4.0.1"
}
},
"dns-equal": {
@@ -7202,9 +7155,9 @@
}
},
"follow-redirects": {
- "version": "1.5.9",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz",
- "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==",
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
+ "integrity": "sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==",
"dev": true,
"requires": {
"debug": "=3.1.0"
@@ -7291,6 +7244,30 @@
"readable-stream": "^2.0.0"
}
},
+ "frontend-collective-react-dnd-scrollzone": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/frontend-collective-react-dnd-scrollzone/-/frontend-collective-react-dnd-scrollzone-1.0.1.tgz",
+ "integrity": "sha512-N1i4hkN4z3BABWGixx+wYaF8OcTX/hamJnwa47ydmI6cMuKf3vJtBPfMfE4rsnHd0VukvV/b6wNMInyqFIHFsg==",
+ "requires": {
+ "hoist-non-react-statics": "^3.1.0",
+ "lodash.throttle": "^4.0.1",
+ "prop-types": "^15.5.9",
+ "raf": "^3.2.0",
+ "react": "^16.3.0",
+ "react-display-name": "^0.2.0",
+ "react-dom": "^16.3.0"
+ },
+ "dependencies": {
+ "hoist-non-react-statics": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz",
+ "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==",
+ "requires": {
+ "react-is": "^16.3.2"
+ }
+ }
+ }
+ },
"fs-readdir-recursive": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
@@ -8105,9 +8082,9 @@
"integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
},
"handle-thing": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
- "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+ "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
"dev": true
},
"handlebars": {
@@ -11747,9 +11724,9 @@
"integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY="
},
"portfinder": {
- "version": "1.0.19",
- "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.19.tgz",
- "integrity": "sha512-23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw==",
+ "version": "1.0.20",
+ "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
+ "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
"dev": true,
"requires": {
"async": "^1.5.2",
@@ -12613,28 +12590,55 @@
"integrity": "sha512-zvU6iouW+SWwHTyThwxGICjJYCMZFk/6r/+jmOdC7ntQoPlS/Pqb81MkxaMf2bHTSq9TN3K3zX2/ayMW/jCtyA=="
},
"react-dnd": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-3.0.2.tgz",
- "integrity": "sha1-sMI9jYKWn1t740y8T4T6H/xcfdw=",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-7.0.2.tgz",
+ "integrity": "sha512-nJnHJo/tNQjyod234+hPNopWHPvgH0gujf3pcdJWRe3l0GL+jSXXwXJ2SFwIHkVmxPYrx8+gbKU3+Pq26p6fkg==",
"requires": {
- "disposables": "^1.0.1",
- "dnd-core": "^3.0.2",
- "hoist-non-react-statics": "^2.5.0",
+ "dnd-core": "^7.0.2",
+ "hoist-non-react-statics": "^3.1.0",
"invariant": "^2.1.0",
- "lodash": "^4.2.0",
- "prop-types": "^15.5.10",
- "shallowequal": "^1.0.2"
+ "lodash": "^4.17.11",
+ "recompose": "^0.30.0",
+ "shallowequal": "^1.1.0"
+ },
+ "dependencies": {
+ "hoist-non-react-statics": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz",
+ "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==",
+ "requires": {
+ "react-is": "^16.3.2"
+ }
+ },
+ "recompose": {
+ "version": "0.30.0",
+ "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz",
+ "integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==",
+ "requires": {
+ "@babel/runtime": "^7.0.0",
+ "change-emitter": "^0.1.2",
+ "fbjs": "^0.8.1",
+ "hoist-non-react-statics": "^2.3.1",
+ "react-lifecycles-compat": "^3.0.2",
+ "symbol-observable": "^1.0.4"
+ },
+ "dependencies": {
+ "hoist-non-react-statics": {
+ "version": "2.5.5",
+ "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+ "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+ }
+ }
+ }
}
},
"react-dnd-html5-backend": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-3.0.2.tgz",
- "integrity": "sha1-hxcv1L6Q5FNTEZtA4Q9ZHd+GYe0=",
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-7.0.2.tgz",
+ "integrity": "sha512-BPhmHeQjvhPXRykHvFLbM+TJFrrarcuf/mIArNEmXzZuNhLfbOnHtMSzR8lPwodABcDAYj7hEF7vTABXX298vA==",
"requires": {
- "autobind-decorator": "^2.1.0",
- "dnd-core": "^3.0.2",
- "lodash": "^4.2.0",
- "shallowequal": "^1.0.2"
+ "dnd-core": "^7.0.2",
+ "lodash": "^4.17.11"
}
},
"react-dnd-scrollzone": {
@@ -12881,15 +12885,15 @@
}
},
"react-sortable-tree": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/react-sortable-tree/-/react-sortable-tree-2.3.0.tgz",
- "integrity": "sha512-ZU2TETT+Xigo7Dzvk7Foo3Y9n4LK2EMbv6scUZUqHZcIA1IIiG49UZ6/1+qWhoLKqRGcmR7a6b1ksYm5xpO+Ow==",
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/react-sortable-tree/-/react-sortable-tree-2.6.0.tgz",
+ "integrity": "sha512-XRAm8mK48xylJtLtk/ENPdV0+cAvx+vCDRxWJq9Nhc4vI+dKx4flEGJc1cFmvt5OvXaaX/KWQFB59/4gYkEPXw==",
"requires": {
+ "frontend-collective-react-dnd-scrollzone": "^1.0.1",
"lodash.isequal": "^4.5.0",
"prop-types": "^15.6.1",
- "react-dnd": "3.0.2",
- "react-dnd-html5-backend": "3.0.2",
- "react-dnd-scrollzone": "^4.0.0",
+ "react-dnd": "^7.0.1",
+ "react-dnd-html5-backend": "^7.0.1",
"react-lifecycles-compat": "^3.0.4",
"react-virtualized": "^9.19.1"
}
@@ -12952,64 +12956,6 @@
}
}
},
- "react-sortable-tree-theme-minimal": {
- "version": "0.0.14",
- "resolved": "https://registry.npmjs.org/react-sortable-tree-theme-minimal/-/react-sortable-tree-theme-minimal-0.0.14.tgz",
- "integrity": "sha512-pbRN3vq7YPCz4mL17DelDKIYgKaw2fs4sJhdgtEDmI1roYjuwZQdo1C2Zm6igHv8ZrciztxJ+qMgdfC8Vn45ig==",
- "requires": {
- "lodash.isequal": "^4.4.0",
- "prop-types": "^15.6.0",
- "react-dnd": "2.5.4",
- "react-dnd-html5-backend": "2.5.4",
- "react-dnd-scrollzone": "^4.0.0",
- "react-virtualized": "^9.13.0"
- },
- "dependencies": {
- "dnd-core": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.6.0.tgz",
- "integrity": "sha1-ErrWbVh0LG5ffPKUP7aFlED4CcQ=",
- "requires": {
- "asap": "^2.0.6",
- "invariant": "^2.0.0",
- "lodash": "^4.2.0",
- "redux": "^3.7.1"
- }
- },
- "react-dnd": {
- "version": "2.5.4",
- "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.5.4.tgz",
- "integrity": "sha512-y9YmnusURc+3KPgvhYKvZ9oCucj51MSZWODyaeV0KFU0cquzA7dCD1g/OIYUKtNoZ+MXtacDngkdud2TklMSjw==",
- "requires": {
- "disposables": "^1.0.1",
- "dnd-core": "^2.5.4",
- "hoist-non-react-statics": "^2.1.0",
- "invariant": "^2.1.0",
- "lodash": "^4.2.0",
- "prop-types": "^15.5.10"
- }
- },
- "react-dnd-html5-backend": {
- "version": "2.5.4",
- "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz",
- "integrity": "sha512-jDqAkm/hI8Tl4HcsbhkBgB6HgpJR1e+ML1SbfxaegXYiuMxEVQm0FOwEH5WxUoo6fmIG4N+H0rSm59POuZOCaA==",
- "requires": {
- "lodash": "^4.2.0"
- }
- },
- "redux": {
- "version": "3.7.2",
- "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
- "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
- "requires": {
- "lodash": "^4.2.1",
- "lodash-es": "^4.2.1",
- "loose-envify": "^1.1.0",
- "symbol-observable": "^1.0.3"
- }
- }
- }
- },
"react-test-renderer": {
"version": "16.6.1",
"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.6.1.tgz",
@@ -14764,32 +14710,75 @@
"dev": true
},
"spdy": {
- "version": "3.4.7",
- "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
- "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+ "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
"dev": true,
"requires": {
- "debug": "^2.6.8",
- "handle-thing": "^1.2.5",
+ "debug": "^4.1.0",
+ "handle-thing": "^2.0.0",
"http-deceiver": "^1.2.7",
- "safe-buffer": "^5.0.1",
"select-hose": "^2.0.0",
- "spdy-transport": "^2.0.18"
+ "spdy-transport": "^3.0.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
+ }
}
},
"spdy-transport": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.1.tgz",
- "integrity": "sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
"dev": true,
"requires": {
- "debug": "^2.6.8",
- "detect-node": "^2.0.3",
+ "debug": "^4.1.0",
+ "detect-node": "^2.0.4",
"hpack.js": "^2.1.6",
- "obuf": "^1.1.1",
- "readable-stream": "^2.2.9",
- "safe-buffer": "^5.0.1",
- "wbuf": "^1.7.2"
+ "obuf": "^1.1.2",
+ "readable-stream": "^3.0.6",
+ "wbuf": "^1.7.3"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
+ },
+ "readable-stream": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
+ "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ }
}
},
"split": {
@@ -16231,17 +16220,17 @@
},
"dependencies": {
"mime": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
- "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+ "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
"dev": true
}
}
},
"webpack-dev-server": {
- "version": "3.1.10",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz",
- "integrity": "sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==",
+ "version": "3.1.14",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
+ "integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
"dev": true,
"requires": {
"ansi-html": "0.0.7",
@@ -16263,12 +16252,14 @@
"portfinder": "^1.0.9",
"schema-utils": "^1.0.0",
"selfsigned": "^1.9.1",
+ "semver": "^5.6.0",
"serve-index": "^1.7.2",
"sockjs": "0.3.19",
"sockjs-client": "1.3.0",
- "spdy": "^3.4.1",
+ "spdy": "^4.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^5.1.0",
+ "url": "^0.11.0",
"webpack-dev-middleware": "3.4.0",
"webpack-log": "^2.0.0",
"yargs": "12.0.2"
@@ -16346,13 +16337,13 @@
}
},
"execa": {
- "version": "0.10.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
- "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
"dev": true,
"requires": {
"cross-spawn": "^6.0.0",
- "get-stream": "^3.0.0",
+ "get-stream": "^4.0.0",
"is-stream": "^1.1.0",
"npm-run-path": "^2.0.0",
"p-finally": "^1.0.0",
@@ -16369,6 +16360,15 @@
"locate-path": "^3.0.0"
}
},
+ "get-stream": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
"import-local": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
@@ -16422,20 +16422,20 @@
"dev": true
},
"os-locale": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz",
- "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
"dev": true,
"requires": {
- "execa": "^0.10.0",
+ "execa": "^1.0.0",
"lcid": "^2.0.0",
"mem": "^4.0.0"
}
},
"p-limit": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
- "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+ "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -16465,6 +16465,16 @@
"find-up": "^3.0.0"
}
},
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
"schema-utils": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -16476,6 +16486,12 @@
"ajv-keywords": "^3.1.0"
}
},
+ "semver": {
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+ "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+ "dev": true
+ },
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
diff --git a/package.json b/package.json
index 57a7cb07a6a6fdec7d42a12640e70a5f0734ebd7..2d690466fdcb353f35fa36101a36a0ecfc7074c5 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
"style-loader": "^0.20.3",
"webpack": "^4.25.1",
"webpack-cli": "^3.1.2",
- "webpack-dev-server": "^3.1.10",
+ "webpack-dev-server": "^3.1.14",
"webpack-merge": "^4.1.4"
},
"dependencies": {
@@ -58,7 +58,6 @@
"@material-ui/lab": "^3.0.0-alpha.23",
"Leaflet.Control.Opacity": "git+https://github.com/SemanticComputing/Leaflet.Control.Opacity.git",
"Leaflet.extra-markers": "git+https://github.com/SemanticComputing/Leaflet.ExtraMarkers.git",
- "autosuggest-highlight": "^3.1.1",
"bootstrap": "^4.1.3",
"deck.gl": "^6.2.4",
"express": "^4.16.4",
@@ -81,9 +80,8 @@
"react-redux": "^5.1.0",
"react-redux-toastr": "^7.4.1",
"react-router-dom": "^4.3.1",
- "react-sortable-tree": "^2.3.0",
+ "react-sortable-tree": "^2.6.0",
"react-sortable-tree-theme-file-explorer": "^2.0.0",
- "react-sortable-tree-theme-minimal": "0.0.14",
"react-virtualized": "^9.21.0",
"recompose": "^0.28.2",
"redux": "^4.0.1",
diff --git a/src/client/components/HierarchicalFacet.js b/src/client/components/HierarchicalFacet.js
index 43b8d763fb6f32d407eeb91a09078cf310f3e192..9be655820489c8cd60bc084830ec5218976e4790 100644
--- a/src/client/components/HierarchicalFacet.js
+++ b/src/client/components/HierarchicalFacet.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
import SortableTree, { changeNodeAtPath } from 'react-sortable-tree';
-import 'react-sortable-tree/style.css'; // This only needs to be imported once in your app
+//import 'react-sortable-tree/style.css'; // This only needs to be imported once in your app
import FileExplorerTheme from 'react-sortable-tree-theme-file-explorer';
import Checkbox from '@material-ui/core/Checkbox';
import FormControlLabel from '@material-ui/core/FormControlLabel';
@@ -39,20 +39,13 @@ const styles = () => ({
alignItems: 'center',
justifyContent: 'center'
},
- treeNode: {
- fontFamily: 'Roboto',
- },
- formControlRoot: {
- //maxHeight: 24
- },
checkbox: {
- width: 24,
- height: 24,
- marginRight: 3,
- marginLeft: 10
+ padding: 0,
+ marginLeft: 6,
+ marginRight: 4,
},
label: {
-
+ // no styling
},
sdbmLabel: {
color: '#00796B'
@@ -117,6 +110,10 @@ class HierarchicalFacet extends Component {
});
};
+ handleSearchFieldOnChange = event => {
+ this.setState({ searchString: event.target.value });
+ }
+
generateLabel = node => {
//let source = node.source == null ? '' : `(source: ${node.source.substring(node.source.lastIndexOf('/') + 1)}`;
//console.log(node)
@@ -147,7 +144,7 @@ class HierarchicalFacet extends Component {
// Case insensitive search of `node.title`
const customSearchMethod = ({ node, searchQuery }) =>
- searchQuery &&
+ searchQuery.length > 2 &&
node.prefLabel.toLowerCase().indexOf(searchQuery.toLowerCase()) > -1;
const selectPrevMatch = () =>
@@ -178,7 +175,7 @@ class HierarchicalFacet extends Component {
<div className={classes.facetSearchContainer}>
<Input
placeholder={`Search...`}
- onChange={event => this.setState({ searchString: event.target.value })}
+ onChange={this.handleSearchFieldOnChange}
>
</Input>
{searchFoundCount > 0 &&
diff --git a/src/client/index.html b/src/client/index.html
index 21bf582cdfff57f228fd195f7567f06e2466b4b7..232125a466287f5a54909fc024e9dc2580185e0d 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -31,6 +31,14 @@
}
.rstcustom__rowWrapper {
display: flex;
+ align-items: center;
+ }
+ .rstcustom__rowSearchMatch {
+ box-shadow: none;
+ }
+ .rstcustom__rowSearchMatch span[class^="MuiFormControlLabel-"], .rstcustom__rowSearchMatch span[class*=" MuiFormControlLabel-"] {
+ outline-offset: 2px;
+ outline: 2px solid black;
}
.leaflet-popup-scrolled {
border: 0px;