Merge pull request #185412 from gador/pgadmin-6.12

pkgs/tools/admin/pgadmin/default.nix

@@ -10,11 +10,11 @@
 
 let
   pname = "pgadmin";
-  version = "6.11";
+  version = "6.12";
 
   src = fetchurl {
     url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
-    sha256 = "sha256-1MvvQvVoWiV5hhgJUcAHbMyZzkADunLtwmszaO4EeCA=";
+    sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo=";
   };
 
   yarnDeps = mkYarnModules {
@@ -72,7 +72,7 @@ let
     azure-identity
   ];
 
-  # override necessary on pgadmin4 6.11
+  # override necessary on pgadmin4 6.12
   pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
     werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {
       version = "2.0.3";

pkgs/tools/admin/pgadmin/expose-setup.py.patch

@@ -1,9 +1,3 @@
-From 391433d020da52fba28ad08beb2cc85ffd852044 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
-Date: Wed, 23 Feb 2022 14:40:11 +0100
-Subject: [PATCH] Expose setup.py as pgadmin4-setup
-
----
  pkg/pip/setup_pip.py |  5 ++++-
  web/setup.py         | 14 ++++++++------
  2 files changed, 12 insertions(+), 7 deletions(-)
@@ -25,41 +19,42 @@ index 5592d1b04..131eaa1ed 100644
  
  )
 diff --git a/web/setup.py b/web/setup.py
-index 5f4257e86..df970f049 100644
+index 2204ffb..d5fda9f 100644
 --- a/web/setup.py
 +++ b/web/setup.py
-@@ -32,6 +32,10 @@ from pgadmin import create_app
- from pgadmin.utils import clear_database_servers, dump_database_servers,\
-     load_database_servers
- 
-+# Configuration settings
-+import config
-+from pgadmin.model import SCHEMA_VERSION
-+from pgadmin.setup import db_upgrade, create_app_data_directory
- 
- def dump_servers(args):
-     """Dump the server groups and servers.
-@@ -139,12 +143,7 @@ def clear_servers():
+@@ -14,7 +14,6 @@ import argparse
+ import os
+ import sys
+ import builtins
+-import config
+
+ # Grab the SERVER_MODE if it's been set by the runtime
+ if 'SERVER_MODE' in globals():
+@@ -91,6 +90,9 @@ def load_servers(args):
+ def setup_db(app):
+     """Setup the configuration database."""
+
++    # here we need an additional import, since the call to setup_db changed
++    # https://redmine.postgresql.org/projects/pgadmin4/repository/2/revisions/3a69d50458f57d19948b867aec55c55d635a36e5/diff/web/setup.py
++    import config
+     create_app_data_directory(config)
+
+     print("pgAdmin 4 - Application Initialisation")
+@@ -139,8 +141,9 @@ def clear_servers():
          clear_database_servers(load_user, True)
- 
- 
+
+
 -if __name__ == '__main__':
--    # Configuration settings
--    import config
--    from pgadmin.model import SCHEMA_VERSION
--    from pgadmin.setup import db_upgrade, create_app_data_directory
--
 +def main():
+     # Configuration settings
++    import config
      parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB')
- 
+
      exp_group = parser.add_argument_group('Dump server config')
-@@ -194,3 +193,6 @@ if __name__ == '__main__':
-             print(str(e))
+@@ -191,3 +194,6 @@ if __name__ == '__main__':
      else:
-         setup_db()
+         app = create_app()
+         setup_db(app)
 +
 +if __name__ == '__main__':
 +    main()
--- 
-2.35.1
-

pkgs/tools/admin/pgadmin/package.json

@@ -70,7 +70,7 @@
     "webpack": "^5.21.2",
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-cli": "^4.5.0",
-    "yarn-audit-html": "^3.0.1"
+    "yarn-audit-html": "^4.0.0"
   },
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.10.4",
@@ -111,12 +111,12 @@
     "closest": "^0.0.1",
     "codemirror": "^5.59.2",
     "context-menu": "^2.0.0",
+    "convert-units": "^2.3.4",
     "css-loader": "^5.0.1",
     "cssnano": "^5.0.2",
     "dagre": "^0.8.4",
     "date-fns": "^2.24.0",
     "diff-arrays-of-objects": "^1.1.8",
-    "dropzone": "^5.9.3",
     "html2canvas": "^1.0.0-rc.7",
     "immutability-helper": "^3.0.0",
     "imports-loader": "^2.0.0",
@@ -124,7 +124,7 @@
     "ip-address": "^7.1.0",
     "jquery": "^3.6.0",
     "jquery-contextmenu": "^2.9.2",
-    "jquery-ui": "^1.13.0",
+    "jquery-ui": "^1.13.2",
     "json-bignumber": "^1.0.1",
     "jsoneditor": "^9.5.4",
     "jsoneditor-react": "^3.1.1",
@@ -132,7 +132,7 @@
     "leaflet": "^1.5.1",
     "lodash": "4.*",
     "ml-matrix": "^6.5.0",
-    "moment": "^2.29.3",
+    "moment": "^2.29.4",
     "moment-timezone": "^0.5.34",
     "mousetrap": "^1.6.3",
     "notificar": "^1.0.1",
@@ -150,6 +150,7 @@
     "react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#8d9bc16ddd7c419acfbbd1c1cc2b70eb9f5b453c",
     "react-dom": "^17.0.1",
     "react-draggable": "^4.4.4",
+    "react-dropzone": "^14.2.1",
     "react-leaflet": "^3.2.2",
     "react-rnd": "^10.3.5",
     "react-router-dom": "^6.2.2",
@@ -165,7 +166,6 @@
     "socket.io-client": "^4.0.0",
     "split.js": "^1.5.10",
     "styled-components": "^5.2.1",
-    "tablesorter": "^2.31.2",
     "tempusdominus-bootstrap-4": "^5.1.2",
     "tempusdominus-core": "^5.19.3",
     "underscore": "^1.13.1",