TagSpaces is an offline, open source, document manager with tagging support
Refactoring validation in create locations functionality
Ilian Sapundshievaf593e5e8af7
diff --git a/app/components/dialogs/CreateLocationDialog.tsx b/app/components/dialogs/CreateLocationDialog.tsxindex 37299209e..fccbd3403 100644--- a/app/components/dialogs/CreateLocationDialog.tsx+++ b/app/components/dialogs/CreateLocationDialog.tsx@@ -138,89 +138,26 @@ class CreateLocationDialog extends React.Component<Props, State> {{[name]: value},- () => {- this.handleValidation(name);- }+ this.handleValidation);};- handleValidation(field) {+ handleValidation() {// const pathRegex = this.state.path.match('^((\.\./|[a-zA-Z0-9_/\-\\])*\.[a-zA-Z0-9]+)$');// const nameRegex = this.state.name.match('^[A-Z][-a-zA-Z]+$');- if (this.state.type === locationType.TYPE_LOCAL) {- let errorTextName = false;- let errorTextPath = false;- let disableConfirmButton = false;- if (!this.state.name || this.state.name.length === 0) {- errorTextName = true;- disableConfirmButton = true;- } else if (- field === 'name' &&- !this.state.errorTextName &&- !this.state.errorTextPath &&- this.state.disableConfirmButton- ) {- // initial skip validation for other fields- return new Promise(resolve => {- resolve(true);- });- }- if (!this.state.path || this.state.path.length === 0) {- errorTextPath = true; // make it optinal in cloud mode- disableConfirmButton = true;- }- return new Promise(resolve =>- this.setState(- { errorTextName, errorTextPath, disableConfirmButton },- // @ts-ignore- resolve(!disableConfirmButton)- )- );- }if (this.state.type === locationType.TYPE_CLOUD) {let cloudErrorTextName = false;- // let cloudErrorTextPath = false;let cloudErrorAccessKey = false;let cloudErrorSecretAccessKey = false;- let cloudErrorBucketName = false;- let cloudErrorRegion = false;let disableConfirmButton = false;if (!this.state.storeName || this.state.storeName.length === 0) {cloudErrorTextName = true;disableConfirmButton = true;- } else if (- field === 'storeName' &&- !this.state.cloudErrorTextName &&- // && !this.state.cloudErrorTextPath- !this.state.cloudErrorAccessKey &&- !this.state.cloudErrorSecretAccessKey &&- !this.state.cloudErrorBucketName &&- !this.state.cloudErrorRegion &&- this.state.disableConfirmButton- ) {- // initial skip validation for other fields- return new Promise(resolve => {- resolve(true);- });}if (!this.state.accessKeyId || this.state.accessKeyId.length === 0) {cloudErrorAccessKey = true;disableConfirmButton = true;- } else if (- field === 'accessKeyId' &&- !this.state.cloudErrorTextName &&- // && !this.state.cloudErrorTextPath- !this.state.cloudErrorAccessKey &&- !this.state.cloudErrorSecretAccessKey &&- !this.state.cloudErrorBucketName &&- !this.state.cloudErrorRegion &&- this.state.disableConfirmButton- ) {- // initial skip validation for other fields- return new Promise(resolve => {- resolve(true);- });}if (@@ -229,113 +166,66 @@ class CreateLocationDialog extends React.Component<Props, State> {) {cloudErrorSecretAccessKey = true;disableConfirmButton = true;- } else if (- field === 'secretAccessKey' &&- !this.state.cloudErrorTextName &&- // && !this.state.cloudErrorTextPath- !this.state.cloudErrorAccessKey &&- !this.state.cloudErrorSecretAccessKey &&- !this.state.cloudErrorBucketName &&- !this.state.cloudErrorRegion &&- this.state.disableConfirmButton- ) {- // initial skip validation for other fields- return new Promise(resolve => {- resolve(true);- });}- if (!this.state.bucketName || this.state.bucketName.length === 0) {- cloudErrorBucketName = true;+ // @ts-ignore+ this.setState({+ cloudErrorTextName,+ cloudErrorAccessKey,+ cloudErrorSecretAccessKey,+ disableConfirmButton+ });+ } else {+ let errorTextName = false;+ let errorTextPath = false;+ let disableConfirmButton = false;+ if (!this.state.name || this.state.name.length === 0) {+ errorTextName = true;disableConfirmButton = true;- } else if (- field === 'bucketName' &&- !this.state.cloudErrorTextName &&- // && !this.state.cloudErrorTextPath- !this.state.cloudErrorAccessKey &&- !this.state.cloudErrorSecretAccessKey &&- !this.state.cloudErrorBucketName &&- !this.state.cloudErrorRegion &&- this.state.disableConfirmButton- ) {- // initial skip validation for other fields- return new Promise(resolve => {- resolve(true);- });}-- if (!this.state.region) {- cloudErrorRegion = true;+ if (!this.state.path || this.state.path.length === 0) {+ errorTextPath = true;disableConfirmButton = true;}-- return new Promise(resolve =>- this.setState(- // @ts-ignore- {- cloudErrorTextName,- cloudErrorAccessKey,- cloudErrorSecretAccessKey,- cloudErrorBucketName,- disableConfirmButton,- cloudErrorRegion- },- () => {- resolve(!disableConfirmButton);- }- )- );+ this.setState({ errorTextName, errorTextPath, disableConfirmButton });}- return new Promise(resolve => {- resolve(true);- });}onConfirm = () => {- // @ts-ignore- this.handleValidation()- .then(success => {- if (success) {- if (this.state.type === locationType.TYPE_LOCAL) {- this.props.addLocation({- uuid: uuidv1(),- type: locationType.TYPE_LOCAL,- name: this.state.name,- paths: [this.state.path],- perspective: this.state.perspective,- isDefault: this.state.isDefault,- isReadOnly: this.state.isReadOnly,- persistIndex: this.state.persistIndex,- fullTextIndex: this.state.fullTextIndex,- watchForChanges: this.state.watchForChanges- });- } else if (this.state.type === locationType.TYPE_CLOUD) {- this.props.addLocation({- uuid: uuidv1(),- type: locationType.TYPE_CLOUD,- name: this.state.storeName,- paths: [this.state.storePath],- endpointURL: this.state.endpointURL,- accessKeyId: this.state.accessKeyId,- secretAccessKey: this.state.secretAccessKey,- bucketName: this.state.bucketName,- region: this.state.region,- perspective: this.state.perspective,- isDefault: this.state.isDefault,- isReadOnly: this.state.isReadOnly,- persistIndex: this.state.persistIndex,- fullTextIndex: this.state.fullTextIndex,- watchForChanges: false- });- }- this.props.onClose();- this.props.resetState('createLocationDialogKey');- }- return true;- })- .catch(error => {- console.debug('Failed validation', error);- });+ if (!this.state.disableConfirmButton) {+ if (this.state.type === locationType.TYPE_LOCAL) {+ this.props.addLocation({+ uuid: uuidv1(),+ type: locationType.TYPE_LOCAL,+ name: this.state.name,+ paths: [this.state.path],+ isDefault: this.state.isDefault,+ isReadOnly: this.state.isReadOnly,+ persistIndex: this.state.persistIndex,+ fullTextIndex: this.state.fullTextIndex,+ watchForChanges: this.state.watchForChanges+ });+ } else if (this.state.type === locationType.TYPE_CLOUD) {+ this.props.addLocation({+ uuid: uuidv1(),+ type: locationType.TYPE_CLOUD,+ name: this.state.storeName,+ paths: [this.state.storePath],+ endpointURL: this.state.endpointURL,+ accessKeyId: this.state.accessKeyId,+ secretAccessKey: this.state.secretAccessKey,+ bucketName: this.state.bucketName,+ region: this.state.region,+ isDefault: this.state.isDefault,+ isReadOnly: this.state.isReadOnly,+ persistIndex: this.state.persistIndex,+ fullTextIndex: this.state.fullTextIndex,+ watchForChanges: false+ });+ }+ this.props.onClose();+ this.props.resetState('createLocationDialogKey');+ }};onCancel = () => {@@ -402,8 +292,8 @@ class CreateLocationDialog extends React.Component<Props, State> {<FormControlLabelvalue={locationType.TYPE_CLOUD}control={<Radio />}- title="AWS S3 compatible object storage"- label="AWS S3 Object Storage"+ title={i18n.t('core:objectStorageTitle')}+ label={i18n.t('core:objectStorage')}/></RadioGroup></FormControl>diff --git a/app/components/dialogs/EditLocationDialog.tsx b/app/components/dialogs/EditLocationDialog.tsxindex c215d304d..7ba5a561e 100644--- a/app/components/dialogs/EditLocationDialog.tsx+++ b/app/components/dialogs/EditLocationDialog.tsx@@ -171,19 +171,12 @@ class EditLocationDialog extends React.Component<Props, State> {let cloudErrorTextName = false;let cloudErrorAccessKey = false;let cloudErrorSecretAccessKey = false;- let cloudErrorBucketName = false;- const cloudErrorRegion = false;let disableConfirmButton = false;if (!this.state.storeName || this.state.storeName.length === 0) {cloudErrorTextName = true;disableConfirmButton = true;}- /* if (!this.state.storePath || this.state.storePath.length === 0) {- cloudErrorTextPath = true;- disableConfirmButton = true;- } */-if (!this.state.accessKeyId || this.state.accessKeyId.length === 0) {cloudErrorAccessKey = true;disableConfirmButton = true;@@ -197,24 +190,12 @@ class EditLocationDialog extends React.Component<Props, State> {disableConfirmButton = true;}- if (!this.state.bucketName || this.state.bucketName.length === 0) {- cloudErrorBucketName = true;- disableConfirmButton = true;- }-- // if (!this.state.region) {- // cloudErrorRegion = true;- // disableConfirmButton = true;- // }-// @ts-ignorethis.setState({cloudErrorTextName,- cloudErrorBucketName,cloudErrorAccessKey,cloudErrorSecretAccessKey,- disableConfirmButton,- cloudErrorRegion+ disableConfirmButton});} else {let errorTextName = false;@@ -345,8 +326,8 @@ class EditLocationDialog extends React.Component<Props, State> {<FormControlLabelvalue={locationType.TYPE_CLOUD}control={<Radio />}- title="AWS S3 compatible object storage"- label="AWS S3 Object Storage"+ title={i18n.t('core:objectStorageTitle')}+ label={i18n.t('core:objectStorage')}/></RadioGroup></FormControl>diff --git a/app/components/dialogs/ObjectStoreForm.tsx b/app/components/dialogs/ObjectStoreForm.tsxindex 6c5e764e7..1ab7dbef1 100644--- a/app/components/dialogs/ObjectStoreForm.tsx+++ b/app/components/dialogs/ObjectStoreForm.tsx@@ -121,6 +121,7 @@ class ObjectStoreForm extends React.Component<Props> {</InputLabel><Inputrequired+ autoFocusmargin="dense"name="storeName"fullWidth={true}@@ -196,7 +197,6 @@ class ObjectStoreForm extends React.Component<Props> {{i18n.t('core:bucketName')}</InputLabel><Input- requiredmargin="dense"name="bucketName"fullWidth={true}@@ -234,7 +234,7 @@ class ObjectStoreForm extends React.Component<Props> {</FormControl></Grid><Grid item xs={12}>- <FormControl fullWidth={true} error={state.cloudErrorSecretAccessKey}>+ <FormControl fullWidth={true}><InputLabel htmlFor="endpointURL">{i18n.t('core:endpointURL')}</InputLabel>@@ -247,11 +247,6 @@ class ObjectStoreForm extends React.Component<Props> {onChange={handleInputChange}value={state.endpointURL}/>- {state.cloudErrorSecretAccessKey && (- <FormHelperText>- {i18n.t('core:invalidEndpointUrl')}- </FormHelperText>- )}</FormControl></Grid></Grid>diff --git a/app/locales/en/core.json b/app/locales/en/core.jsonindex e292961f6..ffbbe1482 100644--- a/app/locales/en/core.json+++ b/app/locales/en/core.json@@ -365,8 +365,8 @@"errorLoadingFolder": "Error loading directory","fileCreateSuccessfully": "File create successfully","errorCreatingFile": "Error creating file",- "connectedtoObjectStore": "Connected to object store",- "connectedtoObjectStoreFailed": "Connection to object store failed!",+ "connectedtoObjectStore": "Connected to object storage",+ "connectedtoObjectStoreFailed": "Connection to object storage failed!","renamingSuccessfully": "Renaming successfully.","notImplementedYet": "Not implemented yet, please use the save button.","generatingThumbnailsFailed": "Generating thumbnails failed",@@ -453,5 +453,8 @@"location": "Location","folder": "Folder","globalSearch": "Global",+ "objectStorage": "Object Storage (Amazon S3, Minio)",+ "objectStorageTitle": "Amazon S3 complient object storage",+ "endpointURL": "Endpoint URL","-": "-"}diff --git a/app/third-party.txt b/app/third-party.txtindex 1d9a14758..71ee80ca7 100644--- a/app/third-party.txt+++ b/app/third-party.txt@@ -218,6 +218,32 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.-----+The following software may be included in this product: @emotion/hash. A copy of the source code may be downloaded from https://github.com/emotion-js/emotion/tree/master/packages/hash. This software contains the following license and notice below:++MIT License++Copyright (c) Emotion team and other contributors++Permission is hereby granted, free of charge, to any person obtaining a copy+of this software and associated documentation files (the "Software"), to deal+in the Software without restriction, including without limitation the rights+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the Software is+furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all+copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE+SOFTWARE.++-----+The following software may be included in this product: @evocateur/libnpmaccess, @evocateur/libnpmpublish. A copy of the source code may be downloaded from https://github.com/evocateur/libnpmaccess.git (@evocateur/libnpmaccess), https://github.com/evocateur/libnpmpublish.git (@evocateur/libnpmpublish). This software contains the following license and notice below:Copyright npm, Inc@@ -282,6 +308,25 @@ OR OTHER DEALINGS IN THE SOFTWARE.-----+The following software may be included in this product: @gorillastack/jmespath. A copy of the source code may be downloaded from git://github.com/GorillaStack/jmespath.js. This software contains the following license and notice below:++Copyright 2014 James Saryerwinnie+Copyright 2019 GorillaStack++Licensed under the Apache License, Version 2.0 (the "License");+you may not use this file except in compliance with the License.+You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++Unless required by applicable law or agreed to in writing, software+distributed under the License is distributed on an "AS IS" BASIS,+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+See the License for the specific language governing permissions and+limitations under the License.++-----+The following software may be included in this product: @jest/console, @jest/fake-timers, @jest/source-map, @jest/test-result, @jest/types, babel-plugin-jest-hoist, babel-preset-jest, diff-sequences, expect, jest-changed-files, jest-diff, jest-docblock, jest-each, jest-get-type, jest-haste-map, jest-leak-detector, jest-matcher-utils, jest-message-util, jest-mock, jest-regex-util, jest-resolve, jest-serializer, jest-snapshot, jest-util, jest-validate, jest-watcher, jest-worker, pretty-format, react, react-dom, react-is, react-test-renderer, scheduler. A copy of the source code may be downloaded from https://github.com/facebook/jest.git (@jest/console), https://github.com/facebook/jest.git (@jest/fake-timers), https://github.com/facebook/jest.git (@jest/source-map), https://github.com/facebook/jest.git (@jest/test-result), https://github.com/facebook/jest.git (@jest/types), https://github.com/facebook/jest.git (babel-plugin-jest-hoist), https://github.com/facebook/jest.git (babel-preset-jest), https://github.com/facebook/jest.git (diff-sequences), https://github.com/facebook/jest.git (expect), https://github.com/facebook/jest.git (jest-changed-files), https://github.com/facebook/jest.git (jest-diff), https://github.com/facebook/jest.git (jest-docblock), https://github.com/facebook/jest.git (jest-each), https://github.com/facebook/jest.git (jest-get-type), https://github.com/facebook/jest.git (jest-haste-map), https://github.com/facebook/jest.git (jest-leak-detector), https://github.com/facebook/jest.git (jest-matcher-utils), https://github.com/facebook/jest.git (jest-message-util), https://github.com/facebook/jest.git (jest-mock), https://github.com/facebook/jest.git (jest-regex-util), https://github.com/facebook/jest.git (jest-resolve), https://github.com/facebook/jest.git (jest-serializer), https://github.com/facebook/jest.git (jest-snapshot), https://github.com/facebook/jest.git (jest-util), https://github.com/facebook/jest.git (jest-validate), https://github.com/facebook/jest (jest-watcher), https://github.com/facebook/jest.git (jest-worker), https://github.com/facebook/jest.git (pretty-format), https://github.com/facebook/react.git (react), https://github.com/facebook/react.git (react-dom), https://github.com/facebook/react.git (react-is), https://github.com/facebook/react.git (react-test-renderer), https://github.com/facebook/react.git (scheduler). This software contains the following license and notice below:MIT License@@ -868,7 +913,7 @@ END OF TERMS AND CONDITIONS------The following software may be included in this product: @xtuc/ieee754, ieee754. A copy of the source code may be downloaded from git://github.com/feross/ieee754.git (@xtuc/ieee754), git://github.com/feross/ieee754.git (ieee754). This software contains the following license and notice below:+The following software may be included in this product: @xtuc/ieee754. A copy of the source code may be downloaded from git://github.com/feross/ieee754.git. This software contains the following license and notice below:Copyright (c) 2008, Fair Oaks Labs, Inc.All rights reserved.@@ -3450,31 +3495,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.------The following software may be included in this product: babel-plugin-macros, cross-env. A copy of the source code may be downloaded from https://github.com/kentcdodds/babel-plugin-macros.git (babel-plugin-macros), https://github.com/kentcdodds/cross-env.git (cross-env). This software contains the following license and notice below:--The MIT License (MIT)-Copyright (c) 2017 Kent C. Dodds--Permission is hereby granted, free of charge, to any person obtaining a copy-of this software and associated documentation files (the "Software"), to deal-in the Software without restriction, including without limitation the rights-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-copies of the Software, and to permit persons to whom the Software is-furnished to do so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in all-copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE-SOFTWARE.--------The following software may be included in this product: babel-plugin-module-resolver. A copy of the source code may be downloaded from https://github.com/tleunen/babel-plugin-module-resolver.git. This software contains the following license and notice below:The MIT License (MIT)@@ -6556,14 +6576,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.------The following software may be included in this product: concat-licenses. A copy of the source code may be downloaded from git+ssh://[email protected]/TheGuardianWolf/concat-licenses.git. This software contains the following license and notice below:--Package created by Jerry Fan. Some parts are adapted from-https://github.com/davglass/license-checker/.+The following software may be included in this product: concat-licenses. A copy of the source code may be downloaded from https://github.com/TheGuardianWolf/concat-licenses.git. This software contains the following license and notice below:MIT License-Copyright (c) 2017 Jerry Fan+Copyright (c) 2019 Jerry FanPermission is hereby granted, free of charge, to any person obtaining a copyof this software and associated documentation files (the "Software"), to deal@@ -6583,31 +6600,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THESOFTWARE.-Copyright 2012 Yahoo! Inc.-All rights reserved.--Redistribution and use in source and binary forms, with or without-modification, are permitted provided that the following conditions are met:- * Redistributions of source code must retain the above copyright- notice, this list of conditions and the following disclaimer.- * Redistributions in binary form must reproduce the above copyright- notice, this list of conditions and the following disclaimer in the- documentation and/or other materials provided with the distribution.- * Neither the name of the Yahoo! Inc. nor the- names of its contributors may be used to endorse or promote products- derived from this software without specific prior written permission.--THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE-DISCLAIMED. IN NO EVENT SHALL YAHOO! INC. BE LIABLE FOR ANY-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.------The following software may be included in this product: concat-stream. A copy of the source code may be downloaded from http://github.com/maxogden/concat-stream.git. This software contains the following license and notice below:@@ -6879,32 +6871,6 @@ THE SOFTWARE.------The following software may be included in this product: convert-css-length. A copy of the source code may be downloaded from https://github.com/KyleAMathews/convert-css-length.git. This software contains the following license and notice below:--The MIT License (MIT)--Copyright (c) 2015 Kyle Mathews--Permission is hereby granted, free of charge, to any person obtaining a copy-of this software and associated documentation files (the "Software"), to deal-in the Software without restriction, including without limitation the rights-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-copies of the Software, and to permit persons to whom the Software is-furnished to do so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in all-copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE-SOFTWARE.--------The following software may be included in this product: cookie. A copy of the source code may be downloaded from https://github.com/jshttp/cookie.git. This software contains the following license and notice below:(The MIT License)@@ -7152,6 +7118,31 @@ SOFTWARE.-----+The following software may be included in this product: cross-env. A copy of the source code may be downloaded from https://github.com/kentcdodds/cross-env.git. This software contains the following license and notice below:++The MIT License (MIT)+Copyright (c) 2017 Kent C. Dodds++Permission is hereby granted, free of charge, to any person obtaining a copy+of this software and associated documentation files (the "Software"), to deal+in the Software without restriction, including without limitation the rights+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the Software is+furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all+copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE+SOFTWARE.++-----+The following software may be included in this product: cross-spawn. A copy of the source code may be downloaded from [email protected]:moxystudio/node-cross-spawn.git. This software contains the following license and notice below:The MIT License (MIT)@@ -15410,8 +15401,7 @@ OTHER DEALINGS IN THE SOFTWARE.The following software may be included in this product: license-checker. A copy of the source code may be downloaded from http://github.com/davglass/license-checker.git. This software contains the following license and notice below:-Copyright 2012 Yahoo! Inc.-All rights reserved.+Copyright 2012 Yahoo Inc.Redistribution and use in source and binary forms, with or withoutmodification, are permitted provided that the following conditions are met:@@ -16741,7 +16731,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND------The following software may be included in this product: mkdirp, optimist. A copy of the source code may be downloaded from http://github.com/substack/node-mkdirp.git (mkdirp), http://github.com/substack/node-optimist.git (optimist). This software contains the following license and notice below:+The following software may be included in this product: mkdirp, optimist. A copy of the source code may be downloaded from https://github.com/substack/node-mkdirp.git (mkdirp), http://github.com/substack/node-optimist.git (optimist). This software contains the following license and notice below:Copyright 2010 James Halliday ([email protected])@@ -17778,34 +17768,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.------The following software may be included in this product: nopt. A copy of the source code may be downloaded from http://github.com/isaacs/nopt. This software contains the following license and notice below:--Copyright 2009, 2010, 2011 Isaac Z. Schlueter.-All rights reserved.--Permission is hereby granted, free of charge, to any person-obtaining a copy of this software and associated documentation-files (the "Software"), to deal in the Software without-restriction, including without limitation the rights to use,-copy, modify, merge, publish, distribute, sublicense, and/or sell-copies of the Software, and to permit persons to whom the-Software is furnished to do so, subject to the following-conditions:--The above copyright notice and this permission notice shall be-included in all copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR-OTHER DEALINGS IN THE SOFTWARE.--------The following software may be included in this product: normalize-package-data. A copy of the source code may be downloaded from git://github.com/npm/normalize-package-data.git. This software contains the following license and notice below:This package contains code originally written by Isaac Z. Schlueter.@@ -17841,32 +17803,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.------The following software may be included in this product: normalize-scroll-left. A copy of the source code may be downloaded from [email protected]:alitaheri/normalize-scroll-left.git. This software contains the following license and notice below:--The MIT License (MIT)--Copyright (c) 2017 Ali Taheri Moghaddar, [email protected]--Permission is hereby granted, free of charge, to any person obtaining a copy-of this software and associated documentation files (the "Software"), to deal-in the Software without restriction, including without limitation the rights-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-copies of the Software, and to permit persons to whom the Software is-furnished to do so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in all-copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE-SOFTWARE.--------The following software may be included in this product: npm, npm-lifecycle. A copy of the source code may be downloaded from https://github.com/npm/npm (npm), git://github.com/npm/lifecycle.git (npm-lifecycle). This software contains the following license and notice below:The npm application@@ -20236,58 +20172,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.------The following software may be included in this product: react-autosuggest. A copy of the source code may be downloaded from https://github.com/moroshko/react-autosuggest.git. This software contains the following license and notice below:--The MIT License (MIT)--Copyright © 2017 Misha Moroshko--Permission is hereby granted, free of charge, to any person obtaining a copy of-this software and associated documentation files (the “Software”), to deal in-the Software without restriction, including without limitation the rights to-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies-of the Software, and to permit persons to whom the Software is furnished to do-so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in all-copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE-SOFTWARE.---------The following software may be included in this product: react-autowhatever, section-iterator, shallow-equal. A copy of the source code may be downloaded from https://github.com/moroshko/react-autowhatever.git (react-autowhatever), https://github.com/moroshko/section-iterator.git (section-iterator), https://github.com/moroshko/shallow-equal.git (shallow-equal). This software contains the following license and notice below:--The MIT License (MIT)--Copyright © 2016 Misha Moroshko--Permission is hereby granted, free of charge, to any person obtaining a copy of-this software and associated documentation files (the “Software”), to deal in-the Software without restriction, including without limitation the rights to-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies-of the Software, and to permit persons to whom the Software is furnished to do-so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in all-copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE-SOFTWARE.--------The following software may be included in this product: react-color, reactcss. A copy of the source code may be downloaded from git+https://github.com/casesandberg/react-color.git (react-color), https://github.com/casesandberg/reactcss (reactcss). This software contains the following license and notice below:The MIT License (MIT)@@ -20465,32 +20349,6 @@ SOFTWARE.------The following software may be included in this product: react-input-autosize. A copy of the source code may be downloaded from https://github.com/JedWatson/react-input-autosize.git. This software contains the following license and notice below:--The MIT License (MIT)--Copyright (c) 2018 Jed Watson--Permission is hereby granted, free of charge, to any person obtaining a copy-of this software and associated documentation files (the "Software"), to deal-in the Software without restriction, including without limitation the rights-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-copies of the Software, and to permit persons to whom the Software is-furnished to do so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in all-copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE-SOFTWARE.--------The following software may be included in this product: react-joyride. A copy of the source code may be downloaded from git+https://github.com/gilbarbara/react-joyride.git. This software contains the following license and notice below:MIT License@@ -22941,6 +22799,20 @@ THE SOFTWARE.-----+The following software may be included in this product: spdx-compare, spdx-ranges. A copy of the source code may be downloaded from https://github.com/kemitchell/spdx-compare.js.git (spdx-compare), https://github.com/kemitchell/spdx-ranges.js.git (spdx-ranges). This software contains the following license and notice below:++The MIT License++Copyright (c) 2015 Kyle E. Mitchell++Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.++-----+The following software may be included in this product: spdx-expression-parse. A copy of the source code may be downloaded from https://github.com/jslicense/spdx-expression-parse.js.git. This software contains the following license and notice below:The MIT License@@ -22968,6 +22840,32 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.-----+The following software may be included in this product: spdx-satisfies. A copy of the source code may be downloaded from https://github.com/kemitchell/spdx-satisfies.js.git. This software contains the following license and notice below:++The MIT License++Copyright (c) spdx-satisfies.js contributors++Permission is hereby granted, free of charge, to any person obtaining a+copy of this software and associated documentation files (the "Software"),+to deal in the Software without restriction, including without limitation+the rights to use, copy, modify, merge, publish, distribute, sublicense,+and/or sell copies of the Software, and to permit persons to whom the+Software is furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included+in all copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR+OTHER DEALINGS IN THE SOFTWARE.++-----+The following software may be included in this product: specificity. A copy of the source code may be downloaded from https://github.com/keeganstreet/specificity.git. This software contains the following license and notice below:The MIT License (MIT)