From 022a1eae2ab8d0706463988f1ae69443de6df99b Mon Sep 17 00:00:00 2001 From: Piero Nicolli Date: Thu, 14 Nov 2019 09:46:32 +0100 Subject: [PATCH 1/5] Upgrade react and react-dom to 16.11.0 --- CHANGELOG.md | 1 + package.json | 4 ++-- yarn.lock | 27 +++++++++++++++++---------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ef7d0a71..7c4d096913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Internal - Upgrade autoprefixer, remove deprecated `browsers` option, move to `browserlist` in `package.json` @sneridagh +- Upgrade react and react-dom to 16.11.0 @pnicolli ## 4.0.0-alpha.12 (2019-11-13) diff --git a/package.json b/package.json index f524efd184..6ac50df91a 100644 --- a/package.json +++ b/package.json @@ -246,12 +246,12 @@ "raven-js": "3.27.0", "razzle": "3.0.0", "razzle-plugin-bundle-analyzer": "1.0.2", - "react": "16.8.6", + "react": "16.11.0", "react-animate-height": "2.0.15", "react-cookie": "1.0.5", "react-dnd": "5.0.0", "react-dnd-html5-backend": "5.0.1", - "react-dom": "16.8.6", + "react-dom": "16.11.0", "react-dropzone": "5.1.0", "react-helmet": "5.2.0", "react-intl": "3.3.2", diff --git a/yarn.lock b/yarn.lock index a9aab3ebcf..92578977f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11644,15 +11644,15 @@ react-dnd@5.0.0: recompose "^0.27.1" shallowequal "^1.0.2" -react-dom@16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" - integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA== +react-dom@16.11.0: + version "16.11.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.11.0.tgz#7e7c4a5a85a569d565c2462f5d345da2dd849af5" + integrity sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.6" + scheduler "^0.17.0" react-dropzone@5.1.0: version "5.1.0" @@ -11857,15 +11857,14 @@ react-transition-group@^2.2.1, react-transition-group@^2.6.1: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react@16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" - integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw== +react@16.11.0: + version "16.11.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz#d294545fe62299ccee83363599bf904e4a07fdbb" + integrity sha512-M5Y8yITaLmU0ynd0r1Yvfq98Rmll6q8AxaEe88c8e7LxO8fZ2cNgmFt0aGAS9wzf1Ao32NKXtCl+/tVVtkxq6g== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.6" read-pkg-up@^1.0.1: version "1.0.1" @@ -12713,6 +12712,14 @@ scheduler@^0.13.6: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe" + integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.2, schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" From 4c349716311bc031c583039034e8f5743c80ed97 Mon Sep 17 00:00:00 2001 From: Piero Nicolli Date: Mon, 18 Nov 2019 23:58:39 +0100 Subject: [PATCH 2/5] Upgrade to react 16.12.0 --- CHANGELOG.md | 2 +- package.json | 4 ++-- yarn.lock | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c4d096913..5ebbc59e05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ ### Internal - Upgrade autoprefixer, remove deprecated `browsers` option, move to `browserlist` in `package.json` @sneridagh -- Upgrade react and react-dom to 16.11.0 @pnicolli +- Upgrade react and react-dom to 16.12.0 @pnicolli ## 4.0.0-alpha.12 (2019-11-13) diff --git a/package.json b/package.json index 6ac50df91a..8cd9dd863c 100644 --- a/package.json +++ b/package.json @@ -246,12 +246,12 @@ "raven-js": "3.27.0", "razzle": "3.0.0", "razzle-plugin-bundle-analyzer": "1.0.2", - "react": "16.11.0", + "react": "16.12.0", "react-animate-height": "2.0.15", "react-cookie": "1.0.5", "react-dnd": "5.0.0", "react-dnd-html5-backend": "5.0.1", - "react-dom": "16.11.0", + "react-dom": "16.12.0", "react-dropzone": "5.1.0", "react-helmet": "5.2.0", "react-intl": "3.3.2", diff --git a/yarn.lock b/yarn.lock index 92578977f7..c442c963bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11644,15 +11644,15 @@ react-dnd@5.0.0: recompose "^0.27.1" shallowequal "^1.0.2" -react-dom@16.11.0: - version "16.11.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.11.0.tgz#7e7c4a5a85a569d565c2462f5d345da2dd849af5" - integrity sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA== +react-dom@16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" + integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.17.0" + scheduler "^0.18.0" react-dropzone@5.1.0: version "5.1.0" @@ -11857,10 +11857,10 @@ react-transition-group@^2.2.1, react-transition-group@^2.6.1: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react@16.11.0: - version "16.11.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz#d294545fe62299ccee83363599bf904e4a07fdbb" - integrity sha512-M5Y8yITaLmU0ynd0r1Yvfq98Rmll6q8AxaEe88c8e7LxO8fZ2cNgmFt0aGAS9wzf1Ao32NKXtCl+/tVVtkxq6g== +react@16.12.0: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83" + integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -12712,10 +12712,10 @@ scheduler@^0.13.6: loose-envify "^1.1.0" object-assign "^4.1.1" -scheduler@^0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe" - integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA== +scheduler@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4" + integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" From e1655e297bbb8933ec47cfaa900283d5a60438c4 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Sat, 23 Nov 2019 10:43:36 +0100 Subject: [PATCH 3/5] Rename UNSAFE lifecycle methods --- src/components/manage/Add/Add.jsx | 2 +- src/components/manage/Blocks/Block/Edit.jsx | 2 +- .../manage/Blocks/Description/Edit.jsx | 2 +- src/components/manage/Blocks/HTML/Edit.jsx | 2 +- .../manage/Blocks/HeroImageLeft/Edit.jsx | 2 +- src/components/manage/Blocks/Image/Edit.jsx | 2 +- src/components/manage/Blocks/Table/Cell.jsx | 2 +- src/components/manage/Blocks/Table/Edit.jsx | 2 +- src/components/manage/Blocks/Text/Edit.jsx | 2 +- src/components/manage/Blocks/Title/Edit.jsx | 2 +- src/components/manage/Contents/Contents.jsx | 4 +- .../Contents/ContentsPropertiesModal.jsx | 2 +- .../manage/Contents/ContentsRenameModal.jsx | 2 +- .../manage/Contents/ContentsTagsModal.jsx | 2 +- .../manage/Contents/ContentsUploadModal.jsx | 2 +- .../manage/Contents/ContentsWorkflowModal.jsx | 4 +- .../manage/Controlpanels/Controlpanel.jsx | 4 +- .../manage/Controlpanels/Controlpanels.jsx | 2 +- .../manage/Controlpanels/ModerateComments.jsx | 4 +- .../Controlpanels/UsersControlpanel.jsx | 55 ++++++++----------- .../Controlpanels/UsersControlpanelGroups.jsx | 5 +- src/components/manage/Delete/Delete.jsx | 4 +- src/components/manage/Diff/Diff.jsx | 2 +- src/components/manage/Display/Display.jsx | 4 +- src/components/manage/Edit/Edit.jsx | 2 +- src/components/manage/History/History.jsx | 2 +- .../Preferences/PersonalInformation.jsx | 2 +- src/components/manage/Sharing/Sharing.jsx | 2 +- src/components/manage/Toolbar/Toolbar.jsx | 2 +- .../manage/Widgets/ReferenceWidget.jsx | 4 +- src/components/manage/Workflow/Workflow.jsx | 4 +- src/components/theme/App/App.jsx | 2 +- .../theme/Breadcrumbs/Breadcrumbs.jsx | 4 +- .../theme/Comments/CommentEditModal.jsx | 2 +- src/components/theme/Comments/Comments.jsx | 4 +- .../theme/ContactForm/ContactForm.jsx | 2 +- src/components/theme/Login/Login.jsx | 2 +- src/components/theme/Logout/Logout.jsx | 2 +- .../theme/Navigation/Navigation.jsx | 4 +- .../theme/PasswordReset/PasswordReset.jsx | 4 +- .../PasswordReset/RequestPasswordReset.jsx | 4 +- src/components/theme/Register/Register.jsx | 2 +- src/components/theme/Search/Search.jsx | 4 +- src/components/theme/Search/SearchTags.jsx | 2 +- src/components/theme/View/LinkView.jsx | 4 +- src/components/theme/View/View.jsx | 4 +- 46 files changed, 85 insertions(+), 95 deletions(-) diff --git a/src/components/manage/Add/Add.jsx b/src/components/manage/Add/Add.jsx index 97a83bc28a..eee0a368de 100644 --- a/src/components/manage/Add/Add.jsx +++ b/src/components/manage/Add/Add.jsx @@ -116,7 +116,7 @@ class Add extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( this.props.createRequest.loading && nextProps.createRequest.loaded && diff --git a/src/components/manage/Blocks/Block/Edit.jsx b/src/components/manage/Blocks/Block/Edit.jsx index ae6220b419..6e8e9df418 100644 --- a/src/components/manage/Blocks/Block/Edit.jsx +++ b/src/components/manage/Blocks/Block/Edit.jsx @@ -123,7 +123,7 @@ class Edit extends Component { } } - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { const { selected, type } = this.props; const blockHasOwnFocusManagement = blocks.blocksConfig?.[type]?.['blockHasOwnFocusManagement'] || null; diff --git a/src/components/manage/Blocks/Description/Edit.jsx b/src/components/manage/Blocks/Description/Edit.jsx index 9b066e2feb..781335347a 100644 --- a/src/components/manage/Blocks/Description/Edit.jsx +++ b/src/components/manage/Blocks/Description/Edit.jsx @@ -91,7 +91,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( nextProps.properties.description && this.props.properties.description !== nextProps.properties.description && diff --git a/src/components/manage/Blocks/HTML/Edit.jsx b/src/components/manage/Blocks/HTML/Edit.jsx index 7f9bb80854..c688d75dee 100644 --- a/src/components/manage/Blocks/HTML/Edit.jsx +++ b/src/components/manage/Blocks/HTML/Edit.jsx @@ -71,7 +71,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.selected) { this.codeEditor._input.focus(); } diff --git a/src/components/manage/Blocks/HeroImageLeft/Edit.jsx b/src/components/manage/Blocks/HeroImageLeft/Edit.jsx index 96da879f31..303363c6f3 100644 --- a/src/components/manage/Blocks/HeroImageLeft/Edit.jsx +++ b/src/components/manage/Blocks/HeroImageLeft/Edit.jsx @@ -143,7 +143,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( this.props.request.loading && nextProps.request.loaded && diff --git a/src/components/manage/Blocks/Image/Edit.jsx b/src/components/manage/Blocks/Image/Edit.jsx index 9ca2e82717..6c54764316 100644 --- a/src/components/manage/Blocks/Image/Edit.jsx +++ b/src/components/manage/Blocks/Image/Edit.jsx @@ -74,7 +74,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( this.props.request.loading && nextProps.request.loaded && diff --git a/src/components/manage/Blocks/Table/Cell.jsx b/src/components/manage/Blocks/Table/Cell.jsx index 76bfc493cd..738c39263c 100644 --- a/src/components/manage/Blocks/Table/Cell.jsx +++ b/src/components/manage/Blocks/Table/Cell.jsx @@ -88,7 +88,7 @@ class Cell extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( nextProps.isTableBlockSelected !== this.props.isTableBlockSelected && this.props.cell === 0 && diff --git a/src/components/manage/Blocks/Table/Edit.jsx b/src/components/manage/Blocks/Table/Edit.jsx index db2bf536ce..e042175c05 100644 --- a/src/components/manage/Blocks/Table/Edit.jsx +++ b/src/components/manage/Blocks/Table/Edit.jsx @@ -226,7 +226,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (!nextProps.data.table) { this.props.onChangeBlock(nextProps.block, { ...nextProps.data, diff --git a/src/components/manage/Blocks/Text/Edit.jsx b/src/components/manage/Blocks/Text/Edit.jsx index d0fb09075a..620f9d812c 100644 --- a/src/components/manage/Blocks/Text/Edit.jsx +++ b/src/components/manage/Blocks/Text/Edit.jsx @@ -111,7 +111,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (!this.props.selected && nextProps.selected) { this.node.focus(); this.setState({ diff --git a/src/components/manage/Blocks/Title/Edit.jsx b/src/components/manage/Blocks/Title/Edit.jsx index 1ed183783e..56bd78ee15 100644 --- a/src/components/manage/Blocks/Title/Edit.jsx +++ b/src/components/manage/Blocks/Title/Edit.jsx @@ -91,7 +91,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( nextProps.properties.title && this.props.properties.title !== nextProps.properties.title && diff --git a/src/components/manage/Contents/Contents.jsx b/src/components/manage/Contents/Contents.jsx index 899d0619ed..1ff7860372 100644 --- a/src/components/manage/Contents/Contents.jsx +++ b/src/components/manage/Contents/Contents.jsx @@ -298,7 +298,7 @@ class Contents extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.fetchContents(); } @@ -308,7 +308,7 @@ class Contents extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( (this.props.clipboardRequest.loading && nextProps.clipboardRequest.loaded) || diff --git a/src/components/manage/Contents/ContentsPropertiesModal.jsx b/src/components/manage/Contents/ContentsPropertiesModal.jsx index 2190127ea4..389da01ce4 100644 --- a/src/components/manage/Contents/ContentsPropertiesModal.jsx +++ b/src/components/manage/Contents/ContentsPropertiesModal.jsx @@ -112,7 +112,7 @@ class ContentsPropertiesModal extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.request.loading && nextProps.request.loaded) { this.props.onOk(); } diff --git a/src/components/manage/Contents/ContentsRenameModal.jsx b/src/components/manage/Contents/ContentsRenameModal.jsx index 7ce6fdcaed..ef1aac7cfa 100644 --- a/src/components/manage/Contents/ContentsRenameModal.jsx +++ b/src/components/manage/Contents/ContentsRenameModal.jsx @@ -82,7 +82,7 @@ class ContentsRenameModal extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.request.loading && nextProps.request.loaded) { this.props.onOk(); } diff --git a/src/components/manage/Contents/ContentsTagsModal.jsx b/src/components/manage/Contents/ContentsTagsModal.jsx index 23abad89e8..e5a1970a82 100644 --- a/src/components/manage/Contents/ContentsTagsModal.jsx +++ b/src/components/manage/Contents/ContentsTagsModal.jsx @@ -77,7 +77,7 @@ class ContentsTagsModal extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.request.loading && nextProps.request.loaded) { this.props.onOk(); } diff --git a/src/components/manage/Contents/ContentsUploadModal.jsx b/src/components/manage/Contents/ContentsUploadModal.jsx index ee282c4af1..b17c71c145 100644 --- a/src/components/manage/Contents/ContentsUploadModal.jsx +++ b/src/components/manage/Contents/ContentsUploadModal.jsx @@ -84,7 +84,7 @@ class ContentsUploadModal extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.request.loading && nextProps.request.loaded) { this.props.onOk(); this.setState({ diff --git a/src/components/manage/Contents/ContentsWorkflowModal.jsx b/src/components/manage/Contents/ContentsWorkflowModal.jsx index 362e786f1c..0afdfc58db 100644 --- a/src/components/manage/Contents/ContentsWorkflowModal.jsx +++ b/src/components/manage/Contents/ContentsWorkflowModal.jsx @@ -77,7 +77,7 @@ class ContentsWorkflowModal extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getWorkflow(this.props.items); } @@ -87,7 +87,7 @@ class ContentsWorkflowModal extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.request.loading && nextProps.request.loaded) { this.props.onOk(); } diff --git a/src/components/manage/Controlpanels/Controlpanel.jsx b/src/components/manage/Controlpanels/Controlpanel.jsx index 3f6056211c..823b490dda 100644 --- a/src/components/manage/Controlpanels/Controlpanel.jsx +++ b/src/components/manage/Controlpanels/Controlpanel.jsx @@ -88,7 +88,7 @@ class Controlpanel extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getControlpanel(this.props.id); } @@ -98,7 +98,7 @@ class Controlpanel extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.updateRequest.loading && nextProps.updateRequest.loaded) { toast.info( ({ - roles: state.roles.roles, - users: state.users.users, - groups: state.groups.groups, - description: state.description, - pathname: props.location.pathname, - deleteRequest: state.users.delete, - createRequest: state.users.create, - deleteGroupRequest: state.groups.delete, - createGroupRequest: state.groups.create, - }), - dispatch => - bindActionCreators( - { - listRoles, - listUsers, - deleteUser, - createUser, - listGroups, - deleteGroup, - createGroup, - updateUser, - updateGroup, - }, - dispatch, - ), -) /** * UsersControlpanel class. * @class UsersControlpanel @@ -269,7 +240,7 @@ class UsersControlpanel extends Component { this.props.listGroups(); } - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( (this.props.deleteRequest.loading && nextProps.deleteRequest.loaded) || (this.props.createRequest.loading && nextProps.createRequest.loaded) @@ -983,10 +954,28 @@ export default compose( (state, props) => ({ roles: state.roles.roles, users: state.users.users, - entries: state.users.users, - groupEntries: state.groups.groups, + groups: state.groups.groups, + description: state.description, pathname: props.location.pathname, + deleteRequest: state.users.delete, + createRequest: state.users.create, + deleteGroupRequest: state.groups.delete, + createGroupRequest: state.groups.create, }), - { listRoles, listUsers }, + dispatch => + bindActionCreators( + { + listRoles, + listUsers, + deleteUser, + createUser, + listGroups, + deleteGroup, + createGroup, + updateUser, + updateGroup, + }, + dispatch, + ), ), )(UsersControlpanel); diff --git a/src/components/manage/Controlpanels/UsersControlpanelGroups.jsx b/src/components/manage/Controlpanels/UsersControlpanelGroups.jsx index 26fceb3d87..a5faafae6c 100644 --- a/src/components/manage/Controlpanels/UsersControlpanelGroups.jsx +++ b/src/components/manage/Controlpanels/UsersControlpanelGroups.jsx @@ -9,13 +9,12 @@ import { Dropdown, Table, Checkbox } from 'semantic-ui-react'; import trashSVG from '../../../icons/delete.svg'; import { Icon } from '../../../components'; -@injectIntl /** * UsersControlpanelGroups class. * @class UsersControlpanelGroups * @extends Component */ -export default class UsersControlpanelGroups extends Component { +class UsersControlpanelGroups extends Component { /** * Property types. * @property {Object} propTypes Property types. @@ -100,3 +99,5 @@ export default class UsersControlpanelGroups extends Component { ); } } + +export default injectIntl(UsersControlpanelGroups); diff --git a/src/components/manage/Delete/Delete.jsx b/src/components/manage/Delete/Delete.jsx index 7c0f979a6e..dc2f99fca5 100644 --- a/src/components/manage/Delete/Delete.jsx +++ b/src/components/manage/Delete/Delete.jsx @@ -84,7 +84,7 @@ class Delete extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getContent(this.props.pathname.split('/delete')[0]); } @@ -94,7 +94,7 @@ class Delete extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.deleteRequest.loading && nextProps.deleteRequest.loaded) { this.props.history.push( this.props.returnUrl || diff --git a/src/components/manage/Diff/Diff.jsx b/src/components/manage/Diff/Diff.jsx index ab552a8dba..7216fa43f7 100644 --- a/src/components/manage/Diff/Diff.jsx +++ b/src/components/manage/Diff/Diff.jsx @@ -112,7 +112,7 @@ class Diff extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( this.props.pathname !== nextProps.pathname || this.props.one !== nextProps.one || diff --git a/src/components/manage/Display/Display.jsx b/src/components/manage/Display/Display.jsx index 63a33df075..553db132cc 100644 --- a/src/components/manage/Display/Display.jsx +++ b/src/components/manage/Display/Display.jsx @@ -133,7 +133,7 @@ class DisplaySelect extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getSchema(this.props.type); } @@ -143,7 +143,7 @@ class DisplaySelect extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.pathname !== this.props.pathname) { this.props.getSchema(nextProps.type); } diff --git a/src/components/manage/Edit/Edit.jsx b/src/components/manage/Edit/Edit.jsx index a6c031174c..b5d23fd574 100644 --- a/src/components/manage/Edit/Edit.jsx +++ b/src/components/manage/Edit/Edit.jsx @@ -113,7 +113,7 @@ class Edit extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.getRequest.loading && nextProps.getRequest.loaded) { this.props.getSchema(nextProps.content['@type']); } diff --git a/src/components/manage/History/History.jsx b/src/components/manage/History/History.jsx index a655906b63..93a2736678 100644 --- a/src/components/manage/History/History.jsx +++ b/src/components/manage/History/History.jsx @@ -87,7 +87,7 @@ class History extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.revertRequest.loading && nextProps.revertRequest.loaded) { this.props.getHistory(getBaseUrl(this.props.pathname)); } diff --git a/src/components/manage/Preferences/PersonalInformation.jsx b/src/components/manage/Preferences/PersonalInformation.jsx index 45fb895665..a65e501c70 100644 --- a/src/components/manage/Preferences/PersonalInformation.jsx +++ b/src/components/manage/Preferences/PersonalInformation.jsx @@ -123,7 +123,7 @@ class PersonalInformation extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getUser(this.props.userId); } diff --git a/src/components/manage/Sharing/Sharing.jsx b/src/components/manage/Sharing/Sharing.jsx index 18d1be2838..015c7846f4 100644 --- a/src/components/manage/Sharing/Sharing.jsx +++ b/src/components/manage/Sharing/Sharing.jsx @@ -132,7 +132,7 @@ class SharingComponent extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.updateRequest.loading && nextProps.updateRequest.loaded) { this.props.getSharing(getBaseUrl(this.props.pathname), this.state.search); } diff --git a/src/components/manage/Toolbar/Toolbar.jsx b/src/components/manage/Toolbar/Toolbar.jsx index 726eaa8055..e9b654e317 100644 --- a/src/components/manage/Toolbar/Toolbar.jsx +++ b/src/components/manage/Toolbar/Toolbar.jsx @@ -125,7 +125,7 @@ class Toolbar extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.pathname !== this.props.pathname) { this.props.listActions(getBaseUrl(nextProps.pathname)); this.props.getTypes(getBaseUrl(nextProps.pathname)); diff --git a/src/components/manage/Widgets/ReferenceWidget.jsx b/src/components/manage/Widgets/ReferenceWidget.jsx index 22a973a424..ba5e8c6cc7 100644 --- a/src/components/manage/Widgets/ReferenceWidget.jsx +++ b/src/components/manage/Widgets/ReferenceWidget.jsx @@ -122,7 +122,7 @@ class ReferenceWidget extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.resetSearchContent(); } @@ -132,7 +132,7 @@ class ReferenceWidget extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { this.setState({ choices: { ...fromPairs( diff --git a/src/components/manage/Workflow/Workflow.jsx b/src/components/manage/Workflow/Workflow.jsx index 95201d1d32..0e6ae636d2 100644 --- a/src/components/manage/Workflow/Workflow.jsx +++ b/src/components/manage/Workflow/Workflow.jsx @@ -195,7 +195,7 @@ class Workflow extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getWorkflow(this.props.pathname); } @@ -205,7 +205,7 @@ class Workflow extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.pathname !== this.props.pathname) { this.props.getWorkflow(nextProps.pathname); } diff --git a/src/components/theme/App/App.jsx b/src/components/theme/App/App.jsx index ae03f5bb00..944656ff04 100644 --- a/src/components/theme/App/App.jsx +++ b/src/components/theme/App/App.jsx @@ -70,7 +70,7 @@ class App extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.pathname !== this.props.pathname) { if (this.state.hasError) { this.setState({ hasError: false }); diff --git a/src/components/theme/Breadcrumbs/Breadcrumbs.jsx b/src/components/theme/Breadcrumbs/Breadcrumbs.jsx index 32ce2c1475..1580dc18fe 100644 --- a/src/components/theme/Breadcrumbs/Breadcrumbs.jsx +++ b/src/components/theme/Breadcrumbs/Breadcrumbs.jsx @@ -51,7 +51,7 @@ class Breadcrumbs extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getBreadcrumbs(getBaseUrl(this.props.pathname)); } @@ -61,7 +61,7 @@ class Breadcrumbs extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.pathname !== this.props.pathname) { this.props.getBreadcrumbs(getBaseUrl(nextProps.pathname)); } diff --git a/src/components/theme/Comments/CommentEditModal.jsx b/src/components/theme/Comments/CommentEditModal.jsx index 8a1b2b23e4..11ec25b46b 100644 --- a/src/components/theme/Comments/CommentEditModal.jsx +++ b/src/components/theme/Comments/CommentEditModal.jsx @@ -78,7 +78,7 @@ class CommentEditModal extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.request.loading && nextProps.request.loaded) { this.props.onOk(); } diff --git a/src/components/theme/Comments/Comments.jsx b/src/components/theme/Comments/Comments.jsx index bbba8a710b..5c16d38af7 100644 --- a/src/components/theme/Comments/Comments.jsx +++ b/src/components/theme/Comments/Comments.jsx @@ -96,7 +96,7 @@ class Comments extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.listComments(getBaseUrl(this.props.pathname)); } @@ -106,7 +106,7 @@ class Comments extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if ( nextProps.pathname !== this.props.pathname || (this.props.addRequest.loading && nextProps.addRequest.loaded) || diff --git a/src/components/theme/ContactForm/ContactForm.jsx b/src/components/theme/ContactForm/ContactForm.jsx index 260a48bb05..828fd2bfef 100644 --- a/src/components/theme/ContactForm/ContactForm.jsx +++ b/src/components/theme/ContactForm/ContactForm.jsx @@ -115,7 +115,7 @@ class ContactForm extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (this.props.loading && nextProps.loaded) { toast.success( { + UNSAFE_componentWillReceiveProps = nextProps => { if ( nextProps.searchableText !== this.props.searchableText || nextProps.subject !== this.props.subject diff --git a/src/components/theme/Search/SearchTags.jsx b/src/components/theme/Search/SearchTags.jsx index 7a3815d5ba..a74d361854 100644 --- a/src/components/theme/Search/SearchTags.jsx +++ b/src/components/theme/Search/SearchTags.jsx @@ -37,7 +37,7 @@ class SearchTags extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.getVocabulary(vocabulary); } diff --git a/src/components/theme/View/LinkView.jsx b/src/components/theme/View/LinkView.jsx index 48c3e75490..5ff557124b 100644 --- a/src/components/theme/View/LinkView.jsx +++ b/src/components/theme/View/LinkView.jsx @@ -44,7 +44,7 @@ class LinkView extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { if (!this.props.token) { this.props.history.replace(this.props.content.remoteUrl); } @@ -56,7 +56,7 @@ class LinkView extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.pathname !== this.props.pathname && !nextProps.token) { nextProps.history.replace(nextProps.content.remoteUrl); } diff --git a/src/components/theme/View/View.jsx b/src/components/theme/View/View.jsx index 76c86631e8..877f3f0aba 100644 --- a/src/components/theme/View/View.jsx +++ b/src/components/theme/View/View.jsx @@ -109,7 +109,7 @@ class View extends Component { * @method componentWillMount * @returns {undefined} */ - componentWillMount() { + UNSAFE_componentWillMount() { this.props.listActions(getBaseUrl(this.props.pathname)); this.props.getContent( getBaseUrl(this.props.pathname), @@ -123,7 +123,7 @@ class View extends Component { * @param {Object} nextProps Next properties * @returns {undefined} */ - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.pathname !== this.props.pathname) { this.props.listActions(getBaseUrl(nextProps.pathname)); this.props.getContent( From 94dcdcdf7613253c8a7277fee428aece149e1663 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Sat, 23 Nov 2019 12:28:59 +0100 Subject: [PATCH 4/5] Update components to be compatible with 16.12 --- package.json | 6 +-- yarn.lock | 104 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 89 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 8cd9dd863c..16cc27732a 100644 --- a/package.json +++ b/package.json @@ -264,20 +264,20 @@ "react-select": "2.4.2", "react-select-async-paginate": "0.2.9", "react-share": "2.3.1", - "react-side-effect": "1.1.5", + "react-side-effect": "2.1.0", "react-simple-code-editor": "0.7.1", "react-test-renderer": "16.8.6", "react-toastify": "5.1.1", "redraft": "0.10.1", "redux": "4.0.1", "redux-actions": "2.6.5", - "redux-connect": "9.0.0", + "redux-connect": "10.0.0", "redux-devtools-extension": "2.13.8", "redux-mock-store": "1.5.3", "redux-thunk": "2.3.0", "release-it": "12.4.0", "semantic-ui-less": "2.4.1", - "semantic-ui-react": "0.84.0", + "semantic-ui-react": "0.88.1", "semver": "5.6.0", "serialize-javascript": "1.5.0", "start-server-and-test": "1.7.13", diff --git a/yarn.lock b/yarn.lock index c442c963bb..bf575de287 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1140,10 +1140,10 @@ dependencies: any-observable "^0.3.0" -"@semantic-ui-react/event-stack@^3.0.1": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@semantic-ui-react/event-stack/-/event-stack-3.1.0.tgz#aadbe4a28b0dd7703c5f451640d0fefe66dd9208" - integrity sha512-WHtU9wutZByZtFZxzj4BVEk+rvWldZpZhRcyv6d84+XLSolm83zLHYJLTACGuSl6Xa/xpgVXquvm9GyMudkJYg== +"@semantic-ui-react/event-stack@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@semantic-ui-react/event-stack/-/event-stack-3.1.1.tgz#3263d17511db81a743167fe45281a24b3eb6b3c8" + integrity sha512-SA7VOu/tY3OkooR++mm9voeQrJpYXjJaMHO1aFCcSouS2xhqMR9Gnz0LEGLOR0h9ueWPBKaQzKIrx3FTTJZmUQ== dependencies: exenv "^1.2.2" prop-types "^15.6.2" @@ -1158,6 +1158,23 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@stardust-ui/react-component-event-listener@~0.38.0": + version "0.38.0" + resolved "https://registry.yarnpkg.com/@stardust-ui/react-component-event-listener/-/react-component-event-listener-0.38.0.tgz#1787faded94b40ad41226e6289baf13e701c6e7f" + integrity sha512-sIP/e0dyOrrlb8K7KWumfMxj/gAifswTBC4o68Aa+C/GA73ccRp/6W1VlHvF/dlOR4KLsA+5SKnhjH36xzPsWg== + dependencies: + "@babel/runtime" "^7.1.2" + prop-types "^15.7.2" + +"@stardust-ui/react-component-ref@~0.38.0": + version "0.38.0" + resolved "https://registry.yarnpkg.com/@stardust-ui/react-component-ref/-/react-component-ref-0.38.0.tgz#52d555f2d5edd213c923c93a106f7de940e427ef" + integrity sha512-xjs6WnvJVueSIXMWw0C3oWIgAPpcD03qw43oGOjUXqFktvpNkB73JoKIhS4sCrtQxBdct75qqr4ZL6JiyPcESw== + dependencies: + "@babel/runtime" "^7.1.2" + prop-types "^15.7.2" + react-is "^16.6.3" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -3628,6 +3645,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-react-context@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c" + integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw== + dependencies: + gud "^1.0.0" + warning "^4.0.3" + cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -8184,7 +8209,7 @@ jwt-decode@2.2.0: resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-2.2.0.tgz#7d86bd56679f58ce6a84704a657dd392bba81a79" integrity sha1-fYa9VmefWM5qhHBKZX3TkruoGnk= -keyboard-key@^1.0.2: +keyboard-key@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/keyboard-key/-/keyboard-key-1.0.4.tgz#52d8fa07b7e17757072aa22a67fb4ae85e4c46b0" integrity sha512-my04dE6BCwPpwoe4KYKfPxWiwgDYQOHrVmtzn1CfzmoEsGG/ef4oZGaXCzi1+iFhG7CN5JkOuxmei5OABY8/ag== @@ -10242,6 +10267,11 @@ pofile@1.0.10: resolved "https://registry.yarnpkg.com/pofile/-/pofile-1.0.10.tgz#503dda9499403984e83ff4489ba2d80af276172a" integrity sha512-bkQlDA9YYNaZGLLrxBoQgydzjc2tasbUfxa94/kx2FO/FCiHAJG6B40Jr3fWQgDC7kr+a9q7q5x7449B91CF0A== +popper.js@^1.14.4: + version "1.16.0" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz#2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3" + integrity sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw== + portfinder@^1.0.21: version "1.0.21" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.21.tgz#60e1397b95ac170749db70034ece306b9a27e324" @@ -11713,6 +11743,11 @@ react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw== +react-is@^16.6.3: + version "16.12.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" + integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== + react-is@^16.8.4: version "16.11.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa" @@ -11728,6 +11763,18 @@ react-medium-image-zoom@3.0.15: resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-3.0.15.tgz#c566c08225cff9c7c6454fe66b570609ffa2991d" integrity sha512-OJc6XXmSFr0ApniFdCL1TliP6BG9eQabkcahWA9CbHha3y2IJXo1aAsQs7Irc2Wcek/N9QCeAY4wTitoMg5iLg== +react-popper@^1.3.4: + version "1.3.6" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.6.tgz#32122f83af8fda01bdd4f86625ddacaf64fdd06d" + integrity sha512-kLTfa9z8n+0jJvRVal9+vIuirg41rObg4Bbrvv/ZfsGPQDN9reyVVSxqnHF1ZNgXgV7x11PeUfd5ItF8DZnqhg== + dependencies: + "@babel/runtime" "^7.1.2" + create-react-context "^0.3.0" + popper.js "^1.14.4" + prop-types "^15.6.1" + typed-styles "^0.0.7" + warning "^4.0.2" + react-portal@4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.1.5.tgz#6665d4d2a92d47d6f8b07a6529e26fc52d5cccde" @@ -11814,7 +11861,12 @@ react-share@2.3.1: jsonp "^0.2.1" prop-types "^15.5.8" -react-side-effect@1.1.5, react-side-effect@^1.1.0: +react-side-effect@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.0.tgz#1ce4a8b4445168c487ed24dab886421f74d380d3" + integrity sha512-IgmcegOSi5SNX+2Snh1vqmF0Vg/CbkycU9XZbOHJlZ6kMzTmi3yc254oB1WCkgA7OQtIAoLmcSFuHTc/tlcqXg== + +react-side-effect@^1.1.0: version "1.1.5" resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-1.1.5.tgz#f26059e50ed9c626d91d661b9f3c8bb38cd0ff2d" integrity sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw== @@ -12038,10 +12090,10 @@ redux-actions@2.6.5: reduce-reducers "^0.4.3" to-camel-case "^1.0.0" -redux-connect@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/redux-connect/-/redux-connect-9.0.0.tgz#071f4b879dcd4c92b30bba27666b780cd25a0494" - integrity sha512-bRT50ibk7kSv2hIa60H2ow6zt4lYfqpB2rzYsgfI7JlWIYK9v73fyuevUX61ycQdujek/o6i70/MO/CThuw7Og== +redux-connect@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/redux-connect/-/redux-connect-10.0.0.tgz#ba798344e46aa31484623d3adfdfa5755cb6c893" + integrity sha512-lLyIuXKRLSXvdpOBEhNDsBwsf2NApEsvpxKQ+oGhL8jL0W9xzkqv35zcRTiPAAPreHQa1imY8OqpZ6h9nMoU5w== redux-devtools-extension@2.13.8: version "2.13.8" @@ -12766,17 +12818,21 @@ semantic-ui-less@2.4.1: dependencies: jquery x.* -semantic-ui-react@0.84.0: - version "0.84.0" - resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-0.84.0.tgz#43f908fd547b1e8b2b108675a93cd7d7460bcdbe" - integrity sha512-OOqdtH+hBxVlh/lQa+zet9MEPcA8cBUo7ePVYZhx82hwF5Ky47FiWrgLk3ZSNie7bb4VkuiuLR9y5cY0EooRlw== +semantic-ui-react@0.88.1: + version "0.88.1" + resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-0.88.1.tgz#006d63f838b651370d68e73510327308f19ff6fd" + integrity sha512-fCCDnRXiVJUJ9icFVSu0n0pZ2cg2QssiLM2nP4pz6aODQpPZTPtXVI6V/hFciwJ+GPkV6WZAmEmFLxR7nRVF4Q== dependencies: "@babel/runtime" "^7.1.2" - "@semantic-ui-react/event-stack" "^3.0.1" + "@semantic-ui-react/event-stack" "^3.1.0" + "@stardust-ui/react-component-event-listener" "~0.38.0" + "@stardust-ui/react-component-ref" "~0.38.0" classnames "^2.2.6" - keyboard-key "^1.0.2" - lodash "^4.17.11" - prop-types "^15.6.2" + keyboard-key "^1.0.4" + lodash "^4.17.15" + prop-types "^15.7.2" + react-is "^16.8.6" + react-popper "^1.3.4" shallowequal "^1.1.0" semver-compare@^1.0.0: @@ -14354,6 +14410,11 @@ type-is@~1.6.15, type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typed-styles@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9" + integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q== + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -14828,6 +14889,13 @@ walker@~1.0.5: dependencies: makeerror "1.0.x" +warning@^4.0.2, warning@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" + integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== + dependencies: + loose-envify "^1.0.0" + watch@~0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986" From 556276fa2ef4f6ffd037e269453f0262336e2c24 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Sat, 23 Nov 2019 12:52:12 +0100 Subject: [PATCH 5/5] fix tests --- .../__snapshots__/Actions.test.jsx.snap | 5 ++ .../Video/__snapshots__/Edit.test.jsx.snap | 1 + .../Video/__snapshots__/View.test.jsx.snap | 1 + .../__snapshots__/Contents.test.jsx.snap | 64 +++++++++++++++++++ .../__snapshots__/ContentsItem.test.jsx.snap | 9 +++ .../ContentsToolbar.test.jsx.snap | 1 + .../__snapshots__/Controlpanels.test.jsx.snap | 6 ++ .../UsersControlpanel.test.jsx.snap | 2 + .../UsersControlpanelGroups.test.jsx.snap | 1 + .../UsersControlpanelUser.test.jsx.snap | 1 + .../Delete/__snapshots__/Delete.test.jsx.snap | 2 + .../Diff/__snapshots__/Diff.test.jsx.snap | 2 + .../Form/__snapshots__/Field.test.jsx.snap | 4 ++ .../__snapshots__/History.test.jsx.snap | 1 + .../__snapshots__/Sharing.test.jsx.snap | 6 ++ .../__snapshots__/ImageSidebar.test.jsx.snap | 2 + .../ObjectBrowserBody.test.jsx.snap | 2 + .../ReferenceWidget.test.jsx.snap | 1 + .../__snapshots__/SchemaWidget.test.jsx.snap | 4 ++ .../SchemaWidgetFieldset.test.jsx.snap | 2 + .../TextareaWidget.test.jsx.snap | 5 -- .../__snapshots__/WysiwygWidget.test.jsx.snap | 5 -- .../__snapshots__/Comments.test.jsx.snap | 5 -- .../__snapshots__/ContactForm.test.jsx.snap | 12 +--- .../__snapshots__/Pagination.test.jsx.snap | 4 ++ 25 files changed, 123 insertions(+), 25 deletions(-) diff --git a/src/components/manage/Actions/__snapshots__/Actions.test.jsx.snap b/src/components/manage/Actions/__snapshots__/Actions.test.jsx.snap index 3b86004e99..d02321aa2d 100644 --- a/src/components/manage/Actions/__snapshots__/Actions.test.jsx.snap +++ b/src/components/manage/Actions/__snapshots__/Actions.test.jsx.snap @@ -17,6 +17,7 @@ exports[`Actions renders an actions component 1`] = `