From ac65a6831236c3c67ec72443781ac33846e245cd Mon Sep 17 00:00:00 2001
From: nataliauvarova <n.uvarova@ispras.ru>
Date: Tue, 10 Oct 2023 14:39:23 +0000
Subject: [PATCH] #971: back react17 fix distance_map

---
 package-lock.json | 33 ++++++++++++++++++---------------
 package.json      |  4 ++--
 src/index.js      | 18 ++++++++++++++++--
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 49b53bc1..311ee0b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8478,11 +8478,12 @@
       }
     },
     "react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
+      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
       "requires": {
-        "loose-envify": "^1.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
     "react-autocomplete": {
@@ -8578,12 +8579,13 @@
       }
     },
     "react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
+      "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
       "requires": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "object-assign": "^4.1.1",
+        "scheduler": "^0.20.2"
       }
     },
     "react-fast-compare": {
@@ -8842,9 +8844,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.22.15",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
-          "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
+          "version": "7.23.1",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz",
+          "integrity": "sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==",
           "requires": {
             "regenerator-runtime": "^0.14.0"
           }
@@ -9323,11 +9325,12 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
+      "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
       "requires": {
-        "loose-envify": "^1.1.0"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
     "schema-utils": {
diff --git a/package.json b/package.json
index cbcfc4b6..633157cd 100644
--- a/package.json
+++ b/package.json
@@ -75,10 +75,10 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.2",
     "plotly.js": "^2.20.0",
-    "react": "^18.2.0",
+    "react": "^17.0.2",
     "react-autocomplete": "^1.8.1",
     "react-datepicker": "^4.7.0",
-    "react-dom": "^18.2.0",
+    "react-dom": "^17.0.2",
     "react-plotly.js": "^2.6.0",
     "react-redux": "^8.0.0",
     "react-router-dom": "^6.3.0",
diff --git a/src/index.js b/src/index.js
index 89762ace..624d8b8c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,8 @@
 import React from "react";
 import { Provider } from "react-redux";
 import { BrowserRouter } from "react-router-dom";
-import { createRoot } from 'react-dom/client';
+import ReactDOM from "react-dom";
+/*import { createRoot } from 'react-dom/client';*/
 import { ApolloProvider } from "@apollo/client";
 import { applyMiddleware, bindActionCreators, compose, createStore } from "redux";
 import createSagaMiddleware from "redux-saga";
@@ -42,6 +43,18 @@ window.logger = bindActionCreators(
 
 window.dispatch = store.dispatch;
 
+ReactDOM.render(
+  <Provider store={store}>
+    <ApolloProvider client={apollo}>
+      <BrowserRouter>
+        <Layout />
+      </BrowserRouter>
+    </ApolloProvider>
+  </Provider>,
+  document.getElementById("root")
+);
+
+/*
 const root = createRoot(document.getElementById("root"));
 
 root.render(<Provider store={store}>
@@ -50,4 +63,5 @@ root.render(<Provider store={store}>
       <Layout />
     </BrowserRouter>
   </ApolloProvider>
-</Provider>);
\ No newline at end of file
+</Provider>);
+*/
\ No newline at end of file