Fixed an issue where query tool is crashing on macOS 15.4 due to a locale issue. #8623

2) Resolved an issue where an empty PSQL panel would open if the psql utility was not found in the binary path.

.dockerignore

@@ -1,4 +1,3 @@
-.git
 web/node_modules
 web/*.log
 web/regression

.github/dependabot.yml

@@ -3,53 +3,53 @@ updates:
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     labels:
       - "Dependencies"
     commit-message:
       prefix: "Docker dependency"
-      
+
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     labels:
       - "Dependencies"
     commit-message:
       prefix: "Python dependency"
-      
+
   - package-ecosystem: "pip"
     directory: "/tools"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     labels:
       - "Dependencies"
     commit-message:
-      prefix: "Python dependency"  
-      
+      prefix: "Python dependency"
+
   - package-ecosystem: "pip"
     directory: "/web/regression"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     labels:
       - "Dependencies"
     commit-message:
-      prefix: "Python dependency"  
-      
+      prefix: "Python dependency"
+
   - package-ecosystem: "npm"
     directory: "/runtime"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     labels:
       - "Dependencies"
     commit-message:
-      prefix: "Python dependency"  
-      
+      prefix: "Javascript dependency"
+
   - package-ecosystem: "npm"
     directory: "/web"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     labels:
       - "Dependencies"
     commit-message:
-      prefix: "Python dependency"  
+      prefix: "Javascript dependency"

.github/workflows/check-container-build.yml

@@ -13,11 +13,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  build-container:
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
 
       - name: Build the container
-        run: docker build .
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          context: .

.github/workflows/check-doc-builds.yml

@@ -13,11 +13,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  build-docs:
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install platform dependencies
         run: |
@@ -33,7 +33,7 @@ jobs:
           make docs
 
       - name: Archive HTML
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pgadmin4-html-build-output
           path: docs/en_US/_build/html/*
@@ -44,7 +44,7 @@ jobs:
           make docs-epub
 
       - name: Archive ePub
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pgadmin4-epub-build-output
           path: docs/en_US/_build/epub/pgAdmin4.epub
@@ -55,7 +55,7 @@ jobs:
           make docs-pdf
 
       - name: Archive PDF
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pgadmin4-pdf-build-output
           path: docs/en_US/_build/latex/pgadmin4.pdf

.github/workflows/check-javascript-style.yml

@@ -13,11 +13,16 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  check-javascript-style:
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
 
       - name: Install Node modules
         run: |

.github/workflows/check-python-build.yml

@@ -13,11 +13,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  build-python-package:
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install platform dependencies
         run: |
@@ -33,7 +33,7 @@ jobs:
           make pip
 
       - name: Archive Python wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pgadmin4-python-build-output
           path: dist/*

.github/workflows/check-python-style.yml

@@ -13,11 +13,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  check-python-style:
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Python dependencies
         run: |

.github/workflows/check-tarball-build.yml

@@ -13,11 +13,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  build-tarball:
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install platform dependencies
         run: |
@@ -33,7 +33,7 @@ jobs:
           make src
 
       - name: Archive source tarball
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pgadmin4-tarball-build-output
           path: dist/*

.github/workflows/check-translations.yml

@@ -13,11 +13,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  check-translations:
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install platform dependencies
         run: |

.github/workflows/run-feature-tests-epas.yml

@@ -0,0 +1,183 @@
+name: Run feature tests on EPAS
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  run-feature-tests-epas:
+    # Only run if the tests are enabled
+    # TODO: Figure out a way to test for the presence of the secrets instead
+    if: vars.ENABLE_EPAS_TESTS == 'true'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        pgver: [13, 14, 15, 16, 17]
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup the EDB APT repo on Linux
+        run: |
+          curl -1sLf 'https://downloads.enterprisedb.com/${{ secrets.CLOUDSMITH_TOKEN }}/enterprise/setup.deb.sh' | sudo -E bash
+
+      - name: Install platform dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger
+
+      - name: Install pgagent on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: |
+          sudo apt install -y edb-as${{ matrix.pgver }}-pgagent
+
+      - name: Create the tablespace directory
+        run: |
+          sudo mkdir -p /var/lib/edb-as/tablespaces/${{ matrix.pgver }}
+          sudo chown enterprisedb:enterprisedb /var/lib/edb-as/tablespaces/${{ matrix.pgver }}
+
+      - name: Start EDB PostgreSQL
+        run: |
+          # Note: we use a custom port for PostgreSQL as the runner may already have a version of PostgreSQL installed
+          sudo su -c "echo local all all trust > /etc/edb-as/${{ matrix.pgver }}/main/pg_hba.conf"
+          sudo sed -i "s/port = 544[0-9]/port = 58${{ matrix.pgver }}/g" /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf
+          sudo sed -i "s/shared_preload_libraries = '/shared_preload_libraries = '\$libdir\/plugin_debugger,/g" /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf
+          sudo su - enterprisedb -c "mkdir -p /var/run/edb-as/${{ matrix.pgver }}-main.epas_stat_tmp"
+          sudo systemctl restart edb-as@${{ matrix.pgver }}-main
+
+          until sudo runuser -l enterprisedb -c "/usr/lib/edb-as/${{ matrix.pgver }}/bin/pg_isready -p 58${{ matrix.pgver }}" 2>/dev/null; do
+            >&2 echo "EPAS is unavailable - sleeping for 2 seconds"
+            sleep 2
+          done
+
+      - name: Create pgagent extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+
+      - name: Install Python dependencies
+        run: make install-python-testing
+
+      - name: Create the test configuration
+        run: |
+          cat <<EOF > web/config_local.py
+          from config import *
+
+          # Debug mode
+          DEBUG = True
+
+          # App mode
+          SERVER_MODE = False
+
+          # Log
+          CONSOLE_LOG_LEVEL = DEBUG
+          FILE_LOG_LEVEL = DEBUG
+
+          DEFAULT_SERVER = '127.0.0.1'
+
+          UPGRADE_CHECK_ENABLED = False
+
+          LOG_FILE = "$(pwd)/var/pgadmin4.log"
+          SESSION_DB_PATH = "$(pwd)/var/sessions"
+          STORAGE_DIR = "$(pwd)/var/storage"
+          SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          TEST_SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          AZURE_CREDENTIAL_CACHE_DIR = "$(pwd)/var/azurecredentialcache"
+          EOF
+
+          cat <<EOF > web/regression/test_config.json
+          {
+            "headless_chrome": false,
+            "default_browser": "Chrome",
+            "pgAdmin4_login_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_user_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER2@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_non_admin_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "server_group": 1,
+            "server_credentials": [
+              {
+                "name": "EPAS ${{ matrix.pgver }}",
+                "comment": "EPAS ${{ matrix.pgver }} Server",
+                "db_username": "enterprisedb",
+                "host": "/var/run/edb-as",
+                "db_password": "",
+                "db_port": 58${{ matrix.pgver }},
+                "maintenance_db": "postgres",
+                "sslmode": "prefer",
+                "tablespace_path": "/var/lib/edb-as/tablespaces/${{ matrix.pgver }}",
+                "enabled": true,
+                "default_binary_paths": {
+                  "pg": "",
+                  "ppas": "/usr/lib/edb-as/${{ matrix.pgver }}/bin"
+                }
+              }
+            ],
+            "server_update_data": [
+              {
+                "comment": "This is test update comment"
+              }
+            ]
+          }
+          EOF
+
+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
+      - name: Build the JS bundle
+        run: |
+          cd web
+          yarn install
+          yarn run bundle
+
+      - name: Run the tests
+        run: |
+          . venv/bin/activate
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          export DISPLAY=:99
+          cd web
+          python regression/runtests.py --pkg feature_tests
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: server-log-pg${{ matrix.pgver }}
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-log-pg${{ matrix.pgver }}
+          path: web/regression/regression.log
+
+      - name: Archive screenshots
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshots-pg${{ matrix.pgver }}
+          path: web/regression/screenshots
+          if-no-files-found: ignore

.github/workflows/run-feature-tests-pg.yml

@@ -0,0 +1,193 @@
+name: Run feature tests on PostgreSQL
+
+# Note: we use a custom port for PostgreSQL as the runners may already have
+#       a version installed.
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  run-feature-tests-pg:
+    strategy:
+      fail-fast: false
+      matrix:
+        pgver: [13, 14, 15, 16, 17]
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup the PGDG APT repo
+        run: |
+          sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+
+      - name: Uninstall PostgreSQL if already present
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
+      - name: Install platform dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent
+
+      - name: Create the tablespace directory
+        run: |
+          sudo mkdir -p /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
+          sudo chown postgres:postgres /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
+
+      - name: Re-create stats directory, just in case
+        run: |
+          sudo rm -rf /var/run/postgresql/${{ matrix.pgver }}-main.pg_stat_tmp/
+          sudo mkdir -p /var/run/postgresql/${{ matrix.pgver }}-main.pg_stat_tmp/
+          sudo chown postgres:postgres /var/run/postgresql/${{ matrix.pgver }}-main.pg_stat_tmp/
+
+      - name: Start PostgreSQL
+        run: |
+          sudo su -c "echo local all all trust > /etc/postgresql/${{ matrix.pgver }}/main/pg_hba.conf"
+          sudo sed -i "s/port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
+          sudo sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = '\$libdir\/plugin_debugger'/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
+          sudo su - postgres -c "/usr/lib/postgresql/${{ matrix.pgver }}/bin/postgres -D /var/lib/postgresql/${{ matrix.pgver }}/main -c config_file=/etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf &"
+
+          until sudo runuser -l postgres -c "pg_isready -p 59${{ matrix.pgver }}" 2>/dev/null; do
+            >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
+            sleep 2
+          done
+
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'
+
+      - name: Install Python dependencies
+        run: make install-python-testing
+
+      - name: Create the test configuration
+        run: |
+          cat <<EOF > web/config_local.py
+          from config import *
+
+          # Debug mode
+          DEBUG = True
+
+          # App mode
+          SERVER_MODE = False
+
+          # Log
+          CONSOLE_LOG_LEVEL = DEBUG
+          FILE_LOG_LEVEL = DEBUG
+
+          DEFAULT_SERVER = '127.0.0.1'
+
+          UPGRADE_CHECK_ENABLED = False
+
+          LOG_FILE = "$(pwd)/var/pgadmin4.log"
+          SESSION_DB_PATH = "$(pwd)/var/sessions"
+          STORAGE_DIR = "$(pwd)/var/storage"
+          SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          TEST_SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          AZURE_CREDENTIAL_CACHE_DIR = "$(pwd)/var/azurecredentialcache"
+          EOF
+
+          cat <<EOF > web/regression/test_config.json
+          {
+            "headless_chrome": false,
+            "default_browser": "Chrome",
+            "pgAdmin4_login_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_user_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER2@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_non_admin_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "server_group": 1,
+            "server_credentials": [
+              {
+                "name": "PostgreSQL ${{ matrix.pgver }}",
+                "comment": "PostgreSQL ${{ matrix.pgver }} Server",
+                "db_username": "postgres",
+                "host": "/var/run/postgresql",
+                "db_password": "postgres",
+                "db_port": 59${{ matrix.pgver }},
+                "maintenance_db": "postgres",
+                "sslmode": "prefer",
+                "tablespace_path": "/var/lib/postgresql/tablespaces/${{ matrix.pgver }}",
+                "enabled": true,
+                "default_binary_paths": {
+                  "pg": "/usr/lib/postgresql/${{ matrix.pgver }}/bin",
+                  "ppas": ""
+                }
+              }
+            ],
+            "server_update_data": [
+              {
+                "comment": "This is test update comment"
+              }
+            ]
+          }
+          EOF
+
+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
+      - name: Build the JS bundle
+        run: |
+          cd web
+          yarn install
+          yarn run bundle
+
+      - name: Run the tests
+        run: |
+          . venv/bin/activate
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          export DISPLAY=:99
+          cd web
+          python regression/runtests.py --pkg feature_tests
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: server-log-pg${{ matrix.pgver }}
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-log-pg${{ matrix.pgver }}
+          path: web/regression/regression.log
+
+      - name: Archive screenshots
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshots-pg${{ matrix.pgver }}
+          path: web/regression/screenshots
+          if-no-files-found: ignore

.github/workflows/run-javascript-tests.yml

@@ -13,20 +13,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  run-javascript-tests:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-22.04, windows-latest]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
-      
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
+      - uses: actions/checkout@v4
+
       - name: Upgrade yarn
         run: |
           yarn set version berry
+          yarn set version 3
 
       - name: Install Node modules
         run: |
@@ -36,4 +41,4 @@ jobs:
       - name: Run the tests
         run: |
           cd web
-          yarn run test:karma-once
+          yarn run test:js-once

.github/workflows/run-python-tests-epas.yml

@@ -23,7 +23,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  run-python-tests-epas:
     # Only run if the tests are enabled
     # TODO: Figure out a way to test for the presence of the secrets instead
     if: vars.ENABLE_EPAS_TESTS == 'true'
@@ -32,25 +32,28 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, windows-latest]
-        pgver: [11, 12, 13, 14, 15]
+        pgver: [13, 14, 15, 16, 17]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup the EDB APT repo on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
-          sudo su -c 'echo "deb [arch=amd64] https://apt.enterprisedb.com/$(lsb_release -cs)-edb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/edb-$(lsb_release -cs).list'
-          sudo su -c 'echo "machine apt.enterprisedb.com login ${{ secrets.EDB_REPO_USERNAME }} password ${{ secrets.EDB_REPO_PASSWORD }}" > /etc/apt/auth.conf.d/edb.conf'
-          sudo wget -q -O - https://apt.enterprisedb.com/edb-deb.gpg.key | sudo apt-key add -
+          curl -1sLf 'https://downloads.enterprisedb.com/${{ secrets.CLOUDSMITH_TOKEN }}/enterprise/setup.deb.sh' | sudo -E bash
 
       - name: Install platform dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger
+
+      - name: Install pgagent on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: |
+          sudo apt install -y edb-as${{ matrix.pgver }}-pgagent
 
       - name: Install platform dependencies on Windows
         if: ${{ matrix.os == 'windows-latest' }}
@@ -78,6 +81,12 @@ jobs:
           icacls "C:\EPAS\${{ matrix.pgver }}\tablespaces" /grant "NETWORK SERVICE":(OI)(CI)F /T
         shell: cmd
 
+      - name: Add edb_job_scheduler into config file.
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver >= 16 }}
+        run: |
+          sudo sed -i "s/shared_preload_libraries = '/shared_preload_libraries = '\$libdir\/edb_job_scheduler,/g" /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf
+          sudo su -c "echo \"edb_job_scheduler.database_list = 'test_dbms_job_scheduler'\" >> /etc/edb-as/${{ matrix.pgver }}/main/postgresql.conf"
+
       - name: Start PostgreSQL on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
@@ -92,8 +101,10 @@ jobs:
             >&2 echo "EPAS is unavailable - sleeping for 2 seconds"
             sleep 2
           done
-          
-          psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+
+      - name: Create pgagent extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
 
       - name: Install Python dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
@@ -272,14 +283,14 @@ jobs:
 
       - name: Archive server log
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: server-log-epas${{ matrix.pgver }}
+          name: server-log-epas-${{ matrix.os }}-pg${{ matrix.pgver }}
           path: var/pgadmin4.log
 
       - name: Archive regression log
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: regression-log-epas${{ matrix.pgver }}
+          name: regression-log-epas-${{ matrix.os }}-pg${{ matrix.pgver }}
           path: web/regression/regression.log

.github/workflows/run-python-tests-pg.yml

@@ -16,26 +16,39 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  run-python-tests-pg:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-        pgver: [11, 12, 13, 14, 15]
+        os: [macos-latest, ubuntu-22.04, windows-latest]
+        pgver: [13, 14, 15, 16, 17]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup the PGDG APT repo on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
           wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 
+      - name: Uninstall PostgreSQL if already present on linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
       - name: Install platform dependencies on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
           sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent
@@ -44,8 +57,9 @@ jobs:
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
           brew install postgresql@${{ matrix.pgver }}
+          echo "/opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin" >> $GITHUB_PATH
 
-      - name: Uninstall PostgreSQL if already present
+      - name: Uninstall PostgreSQL if already present on windows
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           if exist "C:\Program Files\PostgreSQL\{{ matrix.pgver }}\uninstall-postgresql.exe" (
@@ -57,15 +71,17 @@ jobs:
       - name: Install platform dependencies on Windows
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
-          choco install -y postgresql${{ matrix.pgver }} --params "/Password:postgres /Port:59${{ matrix.pgver }}" --ia "--prefix C:\PostgreSQL\${{ matrix.pgver }} --datadir C:\PostgreSQL\${{ matrix.pgver }}\data --install_runtimes 0 --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
+          FOR /f "delims=" %%F IN ('python tools\get_sb_package.py "https://www.postgresql.org/applications-v2.xml" "postgresql_${{ matrix.pgver }}" "windows-x64"') DO SET INSTALLER_EXE=%%F
+          ECHO Running %INSTALLER_EXE%...
+          %INSTALLER_EXE% --prefix C:\PostgreSQL\${{ matrix.pgver }} --datadir C:\PostgreSQL\${{ matrix.pgver }}\data --serverport 59${{ matrix.pgver }} --superpassword postgres --install_runtimes 0 --mode unattended --unattendedmodeui none --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
           choco install -y mitkerberos
-          
+
           REM Ignore error 3010 (reboot required)
           IF %ERRORLEVEL% EQU 3010 cmd /c "exit /b 0"
         shell: cmd
 
       - name: Create the tablespace directory on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo mkdir -p /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
           sudo chown postgres:postgres /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
@@ -73,7 +89,7 @@ jobs:
       - name: Create the tablespace directory on macOS
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
-          mkdir -p /usr/local/var/tablespaces/${{ matrix.pgver }}
+          mkdir -p /opt/homebrew/var/tablespaces/${{ matrix.pgver }}
 
       - name: Create the tablespace directory on Windows
         if: ${{ matrix.os == 'windows-latest' }}
@@ -83,37 +99,37 @@ jobs:
         shell: cmd
 
       - name: Start PostgreSQL on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo su -c "echo local all all trust > /etc/postgresql/${{ matrix.pgver }}/main/pg_hba.conf"
           sudo sed -i "s/port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
           sudo sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = '\$libdir\/plugin_debugger'/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
           sudo su - postgres -c "/usr/lib/postgresql/${{ matrix.pgver }}/bin/postgres -D /var/lib/postgresql/${{ matrix.pgver }}/main -c config_file=/etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf &"
-          
+
           until sudo runuser -l postgres -c "pg_isready -p 59${{ matrix.pgver }}" 2>/dev/null; do
             >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
             sleep 2
           done
-          
+
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'
 
       - name: Start PostgreSQL on macOS
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
-          echo local all all trust > /usr/local/var/postgresql@${{ matrix.pgver }}/pg_hba.conf
-          sed -i '' "s/#port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /usr/local/var/postgresql@${{ matrix.pgver }}/postgresql.conf
+          echo local all all trust > /opt/homebrew/var/postgresql@${{ matrix.pgver }}/pg_hba.conf
+          sed -i '' "s/#port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /opt/homebrew/var/postgresql@${{ matrix.pgver }}/postgresql.conf
           brew services restart postgresql@${{ matrix.pgver }}
-          
-          until /usr/local/opt/postgresql@${{ matrix.pgver }}/bin/pg_isready -p 59${{ matrix.pgver }} 2>/dev/null; do
+
+          until /opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin/pg_isready -p 59${{ matrix.pgver }} 2>/dev/null; do
             >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
             sleep 2
           done
-          
+
           psql postgres -p 59${{ matrix.pgver }} -c 'CREATE ROLE postgres SUPERUSER LOGIN;'
 
       - name: Install Python dependencies on Linux and macOS
-        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }}
         run: make install-python-testing
 
       - name: Install Python dependencies on Windows
@@ -128,25 +144,25 @@ jobs:
         shell: cmd
 
       - name: Create the test configuration on Linux and macOS
-        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }}
         run: |
           cat <<EOF > web/config_local.py
           from config import *
-          
+
           # Debug mode
           DEBUG = True
-          
+
           # App mode
           SERVER_MODE = False
-          
+
           # Log
           CONSOLE_LOG_LEVEL = DEBUG
           FILE_LOG_LEVEL = DEBUG
-          
+
           DEFAULT_SERVER = '127.0.0.1'
-          
+
           UPGRADE_CHECK_ENABLED = False
-          
+
           LOG_FILE = "$(pwd)/var/pgadmin4.log"
           SESSION_DB_PATH = "$(pwd)/var/sessions"
           STORAGE_DIR = "$(pwd)/var/storage"
@@ -154,7 +170,7 @@ jobs:
           TEST_SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
           AZURE_CREDENTIAL_CACHE_DIR = "$(pwd)/var/azurecredentialcache"
           EOF
-          
+
           cat <<EOF > web/regression/test_config.json
           {
             "pgAdmin4_login_credentials": {
@@ -178,15 +194,15 @@ jobs:
                 "name": "PostgreSQL ${{ matrix.pgver }}",
                 "comment": "PostgreSQL ${{ matrix.pgver }} Server",
                 "db_username": "postgres",
-                "host": "${{ matrix.os == 'macos-latest' && '/tmp' || matrix.os == 'ubuntu-latest' && '/var/run/postgresql' || '127.0.0.1' }}",
+                "host": "${{ matrix.os == 'macos-latest' && '/tmp' || matrix.os == 'ubuntu-22.04' && '/var/run/postgresql' || '127.0.0.1' }}",
                 "db_password": "postgres",
                 "db_port": 59${{ matrix.pgver }},
                 "maintenance_db": "postgres",
                 "sslmode": "prefer",
-                "tablespace_path": "${{ matrix.os == 'macos-latest' && format('/usr/local/var/tablespaces/{0}', matrix.pgver) || format('/var/lib/postgresql/tablespaces/{0}', matrix.pgver) }}",
+                "tablespace_path": "${{ matrix.os == 'macos-latest' && format('/opt/homebrew/var/tablespaces/{0}', matrix.pgver) || format('/var/lib/postgresql/tablespaces/{0}', matrix.pgver) }}",
                 "enabled": true,
                 "default_binary_paths": {
-                  "pg": "${{ matrix.os == 'macos-latest' && format('/usr/local/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
+                  "pg": "${{ matrix.os == 'macos-latest' && format('/opt/homebrew/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
                   "ppas": ""
                 }
               }
@@ -203,7 +219,7 @@ jobs:
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           FOR /f "delims=" %%D IN ('python -c "import os; print(os.getcwd().replace('\\', '\\\\'))"') DO SET WORKING_DIR=%%D
-          
+
           > web\config_local.py (
             @echo.from config import *
             @echo.
@@ -228,7 +244,7 @@ jobs:
             @echo.TEST_SQLITE_PATH = "%WORKING_DIR%\\var\\test_pgadmin4.db"
             @echo.AZURE_CREDENTIAL_CACHE_DIR = "%WORKING_DIR%\\var\\azurecredentialcache"
           )
-          
+
           > web\regression\test_config.json (
             @echo.{
             @echo.  "pgAdmin4_login_credentials": {
@@ -275,7 +291,7 @@ jobs:
         shell: cmd
 
       - name: Run the tests on Linux and macOS
-        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }}
         run: |
           . venv/bin/activate
           make check-python
@@ -289,14 +305,14 @@ jobs:
 
       - name: Archive server log
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: server-log-${{ matrix.os }}-pg${{ matrix.pgver }}
           path: var/pgadmin4.log
 
       - name: Archive regression log
         if: success() || failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: regression-log-${{ matrix.os }}-pg${{ matrix.pgver }}
           path: web/regression/regression.log

.github/workflows/sonarqube-scan.yml

@@ -18,14 +18,14 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  build:
+  run-sonarqube-scan:
     # Only run if the project key is set
     if: vars.SONARQUBE_PROJECT_KEY != null
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.gitignore

@@ -9,6 +9,7 @@
 .DS_Store
 .idea
 .vscode
+.sonarlint
 .yarn
 /*.diff
 /*.patch
@@ -38,6 +39,7 @@ runtime/pgAdmin4.app/
 runtime/pgAdmin4.pro.user*
 runtime/pgAdmin4_resource.rc
 runtime/release/
+runtime/dev_config.json
 runtime/ui_BrowserWindow.h
 web/config_local.py
 web/pgadmin/misc/themes/pgadmin.themes.json
@@ -48,6 +50,7 @@ node_modules/
 web/pgAdmin/static/js/generated
 web/pgadmin/static/js/generated
 web/yarn-error.log
+web/commit_hash
 /web/cacert.pem
 auditjs.html
 auditpy.txt

.pycodestyle

@@ -1,5 +1,5 @@
 [pycodestyle]
-ignore = E402,W504,W605
+ignore = E402,W504,E231
 max-line-length = 79
 statistics = True
 show-source = False

.python-version

@@ -0,0 +1 @@
+3.8.0

DEPENDENCIES

@@ -13,7 +13,7 @@ Name                                                             Version
 Python                                                           3.6+             PSF                                  https://www.python.org/
 nw                                                               0.50.2           MIT                                  git://github.com/nwjs/npm-installer.git
 asynckit                                                         0.4.0            MIT                                  git+https://github.com/alexindigo/asynckit.git
-axios                                                            1.3.5            MIT                                  https://github.com/axios/axios.git
+axios                                                            1.4.0            MIT                                  https://github.com/axios/axios.git
 bootstrap                                                        4.6.2            MIT                                  git+https://github.com/twbs/bootstrap.git
 combined-stream                                                  1.0.8            MIT                                  git://github.com/felixge/node-combined-stream.git
 delayed-stream                                                   1.0.0            MIT                                  git://github.com/felixge/node-delayed-stream.git
@@ -61,7 +61,6 @@ httpagentparser                                                  1.9.5
 user-agents                                                      2.2.0            MIT                                  https://github.com/selwin/python-user-agents
 pywinpty                                                         2.0.*            Unknown                              Unknown
 Authlib                                                          1.2.0            BSD 3-Clause License                 https://authlib.org/
-requests                                                         2.28.2           Apache 2.0                           https://requests.readthedocs.io
 pyotp                                                            2.8.0            MIT License                          https://github.com/pyotp/pyotp
 qrcode                                                           7.4.2            BSD                                  https://github.com/lincolnloop/python-qrcode
 Pillow                                                           9.5.0            HPND                                 https://python-pillow.org
@@ -69,9 +68,9 @@ boto3                                                            1.26.121
 botocore                                                         1.29.121         Apache License 2.0                   https://github.com/boto/botocore
 urllib3                                                          1.26.15          MIT                                  https://urllib3.readthedocs.io/
 azure-mgmt-rdbms                                                 10.1.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-mgmt-resource                                              23.0.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
+azure-mgmt-resource                                              23.0.1           MIT License                          https://github.com/Azure/azure-sdk-for-python
 azure-mgmt-subscription                                          3.1.1            MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-identity                                                   1.12.0           MIT License                          https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity
+azure-identity                                                   1.13.0           MIT License                          https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity
 google-api-python-client                                         2.86.0           Apache 2.0                           https://github.com/googleapis/google-api-python-client/
 google-auth-oauthlib                                             1.0.0            Apache 2.0                           https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib
 Werkzeug                                                         2.2.3            BSD-3-Clause                         https://palletsprojects.com/p/werkzeug/
@@ -80,7 +79,7 @@ keyring                                                          23.13.1
 NOTE: This report was generated using Python 3.11. Full information may not be
 shown for Python modules that are not required with this version.
 
-46 dependencies listed.
+45 dependencies listed.
 
 Javascript Dependencies
 =======================
@@ -93,47 +92,47 @@ eve                                                              0.5.4
 jmespath                                                         0.16.0           Apache-2.0                           git://github.com/jmespath/jmespath.js
 jsoneditor                                                       9.10.2           Apache-2.0                           https://github.com/josdejong/jsoneditor.git
 paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
-rc-dock                                                          3.2.17           Apache-2.0                           https://github.com/ticlo/rc-dock.git
+rc-dock                                                          3.2.18           Apache-2.0                           https://github.com/ticlo/rc-dock.git
 rc-new-window                                                    0.1.13           Apache-2.0                           https://github.com/ticlo/rc-new-window.git
 snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
 spdx-correct                                                     3.2.0            Apache-2.0                           https://github.com/jslicense/spdx-correct.js.git
 validate-npm-package-license                                     3.0.4            Apache-2.0                           https://github.com/kemitchell/validate-npm-package-license.js.git
-@babel/code-frame                                                7.21.4           MIT                                  https://github.com/babel/babel.git
-@babel/compat-data                                               7.21.9           MIT                                  https://github.com/babel/babel.git
-@babel/core                                                      7.21.8           MIT                                  https://github.com/babel/babel.git
-@babel/generator                                                 7.21.9           MIT                                  https://github.com/babel/babel.git
-@babel/helper-annotate-as-pure                                   7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-compilation-targets                                7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-create-class-features-plugin                       7.21.8           MIT                                  https://github.com/babel/babel.git
-@babel/helper-environment-visitor                                7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-function-name                                      7.21.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-hoist-variables                                    7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-member-expression-to-functions                     7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-imports                                     7.21.4           MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-transforms                                  7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-optimise-call-expression                           7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-plugin-utils                                       7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-replace-supers                                     7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-simple-access                                      7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-skip-transparent-expression-wrappers               7.20.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-split-export-declaration                           7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-string-parser                                      7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-identifier                               7.19.1           MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-option                                   7.21.0           MIT                                  https://github.com/babel/babel.git
-@babel/helpers                                                   7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/highlight                                                 7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/parser                                                    7.21.9           MIT                                  https://github.com/babel/babel.git
+@babel/code-frame                                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/compat-data                                               7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/core                                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/generator                                                 7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-annotate-as-pure                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-compilation-targets                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-create-class-features-plugin                       7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-environment-visitor                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-function-name                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-hoist-variables                                    7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-member-expression-to-functions                     7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-module-imports                                     7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-module-transforms                                  7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-optimise-call-expression                           7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-plugin-utils                                       7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-replace-supers                                     7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-simple-access                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-skip-transparent-expression-wrappers               7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-split-export-declaration                           7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-string-parser                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-validator-identifier                               7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-validator-option                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helpers                                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/highlight                                                 7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/parser                                                    7.22.5           MIT                                  https://github.com/babel/babel.git
 @babel/plugin-proposal-class-properties                          7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-syntax-jsx                                         7.21.4           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-display-name                       7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-jsx                                7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-jsx-development                    7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-pure-annotations                   7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/preset-react                                              7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/runtime                                                   7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/template                                                  7.21.9           MIT                                  https://github.com/babel/babel.git
-@babel/traverse                                                  7.21.5           MIT                                  https://github.com/babel/babel.git
-@babel/types                                                     7.21.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-syntax-jsx                                         7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-display-name                       7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-jsx                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-jsx-development                    7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-pure-annotations                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/preset-react                                              7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/runtime                                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/template                                                  7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/traverse                                                  7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/types                                                     7.22.5           MIT                                  https://github.com/babel/babel.git
 @date-io/core                                                    1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
 @date-io/date-fns                                                1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
 @emotion/babel-plugin                                            11.11.0          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin
@@ -142,7 +141,7 @@ validate-npm-package-license                                     3.0.4
 @emotion/hash                                                    0.9.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/hash
 @emotion/is-prop-valid                                           1.2.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/is-prop-valid
 @emotion/memoize                                                 0.8.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/memoize
-@emotion/react                                                   11.11.0          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
+@emotion/react                                                   11.11.1          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
 @emotion/serialize                                               1.1.2            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/serialize
 @emotion/sheet                                                   1.2.2            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/sheet
 @emotion/stylis                                                  0.8.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/stylis
@@ -151,18 +150,18 @@ validate-npm-package-license                                     3.0.4
 @emotion/use-insertion-effect-with-fallbacks                     1.0.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/use-insertion-effect-with-fallbacks
 @emotion/utils                                                   1.2.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/utils
 @emotion/weak-memoize                                            0.3.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/weak-memoize
-@floating-ui/core                                                1.2.6            MIT                                  https://github.com/floating-ui/floating-ui.git
-@floating-ui/dom                                                 1.2.8            MIT                                  https://github.com/floating-ui/floating-ui.git
+@floating-ui/core                                                1.3.1            MIT                                  https://github.com/floating-ui/floating-ui.git
+@floating-ui/dom                                                 1.4.2            MIT                                  https://github.com/floating-ui/floating-ui.git
 @istanbuljs/schema                                               0.1.3            MIT                                  git+https://github.com/istanbuljs/schema.git
 @jridgewell/gen-mapping                                          0.3.3            MIT                                  https://github.com/jridgewell/gen-mapping
 @jridgewell/resolve-uri                                          3.1.0            MIT                                  https://github.com/jridgewell/resolve-uri
 @jridgewell/set-array                                            1.1.2            MIT                                  https://github.com/jridgewell/set-array
-@jridgewell/sourcemap-codec                                      1.4.14           MIT                                  git+https://github.com/jridgewell/sourcemap-codec.git
 @jridgewell/sourcemap-codec                                      1.4.15           MIT                                  git+https://github.com/jridgewell/sourcemap-codec.git
+@jridgewell/sourcemap-codec                                      1.4.14           MIT                                  git+https://github.com/jridgewell/sourcemap-codec.git
 @jridgewell/trace-mapping                                        0.3.18           MIT                                  git+https://github.com/jridgewell/trace-mapping.git
-@material-ui/core                                                4.11.0           MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/core                                                4.12.4           MIT                                  https://github.com/mui-org/material-ui.git
 @material-ui/icons                                               4.11.3           MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/lab                                                 4.0.0-alpha.58   MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/lab                                                 4.0.0-alpha.61   MIT                                  https://github.com/mui-org/material-ui.git
 @material-ui/pickers                                             3.3.10           MIT                                  https://github.com/mui-org/material-ui-pickers
 @material-ui/styles                                              4.11.5           MIT                                  https://github.com/mui-org/material-ui.git
 @material-ui/system                                              4.12.2           MIT                                  https://github.com/mui-org/material-ui.git
@@ -178,24 +177,24 @@ validate-npm-package-license                                     3.0.4
 @projectstorm/react-diagrams-defaults                            6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
 @projectstorm/react-diagrams-routing                             6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
 @rc-component/portal                                             1.1.1            MIT                                  https://github.com/react-component/portal.git
-@rc-component/trigger                                            1.13.3           MIT                                  https://github.com/react-component/trigger.git
+@rc-component/trigger                                            1.13.6           MIT                                  https://github.com/react-component/trigger.git
 @react-dnd/asap                                                  5.0.2            MIT                                  https://github.com/react-dnd/react-dnd
 @react-dnd/invariant                                             4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
 @react-dnd/shallowequal                                          4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
-@remix-run/router                                                1.6.2            MIT                                  https://github.com/remix-run/react-router
+@remix-run/router                                                1.6.3            MIT                                  https://github.com/remix-run/react-router
 @simonwep/pickr                                                  1.8.2            MIT                                  https://github.com/Simonwep/pickr.git
 @sindresorhus/is                                                 0.7.0            MIT                                  https://github.com/sindresorhus/is.git
 @socket.io/component-emitter                                     3.1.0            MIT                                  https://github.com/socketio/emitter.git
 @szhsin/react-menu                                               2.3.4            MIT                                  https://github.com/szhsin/react-menu.git
 @types/classnames                                                2.3.1            MIT                                  Unknown
 @types/minimist                                                  1.2.2            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/node                                                      20.2.4           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/node                                                      20.3.1           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/normalize-package-data                                    2.4.1            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/parse-json                                                4.0.0            MIT                                  https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/prop-types                                                15.7.5           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     18.2.7           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     16.14.42         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     17.0.60          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     18.2.13          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     16.14.43         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     17.0.62          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/react-dom                                                 17.0.20          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/react-transition-group                                    4.4.6            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/scheduler                                                 0.16.3           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
@@ -224,7 +223,7 @@ brace                                                            0.11.1
 brace-expansion                                                  1.1.11           MIT                                  git://github.com/juliangruber/brace-expansion.git
 braces                                                           3.0.2            MIT                                  https://github.com/micromatch/braces.git
 browserfs                                                        1.4.3            MIT                                  https://github.com/jvilk/BrowserFS.git
-browserslist                                                     4.21.5           MIT                                  https://github.com/browserslist/browserslist.git
+browserslist                                                     4.21.9           MIT                                  https://github.com/browserslist/browserslist.git
 callsites                                                        3.1.0            MIT                                  https://github.com/sindresorhus/callsites.git
 camelcase                                                        6.3.0            MIT                                  https://github.com/sindresorhus/camelcase.git
 camelcase-keys                                                   7.0.2            MIT                                  https://github.com/sindresorhus/camelcase-keys.git
@@ -232,7 +231,7 @@ camelize                                                         1.0.1
 caniuse-api                                                      3.0.0            MIT                                  https://github.com/nyalab/caniuse-api.git
 chalk                                                            2.4.2            MIT                                  https://github.com/chalk/chalk.git
 chart.js                                                         3.9.1            MIT                                  https://github.com/chartjs/Chart.js.git
-chartjs-plugin-zoom                                              1.3.0            MIT                                  https://github.com/chartjs/chartjs-plugin-zoom.git
+chartjs-plugin-zoom                                              2.0.1            MIT                                  https://github.com/chartjs/chartjs-plugin-zoom.git
 classnames                                                       2.3.2            MIT                                  https://github.com/JedWatson/classnames.git
 closest                                                          0.0.1            MIT                                  https://github.com/ForbesLindesay/closest.git
 clsx                                                             1.2.1            MIT                                  https://github.com/lukeed/clsx.git
@@ -244,7 +243,7 @@ commander                                                        7.2.0
 concat-map                                                       0.0.1            MIT                                  git://github.com/substack/node-concat-map.git
 convert-source-map                                               1.9.0            MIT                                  git://github.com/thlorenz/convert-source-map.git
 convert-units                                                    2.3.4            MIT                                  git://github.com/ben-ng/convert-units.git
-core-js                                                          3.30.2           MIT                                  https://github.com/zloirock/core-js.git
+core-js                                                          3.31.0           MIT                                  https://github.com/zloirock/core-js.git
 cosmiconfig                                                      7.1.0            MIT                                  git+https://github.com/davidtheclark/cosmiconfig.git
 css-line-break                                                   2.1.0            MIT                                  git+ssh://git@github.com/niklasvh/css-line-break.git
 css-to-react-native                                              3.2.0            MIT                                  git+https://github.com/styled-components/css-to-react-native.git
@@ -270,8 +269,8 @@ dnd-core                                                         16.0.1
 dom-align                                                        1.12.4           MIT                                  git@github.com:yiminghe/dom-align.git
 dom-helpers                                                      5.2.1            MIT                                  git+https://github.com/react-bootstrap/dom-helpers.git
 dom-serializer                                                   1.4.1            MIT                                  git://github.com/cheeriojs/dom-renderer.git
-engine.io-client                                                 6.4.0            MIT                                  https://github.com/socketio/engine.io-client.git
-engine.io-parser                                                 5.0.7            MIT                                  git@github.com:socketio/engine.io-parser.git
+engine.io-client                                                 6.5.0            MIT                                  https://github.com/socketio/engine.io-client.git
+engine.io-parser                                                 5.1.0            MIT                                  git@github.com:socketio/engine.io-parser.git
 error-ex                                                         1.3.2            MIT                                  https://github.com/qix-/node-error-ex.git
 escalade                                                         3.1.1            MIT                                  https://github.com/lukeed/escalade.git
 escape-string-regexp                                             1.0.5            MIT                                  https://github.com/sindresorhus/escape-string-regexp.git
@@ -404,7 +403,7 @@ picomatch                                                        2.3.1
 picomodal                                                        3.0.0            MIT                                  https://github.com/Nycto/PicoModal.git
 popper.js                                                        1.16.1-lts       MIT                                  git+https://github.com/FezVrasta/popper.js.git
 popper.js                                                        1.16.1           MIT                                  git+https://github.com/FezVrasta/popper.js.git
-postcss                                                          8.4.23           MIT                                  https://github.com/postcss/postcss.git
+postcss                                                          8.4.24           MIT                                  https://github.com/postcss/postcss.git
 postcss-calc                                                     8.2.4            MIT                                  https://github.com/postcss/postcss-calc.git
 postcss-colormin                                                 5.3.1            MIT                                  https://github.com/cssnano/cssnano.git
 postcss-convert-values                                           5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
@@ -442,14 +441,14 @@ raf                                                              3.4.1
 rc-align                                                         4.0.15           MIT                                  git@github.com:react-component/align.git
 rc-dropdown                                                      3.6.2            MIT                                  git@github.com:react-component/dropdown.git
 rc-dropdown                                                      4.0.1            MIT                                  git@github.com:react-component/dropdown.git
-rc-menu                                                          9.9.1            MIT                                  git@github.com:react-component/menu.git
+rc-menu                                                          9.9.2            MIT                                  git@github.com:react-component/menu.git
 rc-menu                                                          9.6.4            MIT                                  git@github.com:react-component/menu.git
 rc-motion                                                        2.7.3            MIT                                  git@github.com:react-component/motion.git
-rc-overflow                                                      1.3.0            MIT                                  git@github.com:react-component/overflow.git
+rc-overflow                                                      1.3.1            MIT                                  git@github.com:react-component/overflow.git
 rc-resize-observer                                               1.3.1            MIT                                  git@github.com:react-component/resize-observer.git
 rc-tabs                                                          11.16.1          MIT                                  git@github.com:react-component/tabs.git
 rc-trigger                                                       5.3.4            MIT                                  https://github.com/react-component/trigger.git
-rc-util                                                          5.32.2           MIT                                  git@github.com:react-component/util.git
+rc-util                                                          5.34.0           MIT                                  git@github.com:react-component/util.git
 re-resizable                                                     6.9.6            MIT                                  https://github.com/bokuweb/react-resizable-box.git
 react                                                            17.0.2           MIT                                  https://github.com/facebook/react.git
 react-aspen                                                      1.2.0            MIT                                  https://github.com/neeksandhu/react-aspen.git
@@ -460,16 +459,16 @@ react-dnd-html5-backend                                          16.0.1
 react-dom                                                        17.0.2           MIT                                  https://github.com/facebook/react.git
 react-draggable                                                  4.4.5            MIT                                  https://github.com/react-grid-layout/react-draggable.git
 react-dropzone                                                   14.2.3           MIT                                  https://github.com/react-dropzone/react-dropzone.git
-react-is                                                         16.13.1          MIT                                  https://github.com/facebook/react.git
 react-is                                                         17.0.2           MIT                                  https://github.com/facebook/react.git
+react-is                                                         16.13.1          MIT                                  https://github.com/facebook/react.git
 react-resize-detector                                            9.1.0            MIT                                  git+https://github.com/maslianok/react-resize-detector.git
 react-rnd                                                        10.4.1           MIT                                  https://github.com/bokuweb/react-rnd.git
-react-router                                                     6.11.2           MIT                                  https://github.com/remix-run/react-router
-react-router-dom                                                 6.11.2           MIT                                  https://github.com/remix-run/react-router
+react-router                                                     6.13.0           MIT                                  https://github.com/remix-run/react-router
+react-router-dom                                                 6.13.0           MIT                                  https://github.com/remix-run/react-router
 react-select                                                     5.7.3            MIT                                  https://github.com/JedWatson/react-select/tree/master/packages/react-select
 react-table                                                      7.8.0            MIT                                  https://github.com/tannerlinsley/react-table
 react-transition-state                                           1.1.5            MIT                                  https://github.com/szhsin/react-transition-state.git
-react-virtualized-auto-sizer                                     1.0.17           MIT                                  https://github.com/bvaughn/react-virtualized-auto-sizer.git
+react-virtualized-auto-sizer                                     1.0.20           MIT                                  https://github.com/bvaughn/react-virtualized-auto-sizer.git
 react-window                                                     1.8.9            MIT                                  https://github.com/bvaughn/react-window.git
 read-pkg                                                         6.0.0            MIT                                  https://github.com/sindresorhus/read-pkg.git
 read-pkg-up                                                      8.0.0            MIT                                  https://github.com/sindresorhus/read-pkg-up.git
@@ -487,8 +486,8 @@ scheduler                                                        0.20.2
 shallowequal                                                     1.1.0            MIT                                  https://github.com/dashed/shallowequal.git
 slash                                                            4.0.0            MIT                                  https://github.com/sindresorhus/slash.git
 snapsvg-cjs                                                      0.0.6            MIT                                  git+https://github.com/geelen/Snap.svg-cjs.git
-socket.io-client                                                 4.6.1            MIT                                  https://github.com/socketio/socket.io-client.git
-socket.io-parser                                                 4.2.3            MIT                                  https://github.com/socketio/socket.io-parser.git
+socket.io-client                                                 4.7.0            MIT                                  https://github.com/socketio/socket.io-client.git
+socket.io-parser                                                 4.2.4            MIT                                  https://github.com/socketio/socket.io-parser.git
 spdx-expression-parse                                            3.0.1            MIT                                  https://github.com/jslicense/spdx-expression-parse.js.git
 split.js                                                         1.6.5            MIT                                  https://github.com/nathancahill/split
 stable                                                           0.1.8            MIT                                  https://github.com/Two-Screen/stable.git
@@ -530,24 +529,24 @@ react-leaflet                                                    3.2.5
 boolbase                                                         1.0.0            ISC                                  https://github.com/fb55/boolbase
 css-color-keywords                                               1.0.0            ISC                                  https://github.com/sonicdoe/css-color-keywords.git
 css-declaration-sorter                                           6.4.0            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
-electron-to-chromium                                             1.4.408          ISC                                  https://github.com/kilian/electron-to-chromium/
+electron-to-chromium                                             1.4.437          ISC                                  https://github.com/kilian/electron-to-chromium/
 fastq                                                            1.15.0           ISC                                  git+https://github.com/mcollina/fastq.git
 glob-parent                                                      5.1.2            ISC                                  https://github.com/gulpjs/glob-parent.git
 hosted-git-info                                                  4.1.0            ISC                                  git+https://github.com/npm/hosted-git-info.git
-jsonrepair                                                       3.1.0            ISC                                  https://github.com/josdejong/jsonrepair.git
+jsonrepair                                                       3.2.0            ISC                                  https://github.com/josdejong/jsonrepair.git
 lru-cache                                                        6.0.0            ISC                                  git://github.com/isaacs/node-lru-cache.git
 lru-cache                                                        5.1.1            ISC                                  git://github.com/isaacs/node-lru-cache.git
 minimatch                                                        3.1.2            ISC                                  git://github.com/isaacs/minimatch.git
 picocolors                                                       1.0.0            ISC                                  https://github.com/alexeyraspopov/picocolors.git
 react-timer-hook                                                 3.0.6            ISC                                  git+https://github.com/amrlabib/react-timer-hook.git
 semver                                                           6.3.0            ISC                                  https://github.com/npm/node-semver
-semver                                                           7.5.1            ISC                                  https://github.com/npm/node-semver.git
+semver                                                           7.5.2            ISC                                  https://github.com/npm/node-semver.git
 vanilla-picker                                                   2.12.1           ISC                                  https://github.com/Sphinxxxx/vanilla-picker.git
 yallist                                                          4.0.0            ISC                                  git+https://github.com/isaacs/yallist.git
 yallist                                                          3.1.1            ISC                                  git+https://github.com/isaacs/yallist.git
 yaml                                                             1.10.2           ISC                                  https://github.com/eemeli/yaml.git
 yargs-parser                                                     20.2.9           ISC                                  https://github.com/yargs/yargs-parser.git
-ace-builds                                                       1.22.0           BSD-3-Clause                         https://github.com/ajaxorg/ace-builds.git
+ace-builds                                                       1.23.0           BSD-3-Clause                         https://github.com/ajaxorg/ace-builds.git
 hoist-non-react-statics                                          3.3.2            BSD-3-Clause                         git://github.com/mridgway/hoist-non-react-statics.git
 hyphenate-style-name                                             1.0.4            BSD-3-Clause                         git+ssh://git@github.com/rexxars/hyphenate-style-name.git
 istanbul-lib-coverage                                            3.2.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
@@ -560,7 +559,7 @@ source-map                                                       0.6.1
 source-map                                                       0.5.7            BSD-3-Clause                         http://github.com/mozilla/source-map.git
 source-map-js                                                    1.0.2            BSD-3-Clause                         https://github.com/7rulnik/source-map-js.git
 sprintf-js                                                       1.1.2            BSD-3-Clause                         https://github.com/alexei/sprintf.js.git
-caniuse-lite                                                     1.0.30001489     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
+caniuse-lite                                                     1.0.30001506     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
 css-select                                                       4.3.0            BSD-2-Clause                         git://github.com/fb55/css-select.git
 css-what                                                         6.1.0            BSD-2-Clause                         https://github.com/fb55/css-what
 domelementtype                                                   2.3.0            BSD-2-Clause                         git://github.com/fb55/domelementtype.git
@@ -578,7 +577,7 @@ spdx-license-ids                                                 3.0.13
 mousetrap                                                        1.6.5            Apache-2.0 WITH LLVM-exception       git://github.com/ccampbell/mousetrap.git
 pako                                                             1.0.11           (MIT AND Zlib)                       https://github.com/nodeca/pako.git
 spdx-exceptions                                                  2.3.0            CC-BY-3.0                            https://github.com/kemitchell/spdx-exceptions.json.git
-tslib                                                            2.5.2            0BSD                                 https://github.com/Microsoft/tslib.git
+tslib                                                            2.5.3            0BSD                                 https://github.com/Microsoft/tslib.git
 tslib                                                            2.3.1            0BSD                                 https://github.com/Microsoft/tslib.git
 type-fest                                                        1.4.0            (MIT OR CC0-1.0)                     https://github.com/sindresorhus/type-fest.git
 webcabin-docker                                                  2.2.5            MIT*                                 Unknown

Dockerfile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2023, The pgAdmin Development Team
+# Copyright (C) 2013 - 2025, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -31,6 +31,7 @@ RUN apk add --no-cache \
     yarn \
     zlib-dev
 
+COPY .git .git
 # Create the /pgadmin4 directory and copy the source into it. Explicitly
 # remove the node_modules directory as we'll recreate a clean version, as well
 # as various other files we don't want
@@ -46,7 +47,10 @@ WORKDIR /pgadmin4/web
 
 # Build the JS vendor code in the app-builder, and then remove the vendor source.
 RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
+    npm install -g corepack && \
+    corepack enable && \
     yarn set version berry && \
+    yarn set version 3 && \
     yarn install && \
     yarn run bundle && \
     rm -rf node_modules \
@@ -55,18 +59,20 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
            .[^.]* \
            babel.cfg \
            webpack.* \
-           karma.conf.js \
-           ./pgadmin/static/js/generated/.cache
+           jest.config.js \
+           babel.* \
+           ./pgadmin/static/js/generated/.cache \
+           /pgadmin4/.git
 
 #########################################################################
 # Next, create the base environment for Python
 #########################################################################
 
-FROM alpine:latest as env-builder
+FROM alpine:latest AS env-builder
 
 # Install dependencies
 COPY requirements.txt /
-RUN     apk add --no-cache \
+RUN apk add --no-cache \
         make \
         python3 \
         py3-pip && \
@@ -90,7 +96,7 @@ RUN     apk add --no-cache \
 # Now, create a documentation build container for the Sphinx docs
 #########################################################################
 
-FROM env-builder as docs-builder
+FROM env-builder AS docs-builder
 
 # Install Sphinx
 RUN /venv/bin/python3 -m pip install --no-cache-dir sphinx
@@ -114,26 +120,16 @@ RUN rm -rf /pgadmin4/docs/en_US/_build/html/_static/*.png
 # Create additional builders to get all of the PostgreSQL utilities
 #########################################################################
 
-FROM postgres:10-alpine as pg10-builder
-FROM postgres:11-alpine as pg11-builder
-FROM postgres:12-alpine as pg12-builder
-FROM postgres:13-alpine as pg13-builder
-FROM postgres:14-alpine as pg14-builder
-FROM postgres:15-alpine as pg15-builder
+FROM postgres:12-alpine AS pg12-builder
+FROM postgres:13-alpine AS pg13-builder
+FROM postgres:14-alpine AS pg14-builder
+FROM postgres:15-alpine AS pg15-builder
+FROM postgres:16-alpine AS pg16-builder
+FROM postgres:17-alpine AS pg17-builder
 
-FROM alpine:latest as tool-builder
+FROM alpine:latest AS tool-builder
 
 # Copy the PG binaries
-COPY --from=pg10-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-10/
-COPY --from=pg10-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-10/
-COPY --from=pg10-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-10/
-COPY --from=pg10-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-10/
-
-COPY --from=pg11-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-11/
-COPY --from=pg11-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-11/
-COPY --from=pg11-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-11/
-COPY --from=pg11-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-11/
-
 COPY --from=pg12-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-12/
 COPY --from=pg12-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-12/
 COPY --from=pg12-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-12/
@@ -154,6 +150,16 @@ COPY --from=pg15-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-15/
 COPY --from=pg15-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-15/
 COPY --from=pg15-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-15/
 
+COPY --from=pg16-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-16/
+COPY --from=pg16-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-16/
+COPY --from=pg16-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-16/
+COPY --from=pg16-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-16/
+
+COPY --from=pg17-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-17/
+COPY --from=pg17-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-17/
+COPY --from=pg17-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-17/
+COPY --from=pg17-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-17/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
@@ -165,9 +171,14 @@ COPY --from=env-builder /venv /venv
 
 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
-COPY --from=pg15-builder /usr/local/lib/libpq.so.5.15 /usr/lib/
-RUN ln -s libpq.so.5.15 /usr/lib/libpq.so.5 && \
-    ln -s libpq.so.5.15 /usr/lib/libpq.so
+COPY --from=pg17-builder /usr/local/lib/libpq.so.5.17 /usr/lib/
+COPY --from=pg17-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
+COPY --from=pg17-builder /usr/lib/liblz4.so.1.10.0 /usr/lib/
+
+RUN ln -s libpq.so.5.17 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.17 /usr/lib/libpq.so && \
+    ln -s libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
+    ln -s liblz4.so.1.10.0 /usr/lib/liblz4.so.1
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -184,28 +195,30 @@ COPY LICENSE /pgadmin4/LICENSE
 COPY DEPENDENCIES /pgadmin4/DEPENDENCIES
 
 # Install runtime dependencies and configure everything in one RUN step
-RUN apk add \
+RUN apk add --no-cache \
         python3 \
+        bash \
         py3-pip \
         postfix \
         krb5-libs \
         libjpeg-turbo \
         shadow \
         sudo \
+        tzdata \
         libedit \
         libldap \
         libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn && \
+    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==23.0.0 && \
     find / -type d -name '__pycache__' -exec rm -rf {} + && \
     useradd -r -u 5050 -g root -s /sbin/nologin pgadmin && \
-    mkdir -p /var/lib/pgadmin && \
-    chown pgadmin:root /var/lib/pgadmin && \
+    mkdir -p /run/pgadmin /var/lib/pgadmin && \
+    chown pgadmin:root /run/pgadmin /var/lib/pgadmin && \
     chmod g=u /var/lib/pgadmin && \
     touch /pgadmin4/config_distro.py && \
     chown pgadmin:root /pgadmin4/config_distro.py && \
     chmod g=u /pgadmin4/config_distro.py && \
     chmod g=u /etc/passwd && \
-    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.11 && \
+    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.12 && \
     echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
     echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix
 

LICENSE

@@ -1,6 +1,10 @@
 pgAdmin 4
+=========
 
-Copyright (C) 2013 - 2023, The pgAdmin Development Team
+This software is released under the PostgreSQL licence.
+
+-------------------------------------------------------------------------------
+Copyright (C) 2013 - 2025, The pgAdmin Development Team
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement is

Make.bat

@@ -26,6 +26,7 @@ CALL :CLEAN || EXIT /B 1
 CALL :CREATE_VIRTUAL_ENV || EXIT /B 1
 CALL :CREATE_PYTHON_ENV || EXIT /B 1
 CALL :CREATE_RUNTIME_ENV || EXIT /B 1
+CALL :GENERATE_SBOM || EXIT /B 1
 CALL :CREATE_INSTALLER || EXIT /B 1
 CALL :SIGN_INSTALLER || EXIT /B 1
 
@@ -51,24 +52,22 @@ REM Main build sequence Ends
 
 :SET_ENVIRONMENT
     ECHO Configuring the environment...
-    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python38"
+    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python313"
     IF "%PGADMIN_KRB5_DIR%" == ""     SET "PGADMIN_KRB5_DIR=C:\Program Files\MIT\Kerberos"
-    IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files (x86)\PostgreSQL\12"
+    IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files\PostgreSQL\17"
     IF "%PGADMIN_INNOTOOL_DIR%" == "" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6"
-    IF "%PGADMIN_VCREDIST_DIR%" == "" SET "PGADMIN_VCREDIST_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.16.27012"
-    IF "%PGADMIN_SIGNTOOL_DIR%" == "" SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64"
-
-    REM Set REDIST_NAME (the filename)
-    set "VCREDIST_FILE=vcredist_x64.exe"
+    IF "%PGADMIN_VCREDIST_DIR%" == "" SET "PGADMIN_VCREDIST_DIR=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.40.33807"
+    IF "%PGADMIN_VCREDIST_FILE%" == "" SET "PGADMIN_VCREDIST_FILE=vc_redist.x64.exe"
+    IF "%PGADMIN_SIGNTOOL_DIR%" == "" SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64"
 
     REM Set additional variables we need
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')  DO SET APP_MAJOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py') DO SET APP_MINOR=%%a
-    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py')   DO SET APP_VERSION_SUFFIX=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\version.py')  DO SET APP_MAJOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\version.py') DO SET APP_MINOR=%%a
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\version.py')   DO SET APP_VERSION_SUFFIX=%%a
     REM remove single quote from the string
     SET APP_VERSION_SUFFIX=%APP_VERSION_SUFFIX:'=%
     SET APP_NAME=""
-    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py') DO SET APP_NAME=%%a
+    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\branding.py') DO SET APP_NAME=%%a
     FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
     SET APP_VERSION=%APP_MAJOR%.%APP_MINOR%
     SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%APP_VERSION_SUFFIX%-x64.exe
@@ -97,7 +96,7 @@ REM Main build sequence Ends
     ECHO PostgreSQL directory:      %PGADMIN_POSTGRES_DIR%
     ECHO.
     ECHO VC++ redist directory:     %PGADMIN_VCREDIST_DIR%
-    ECHO VC++ redist file:          %VCREDIST_FILE%
+    ECHO VC++ redist file:          %PGADMIN_VCREDIST_FILE%
     ECHO InnoTool directory:        %PGADMIN_INNOTOOL_DIR%
     ECHO signtool directory:        %PGADMIN_SIGNTOOL_DIR%
     ECHO.
@@ -216,7 +215,10 @@ REM Main build sequence Ends
 
     ECHO Installing javascript dependencies...
     CD "%BUILDROOT%\web"
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version 3 || EXIT /B 1
     CALL yarn install || EXIT /B 1
+    CALL npm rebuild || EXIT /B 1
 
     ECHO Bundling javascript...
     CALL yarn run bundle || EXIT /B 1
@@ -229,6 +231,8 @@ REM Main build sequence Ends
     RD /Q /S "%BUILDROOT%\web\regression" 1> nul 2>&1
     ECHO Removing tools...
     RD /Q /S "%BUILDROOT%\web\tools" 1> nul 2>&1
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\web\.yarn" 1> nul 2>&1
     ECHO Removing any existing configurations...
     DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
     DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1
@@ -258,51 +262,70 @@ REM Main build sequence Ends
     RD /Q /S "%BUILDROOT%\docs\en_US\html\_sources" 1> nul 2>&1
 
     ECHO Staging runtime components...
-    XCOPY /S /I /E /H /Y "%WD%\runtime\assets" "%BUILDROOT%\runtime\assets" > nul || EXIT /B 1
-    XCOPY /S /I /E /H /Y "%WD%\runtime\src" "%BUILDROOT%\runtime\src" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\runtime\resources\app"
+    XCOPY /S /I /E /H /Y "%WD%\runtime\assets" "%BUILDROOT%\runtime\resources\app\assets" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%WD%\runtime\src" "%BUILDROOT%\runtime\resources\app\src" > nul || EXIT /B 1
 
-    COPY "%WD%\runtime\package.json" "%BUILDROOT%\runtime\" > nul || EXIT /B 1
-    CD "%BUILDROOT%\runtime\"
-    CALL yarn install --production=true || EXIT /B 1
+    COPY "%WD%\runtime\package.json" "%BUILDROOT%\runtime\resources\app\" > nul || EXIT /B 1
+    COPY "%WD%\runtime\.yarnrc.yml" "%BUILDROOT%\runtime\resources\app\" > nul || EXIT /B 1
 
-    ECHO Downloading NWjs to %TMPDIR%...
-    REM Get a fresh copy of nwjs.
-    REM NOTE: The nw download servers seem to be very unreliable, so at the moment we're using wget which retries
+    CD "%BUILDROOT%\runtime\resources\app\"
 
-    REM YARN
-    REM CALL yarn --cwd "%TMPDIR%" add nw || EXIT /B
-    REM YARN END
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version 3 || EXIT /B 1
+    CALL yarn plugin import workspace-tools || EXIT /B 1
+    CALL yarn workspaces focus --production || EXIT /B 1
+
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\runtime\resources\app\.yarn" 1> nul 2>&1
+
+    ECHO Downloading Electron to %TMPDIR%...
+    REM Get a fresh copy of electron.
 
     REM WGET
-    FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
+    FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
     :GET_NW
-        wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
+        wget https://github.com/electron/electron/releases/download/v%ELECTRON_VERSION%/electron-v%ELECTRON_VERSION%-win32-x64.zip -O "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip"
         IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
 
-    tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1
+    MKDIR "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64" || EXIT /B 1
+    tar -C "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64" -xvf "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip" || EXIT /B 1
     REM WGET END
 
-    REM YARN
-    REM XCOPY /S /I /E /H /Y "%TMPDIR%\node_modules\nw\nwjs\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    REM YARN END
+    REM XCOPY
+    XCOPY /S /I /E /H /Y "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    REM XCOPY END
 
-    REM WGET
-    XCOPY /S /I /E /H /Y "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    REM WGET END
+    MOVE "%BUILDROOT%\runtime\electron.exe" "%BUILDROOT%\runtime\pgAdmin4.exe"
 
-    MOVE "%BUILDROOT%\runtime\nw.exe" "%BUILDROOT%\runtime\pgAdmin4.exe"
+    ECHO Downloading rcedit.exe...
+    wget https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe -O "%TMPDIR%\rcedit-x64.exe"
 
-    ECHO Replacing executable icon...
-    CALL yarn --cwd "%TMPDIR%" add winresourcer || EXIT /B
-    "%TMPDIR%\node_modules\winresourcer\bin\Resourcer.exe" -op:upd -src:"%BUILDROOT%\runtime\pgAdmin4.exe" -type:Icongroup -name:IDR_MAINFRAME -file:"%WD%\pkg\win32\Resources\pgAdmin4.ico"
+    ECHO Replacing executable icon, description, version...
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-icon "%WD%\pkg\win32\Resources\pgAdmin4.ico"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-version-string "FileDescription" "%APP_NAME%"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-version-string "ProductName" "%APP_NAME%"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-product-version "%APP_VERSION%""
+
+    ECHO Attempting to sign the pgAdmin4.exe...
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /fd certHash /tr http://timestamp.digicert.com /td SHA256 "%BUILDROOT%\runtime\pgAdmin4.exe"
+    IF %ERRORLEVEL% NEQ 0 (
+        ECHO.
+        ECHO ************************************************************
+        ECHO * Failed to sign the pgAdmin4.exe
+        ECHO ************************************************************
+        PAUSE
+    )
 
     ECHO Staging PostgreSQL components...
     COPY "%PGADMIN_POSTGRES_DIR%\bin\libpq.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
     IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" "%BUILDROOT%\runtime" > nul
     IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" "%BUILDROOT%\runtime" > nul
-    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\liblz4.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\liblz4.dll" "%BUILDROOT%\runtime" > nul
+    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libzstd.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libzstd.dll" "%BUILDROOT%\runtime" > nul
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
     COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dump.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
     COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dumpall.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1L%
     COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_restore.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
@@ -310,7 +333,7 @@ REM Main build sequence Ends
 
     ECHO Staging VC++ runtime...
     MKDIR "%BUILDROOT%\installer" || EXIT /B 1
-    COPY "%PGADMIN_VCREDIST_DIR%\%VCREDIST_FILE%" "%BUILDROOT%\installer" > nul || EXIT /B 1
+    COPY "%PGADMIN_VCREDIST_DIR%\%PGADMIN_VCREDIST_FILE%" "%BUILDROOT%\installer" > nul || EXIT /B 1
 
     CD %WD%
     EXIT /B 0
@@ -328,13 +351,13 @@ REM Main build sequence Ends
     ECHO Processing installer configuration script...
     CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
     CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
-    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%VCREDIST_FILE%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%PGADMIN_VCREDIST_FILE%"""
 
     ECHO Cleaning up...
     DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
 
     ECHO Creating windows installer using INNO tool...
-    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
+    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" "%WD%\pkg\win32\installer.iss" || EXIT /B 1
 
     ECHO Renaming installer...
     MOVE "%WD%\pkg\win32\Output\pgadmin4-setup.exe" "%DISTROOT%\%INSTALLERNAME%" > nul || EXIT /B 1
@@ -345,10 +368,15 @@ REM Main build sequence Ends
     CD %WD%
     EXIT /B 0
 
+:GENERATE_SBOM
+    ECHO Generating SBOM...
+    CALL syft "%BUILDROOT%" -o cyclonedx-json > "%BUILDROOT%\sbom.json"
+
+    EXIT /B 0
 
 :SIGN_INSTALLER
     ECHO Attempting to sign the installer...
-    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%DISTROOT%\%INSTALLERNAME%"
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /fd certHash /tr http://timestamp.digicert.com /td SHA256 "%DISTROOT%\%INSTALLERNAME%"
     IF %ERRORLEVEL% NEQ 0 (
         ECHO.
         ECHO ************************************************************

Makefile

@@ -2,16 +2,16 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2023, The pgAdmin Development Team
+# Copyright (C) 2013 - 2025, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
 
 SHELL = /bin/sh
 
-APP_NAME := $(shell grep ^APP_NAME web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]' | tr -d "'" | awk '{print tolower($$0)}')
-APP_RELEASE := $(shell grep ^APP_RELEASE web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
-APP_REVISION := $(shell grep ^APP_REVISION web/config.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
+APP_NAME := $(shell grep ^APP_NAME web/branding.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]' | tr -d "'" | awk '{print tolower($$0)}')
+APP_RELEASE := $(shell grep ^APP_RELEASE web/version.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
+APP_REVISION := $(shell grep ^APP_REVISION web/version.py | awk -F"=" '{print $$NF}' | tr -d '[:space:]')
 
 #########################################################################
 # High-level targets
@@ -42,7 +42,7 @@ linter:
 	cd web && yarn run linter
 
 check: install-node bundle linter check-pep8
-	cd web && yarn run karma start --single-run && python regression/runtests.py
+	cd web && yarn run test:js-once && python regression/runtests.py
 
 check-audit:
 	cd web && yarn run audit
@@ -77,10 +77,10 @@ check-feature: install-node bundle
 	cd web && python regression/runtests.py --pkg feature_tests
 
 check-js: install-node linter
-	cd web && yarn run karma start --single-run
+	cd web && yarn run test:js-once
 
 check-js-coverage:
-    cd web && yarn run test:karma-coverage
+    cd web && yarn run test:js-coverage
 
 # Include all clean sub-targets in clean
 clean: clean-appbundle clean-debian clean-dist clean-docs clean-node clean-pip clean-redhat clean-src
@@ -118,6 +118,7 @@ debian:
 
 docker:
 	echo $(APP_NAME)
+	git checkout HEAD
 	docker build --pull -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .
 
 docs:

README.md

@@ -1,7 +1,7 @@
-# pgAdmin 4 
+# pgAdmin 4
 
 pgAdmin 4 is a rewrite of the popular pgAdmin3 management tool for the
-PostgreSQL (http://www.postgresql.org) database. 
+PostgreSQL (http://www.postgresql.org) database.
 
 In the following documentation and examples, *$PGADMIN4_SRC/* is used to denote
 the top-level directory of a copy of the pgAdmin source tree, either from a
@@ -9,156 +9,30 @@ tarball or a git checkout.
 
 ## Architecture
 
-pgAdmin 4 is written as a web application in Python, using jQuery and Bootstrap
-for the client side processing and UI. On the server side, Flask is being
-utilised.
+pgAdmin 4 is written as a web application with Python(Flask) on the server side
+and ReactJS, HTML5 with CSS for the client side processing and UI.
 
 Although developed using web technologies, pgAdmin 4 can be deployed either on
 a web server using a browser, or standalone on a workstation. The runtime/
-subdirectory contains an NWjs based runtime application intended to allow this,
-which will execute the Python server and display the UI.
+subdirectory contains an Electron based runtime application intended to allow this,
+which will fork a Python server process and display the UI.
 
-## Building the Runtime
-
-To build the runtime, the following packages must be installed:
-
-* NodeJS 12+
-* Yarn
-
-Change into the runtime directory, and run *yarn install*. This will install the
-dependencies required.
-
-In order to use the runtime in a development environment, you'll need to copy
-*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
-executable and *pgAdmin.py* file, otherwise the runtime will use the default
-paths it would expect to find in the standard package for your platform.
-
-You can then execute the runtime by running something like:
+## Prerequisites
+1. Install Node.js 20 and above (https://nodejs.org/en/download)
+2. yarn (https://yarnpkg.com/getting-started/install)
+3. Python 3.8 and above (https://www.python.org/downloads/)
+4. PostgreSQL server (https://www.postgresql.org/download)
 
+Start by enabling Corepack, if it isn't already;
+this will add the yarn binary to your PATH:
 ```bash
-node_modules/nw/nwjs/nw .
+corepack enable
 ```
 
-or on macOS:
-
-```bash
-node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
-```
-
-# Configuring the Python Environment
-
-In order to run the Python code, a suitable runtime environment is required.
-Python version 3.7 and later are currently supported. It is recommended that a
-Python Virtual Environment is setup for this purpose, rather than using the
-system Python environment. On Linux and Mac systems, the process is fairly
-simple - adapt as required for your distribution:
-
-1. Create a virtual environment in an appropriate directory. The last argument is
-   the name of the environment; that can be changed as desired:
-
-   ```bash
-   $ python3 -m venv venv
-   ```
-   
-2. Now activate the virtual environment:
-
-   ```bash
-   $ source venv/bin/activate
-   ```
-   
-3. Some of the components used by pgAdmin require a very recent version of *pip*,
-   so update that to the latest:
-   
-   ```bash
-   $ pip install --upgrade pip
-   ```
-   
-4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
-   pg_config can be found for building psycopg3), and install the required
-   packages:
-
-   ```bash
-   (venv) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
-   ```
-   
-   If you are planning to run the regression tests, you also need to install
-   additional requirements from web/regression/requirements.txt:
-
-   ```bash
-   (venv) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
-   ```
-   
-5. Create a local configuration file for pgAdmin. Edit
-   $PGADMIN4_SRC/web/config_local.py and add any desired configuration options
-   (use the config.py file as a reference - any settings duplicated in
-   config_local.py will override those in config.py). A typical development
-   configuration may look like:
-   
-    ```python
-    from config import *
-
-    # Debug mode
-    DEBUG = True
-
-    # App mode
-    SERVER_MODE = True
-
-    # Enable the test module
-    MODULE_BLACKLIST.remove('test')
-
-    # Log
-    CONSOLE_LOG_LEVEL = DEBUG
-    FILE_LOG_LEVEL = DEBUG
-
-    DEFAULT_SERVER = '127.0.0.1'
-
-    UPGRADE_CHECK_ENABLED = True
-
-    # Use a different config DB for each server mode.
-    if SERVER_MODE == False:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-desktop.db'
-        )
-    else:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-server.db'
-        )
-   ```
-   
-   This configuration allows easy switching between server and desktop modes
-   for testing.
-
-6. The initial setup of the configuration database is interactive in server
-   mode, and non-interactive in desktop mode. You can run it either by
-   running:
-
-   ```bash
-   (venv) $ python3 $PGADMIN4_SRC/web/setup.py
-   ```
-   
-   or by starting pgAdmin 4:
-
-   ```bash
-   (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
-   ```
-   
-   Whilst it is possible to automatically run setup in desktop mode by running
-   the runtime, that will not work in server mode as the runtime doesn't allow
-   command line interaction with the setup program.
-
-At this point you will be able to run pgAdmin 4 from the command line in either
-server or desktop mode, and access it from a web browser using the URL shown in
-the terminal once pgAdmin has started up.
-
-Setup of an environment on Windows is somewhat more complicated unfortunately,
-please see *pkg/win32/README.txt* for complete details.
-
 # Building the Web Assets
 
 pgAdmin is dependent on a number of third party Javascript libraries. These,
-along with it's own Javascript code, SCSS/CSS code and images must be
+along with it's own Javascript code, CSS code and images must be
 compiled into a "bundle" which is transferred to the browser for execution
 and rendering. This is far more efficient than simply requesting each
 asset as it's needed by the client.
@@ -182,21 +56,123 @@ C:\$PGADMIN4_SRC\web> yarn install
 C:\$PGADMIN4_SRC\web> yarn run bundle
 ```
 
-# Creating pgAdmin themes
+# Configuring the Python Environment
 
-To create a pgAdmin theme, you need to create a directory under
-*web/pgadmin/static/scss/resources*.
-Copy the sample file *_theme.variables.scss.sample* to the new directory and
-rename it to *_theme.variables.scss*. Change the desired hexadecimal values of
-the colors and bundle pgAdmin. You can also add a preview image in the theme
-directory with the name as *\<dir name>_preview.png*. It is recommended that the
-preview image should not be larger in size as it may take time to load on slow
-networks. Run the *yarn run bundle* and you're good to go. No other changes are
-required, pgAdmin bundle will read the directory and create other required
-entries to make them available in preferences.
+In order to run the Python code, a suitable runtime environment is required.
+Python version 3.8 and later are currently supported. It is recommended that a
+Python Virtual Environment is setup for this purpose, rather than using the
+system Python environment. On Linux and Mac systems, the process is fairly
+simple - adapt as required for your distribution:
 
-The name of the theme is derived from the directory name. Underscores (_) and
-hyphens (-) will be replaced with spaces and the result will be camel cased.
+1. Create a virtual environment in an appropriate directory. The last argument is
+   the name of the environment; that can be changed as desired:
+
+   ```bash
+   $ python3 -m venv venv
+   ```
+
+2. Now activate the virtual environment:
+
+   ```bash
+   $ source venv/bin/activate
+   ```
+
+3. Some of the components used by pgAdmin require a very recent version of *pip*,
+   so update that to the latest:
+
+   ```bash
+   $ pip install --upgrade pip
+   ```
+
+4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
+   pg_config can be found for building psycopg3), and install the required
+   packages:
+
+   ```bash
+   (venv) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
+   ```
+
+   If you are planning to run the regression tests, you also need to install
+   additional requirements from web/regression/requirements.txt:
+
+   ```bash
+   (venv) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
+   ```
+
+5. Create a local configuration file for pgAdmin. Edit
+   $PGADMIN4_SRC/web/config_local.py and add any desired configuration options
+   (use the config.py file as a reference - any settings duplicated in
+   config_local.py will override those in config.py). A typical development
+   configuration may look like:
+
+    ```python
+   import os
+   import logging
+
+   # Change pgAdmin data directory
+   DATA_DIR = '/Users/myuser/.pgadmin_dev'
+
+   #Change pgAdmin server and port
+   DEFAULT_SERVER = '127.0.0.1'
+   DEFAULT_SERVER_PORT = 5051
+
+   # Switch between server and desktop mode
+   SERVER_MODE = True
+
+   #Change pgAdmin config DB path in case external DB is used.
+   CONFIG_DATABASE_URI="postgresql://postgres:postgres@localhost:5436/pgadmin"
+
+   #Setup SMTP
+   MAIL_SERVER = 'smtp.gmail.com'
+   MAIL_PORT = 465
+   MAIL_USE_SSL = True
+   MAIL_USERNAME = 'user@gmail.com'
+   MAIL_PASSWORD = 'xxxxxxxxxx'
+
+   # Change log level
+   CONSOLE_LOG_LEVEL = logging.INFO
+   FILE_LOG_LEVEL = logging.INFO
+
+   # Use a different config DB for each server mode.
+   if SERVER_MODE == False:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-desktop.db'
+     )
+   else:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-server.db'
+     )
+   ```
+
+   This configuration allows easy switching between server and desktop modes
+   for testing.
+
+6. The initial setup of the configuration database is interactive in server
+   mode, and non-interactive in desktop mode. You can run it either by
+   running:
+
+   ```bash
+   (venv) $ python3 $PGADMIN4_SRC/web/setup.py
+   ```
+
+   or by starting pgAdmin 4:
+
+   ```bash
+   (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
+   ```
+
+Whilst it is possible to automatically run setup in desktop mode by running
+the runtime, that will not work in server mode as the runtime doesn't allow
+command line interaction with the setup program.
+
+At this point you will be able to run pgAdmin 4 from the command line in either
+server or desktop mode, and access it from a web browser using the URL shown in
+the terminal once pgAdmin has started up.
+
+Setup of an environment on Windows is somewhat more complicated unfortunately,
+please see *pkg/win32/README.txt* for complete details.
 
 # Building the documentation
 
@@ -217,6 +193,21 @@ The docs can then be built using the Makefile in *$PGADMIN4_SRC*, e.g.
 
 The output can be found in *$PGADMIN4_SRC/docs/en_US/_build/html/index.html*
 
+## Building the Runtime
+Change into the runtime directory, and run *yarn install*. This will install the
+dependencies required.
+
+In order to use the runtime in a development environment, you'll need to copy
+*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
+executable and *pgAdmin.py* file, otherwise the runtime will use the default
+paths it would expect to find in the standard package for your platform.
+
+You can then execute the runtime by running something like:
+
+```bash
+yarn run start
+```
+
 # Building packages
 
 Most packages can be built using the Makefile in $PGADMIN4_SRC, provided all
@@ -228,7 +219,7 @@ To build a source tarball:
 (venv) $ make src
 ```
 
-To build a PIP Wheel, activate either a Python 3 virtual environment, configured 
+To build a PIP Wheel, activate either a Python 3 virtual environment, configured
 with all the required packages, and then run:
 
 ```bash
@@ -266,7 +257,7 @@ See https://www.pgadmin.org/support/ for support options.
 
 If you would like to report a security issue with pgAdmin, please email
 **security (at) pgadmin (dot) org**.
-    
+
 Note that this address should only be used for reporting security issues
 that you believe you've found in the design or code of pgAdmin, pgAgent,
 and the pgAdmin website. It should not be used to ask security questions.

SECURITY.md

@@ -0,0 +1,82 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest version receives security updates. Users are encouraged to upgrade to the latest stable release.
+
+
+## Reporting a Vulnerability
+
+We take security seriously and appreciate your efforts to responsibly disclose vulnerabilities. If you believe you have found a vulnerability, please follow the guidelines below to submit a report.
+
+### **What to Include in Your Report**
+To help us quickly understand and address the issue, please include the following sections in your report:
+
+#### 1. **Summary**
+   - A brief description of the vulnerability.
+
+#### 2. **Affected Versions**
+   - The version(s) of the project affected by the vulnerability.
+   - Example: "Affects versions 3.4.0 to 3.6.23."
+
+#### 3. **Details**
+   - A detailed explanation of the vulnerability, including:
+     - How to reproduce the issue (step-by-step instructions).
+     - The code or component where the vulnerability exists.
+     - The expected vs. actual behavior.
+
+#### 4. **Proof of Concept (PoC)**
+   - Provide a proof of concept to demonstrate the vulnerability. This could be:
+     - Code snippets.
+     - Screenshots or videos.
+     - A minimal reproducible example.
+
+#### 5. **Patches (if applicable)**
+   - If you have a suggested fix or patch, include it in your report.
+   - Example: "Sanitize user input using `DOMPurify`."
+
+#### 6. **Impact**
+   - Describe the potential impact of the vulnerability, such as:
+     - Remote Code Execution.
+     - CSRF.
+     - Data exposure.
+     - Denial of service.
+
+
+
+### **What to Expect**
+- **Acknowledgement**: You will receive an acknowledgement of your report within **48 hours**.
+- **Timeline**: We will provide a timeline for investigating and addressing the issue.
+- **Updates**: You will receive regular updates on the progress of the vulnerability resolution.
+- **CVE ID**: If the vulnerability is confirmed, we will request a CVE ID to acknowledge the issue officially and include it in the release notes.
+
+
+### **Out of Scope**
+The following issues are considered out of scope for security reports:
+- Vulnerabilities in outdated or unsupported versions.
+- Issues related to non-security-impacting bugs or feature requests.
+- Vulnerabilities requiring physical access to the device or social engineering.
+
+
+
+## Security Updates
+
+We are committed to providing timely security updates for supported versions. Here’s our process:
+1. **Assessment**:
+   - All reported vulnerabilities are assessed for severity and impact.
+2. **Patch Development**:
+   - Patches are developed and tested in a private repository to prevent premature disclosure.
+3. **Release**:
+   - Security patches are released as soon as possible, along with a detailed advisory.
+
+
+
+## Acknowledgments
+
+We deeply appreciate the efforts of security researchers and users who help us improve the security of our project.
+
+
+
+## Contact
+
+For any questions or concerns regarding security, please contact us at `security@pgadmin.org`.

docs/en_US/backup_dialog.rst

@@ -67,7 +67,7 @@ Use the fields in the *General* tab to specify parameters for the backup:
 * Use the dropdown listbox next to *Rolename* to specify the role that owns the
   backup.
 
-Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
+Click the *Data Options* tab to continue. Use the fields in the *Data Options*
 tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
 
 .. image:: images/backup_sections.png
@@ -97,7 +97,7 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
    * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
-   * Move the switch next to *Only schema* to limit the back up to schema-level
+   * Move the switch next to *Only schemas* to limit the back up to schema-level
      database objects.
 
    * Move the switch next to *Blobs* towards left position to exclude large
@@ -113,10 +113,10 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
    * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* towards right position to exclude
+   * Move the switch next to *Privileges* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* towards right position to exclude
+   * Move the switch next to *Tablespaces* towards right position to exclude
      tablespaces.
 
    * Move the switch next to *Unlogged table data* towards right position to
@@ -126,25 +126,45 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
      commands that set the comments. **Note:** This option is visible only for
      database server greater than or equal to 11.
 
-Click the *Options* tab to continue. Use these additional fields to specify
-options like including ddl statements, verbose message or using set session
-authorization corresponding to *pg_dump* options.
+   * Move the switch next to *Publications* towards right position to exclude
+     publications.
+
+   * Move the switch next to *Subscriptions* towards right position to exclude
+     subscriptions.
+
+   * Move the switch next to *Security labels* towards right position to exclude
+     Security labels.
+
+   * Move the switch next to *Toast compressions* towards right position to exclude
+     Toast compressions. **Note:** This option is visible only for
+     database server greater than or equal to 14.
+
+   * Move the switch next to *Table access methods* towards right position to exclude
+     Table access methods. **Note:** This option is visible only for
+     database server greater than or equal to 15.
 
 .. image:: images/backup_queries.png
     :alt: Queries option on backup dialog
     :align: center
 
-* Move switches in the **Queries** field box to specify the type of statements
-  that should be included in the backup.
+Click the *Query Options* tab to continue. Use these additional fields to specify
+the type of statements that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* towards right position to dump
-     the data in the form of INSERT statements and include explicit column
-     names.  Please note: this may make restoration from backup slow.
-
-   * Move the switch next to *Use Insert commands* towards right position to
+   * Move the switch next to *Use INSERT commands* towards right position to
      dump the data in the form of INSERT statements rather than using a COPY
      command.  Please note: this may make restoration from backup slow.
 
+   * Use the *Maximum rows per INSERT command* field to controls the maximum
+     number of rows per INSERT command. **Note:** This option is visible only for
+     database server greater than or equal to 12.
+
+   * Move the switch next to *On conflict do nothing to INSERT command* towards
+     right position to add ON CONFLICT DO NOTHING to INSERT command.
+     This option is not valid unless *Use INSERT commands*, *Use Column INSERTS*
+     or *Maximum rows per INSERT command* is also specified.
+     **Note:** This option is visible only for database server greater than or
+     equal to 12.
+
    * Move the switch next to *Include CREATE DATABASE statement* towards right
      position to include a command in the backup that creates a new database
      when restoring the backup.
@@ -154,12 +174,59 @@ authorization corresponding to *pg_dump* options.
      database object with the same name before recreating the object during a
      backup.
 
-   * Move the switch next to *Load Via Partition Root* towards right position,
+   * Move the switch next to *Include IF EXISTS clause* towards right
+     position to add an IF EXISTS clause to drop databases and other objects.
+     This option is not valid unless *Include DROP DATABASE statement* is also set.
+
+.. image:: images/backup_table.png
+    :alt: Backup dialog tables section
+    :align: center
+
+Click the *Table Options* tab to continue. Use the fields in the *Table Options*
+tab related to tables that should be included in the backup.
+
+   * Move the switch next to *Use Column INSERTS* towards right position to dump
+     the data in the form of INSERT statements and include explicit column
+     names. Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Load via partition root* towards right position,
      so when dumping a COPY or INSERT statement for a partitioned table, target
      the root of the partitioning hierarchy which contains it rather than the
      partition itself. **Note:** This option is visible only for database server
      greater than or equal to 11.
 
+   * Move the switch next to *Enable row security* towards right position to
+     set row_security to on instead, allowing the user to dump the parts of the
+     contents of the table that they have access to. This option is relevant
+     only when dumping the contents of a table which has row security.
+
+   * Use the *Include table(s) and Children* field to dump the tables and any partitions 
+     or inheritance child tables of the tables matching the pattern.
+     **Note:** This option is visible only for database server greater than or
+     equal to 16.
+    
+   * The Exclude patterns field is utilized to exclude patterns in the following manner:
+
+   * Use the *Table(s)* field to not dump the tables matching the
+     pattern. Multiple patterns can be given separated by space.
+
+   * Use the *Table(s) data* field to not dump data for any tables
+     matching the pattern. Multiple patterns can be given separated by
+     spaces.
+
+   * Use the *Table(s) and children* field to not dump the tables and any
+     partitions or inheritance child tables of the tables matching the pattern.
+     **Note:** This option is visible only for database server greater than or
+     equal to 16.
+
+   * Use the *Table(s) data and children* field to not dump data for the
+     tables and any partitions or inheritance child tables of the tables matching 
+     the table pattern. **Note:** This option is visible only for database server
+     greater than or equal to 16.
+
+Click the *Options* tab to continue. Use the fields in the *Options*
+tab to provide other backup options.
+
 .. image:: images/backup_disable.png
     :alt: Disable option on backup dialog
     :align: center
@@ -167,7 +234,7 @@ authorization corresponding to *pg_dump* options.
 * Move switches in the **Disable** field box to specify the type of statements
   that should be excluded from the backup.
 
-   * Move the switch next to *Trigger* (active when creating a data-only backup)
+   * Move the switch next to *Triggers* (active when creating a data-only backup)
      towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
@@ -182,9 +249,6 @@ authorization corresponding to *pg_dump* options.
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* towards right position to include object
-     identifiers as part of the table data for each table.
-
    * Move the switch next to *Verbose messages* towards left position to instruct
      *pg_dump* to exclude verbose messages.
 
@@ -195,6 +259,26 @@ authorization corresponding to *pg_dump* options.
      position to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 
+   * Use the *Exclude schema* field to not dump schemas whose name matches
+     pattern.
+
+   * Use the *Extra float digits* field to use the specified value when dumping
+     floating-point data, instead of the maximum available precision.
+
+   * Use the *Lock wait timeout* field to do not wait forever to acquire shared
+     table locks at the beginning of the dump. Instead, fail if unable to lock a
+     table within the specified timeout.
+
+Click the *Objects* tab to continue.
+
+.. image:: images/backup_object_selection.png
+    :alt: Select objects in backup dialog
+    :align: center
+
+* Select the objects from tree to take backup of selected objects only.
+    * If Schema is selected then it will take the backup of that selected schema only.
+    * If any Table, View, Materialized View, Sequences, or Foreign Table is selected then it will take the backup of those selected objects.
+
 When you’ve specified the details that will be incorporated into the pg_dump
 command:
 
@@ -205,4 +289,4 @@ command:
 
 pgAdmin will run the backup process in background. You can view all the background
 process with there running status and logs on the :ref:`Processes <processes>`
-tab
+tab

docs/en_US/backup_server_dialog.rst

@@ -24,22 +24,27 @@ Use the fields in the *General* tab to specify the following:
   connection privileges on the selected server.  The role will be used for
   authentication during the backup.
 
+Click the *Data Options* tab to continue. Use the fields in the *Data Options*
+tab to provide options related to data or pgAdmin objects that correspond to *pg_dumpall*.
+
 .. image:: images/backup_server_objects.png
     :alt: Type of objects option on backup server dialog
     :align: center
 
-Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
-tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
-
 * Move switches in the **Type of objects** field box to specify details about
   the type of objects that will be backed up.
 
    * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
-   * Move the switch next to *Only schema* to limit the back up to schema-level
+   * Move the switch next to *Only schemas* to limit the back up to schema-level
      database objects.
 
+   * Move the switch next to *Only tablespaces* to limit the back
+     up to tablespaces only.
+
+   * Move the switch next to *Only roles* to limit the back up to roles only.
+
 .. image:: images/backup_server_do_not_save.png
     :alt: Do not save option on backup server dialog
     :align: center
@@ -50,10 +55,13 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
    * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* towards right position to exclude
+   * Move the switch next to *Role passwords* towards right position to exclude
+     passwords for roles.
+
+   * Move the switch next to *Privileges* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* towards right position to exclude
+   * Move the switch next to *Tablespaces* towards right position to exclude
      tablespaces.
 
    * Move the switch next to *Unlogged table data* towards right position to
@@ -63,26 +71,73 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
      commands that set the comments. **Note:** This option is visible only for
      database server greater than or equal to 11.
 
+   * Move the switch next to *Publications* towards right position to exclude
+     publications.
+
+   * Move the switch next to *Subscriptions* towards right position to exclude
+     subscriptions.
+
+   * Move the switch next to *Security labels* towards right position to exclude
+     Security labels.
+
+   * Move the switch next to *Toast compressions* towards right position to exclude
+     Toast compressions. **Note:** This option is visible only for
+     database server greater than or equal to 14.
+
+   * Move the switch next to *Table access methods* towards right position to exclude
+     Table access methods. **Note:** This option is visible only for
+     database server greater than or equal to 15.
+
 .. image:: images/backup_server_queries.png
     :alt: Queries option on backup server dialog
     :align: center
 
-* Move switches in the **Queries** field box to specify the type of statements
-  that should be included in the backup.
+Click the *Query Options* tab to continue. Use these additional fields to specify
+the type of statements that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* towards right position to dump
-     the data in the form of INSERT statements and include explicit column
-     names. Please note: this may make restoration from backup slow.
+   * Move the switch next to *Use INSERT commands* towards right position to
+     dump the data in the form of INSERT statements rather than using a COPY
+     command.  Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Use Insert commands* towards right position to dump
-     the data in the form of INSERT statements rather than using a COPY command.
-     Please note: this may make restoration from backup slow.
+   * Use the *Maximum rows per INSERT command* field to controls the maximum
+     number of rows per INSERT command. **Note:** This option is visible only for
+     database server greater than or equal to 12.
+
+   * Move the switch next to *On conflict do nothing to INSERT command* towards
+     right position to add ON CONFLICT DO NOTHING to INSERT command.
+     This option is not valid unless *Use INSERT commands*, *Use Column INSERTS*
+     or *Maximum rows per INSERT command* is also specified.
+     **Note:** This option is visible only for database server greater than or
+     equal to 12.
 
    * Move the switch next to *Include DROP DATABASE statement* towards right
      position to include a command in the backup that will drop any existing
      database object with the same name before recreating the object during a
      backup.
 
+   * Move the switch next to *Include IF EXISTS clause* towards right
+     position to add an IF EXISTS clause to drop databases and other objects.
+     This option is not valid unless *Include DROP DATABASE statement* is also set.
+
+.. image:: images/backup_server_table.png
+    :alt: Backup dialog tables section
+    :align: center
+
+Click the *Table Options* tab to continue. Use the fields in the *Table Options*
+tab related to tables that should be included in the backup.
+
+   * Move the switch next to *Use Column INSERTS* towards right position to dump
+     the data in the form of INSERT statements and include explicit column
+     names. Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Load via partition root* towards right position,
+     so when dumping a COPY or INSERT statement for a partitioned table, target
+     the root of the partitioning hierarchy which contains it rather than the
+     partition itself. **Note:** This option is visible only for database server
+     greater than or equal to 11.
+
+Click the *Options* tab to continue. Use the fields in the *Options*
+tab to provide other backup options.
 
 .. image:: images/backup_server_disable.png
     :alt: Disable option on backup server dialog
@@ -91,7 +146,7 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
 * Move switches in the **Disable** field box to specify the type of statements
   that should be excluded from the backup.
 
-   * Move the switch next to *Trigger* (active when creating a data-only backup)
+   * Move the switch next to *Triggers* (active when creating a data-only backup)
      towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
@@ -106,11 +161,8 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* towards right position to include object
-     identifiers as part of the table data for each table.
-
    * Move the switch next to *Verbose messages* towards left position to instruct
-     *pg_dump* to exclude verbose messages.
+     *pg_dumpall* to exclude verbose messages.
 
    * Move the switch next to *Force double quotes on identifiers* towards right
      position to force the quoting of all identifiers.
@@ -119,9 +171,24 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
      position to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 
-Click the *Backup* button to build and execute a command based on your
-selections; click the *Cancel* button to exit without saving work.
+   * Use the *Exclude database* field to not dump databases whose name matches
+     pattern.
+
+   * Use the *Extra float digits* field to use the specified value when dumping
+     floating-point data, instead of the maximum available precision.
+
+   * Use the *Lock wait timeout* field to do not wait forever to acquire shared
+     table locks at the beginning of the dump. Instead, fail if unable to lock a
+     table within the specified timeout.
+
+When you’ve specified the details that will be incorporated into the pg_dumpall
+command:
+
+* Click the *Backup* button to build and execute a command that builds a backup
+  based on your selections on the *Backup Server* dialog.
+
+* Click the *Cancel* button to exit without saving work.
 
 pgAdmin will run the backup process in background. You can view all the background
 process with there running status and logs on the :ref:`Processes <processes>`
-tab
+tab

docs/en_US/build_code_snippet.py

@@ -14,7 +14,7 @@ root = os.path.realpath(
 
 if sys.path[0] != root:
     sys.path.insert(0, root)
-
+import config
 from pgadmin.utils import PgAdminModule
 
 target = open('code_snippets.rst', 'w')

docs/en_US/clear_saved_passwords.rst

@@ -8,6 +8,7 @@ Use *Clear Saved Password* functionality to clear the saved password for the
 database server.
 
 .. image:: images/clear_saved_password.png
+    :alt: Clear saved password
     :align: center
 
 *Clear Saved Password* shows in the context menu for the selected server as well
@@ -17,6 +18,7 @@ Use *Clear SSH Tunnel Password* functionality to clear the saved password of SSH
 Tunnel to connect to the database server.
 
 .. image:: images/clear_tunnel_password.png
+    :alt: Clear SSH tunnel password
     :align: center
 
 *Clear SSH Tunnel Password* shows in the context menu for the selected server as

docs/en_US/cloud_edb_biganimal.rst

@@ -66,6 +66,8 @@ details.
 
 * Use the *Volume IOPS* field to specify the storage IOPS. This field is specific to AWS.
 
+* Use the *Disk throughput* field to specify the disk throughput. This field is specific to AWS.
+
 
 .. image:: images/cloud_biganimal_database.png
     :alt: Cloud Deployment Provider

docs/en_US/code_overview.rst

@@ -5,14 +5,14 @@
 **********************
 
 The bulk of pgAdmin is a Python web application written using the Flask framework
-on the backend, and HTML5 with CSS3, Bootstrap and jQuery on the front end. A
+on the backend, and HTML5 with CSS3,ReactJS on the front end. A
 desktop runtime is also included for users that prefer a desktop application to
-a web application, which is written using NWjs (Node Webkit).
+a web application, which is written using Electron.
 
 Runtime
 *******
 
-The runtime is based on NWjs which integrates a browser and the Python server
+The runtime is based on Electron which integrates a browser and the Python server
 creating a standalone application. The source code can be found in the
 **/runtime** directory in the source tree.
 
@@ -207,8 +207,7 @@ Front End
 
 pgAdmin uses javascript extensively for the front-end implementation. It uses
 require.js to allow the lazy loading (or, say load only when required),
-bootstrap and MaterialUI for UI look and feel, React for generating
-properties/create dialog for selected node. We have
+ReactJS with CSS and MaterialUI for UI look and feel. We have
 divided each module in small chunks as much as possible. Not all javascript
 modules are required to be loaded (i.e. loading a javascript module for
 database will make sense only when a server node is loaded completely.) Please

docs/en_US/code_review.rst

@@ -16,7 +16,7 @@ review process for any changes submitted for inclusion in pgAdmin.
   bulk updates every year). The start date should always be 2013, and the end year
   the current year, e.g.
 
-    Copyright (C) 2013 - 2023, The pgAdmin Development Team
+    Copyright (C) 2013 - 2025, The pgAdmin Development Team
 
 * Ensure there's a blank line immediately following any copyright headers.
 

docs/en_US/coding_standards.rst

@@ -22,14 +22,12 @@ purpose or how it works if not obvious from a quick review of the code itself.
 CSS 3
 *****
 
-CSS3 is used for styling and layout throughout the application. Extensive use is
-made of the Bootstrap Framework to aid in that process, however additional
-styles must still be created from time to time.
+CSS3 is used for styling and layout throughout the application.
 
 Most custom styling comes from individual modules which may advertise static
 stylesheets to be included in the module that is loading them via hooks.
 
-Styling overrides (for example, to alter the Bootstrap look and feel) will
+Styling overrides (for example, to alter the look and feel) will
 typically be found in the **overrides.css** file in the main static file
 directory for the application.
 
@@ -64,7 +62,7 @@ All HTML must be HTML 5 compliant.
 Javascript
 **********
 
-Client-side code is written in Javascript using jQuery and various plugins.
+Client-side code is written in Javascript using ReactJS and various plugins.
 Whilst much of the code is rendered from static files, there is also code that
 is rendered from templates using Jinja2 (often to inject the users settings) or
 constructed on the fly from module hooks.
@@ -122,7 +120,7 @@ with the required file header is shown below::
     #
     # pgAdmin 4 - PostgreSQL Tools
     #
-    # Copyright (C) 2013 - 2023, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2025, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

docs/en_US/collation_dialog.rst

@@ -50,6 +50,16 @@ settings:
 * Use the *LC_CTYPE* field to specify a locale with specified character
   classification. The locale must be applicable to the current database encoding.
   (See CREATE DATABASE for details.)
+* Use the drop-down listbox next to *Locale Provider* to select a locale services associated
+  with the collation. Possible values are: icu, libc. libc is the default.
+* Move the switch next to *Deterministic* to *YES* to specify whether the collation should use
+  deterministic comparisons. By default, this option is set to true. In a
+  deterministic comparison, strings that are not byte-wise equal are considered
+  unequal, even if they are considered logically equal in the comparison.
+* Use the *Rules* field to specify a rules for customizing the behavior of the collation.
+  It includes considerations such as character ordering, case sensitivity, and accent
+  sensitivity.
+* Use the *Version* field to specify version string to store with the collation object.
 
 
 Click the *SQL* tab to continue.

docs/en_US/column_dialog.rst

@@ -39,6 +39,12 @@ are disabled if inapplicable.)
   a text value.
 * Use the drop-down listbox next to *Collation* to apply a collation setting to
   the column.
+* Use the drop-down listbox next to *Compression* to set the compression method
+  for the column. Compression is supported only for variable-width data types,
+  and is used only when the column's storage mode is main or extended. This
+  option is available from v14 and above.
+* Use the drop-down listbox next to *Storage* to set the storage mode for the
+  column. This option is available from v16 and above.
 
 Click the *Constraints* tab to continue.
 

docs/en_US/config_py.rst

@@ -27,8 +27,8 @@ The configuration files are as follows:
   needed.
 
 * ``config_local.py``: This file is read after ``config_distro.py`` and is intended
-  for end users to change any default or packaging specific settings that they may
-  wish to adjust to meet local preferences or standards.This file is optional,
+  for the owner of the installation to change any default or packaging specific settings
+  that they may wish to adjust to meet local preferences or standards.This file is optional,
   and may be created by users in the same directory as ``config.py`` if
   needed.
 

docs/en_US/connect_to_server.rst

@@ -11,6 +11,7 @@ and select *Connect Server...* from the context menu.
 
 .. image:: images/connect_to_server.png
     :alt: Connect to server dialog
+    :align: center
 
 Provide authentication information for the selected server:
 
@@ -26,6 +27,7 @@ Tunnel and Database server passwords if not already saved.
 
 .. image:: images/connect_to_tunneled_server.png
     :alt: Connect to server dialog
+    :align: center
 
 Provide authentication information for the selected server:
 

docs/en_US/container_deployment.rst

@@ -26,9 +26,9 @@ where *<tag name>* is one of the following:
    +==========+===============================================================================+
    | latest   | The most recent release.                                                      |
    +----------+-------------------------------------------------------------------------------+
-   | 6.14     | A specific version (6.14 in this case).                                       |
+   | 8.4      | A specific version (8.4 in this case).                                        |
    +----------+-------------------------------------------------------------------------------+
-   | 6        | the latest release of a specific major version (major version 6 in this case).|
+   | 8        | the latest release of a specific major version (major version 8 in this case).|
    +----------+-------------------------------------------------------------------------------+
    | snapshot | The latest nightly test build.                                                |
    +----------+-------------------------------------------------------------------------------+
@@ -42,23 +42,22 @@ maintenance functions to be executed. Multiple versions are included in the
 following directories to allow use with different versions of the database
 server:
 
-* PostgreSQL 10: */usr/local/pgsql-10*
-* PostgreSQL 11: */usr/local/pgsql-11*
 * PostgreSQL 12: */usr/local/pgsql-12*
 * PostgreSQL 13: */usr/local/pgsql-13*
 * PostgreSQL 14: */usr/local/pgsql-14*
+* PostgreSQL 15: */usr/local/pgsql-15*
+* PostgreSQL 16: */usr/local/pgsql-16*
 
 The default binary paths set in the container are as follows:
 
 .. code-block:: bash
 
     DEFAULT_BINARY_PATHS = {
+        'pg-17': '/usr/local/pgsql-17',
+        'pg-16': '/usr/local/pgsql-16',
         'pg-15': '/usr/local/pgsql-15',
         'pg-14': '/usr/local/pgsql-14',
-        'pg-13': '/usr/local/pgsql-13',
-        'pg-12': '/usr/local/pgsql-12',
-        'pg-11': '/usr/local/pgsql-11',
-        'pg-10': '/usr/local/pgsql-10'
+        'pg-13': '/usr/local/pgsql-13'
     }
 
 this may be changed in the :ref:`preferences`.
@@ -133,7 +132,38 @@ than using the default.
 
 Override the default file path for the server definition list. See the
 /pgadmin4/servers.json mapped file below for more information. See the format
-of the `JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
+of the `Servers JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
+
+**PGADMIN_REPLACE_SERVERS_ON_STARTUP**
+
+*Default: null*
+
+By default, the server definitions are only loaded on first launch, i.e. when initializing the configuration database. See PGADMIN_SERVER_JSON_FILE above.
+
+If this variable is set to True, the server definitions will be replaced on every launch. This can be used to declaratively manage the server definitions.
+
+**PGADMIN_PREFERENCES_JSON_FILE**
+
+*Default: /pgadmin4/preferences.json*
+
+Override the default file path for the preferences customization at the container creation. See the
+/pgadmin4/preferences.json mapped file below for more information. See the format
+of the `Preferences JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/preferences.html#json-format>`_.
+
+**PGADMIN_CUSTOM_CONFIG_DISTRO_FILE**
+
+*Default: /pgadmin4/config_distro.py*
+
+Override the default file path for the pgadmin configurations file.This can be used while provisioning
+container with read only root file system to achieve a more secure pgadmin4 deployment for kubernetes.
+Note that if you are externally mapping this file, then environment variables passed using *PGADMIN_CONFIG_*
+suffix will be ignored.
+
+**PGPASS_FILE**
+
+*Default: <null>*
+This varible should be set to if you want to pass password using pgpass
+file for the servers added in pgadmin.
 
 **GUNICORN_ACCESS_LOGFILE**
 
@@ -229,6 +259,14 @@ pgAdmin in the container. Note that server definitions are only loaded on first
 launch, i.e. when the configuration database is created, and not on subsequent
 launches using the same configuration database.
 
+**/pgadmin4/preferences.json**
+
+If this file is mapped, preferences defined in it will be updated at launch
+time. This allows customization of preferences settings into the instance of
+pgAdmin in the container. Note that preferences are only set on first
+launch, i.e. when the configuration database is created, and not on subsequent
+launches using the same configuration database.
+
 **/certs/server.cert**
 
 If TLS is enabled, this file will be used as the servers TLS certificate.

docs/en_US/database_dialog.rst

@@ -19,6 +19,9 @@ Use the fields in the *General* tab to identify the database:
 
 * Use the *Database* field to add a descriptive name for the database. The name
   will be displayed in the *pgAdmin* tree control.
+* Use the *OID* field to specify the object identifier to be used for the new
+  database. Users can specify the value greater than 16383. This option is available
+  from v15 and above.
 * Select the owner of the database from the drop-down listbox in the *Owner*
   field.
 * Store notes about the database in the *Comment* field.
@@ -38,11 +41,25 @@ Use the *Definition* tab to set properties for the database:
 * Select a tablespace from the drop-down listbox in the *Tablespace* field. The
   selected tablespace will be the default tablespace used to contain database
   objects.
+* Select the strategy from the drop-down listbox in the *Strategy* field while
+  creating a new database. This option is available from v15 and above.
+* Select the locale provider from the drop-down listbox in the *Locale Provider*
+  field to set the default collation for this database. Possible values are: icu, libc and builtin.
+  This option is available from v15 and above. **Note:** The icu and libc options are available
+  from v15 and builtin option is available from v17 onwards.
 * Select the collation order from the drop-down listbox in the *Collation* field.
 * Select the character classification from the drop-down listbox in the
   *Character Type* field. This affects the categorization of characters, e.g.
   lower, upper and digit. The default, or a blank field, uses the character
   classification of the template database.
+* Select the icu locale from the drop-down listbox in the *ICU Locale* to
+  specifies the ICU locale ID if the ICU locale provider is used.
+  This option is available from v15 and above.
+* Specify the icu rules in the *ICU Rules* field as additional collation
+  rules to customize the behavior of the default collation of this database.
+  This option is available from v16 and above.
+* Select the builtin locale from the drop-down listbox in the *Builtin Locale* if the
+  builtin locale provider is used. This option is available from v17 and above.
 * Specify a connection limit in the *Connection Limit* field to configure the
   maximum number of connection requests. The default value (*-1*) allows
   unlimited connections to the database.

docs/en_US/dbms_job.rst

@@ -0,0 +1,108 @@
+.. _dbms_job:
+
+*****************
+`DBMS Job`:index:
+*****************
+
+Use the *DBMS Job* dialog to create a DBMS Job.
+
+.. image:: images/dbms_job_general.png
+    :alt: DBMS Job dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to create job:
+
+* Use the *Name* field to add a descriptive name for the job. The name will
+  be displayed in the *pgAdmin* object explorer.
+* Use the *Enabled?* switch to indicate that job should be enabled or disabled.
+* Use the *Job Type* field to select the type of the job. Type could be SELF-CONTAINED or PRE-DEFINED.
+  If the Job Type is Self-Contained you need to specify the action and repeat interval in the Action and Repeat tabs respectively.
+  If the Job Type is Pre-Defined you need to specify the existing Program and Schedule names in the Pre-Defined tab.
+* Store notes about the job in the *Comment* field.
+
+Click the *Action* tab to continue.
+
+.. image:: images/dbms_job_action.png
+    :alt: DBMS Job dialog action tab
+    :align: center
+
+Use the *Action* tab to select the action for the job. This tab is only enabled when the job type is 'SELF-CONTAINED'.
+
+* Use the *Type* field to select the type of the job. Type could be PLSQL BLOCK or STORED PROCEDURE.
+* Use the *Procedure* field to select an existing procedure that executes when the job is invoked.
+* *Number of Arguments* field is read-only and indicates the quantity of arguments necessary for the chosen procedure.
+
+Click the *Code* tab to continue.
+
+.. image:: images/dbms_job_code.png
+    :alt: DBMS Job dialog code tab
+    :align: center
+
+* Use the *Code* field to write the code that executes when the job is invoked.
+  This tab is only enabled when the job type is 'SELF-CONTAINED' and type of the action is set to 'PLSQL BLOCK'.
+
+
+Click the *Arguments* tab to continue.
+
+.. image:: images/dbms_job_arguments.png
+    :alt: DBMS Job dialog arguments tab
+    :align: center
+
+* *Arguments* tab outlines the arguments required by the selected procedure in the 'Action' tab. This tab is only enabled when the job type is 'SELF-CONTAINED'.
+
+
+Click the *Repeat* tab to continue.
+
+.. image:: images/dbms_job_repeat.png
+    :alt: DBMS Job dialog repeat tab
+    :align: center
+
+Use the *Repeat* tab to select the repeat interval for the job. This tab is only enabled when the job type is 'SELF-CONTAINED'.
+
+* Use the calendar selector in the *Start* field to specify the starting date
+  and time for the job.
+* Use the calendar selector in the *End* field to specify the ending date and
+  time for the job.
+* Use the *Frequency* field to select the frequency. Frequency is one of the following:
+  YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY.
+* Use the *Date* field to select the date on which job will execute.Date is YYYYMMDD.
+* Use the *Months* field to select the months in which the job will execute.
+* Use the *Week Days* field to select the days on which the job will execute.
+* Use the *Month Days* field to select the numeric days on which the job will
+  execute.
+* Use the *Hours* field to select the hour at which the job will execute.
+* Use the *Minutes* field to select the minute at which the job will execute.
+
+Click the *Pre-Defined* tab to continue.
+
+.. image:: images/dbms_job_predefined.png
+    :alt: DBMS Job dialog predefined tab
+    :align: center
+
+Use the *Pre-Defined* tab to select the existing program and schedule to create the job.
+This tab is only enabled when the job type is 'PRE-DEFINED'.
+
+* Use the *Program Name* field to select the existing program.
+* Use the *Schedule Name* field to select an existing schedule.
+
+
+Click the *SQL* tab to continue.
+
+Your entries in the *DBMS Job* dialog generate a SQL command (see an example below).
+Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
+SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in
+the *DBMS Job* dialog:
+
+.. image:: images/dbms_job_sql.png
+    :alt: DBMS Job dialog sql tab
+    :align: center
+
+* Click the *Info* button (i) to access online help.
+* Click the *Help* button (?) to access dialog help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/dbms_job_scheduler.rst

@@ -0,0 +1,45 @@
+.. _dbms_job_scheduler:
+
+********************************
+`Using EDB Job Scheduler`:index:
+********************************
+
+In the past versions of EPAS, DBMS_SCHEDULER or DBMS_JOBS required the configuration
+of pgAgent, an essential service for their functionality. Maintaining pgAgent in a
+production environment is cumbersome. The need for correct configuration, regular updates,
+and ensuring the service’s health added complexity.
+
+EPAS 16 revolutionizes job scheduling by eliminating the need for the pgAgent component.
+The new version introduces EDB Job Scheduler which is an extension that runs the job scheduler
+as a background process for the DBMS_SCHEDULER and DBMS_JOB packages.
+
+The EDB Job Scheduler has a scheduler process that starts when the database cluster starts.
+To start the scheduler process, load the EDB Job Scheduler extension using the **shared_preload_libraries**
+parameter. After you load the extension, create the extension **'edb_job_scheduler'** and **'dbms_scheduler'** using
+the CREATE EXTENSION command. The database in which you're creating the extension must be listed in the
+**edb_job_scheduler.database_list** parameter.
+
+Instructions for configuring the EDB Job Scheduler can be found in the
+`Configuring EDB Job Scheduler <https://www.enterprisedb.com/docs/pg_extensions/edb_job_scheduler/configuring/>`_.
+
+.. image:: images/dbms_job_scheduler.png
+    :alt: DBMS Job Scheduler Object Browser
+    :align: center
+
+Check the status of all the jobs
+********************************
+
+To check the running status of all the jobs select the 'DBMS Job Scheduler' collection node from the object
+explorer and select the Properties tab.
+
+.. image:: images/dbms_job_details.png
+    :alt: DBMS Job Details
+    :align: center
+
+
+.. toctree::
+   :maxdepth: 1
+
+   dbms_job
+   dbms_program
+   dbms_schedule

docs/en_US/dbms_program.rst

@@ -0,0 +1,71 @@
+.. _dbms_program:
+
+*********************
+`DBMS Program`:index:
+*********************
+
+Use the *DBMS Program* dialog to create a DBMS Program.
+
+.. image:: images/dbms_program_general.png
+    :alt: DBMS Program dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to create program:
+
+* Use the *Name* field to add a descriptive name for the program. The name will
+  be displayed in the *pgAdmin* object explorer.
+* Use the *Enabled?* switch to indicate that program should be enabled or disabled.
+* Store notes about the program in the *Comment* field.
+
+Click the *Action* tab to continue.
+
+.. image:: images/dbms_program_action.png
+    :alt: DBMS Program dialog action tab
+    :align: center
+
+Use the *Action* tab to select the action for the program:
+
+* Use the *Type* field to select the type of the program. Type could be PLSQL BLOCK or STORED PROCEDURE.
+* Use the *Procedure* field to select an existing procedure that executes when the program is invoked.
+* *Number of Arguments* field is read-only and indicates the quantity of arguments necessary for the chosen procedure.
+
+Click the *Code* tab to continue.
+
+.. image:: images/dbms_program_code.png
+    :alt: DBMS Program dialog code tab
+    :align: center
+
+* Use the *Code* field to write the code that executes when the program is invoked.
+  This tab is only enabled when the type of the program is set to 'PLSQL BLOCK'.
+
+
+Click the *Arguments* tab to continue.
+
+.. image:: images/dbms_program_arguments.png
+    :alt: DBMS Program dialog arguments tab
+    :align: center
+
+* *Arguments* tab is a read-only section that outlines the arguments required by the selected procedure in the 'Action' tab.
+
+
+Click the *SQL* tab to continue.
+
+Your entries in the *DBMS Program* dialog generate a SQL command (see an example below).
+Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
+SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in
+the *DBMS Program* dialog:
+
+.. image:: images/dbms_program_sql.png
+    :alt: DBMS Program dialog sql tab
+    :align: center
+
+* Click the *Info* button (i) to access online help.
+* Click the *Help* button (?) to access dialog help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
+

docs/en_US/dbms_schedule.rst

@@ -0,0 +1,61 @@
+.. _dbms_schedule:
+
+**********************
+`DBMS Schedule`:index:
+**********************
+
+Use the *DBMS Schedule* dialog to create a DBMS Schedule.
+
+.. image:: images/dbms_schedule_general.png
+    :alt: DBMS Schedule dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to create schedule:
+
+* Use the *Name* field to add a descriptive name for the schedule. The name will
+  be displayed in the *pgAdmin* object explorer.
+* Store notes about the schedule in the *Comment* field.
+
+Click the *Repeat* tab to continue.
+
+.. image:: images/dbms_schedule_repeat.png
+    :alt: DBMS Schedule dialog repeat tab
+    :align: center
+
+Use the *Repeat* tab to select the repeat interval for the schedule:
+
+* Use the calendar selector in the *Start* field to specify the starting date
+  and time for the schedule.
+* Use the calendar selector in the *End* field to specify the ending date and
+  time for the schedule.
+* Use the *Frequency* field to select the frequency. Frequency is one of the following:
+  YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY.
+* Use the *Date* field to select the date on which schedule will execute.Date is YYYYMMDD.
+* Use the *Months* field to select the months in which the schedule will execute.
+* Use the *Week Days* field to select the days on which the schedule will execute.
+* Use the *Month Days* field to select the numeric days on which the schedule will
+  execute.
+* Use the *Hours* field to select the hour at which the schedule will execute.
+* Use the *Minutes* field to select the minute at which the schedule will execute.
+
+
+Click the *SQL* tab to continue.
+
+Your entries in the *DBMS Schedule* dialog generate a SQL command (see an example below).
+Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
+SQL command.
+
+**Example**
+
+The following is an example of the sql command generated by user selections in
+the *DBMS Schedule* dialog:
+
+.. image:: images/dbms_schedule_sql.png
+    :alt: DBMS Schedule dialog sql tab
+    :align: center
+
+* Click the *Info* button (i) to access online help.
+* Click the *Help* button (?) to access dialog help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/debugger.rst

@@ -61,6 +61,7 @@ values required by the program:
 
 .. image:: images/debug_params.png
     :alt: Debugger parameter dialog
+    :align: center
 
 Use the fields on the *Debugger* dialog to provide a value for each parameter:
 
@@ -100,25 +101,29 @@ The toolbar options are:
     :alt: Debugger navigation toolbar
     :align: center
 
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| Option                  | Action                                                                                                    |
-+=========================+===========================================================================================================+
-| *Step into*             | Click the *Step into* icon to execute the currently highlighted line of code.                             |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Step over*             | Click the *Step over* icon to execute a line of code, stepping over any sub-functions invoked by the code.|
-|                         | The sub-function executes, but is not debugged unless it contains a breakpoint.                           |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Continue/Start*        | Click the *Continue/Start* icon to execute the highlighted code, and continue until the program           |
-|                         | encounters a breakpoint or completes.                                                                     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Toggle breakpoint*     | Use the *Toggle breakpoint* icon to enable or disable a breakpoint (without removing the breakpoint).     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Clear all breakpoints* | Click the *Clear all breakpoints* icon to remove all breakpoints from the program.                        |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Stop*                  | Click the *Stop* icon to halt the execution of a program.                                                 |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Help*                  | Click the *Help* icon to open debugger documentation.                                                     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
+.. table::
+    :class: longtable
+    :widths: 1 4 1
+
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | Option                  | Action                                                                                                    | Shortcut               |
+    +=========================+===========================================================================================================+========================+
+    | *Step into*             | Click the *Step into* icon to execute the currently highlighted line of code.                             | Option/Alt + Shift + I |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Step over*             | Click the *Step over* icon to execute a line of code, stepping over any sub-functions invoked by the code.| Option/Alt + Shift + O |
+    |                         | The sub-function executes, but is not debugged unless it contains a breakpoint.                           |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Continue/Start*        | Click the *Continue/Start* icon to execute the highlighted code, and continue until the program           | Option/Alt + Shift + C |
+    |                         | encounters a breakpoint or completes.                                                                     |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Toggle breakpoint*     | Use the *Toggle breakpoint* icon to enable or disable a breakpoint (without removing the breakpoint).     | Option/Alt + Shift + T |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Clear all breakpoints* | Click the *Clear all breakpoints* icon to remove all breakpoints from the program.                        | Option/Alt + Shift + X |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Stop*                  | Click the *Stop* icon to halt the execution of a program.                                                 | Option/Alt + Shift + S |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Help*                  | Click the *Help* icon to open debugger documentation.                                                     |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
 
 The top panel of the debugger window displays the program body; click in the
 grey margin next to a line number to add a breakpoint.  The highlighted line in

docs/en_US/desktop_deployment.rst

@@ -36,43 +36,34 @@ See :ref:`config_py` for more information on configuration settings.
 Desktop Runtime Standalone Application
 ======================================
 
-The Desktop Runtime is based on `NWjs <https://nwjs.io/>`_ which integrates a
+The Desktop Runtime is based on `Electron <https://www.electronjs.org/>`_ which integrates a
 browser and the Python server creating a standalone application.
 
 .. image:: images/runtime_standalone.png
     :alt: Runtime Standalone
     :align: center
 
-Runtime Menu
-------------
+Runtime Menu Items
+------------------
 
 .. image:: images/runtime_menu.png
     :alt: Runtime Menu
     :align: center
 
-Use the *File Menu* to access the *Runtime Menu*:
+Use the *File Menu* to access the runtime menu items:
 
 +-------------------------+---------------------------------------------------------------------------------------------------------+
 | Option                  | Action                                                                                                  |
 +=========================+=========================================================================================================+
-| *Configure...*          | Click to open configuration dialog to configure fixed port, port number and connection timeout.         |
+| *View logs...*          | Click to open the view log dialog to view the pgAdmin 4 logs.                                           |
 +-------------------------+---------------------------------------------------------------------------------------------------------+
-| *View log...*           | Click to open the view log dialog to view the pgAdmin 4 logs.                                           |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Enter Full Screen*     | Click to enter/exit the full screen mode. Keyboard Shortcuts: OSX (Cmd + Ctrl + F), Other OS (F10).     |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Actual Size*           | Click to change the window size to it original size. Keyboard Shortcuts: OSX (Cmd + 0),                 |
-|                         | Other OS (Ctrl + 0).                                                                                    |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Zoom In*               | Click to increase the zoom level. Keyboard Shortcuts: OSX (Cmd + +), Other OS (Ctrl + +).               |
-+-------------------------+---------------------------------------------------------------------------------------------------------+
-| *Zoom Out*              | Click to decrease the zoom level. Keyboard Shortcuts: OSX (Cmd + -), Other OS (Ctrl + -).               |
+| *Configure runtime...*  | Click to open configuration dialog to configure fixed port, port number and connection timeout.         |
 +-------------------------+---------------------------------------------------------------------------------------------------------+
 
 Configuration Dialog
 --------------------
 
-Use the *Runtime Menu* to access the *Configuration* dialog:
+Use the *Configure runtime...* option to access the *Configuration* dialog:
 
 .. image:: images/runtime_configuration.png
     :alt: Runtime Configuration
@@ -101,7 +92,7 @@ Timeout*, and 'Open Documentation in Default Browser?' configuration parameters:
 Log dialog
 ----------
 
-Use the *Runtime Menu* to access the *Log* dialog:
+Use the *File Menu* to access the *View Logs* dialog:
 
 .. image:: images/runtime_view_log.png
     :alt: Runtime View Log

docs/en_US/directory_dialog.rst

@@ -0,0 +1,87 @@
+.. _directory_dialog:
+
+*************************
+`Directory Dialog`:index:
+*************************
+
+Use the Directory dialog to create an alias for a file system directory path.
+To create directories, you must have the CREATE ANY DIRECTORY system privilege.
+When you create a directory, you are automatically granted READ and WRITE privileges
+on the directory, and you can grant READ and WRITE privileges to other users and roles.
+The superuser can also grant these privileges to other users and roles.
+
+Please note that directories are supported when connected to EDB Postgres Advanced Server.
+For more information about using directories, please see the EDB Postgres Advanced Server Guide, available at:
+
+   https://www.enterprisedb.com/docs/epas/latest/epas_compat_sql/
+
+
+The *Directory* dialog organizes the definition of a directory through the
+following tabs: *General*, *Definition*, *Security*, and *SQL*.
+The *SQL* tab displays the SQL code generated by dialog selections.
+
+.. image:: images/directory_general.png
+    :alt: Directory general tab
+    :align: center
+
+Use the fields on the *General* tab to specify directory attributes:
+
+* Use the *Name* field to add a directory alias name. This name will be displayed in the object explorer.
+* Select the owner of the directory from the drop-down listbox in the *Owner*
+  field.
+
+Click the *Definition* tab to continue.
+
+.. image:: images/directory_definition.png
+    :alt: Directory dialog definition tab
+    :align: center
+
+* Use the *Location* field to specify a fully qualified directory path represented
+  by the alias name. The CREATE DIRECTORY command doesn't create the operating system directory.
+  The physical directory must be created independently using operating system commands.
+
+Click the *Security* tab to continue.
+
+.. image:: images/directory_security.png
+    :alt: Directory dialog security tab
+    :align: center
+
+NOTE:- This *Security* tab will be only available for EPAS 17.
+
+Use the *Security* tab to assign privileges for the directory.
+
+Use the *Privileges* panel to assign security privileges. Click the *Add* icon
+(+) to assign a set of privileges:
+
+* Select the name of the role from the drop-down listbox in the *Grantee* field.
+* The current user, who is the default grantor for granting the privilege, is displayed in the *Grantor* field.
+* Click inside the *Privileges* field. Check the boxes to the left of one or
+  more privileges to grant the selected privileges to the specified user.
+
+Click the *Add* icon to assign additional sets of privileges; to discard a
+privilege, click the trash icon to the left of the row and confirm deletion in
+the *Delete Row* popup.
+
+Click the *SQL* tab to continue.
+
+Your entries in the *Directory* dialog generate a SQL command (see an example
+below). Use the *SQL* tab for review; revisit or switch tabs to make any changes
+to the SQL command.
+
+Example
+*******
+
+The following is an example of the sql command generated by user selections in
+the *Directory* dialog:
+
+.. image:: images/directory_sql.png
+    :alt: Directory dialog sql tab
+    :align: center
+
+The example shown demonstrates creating a directory named *test1*. It has a
+*location* value equal to */home/test_dir*.
+
+* Click the *Info* button (i) to access online help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/editgrid.rst

@@ -212,6 +212,7 @@ To add new column(s) in data sorting grid, click on the [+] icon.
 
 * Use the drop-down *Column* to select the column you want to sort.
 * Use the drop-down *Order* to select the sort order for the column.
+* Use the drop-down *NULLs* to select the NULL values order for the column.
 
 To delete a row from the grid, click the trash icon.
 
@@ -222,3 +223,18 @@ To delete a row from the grid, click the trash icon.
    :maxdepth: 2
 
    viewdata_filter
+
+
+
+Promote View/Edit Data to Query Tool
+************************************
+
+A View/Edit Data tab can be converted to a Query Tool Tab just by editing the query. Once you start editing, it will ask if you really want to move away from View/Edit.
+
+.. image:: images/promote_view_edit_data_warning.png
+    :alt: Promote View/Edit Data tab to Query Tool tab warning
+    :align: center
+
+You can disable the dialog by selecting the "Don't Ask again" checkbox. If you wish to resume the confirmation dialog, you can do it from "Prefrences -> Query Tool -> Editor -> Show View/Edit Data Promotion Warning?"
+
+Once you chose to continue, you won't be able to use the features of View/Edit mode like the filter and sorting options, limit, etc. It is a one-way conversion. It will be a query tool now.

docs/en_US/erd_tool.rst

@@ -18,7 +18,14 @@ The Entity-Relationship Diagram (ERD) tool is a database design tool that provid
     :alt: ERD tool window
     :align: center
 
-You can open multiple copies of the ERD tool in individual tabs simultaneously. To close a copy of the ERD tool, click the *X* in the upper-right hand corner of the tab bar.
+You can open multiple copies of the ERD tool in individual tabs simultaneously.
+You can also generate an ERD from a database, schema or a table.
+
+* The ERD for database will fetch all the tables from all the schemas of the database and plot them with foreign key links.
+* The ERD for schema will fetch all the tables from a schema and plot them with foreign key links. If any table refers to a table in another
+  schema, then that link/foreign key will be removed.
+* The ERD for table will fetch all the tables linked directly or indirectly to mentioned table. You can change the depth of traversal from :ref:`Preferences <preferences>`.
+
 
 Toolbar
 *******
@@ -41,9 +48,9 @@ File Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
-   | *Open File*          | Click the *Open File* icon to load a previously saved diagram.                                    | Ctrl + O       |
+   | *Open File*          | Click the *Open File* icon to load a previously saved diagram.                                    | Cmd/Ctrl + O   |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Save*               | Click the *Save* icon to perform a quick-save of a previously saved diagram, or to save the       | Ctrl + S       |
+   | *Save*               | Click the *Save* icon to perform a quick-save of a previously saved diagram, or to save the       | Cmd/Ctrl + S   |
    |                      | diagram to a file.                                                                                |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | *Save as*            | Click the *Save As* to open a new browser dialog and specify a new location to save the diagram.  | Ctrl + Shift + |
@@ -60,13 +67,13 @@ Export Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
-   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option + Ctrl +|
-   |                      | with the generated SQL ready for execution.                                                       | S              |
+   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option/Alt +   |
+   |                      | with the generated SQL ready for execution.                                                       | Ctrl + S       |
    |                      | You can select the option *With DROP Table* if you wish to have DROP Table DDL statements before  |                |
    |                      | each CREATE Table DDL. You can see the option by clicking the down arrow beside the SQL button.   |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option + Ctrl +|
-   |                      |                                                                                                   | I              |
+   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option/Alt +   |
+   |                      |                                                                                                   | Ctrl + I       |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
 
 Editing Options
@@ -200,6 +207,22 @@ The table node shows table details in a graphical representation:
 * you can click on the node and drag to move on the canvas.
 * Upon double click on the table node or by clicking the edit button from the toolbar, the table dialog opens where you can change the table details. Refer :ref:`table dialog <table_dialog>` for information on different fields.
 
+The One to One Link Dialog
+***************************
+
+.. image:: images/erd_11_dialog.png
+    :alt: ERD tool 1-1 dialog
+    :align: center
+
+The one to one link dialog allows you to:
+
+* Add a one to one relationship between two tables.
+* *Local Table* is the table that references a table and has the *one* end point.
+* *Local Column* the column that references.
+* *Select Constraint* To implement one to one relationship, the *Local Column* must have primaty key or unique constraint. The default is a unique constraint. Please note that this field is visible only when the selected *Local Column* does not have either of the mentioned constraints.
+* *Referenced Table* is the table that is being referred and has the *one* end point.
+* *Referenced Column* the column that is being referred.
+
 The One to Many Link Dialog
 ***************************
 

docs/en_US/extension_dialog.rst

@@ -23,6 +23,9 @@ Use the fields in the *General* tab to identify an extension:
 
 * Use the drop-down listbox in the *Name* field to select the extension. Each
   extension must have a unique name.
+* Move the switch next to *Cascade?* towards right position to automatically
+  install any extensions that this extension depends on that are not already
+  installed.
 * Store notes about the extension in the *Comment* field.
 
 Click the *Definition* tab to continue.
@@ -55,7 +58,7 @@ the *Extension* dialog:
     :align: center
 
 The command creates the *adminpack* extension in the *public* schema.  It is
-version *1.0* of *adminpack*.
+version *2.0* of *adminpack*.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.

docs/en_US/function_dialog.rst

@@ -35,8 +35,10 @@ Click the *Definition* tab to continue.
 
 Use the fields in the *Definition* tab to define the function:
 
+* Move the *Custom return type?* switch to provide a user defined return type.
 * Use the drop-down listbox next to *Return type* to select the data type
-  returned by the function, if any.
+  returned by the function, if any. If *Custom return type?* is enabled this field
+  will change to an input text field.
 * Use the drop-down listbox next to *Language* to select the implementation
   language. The default is *sql*.
 * Use the fields in the *Arguments* to define an argument. Click the *Add*