Merge pull request #192615 from gador/pgadmin-6.14

nixos/tests/pgadmin4.nix

@@ -107,14 +107,12 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
       )
 
       # Don't bother to test LDAP or kerberos authentification
-      # For now deactivate change_password API test. Current bug report at https://redmine.postgresql.org/issues/7648
-      # Password change works from the UI, if email SMTP is configured.
       with subtest("run browser test"):
           machine.succeed(
                'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
                && python regression/runtests.py \
                --pkg browser \
-               --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking,browser.tests.test_change_password'
+               --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking'
           )
 
       # fontconfig is necessary for chromium to run

pkgs/tools/admin/pgadmin/default.nix

@@ -10,11 +10,11 @@
 
 let
   pname = "pgadmin";
-  version = "6.13";
+  version = "6.14";
 
   src = fetchurl {
     url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
-    sha256 = "sha256-vLItmE76R1IzgMYEGEvIeOmbfQQac5WK12AkkZknTFU=";
+    sha256 = "sha256-M3Tu+69Gmc0FfqtGTtJ6j014QARd2efJ4dq0vK2IMr8=";
   };
 
   yarnDeps = mkYarnModules {
@@ -75,7 +75,7 @@ let
   # keep the scope, as it is used throughout the derivation and tests
   # this also makes potential future overrides easier
   pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
-    # flask 2.2 is incompatible with pgadmin 6.13
+    # flask 2.2 is incompatible with pgadmin 6.14
     # https://redmine.postgresql.org/issues/7651
     flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
       version = "2.1.3";
@@ -84,6 +84,18 @@ let
         sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
       };
     });
+    # pgadmin 6.14 is incompatible with the major flask-security-too update to 5.0.x
+    flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
+      version = "4.1.5";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
+      };
+      propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
+        final.pythonPackages.flask_mail
+        final.pythonPackages.pyqrcode
+      ];
+    });
   });
 
 in

pkgs/tools/admin/pgadmin/package.json

@@ -37,6 +37,9 @@
     "exports-loader": "^2.0.0",
     "html-react-parser": "^1.2.7",
     "image-minimizer-webpack-plugin": "^2.2.0",
+    "imagemin-mozjpeg": "^10.0.0",
+    "imagemin-optipng": "^8.0.0",
+    "imagemin-pngquant": "^9.0.2",
     "is-docker": "^2.1.1",
     "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.6.0",
@@ -85,20 +88,15 @@
     "@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",
     "ajv": "^8.8.2",
-    "alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263",
     "anti-trojan-source": "^1.4.0",
     "aspen-decorations": "^1.0.2",
     "axios": "^0.21.1",
     "babelify": "~10.0.0",
     "backbone": "1.4.0",
-    "backform": "^0.2.0",
-    "backgrid-filter": "^0.3.7",
-    "backgrid-select-all": "^0.3.5",
     "bignumber.js": "^9.0.1",
     "bootstrap": "^4.3.1",
     "bootstrap-datepicker": "^1.8.0",
@@ -147,7 +145,7 @@
     "react": "^17.0.1",
     "react-aspen": "^1.1.0",
     "react-checkbox-tree": "^1.7.2",
-    "react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#8d9bc16ddd7c419acfbbd1c1cc2b70eb9f5b453c",
+    "react-data-grid": "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8",
     "react-dom": "^17.0.1",
     "react-draggable": "^4.4.4",
     "react-dropzone": "^14.2.1",
@@ -161,7 +159,6 @@
     "react-window": "^1.8.5",
     "select2": "^4.0.13",
     "shim-loader": "^1.0.1",
-    "slickgrid": "git+https://github.com/6pac/SlickGrid.git#2.3.16",
     "snapsvg-cjs": "^0.0.6",
     "socket.io-client": "^4.0.0",
     "split.js": "^1.5.10",