diff --git a/package-lock.json b/package-lock.json index 7f3c644c6..09f95877b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21376,28 +21376,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, @@ -21408,14 +21408,14 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": false, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, @@ -21426,42 +21426,42 @@ }, "chownr": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, @@ -21471,28 +21471,28 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, @@ -21502,14 +21502,14 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, @@ -21526,7 +21526,7 @@ }, "glob": { "version": "7.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, @@ -21541,14 +21541,14 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": false, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, @@ -21558,7 +21558,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, @@ -21568,7 +21568,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, @@ -21579,21 +21579,21 @@ }, "inherits": { "version": "2.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, @@ -21603,14 +21603,14 @@ }, "isarray": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, @@ -21620,14 +21620,14 @@ }, "minimist": { "version": "0.0.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true, "optional": true }, "minipass": { "version": "2.3.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "optional": true, @@ -21638,7 +21638,7 @@ }, "minizlib": { "version": "1.2.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, @@ -21648,7 +21648,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "optional": true, @@ -21658,7 +21658,7 @@ }, "ms": { "version": "2.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true @@ -21672,7 +21672,7 @@ }, "needle": { "version": "2.3.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz", "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, @@ -21684,7 +21684,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, @@ -21703,7 +21703,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, @@ -21714,14 +21714,14 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, @@ -21732,7 +21732,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, @@ -21745,21 +21745,21 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, @@ -21769,21 +21769,21 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, @@ -21794,21 +21794,21 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, @@ -21821,7 +21821,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true @@ -21830,7 +21830,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, @@ -21846,7 +21846,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, @@ -21856,49 +21856,49 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, @@ -21910,7 +21910,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, @@ -21920,7 +21920,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, @@ -21930,14 +21930,14 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, @@ -21953,14 +21953,14 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, @@ -21970,14 +21970,14 @@ }, "wrappy": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true }, "yallist": { "version": "3.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true, "optional": true diff --git a/src/core/client/admin/routes/Stories/StoryStatus/CloseStoryMutation.ts b/src/core/client/admin/routes/Stories/StoryActions/CloseStoryMutation.ts similarity index 100% rename from src/core/client/admin/routes/Stories/StoryStatus/CloseStoryMutation.ts rename to src/core/client/admin/routes/Stories/StoryActions/CloseStoryMutation.ts diff --git a/src/core/client/admin/routes/Stories/StoryStatus/OpenStoryMutation.ts b/src/core/client/admin/routes/Stories/StoryActions/OpenStoryMutation.ts similarity index 100% rename from src/core/client/admin/routes/Stories/StoryStatus/OpenStoryMutation.ts rename to src/core/client/admin/routes/Stories/StoryActions/OpenStoryMutation.ts diff --git a/src/core/client/admin/routes/Stories/StoryActions/RescrapeStoryMutation.ts b/src/core/client/admin/routes/Stories/StoryActions/RescrapeStoryMutation.ts new file mode 100644 index 000000000..06bafd89c --- /dev/null +++ b/src/core/client/admin/routes/Stories/StoryActions/RescrapeStoryMutation.ts @@ -0,0 +1,40 @@ +import { graphql } from "react-relay"; +import { Environment } from "relay-runtime"; + +import { + commitMutationPromiseNormalized, + createMutation, + MutationInput, +} from "coral-framework/lib/relay"; + +import { RescrapeStoryMutation as MutationTypes } from "coral-admin/__generated__/RescrapeStoryMutation.graphql"; + +let clientMutationId = 0; + +const RescrapeStoryMutation = createMutation( + "scrapeStory", + (environment: Environment, input: MutationInput) => + commitMutationPromiseNormalized(environment, { + mutation: graphql` + mutation RescrapeStoryMutation($input: ScrapeStoryInput!) { + scrapeStory(input: $input) { + story { + id + metadata { + title + } + } + clientMutationId + } + } + `, + variables: { + input: { + ...input, + clientMutationId: (clientMutationId++).toString(), + }, + }, + }) +); + +export default RescrapeStoryMutation; diff --git a/src/core/client/admin/routes/Stories/StoryActions/StoryActions.tsx b/src/core/client/admin/routes/Stories/StoryActions/StoryActions.tsx new file mode 100644 index 000000000..a29176088 --- /dev/null +++ b/src/core/client/admin/routes/Stories/StoryActions/StoryActions.tsx @@ -0,0 +1,94 @@ +import { Localized } from "@fluent/react/compat"; +import React, { FunctionComponent } from "react"; + +import { + Button, + ButtonIcon, + ClickOutside, + Dropdown, + DropdownButton, + Popover, +} from "coral-ui/components/v2"; + +interface Props { + onRescrape: () => void; + onOpen: () => void; + onClose: () => void; + canOpen: boolean; + canClose: boolean; +} + +const StoryActions: FunctionComponent = ({ + onRescrape, + onOpen, + onClose, + canOpen, + canClose, +}) => { + return ( + + ( + + + + { + onRescrape(); + toggleVisibility(); + }} + > + Re-scrape + + + {canOpen && ( + + { + onOpen(); + toggleVisibility(); + }} + > + Open story + + + )} + {canClose && ( + + { + onClose(); + toggleVisibility(); + }} + > + Close story + + + )} + + + )} + > + {({ toggleVisibility, ref, visible }) => ( + + + + )} + + + ); +}; + +export default StoryActions; diff --git a/src/core/client/admin/routes/Stories/StoryActions/StoryActionsContainer.tsx b/src/core/client/admin/routes/Stories/StoryActions/StoryActionsContainer.tsx new file mode 100644 index 000000000..5fad3f278 --- /dev/null +++ b/src/core/client/admin/routes/Stories/StoryActions/StoryActionsContainer.tsx @@ -0,0 +1,61 @@ +import React, { FunctionComponent, useCallback } from "react"; +import { graphql } from "react-relay"; + +import { Ability, can } from "coral-admin/permissions"; +import { useMutation, withFragmentContainer } from "coral-framework/lib/relay"; +import { GQLSTORY_STATUS } from "coral-framework/schema"; + +import { StoryActionsContainer_story } from "coral-admin/__generated__/StoryActionsContainer_story.graphql"; +import { StoryActionsContainer_viewer } from "coral-admin/__generated__/StoryActionsContainer_viewer.graphql"; + +import CloseStoryMutation from "./CloseStoryMutation"; +import OpenStoryMutation from "./OpenStoryMutation"; +import RescrapeStoryMutation from "./RescrapeStoryMutation"; +import StoryActions from "./StoryActions"; + +interface Props { + story: StoryActionsContainer_story; + viewer: StoryActionsContainer_viewer; +} + +const StoryActionsContainer: FunctionComponent = (props) => { + const rescrape = useMutation(RescrapeStoryMutation); + const closeStory = useMutation(CloseStoryMutation); + const openStory = useMutation(OpenStoryMutation); + const onRescrape = useCallback(() => { + rescrape({ id: props.story.id }); + }, [props.story.id]); + const onClose = useCallback(() => { + closeStory({ id: props.story.id }); + }, [props.story.id]); + const onOpen = useCallback(() => { + openStory({ id: props.story.id }); + }, [props.story.id]); + const canChangeStatus = can(props.viewer, Ability.CHANGE_STORY_STATUS); + return ( + + ); +}; + +const enhanced = withFragmentContainer({ + viewer: graphql` + fragment StoryActionsContainer_viewer on User { + id + role + } + `, + story: graphql` + fragment StoryActionsContainer_story on Story { + id + status + } + `, +})(StoryActionsContainer); + +export default enhanced; diff --git a/src/core/client/admin/routes/Stories/StoryActions/index.ts b/src/core/client/admin/routes/Stories/StoryActions/index.ts new file mode 100644 index 000000000..ee0174b8e --- /dev/null +++ b/src/core/client/admin/routes/Stories/StoryActions/index.ts @@ -0,0 +1,4 @@ +export { + default, + default as StoryActionsContainer, +} from "./StoryActionsContainer"; diff --git a/src/core/client/admin/routes/Stories/StoryRow.css b/src/core/client/admin/routes/Stories/StoryRow.css index 899cbaba2..edf856fa8 100644 --- a/src/core/client/admin/routes/Stories/StoryRow.css +++ b/src/core/client/admin/routes/Stories/StoryRow.css @@ -19,7 +19,8 @@ .reportedCountColumn, .pendingCountColumn, -.totalCountColumn { +.totalCountColumn, +.actionsColumn { text-align: center; } diff --git a/src/core/client/admin/routes/Stories/StoryRow.tsx b/src/core/client/admin/routes/Stories/StoryRow.tsx index f4558772a..2a3417f32 100644 --- a/src/core/client/admin/routes/Stories/StoryRow.tsx +++ b/src/core/client/admin/routes/Stories/StoryRow.tsx @@ -12,7 +12,8 @@ import { TextLink, } from "coral-ui/components/v2"; -import StoryStatus from "./StoryStatus"; +import StoryActionsContainer from "./StoryActions"; +import StoryStatusContainer from "./StoryStatus"; import styles from "./StoryRow.css"; @@ -21,8 +22,9 @@ interface Props { title: string | null; author: string | null; publishDate: string | null; - story: PropTypesOf["story"]; - viewer: PropTypesOf["viewer"]; + story: PropTypesOf["story"] & + PropTypesOf["story"]; + viewer: PropTypesOf["viewer"]; siteName: string; siteID: string; multisite: boolean; @@ -73,7 +75,10 @@ const UserRow: FunctionComponent = (props) => ( {props.totalCount} - + + + + ); diff --git a/src/core/client/admin/routes/Stories/StoryRowContainer.tsx b/src/core/client/admin/routes/Stories/StoryRowContainer.tsx index e14f41cbc..32aff9fa0 100644 --- a/src/core/client/admin/routes/Stories/StoryRowContainer.tsx +++ b/src/core/client/admin/routes/Stories/StoryRowContainer.tsx @@ -53,7 +53,7 @@ const enhanced = withFragmentContainer({ viewer: graphql` fragment StoryRowContainer_viewer on User { id - ...StoryStatusChangeContainer_viewer + ...StoryActionsContainer_viewer } `, story: graphql` @@ -80,7 +80,8 @@ const enhanced = withFragmentContainer({ id } isClosed - ...StoryStatusChangeContainer_story + ...StoryActionsContainer_story + ...StoryStatusContainer_story } `, })(StoryRowContainer); diff --git a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.css b/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.css deleted file mode 100644 index 6e953b31e..000000000 --- a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.css +++ /dev/null @@ -1,9 +0,0 @@ -.button { - width: 100%; - justify-content: space-between; - padding: 0; -} - -.dropdownButton { - min-width: 80px; -} diff --git a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.tsx b/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.tsx deleted file mode 100644 index 56facba92..000000000 --- a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.tsx +++ /dev/null @@ -1,82 +0,0 @@ -import { Localized } from "@fluent/react/compat"; -import React, { FunctionComponent } from "react"; - -import TranslatedStoryStatus from "coral-admin/components/TranslatedStoryStatus"; -import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "coral-framework/schema"; -import { - Button, - ButtonIcon, - ClickOutside, - Dropdown, - DropdownButton, - Popover, -} from "coral-ui/components/v2"; - -import StoryStatusText from "./StoryStatusText"; - -import styles from "./StoryStatusChange.css"; - -interface Props { - onChangeStatus: (status: GQLSTORY_STATUS_RL) => void; - status: GQLSTORY_STATUS_RL; -} - -const StoryStatusChange: FunctionComponent = (props) => ( - - ( - - - {Object.keys(GQLSTORY_STATUS).map((r: GQLSTORY_STATUS_RL) => ( - { - props.onChangeStatus(r); - toggleVisibility(); - }} - > - dummy - - } - > - {r} - - ))} - - - )} - > - {({ toggleVisibility, ref, visible }) => ( - - - - )} - - -); - -export default StoryStatusChange; diff --git a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChangeContainer.tsx b/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChangeContainer.tsx deleted file mode 100644 index a47b7364e..000000000 --- a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChangeContainer.tsx +++ /dev/null @@ -1,75 +0,0 @@ -import React, { FunctionComponent, useCallback } from "react"; -import { graphql } from "react-relay"; - -import { Ability, can } from "coral-admin/permissions"; -import { - MutationProp, - withFragmentContainer, - withMutation, -} from "coral-framework/lib/relay"; -import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "coral-framework/schema"; - -import { StoryStatusChangeContainer_story } from "coral-admin/__generated__/StoryStatusChangeContainer_story.graphql"; -import { StoryStatusChangeContainer_viewer } from "coral-admin/__generated__/StoryStatusChangeContainer_viewer.graphql"; - -import CloseStoryMutation from "./CloseStoryMutation"; -import OpenStoryMutation from "./OpenStoryMutation"; -import StoryStatusChange from "./StoryStatusChange"; -import StoryStatusText from "./StoryStatusText"; - -interface Props { - openStory: MutationProp; - closeStory: MutationProp; - viewer: StoryStatusChangeContainer_viewer; - story: StoryStatusChangeContainer_story; -} - -const StoryStatusChangeContainer: FunctionComponent = (props) => { - const handleChangeStatus = useCallback( - (status: GQLSTORY_STATUS_RL) => { - if (props.story.status === status) { - return; - } - if (status === GQLSTORY_STATUS.CLOSED) { - props.closeStory({ id: props.story.id }); - } else if (status === GQLSTORY_STATUS.OPEN) { - props.openStory({ id: props.story.id }); - } - }, - [props.story.id, props.closeStory, props.openStory, props.story.status] - ); - - const canChangeStatus = can(props.viewer, Ability.CHANGE_STORY_STATUS); - - if (!canChangeStatus) { - return {props.story.status}; - } - - return ( - - ); -}; - -const enhanced = withMutation(OpenStoryMutation)( - withMutation(CloseStoryMutation)( - withFragmentContainer({ - viewer: graphql` - fragment StoryStatusChangeContainer_viewer on User { - id - role - } - `, - story: graphql` - fragment StoryStatusChangeContainer_story on Story { - id - status - } - `, - })(StoryStatusChangeContainer) - ) -); - -export default enhanced; diff --git a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusContainer.tsx b/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusContainer.tsx new file mode 100644 index 000000000..48a487fe3 --- /dev/null +++ b/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusContainer.tsx @@ -0,0 +1,27 @@ +import React, { FunctionComponent } from "react"; +import { graphql } from "react-relay"; + +import { withFragmentContainer } from "coral-framework/lib/relay"; + +import { StoryStatusContainer_story } from "coral-admin/__generated__/StoryStatusContainer_story.graphql"; + +import StoryStatusText from "./StoryStatusText"; + +interface Props { + story: StoryStatusContainer_story; +} + +const StoryStatusContainer: FunctionComponent = (props) => { + return {props.story.status}; +}; + +const enhanced = withFragmentContainer({ + story: graphql` + fragment StoryStatusContainer_story on Story { + id + status + } + `, +})(StoryStatusContainer); + +export default enhanced; diff --git a/src/core/client/admin/routes/Stories/StoryStatus/index.ts b/src/core/client/admin/routes/Stories/StoryStatus/index.ts index b87c4cbc0..77c072b8a 100644 --- a/src/core/client/admin/routes/Stories/StoryStatus/index.ts +++ b/src/core/client/admin/routes/Stories/StoryStatus/index.ts @@ -1,4 +1,4 @@ export { default, - default as StoryStatusChangeContainer, -} from "./StoryStatusChangeContainer"; + default as StoryStatusContainer, +} from "./StoryStatusContainer"; diff --git a/src/core/client/admin/routes/Stories/StoryTable.css b/src/core/client/admin/routes/Stories/StoryTable.css index 0a1c26196..01d1012c0 100644 --- a/src/core/client/admin/routes/Stories/StoryTable.css +++ b/src/core/client/admin/routes/Stories/StoryTable.css @@ -10,14 +10,19 @@ $tableHeaderAltTextColor: var(--v2-colors-mono-100); width: 14%; } .reportedCountColumn { - width: 9%; + width: 8%; } .pendingCountColumn { - width: 9%; + width: 8%; } .totalCountColumn { - width: 9%; + width: 8%; } + +.actionsColumn { + width: 8%; +} + .clickToModerate { font-size: var(--v2-font-size-2); font-weight: var(--v2-font-weight-primary-semi-bold); diff --git a/src/core/client/admin/routes/Stories/StoryTable.tsx b/src/core/client/admin/routes/Stories/StoryTable.tsx index 08a5909c6..572c36b83 100644 --- a/src/core/client/admin/routes/Stories/StoryTable.tsx +++ b/src/core/client/admin/routes/Stories/StoryTable.tsx @@ -68,6 +68,9 @@ const StoryTable: FunctionComponent = (props) => ( Status + + Actions + diff --git a/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap b/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap index 21316410a..90364cbf7 100644 --- a/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap +++ b/src/core/client/admin/test/stories/__snapshots__/stories.spec.tsx.snap @@ -174,6 +174,11 @@ exports[`renders empty stories 1`] = ` > Status + + Actions + + + Open + + +
@@ -320,13 +329,22 @@ exports[`renders empty stories 1`] = ` + + Open + + +
@@ -546,6 +559,11 @@ exports[`renders stories 1`] = ` > Status + + Actions + + + Open + + +
@@ -692,13 +714,22 @@ exports[`renders stories 1`] = ` + + Open + + +
diff --git a/src/core/client/admin/test/stories/stories.spec.tsx b/src/core/client/admin/test/stories/stories.spec.tsx index 7af158dd0..b17548a12 100644 --- a/src/core/client/admin/test/stories/stories.spec.tsx +++ b/src/core/client/admin/test/stories/stories.spec.tsx @@ -201,9 +201,9 @@ it("change story status", async () => { selector: "tr", }); - const changeStatusButton = within(storyRow).getByLabelText("Change status"); + const changeStatusButton = within(storyRow).getByLabelText("Select action"); const popup = within(storyRow).getByLabelText( - "A dropdown to change the story status" + "A dropdown to select story actions" ); /** CLOSE STORY */ @@ -211,7 +211,9 @@ it("change story status", async () => { changeStatusButton.props.onClick(); }); act(() => { - within(popup).getByText("Closed", { selector: "button" }).props.onClick(); + within(popup) + .getByText("Close story", { selector: "button" }) + .props.onClick(); }); within(storyRow).getByText("Closed"); @@ -223,7 +225,9 @@ it("change story status", async () => { }); act(() => { - within(popup).getByText("Open", { selector: "button" }).props.onClick(); + within(popup) + .getByText("Open story", { selector: "button" }) + .props.onClick(); }); within(storyRow).getByText("Open"); diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl index 3f280e381..325bcc81a 100644 --- a/src/locales/en-US/admin.ftl +++ b/src/locales/en-US/admin.ftl @@ -475,6 +475,17 @@ stories-column-site = Site site-table-siteName = Site name stories-filter-sites = Site +stories-column-actions = Actions +stories-column-rescrape = Re-scrape + +stories-actionsButton = + .aria-label = Select action +stories-actions-popover = + .description = A dropdown to select story actions +stories-actions-rescrape = Re-scrape +stories-actions-close = Close story +stories-actions-open = Open story + ### Sections moderate-section-selector-allSections = All Sections