Closes #813 - Upgrading React dependency of the configuration UI to t…

…he latest version (#814) Co-authored-by: Marius Oehler <[email protected]>
inspectIT · Jul 9, 2020 · 515b602 · 515b602
1 parent 3174f0c
commit 515b602
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/components/inspectit-ocelot-configurationserver-ui/package.json b/components/inspectit-ocelot-configurationserver-ui/package.json
@@ -37,9 +37,9 @@
     "primereact": "^4.2.1",
     "prop-types": "^15.7.2",
     "randexp": "^0.5.3",
-    "react": "^16.7.0",
+    "react": "^16.13.1",
     "react-diff-viewer": "^3.1.1",
-    "react-dom": "^16.7.0",
+    "react-dom": "^16.13.1",
     "react-redux": "^7.2.0",
     "react-timeago": "^4.4.0",
     "react-transition-group": "^4.2.1",

diff --git a/...spectit-ocelot-configurationserver-ui/src/components/views/mappings/dialogs/EditDialog.js b/...spectit-ocelot-configurationserver-ui/src/components/views/mappings/dialogs/EditDialog.js
@@ -16,7 +16,8 @@ const defaultState = {
   name: '',
   sources: [],
   attributes: [],
-  isNewMapping: null,
+  isNewMapping: true,
+  currentMapping: null,
 };
 
 /**
@@ -95,11 +96,16 @@ class EditMappingDialog extends React.Component {
    *
    * @param {*} nextProps
    */
-  componentWillReceiveProps(nextProps) {
-    if (!nextProps.mapping) {
-      this.setState({ isNewMapping: true });
-    } else {
-      this.setState(buildStateObject(nextProps.mapping));
+  componentDidUpdate() {
+    const { currentMapping } = this.state;
+    const { mapping } = this.props;
+
+    if (currentMapping !== mapping) {
+      if (!this.props.mapping) {
+        this.setState({ ...defaultState });
+      } else {
+        this.setState({ ...buildStateObject(this.props.mapping), currentMapping: mapping });
+      }
     }
   }
 

diff --git a/...ocelot-configurationserver-ui/src/components/views/mappings/editComponents/EditSources.js b/...ocelot-configurationserver-ui/src/components/views/mappings/editComponents/EditSources.js
@@ -45,7 +45,7 @@ class EditSources extends React.Component {
       </div>
     );
   }
-  componentWillMount = () => {
+  componentDidMount = () => {
     this.props.fetchFiles();
   };
 

diff --git a/components/inspectit-ocelot-configurationserver-ui/yarn.lock b/components/inspectit-ocelot-configurationserver-ui/yarn.lock
@@ -6154,15 +6154,15 @@ react-diff-viewer@^3.1.1:
     memoize-one "^5.0.4"
     prop-types "^15.6.2"
 
-react-dom@^16.7.0:
-  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.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
+  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
+    scheduler "^0.19.1"
 
 [email protected]:
   version "5.1.6"
@@ -6205,15 +6205,14 @@ react-transition-group@^4.2.1:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@^16.7.0:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
-  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
+react@^16.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
 
 read-pkg-up@^2.0.0:
   version "2.0.0"
@@ -6589,10 +6588,10 @@ sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.13.6:
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
-  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
+scheduler@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
+  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ class EditSources extends React.Component { @@
           </div>
         );
       }
-      componentWillMount = () => {
+      componentDidMount = () => {
         this.props.fetchFiles();
       };
@@ Expand Down @@