Merge pull request #166250 from gador/pgadmin-update-6.7

pgadimin4: 6.5 -> 6.7

nixos/tests/pgadmin4.nix

@@ -46,6 +46,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
       qrcode
       pillow
       pyotp
+      boto3
     ]);
   in
   {

pkgs/tools/admin/pgadmin/default.nix

@@ -11,11 +11,11 @@
 let
 
   pname = "pgadmin";
-  version = "6.5";
+  version = "6.7";
 
   src = fetchurl {
     url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
-    sha256 = "0df1r7c7vgrkc6qq6ljxsak9ish477508hdxgqqpqiy816inyaa0";
+    sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d";
   };
 
   yarnDeps = mkYarnModules {
@@ -50,9 +50,11 @@ python3.pkgs.buildPythonApplication rec {
     # relax dependencies
     substituteInPlace requirements.txt \
       --replace "Pillow==8.3.*" "Pillow>=8.3.0" \
-      --replace "psycopg2==2.8.*" "psycopg2>=2.8.0" \
+      --replace "psycopg2==2.9.*" "psycopg2>=2.9" \
       --replace "cryptography==3.*" "cryptography>=3.0" \
-      --replace "requests==2.25.*" "requests>=2.25.0"
+      --replace "requests==2.25.*" "requests>=2.25.0" \
+      --replace "boto3==1.20.*" "boto3>=1.20" \
+      --replace "botocore==1.23.*" "botocore>=1.23"
     # don't use Server Mode (can be overridden later)
     substituteInPlace pkg/pip/setup_pip.py \
       --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \
@@ -148,6 +150,8 @@ python3.pkgs.buildPythonApplication rec {
     qrcode
     pillow
     pyotp
+    botocore
+    boto3
   ];
 
   passthru = {

pkgs/tools/admin/pgadmin/package.json

@@ -11,6 +11,7 @@
     "@babel/eslint-parser": "^7.12.13",
     "@babel/eslint-plugin": "^7.12.13",
     "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
+    "@babel/plugin-syntax-jsx": "^7.16.0",
     "@babel/preset-env": "^7.10.2",
     "@babel/preset-typescript": "^7.8.3",
     "@emotion/core": "^10.0.14",
@@ -18,6 +19,7 @@
     "@emotion/react": "^11.1.5",
     "@emotion/styled": "^10.0.14",
     "@emotion/utils": "^1.0.0",
+    "@svgr/webpack": "^5.5.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
     "autoprefixer": "^10.2.4",
     "axios-mock-adapter": "^1.17.0",
@@ -40,9 +42,10 @@
     "imagemin-pngquant": "^9.0.1",
     "imagemin-svgo": "^8.0.0",
     "is-docker": "^2.1.1",
+    "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.6.0",
     "jasmine-enzyme": "^7.1.2",
-    "karma": "^6.3.2",
+    "karma": "^6.3.15",
     "karma-babel-preprocessor": "^8.0.0",
     "karma-browserify": "^8.0.0",
     "karma-chrome-launcher": "^3.1.0",
@@ -63,7 +66,7 @@
     "sass-resources-loader": "^2.2.1",
     "style-loader": "^2.0.0",
     "stylis": "^4.0.7",
-    "svgo": "^1.1.1",
+    "svgo": "^2.7.0",
     "svgo-loader": "^2.2.0",
     "terser-webpack-plugin": "^5.1.1",
     "typescript": "^3.2.2",
@@ -86,11 +89,13 @@
     "@material-ui/pickers": "^3.2.10",
     "@projectstorm/react-diagrams": "^6.6.1",
     "@simonwep/pickr": "^1.5.1",
+    "@szhsin/react-menu": "^2.2.0",
     "@tippyjs/react": "^4.2.0",
     "@types/classnames": "^2.2.6",
     "@types/react": "^16.7.18",
     "@types/react-dom": "^16.0.11",
     "acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7",
+    "ajv": "^8.8.2",
     "alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263",
     "aspen-decorations": "^1.0.2",
     "axios": "^0.21.1",
@@ -103,12 +108,14 @@
     "bootstrap": "^4.3.1",
     "bootstrap-datepicker": "^1.8.0",
     "bootstrap4-toggle": "^3.6.1",
+    "brace": "^0.11.1",
     "browserfs": "^1.4.3",
     "chart.js": "^2.9.3",
     "classnames": "^2.2.6",
     "closest": "^0.0.1",
     "codemirror": "^5.59.2",
     "context-menu": "^2.0.0",
+    "copy-to-clipboard": "^3.3.1",
     "css-loader": "^5.0.1",
     "cssnano": "^5.0.2",
     "dagre": "^0.8.4",
@@ -120,12 +127,12 @@
     "imports-loader": "^2.0.0",
     "insert-if": "^1.1.0",
     "ip-address": "^7.1.0",
-    "istanbul-instrumenter-loader": "^3.0.1",
     "jquery": "^3.6.0",
     "jquery-contextmenu": "^2.9.2",
     "jquery-ui": "^1.13.0",
     "json-bignumber": "^1.0.1",
     "jsoneditor": "^9.5.4",
+    "jsoneditor-react": "^3.1.1",
     "karma-coverage": "^2.0.3",
     "leaflet": "^1.5.1",
     "lodash": "4.*",
@@ -141,6 +148,7 @@
     "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422",
     "postcss": "^8.2.15",
     "raf": "^3.4.1",
+    "rc-dock": "^3.2.9",
     "react": "^17.0.1",
     "react-aspen": "^1.1.0",
     "react-checkbox-tree": "^1.7.2",
@@ -148,6 +156,7 @@
     "react-draggable": "^4.4.4",
     "react-select": "^4.2.1",
     "react-table": "^7.6.3",
+    "react-timer-hook": "^3.0.5",
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.5",
     "select2": "^4.0.13",
@@ -177,7 +186,7 @@
     "bundle:watch": "yarn run linter && yarn run webpacker:watch",
     "bundle:dev": "yarn run linter && yarn run webpacker",
     "bundle:analyze": "cross-env NODE_ENV=production ANALYZE=true yarn run bundle:dev",
-    "bundle": "cross-env NODE_ENV=production yarn run bundle:dev",
+    "bundle": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 yarn run bundle:dev",
     "test:karma-once": "yarn run linter && yarn run karma start --single-run",
     "test:karma": "yarn run linter && yarn run karma start",
     "test:karma-coverage": "yarn run test:karma-once --reporters coverage,progress",