-
-
<%= react_component("Projects", {
- editIcon: image_url('edit_image_button.svg'),
- deleteIcon: image_url('delete_image_button.svg'),
isAdminUser: current_user.has_owner_or_admin_role?(current_user.current_workspace)
}) %>
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index e3e9a6a6be..94d49fe9e9 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -8,6 +8,8 @@ environment.config.merge({
const aliasConfig = require("./alias");
environment.config.merge(aliasConfig);
+
+
const webpack = require('webpack')
environment.plugins.prepend('Provide',
new webpack.ProvidePlugin({
@@ -16,4 +18,11 @@ environment.plugins.prepend('Provide',
})
);
-module.exports = environment;
+module.exports = environment
+
+const nodeModulesLoader = environment.loaders.get('nodeModules')
+
+if (!Array.isArray(nodeModulesLoader.exclude)) {
+ nodeModulesLoader.exclude = (nodeModulesLoader.exclude == null) ? [] : [nodeModulesLoader.exclude]
+}
+nodeModulesLoader.exclude.push(/react-table/)
diff --git a/package.json b/package.json
index 698ec84454..27ed4c0880 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,9 @@
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
- "react-router-dom": "^6.1.1",
+ "react-router-dom": "^6.2.2",
"react-select": "^5.2.2",
+ "react-table": "^7.7.0",
"react-toastify": "^8.1.0",
"react-tooltip": "^4.2.21",
"react-transition-group": "1.x",
diff --git a/yarn.lock b/yarn.lock
index e2777f004e..a7c8d3f372 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4666,10 +4666,10 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
-history@^5.1.0:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/history/-/history-5.1.0.tgz#2e93c09c064194d38d52ed62afd0afc9d9b01ece"
- integrity sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==
+history@^5.2.0:
+ version "5.3.0"
+ resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
+ integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==
dependencies:
"@babel/runtime" "^7.7.6"
@@ -7617,20 +7617,20 @@ react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-react-router-dom@^6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.1.1.tgz#ed59376ff9115bc49227e87982a32e91e9530ca3"
- integrity sha512-O3UH89DI4o+swd2q6lF4dSmpuNCxwkUXcj0zAFcVc1H+YoPE6T7uwoFMX0ws1pUvCY8lYDucFpOqCCdal6VFzg==
+react-router-dom@^6.2.2:
+ version "6.2.2"
+ resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.2.2.tgz#f1a2c88365593c76b9612ae80154a13fcb72e442"
+ integrity sha512-AtYEsAST7bDD4dLSQHDnk/qxWLJdad5t1HFa1qJyUrCeGgEuCSw0VB/27ARbF9Fi/W5598ujvJOm3ujUCVzuYQ==
dependencies:
- history "^5.1.0"
- react-router "6.1.1"
+ history "^5.2.0"
+ react-router "6.2.2"
-react-router@6.1.1:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.1.1.tgz#16f41bf54e87d995bcd4d447720a693f77d8fcb9"
- integrity sha512-55o96RiDZmC0uD17DPqVmzzfdNd2Dc+EjkYvMAmHl43du/GItaTdFr5WwjTryNWPXZ+OOVQxQhwAX25UwxpHtw==
+react-router@6.2.2:
+ version "6.2.2"
+ resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.2.2.tgz#495e683a0c04461eeb3d705fe445d6cf42f0c249"
+ integrity sha512-/MbxyLzd7Q7amp4gDOGaYvXwhEojkJD5BtExkuKmj39VEE0m3l/zipf6h2WIB2jyAO0lI6NGETh4RDcktRm4AQ==
dependencies:
- history "^5.1.0"
+ history "^5.2.0"
react-select@^5.2.2:
version "5.2.2"
@@ -7645,6 +7645,11 @@ react-select@^5.2.2:
prop-types "^15.6.0"
react-transition-group "^4.3.0"
+react-table@^7.7.0:
+ version "7.7.0"
+ resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.7.0.tgz#e2ce14d7fe3a559f7444e9ecfe8231ea8373f912"
+ integrity sha512-jBlj70iBwOTvvImsU9t01LjFjy4sXEtclBovl3mTiqjz23Reu0DKnRza4zlLtOPACx6j2/7MrQIthIK1Wi+LIA==
+
react-toastify@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-8.1.0.tgz#acaca4e8c4415c8474562dd84a14e6f390ed7f17"