From 51190a90411215929818452aea497dff6d457899 Mon Sep 17 00:00:00 2001 From: aaron-collier Date: Mon, 22 Jul 2019 12:13:48 -0700 Subject: [PATCH 1/7] Add an action create to clear the resource URI message --- package-lock.json | 175 +++++++++------------ src/actionCreators/messages.js | 13 ++ src/actionCreators/resources.js | 2 + src/actions/index.js | 4 + src/components/editor/ResourceTemplate.jsx | 5 +- src/reducers/index.js | 5 +- src/reducers/inputs.js | 13 ++ 7 files changed, 117 insertions(+), 100 deletions(-) create mode 100644 src/actionCreators/messages.js diff --git a/package-lock.json b/package-lock.json index 2aa3acbda..b7f4ec237 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6560,28 +6560,27 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": false, + "resolved": "", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", - "resolved": false, + "resolved": "", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": false, + "resolved": "", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, @@ -6592,17 +6591,15 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": false, + "resolved": "", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", - "resolved": false, + "resolved": "", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6610,42 +6607,39 @@ }, "chownr": { "version": "1.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": false, + "resolved": "", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", - "resolved": false, + "resolved": "", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", - "resolved": false, + "resolved": "", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", - "resolved": false, + "resolved": "", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, @@ -6655,28 +6649,28 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": false, + "resolved": "", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": false, + "resolved": "", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": false, + "resolved": "", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": false, + "resolved": "", "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, @@ -6686,14 +6680,14 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": false, + "resolved": "", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": false, + "resolved": "", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, @@ -6710,7 +6704,7 @@ }, "glob": { "version": "7.1.3", - "resolved": false, + "resolved": "", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, @@ -6725,14 +6719,14 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": false, + "resolved": "", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": false, + "resolved": "", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, @@ -6742,7 +6736,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": false, + "resolved": "", "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, @@ -6752,7 +6746,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": false, + "resolved": "", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, @@ -6763,58 +6757,53 @@ }, "inherits": { "version": "2.0.3", - "resolved": false, + "resolved": "", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", - "resolved": false, + "resolved": "", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": false, + "resolved": "", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } }, "isarray": { "version": "1.0.0", - "resolved": false, + "resolved": "", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": false, + "resolved": "", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "resolved": false, + "resolved": "", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", - "resolved": false, + "resolved": "", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6822,7 +6811,7 @@ }, "minizlib": { "version": "1.2.1", - "resolved": false, + "resolved": "", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, @@ -6832,24 +6821,23 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": false, + "resolved": "", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } }, "ms": { "version": "2.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true }, "needle": { "version": "2.3.0", - "resolved": false, + "resolved": "", "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, @@ -6861,7 +6849,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": false, + "resolved": "", "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, @@ -6880,7 +6868,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": false, + "resolved": "", "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, @@ -6891,14 +6879,14 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": false, + "resolved": "", "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": false, + "resolved": "", "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, @@ -6909,7 +6897,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": false, + "resolved": "", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, @@ -6922,45 +6910,43 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": false, + "resolved": "", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", - "resolved": false, + "resolved": "", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": false, + "resolved": "", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } }, "os-homedir": { "version": "1.0.2", - "resolved": false, + "resolved": "", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": false, + "resolved": "", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": false, + "resolved": "", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, @@ -6971,21 +6957,21 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": false, + "resolved": "", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "resolved": false, + "resolved": "", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, @@ -6998,7 +6984,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": false, + "resolved": "", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true @@ -7007,7 +6993,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": false, + "resolved": "", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, @@ -7023,7 +7009,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, @@ -7033,52 +7019,50 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": false, + "resolved": "", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", - "resolved": false, + "resolved": "", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": false, + "resolved": "", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "resolved": false, + "resolved": "", "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": false, + "resolved": "", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": false, + "resolved": "", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": false, + "resolved": "", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7087,7 +7071,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, @@ -7097,24 +7081,23 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": false, + "resolved": "", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } }, "strip-json-comments": { "version": "2.0.1", - "resolved": false, + "resolved": "", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "resolved": false, + "resolved": "", "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, @@ -7130,14 +7113,14 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": false, + "resolved": "", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": false, + "resolved": "", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, @@ -7147,17 +7130,15 @@ }, "wrappy": { "version": "1.0.2", - "resolved": false, + "resolved": "", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", - "resolved": false, + "resolved": "", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true, - "optional": true + "dev": true } } }, @@ -11385,7 +11366,7 @@ "dependencies": { "minimist": { "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true }, diff --git a/src/actionCreators/messages.js b/src/actionCreators/messages.js new file mode 100644 index 000000000..d82f6b525 --- /dev/null +++ b/src/actionCreators/messages.js @@ -0,0 +1,13 @@ +// Copyright 2019 Stanford University see LICENSE for license + +import { clearingResourceURIMessage } from 'actions/index' + +const clearResourceURIMessage = () => (dispatch, getState) => { + if (getState().selectorReducer.editor.resourceURIMessage.show === false) { + return // The resource URI message is already clear + } + + dispatch(clearingResourceURIMessage()) +} + +export default clearResourceURIMessage diff --git a/src/actionCreators/resources.js b/src/actionCreators/resources.js index d31e110e3..2757bca6f 100644 --- a/src/actionCreators/resources.js +++ b/src/actionCreators/resources.js @@ -34,6 +34,7 @@ export const retrieveResource = (currentUser, uri) => (dispatch) => { return loadRDFResource(currentUser, uri) .then((response) => { dispatch(clearResourceTemplates()) + // dispatch(clearResourceURIMessage()) const data = response.response.text return rdfDatasetFromN3(data).then((dataset) => { const builder = new ResourceStateBuilder(dataset, null) @@ -47,6 +48,7 @@ export const newResource = resourceTemplateId => (dispatch) => { const resource = {} resource[resourceTemplateId] = {} dispatch(clearResourceTemplates()) + // dispatch(clearResourceURIMessage()) dispatch(setResource(resource)) dispatch(stubResource(true)) } diff --git a/src/actions/index.js b/src/actions/index.js index 4c0196de6..ed2b49437 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -72,6 +72,10 @@ export const showResourceURIMessage = resourceUri => ({ payload: resourceUri, }) +export const clearingResourceURIMessage = () => ({ + type: 'CLEARING_RESOURCE_URI_MESSAGE', +}) + export const updateStarted = () => ({ type: 'UPDATE_STARTED', }) diff --git a/src/components/editor/ResourceTemplate.jsx b/src/components/editor/ResourceTemplate.jsx index d4dcff9d4..352a44d77 100644 --- a/src/components/editor/ResourceTemplate.jsx +++ b/src/components/editor/ResourceTemplate.jsx @@ -10,6 +10,7 @@ import { bindActionCreators } from 'redux' import loadLanguages from 'actionCreators/languages' import ResourceURIMessage from './ResourceURIMessage' import _ from 'lodash' +import clearResourceURIMessage from 'actionCreators/messages' /** * This is the root component of the editor on the resource edit page @@ -18,6 +19,7 @@ class ResourceTemplate extends Component { componentDidMount() { // We load the languages once here so that each literal doesn't try to hit the LOC endpoint this.props.loadLanguages() + this.props.clearResourceURIMessage() } render() { @@ -47,6 +49,7 @@ ResourceTemplate.propTypes = { error: PropTypes.string, newResource: PropTypes.func, loadLanguages: PropTypes.func, + clearResourceURIMessage: PropTypes.func, } const mapStateToProps = (state) => { @@ -60,6 +63,6 @@ const mapStateToProps = (state) => { } } -const mapDispatchToProps = dispatch => bindActionCreators({ loadLanguages, newResource }, dispatch) +const mapDispatchToProps = dispatch => bindActionCreators({ loadLanguages, newResource, clearResourceURIMessage }, dispatch) export default connect(mapStateToProps, mapDispatchToProps)(ResourceTemplate) diff --git a/src/reducers/index.js b/src/reducers/index.js index 1be63af22..188900e40 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -3,8 +3,8 @@ import { combineReducers } from 'redux' import authenticate from './authenticate' import { - removeMyItem, setItemsOrSelections, setBaseURL, showResourceURIMessage, setMyItemsLang, - showGroupChooser, closeGroupChooser, showRdfPreview, + removeMyItem, setItemsOrSelections, setBaseURL, showResourceURIMessage, clearingResourceURIMessage, + setMyItemsLang, showGroupChooser, closeGroupChooser, showRdfPreview, } from './inputs' import { setResourceTemplate, clearResourceTemplates, setResourceTemplateSummary, @@ -111,6 +111,7 @@ const handlers = { RETRIEVE_RESOURCE_TEMPLATE_STARTED: clearRetrieveError, SET_BASE_URL: setBaseURL, SHOW_RESOURCE_URI_MESSAGE: showResourceURIMessage, + CLEARING_RESOURCE_URI_MESSAGE: clearingResourceURIMessage, SHOW_SEARCH_RESULTS: showSearchResults, SHOW_GROUP_CHOOSER: showGroupChooser, CLOSE_GROUP_CHOOSER: closeGroupChooser, diff --git a/src/reducers/inputs.js b/src/reducers/inputs.js index 9e7bb6ba2..48003574c 100644 --- a/src/reducers/inputs.js +++ b/src/reducers/inputs.js @@ -148,6 +148,19 @@ export const showResourceURIMessage = (state, action) => { return newState } +/** + * @param {Object} state the previous redux state + * @param {Object} action the payload of the action is the URI returned from saving the resource + * @return {Object} the next redux state + */ +export const clearingResourceURIMessage = (state) => { + const newState = { ...state } + + newState.editor.resourceURIMessage.show = false + newState.editor.resourceURIMessage.uri = '' + return newState +} + export const removeMyItem = (state, action) => { const newState = { ...state } const reduxPath = action.payload.reduxPath From 386bdd8a8abf2b5242ff7ee76cb73dd78cd7b05e Mon Sep 17 00:00:00 2001 From: aaron-collier Date: Mon, 22 Jul 2019 12:23:12 -0700 Subject: [PATCH 2/7] Remove comment cruft --- src/actionCreators/resources.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/actionCreators/resources.js b/src/actionCreators/resources.js index 2757bca6f..d31e110e3 100644 --- a/src/actionCreators/resources.js +++ b/src/actionCreators/resources.js @@ -34,7 +34,6 @@ export const retrieveResource = (currentUser, uri) => (dispatch) => { return loadRDFResource(currentUser, uri) .then((response) => { dispatch(clearResourceTemplates()) - // dispatch(clearResourceURIMessage()) const data = response.response.text return rdfDatasetFromN3(data).then((dataset) => { const builder = new ResourceStateBuilder(dataset, null) @@ -48,7 +47,6 @@ export const newResource = resourceTemplateId => (dispatch) => { const resource = {} resource[resourceTemplateId] = {} dispatch(clearResourceTemplates()) - // dispatch(clearResourceURIMessage()) dispatch(setResource(resource)) dispatch(stubResource(true)) } From 704dffb58dc939eaddaf606101f7c6c77507a9bd Mon Sep 17 00:00:00 2001 From: aaron-collier Date: Mon, 22 Jul 2019 12:57:20 -0700 Subject: [PATCH 3/7] Mock function in test --- __tests__/components/editor/ResourceTemplate.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/__tests__/components/editor/ResourceTemplate.test.js b/__tests__/components/editor/ResourceTemplate.test.js index 7c25d6f3f..44ff07d55 100644 --- a/__tests__/components/editor/ResourceTemplate.test.js +++ b/__tests__/components/editor/ResourceTemplate.test.js @@ -10,11 +10,13 @@ describe('', () => { resourceLabel: 'BF2 Work', } const loadLanguages = jest.fn() + const clearResourceURIMessage = jest.fn() const wrapper = shallow() + retrieveResourceTemplate={jest.fn()} + clearResourceURIMessage={clearResourceURIMessage} />) it('loads the languages', () => { expect(loadLanguages).toHaveBeenCalled() }) From c36f8423a00d9163c1755d20c3303a61304e5a37 Mon Sep 17 00:00:00 2001 From: aaron-collier Date: Mon, 22 Jul 2019 13:20:41 -0700 Subject: [PATCH 4/7] Add test for clearing resource URI message --- .../components/editor/ResourceTemplate.test.js | 2 +- __tests__/reducers/inputs.test.js | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/__tests__/components/editor/ResourceTemplate.test.js b/__tests__/components/editor/ResourceTemplate.test.js index 44ff07d55..8c17b7b1a 100644 --- a/__tests__/components/editor/ResourceTemplate.test.js +++ b/__tests__/components/editor/ResourceTemplate.test.js @@ -15,7 +15,7 @@ describe('', () => { const wrapper = shallow() it('loads the languages', () => { expect(loadLanguages).toHaveBeenCalled() diff --git a/__tests__/reducers/inputs.test.js b/__tests__/reducers/inputs.test.js index 60baba46b..15c99dc21 100644 --- a/__tests__/reducers/inputs.test.js +++ b/__tests__/reducers/inputs.test.js @@ -3,7 +3,7 @@ import { removeMyItem, setItemsOrSelections, setBaseURL, validate, showGroupChooser, closeGroupChooser, showRdfPreview, - showResourceURIMessage, + showResourceURIMessage, clearingResourceURIMessage, } from 'reducers/inputs' import { @@ -365,6 +365,22 @@ describe('showResourceURIMessage', () => { }) }) +describe('clearingResourceURIMessage', () => { + it('turns off the Resource URI message display', () => { + initialState.editor.resourceURIMessage = { + show: true, + uri: 'this message will disapear', + } + + const result = clearingResourceURIMessage(initialState, { + type: 'CLEARING_RESOURCE_URI_MESSAGE', + }) + + expect(result.editor.resourceURIMessage.show).toBe(false) + expect(result.editor.resourceURIMessage.uri).toEqual('') + }) +}) + describe('removeMyItem', () => { it('removes an item from state', () => { initialState.resource = { From 006f2f5e7a6fe11063871126e6d4ccc6fff05c56 Mon Sep 17 00:00:00 2001 From: aaron-collier Date: Tue, 23 Jul 2019 08:30:05 -0700 Subject: [PATCH 5/7] Undo changes to package-lock.json --- package-lock.json | 175 +++++++++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index b7f4ec237..2aa3acbda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6560,27 +6560,28 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "", + "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", - "resolved": "", + "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": "", + "resolved": false, "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, @@ -6591,15 +6592,17 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "", + "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6607,39 +6610,42 @@ }, "chownr": { "version": "1.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": "", + "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "", + "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, @@ -6649,28 +6655,28 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": "", + "resolved": false, "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": "", + "resolved": false, "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": "", + "resolved": false, "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, @@ -6680,14 +6686,14 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "resolved": "", + "resolved": false, "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, @@ -6704,7 +6710,7 @@ }, "glob": { "version": "7.1.3", - "resolved": "", + "resolved": false, "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, @@ -6719,14 +6725,14 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": "", + "resolved": false, "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, @@ -6736,7 +6742,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": "", + "resolved": false, "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, @@ -6746,7 +6752,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": "", + "resolved": false, "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, @@ -6757,53 +6763,58 @@ }, "inherits": { "version": "2.0.3", - "resolved": "", + "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", - "resolved": "", + "resolved": false, "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } }, "isarray": { "version": "1.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": "", + "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "resolved": "", + "resolved": false, "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", - "resolved": "", + "resolved": false, "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6811,7 +6822,7 @@ }, "minizlib": { "version": "1.2.1", - "resolved": "", + "resolved": false, "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, @@ -6821,23 +6832,24 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": "", + "resolved": false, "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } }, "ms": { "version": "2.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true }, "needle": { "version": "2.3.0", - "resolved": "", + "resolved": false, "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, @@ -6849,7 +6861,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": "", + "resolved": false, "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, @@ -6868,7 +6880,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, @@ -6879,14 +6891,14 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": "", + "resolved": false, "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": "", + "resolved": false, "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, @@ -6897,7 +6909,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "", + "resolved": false, "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, @@ -6910,43 +6922,45 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": "", + "resolved": false, "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "resolved": "", + "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } }, "os-homedir": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "resolved": "", + "resolved": false, "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, @@ -6957,21 +6971,21 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": "", + "resolved": false, "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "resolved": "", + "resolved": false, "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, @@ -6984,7 +6998,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": false, "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true @@ -6993,7 +7007,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": "", + "resolved": false, "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, @@ -7009,7 +7023,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": "", + "resolved": false, "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, @@ -7019,50 +7033,52 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "", + "resolved": false, "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "", + "resolved": false, "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "resolved": "", + "resolved": false, "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "resolved": "", + "resolved": false, "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": "", + "resolved": false, "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7071,7 +7087,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "", + "resolved": false, "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, @@ -7081,23 +7097,24 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } }, "strip-json-comments": { "version": "2.0.1", - "resolved": "", + "resolved": false, "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "resolved": "", + "resolved": false, "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, @@ -7113,14 +7130,14 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": "", + "resolved": false, "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, @@ -7130,15 +7147,17 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "", + "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", - "resolved": "", + "resolved": false, "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -11366,7 +11385,7 @@ "dependencies": { "minimist": { "version": "0.0.10", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true }, From 39f0cbc7c369d1ae45e8e28ed843f56c5c07541d Mon Sep 17 00:00:00 2001 From: aaron-collier Date: Tue, 23 Jul 2019 09:53:50 -0700 Subject: [PATCH 6/7] Remove unnecessary action creator --- .../components/editor/ResourceTemplate.test.js | 4 +--- src/actionCreators/messages.js | 13 ------------- src/actionCreators/resources.js | 3 +++ src/actions/index.js | 4 ++-- src/components/editor/ResourceTemplate.jsx | 5 +---- src/reducers/index.js | 4 ++-- src/reducers/inputs.js | 2 +- 7 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 src/actionCreators/messages.js diff --git a/__tests__/components/editor/ResourceTemplate.test.js b/__tests__/components/editor/ResourceTemplate.test.js index 8c17b7b1a..7c25d6f3f 100644 --- a/__tests__/components/editor/ResourceTemplate.test.js +++ b/__tests__/components/editor/ResourceTemplate.test.js @@ -10,13 +10,11 @@ describe('', () => { resourceLabel: 'BF2 Work', } const loadLanguages = jest.fn() - const clearResourceURIMessage = jest.fn() const wrapper = shallow() + retrieveResourceTemplate={jest.fn()} />) it('loads the languages', () => { expect(loadLanguages).toHaveBeenCalled() }) diff --git a/src/actionCreators/messages.js b/src/actionCreators/messages.js deleted file mode 100644 index d82f6b525..000000000 --- a/src/actionCreators/messages.js +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2019 Stanford University see LICENSE for license - -import { clearingResourceURIMessage } from 'actions/index' - -const clearResourceURIMessage = () => (dispatch, getState) => { - if (getState().selectorReducer.editor.resourceURIMessage.show === false) { - return // The resource URI message is already clear - } - - dispatch(clearingResourceURIMessage()) -} - -export default clearResourceURIMessage diff --git a/src/actionCreators/resources.js b/src/actionCreators/resources.js index d31e110e3..e2f0de0a2 100644 --- a/src/actionCreators/resources.js +++ b/src/actionCreators/resources.js @@ -5,6 +5,7 @@ import { assignBaseURL, updateStarted, updateFinished, retrieveResourceStarted, setResource, updateProperty, toggleCollapse, appendResource, clearResourceTemplates, + clearResourceURIMessage, } from 'actions/index' import { fetchResourceTemplate } from 'actionCreators/resourceTemplates' import { updateRDFResource, loadRDFResource } from 'sinopiaServer' @@ -47,12 +48,14 @@ export const newResource = resourceTemplateId => (dispatch) => { const resource = {} resource[resourceTemplateId] = {} dispatch(clearResourceTemplates()) + dispatch(clearResourceURIMessage()) dispatch(setResource(resource)) dispatch(stubResource(true)) } // A thunk that stubs out an existing new resource export const existingResource = (resource, uri) => (dispatch) => { + dispatch(clearResourceURIMessage()) dispatch(setResource(resource)) dispatch(assignBaseURL(uri)) dispatch(stubResource(false)) diff --git a/src/actions/index.js b/src/actions/index.js index ed2b49437..6f24887ea 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -72,8 +72,8 @@ export const showResourceURIMessage = resourceUri => ({ payload: resourceUri, }) -export const clearingResourceURIMessage = () => ({ - type: 'CLEARING_RESOURCE_URI_MESSAGE', +export const clearResourceURIMessage = () => ({ + type: 'CLEAR_RESOURCE_URI_MESSAGE', }) export const updateStarted = () => ({ diff --git a/src/components/editor/ResourceTemplate.jsx b/src/components/editor/ResourceTemplate.jsx index 352a44d77..d4dcff9d4 100644 --- a/src/components/editor/ResourceTemplate.jsx +++ b/src/components/editor/ResourceTemplate.jsx @@ -10,7 +10,6 @@ import { bindActionCreators } from 'redux' import loadLanguages from 'actionCreators/languages' import ResourceURIMessage from './ResourceURIMessage' import _ from 'lodash' -import clearResourceURIMessage from 'actionCreators/messages' /** * This is the root component of the editor on the resource edit page @@ -19,7 +18,6 @@ class ResourceTemplate extends Component { componentDidMount() { // We load the languages once here so that each literal doesn't try to hit the LOC endpoint this.props.loadLanguages() - this.props.clearResourceURIMessage() } render() { @@ -49,7 +47,6 @@ ResourceTemplate.propTypes = { error: PropTypes.string, newResource: PropTypes.func, loadLanguages: PropTypes.func, - clearResourceURIMessage: PropTypes.func, } const mapStateToProps = (state) => { @@ -63,6 +60,6 @@ const mapStateToProps = (state) => { } } -const mapDispatchToProps = dispatch => bindActionCreators({ loadLanguages, newResource, clearResourceURIMessage }, dispatch) +const mapDispatchToProps = dispatch => bindActionCreators({ loadLanguages, newResource }, dispatch) export default connect(mapStateToProps, mapDispatchToProps)(ResourceTemplate) diff --git a/src/reducers/index.js b/src/reducers/index.js index 188900e40..077a9e4fe 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -3,7 +3,7 @@ import { combineReducers } from 'redux' import authenticate from './authenticate' import { - removeMyItem, setItemsOrSelections, setBaseURL, showResourceURIMessage, clearingResourceURIMessage, + removeMyItem, setItemsOrSelections, setBaseURL, showResourceURIMessage, clearResourceURIMessage, setMyItemsLang, showGroupChooser, closeGroupChooser, showRdfPreview, } from './inputs' import { @@ -111,7 +111,7 @@ const handlers = { RETRIEVE_RESOURCE_TEMPLATE_STARTED: clearRetrieveError, SET_BASE_URL: setBaseURL, SHOW_RESOURCE_URI_MESSAGE: showResourceURIMessage, - CLEARING_RESOURCE_URI_MESSAGE: clearingResourceURIMessage, + CLEAR_RESOURCE_URI_MESSAGE: clearResourceURIMessage, SHOW_SEARCH_RESULTS: showSearchResults, SHOW_GROUP_CHOOSER: showGroupChooser, CLOSE_GROUP_CHOOSER: closeGroupChooser, diff --git a/src/reducers/inputs.js b/src/reducers/inputs.js index 48003574c..82443e96f 100644 --- a/src/reducers/inputs.js +++ b/src/reducers/inputs.js @@ -153,7 +153,7 @@ export const showResourceURIMessage = (state, action) => { * @param {Object} action the payload of the action is the URI returned from saving the resource * @return {Object} the next redux state */ -export const clearingResourceURIMessage = (state) => { +export const clearResourceURIMessage = (state) => { const newState = { ...state } newState.editor.resourceURIMessage.show = false From a568e2d78c46ca5e1aa051a2f31b061fec569341 Mon Sep 17 00:00:00 2001 From: aaron-collier Date: Tue, 23 Jul 2019 10:01:25 -0700 Subject: [PATCH 7/7] Rewrite testing --- __tests__/actionCreators/resources.test.js | 16 +++++++++------- __tests__/reducers/inputs.test.js | 8 ++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/__tests__/actionCreators/resources.test.js b/__tests__/actionCreators/resources.test.js index ebb9c7853..cc3f82351 100644 --- a/__tests__/actionCreators/resources.test.js +++ b/__tests__/actionCreators/resources.test.js @@ -85,9 +85,10 @@ describe('newResource', () => { await store.dispatch(newResource(resourceTemplateId)) const actions = store.getActions() expect(actions[0]).toEqual({ type: 'CLEAR_RESOURCE_TEMPLATES' }) - expect(actions[1]).toEqual({ type: 'SET_RESOURCE', payload: { [resourceTemplateId]: {} } }) - expect(actions[2]).toEqual({ type: 'RETRIEVE_RESOURCE_TEMPLATE_STARTED', payload: resourceTemplateId }) - expect(actions[3]).toEqual({ type: 'SET_RESOURCE_TEMPLATE', payload: resourceTemplateResponse.response.body }) + expect(actions[1]).toEqual({ type: 'CLEAR_RESOURCE_URI_MESSAGE' }) + expect(actions[2]).toEqual({ type: 'SET_RESOURCE', payload: { [resourceTemplateId]: {} } }) + expect(actions[3]).toEqual({ type: 'RETRIEVE_RESOURCE_TEMPLATE_STARTED', payload: resourceTemplateId }) + expect(actions[4]).toEqual({ type: 'SET_RESOURCE_TEMPLATE', payload: resourceTemplateResponse.response.body }) }) }) @@ -114,10 +115,11 @@ describe('existingResource', () => { await store.dispatch(existingResource(resource, 'http://localhost:8080/repository/stanford/888ea64d-f471-41bf-9d33-c9426ab83b5c')) const actions = store.getActions() - expect(actions[0]).toEqual({ type: 'SET_RESOURCE', payload: { [resourceTemplateId]: {} } }) - expect(actions[1]).toEqual({ type: 'SET_BASE_URL', payload: 'http://localhost:8080/repository/stanford/888ea64d-f471-41bf-9d33-c9426ab83b5c' }) - expect(actions[2]).toEqual({ type: 'RETRIEVE_RESOURCE_TEMPLATE_STARTED', payload: undefined }) - expect(actions[3]).toEqual({ type: 'SET_RESOURCE_TEMPLATE', payload: resourceTemplateResponse.response.body }) + expect(actions[0]).toEqual({ type: 'CLEAR_RESOURCE_URI_MESSAGE' }) + expect(actions[1]).toEqual({ type: 'SET_RESOURCE', payload: { [resourceTemplateId]: {} } }) + expect(actions[2]).toEqual({ type: 'SET_BASE_URL', payload: 'http://localhost:8080/repository/stanford/888ea64d-f471-41bf-9d33-c9426ab83b5c' }) + expect(actions[3]).toEqual({ type: 'RETRIEVE_RESOURCE_TEMPLATE_STARTED', payload: undefined }) + expect(actions[4]).toEqual({ type: 'SET_RESOURCE_TEMPLATE', payload: resourceTemplateResponse.response.body }) }) }) diff --git a/__tests__/reducers/inputs.test.js b/__tests__/reducers/inputs.test.js index 15c99dc21..994309cf4 100644 --- a/__tests__/reducers/inputs.test.js +++ b/__tests__/reducers/inputs.test.js @@ -3,7 +3,7 @@ import { removeMyItem, setItemsOrSelections, setBaseURL, validate, showGroupChooser, closeGroupChooser, showRdfPreview, - showResourceURIMessage, clearingResourceURIMessage, + showResourceURIMessage, clearResourceURIMessage, } from 'reducers/inputs' import { @@ -365,15 +365,15 @@ describe('showResourceURIMessage', () => { }) }) -describe('clearingResourceURIMessage', () => { +describe('clearResourceURIMessage', () => { it('turns off the Resource URI message display', () => { initialState.editor.resourceURIMessage = { show: true, uri: 'this message will disapear', } - const result = clearingResourceURIMessage(initialState, { - type: 'CLEARING_RESOURCE_URI_MESSAGE', + const result = clearResourceURIMessage(initialState, { + type: 'CLEAR_RESOURCE_URI_MESSAGE', }) expect(result.editor.resourceURIMessage.show).toBe(false)