revert(pkg): back out all _fixup_imports path-handling attempts

pkg/mac/build-functions.sh reverted to bd841b882's state - keeps the
notarization diagnostic fix (print REQUEST_STATUS + fetch notarytool
log on failure), drops everything from 0296de48e through 6891b5e12.

Five iterations trying to fix _fixup_imports's otool handling of
"pgAdmin 4 Helper (GPU)" (newline-based path list, otool-classic
fallback via bare name, via resolved absolute path, absolute-path
retries for otool/install_name_tool) all failed to get the appbundle
build past this file. Confirmed along the way: the path itself is
byte-for-byte correct and the file verifiably exists at the moment
otool runs (od -c / ls -la evidence from a live buildfarm run); both
otool and otool-classic, called directly with correct quoting and a
resolved absolute path, still fail identically on it. That's a real
bug/limitation in Apple's tooling on this build node, not fixable by
further changes to how this script constructs or passes the path.

Reverting rather than continuing to guess. The stale nspkg.pth /
--system-site-packages fix in pkg/linux/build-functions.sh (verified
working, pgadmin4-rpm-build #180 succeeded) is untouched by this.

.coderabbit.yaml

@@ -0,0 +1,186 @@
+language: en-US
+tone_instructions: ''
+early_access: false
+enable_free_tier: true
+reviews:
+  profile: chill
+  request_changes_workflow: false
+  high_level_summary: true
+  high_level_summary_placeholder: '@coderabbitai summary'
+  high_level_summary_in_walkthrough: false
+  auto_title_placeholder: '@coderabbitai'
+  auto_title_instructions: ''
+  review_status: true
+  commit_status: true
+  fail_commit_status: false
+  collapse_walkthrough: false
+  changed_files_summary: true
+  sequence_diagrams: true
+  estimate_code_review_effort: true
+  assess_linked_issues: true
+  related_issues: true
+  related_prs: true
+  suggested_labels: true
+  labeling_instructions: []
+  auto_apply_labels: false
+  suggested_reviewers: true
+  auto_assign_reviewers: false
+  in_progress_fortune: true
+  poem: false
+  path_filters: []
+  path_instructions: []
+  abort_on_close: true
+  disable_cache: false
+  auto_review:
+    enabled: true
+    auto_incremental_review: true
+    ignore_title_keywords: []
+    labels: []
+    drafts: false
+    base_branches: []
+    ignore_usernames: []
+  finishing_touches:
+    docstrings:
+      enabled: true
+    unit_tests:
+      enabled: true
+  pre_merge_checks:
+    docstrings:
+      mode: warning
+      threshold: 80
+    title:
+      mode: warning
+      requirements: ''
+    description:
+      mode: warning
+    issue_assessment:
+      mode: warning
+    custom_checks: []
+  tools:
+    ast-grep:
+      rule_dirs: []
+      util_dirs: []
+      essential_rules: true
+      packages: []
+    shellcheck:
+      enabled: true
+    ruff:
+      enabled: true
+    markdownlint:
+      enabled: true
+    github-checks:
+      enabled: true
+      timeout_ms: 900000
+    languagetool:
+      enabled: true
+      enabled_rules: []
+      disabled_rules: []
+      enabled_categories: []
+      disabled_categories: []
+      enabled_only: false
+      level: default
+    biome:
+      enabled: true
+    hadolint:
+      enabled: true
+    swiftlint:
+      enabled: true
+    phpstan:
+      enabled: true
+      level: default
+    phpmd:
+      enabled: true
+    phpcs:
+      enabled: true
+    golangci-lint:
+      enabled: true
+    yamllint:
+      enabled: true
+    gitleaks:
+      enabled: true
+    checkov:
+      enabled: true
+    detekt:
+      enabled: true
+    eslint:
+      enabled: true
+    flake8:
+      enabled: true
+    rubocop:
+      enabled: true
+    buf:
+      enabled: true
+    regal:
+      enabled: true
+    actionlint:
+      enabled: true
+    pmd:
+      enabled: true
+    clang:
+      enabled: true
+    cppcheck:
+      enabled: true
+    semgrep:
+      enabled: true
+    circleci:
+      enabled: true
+    clippy:
+      enabled: true
+    sqlfluff:
+      enabled: true
+    prismaLint:
+      enabled: true
+    pylint:
+      enabled: true
+    oxc:
+      enabled: true
+    shopifyThemeCheck:
+      enabled: true
+    luacheck:
+      enabled: true
+    brakeman:
+      enabled: true
+    dotenvLint:
+      enabled: true
+    htmlhint:
+      enabled: true
+    checkmake:
+      enabled: true
+    osvScanner:
+      enabled: true
+chat:
+  art: true
+  auto_reply: true
+  integrations:
+    jira:
+      usage: auto
+    linear:
+      usage: auto
+knowledge_base:
+  opt_out: false
+  web_search:
+    enabled: true
+  code_guidelines:
+    enabled: true
+    filePatterns: []
+  learnings:
+    scope: auto
+  issues:
+    scope: auto
+  jira:
+    usage: auto
+    project_keys: []
+  linear:
+    usage: auto
+    team_keys: []
+  pull_requests:
+    scope: auto
+  mcp:
+    usage: auto
+    disabled_servers: []
+code_generation:
+  docstrings:
+    language: en-US
+    path_instructions: []
+  unit_tests:
+    path_instructions: []

.dockerignore

@@ -1,5 +1,5 @@
-.git
 web/node_modules
+web/config_*.py
 web/*.log
 web/regression
 web/**/tests/

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and normalize end of lines to LF (\n)
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,7 +34,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. Windows 10, OSX monterey]
- - Version: [e.g. 6.15]
+ - pgAdmin version: [e.g. 6.15]
  - Mode: [e.g Desktop or Server]
  - Browser (if running in server mode): [e.g. chrome, safari]
  - Package type: [e.g. RPM, DEB, Python, Container, etc.]

.github/dependabot.yml

@@ -0,0 +1,55 @@
+version: 2
+updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "Dependencies"
+    commit-message:
+      prefix: "Docker dependency"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "Dependencies"
+    commit-message:
+      prefix: "Python dependency"
+
+  - package-ecosystem: "pip"
+    directory: "/tools"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "Dependencies"
+    commit-message:
+      prefix: "Python dependency"
+
+  - package-ecosystem: "pip"
+    directory: "/web/regression"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "Dependencies"
+    commit-message:
+      prefix: "Python dependency"
+
+  - package-ecosystem: "npm"
+    directory: "/runtime"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "Dependencies"
+    commit-message:
+      prefix: "Javascript dependency"
+
+  - package-ecosystem: "npm"
+    directory: "/web"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "Dependencies"
+    commit-message:
+      prefix: "Javascript dependency"

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

@@ -0,0 +1,28 @@
+name: Check container build
+
+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:
+  build-container:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Build the container
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          context: .

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

@@ -1,39 +0,0 @@
-name: Check documentation build
-
-on:
-  # Triggers the workflow on push or pull request events but only for the "master" branch
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-
-      # Run the tests
-      - name: Install dependencies
-        run: sudo apt install build-essential python3-dev libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev
-
-      - name: Install requirements
-        run: pip install -r requirements.txt
-
-      - name: Install sphinx
-        run: pip install sphinx==6.1.1
-
-      - name: Install sphinx youtube
-        run: pip install sphinxcontrib-youtube
-
-      - name: Check the documentation
-        run: make docs

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

@@ -0,0 +1,61 @@
+name: Check documentation builds
+
+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:
+  build-docs:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install platform dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev latexmk texlive-latex-recommended tex-gyre texlive-latex-extra
+
+      - name: Install Python dependencies
+        run: make install-python
+
+      - name: Check the HTML build
+        run: |
+          . venv/bin/activate
+          make docs
+
+      - name: Archive HTML
+        uses: actions/upload-artifact@v4
+        with:
+          name: pgadmin4-html-build-output
+          path: docs/en_US/_build/html/*
+
+      - name: Check the ePub build
+        run: |
+          . venv/bin/activate
+          make docs-epub
+
+      - name: Archive ePub
+        uses: actions/upload-artifact@v4
+        with:
+          name: pgadmin4-epub-build-output
+          path: docs/en_US/_build/epub/pgAdmin4.epub
+
+      - name: Check the PDF build
+        run: |
+          . venv/bin/activate
+          make docs-pdf
+
+      - name: Archive PDF
+        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

@@ -1,36 +1,35 @@
 name: Check Javascript style
 
 on:
-  # Triggers the workflow on push or pull request events but only for the "master" branch
   push:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+  check-javascript-style:
+    runs-on: ubuntu-22.04
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version $(node -p "require('./web/package.json').packageManager.split('@')[1]")
 
-      # Run the tests
-      - name: Install nodejs
-        run: sudo apt install nodejs
-        
-      - name: Install yarn
-        run: sudo npm install --global yarn
-        
       - name: Install Node modules
-        run: cd web && yarn install
+        run: |
+          cd web
+          yarn install
 
       - name: Run the linter
-        run: cd web && yarn run linter
+        run: |
+          cd web
+          yarn run linter

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

@@ -0,0 +1,39 @@
+name: Check Python build
+
+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:
+  build-python-package:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install platform dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev
+
+      - name: Install Python dependencies
+        run: make install-python
+
+      - name: Check the Python wheel build
+        run: |
+          . venv/bin/activate
+          make pip
+
+      - name: Archive Python wheel
+        uses: actions/upload-artifact@v4
+        with:
+          name: pgadmin4-python-build-output
+          path: dist/*

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

@@ -1,30 +1,28 @@
 name: Check Python style
 
 on:
-  # Triggers the workflow on push or pull request events but only for the "master" branch
   push:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
 
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+  check-python-style:
+    runs-on: ubuntu-22.04
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      # Run the tests
-      - name: Install pycodestyle
-        run: pip install pycodestyle
+      - name: Install Python dependencies
+        run: |
+          sudo pip install --upgrade pip
+          sudo pip install pycodestyle
 
       - name: Check the documentation
         run: pycodestyle --config=.pycodestyle docs/
@@ -36,4 +34,4 @@ jobs:
         run: pycodestyle --config=.pycodestyle web/
 
       - name: Check the tools
-        run: pycodestyle --config=.pycodestyle tools/
+        run: pycodestyle --config=.pycodestyle tools/

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

@@ -0,0 +1,39 @@
+name: Check tarball build
+
+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:
+  build-tarball:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install platform dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev
+
+      - name: Install Python dependencies
+        run: make install-python
+
+      - name: Check the tarball build
+        run: |
+          . venv/bin/activate
+          make src
+
+      - name: Archive source tarball
+        uses: actions/upload-artifact@v4
+        with:
+          name: pgadmin4-tarball-build-output
+          path: dist/*

.github/workflows/check-translations.yml

@@ -0,0 +1,34 @@
+name: Check translations
+
+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:
+  check-translations:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install platform dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y python3-babel python3-jinja2
+
+      - name: Check we can extract messages
+        run: make msg-extract
+
+      - name: Check we can update the catalogs
+        run: make msg-update
+
+      - name: Check the catalogs will compile
+        run: make msg-compile

.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: [14, 15, 16, 17, 18]
+
+    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 $(node -p "require('./web/package.json').packageManager.split('@')[1]")
+
+      - 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: [14, 15, 16, 17, 18]
+
+    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": "",
+                "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 $(node -p "require('./web/package.json').packageManager.split('@')[1]")
+
+      - 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

@@ -0,0 +1,44 @@
+name: Run Javascript tests
+
+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-javascript-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-22.04, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - 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 $(node -p "require('./web/package.json').packageManager.split('@')[1]")
+
+      - name: Install Node modules
+        run: |
+          cd web
+          yarn install
+
+      - name: Run the tests
+        run: |
+          cd web
+          yarn run test:js-once

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

@@ -0,0 +1,324 @@
+# This workflow requires the following configuration in Github
+#
+# Vars:
+#   ENABLE_EPAS_TESTS - Set to true to enable this test
+#
+# Secrets:
+#   EDB_REPO_USERNAME - Username for accessing EDB Repos 1.0
+#   EDB_REPO_PASSWORD - Password for accessing EDB Repos 1.0
+#   EDB_SBP_URL - URL to the EDB StackBuilder Plus catalog
+
+name: Run Python 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-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'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-22.04, windows-latest]
+        pgver: [14, 15, 16, 17, 18]
+        postgisver: [34]
+        exclude:
+          - pgver: 18
+            postgisver: 34
+        include:
+          - os: ubuntu-22.04
+            pgver: 18
+            postgisver: 36
+          - os: windows-latest
+            pgver: 18
+            postgisver: 36
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Update python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Setup the EDB APT repo on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          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 }}-postgis${{ matrix.postgisver }}
+
+      - 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' }}
+        run: |
+          FOR /f "delims=" %%F IN ('python tools\get_sb_package.py "${{ secrets.EDB_SBP_URL }}" "edb_as${{ matrix.pgver }}_dbserver" "windows-x64"') DO SET INSTALLER_EXE=%%F
+          ECHO Running %INSTALLER_EXE%...
+          %INSTALLER_EXE% --prefix C:\EPAS\${{ matrix.pgver }} --datadir C:\EPAS\${{ matrix.pgver }}\data --serverport 58${{ matrix.pgver }} --superpassword enterprisedb --create_samples no --install_runtimes 0 --mode unattended --unattendedmodeui none --disable-components stackbuilderplus${{ matrix.pgver < 15 && ',pgadmin4' || '' }}
+          
+          choco install -y mitkerberos
+          
+          REM Ignore error 3010 (reboot required)
+          IF %ERRORLEVEL% EQU 3010 cmd /c "exit /b 0"
+        shell: cmd
+
+      - name: Add pg_config path to PATH
+        shell: pwsh
+        run: |
+          $pgPath = "C:\\EPAS\\${{ matrix.pgver }}\\bin"
+          Write-Output $pgPath
+          Add-Content -Path $env:GITHUB_PATH -Value $pgPath
+          pg_config --version
+
+      - name: Create the tablespace directory on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          sudo mkdir -p /var/lib/edb-as/tablespaces/${{ matrix.pgver }}
+          sudo chown enterprisedb:enterprisedb /var/lib/edb-as/tablespaces/${{ matrix.pgver }}
+
+      - name: Create the tablespace directory on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          mkdir "C:\EPAS\${{ matrix.pgver }}\tablespaces"
+          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: |
+          # 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: Create postgis extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
+
+      - name: Install Python dependencies on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: make install-python-testing
+
+      - name: Install Python dependencies on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          SET LIB=C:\EPAS\${{ matrix.pgver }}\lib;%LIB%
+          SET INCLUDE=C:\EPAS\${{ matrix.pgver }}\include;%INCLUDE%
+          python -m venv venv
+          call venv\Scripts\activate.bat
+          python -m pip install --upgrade pip
+          pip install wheel sphinx sphinxcontrib-youtube -r web\regression\requirements.txt
+        shell: cmd
+
+      - name: Create the test configuration on Linux
+        if: ${{ 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"
+          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
+          {
+            "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: Create the test configuration on Windows
+        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.
+            @echo.# Debug mode
+            @echo.DEBUG = True
+            @echo.
+            @echo.# App mode
+            @echo.SERVER_MODE = False
+            @echo.
+            @echo.# Log
+            @echo.CONSOLE_LOG_LEVEL = DEBUG
+            @echo.FILE_LOG_LEVEL = DEBUG
+            @echo.
+            @echo.DEFAULT_SERVER = '127.0.0.1'
+            @echo.
+            @echo.UPGRADE_CHECK_ENABLED = False
+            @echo.
+            @echo.LOG_FILE = "%WORKING_DIR%\\var\\pgadmin4.log"
+            @echo.SESSION_DB_PATH = "%WORKING_DIR%\\var\\sessions"
+            @echo.STORAGE_DIR = "%WORKING_DIR%\\var\\storage"
+            @echo.SQLITE_PATH = "%WORKING_DIR%\\var\\pgadmin4.db"
+            @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": {
+            @echo.    "new_password": "NEWPASSWORD",
+            @echo.    "login_password": "PASSWORD",
+            @echo.    "login_username": "USER@EXAMPLE.COM"
+            @echo.  },
+            @echo.  "pgAdmin4_test_user_credentials": {
+            @echo.    "new_password": "NEWPASSWORD",
+            @echo.    "login_password": "PASSWORD",
+            @echo.    "login_username": "USER2@EXAMPLE.COM"
+            @echo.  },
+            @echo.  "pgAdmin4_test_non_admin_credentials": {
+            @echo.    "new_password": "NEWPASSWORD",
+            @echo.    "login_password": "PASSWORD",
+            @echo.    "login_username": "USER@EXAMPLE.COM"
+            @echo.  },
+            @echo.  "server_group": 1,
+            @echo.  "server_credentials": [
+            @echo.    {
+            @echo.      "name": "EPAS ${{ matrix.pgver }}",
+            @echo.      "comment": "EPAS ${{ matrix.pgver }} Server",
+            @echo.      "db_username": "enterprisedb",
+            @echo.      "host": "127.0.0.1",
+            @echo.      "db_password": "enterprisedb",
+            @echo.      "db_port": 58${{ matrix.pgver }},
+            @echo.      "maintenance_db": "postgres",
+            @echo.      "sslmode": "prefer",
+            @echo.      "tablespace_path": "C:\\EPAS\\${{ matrix.pgver }}\\tablespaces",
+            @echo.      "enabled": true,
+            @echo.      "default_binary_paths": {
+            @echo.        "pg": "",
+            @echo.        "ppas": "C:\\EPAS\\${{ matrix.pgver }}\\bin"
+            @echo.      }
+            @echo.    }
+            @echo.  ],
+            @echo.  "server_update_data": [
+            @echo.    {
+            @echo.      "comment": "This is test update comment"
+            @echo.    }
+            @echo.  ]
+            @echo.}
+          )
+        shell: cmd
+
+      - name: Run the tests on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          . venv/bin/activate
+          make check-python
+
+      - name: Run the tests on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          call venv\Scripts\activate.bat
+          python web\regression\runtests.py --exclude feature_tests
+        shell: cmd
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: server-log-epas-${{ matrix.os }}-pg${{ matrix.pgver }}
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-log-epas-${{ matrix.os }}-pg${{ matrix.pgver }}
+          path: web/regression/regression.log

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

@@ -0,0 +1,335 @@
+name: Run Python tests on PostgreSQL
+
+# Note: we use a custom port (and installation directory on Windows) 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-python-tests-pg:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-22.04, windows-latest]
+        pgver: [14, 15, 16, 17, 18]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Update python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Setup the PGDG APT repo on Linux
+        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-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 postgresql-${{ matrix.pgver }}-postgis-3
+
+      - name: Install platform dependencies on macOS
+        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 on windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          if exist "C:\Program Files\PostgreSQL\{{ matrix.pgver }}\uninstall-postgresql.exe" (
+              "C:\Program Files\PostgreSQL\{{ matrix.pgver }}\uninstall-postgresql.exe" --mode unattended
+          )
+          reg delete "HKLM\SOFTWARE\PostgreSQL" /f
+        shell: cmd
+
+      - name: Install platform dependencies on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          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_custom\${{ matrix.pgver }} --datadir C:\PostgreSQL_custom\${{ 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: Add pg_config path to PATH
+        shell: pwsh
+        run: |
+          $pgPath = "C:\\PostgreSQL_custom\\${{ matrix.pgver }}\\bin"
+          Write-Output $pgPath
+          Add-Content -Path $env:GITHUB_PATH -Value $pgPath
+          pg_config --version
+
+      - name: Create the tablespace directory on Linux
+        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 }}
+
+      - name: Create the tablespace directory on macOS
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          mkdir -p /opt/homebrew/var/tablespaces/${{ matrix.pgver }}
+
+      - name: Create the tablespace directory on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          mkdir "C:\PostgreSQL\${{ matrix.pgver }}\tablespaces"
+          icacls "C:\PostgreSQL\${{ matrix.pgver }}\tablespaces" /grant "NETWORK SERVICE":(OI)(CI)F /T
+        shell: cmd
+
+      - name: Start PostgreSQL on Linux
+        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;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION postgis;'
+
+      - name: Start PostgreSQL on macOS
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          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 /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-22.04' }}
+        run: make install-python-testing
+
+      - name: Install Python dependencies on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          SET LIB=C:\PostgreSQL\${{ matrix.pgver }}\lib;%LIB%
+          SET INCLUDE=C:\PostgreSQL\${{ matrix.pgver }}\include;%INCLUDE%
+          python -m venv venv
+          call venv\Scripts\activate.bat
+          python -m pip install --upgrade pip
+          pip install wheel sphinx sphinxcontrib-youtube -r web\regression\requirements.txt
+        shell: cmd
+
+      - name: Create the test configuration on Linux and macOS
+        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"
+          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
+          {
+            "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": "${{ 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('/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('/opt/homebrew/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
+                  "ppas": ""
+                }
+              }
+            ],
+            "server_update_data": [
+              {
+                "comment": "This is test update comment"
+              }
+            ]
+          }
+          EOF
+
+      - name: Create the test configuration on Windows
+        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.
+            @echo.# Debug mode
+            @echo.DEBUG = True
+            @echo.
+            @echo.# App mode
+            @echo.SERVER_MODE = False
+            @echo.
+            @echo.# Log
+            @echo.CONSOLE_LOG_LEVEL = DEBUG
+            @echo.FILE_LOG_LEVEL = DEBUG
+            @echo.
+            @echo.DEFAULT_SERVER = '127.0.0.1'
+            @echo.
+            @echo.UPGRADE_CHECK_ENABLED = False
+            @echo.
+            @echo.LOG_FILE = "%WORKING_DIR%\\var\\pgadmin4.log"
+            @echo.SESSION_DB_PATH = "%WORKING_DIR%\\var\\sessions"
+            @echo.STORAGE_DIR = "%WORKING_DIR%\\var\\storage"
+            @echo.SQLITE_PATH = "%WORKING_DIR%\\var\\pgadmin4.db"
+            @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": {
+            @echo.    "new_password": "NEWPASSWORD",
+            @echo.    "login_password": "PASSWORD",
+            @echo.    "login_username": "USER@EXAMPLE.COM"
+            @echo.  },
+            @echo.  "pgAdmin4_test_user_credentials": {
+            @echo.    "new_password": "NEWPASSWORD",
+            @echo.    "login_password": "PASSWORD",
+            @echo.    "login_username": "USER2@EXAMPLE.COM"
+            @echo.  },
+            @echo.  "pgAdmin4_test_non_admin_credentials": {
+            @echo.    "new_password": "NEWPASSWORD",
+            @echo.    "login_password": "PASSWORD",
+            @echo.    "login_username": "USER@EXAMPLE.COM"
+            @echo.  },
+            @echo.  "server_group": 1,
+            @echo.  "server_credentials": [
+            @echo.    {
+            @echo.      "name": "PostgreSQL ${{ matrix.pgver }}",
+            @echo.      "comment": "PostgreSQL ${{ matrix.pgver }} Server",
+            @echo.      "db_username": "postgres",
+            @echo.      "host": "127.0.0.1",
+            @echo.      "db_password": "postgres",
+            @echo.      "db_port": 59${{ matrix.pgver }},
+            @echo.      "maintenance_db": "postgres",
+            @echo.      "sslmode": "prefer",
+            @echo.      "tablespace_path": "C:\\PostgreSQL\\${{ matrix.pgver }}\\tablespaces",
+            @echo.      "enabled": true,
+            @echo.      "default_binary_paths": {
+            @echo.        "pg": "C:\\PostgreSQL\\${{ matrix.pgver }}\\bin",
+            @echo.        "ppas": ""
+            @echo.      }
+            @echo.    }
+            @echo.  ],
+            @echo.  "server_update_data": [
+            @echo.    {
+            @echo.      "comment": "This is test update comment"
+            @echo.    }
+            @echo.  ]
+            @echo.}
+          )
+        shell: cmd
+
+      - name: Run the tests on Linux and macOS
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }}
+        run: |
+          . venv/bin/activate
+          make check-python
+
+      - name: Run the tests on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          call venv\Scripts\activate.bat
+          python web\regression\runtests.py --exclude feature_tests
+        shell: cmd
+
+      - name: Archive server log
+        if: success() || failure()
+        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@v4
+        with:
+          name: regression-log-${{ matrix.os }}-pg${{ matrix.pgver }}
+          path: web/regression/regression.log
+
+

.github/workflows/run-python-tests-server-mode.yml

@@ -0,0 +1,204 @@
+name: Run Python tests in server mode (data isolation)
+
+# This workflow runs the data-isolation tests with SERVER_MODE=True.
+# The main run-python-tests-pg.yml workflow runs everything with
+# SERVER_MODE=False, so any test that gates itself on `config.SERVER_MODE`
+# (notably web/pgadmin/browser/server_groups/tests/test_sg_data_isolation.py
+# and web/pgadmin/browser/server_groups/servers/tests/test_server_data_isolation.py)
+# skips itself in CI. That gap allowed the admin-bypass regression in
+# 9a76ed8 to ship; this workflow exists so regressions to the centralized
+# access-control helpers in web/pgadmin/utils/server_access.py are caught.
+#
+# Scope is intentionally narrow: one OS, one PG version, only the
+# data-isolation modules. Keep it cheap to run on every PR.
+
+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-python-tests-server-mode:
+    runs-on: ubuntu-24.04
+
+    env:
+      PG_VER: 18
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # We don't run any authenticated git operations after checkout
+          # (no push, no submodule fetch, no comment back to the PR), so
+          # persisting the token in the local git config only widens the
+          # blast radius of an unrelated step compromise.
+          persist-credentials: false
+
+      - name: Update python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Setup the PGDG APT repo
+        # apt-key is deprecated on Ubuntu 24.04+; install the key into
+        # /etc/apt/keyrings/ and reference it via signed-by= in the
+        # sources.list entry instead.
+        run: |
+          sudo install -d -m 0755 /etc/apt/keyrings
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+            | sudo gpg --dearmor -o /etc/apt/keyrings/pgdg.gpg
+          sudo sh -c 'echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+
+      - name: Uninstall PostgreSQL if already present
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            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 != ${PG_VER} ]; 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-${PG_VER}
+
+      - name: Start PostgreSQL
+        run: |
+          sudo su -c "echo local all all trust > /etc/postgresql/${PG_VER}/main/pg_hba.conf"
+          sudo sed -i "s/port = 543[0-9]/port = 59${PG_VER}/g" /etc/postgresql/${PG_VER}/main/postgresql.conf
+          sudo su - postgres -c "/usr/lib/postgresql/${PG_VER}/bin/postgres -D /var/lib/postgresql/${PG_VER}/main -c config_file=/etc/postgresql/${PG_VER}/main/postgresql.conf &"
+
+          # Bounded readiness wait: 60 attempts × 2s = 120s cap. If PG
+          # never becomes ready, fail fast with logs rather than hanging
+          # until the job timeout.
+          for attempt in $(seq 1 60); do
+            if sudo runuser -l postgres -c "pg_isready -p 59${PG_VER}" 2>/dev/null; then
+              break
+            fi
+            >&2 echo "Postgres is unavailable (attempt ${attempt}/60) - sleeping for 2 seconds"
+            sleep 2
+            if [ "$attempt" -eq 60 ]; then
+              >&2 echo "Postgres failed to become ready within 120 seconds"
+              sudo tail -n 200 /var/log/postgresql/postgresql-${PG_VER}-main.log || true
+              exit 1
+            fi
+          done
+
+      - name: Install Python dependencies
+        run: make install-python-testing
+
+      - name: Create the test configuration (SERVER_MODE=True)
+        run: |
+          mkdir -p var
+          cat <<EOF > web/config_local.py
+          from config import *
+
+          # Debug mode
+          DEBUG = True
+
+          # App mode — this is the whole point of this workflow.
+          SERVER_MODE = True
+
+          # 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
+          {
+            "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": "USER3@EXAMPLE.COM"
+            },
+            "server_group": 1,
+            "server_credentials": [
+              {
+                "name": "PostgreSQL ${{ env.PG_VER }}",
+                "comment": "PostgreSQL ${{ env.PG_VER }} Server",
+                "db_username": "postgres",
+                "host": "/var/run/postgresql",
+                "db_password": "postgres",
+                "db_port": 59${{ env.PG_VER }},
+                "maintenance_db": "postgres",
+                "sslmode": "prefer",
+                "tablespace_path": "/var/lib/postgresql/tablespaces/${{ env.PG_VER }}",
+                "enabled": true,
+                "default_binary_paths": {
+                  "pg": "/usr/lib/postgresql/${{ env.PG_VER }}/bin",
+                  "ppas": ""
+                }
+              }
+            ],
+            "server_update_data": [
+              {
+                "comment": "This is test update comment"
+              }
+            ]
+          }
+          EOF
+
+      - name: Run server-group data isolation tests
+        run: |
+          . venv/bin/activate
+          python web/regression/runtests.py --pkg browser.server_groups.tests --modules test_sg_data_isolation
+
+      - name: Run server data isolation tests
+        run: |
+          . venv/bin/activate
+          python web/regression/runtests.py --pkg browser.server_groups.servers.tests --modules test_server_data_isolation
+
+      - name: Run SQL Editor unauth-pickle regression test
+        # Regression guard for the CSRF-only-no-auth chain on
+        # /sqleditor/close and /sqleditor/.../update_connection: both
+        # endpoints reach pickle.loads via close_sqleditor_session() /
+        # check_transaction_status(), so they must require an
+        # authenticated session. This test is a no-op in DESKTOP mode
+        # (auto-re-authentication) so it can only run here.
+        run: |
+          . venv/bin/activate
+          python web/regression/runtests.py --pkg tools.sqleditor --modules test_close_requires_auth
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: server-log-server-mode
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-log-server-mode
+          path: web/regression/regression.log

.github/workflows/sonarqube-scan.yml

@@ -0,0 +1,58 @@
+# This workflow requires the following configuration in Github
+#
+# Variables:
+#   SONARQUBE_PROJECT_KEY - The project key in SonarQube
+#
+# Secrets:
+#   SONARQUBE_TOKEN - SonarQube API token
+#   SONARQUBE_HOST - The URL of the SonarQube host
+
+name: SonarQube scan
+
+on:
+  push:
+    branches: [ "master" ]
+
+concurrency:
+  group: sonarqube
+  cancel-in-progress: false
+
+jobs:
+  run-sonarqube-scan:
+    # Only run if the project key is set
+    if: vars.SONARQUBE_PROJECT_KEY != null
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Create the scan properties file
+        run: |
+          cat <<EOF > sonar-project.properties
+          sonar.projectKey=${{ vars.SONARQUBE_PROJECT_KEY }}
+          sonar.projectName=pgAdmin 4
+          sonar.projectVersion=%VERSION%
+
+          # Ignore templates and SQL scripts as they confuse the scanner
+          sonar.exclusions=**/templates/**/*, **/*.sql
+          
+          # Let SonarQube know where tests can be found
+          sonar.test.inclusions=**/tests/**, web/regression
+          
+          # Python compatibility
+          sonar.python.version=3.7, 3.8, 3.9, 3.10, 3.11
+          EOF
+          
+          APP_RELEASE=`grep "^APP_RELEASE" web/config.py | cut -d"=" -f2 | sed 's/ //g'`
+          APP_REVISION=`grep "^APP_REVISION" web/config.py | cut -d"=" -f2 | sed 's/ //g'`
+          APP_LONG_VERSION=${APP_RELEASE}.${APP_REVISION}
+          sed -i "s/%VERSION%/${APP_LONG_VERSION}/g" sonar-project.properties
+
+      - name: SonarQube Scan
+        uses: sonarsource/sonarqube-scan-action@22918119ff8e1ca75a623e15c8296b6ea4fbe28f # v8.2.1
+        env:
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }}

.gitignore

@@ -9,6 +9,8 @@
 .DS_Store
 .idea
 .vscode
+.sonarlint
+.yarn
 /*.diff
 /*.patch
 /dist
@@ -37,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
@@ -47,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
@@ -55,5 +59,6 @@ auditpy.txt
 web/coverage/
 web/.coverage
 web/regression/.coverage
+.worktree/
 web/regression/covhtml/
 web/regression/htmlcov/

.pycodestyle

@@ -1,9 +1,9 @@
 [pycodestyle]
-ignore = E402,W504,W605
+ignore = E402,W504,E231
 max-line-length = 79
 statistics = True
 show-source = False
 show-pep8 = False
 count = True
 format = pylint
-exclude = migrations,node_modules,config_local.py,config_distro.py
+exclude = node_modules,config_local.py,config_distro.py

CONTRIBUTING.md

@@ -0,0 +1,341 @@
+# Contributing to pgAdmin 4
+
+Thank you for your interest in contributing to pgAdmin 4.
+
+## Contents
+
+- Getting Started
+- Reporting Issues
+- Making Changes
+- Pull Requests
+- AI-assisted Contributions
+- Development Setup
+- Database Migrations
+- Security Issues
+- Community and Support
+- License
+
+## Getting Started
+
+Before starting work, please review the project documentation and familiarize yourself with the architecture and development workflow.
+
+### Architecture
+
+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/](runtime/) subdirectory contains an Electron-based runtime application intended to allow this, which will fork a Python server process and display the UI.
+
+For a fuller introduction to the codebase, see the [code overview](docs/en_US/code_overview.rst).
+
+If you are new to the codebase, consider starting with smaller bug fixes or documentation improvements before working on larger changes.
+
+The Sphinx documentation also includes contributor guidance for [coding standards](docs/en_US/coding_standards.rst), [submitting pull requests](docs/en_US/submitting_pull_requests.rst), [code review](docs/en_US/code_review.rst), and [translations](docs/en_US/translations.rst).
+
+## Reporting Issues
+
+When reporting a bug:
+
+- Search existing issues first.
+- If a similar issue exists, add any additional information or context you have. Do not create a duplicate issue.
+- Provide clear steps to reproduce the issue.
+- Include relevant environment and version information.
+- Attach screenshots, logs, or error messages when appropriate.
+
+For feature requests, describe the problem being solved and the expected behavior. 
+
+
+## Making Changes
+
+When working on a contribution:
+
+- Keep changes focused and easy to review.
+- Follow existing coding patterns and conventions, including the [coding standards](docs/en_US/coding_standards.rst).
+- Avoid unrelated refactoring and changes in the same commit.
+- Keep commit messages clear and descriptive.
+- Update tests or documentation when necessary.
+
+## Pull Requests
+
+Before opening a pull request:
+
+- Ensure your changes build successfully.
+- Test your changes locally.
+- Review your code before submission.
+- Update your branch with the latest changes from `master` upstream when appropriate.
+
+When opening a pull request:
+
+- Clearly describe the change.
+- Explain the reason for the change.
+- Include screenshots or recordings for UI-related changes when applicable.
+- Submit any changes as Pull Requests against the `master` branch of the [pgadmin-org/pgadmin4](https://github.com/pgadmin-org/pgadmin4) repository.
+
+Use a clear pull request title that describes the change. Short prefixes such as `feat:`, `fix:`, `docs:`, `test:`, `refactor:`, and `chore:` are useful when they match the change being made. Branch names are contributor-local and do not need to follow a project-specific naming convention.
+
+For more detail, see the [pull request submission guide](docs/en_US/submitting_pull_requests.rst) and [code review guide](docs/en_US/code_review.rst).
+
+## AI-assisted Contributions
+
+Contributors are responsible for understanding, testing, and standing behind everything they submit, whether or not AI tools were used. Please do not open large numbers of auto-generated issues or pull requests without first discussing that work with the maintainers.
+
+## Development Setup
+
+In the following documentation and examples, `$PGADMIN4_SRC` is used to denote the top-level directory of your copy of the pgAdmin source tree (either from a tarball or a git checkout).
+
+### Prerequisites
+
+1. Install Node.js 20 and above (https://nodejs.org/en/download)
+2. yarn (https://yarnpkg.com/getting-started/install)
+3. Python 3.9 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
+corepack enable
+```
+
+### Building Web Assets
+
+pgAdmin is dependent on a number of third-party JavaScript libraries. These, along with its 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 is needed by the client.
+
+To create the bundle, you will need the 'yarn' package management tool to be installed. Then, you can run the following commands on a *nix system to download the required packages and build the bundle:
+
+```bash
+$ cd $PGADMIN4_SRC
+$ make install-node
+$ make bundle
+```
+
+On Windows systems (where "make" is not available), the following commands can be used:
+
+```bat
+C:\> cd $PGADMIN4_SRC\web
+C:\$PGADMIN4_SRC\web> yarn install
+C:\$PGADMIN4_SRC\web> yarn run bundle
+```
+
+### Python Environment
+
+In order to run the Python code, a suitable runtime environment is required. Python version 3.9 and later are currently supported. It is recommended that a Python virtual environment is set up 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
+   ```
+
+   On Windows:
+
+   ```bash
+   venv\Scripts\activate
+   ```
+
+3. Some of the components used by pgAdmin require a very recent version of *pip*, so update that to the latest:
+
+   ```bash
+   (venv) $ 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
+   ```
+
+### Configuration
+
+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 an external DB is used.
+CONFIG_DATABASE_URI="postgresql://postgres:postgres@localhost:5436/pgadmin"
+
+# Set up 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.
+
+### Running pgAdmin
+
+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.md` for complete details.
+
+### Building the documentation
+
+In order to build the docs, an additional Python package is required in the virtual environment. This can be installed with the pip package manager:
+
+```bash
+$ source venv/bin/activate
+(venv) $ pip install Sphinx
+(venv) $ pip install sphinxcontrib-youtube
+```
+
+The docs can then be built using the Makefile in `$PGADMIN4_SRC`, e.g.
+
+```bash
+(venv) $ make docs
+```
+
+The output can be found in `$PGADMIN4_SRC/docs/en_US/_build/html/index.html`
+
+### Runtime Development
+
+For Electron runtime development:
+
+1. Navigate to the `runtime` directory.
+2. Install dependencies:
+
+```bash
+yarn install
+```
+
+3. Copy:
+
+```text
+dev_config.json.in
+```
+
+to:
+
+```text
+dev_config.json
+```
+
+4. Update the paths to your Python executable and `pgAdmin4.py`.
+
+Start the runtime:
+
+```bash
+yarn run start
+```
+
+### Building packages
+
+Most packages can be built using the Makefile in `$PGADMIN4_SRC`, provided all the setup and configuration above has been completed.
+
+To build a source tarball:
+
+```bash
+(venv) $ make src
+```
+
+To build a PIP Wheel, activate either a Python 3 virtual environment, configured with all the required packages, and then run:
+
+```bash
+(venv) $ make pip
+```
+
+To build the macOS AppBundle, please see `pkg/mac/README.md`.
+
+To build the Windows installer, please see `pkg/win32/README.md`.
+
+## Database Migrations
+
+In order to make changes to the SQLite DB, navigate to the 'web' directory:
+
+```bash
+(venv) $ cd $PGADMIN4_SRC/web
+```
+
+Create a migration file with the following command:
+
+```bash
+(venv) $ FLASK_APP=pgAdmin4.py flask db revision
+```
+
+This will create a file in `$PGADMIN4_SRC/web/migrations/versions/`. Add any changes to the `upgrade` function.
+
+When making schema changes, update the `SCHEMA_VERSION` value in:
+
+```text
+web/pgadmin/model/__init__.py
+```
+
+There is no need to increment the `SETTINGS_SCHEMA_VERSION`.
+
+## Security Issues
+
+**Do not report security vulnerabilities through GitHub issues.**
+
+Potential security issues should be reported to: 
+`security@pgadmin.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**.
+
+If you are unsure whether an issue is a security vulnerability, please lean on the side of caution and report it to the above address. The pgAdmin team will review the report and respond as appropriate.
+
+## Community and Support
+
+For development discussions, use:
+
+`pgadmin-hackers@postgresql.org`
+
+For support options, visit the [pgAdmin support page](https://www.pgadmin.org/support/).
+
+Use the [GitHub issue tracker](https://github.com/pgadmin-org/pgadmin4/issues) for reporting bugs and requesting features, but please follow the guidelines outlined in the "Reporting Issues" section above.
+
+## License
+
+By contributing to pgAdmin 4, you agree that your contributions will be licensed under the project's existing and future license terms.

DEPENDENCIES

@@ -1,572 +0,0 @@
-pgAdmin 4 Dependency Inventory
-==============================
-
-pgAdmin 4 is built on Python, Javascript and NW.js (node-webkit), and is
-dependent on various third party libraries. These are automatically compiled
-from the system, requirements.txt and packages.json and listed below.
-
-Runtime Dependencies
-====================
-
-Name                                                             Version          Licence                              URL
-----                                                             -------          -------                              ---
-Python                                                           3.6+             PSF                                  https://www.python.org/
-nw                                                               0.50.2           MIT                                  git://github.com/nwjs/npm-installer.git
-axios                                                            0.21.4           MIT                                  https://github.com/axios/axios.git
-bootstrap                                                        4.6.2            MIT                                  git+https://github.com/twbs/bootstrap.git
-follow-redirects                                                 1.15.2           MIT                                  git@github.com:follow-redirects/follow-redirects.git
-
-5 dependencies listed.
-
-Python Dependencies
-===================
-
-Name                                                             Version          Licence                              URL
-----                                                             -------          -------                              ---
-Flask                                                            2.1.3            BSD-3-Clause                         https://palletsprojects.com/p/flask
-Flask-Gravatar                                                   0.5.0            BSD                                  https://github.com/zzzsochi/Flask-Gravatar/
-Flask-Login                                                      0.6.2            MIT                                  https://github.com/maxcountryman/flask-login
-Flask-Mail                                                       0.9.1            BSD                                  https://github.com/rduplain/flask-mail
-Flask-Migrate                                                    3.1.0            UNKNOWN                              https://github.com/miguelgrinberg/flask-migrate
-Flask-SQLAlchemy                                                 2.5.1            BSD-3-Clause                         https://github.com/pallets/flask-sqlalchemy
-Flask-WTF                                                        1.0.1            BSD-3-Clause                         https://github.com/wtforms/flask-wtf/
-Flask-Compress                                                   1.13             MIT                                  https://github.com/colour-science/flask-compress
-Flask-Paranoid                                                   0.3.0            UNKNOWN                              https://github.com/miguelgrinberg/flask-paranoid
-Flask-Babel                                                      2.0.0            BSD                                  http://github.com/python-babel/flask-babel
-Flask-Security-Too                                               4.1.5            MIT                                  https://github.com/Flask-Middleware/flask-security
-Flask-SocketIO                                                   5.2.0            Unknown                              https://github.com/miguelgrinberg/flask-socketio
-WTForms                                                          3.0.1            BSD-3-Clause                         https://wtforms.readthedocs.io/
-passlib                                                          1.7.4            BSD                                  https://passlib.readthedocs.io
-pytz                                                             2021.3           MIT                                  http://pythonhosted.org/pytz
-simplejson                                                       3.18.0           MIT License                          https://github.com/simplejson/simplejson
-speaklater3                                                      1.4              UNKNOWN                              https://github.com/ThomasWaldmann/speaklater
-sqlparse                                                         0.4.3            BSD-3-Clause                         https://github.com/andialbrecht/sqlparse
-psutil                                                           5.9.3            BSD-3-Clause                         https://github.com/giampaolo/psutil
-psycopg2                                                         2.9.5            LGPL with exceptions                 https://psycopg.org/
-python-dateutil                                                  2.8.2            Dual License                         https://github.com/dateutil/dateutil
-SQLAlchemy                                                       1.4.45           MIT                                  https://www.sqlalchemy.org
-bcrypt                                                           3.2.2            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
-cryptography                                                     3.4.8            BSD or Apache License, Version 2.0   https://github.com/pyca/cryptography
-sshtunnel                                                        0.4.0            MIT                                  https://github.com/pahaz/sshtunnel
-ldap3                                                            2.9.1            LGPL v3                              https://github.com/cannatag/ldap3
-gssapi                                                           1.8.2            LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
-eventlet                                                         0.33.0           UNKNOWN                              http://eventlet.net
-httpagentparser                                                  1.9.5            http://www.opensource.org/licenses/mit-license.php https://github.com/shon/httpagentparser
-user-agents                                                      2.2.0            MIT                                  https://github.com/selwin/python-user-agents
-pywinpty                                                         1.1.*            Unknown                              Unknown
-Authlib                                                          1.1.0            BSD 3-Clause License                 https://authlib.org/
-requests                                                         2.25.1           Apache 2.0                           https://requests.readthedocs.io
-pyotp                                                            2.7.0            MIT License                          https://github.com/pyotp/pyotp
-qrcode                                                           7.3.1            BSD                                  https://github.com/lincolnloop/python-qrcode
-Pillow                                                           9.3.0            HPND                                 https://python-pillow.org
-boto3                                                            1.26.42          Apache License 2.0                   https://github.com/boto/boto3
-botocore                                                         1.29.42          Apache License 2.0                   https://github.com/boto/botocore
-urllib3                                                          1.26.13          MIT                                  https://urllib3.readthedocs.io/
-Werkzeug                                                         2.1.2            BSD-3-Clause                         https://palletsprojects.com/p/werkzeug/
-azure-mgmt-rdbms                                                 10.1.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-mgmt-resource                                              21.0.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-mgmt-subscription                                          3.0.0            MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-identity                                                   1.9.0            MIT License                          https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity
-
-NOTE: This report was generated using Python 3.10. Full information may not be
-shown for Python modules that are not required with this version.
-
-44 dependencies listed.
-
-Javascript Dependencies
-=======================
-
-Name                                                             Version          Licence                              URL
-----                                                             -------          -------                              ---
-@ampproject/remapping                                            2.2.0            Apache-2.0                           git+https://github.com/ampproject/remapping.git
-anti-trojan-source                                               1.4.0            Apache-2.0                           https://github.com/lirantal/anti-trojan-source.git
-bootstrap-datepicker                                             1.9.0            Apache-2.0                           https://github.com/uxsolutions/bootstrap-datepicker.git
-eve                                                              0.5.4            Apache-2.0                           git@github.com:adobe-webplatform/eve.git
-jmespath                                                         0.16.0           Apache-2.0                           git://github.com/jmespath/jmespath.js
-jsoneditor                                                       9.9.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.14           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.1.1            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.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/compat-data                                               7.20.1           MIT                                  https://github.com/babel/babel.git
-@babel/core                                                      7.20.2           MIT                                  https://github.com/babel/babel.git
-@babel/generator                                                 7.20.4           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.20.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-create-class-features-plugin                       7.20.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-environment-visitor                                7.18.9           MIT                                  https://github.com/babel/babel.git
-@babel/helper-function-name                                      7.19.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.18.9           MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-imports                                     7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-transforms                                  7.20.2           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.20.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-replace-supers                                     7.19.1           MIT                                  https://github.com/babel/babel.git
-@babel/helper-simple-access                                      7.20.2           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.19.4           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.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helpers                                                   7.20.1           MIT                                  https://github.com/babel/babel.git
-@babel/highlight                                                 7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/parser                                                    7.20.3           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.18.6           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.19.0           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.20.1           MIT                                  https://github.com/babel/babel.git
-@babel/template                                                  7.18.10          MIT                                  https://github.com/babel/babel.git
-@babel/traverse                                                  7.20.1           MIT                                  https://github.com/babel/babel.git
-@babel/types                                                     7.20.2           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.10.5          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin
-@emotion/cache                                                   11.10.5          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/cache
-@emotion/hash                                                    0.8.0            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/hash
-@emotion/hash                                                    0.9.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/hash
-@emotion/is-prop-valid                                           1.2.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/is-prop-valid
-@emotion/memoize                                                 0.8.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/memoize
-@emotion/react                                                   11.10.5          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
-@emotion/serialize                                               1.1.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/serialize
-@emotion/sheet                                                   1.2.1            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
-@emotion/unitless                                                0.8.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/unitless
-@emotion/unitless                                                0.7.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/unitless
-@emotion/use-insertion-effect-with-fallbacks                     1.0.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/use-insertion-effect-with-fallbacks
-@emotion/utils                                                   1.2.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/utils
-@emotion/weak-memoize                                            0.3.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/weak-memoize
-@istanbuljs/schema                                               0.1.3            MIT                                  git+https://github.com/istanbuljs/schema.git
-@jridgewell/gen-mapping                                          0.3.2            MIT                                  https://github.com/jridgewell/gen-mapping
-@jridgewell/gen-mapping                                          0.1.1            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/trace-mapping                                        0.3.17           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/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/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
-@material-ui/types                                               5.1.0            MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/utils                                               4.11.3           MIT                                  https://github.com/mui-org/material-ui.git
-@nodelib/fs.scandir                                              2.1.5            MIT                                  https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir
-@nodelib/fs.stat                                                 2.0.5            MIT                                  https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat
-@nodelib/fs.walk                                                 1.2.8            MIT                                  https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
-@projectstorm/geometry                                           6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-canvas-core                                  6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams                                     6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-core                                6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@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
-@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.0.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                                                      18.11.9          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.0.25          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     16.14.34         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react-dom                                                 16.9.17          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react-transition-group                                    4.4.5            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/scheduler                                                 0.16.2           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/styled-jsx                                                2.2.9            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-ajv                                                              8.11.2           MIT                                  https://github.com/ajv-validator/ajv.git
-ajv                                                              6.12.6           MIT                                  https://github.com/ajv-validator/ajv.git
-ansi-styles                                                      3.2.1            MIT                                  https://github.com/chalk/ansi-styles.git
-array-union                                                      3.0.1            MIT                                  https://github.com/sindresorhus/array-union.git
-arrify                                                           1.0.1            MIT                                  https://github.com/sindresorhus/arrify.git
-aspen-core                                                       1.0.5            MIT                                  git+https://github.com/neeksandhu/aspen-core.git
-aspen-decorations                                                1.1.1            MIT                                  git+https://github.com/neeksandhu/aspen-decorations.git
-aspen-tree-model                                                 1.0.5            MIT                                  git+https://github.com/neeksandhu/aspen-tree-model.git
-async                                                            2.6.4            MIT                                  https://github.com/caolan/async.git
-attr-accept                                                      2.2.2            MIT                                  https://github.com/react-dropzone/attr-accept.git
-axios                                                            0.21.4           MIT                                  https://github.com/axios/axios.git
-babel-plugin-macros                                              3.1.0            MIT                                  https://github.com/kentcdodds/babel-plugin-macros
-babel-plugin-styled-components                                   2.0.7            MIT                                  https://github.com/styled-components/babel-plugin-styled-components.git
-babel-plugin-syntax-jsx                                          6.18.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-jsx
-babelify                                                         10.0.0           MIT                                  https://github.com/babel/babelify.git
-balanced-match                                                   1.0.2            MIT                                  git://github.com/juliangruber/balanced-match.git
-base64-arraybuffer                                               1.0.2            MIT                                  https://github.com/niklasvh/base64-arraybuffer
-bignumber.js                                                     9.1.0            MIT                                  https://github.com/MikeMcl/bignumber.js.git
-bootstrap                                                        4.6.2            MIT                                  git+https://github.com/twbs/bootstrap.git
-bootstrap4-toggle                                                3.6.1            MIT                                  https://github.com/gitbrent/bootstrap4-toggle.git
-bowser                                                           2.11.0           MIT                                  git+https://github.com/lancedikson/bowser.git
-brace                                                            0.11.1           MIT                                  git://github.com/thlorenz/brace.git
-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.4           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
-camelize                                                         1.0.1            MIT                                  git://github.com/ljharb/camelize.git
-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
-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
-codemirror                                                       5.65.10          MIT                                  https://github.com/codemirror/CodeMirror.git
-color-convert                                                    1.9.3            MIT                                  https://github.com/Qix-/color-convert.git
-color-name                                                       1.1.3            MIT                                  git@github.com:dfcreative/color-name.git
-colord                                                           2.9.3            MIT                                  https://github.com/omgovich/colord.git
-commander                                                        7.2.0            MIT                                  https://github.com/tj/commander.js.git
-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.26.1           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.0.0            MIT                                  git+https://github.com/styled-components/css-to-react-native.git
-css-tree                                                         1.1.3            MIT                                  https://github.com/csstree/csstree.git
-css-vendor                                                       2.0.8            MIT                                  git@github.com:cssinjs/css-vendor.git
-cssesc                                                           3.0.0            MIT                                  https://github.com/mathiasbynens/cssesc.git
-cssnano                                                          5.1.14           MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-preset-default                                           5.2.13           MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-utils                                                    3.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-csso                                                             4.2.0            MIT                                  https://github.com/css/csso.git
-csstype                                                          2.6.21           MIT                                  https://github.com/frenic/csstype
-csstype                                                          3.1.1            MIT                                  https://github.com/frenic/csstype
-dagre                                                            0.8.5            MIT                                  https://github.com/dagrejs/dagre.git
-date-fns                                                         2.29.3           MIT                                  https://github.com/date-fns/date-fns
-debug                                                            4.3.4            MIT                                  git://github.com/debug-js/debug.git
-decamelize                                                       5.0.1            MIT                                  https://github.com/sindresorhus/decamelize.git
-decamelize                                                       1.2.0            MIT                                  https://github.com/sindresorhus/decamelize.git
-decamelize-keys                                                  1.1.1            MIT                                  https://github.com/sindresorhus/decamelize-keys.git
-deep-diff                                                        1.0.2            MIT                                  git://github.com/flitbit/diff.git
-diff-arrays-of-objects                                           1.1.9            MIT                                  git+https://github.com/malcolmvr/diff-arrays-of-objects.git
-dir-glob                                                         3.0.1            MIT                                  https://github.com/kevva/dir-glob.git
-dnd-core                                                         16.0.1           MIT                                  https://github.com/react-dnd/react-dnd.git
-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.2.3            MIT                                  https://github.com/socketio/engine.io-client.git
-engine.io-parser                                                 5.0.4            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
-escape-string-regexp                                             4.0.0            MIT                                  https://github.com/sindresorhus/escape-string-regexp.git
-fast-deep-equal                                                  3.1.3            MIT                                  git+https://github.com/epoberezkin/fast-deep-equal.git
-fast-glob                                                        3.2.12           MIT                                  https://github.com/mrmlnc/fast-glob.git
-fast-json-stable-stringify                                       2.1.0            MIT                                  git://github.com/epoberezkin/fast-json-stable-stringify.git
-fast-memoize                                                     2.5.2            MIT                                  git+https://github.com/caiogondim/fast-memoize.git
-file-selector                                                    0.6.0            MIT                                  https://github.com/react-dropzone/file-selector.git
-filename-reserved-regex                                          2.0.0            MIT                                  https://github.com/sindresorhus/filename-reserved-regex.git
-fill-range                                                       7.0.1            MIT                                  https://github.com/jonschlinkert/fill-range.git
-find-root                                                        1.1.0            MIT                                  git@github.com:js-n/find-root.git
-find-up                                                          5.0.0            MIT                                  https://github.com/sindresorhus/find-up.git
-follow-redirects                                                 1.15.2           MIT                                  git@github.com:follow-redirects/follow-redirects.git
-function-bind                                                    1.1.1            MIT                                  git://github.com/Raynos/function-bind.git
-gensync                                                          1.0.0-beta.2     MIT                                  https://github.com/loganfsmyth/gensync.git
-globals                                                          11.12.0          MIT                                  https://github.com/sindresorhus/globals.git
-globby                                                           12.2.0           MIT                                  https://github.com/sindresorhus/globby.git
-graphlib                                                         2.1.8            MIT                                  https://github.com/dagrejs/graphlib.git
-hammerjs                                                         2.0.8            MIT                                  git://github.com/hammerjs/hammer.js.git
-hard-rejection                                                   2.1.0            MIT                                  https://github.com/sindresorhus/hard-rejection.git
-has                                                              1.0.3            MIT                                  git://github.com/tarruda/has.git
-has-flag                                                         3.0.0            MIT                                  https://github.com/sindresorhus/has-flag.git
-has-flag                                                         4.0.0            MIT                                  https://github.com/sindresorhus/has-flag.git
-html-escaper                                                     2.0.2            MIT                                  https://github.com/WebReflection/html-escaper.git
-html2canvas                                                      1.4.1            MIT                                  git@github.com:niklasvh/html2canvas.git
-ignore                                                           5.2.1            MIT                                  git@github.com:kaelzhang/node-ignore.git
-immutability-helper                                              3.1.1            MIT                                  git+https://github.com/kolodny/immutability-helper.git
-import-fresh                                                     3.3.0            MIT                                  https://github.com/sindresorhus/import-fresh.git
-indent-string                                                    5.0.0            MIT                                  https://github.com/sindresorhus/indent-string.git
-insert-if                                                        1.2.0            MIT                                  git+https://github.com/chipto/insert-if.git
-ip-address                                                       7.1.0            MIT                                  git://github.com/beaugunderson/ip-address.git
-is-any-array                                                     2.0.0            MIT                                  https://github.com/cheminfo-js/is-any-array.git
-is-arrayish                                                      0.2.1            MIT                                  https://github.com/qix-/node-is-arrayish.git
-is-core-module                                                   2.11.0           MIT                                  git+https://github.com/inspect-js/is-core-module.git
-is-extglob                                                       2.1.1            MIT                                  https://github.com/jonschlinkert/is-extglob.git
-is-glob                                                          4.0.3            MIT                                  https://github.com/micromatch/is-glob.git
-is-in-browser                                                    1.1.3            MIT                                  git+https://github.com/tuxsudo/is-in-browser.git
-is-number                                                        7.0.0            MIT                                  https://github.com/jonschlinkert/is-number.git
-is-plain-obj                                                     1.1.0            MIT                                  https://github.com/sindresorhus/is-plain-obj.git
-is-relative                                                      1.0.0            MIT                                  https://github.com/jonschlinkert/is-relative.git
-is-unc-path                                                      1.0.0            MIT                                  https://github.com/jonschlinkert/is-unc-path.git
-javascript-natural-sort                                          0.7.1            MIT                                  https://github.com/Bill4Time/javascript-natural-sort.git
-jquery                                                           3.6.1            MIT                                  https://github.com/jquery/jquery.git
-jquery-contextmenu                                               2.9.2            MIT                                  git://github.com/swisnl/jQuery-contextMenu.git
-js-tokens                                                        4.0.0            MIT                                  https://github.com/lydell/js-tokens.git
-jsbn                                                             1.1.0            MIT                                  https://github.com/andyperlitch/jsbn.git
-jsesc                                                            2.5.2            MIT                                  https://github.com/mathiasbynens/jsesc.git
-json-bignumber                                                   1.1.1            MIT                                  git@github.com:wbuss/JSONBigNumber.git
-json-parse-even-better-errors                                    2.3.1            MIT                                  https://github.com/npm/json-parse-even-better-errors
-json-schema-traverse                                             1.0.0            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
-json-schema-traverse                                             0.4.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
-json-source-map                                                  0.6.1            MIT                                  git+https://github.com/epoberezkin/json-source-map.git
-json5                                                            2.2.3            MIT                                  git+https://github.com/json5/json5.git
-jsoneditor-react                                                 3.1.2            MIT                                  git+https://github.com/vankop/jsoneditor-react.git
-jss                                                              10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-camel-case                                            10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-default-unit                                          10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-global                                                10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-nested                                                10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-props-sort                                            10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-rule-value-function                                   10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-vendor-prefixer                                       10.9.2           MIT                                  https://github.com/cssinjs/jss.git
-karma-coverage                                                   2.2.0            MIT                                  git://github.com/karma-runner/karma-coverage.git
-kind-of                                                          6.0.3            MIT                                  https://github.com/jonschlinkert/kind-of.git
-lilconfig                                                        2.0.6            MIT                                  https://github.com/antonk52/lilconfig
-lines-and-columns                                                1.2.4            MIT                                  https://github.com/eventualbuddha/lines-and-columns.git
-locate-path                                                      6.0.0            MIT                                  https://github.com/sindresorhus/locate-path.git
-lodash                                                           4.17.21          MIT                                  https://github.com/lodash/lodash.git
-lodash._basebind                                                 2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._basecreate                                               2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._basecreatecallback                                       2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._basecreatewrapper                                        2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._createwrapper                                            2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._objecttypes                                              2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._renative                                                 2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._setbinddata                                              2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._shimkeys                                                 2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._slice                                                    2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.bind                                                      2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.foreach                                                   2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.forown                                                    2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.identity                                                  2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.isfunction                                                2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.isobject                                                  2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.keys                                                      2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.memoize                                                   4.1.2            MIT                                  https://github.com/lodash/lodash.git
-lodash.noop                                                      2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.support                                                   2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.uniq                                                      4.5.0            MIT                                  https://github.com/lodash/lodash.git
-loose-envify                                                     1.4.0            MIT                                  git://github.com/zertosh/loose-envify.git
-make-dir                                                         3.1.0            MIT                                  https://github.com/sindresorhus/make-dir.git
-map-obj                                                          4.3.0            MIT                                  https://github.com/sindresorhus/map-obj.git
-map-obj                                                          1.0.1            MIT                                  https://github.com/sindresorhus/map-obj.git
-matches-selector                                                 0.0.1            MIT                                  https://github.com/ForbesLindesay/matches-selector.git
-memoize-one                                                      5.2.1            MIT                                  https://github.com/alexreardon/memoize-one.git
-meow                                                             10.1.5           MIT                                  https://github.com/sindresorhus/meow.git
-merge2                                                           1.4.1            MIT                                  git@github.com:teambition/merge2.git
-micromatch                                                       4.0.5            MIT                                  https://github.com/micromatch/micromatch.git
-min-indent                                                       1.0.1            MIT                                  https://github.com/thejameskyle/min-indent
-minimist-options                                                 4.1.0            MIT                                  https://github.com/vadimdemedes/minimist-options.git
-ml-array-max                                                     1.2.4            MIT                                  git+https://github.com/mljs/array.git
-ml-array-min                                                     1.2.3            MIT                                  git+https://github.com/mljs/array.git
-ml-array-rescale                                                 1.3.7            MIT                                  git+https://github.com/mljs/array.git
-ml-matrix                                                        6.10.4           MIT                                  https://github.com/mljs/matrix.git
-mobius1-selectr                                                  2.4.13           MIT                                  git+https://github.com/Mobius1/Selectr.git
-moment                                                           2.29.4           MIT                                  https://github.com/moment/moment.git
-moment-timezone                                                  0.5.39           MIT                                  https://github.com/moment/moment-timezone.git
-ms                                                               2.1.2            MIT                                  https://github.com/zeit/ms.git
-nanoid                                                           3.3.4            MIT                                  https://github.com/ai/nanoid.git
-nanopop                                                          2.2.0            MIT                                  https://github.com/Simonwep/nanopop.git
-node-releases                                                    2.0.6            MIT                                  https://github.com/chicoxyzzy/node-releases.git
-normalize-url                                                    6.1.0            MIT                                  https://github.com/sindresorhus/normalize-url.git
-notificar                                                        1.0.1            MIT                                  git+https://github.com/neeksandhu/notificar.git
-notistack                                                        1.0.10           MIT                                  git+https://github.com/iamhosseindhv/notistack.git
-object-assign                                                    4.1.1            MIT                                  https://github.com/sindresorhus/object-assign.git
-p-limit                                                          3.1.0            MIT                                  https://github.com/sindresorhus/p-limit.git
-p-locate                                                         5.0.0            MIT                                  https://github.com/sindresorhus/p-locate.git
-p-reduce                                                         1.0.0            MIT                                  https://github.com/sindresorhus/p-reduce.git
-p-series                                                         1.1.0            MIT                                  https://github.com/sindresorhus/p-series.git
-parent-module                                                    1.0.1            MIT                                  https://github.com/sindresorhus/parent-module.git
-parse-json                                                       5.2.0            MIT                                  https://github.com/sindresorhus/parse-json.git
-path-exists                                                      4.0.0            MIT                                  https://github.com/sindresorhus/path-exists.git
-path-fx                                                          2.1.2            MIT                                  git+https://github.com/NeekSandhu/path-fx.git
-path-parse                                                       1.0.7            MIT                                  https://github.com/jbgutierrez/path-parse.git
-path-type                                                        4.0.0            MIT                                  https://github.com/sindresorhus/path-type.git
-pathfinding                                                      0.4.18           MIT                                  git://github.com/qiao/PathFinding.js.git
-performance-now                                                  2.1.0            MIT                                  git://github.com/braveg1rl/performance-now.git
-picomatch                                                        2.3.1            MIT                                  https://github.com/micromatch/picomatch.git
-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.19           MIT                                  https://github.com/postcss/postcss.git
-postcss-calc                                                     8.2.4            MIT                                  https://github.com/postcss/postcss-calc.git
-postcss-colormin                                                 5.3.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-convert-values                                           5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-comments                                         5.1.2            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-duplicates                                       5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-empty                                            5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-overridden                                       5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-longhand                                           5.1.7            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-rules                                              5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-font-values                                       5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-gradients                                         5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-params                                            5.1.4            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-selectors                                         5.2.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-charset                                        5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-display-values                                 5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-positions                                      5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-repeat-style                                   5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-string                                         5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-timing-functions                               5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-unicode                                        5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-url                                            5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-whitespace                                     5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-ordered-values                                           5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-initial                                           5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-transforms                                        5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-selector-parser                                          6.0.11           MIT                                  https://github.com/postcss/postcss-selector-parser.git
-postcss-svgo                                                     5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-unique-selectors                                         5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-value-parser                                             4.2.0            MIT                                  https://github.com/TrySound/postcss-value-parser.git
-prop-types                                                       15.8.1           MIT                                  https://github.com/facebook/prop-types.git
-punycode                                                         2.1.1            MIT                                  https://github.com/bestiejs/punycode.js.git
-queue-microtask                                                  1.2.3            MIT                                  git://github.com/feross/queue-microtask.git
-quick-lru                                                        5.1.1            MIT                                  https://github.com/sindresorhus/quick-lru.git
-raf                                                              3.4.1            MIT                                  git://github.com/chrisdickinson/raf.git
-rc-align                                                         4.0.12           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.8.0            MIT                                  git@github.com:react-component/menu.git
-rc-menu                                                          9.6.4            MIT                                  git@github.com:react-component/menu.git
-rc-motion                                                        2.6.2            MIT                                  git@github.com:react-component/motion.git
-rc-overflow                                                      1.2.8            MIT                                  git@github.com:react-component/overflow.git
-rc-resize-observer                                               1.2.0            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.24.6           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
-react-checkbox-tree                                              1.8.0            MIT                                  https://github.com/jakezatecky/react-checkbox-tree
-react-data-grid                                                  7.0.0-beta.14    MIT                                  https://github.com/adazzle/react-data-grid.git
-react-dnd                                                        16.0.1           MIT                                  https://github.com/react-dnd/react-dnd.git
-react-dnd-html5-backend                                          16.0.1           MIT                                  https://github.com/react-dnd/react-dnd.git
-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-draggable                                                  4.4.4            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-input-autosize                                             3.0.0            MIT                                  https://github.com/JedWatson/react-input-autosize.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-rnd                                                        10.3.7           MIT                                  https://github.com/bokuweb/react-rnd.git
-react-router                                                     6.4.3            MIT                                  https://github.com/remix-run/react-router
-react-router-dom                                                 6.4.3            MIT                                  https://github.com/remix-run/react-router
-react-select                                                     4.3.1            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.7            MIT                                  https://github.com/bvaughn/react-virtualized-auto-sizer.git
-react-window                                                     1.8.8            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
-redent                                                           4.0.0            MIT                                  https://github.com/sindresorhus/redent.git
-redux                                                            4.2.0            MIT                                  https://github.com/reduxjs/redux.git
-regenerator-runtime                                              0.13.11          MIT                                  https://github.com/facebook/regenerator/tree/main/packages/runtime
-require-from-string                                              2.0.2            MIT                                  https://github.com/floatdrop/require-from-string.git
-resize-observer-polyfill                                         1.5.1            MIT                                  https://github.com/que-etc/resize-observer-polyfill.git
-resolve                                                          1.22.1           MIT                                  git://github.com/browserify/resolve.git
-resolve-from                                                     4.0.0            MIT                                  https://github.com/sindresorhus/resolve-from.git
-reusify                                                          1.0.4            MIT                                  git+https://github.com/mcollina/reusify.git
-rifm                                                             0.7.0            MIT                                  https://github.com/istarkov/rifm.git
-run-parallel                                                     1.2.0            MIT                                  git://github.com/feross/run-parallel.git
-scheduler                                                        0.20.2           MIT                                  https://github.com/facebook/react.git
-select2                                                          4.0.13           MIT                                  git://github.com/select2/select2.git
-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.5.4            MIT                                  https://github.com/socketio/socket.io-client.git
-socket.io-parser                                                 4.2.1            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
-strip-indent                                                     4.0.0            MIT                                  https://github.com/sindresorhus/strip-indent.git
-styled-components                                                5.3.6            MIT                                  git+https://github.com/styled-components/styled-components.git
-stylehacks                                                       5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-stylis                                                           4.1.3            MIT                                  https://github.com/thysultan/stylis.js
-supports-color                                                   5.5.0            MIT                                  https://github.com/chalk/supports-color.git
-supports-color                                                   7.2.0            MIT                                  https://github.com/chalk/supports-color.git
-supports-preserve-symlinks-flag                                  1.0.0            MIT                                  git+https://github.com/inspect-js/node-supports-preserve-symlinks-flag.git
-svgo                                                             2.8.0            MIT                                  git://github.com/svg/svgo.git
-tempusdominus-bootstrap-4                                        5.39.2           MIT                                  https://github.com/tempusdominus/bootstrap-4.git
-tempusdominus-core                                               5.19.3           MIT                                  https://github.com/tempusdominus/core.git
-text-segmentation                                                1.0.3            MIT                                  git+ssh://git@github.com/niklasvh/text-segmentation.git
-tiny-warning                                                     1.0.3            MIT                                  https://github.com/alexreardon/tiny-warning.git
-to-fast-properties                                               2.0.0            MIT                                  https://github.com/sindresorhus/to-fast-properties.git
-to-regex-range                                                   5.0.1            MIT                                  https://github.com/micromatch/to-regex-range.git
-trim-newlines                                                    4.0.2            MIT                                  https://github.com/sindresorhus/trim-newlines.git
-unc-path-regex                                                   0.1.2            MIT                                  https://github.com/regexhq/unc-path-regex.git
-update-browserslist-db                                           1.0.10           MIT                                  https://github.com/browserslist/update-db.git
-util-deprecate                                                   1.0.2            MIT                                  git://github.com/TooTallNate/util-deprecate.git
-utrie                                                            1.0.2            MIT                                  git+ssh://git@github.com/niklasvh/utrie.git
-valid-filename                                                   2.0.1            MIT                                  https://github.com/sindresorhus/valid-filename.git
-wkx                                                              0.5.0            MIT                                  http://github.com/cschwarz/wkx.git
-ws                                                               8.2.3            MIT                                  https://github.com/websockets/ws.git
-xmlhttprequest-ssl                                               2.0.0            MIT                                  git://github.com/mjwwit/node-XMLHttpRequest.git
-xterm                                                            4.19.0           MIT                                  https://github.com/xtermjs/xterm.js
-xterm-addon-fit                                                  0.5.0            MIT                                  https://github.com/xtermjs/xterm.js
-xterm-addon-search                                               0.8.2            MIT                                  https://github.com/xtermjs/xterm.js
-xterm-addon-web-links                                            0.4.0            MIT                                  https://github.com/xtermjs/xterm.js
-yocto-queue                                                      0.1.0            MIT                                  https://github.com/sindresorhus/yocto-queue.git
-@fortawesome/fontawesome-free                                    5.15.4           (CC-BY-4.0 AND OFL-1.1 AND MIT)      https://github.com/FortAwesome/Font-Awesome
-@react-leaflet/core                                              1.1.1            Hippocratic-2.1                      https://github.com/PaulLeCam/react-leaflet.git
-react-leaflet                                                    3.2.5            Hippocratic-2.1                      https://github.com/PaulLeCam/react-leaflet.git
-@sphinxxxx/color-conversion                                      2.2.2            ISC                                  git+https://github.com/Sphinxxxx/color-conversion.git
-@trysound/sax                                                    0.2.0            ISC                                  git://github.com/svg/sax.git
-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.3.1            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
-electron-to-chromium                                             1.4.284          ISC                                  https://github.com/kilian/electron-to-chromium/
-fastq                                                            1.13.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                                                       2.2.1            ISC                                  https://github.com/josdejong/jsonrepair.git
-lru-cache                                                        6.0.0            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.5            ISC                                  git+https://github.com/amrlabib/react-timer-hook.git
-semver                                                           7.3.8            ISC                                  https://github.com/npm/node-semver.git
-semver                                                           6.3.0            ISC                                  https://github.com/npm/node-semver
-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
-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.13.1           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
-istanbul-lib-instrument                                          5.2.1            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-report                                              3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-source-maps                                         4.0.1            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-reports                                                 3.1.5            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-react-transition-group                                           4.4.5            BSD-3-Clause                         https://github.com/reactjs/react-transition-group.git
-source-map                                                       0.6.1            BSD-3-Clause                         http://github.com/mozilla/source-map.git
-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.30001434     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
-domhandler                                                       4.3.1            BSD-2-Clause                         git://github.com/fb55/domhandler.git
-domutils                                                         2.8.0            BSD-2-Clause                         git://github.com/fb55/domutils.git
-entities                                                         2.2.0            BSD-2-Clause                         git://github.com/fb55/entities.git
-leaflet                                                          1.9.3            BSD-2-Clause                         git://github.com/Leaflet/Leaflet.git
-normalize-package-data                                           3.0.3            BSD-2-Clause                         git://github.com/npm/normalize-package-data.git
-nth-check                                                        2.1.1            BSD-2-Clause                         https://github.com/fb55/nth-check
-uri-js                                                           4.4.1            BSD-2-Clause                         http://github.com/garycourt/uri-js
-FileSaver                                                        0.10.0           UNKNOWN                              Unknown
-heap                                                             0.2.5            UNKNOWN                              git://github.com/qiao/heap.js.git
-mdn-data                                                         2.0.14           CC0-1.0                              https://github.com/mdn/data.git
-spdx-license-ids                                                 3.0.12           CC0-1.0                              https://github.com/jslicense/spdx-license-ids.git
-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.4.1            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
-
-489 dependencies listed.
-

Dockerfile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# Copyright (C) 2013 - 2026, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -27,47 +27,42 @@ RUN apk add --no-cache \
     make \
     nasm \
     nodejs \
+    npm \
     yarn \
     zlib-dev
 
-# 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
+# Create the /pgadmin4 directory and copy the source into it
 COPY web /pgadmin4/web
-RUN rm -rf /pgadmin4/web/*.log \
-           /pgadmin4/web/config_*.py \
-           /pgadmin4/web/node_modules \
-           /pgadmin4/web/regression \
-           `find /pgadmin4/web -type d -name tests` \
-           `find /pgadmin4/web -type f -name .DS_Store`
-
 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" && \
+RUN --mount=type=bind,source=.git,target=/pgadmin4/.git \
+    --mount=type=tmpfs,target=node_modules \
+    --mount=type=tmpfs,target=pgadmin/static/js/generated/.cache \
+    export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
+    npm install -g corepack && \
+    corepack enable && \
+    yarn set version berry && \
+    yarn set version "$(node -p "require('./package.json').packageManager.split('@')[1]")" && \
     yarn install && \
     yarn run bundle && \
-    rm -rf node_modules \
-           yarn.lock \
+    rm -rf yarn.lock \
            package.json \
            .[^.]* \
            babel.cfg \
            webpack.* \
-           karma.conf.js \
-           ./pgadmin/static/js/generated/.cache
+           jest.config.js \
+           babel.*
 
 #########################################################################
 # Next, create the base environment for Python
 #########################################################################
 
-FROM alpine:latest as env-builder
+FROM python:3-alpine AS env-builder
 
 # Install dependencies
-COPY requirements.txt /
-RUN     apk add --no-cache \
-        make \
-        python3 \
-        py3-pip && \
+RUN apk add --no-cache \
+        make && \
     apk add --no-cache --virtual build-deps \
         build-base \
         openssl-dev \
@@ -78,9 +73,9 @@ RUN     apk add --no-cache \
         cargo \
         zlib-dev \
         libjpeg-turbo-dev \
-        libpng-dev \
-        python3-dev && \
-    python3 -m venv --system-site-packages --without-pip /venv && \
+        libpng-dev
+COPY requirements.txt /
+RUN python3 -m venv --system-site-packages --without-pip /venv && \
     /venv/bin/python3 -m pip install --no-cache-dir -r requirements.txt && \
     apk del --no-cache build-deps
 
@@ -88,10 +83,10 @@ 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==6.1.1
+RUN /venv/bin/python3 -m pip install --no-cache-dir sphinx
 RUN /venv/bin/python3 -m pip install --no-cache-dir sphinxcontrib-youtube
 
 # Copy the docs from the local tree. Explicitly remove any existing builds that
@@ -112,31 +107,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: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 postgres:18-alpine AS pg18-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/
-COPY --from=pg12-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-12/
-
 COPY --from=pg13-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-13/
@@ -152,20 +132,54 @@ 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/
+
+COPY --from=pg18-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-18/
+COPY --from=pg18-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-18/
+COPY --from=pg18-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-18/
+COPY --from=pg18-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-18/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
 
-FROM alpine:latest
+FROM python:3-alpine
+
+# Install runtime dependencies
+RUN apk update && apk upgrade && \
+    apk add \
+        bash \
+        postfix \
+        krb5-libs \
+        libcurl \
+        libjpeg-turbo \
+        shadow \
+        sudo \
+        tzdata \
+        libedit \
+        libldap \
+        libcap \
+        su-exec && \
+    rm -rf /var/cache/apk/*
 
 # Copy in the Python packages
 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=pg18-builder /usr/local/lib/libpq.so.5.18 /usr/local/lib/libpq-oauth-18.so /usr/lib/liblz4.so.1.10.0 /usr/lib/
+
+RUN ln -s libpq.so.5.18 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.18 /usr/lib/libpq.so && \
+    ln -s liblz4.so.1.10.0 /usr/lib/liblz4.so.1
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -173,41 +187,31 @@ ENV PYTHONPATH=/pgadmin4
 # Copy in the code and docs
 COPY --from=app-builder /pgadmin4/web /pgadmin4
 COPY --from=docs-builder /pgadmin4/docs/en_US/_build/html/ /pgadmin4/docs
-COPY pkg/docker/run_pgadmin.py /pgadmin4
-COPY pkg/docker/gunicorn_config.py /pgadmin4
+COPY pkg/docker/run_pgadmin.py pkg/docker/gunicorn_config.py /pgadmin4/
 COPY pkg/docker/entrypoint.sh /entrypoint.sh
 
 # License files
 COPY LICENSE /pgadmin4/LICENSE
-COPY DEPENDENCIES /pgadmin4/DEPENDENCIES
 
-# Install runtime dependencies and configure everything in one RUN step
-RUN apk add \
-        python3 \
-        py3-pip \
-        postfix \
-        krb5-libs \
-        libjpeg-turbo \
-        shadow \
-        sudo \
-        libedit \
-        libldap \
-        libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn && \
+# Configure everything in one RUN step
+RUN /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 && \
-    chmod g=u /var/lib/pgadmin && \
+    mkdir -p /run/pgadmin /var/lib/pgadmin && \
+    chown pgadmin:root /run/pgadmin /var/lib/pgadmin && \
+    chmod g=u /run/pgadmin /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.10 && \
+    PYBIN="$(ls /usr/local/bin/python3.[0-9][0-9] 2>/dev/null | head -n1)" && \
+    cp "$PYBIN" /usr/local/bin/python3-cap && \
+    setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/python3-cap && \
+    ln -s /usr/local/bin/python3-cap /venv/bin/python3-cap && \
     echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
     echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix
 
-USER pgadmin
+USER 5050
 
 # Finish up
 VOLUME /var/lib/pgadmin

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 - 2026, 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,8 +26,9 @@ 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
+CALL :VERIFY_SIGNATURE || EXIT /B 1
 
 EXIT /B %ERRORLEVEL%
 REM Main build sequence Ends
@@ -51,24 +52,23 @@ 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"
+    IF "%PGADMIN_WINDOWS_CSC%" == "" SET "PGADMIN_WINDOWS_CSC="
 
     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,9 +97,14 @@ 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%
+    IF "%PGADMIN_WINDOWS_CSC%" == "" (
+        ECHO Code signing certificate:  [NONE - Signing disabled]
+    ) ELSE (
+        ECHO Code signing certificate:  %PGADMIN_WINDOWS_CSC%
+    )
     ECHO.
     ECHO App version:               %APP_VERSION%
     ECHO App version suffix:        %APP_VERSION_SUFFIX%
@@ -216,7 +221,16 @@ REM Main build sequence Ends
 
     ECHO Installing javascript dependencies...
     CD "%BUILDROOT%\web"
+    SET "YARN_VERSION="
+    FOR /f "delims=" %%v IN ('node -p "require('./package.json').packageManager.split('@')[1]"') DO SET "YARN_VERSION=%%v"
+    IF "%YARN_VERSION%"=="" (
+        ECHO ERROR: Could not determine Yarn version from package.json packageManager field.
+        EXIT /B 1
+    )
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version %YARN_VERSION% || 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,13 +243,14 @@ 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
 
     ECHO Staging license files...
     COPY "%WD%\LICENSE" "%BUILDROOT%\" > nul || EXIT /B 1
-    COPY "%WD%\DEPENDENCIES" "%BUILDROOT%\" > nul || EXIT /B 1
 
     ECHO Creating config_distro.py
     ECHO SERVER_MODE = False > "%BUILDROOT%\web\config_distro.py"
@@ -246,7 +261,7 @@ REM Main build sequence Ends
     ECHO } >> "%BUILDROOT%\web\config_distro.py"
 
     ECHO Building docs...
-    CALL pip install sphinx==6.1.1 || EXIT /B 1
+    CALL pip install sphinx || EXIT /B 1
     CALL pip install sphinxcontrib-youtube || EXIT /B 1
     MKDIR "%BUILDROOT%\docs\en_US\html"
     CD "%WD%\docs\en_US"
@@ -258,51 +273,80 @@ 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
+    SET "YARN_VERSION="
+    FOR /f "delims=" %%v IN ('node -p "require('./package.json').packageManager.split('@')[1]"') DO SET "YARN_VERSION=%%v"
+    IF "%YARN_VERSION%"=="" (
+        ECHO ERROR: Could not determine Yarn version from package.json packageManager field.
+        EXIT /B 1
+    )
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version %YARN_VERSION% || 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%""
+
+    IF NOT "%PGADMIN_WINDOWS_CSC%" == "" (
+        ECHO Attempting to sign the pgAdmin4.exe...
+        CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /sm /n "%PGADMIN_WINDOWS_CSC%" /tr http://timestamp.digicert.com /td sha256 /fd sha1 /v "%BUILDROOT%\runtime\pgAdmin4.exe"
+        IF %ERRORLEVEL% NEQ 0 (
+            ECHO.
+            ECHO ************************************************************
+            ECHO * Failed to sign the pgAdmin4.exe
+            ECHO ************************************************************
+            PAUSE
+        )
+    ) ELSE (
+        ECHO Skipping code signing ^(PGADMIN_WINDOWS_CSC is not set^)...
+    )
 
     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 +354,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 +372,17 @@ 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
+    IF NOT "%PGADMIN_WINDOWS_CSC%" == "" (
+        CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" "%WD%\pkg\win32\installer.iss" "/SpgAdminSigntool=%PGADMIN_SIGNTOOL_DIR%\signtool.exe sign /sm /n $q%PGADMIN_WINDOWS_CSC%$q /tr http://timestamp.digicert.com /td sha256 /fd sha1 /v $f" || EXIT /B 1
+    ) ELSE (
+        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,14 +393,25 @@ REM Main build sequence Ends
     CD %WD%
     EXIT /B 0
 
+:GENERATE_SBOM
+    ECHO Generating SBOM...
+    CALL syft "%BUILDROOT%" -o cyclonedx-json > "%BUILDROOT%\sbom.json"
 
-:SIGN_INSTALLER
-    ECHO Attempting to sign the installer...
-    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%DISTROOT%\%INSTALLERNAME%"
+    EXIT /B 0
+
+:VERIFY_SIGNATURE
+    IF "%PGADMIN_WINDOWS_CSC%" == "" (
+        ECHO Skipping signature verification ^(PGADMIN_WINDOWS_CSC is not set^)...
+        EXIT /B 0
+    )
+
+    ECHO Verifying the installer signature...
+
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" verify /pa /v "%DISTROOT%\%INSTALLERNAME%"
     IF %ERRORLEVEL% NEQ 0 (
         ECHO.
         ECHO ************************************************************
-        ECHO * Failed to sign the installer
+        ECHO * Failed to verify signature of the installer
         ECHO ************************************************************
         PAUSE
     )

Makefile

@@ -2,29 +2,36 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# Copyright (C) 2013 - 2026, 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
 #########################################################################
 
 # Include only platform-independent builds in all
-all: docs pip src runtime
+all: docs pip src
 
+# Add BUILD_OPTS variable to pass arguments
 appbundle:
-	./pkg/mac/build.sh
+	./pkg/mac/build.sh $(BUILD_OPTS)
 
 install-node:
-	cd web && yarn install && npm rebuild
+	cd web && yarn install
+
+install-python:
+	./tools/setup-python-env.sh
+
+install-python-testing:
+	./tools/setup-python-env.sh --test
 
 bundle:
 	cd web && yarn run bundle
@@ -36,7 +43,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
@@ -71,28 +78,18 @@ 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
-
-runtime-debug:
-	cd runtime && qmake CONFIG+=debug && make
-
-runtime:
-	cd runtime && qmake CONFIG+=release && make
+    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 clean-runtime
+clean: clean-appbundle clean-debian clean-dist clean-docs clean-node clean-pip clean-redhat clean-src
 	rm -rf web/pgadmin/static/js/generated/*
 	rm -rf web/pgadmin/static/js/generated/.cache
 	rm -rf web/pgadmin/static/css/generated/*
 	rm -rf web/pgadmin/static/css/generated/.cache
 
-clean-runtime:
-	if [ -f runtime/Makefile ]; then (cd runtime && make clean); fi;
-	rm -rf build-*
-
 clean-appbundle:
 	rm -rf mac-build/
 
@@ -122,6 +119,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,168 +9,42 @@ 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.9 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.6 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 psycopg2), 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
+pgAdmin is dependent on a number of third-party JavaScript libraries. These,
+along with its 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.
+asset as it is needed by the client.
 
 To create the bundle, you will need the 'yarn' package management tool to be
 installed. Then, you can run the following commands on a *nix system to
 download the required packages and build the bundle:
 
 ```bash
-(venv) $ cd $PGADMIN4_SRC
-(venv) $ make install-node
-(venv) $ make bundle
+$ cd $PGADMIN4_SRC
+$ make install-node
+$ make bundle
 ```
 
 On Windows systems (where "make" is not available), the following commands
@@ -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.9 and later are currently supported. It is recommended that a
+Python virtual environment is set up 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
+   (venv) $ 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 an external DB is used.
+   CONFIG_DATABASE_URI="postgresql://postgres:postgres@localhost:5436/pgadmin"
+
+   # Set up 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.md* 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,16 +219,16 @@ 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
 (venv) $ make pip
 ```
 
-To build the macOS AppBundle, please see *pkg/mac/README*.
+To build the macOS AppBundle, please see *pkg/mac/README.md*.
 
-To build the Windows installer, please see *pkg/win32/README.txt*.
+To build the Windows installer, please see *pkg/win32/README.md*.
 # Create Database Migrations
 
 In order to make changes to the SQLite DB, navigate to the 'web' directory:
@@ -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/ai_tools.rst

@@ -0,0 +1,249 @@
+.. _ai_tools:
+
+*******************
+`AI Reports`:index:
+*******************
+
+**AI Reports** is a feature that provides AI-powered database analysis and insights
+using Large Language Models (LLMs). Use the *Tools → AI Reports* menu to access
+the various AI-powered reports.
+
+The AI Reports feature allows you to:
+
+ * Generate security reports to identify potential security vulnerabilities and configuration issues.
+
+ * Create performance reports with optimization recommendations for queries and configurations.
+
+ * Perform design reviews to analyze database schema structure and suggest improvements.
+
+**Prerequisites:**
+
+Before using AI Reports, you must:
+
+ 1. Ensure AI features are enabled in the server configuration (set ``LLM_ENABLED`` to ``True`` in ``config.py``).
+
+ 2. Configure an LLM provider in :ref:`Preferences → AI <preferences>`.
+
+**Note:**
+
+ * AI Reports using cloud providers (Anthropic, OpenAI) require an active internet connection.
+   Local providers (Ollama, Docker Model Runner) do not require internet access.
+
+ * API usage may incur costs depending on your LLM provider's pricing model.
+   Local providers (Ollama, Docker Model Runner) are free to use.
+
+ * The quality and accuracy of reports depend on the LLM provider and model configured.
+
+
+Configuring AI Reports
+**********************
+
+To configure AI Reports, navigate to *File → Preferences → AI* (or click the *Settings*
+button and select *AI*).
+
+.. image:: images/preferences_ai.png
+    :alt: AI preferences
+    :align: center
+
+Select your preferred LLM provider from the dropdown:
+
+**Anthropic**
+  Use Claude models from Anthropic, or any Anthropic-compatible API provider.
+
+  * **API URL**: Custom API endpoint URL (leave empty for default: https://api.anthropic.com/v1).
+  * **API Key File**: Path to a file containing your Anthropic API key (obtain from https://console.anthropic.com/). This path refers to the filesystem where the pgAdmin server is running (e.g., inside the container if using Docker). The ``~`` prefix is expanded to the home directory of the user running the pgAdmin server process. Optional when using a custom URL with a provider that does not require authentication.
+  * **Model**: Select from available Claude models (e.g., claude-sonnet-4-20250514).
+
+**OpenAI**
+  Use GPT models from OpenAI, or any OpenAI-compatible API provider (e.g.,
+  LiteLLM, LM Studio, EXO, or other local inference servers).
+
+  * **API URL**: Custom API endpoint URL (leave empty for default: https://api.openai.com/v1). Include the ``/v1`` path prefix if required by your provider.
+  * **API Key File**: Path to a file containing your OpenAI API key (obtain from https://platform.openai.com/). This path refers to the filesystem where the pgAdmin server is running (e.g., inside the container if using Docker). The ``~`` prefix is expanded to the home directory of the user running the pgAdmin server process. Optional when using a custom URL with a provider that does not require authentication.
+  * **Model**: Select from available GPT models (e.g., gpt-4).
+
+**Ollama**
+  Use locally-hosted open-source models via Ollama. Requires a running Ollama instance.
+
+  * **API URL**: The URL of your Ollama server (default: http://localhost:11434).
+  * **Model**: Enter the name of the Ollama model to use (e.g., llama2, mistral).
+
+**Docker Model Runner**
+  Use models running in Docker Desktop's built-in model runner (available in Docker Desktop 4.40+).
+  No API key is required.
+
+  * **API URL**: The URL of the Docker Model Runner API (default: http://localhost:12434).
+  * **Model**: Select from available models or enter a custom model name.
+
+.. note:: You can also use the *OpenAI* provider with a custom API URL for any
+   OpenAI-compatible endpoint, including Docker Model Runner and other local
+   inference servers.
+
+After configuring your provider, click *Save* to apply the changes.
+
+
+Security Reports
+****************
+
+Security Reports analyze your PostgreSQL server, database, or schema for potential
+security vulnerabilities and configuration issues.
+
+To generate a security report:
+
+1. In the *Browser* tree, select a server, database, or schema.
+
+2. Choose *Tools → AI Reports → Security* from the menu, or right-click the
+   object and select *Security* from the context menu.
+
+3. The report will be generated and displayed in a new tab.
+
+.. image:: images/ai_security_report.png
+    :alt: AI security report
+    :align: center
+
+**Security Report Scope:**
+
+* **Server Level**: Analyzes server configuration, authentication settings, roles, and permissions.
+
+* **Database Level**: Reviews database-specific security settings, roles with database access, and object permissions.
+
+* **Schema Level**: Examines schema permissions, object ownership, and access controls.
+
+Each report includes:
+
+* **Security Findings**: Identified vulnerabilities or security concerns.
+
+* **Risk Assessment**: Severity levels for each finding (Critical, High, Medium, Low).
+
+* **Recommendations**: Specific actions to remediate security issues.
+
+* **Best Practices**: General security recommendations for PostgreSQL.
+
+
+Performance Reports
+*******************
+
+Performance Reports analyze query performance, configuration settings, and provide
+optimization recommendations.
+
+To generate a performance report:
+
+1. In the *Browser* tree, select a server or database.
+
+2. Choose *Tools → AI Reports → Performance* from the menu, or right-click the
+   object and select *Performance* from the context menu.
+
+3. The report will be generated and displayed in a new tab.
+
+**Performance Report Scope:**
+
+* **Server Level**: Analyzes server configuration parameters, resource utilization, and overall server performance metrics.
+
+* **Database Level**: Reviews database-specific configuration, query performance, index usage, and table statistics.
+
+Each report includes:
+
+* **Performance Metrics**: Key performance indicators and statistics.
+
+* **Configuration Analysis**: Review of relevant configuration parameters.
+
+* **Query Optimization**: Recommendations for improving slow queries.
+
+* **Index Recommendations**: Suggestions for adding, removing, or modifying indexes.
+
+* **Capacity Planning**: Resource utilization trends and recommendations.
+
+
+Design Review Reports
+*********************
+
+Design Review Reports analyze your database schema structure and suggest
+improvements for normalization, naming conventions, and best practices.
+
+To generate a design review report:
+
+1. In the *Browser* tree, select a database or schema.
+
+2. Choose *Tools → AI Reports → Design* from the menu, or right-click the
+   object and select *Design* from the context menu.
+
+3. The report will be generated and displayed in a new tab.
+
+**Design Review Scope:**
+
+* **Database Level**: Reviews overall database structure, schema organization, and cross-schema dependencies.
+
+* **Schema Level**: Analyzes tables, views, functions, and other objects within the schema.
+
+Each report includes:
+
+* **Schema Structure Analysis**: Review of table structures, relationships, and constraints.
+
+* **Normalization Review**: Recommendations for database normalization (1NF, 2NF, 3NF, etc.).
+
+* **Naming Conventions**: Suggestions for consistent naming patterns.
+
+* **Data Type Usage**: Review of data type choices and recommendations.
+
+* **Index Design**: Analysis of indexing strategy.
+
+* **Best Practices**: General PostgreSQL schema design recommendations.
+
+
+Working with Reports
+********************
+
+All AI reports are displayed in a dedicated panel with the following features:
+
+**Report Display**
+  Reports are formatted as Markdown and rendered with syntax highlighting for SQL code.
+
+**Toolbar Actions**
+
+  * **Stop** - Cancel the current report generation. This is useful if the report
+    is taking too long or if you want to change parameters.
+
+  * **Regenerate** - Generate a new report for the same object. Useful when you
+    want to get a fresh analysis or if data has changed.
+
+  * **Download** - Download the report as a Markdown (.md) file. The filename
+    includes the report type, object name, and date for easy identification.
+
+**Multiple Reports**
+  You can generate and view multiple reports simultaneously. Each report opens in
+  a new tab, allowing you to compare reports across different servers, databases,
+  or schemas.
+
+**Report Management**
+  Each report tab can be closed individually by clicking the *X* in the tab.
+  Panel titles show the object name and report type for easy identification.
+
+**Copying Content**
+  You can select and copy text from reports to use in documentation or share with
+  your team.
+
+
+Troubleshooting
+***************
+
+**"AI features are disabled in the server configuration"**
+  The administrator has disabled AI features on the server. Contact your
+  pgAdmin administrator to enable the ``LLM_ENABLED`` configuration option.
+
+**"Please configure an LLM provider in Preferences"**
+  You need to configure an LLM provider before using AI Reports. See *Configuring AI Reports* above.
+
+**"Please connect to the server/database first"**
+  You must establish a connection to the server or database before generating reports.
+
+**API Connection Errors**
+  * Verify your API key is correct (for Anthropic and OpenAI).
+  * Check your internet connection (for cloud providers).
+  * For Ollama, ensure the Ollama server is running and accessible.
+  * For Docker Model Runner, ensure Docker Desktop 4.40+ is running with the model runner enabled.
+  * Check that your firewall allows connections to the LLM provider's API.
+
+**Report Generation Fails**
+  * Check the pgAdmin logs for detailed error messages.
+  * Verify the database connection is still active.
+  * Ensure the selected model is available for your account/subscription.

docs/en_US/auto_update_desktop_app.rst

@@ -0,0 +1,96 @@
+Auto-Update of pgAdmin 4 Desktop Application
+********************************************
+
+pgAdmin 4's desktop application includes an automated update system built using 
+Electron's ``autoUpdater`` module. This feature enables users to receive and install 
+updates seamlessly, ensuring they always have access to the latest features and security fixes.
+
+Supported Platforms
+===================
+
+- **macOS:** Fully supported with automatic updates enabled by default
+- **Windows:** Not supported
+- **Linux:** Not supported
+
+Update Process Overview
+=======================
+
+1. **Check for Updates:**
+   
+   - Automatic check on application startup
+   - Manual check available via pgAdmin 4 menu > Check for Updates
+   - Uses Electron's ``autoUpdater`` API to query update server
+
+2. **Download Process:**
+   
+   - Updates download automatically when detected
+   - Progress shown via notifications
+   - Background download prevents interruption of work
+
+3. **Installation Flow:**
+   
+   - User prompted to Install & Restart or Restart Later when update ready
+   - Update applied during application restart
+
+  The flow chart for the update process is as follows:
+
+  .. image:: images/auto_update_desktop_app.png
+    :alt: Auto-update Desktop App
+    :align: center
+
+User Interface Components
+=========================
+
+1. **Notification Types:**
+   
+   - Update available
+   - Download progress
+   - Update ready to install
+   - Error notifications
+
+2. **Menu Integration:**
+   
+   - Check for Updates option in pgAdmin 4 menu
+   - Restart to Update option when  update available
+
+Error Handling
+==============
+
+The system includes comprehensive error handling:
+
+1. **Network Errors:**
+   
+   - Connection timeouts
+   - Download failures
+   - Server unavailability
+
+2. **Installation Errors:**
+   
+   - Corrupted downloads
+
+3. **Recovery Mechanisms:**
+   
+   - Fallback to manual update
+   - Error reporting to logs
+
+Security Considerations
+=======================
+
+The update system implements below security measures:
+
+1. **Secure Communication:**
+
+   - Protected update metadata
+
+Platform-Specific Notes
+=======================
+
+1. **macOS:**
+   
+   - Uses native update mechanisms
+   - Requires signed packages
+
+References
+==========
+
+- `Electron autoUpdater API Documentation <https://www.electronjs.org/docs/latest/api/auto-updater>`_

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
@@ -77,13 +77,13 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
 * Move switches in the **Sections** field box to select a portion of the object
   that will be backed up.
 
-   * Move the switch next to *Pre-data* towards right position to include all
+   * Move the switch next to *Pre-data* to the *Yes* position to include all
      data definition items not included in the data or post-data item lists.
 
-   * Move the switch next to *Data* towards right position to backup actual table
+   * Move the switch next to *Data* to the *Yes* position to backup actual table
      data, large-object contents, and sequence values.
 
-   * Move the switch next to *Post-data* towards right position to include
+   * Move the switch next to *Post-data* to the *Yes* position to include
      definitions of indexes, triggers, rules, and constraints other than
      validated check constraints.
 
@@ -94,13 +94,13 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
 * 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
+   * Move the switch next to *Only data* to the *Yes* 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
+   * Move the switch next to *Blobs* to the *No* position to exclude large
      objects in the backup.
 
 .. image:: images/backup_do_not_save.png
@@ -110,56 +110,123 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
 * Move switches in the **Do not save** field box to select the objects that will
   not be included in the backup.
 
-   * Move the switch next to *Owner* towards right position to exclude commands
+   * Move the switch next to *Owner* to the *Yes* 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* to the *Yes* 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* to the *Yes* position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* towards right position to
+   * Move the switch next to *Unlogged table data* to the *Yes* position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* towards right position to exclude
+   * Move the switch next to *Comments* to the *Yes* position to exclude
      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* to the *Yes* position to exclude
+     publications.
+
+   * Move the switch next to *Subscriptions* to the *Yes* position to exclude
+     subscriptions.
+
+   * Move the switch next to *Security labels* to the *Yes* position to exclude
+     Security labels.
+
+   * Move the switch next to *Toast compressions* to the *Yes* 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* to the *Yes* 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* to the *Yes* 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 *Include CREATE DATABASE statement* towards right
+   * 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* to the *Yes*
      position to include a command in the backup that creates a new database
      when restoring the backup.
 
-   * Move the switch next to *Include DROP DATABASE statement* towards right
+   * Move the switch next to *Include DROP DATABASE statement* to the *Yes*
      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 *Load Via Partition Root* towards right position,
+   * Move the switch next to *Include IF EXISTS clause* to the *Yes*
+     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* to the *Yes* 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* to the *Yes* 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* to the *Yes* 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,11 +234,11 @@ 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)
-     towards right position to include commands that will disable triggers on the
+   * Move the switch next to *Triggers* (active when creating a data-only backup)
+     to the *Yes* position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* towards right position to enable dollar
+   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -182,19 +249,36 @@ 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
+   * Move the switch next to *Verbose messages* to the *No* position to instruct
      *pg_dump* to exclude verbose messages.
 
-   * Move the switch next to *Force double quotes on identifiers* towards right
+   * Move the switch next to *Force double quotes on identifiers* to the *Yes*
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
      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 specify a timeout rather than waiting
+     indefinitely to acquire shared table locks at the beginning of the dump.
+     If unable to lock a table within the specified timeout, the operation will fail.
+
+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:
 
@@ -203,6 +287,6 @@ command:
 
 * 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
+pgAdmin will run the backup process in the background. You can view all the background
+processes with their running status and logs on the :ref:`Processes <processes>`
+tab.

docs/en_US/backup_globals_dialog.rst

@@ -34,6 +34,6 @@ statements that should be included in the backup.
 Click the *Backup* button to build and execute a command based on your
 selections; 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
+pgAdmin will run the backup process in the background. You can view all the background
+processes with their running status and logs on the :ref:`Processes <processes>`
+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
+   * Move the switch next to *Only data* to the *Yes* 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
@@ -47,42 +52,92 @@ tab to provide options related to data or pgAdmin objects that correspond to *pg
 * Move switches in the **Do not save** field box to select the objects that will
   not be included in the backup.
 
-   * Move the switch next to *Owner* towards right position to exclude commands
+   * Move the switch next to *Owner* to the *Yes* 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* to the *Yes* position to exclude
+     passwords for roles.
+
+   * Move the switch next to *Privileges* to the *Yes* 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* to the *Yes* position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* towards right position to
+   * Move the switch next to *Unlogged table data* to the *Yes* position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* towards right position to exclude
+   * Move the switch next to *Comments* to the *Yes* position to exclude
      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* to the *Yes* position to exclude
+     publications.
+
+   * Move the switch next to *Subscriptions* to the *Yes* position to exclude
+     subscriptions.
+
+   * Move the switch next to *Security labels* to the *Yes* position to exclude
+     Security labels.
+
+   * Move the switch next to *Toast compressions* to the *Yes* 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* to the *Yes* 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* to the *Yes* 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 *Include DROP DATABASE statement* towards right
+   * 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* to the *Yes*
      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* to the *Yes*
+     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* to the *Yes* 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* to the *Yes* 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,11 +146,11 @@ 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)
-     towards right position to include commands that will disable triggers on the
+   * Move the switch next to *Triggers* (active when creating a data-only backup)
+     to the *Yes* position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* towards right position to enable dollar
+   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -106,22 +161,34 @@ 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* to the *No* position to instruct
+     *pg_dumpall* to exclude verbose messages.
 
-   * Move the switch next to *Verbose messages* towards left position to instruct
-     *pg_dump* to exclude verbose messages.
-
-   * Move the switch next to *Force double quotes on identifiers* towards right
+   * Move the switch next to *Force double quotes on identifiers* to the *Yes*
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
      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.
 
-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
+   * 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 specify a timeout rather than waiting
+     indefinitely to acquire shared table locks at the beginning of the dump.
+     If unable to lock a table within the specified timeout, the operation will fail.
+
+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 the background. You can view all the background
+processes with their running status and logs on the :ref:`Processes <processes>`
+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/change_password_dialog.rst

@@ -13,6 +13,9 @@ Please consider the following guidelines when selecting a password:
 
 * Ensure that your password is an adequate length; 6 characters should be the
   absolute minimum number of characters in the password.
+* The minimum password length is set by default to six characters. This value 
+  can be changed by setting the *PASSWORD_LENGTH_MIN* option to desired length 
+  in pgAdmin configuration; see :ref:`config_py` for more information.
 * Ensure that your password is not open to dictionary attacks. Use a mixture of
   upper and lower case letters and numerics, and avoid words or names. Consider
   using the first letter from each word in a phrase that you will remember

docs/en_US/change_user_password.rst

@@ -13,6 +13,9 @@ Please consider the following guidelines when selecting a password:
 
 * Ensure that your password is an adequate length; 6 characters should be the
   absolute minimum number of characters in the password.
+* The minimum password length is set by default to six characters. This value 
+  can be changed by setting the *PASSWORD_LENGTH_MIN* option to desired length 
+  in pgAdmin configuration; see :ref:`config_py` for more information.
 * Ensure that your password is not open to dictionary attacks. Use a mixture of
   upper and lower case letters and numerics, and avoid words or names. Consider
   using the first letter from each word in a phrase that you will remember

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_aws_rds.rst

@@ -1,12 +1,12 @@
 .. _cloud_aws_rds:
 
 ******************************************
-`Amazon AWS RDS Cloud Deployment`:index:
+`Amazon RDS Cloud Deployment`:index:
 ******************************************
 
-To deploy a PostgreSQL server on the Amazon AWS cloud, follow the below steps.
+To deploy a PostgreSQL server on the Amazon cloud, follow the below steps.
 
-.. image:: images/cloud_aws_provider.png
+.. image:: images/cloud_provider_for_postgresql.png
     :alt: Cloud Deployment Provider
     :align: center
 
@@ -32,8 +32,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Instance name* field to add an instance name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control
-  too.
+  server; the name specified will be displayed in the *Object Explorer* too.
 
 * Use the *Public IP* field to specify the IP Address range for permitting the
   inbound traffic.
@@ -63,8 +62,8 @@ details.
 Use the fields from the Database Details tab to specify the Instance details.
 
 * Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
-  control within the specified group.
+  node for the server; the server will be displayed in the *Object Explorer*
+  within the specified group.
 
 * Use the *Database name* field to add the database name for the PostgreSQL
   server.
@@ -92,8 +91,8 @@ button to deploy the instance on Amazon RDS.
 
 Once you click on the finish, one background process will start which will
 deploy the instance in the cloud and monitor the progress of the deployment.
-You can view all the background process with there running status and logs
-on the :ref:`Processes <processes>` tab
+You can view all the background processes with their running status and logs
+on the :ref:`Processes <processes>` tab.
 
 The Server will be added to the tree with the cloud deployment icon. Once the
 deployment is done, the server details will be updated.

docs/en_US/cloud_azure_database.rst

@@ -0,0 +1,122 @@
+.. cloud_azure_database:
+
+******************************************
+`Azure Database Cloud Deployment`:index:
+******************************************
+
+To deploy a PostgreSQL server on the Azure Database, follow the below steps.
+
+.. image:: images/cloud_provider_for_postgresql.png
+    :alt: Cloud Deployment
+    :align: center
+
+Once you launch the tool, select the Azure Database option.
+Click on the *Next* button to proceed further.
+
+
+.. image:: images/cloud_azure_credentials.png
+    :alt: Cloud Deployment
+    :align: center
+
+In the Credentials dialog, select authentication method either interactive
+browser or Azure CLI. Azure CLI will use the currently logged in identity
+through the Azure CLI on the local machine. Interactive Browser will
+open a browser window to authenticate a user interactively.
+
+Use the *Azure tenant* id to specify Azure tenant ID against which user
+is authenticated.
+
+Clicking the *Click here to authenticate yourself to Microsoft Azure*
+button, user will be redirected to the Microsoft Azure authentication page in a
+new browser tab if the Interactive Browser option is selected.
+Azure CLI authentication can be used only in Desktop mode.
+
+Once authentication is completed, click on the next button to proceed.
+
+.. image:: images/cloud_azure_instance.png
+    :alt: Cloud Deployment
+    :align: center
+
+Use the fields from the Instance Specification tab to specify the Instance
+details.
+
+* Use the *Cluster name* field to add a name for the PostgreSQL
+  server; the name specified will be displayed in the *Object Explorer* too.
+
+* Select a subscription from the *Subscription* options which are populated based
+  on user access levels in Azure portal.
+
+* Select the resource group from *Resource Group* dropdown under which the
+  PostgreSQL instance will be created.
+
+* Select the location to deploy PostgreSQL instance from *Location*
+  options.
+
+* Select the availability zone in specified region to deploy PostgreSQL
+  instance from *Availability zone* options.
+
+* Use *Database version* options to specify PostgreSQL database version.
+
+* Use the *Instance class* field to allocate the computational, network, and
+  memory capacity required by planned workload of this DB instance.
+
+* Use the *Instance type* field to select the instance type.
+
+* Use the *Storage size* option to specify the storage capacity.
+
+.. image:: images/cloud_azure_network.png
+    :alt: Cloud Deployment
+    :align: center
+
+* Use the *Public IP* field to specify the List of IP Addresses or range of
+  IP Addresses (start IP Address - end IP address) from which inbound traffic
+  should be accepted. Add multiple IP addresses/ranges separated with commas,
+  for example: "192.168.0.50, 192.168.0.100 - 192.168.0.200"
+
+* Use *Zone redundant high availability* option to specify High Availability
+  option. Zone redundant high availability deploys a standby replica in a
+  different zone.
+  The Burstable instance type does not support high availability.
+
+.. image:: images/cloud_azure_database.png
+    :alt: Cloud Deployment
+    :align: center
+
+Use the fields from the Database Details tab to specify the PostgreSQL database details.
+
+* Use the drop-down list in the *pgAdmin server group* field to select the parent
+  node for the server; the server will be displayed in the *Object Explorer*
+  within the specified group.
+
+* Use the *Admin username* field to add the database name for the PostgreSQL
+  server.
+
+* Use the *Password* field to provide a password that will be supplied when
+  authenticating with the server.
+
+* Use the *Confirm password* field to repeat the password.
+
+Click on the next button to proceed.
+
+.. image:: images/cloud_azure_review.png
+    :alt: Cloud Deployment
+    :align: center
+
+At the end, review the instance details that you provided. Click on Finish
+button to deploy the instance on Azure Database.
+
+Once you click on the finish, one background process will start which will
+deploy the instance in the cloud and monitor the progress of the deployment.
+You can view all the background processes with their running status and logs
+on the :ref:`Processes <processes>` tab.
+
+.. image:: images/cloud_azure_bg_process_watcher.png
+    :alt: Cloud Deployment
+    :align: center
+
+The Server will be added to the tree with the cloud deployment icon. Once the
+deployment is done, the server details will be updated.
+
+.. image:: images/cloud_deployment_tree.png
+    :alt: Cloud Deployment Provider
+    :align: center

docs/en_US/cloud_azure_postgresql.rst

@@ -1,122 +0,0 @@
-.. _cloud_azure_postgresql:
-
-******************************************
-`Azure PostgreSQL Cloud Deployment`:index:
-******************************************
-
-To deploy a PostgreSQL server on the Azure cloud, follow the below steps.
-
-.. image:: images/cloud_azure_provider.png
-    :alt: Cloud Deployment
-    :align: center
-
-Once you launch the tool, select the Azure PostgreSQL option.
-Click on the *Next* button to proceed further.
-
-
-.. image:: images/cloud_azure_credentials.png
-    :alt: Cloud Deployment
-    :align: center
-
-In the Credentials dialog, select authentication method either interactive
-browser or Azure CLI. Azure CLI will use the currently logged in identity
-through the Azure CLI on the local machine. Interactive Browser will
-open a browser window to authenticate a user interactively.
-
-Use the *Azure tenant* id to specify Azure tenant ID against which user
-is authenticated.
-
-Clicking the *Click here to authenticate yourself to Microsoft Azure*
-button, user will be redirected to the Microsoft Azure authentication page in a
-new browser tab if the Interactive Browser option is selected.
-Azure CLI authentication can be used only in Desktop mode.
-
-Once authentication is completed, click on the next button to proceed.
-
-.. image:: images/cloud_azure_instance.png
-    :alt: Cloud Deployment
-    :align: center
-
-Use the fields from the Instance Specification tab to specify the Instance
-details.
-
-* Use the *Cluster name* field to add a name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control too.
-
-* Select a subscription from the *Subscription* options which are populated based
-  on user access levels in Azure portal.
-
-* Select the resource group from *Resource Group* dropdown under which the
-  PostgreSQL instance will be created.
-
-* Select the location to deploy PostgreSQL instance from *Location*
-  options.
-
-* Select the availability zone in specified region to deploy PostgreSQL
-  instance from *Availability zone* options.
-
-* Use *Database version* options to specify PostgreSQL database version.
-
-* Use the *Instance class* field to allocate the computational, network, and
-  memory capacity required by planned workload of this DB instance.
-
-* Use the *Instance type* field to select the instance type.
-
-* Use the *Storage size* option to specify the storage capacity.
-
-.. image:: images/cloud_azure_network.png
-    :alt: Cloud Deployment
-    :align: center
-
-* Use the *Public IP* field to specify the List of IP Addresses or range of
-  IP Addresses (start IP Address - end IP address) from which inbound traffic
-  should be accepted. Add multiple IP addresses/ranges separated with commas,
-  for example: "192.168.0.50, 192.168.0.100 - 192.168.0.200"
-
-* Use *Zone redundant high availability* option to specify High Availability
-  option. Zone redundant high availability deploys a standby replica in a
-  different zone.
-  The Burstable instance type does not support high availability.
-
-.. image:: images/cloud_azure_database.png
-    :alt: Cloud Deployment
-    :align: center
-
-Use the fields from the Database Details tab to specify the PostgreSQL database details.
-
-* Use the drop-down list in the *pgAdmin server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
-  control within the specified group.
-
-* Use the *Admin username* field to add the database name for the PostgreSQL
-  server.
-
-* Use the *Password* field to provide a password that will be supplied when
-  authenticating with the server.
-
-* Use the *Confirm password* field to repeat the password.
-
-Click on the next button to proceed.
-
-.. image:: images/cloud_azure_review.png
-    :alt: Cloud Deployment
-    :align: center
-
-At the end, review the instance details that you provided. Click on Finish
-button to deploy the instance on Azure PostgreSQL.
-
-Once you click on the finish, one background process will start which will
-deploy the instance in the cloud and monitor the progress of the deployment.
-You can view all the background process with there running status and logs
-on the :ref:`Processes <processes>` tab
-
-.. image:: images/cloud_azure_bg_process_watcher.png
-    :alt: Cloud Deployment
-    :align: center
-
-The Server will be added to the tree with the cloud deployment icon. Once the
-deployment is done, the server details will be updated.
-
-.. image:: images/cloud_deployment_tree.png
-    :alt: Cloud Deployment Provider
-    :align: center

docs/en_US/cloud_deployment.rst

@@ -1,11 +1,12 @@
 .. _cloud_deployment:
 
-******************************
-`Cloud Deployment`:index:
-******************************
+*************************************
+`PostgreSQL Cloud Deployment`:index:
+*************************************
 
-A PostgreSQL server can be deployed on the Amazon AWS and EDB BigAnimal
-cloud using this module. In future more cloud options will be available.
+A PostgreSQL server can be deployed on the Amazon, Azure, Google cloud
+using this module. In future more cloud provider options will be
+available.
 
 To launch the *Cloud Deployment...* tool, right click on the *Server Group* or
 *Server* of the tree control, and select *Deploy a Cloud Instance* from the
@@ -15,5 +16,5 @@ To launch the *Cloud Deployment...* tool, right click on the *Server Group* or
    :maxdepth: 2
 
    cloud_aws_rds
-   cloud_edb_biganimal
-   cloud_azure_postgresql
+   cloud_azure_database
+   cloud_google_cloud_sql

docs/en_US/cloud_edb_biganimal.rst

@@ -1,108 +0,0 @@
-.. _cloud_edb_biganimal:
-
-******************************************
-`EDB BigAnimal Cloud Deployment`:index:
-******************************************
-
-To deploy a PostgreSQL server on the EDB BigAnimal cloud, follow the below steps.
-
-.. image:: images/cloud_biganimal_provider.png
-    :alt: Cloud Deployment Provider
-    :align: center
-
-Once you launch the tool, select the EDB BigAnimal option.
-Click on the *Next* button to proceed further.
-
-.. image:: images/cloud_biganimal_credentials.png
-    :alt: Cloud Deployment Provider
-    :align: center
-
-The next steps is to authenticate the user to EDB BigAninal.
-Click the given button to authenticate, by clicking the button, the user
-will be redirected to the new tab for the verification.
-Once you confirm the one time code, the pgAdmin will automatically detect it
-and the next button will be enabled. To proceed further, click on the next button.
-
-.. image:: images/cloud_biganimal_cluster.png
-    :alt: Cloud Deployment Provider
-    :align: center
-
-
-* Use the *Cluster type* field to choose a cluster type.
-
-* Use the *No. of Standby Replicas* field to specify the replicas if you have selected the High Availability cluster.
-
-* Use the *Cluster provider* field to coose the provider.
-
-
-.. image:: images/cloud_biganimal_instance.png
-    :alt: Cloud Deployment Provider
-    :align: center
-
-Use the fields from the Instance Specification tab to specify the Instance
-details.
-
-* Use the *Cluster name* field to add a cluster name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control
-  too.
-
-* Use the *Region* field to select the region.
-
-* Use the *Public IP range* field to specify the IP Address range for permitting the
-  inbound traffic. Leave it blank for 0.0.0.0/0
-
-* Use the *Instance type* field to select the instance type.
-
-* Use the *Instance series* field to select the instance series.
-
-* Use the *Instance size* field to allocate the computational, network, and
-  memory capacity required by planned workload of this DB instance.
-
-* Use the *Volume type* field to select the instance storage type.
-
-* Use the *Volume properties* field to specify the storage capacity. This field is specific to Azure.
-
-* Use the *Volume size* field to specify the storage size. This field is specific to AWS.
-
-* Use the *Volume IOPS* field to specify the storage IOPS. This field is specific to AWS.
-
-
-.. image:: images/cloud_biganimal_database.png
-    :alt: Cloud Deployment Provider
-    :align: center
-
-Use the fields from the Database Details tab to specify the Instance details.
-
-* Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
-  control within the specified group.
-
-* Use the *Database type* field to specify the PostgreSQL
-  type, EnterpriseDB PostgreSQL Advanced Server or PostgreSQL.
-
-* Use the *PostgreSQL version* field to select the database version.
-
-* Use the *Database Password* field to provide a password that will be supplied when
-  authenticating with the server.
-
-* Use the *Confirm password* field to repeat the password.
-
-
-.. image:: images/cloud_biganimal_review.png
-    :alt: Cloud Deployment Provider
-    :align: center
-
-At the end, review the Cluster details that you provided. Click on Finish
-button to deploy the instance on EDB BigAnimal.
-
-.. image:: images/cloud_deployment_tree.png
-    :alt: Cloud Deployment Provider
-    :align: center
-
-Once you click on the finish, one background process will start which will
-deploy the instance in the cloud and monitor the progress of the deployment.
-You can view all the background process with there running status and logs
-on the :ref:`Processes <processes>` tab
-
-The Server will be added to the tree with the cloud deployment icon. Once the
-deployment is done, the server details will be updated.

docs/en_US/cloud_google_cloud_sql.rst

@@ -0,0 +1,117 @@
+.. cloud_google_cloud_sql:
+
+************************************************
+`Google Cloud SQL Deployment`:index:
+************************************************
+
+To deploy a PostgreSQL server on the Google Cloud SQL, follow the below steps.
+
+.. image:: images/cloud_provider_for_postgresql.png
+    :alt: Cloud Deployment
+    :align: center
+
+Once you launch the tool, select the Google Cloud SQL option.
+Click on the *Next* button to proceed further.
+
+
+.. image:: images/cloud_google_credentials.png
+    :alt: Cloud Deployment
+    :align: center
+
+In the Credentials dialog, select client secret file to authenticate
+using google.You can download a client secret which is json formatted file
+from google cloud console once OAuth2 client ID is created.
+
+.. note:: While creating client OAuth client ID, select Desktop App as application type.
+ Refer `this <https://support.google.com/cloud/answer/6158849?hl=en/>`_ link for creating client secret.
+
+Clicking the *Click here to authenticate yourself to Google*
+button, user will be redirected to the Google authentication page in a
+new browser tab.
+
+Once authentication is completed, click on the next button to proceed.
+
+.. image:: images/cloud_google_instance.png
+    :alt: Cloud Deployment
+    :align: center
+
+Use the fields from the Instance Specification tab to specify the Instance
+details.
+
+* Use the *Cluster name* field to add a name for the PostgreSQL
+  server; the name specified will be displayed in the *Object Explorer* too.
+
+* Select the project from *project* dropdown under which the
+  PostgreSQL instance will be created.
+
+* Select the location to deploy PostgreSQL instance from *Location*
+  options.
+
+* Select the availability zone in specified region to deploy PostgreSQL
+  instance from *Availability zone* options.
+
+* Use *Database version* options to specify PostgreSQL database version.
+
+* Use the *Instance class* field to allocate the computational and
+  memory capacity required by planned workload of this DB instance.
+
+* Use the *Instance type* field to select the instance type.
+
+* Specify storage type by selecting option from *Storage type*.
+
+* Use the *Storage capacity* option to specify the storage capacity.
+
+.. image:: images/cloud_google_network.png
+    :alt: Cloud Deployment
+    :align: center
+
+* Use the *Public IP* field to specify the list of IP address range
+  for allowed inbound traffic, for example: 127.0.0.1/32. Add multiple
+  IP addresses/ranges separated with commas.
+
+* Use the *High Availability* option to specify High Availability
+  option. This option creates a standby in a select Secondary
+  Availability Zone.
+
+* Select the secondary availability zone for high availability
+  from *Secondary Availability zone* options.
+
+.. image:: images/cloud_google_database.png
+    :alt: Cloud Deployment
+    :align: center
+
+Use the fields from the Database Details tab to specify the PostgreSQL database details.
+
+* Use the drop-down list in the *pgAdmin server group* field to select the parent
+  node for the server; the server will be displayed in the *Object Explorer*
+  within the specified group.
+
+* Admin username field will be default to postgres.
+  server.
+
+* Use the *Password* field to provide a password that will be supplied when
+  authenticating with the server.
+
+* Use the *Confirm password* field to repeat the password.
+
+Click on the next button to proceed.
+
+.. image:: images/cloud_google_review.png
+    :alt: Cloud Deployment
+    :align: center
+
+At the end, review the instance details that you provided. Click on Finish
+button to deploy the instance on Azure PostgreSQL.
+
+Once you click on the finish, one background process will start which will
+deploy the instance in the cloud and monitor the progress of the deployment.
+You can view all the background processes with their running status and logs
+on the :ref:`Processes <processes>` tab.
+
+
+The Server will be added to the tree with the cloud deployment icon. Once the
+deployment is done, the server details will be updated.
+
+.. image:: images/cloud_google_deployment_tree.png
+    :alt: Cloud Deployment Provider
+    :align: center

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.
 
@@ -194,7 +194,7 @@ Nodes
 *****
 
 Nodes are very similar to modules, it represents an individual node or,
-collection object on the browser treeview. To recognised as a node module, a
+collection object on the object explorer treeview. To recognised as a node module, a
 Python package (along with javascript modules) must be created. This must:
 
 1) Be placed within the **web/pgadmin/browser/** directory, and
@@ -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 - 2026, 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 - 2026, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

docs/en_US/collation_dialog.rst

@@ -40,6 +40,9 @@ settings:
   as the existing one, but will be an independent object. If you choose to copy
   an existing collation, you cannot modify the collation properties displayed on
   this tab.
+* Use the drop-down listbox next to *Provider* to select a locale services associated
+  with the collation. Possible values are: icu, libc and builtin.
+  **Note:** The builtin option is available from v17 onwards.
 * Use the *Locale* field to specify a locale; a locale specifies language and
   language formatting characteristics. If you specify this, you cannot specify
   either of the following parameters. To view a list of locales supported by
@@ -50,12 +53,20 @@ 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.)
+* 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 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.
 
-Your entries in the *Collation* dialog generate a SQL command (see an example b
-elow). Use the *SQL* tab for review; revisit or switch tabs to make any changes
+Your entries in the *Collation* 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
@@ -69,7 +80,7 @@ the *Collation* dialog:
     :align: center
 
 The example shown demonstrates creating a collation named *french* that uses the
-rules specified for the locale, *fr-BI-x-icu.  The collation is owned by
+rules specified for the locale, *fr-BI-x-icu*.  The collation is owned by
 *postgres*.
 
 * Click the *Info* button (i) to access online help. For more information about

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.
 
@@ -138,7 +144,7 @@ the *Add* icon (+) to add each security label selection:
 
 * Specify a security label provider in the *Provider* field. The named provider
   must be loaded and must consent to the proposed labeling operation.
-* Specify a a security label in the *Security Label* field. The meaning of a
+* Specify a security label in the *Security Label* field. The meaning of a
   given label is at the discretion of the label provider. PostgreSQL places no
   restrictions on whether or how a label provider must interpret security
   labels; it merely provides a mechanism for storing them.

docs/en_US/conf.py

@@ -239,6 +239,14 @@ latex_documents = [
 # https://groups.google.com/forum/#!topic/sphinx-users/ZlQ95_QikXo
 latex_elements = {
     'fncychap': r'\usepackage[Sonny]{fncychap}',
+    # pdflatex's default utf8 inputenc covers Latin-1/Latin-Extended-A but
+    # not the Vietnamese precomposed code points that appear in CVE
+    # reporter names. Declare the specific characters we use rather than
+    # switching engines.
+    'preamble': r'''
+\DeclareUnicodeCharacter{1EA1}{\d{a}}
+\DeclareUnicodeCharacter{1EC1}{\`{\^e}}
+''',
 }
 
 

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,23 @@ 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-18': '/usr/local/pgsql-18',
+        '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 +133,39 @@ 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>*
+Set this variable to the path of a pgpass file if you want to supply passwords
+for the servers added in pgAdmin. On startup, the file is copied into the
+container and used as the ``.pgpass`` file.
 
 **GUNICORN_ACCESS_LOGFILE**
 
@@ -229,6 +261,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.
@@ -281,6 +321,44 @@ Run a TLS secured container using a shared config/storage directory in
         -e 'PGADMIN_ENABLE_TLS=True' \
         -d dpage/pgadmin4
 
+Restricted Security Contexts (OpenShift, ``--cap-drop=ALL``)
+************************************************************
+
+Some platforms refuse to honor Linux file capabilities. The two situations
+the pgAdmin container handles automatically are:
+
+- ``--cap-drop=ALL`` (or an equivalent restricted Kubernetes SecurityContext
+  such as OpenShift's ``restricted-v2`` SCC), which zeros the bounding set
+  and removes ``CAP_NET_BIND_SERVICE``. Exec of a capability-tagged binary
+  then fails with ``Operation not permitted``.
+
+- ``--security-opt=no-new-privileges`` (or
+  ``allowPrivilegeEscalation: false``), which causes the kernel to silently
+  strip file capabilities on exec. The binary runs, but a subsequent
+  ``bind()`` to a port below 1024 fails with ``EPERM``.
+
+The container's entrypoint reads ``/proc/self/status`` at startup, detects
+either condition, switches gunicorn to the non-capability python
+interpreter, and (when *PGADMIN_LISTEN_PORT* is not set) defaults the
+listen port to **8080** for plain HTTP and **8443** for TLS instead of
+80/443. A message is logged so the choice is visible.
+
+In practice this means a typical OpenShift deployment requires no special
+build, no setcap, and no custom configuration — only a Service / Route
+that targets the chosen non-privileged port:
+
+.. code-block:: bash
+
+    docker run --rm -p 8080:8080 \
+        --security-opt=no-new-privileges \
+        --cap-drop=ALL \
+        -e 'PGADMIN_DEFAULT_EMAIL=user@domain.com' \
+        -e 'PGADMIN_DEFAULT_PASSWORD=SuperSecret' \
+        dpage/pgadmin4
+
+If you explicitly set *PGADMIN_LISTEN_PORT*, that value is honored in both
+the restricted and unrestricted paths.
+
 Reverse Proxying
 ****************
 
@@ -487,3 +565,84 @@ the container is typically launched per the example below:
         -e "SCRIPT_NAME=/pgadmin4" \
         -l "traefik.frontend.pgadmin4.rule=Host(`host.example.com`) && PathPrefix(`/pgadmin4`)" \
         -d dpage/pgadmin4
+
+Sharing the data volume across containers (Kubernetes init containers)
+----------------------------------------------------------------------
+
+A common Kubernetes pattern is to bootstrap a pgAdmin deployment with one or
+more init containers that share the ``/var/lib/pgadmin`` volume with the main
+pgAdmin container — for example, an init container that runs
+``setup.py load-servers`` to import a ``servers.json`` definition file at
+each rollout.
+
+**The image tag of any such sidecar/init container must NOT be newer than
+the main pgAdmin container's tag.** pgAdmin's configuration database
+(``pgadmin4.db``) is migrated forward only — destructive operations such as
+dropping a column are part of normal upgrades. If an init container running
+``pgadmin4:latest`` (or any newer tag) executes ``setup.py`` against a
+``pgadmin4.db`` that the main, older pgAdmin will then read, the init
+container's migrations will advance the schema past what the main container's
+ORM understands, and the main container will fail at runtime with errors
+like ``no such column: <table>.<column>``.
+
+The safe configuration is to pin **both** the main container and every
+sidecar/init container that touches the data volume to the **same**
+explicit version tag, and upgrade them together:
+
+.. code-block:: yaml
+
+    # Deployment manifest (spec.template.spec): pin every container that
+    # touches the data volume to the same explicit tag. Do NOT use :latest.
+    spec:
+      template:
+        spec:
+          initContainers:
+            - name: import-servers-json
+              image: docker.io/dpage/pgadmin4:9.14   # match the main container
+              # ... rest of the init container spec ...
+          containers:
+            - name: pgadmin
+              image: docker.io/dpage/pgadmin4:9.14   # main pgAdmin container
+
+If you deploy pgAdmin with a Helm chart, set the equivalent image-tag values
+for both the main container and every init/sidecar container rather than the
+raw fields shown above. When upgrading pgAdmin, change every reference to the
+image tag at the same time so that the main container and any sidecar/init
+containers move forward together.
+
+Use ``strategy: Recreate``, not ``RollingUpdate``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Even when every container's image tag is pinned correctly, **a rolling
+upgrade across pgAdmin versions is unsafe** when the old and new pods share
+a data volume. Kubernetes' default ``RollingUpdate`` strategy starts the
+new pod, waits for it to become healthy, and only *then* terminates the
+old pod. During that overlap window:
+
+1. The new pod's startup runs ``db_upgrade()`` and applies any pending
+   migrations to the shared ``pgadmin4.db`` — including destructive ones
+   (column drops, table renames, type changes).
+2. The new pod becomes healthy. The old pod is still alive and still has
+   ``pgadmin4.db`` open with its older ORM schema metadata.
+3. Until Kubernetes terminates the old pod, requests routed to it
+   generate queries that reference the pre-migration schema. Those
+   queries now fail at runtime against the migrated database — for
+   example, ``no such column: <table>.<column>`` when a column was
+   dropped in this release.
+
+Because pgAdmin's migrations are forward-only with single-step destructive
+operations (a column dropped in release N+1 is gone immediately, not after
+a deprecation cycle), there is no safe way for an N-version pod to keep
+serving against a migrated N+1 schema. Set the deployment strategy to
+``Recreate``, which terminates the old pod *before* starting the new one:
+
+.. code-block:: yaml
+
+    spec:
+      strategy:
+        type: Recreate   # not RollingUpdate
+
+The trade-off is a few seconds of downtime during each upgrade, in
+exchange for not serving traffic from a pod whose ORM is misaligned with
+the database schema underneath it. This is the supported upgrade
+strategy for pgAdmin K8s deployments today.

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,15 +41,29 @@ 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.
-* If the *templates?* is set to true, then database will be a template database.
+* If *Template?* is set to *Yes*, the database will be a template database.
 
 Click the *Security* tab to continue.
 
@@ -72,7 +89,7 @@ database. Click the *Add* icon (+) to add each security label selection:
 
 * Specify a security label provider in the *Provider* field. The named provider
   must be loaded and must consent to the proposed labeling operation.
-* Specify a a security label in the *Security Label* field. The meaning of a
+* Specify a security label in the *Security Label* field. The meaning of a
   given label is at the discretion of the label provider. PostgreSQL places no
   restrictions on whether or how a label provider must interpret security
   labels; it merely provides a mechanism for storing them.
@@ -108,8 +125,8 @@ Use the *Advanced* tab to set advanced parameters for the database.
 
 * Use *Schema restriction* field to provide a SQL restriction that will be used
   against the pg_namespace table to limit the schemas that you see.
-  For example, you might enter: *public* so that only *public* are shown in
-  the pgAdmin browser.Separate entries with a comma or tab as you type.
+  For example, you might enter: *public* so that only *public* is shown in
+  the pgAdmin browser. Separate entries with a comma or tab as you type.
 
 Click the *SQL* tab to continue.
 

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
@@ -137,3 +128,10 @@ The configuration settings are stored in *runtime_config.json* file, which
 will be available on Unix systems (~/.local/share/pgadmin/),
 on Mac OS X (~/Library/Preferences/pgadmin),
 and on Windows (%APPDATA%/pgadmin).
+
+For details on the auto-update system for the desktop application, see
+
+.. toctree::
+   :maxdepth: 1
+
+   auto_update_desktop_app

docs/en_US/developer_tools.rst

@@ -17,3 +17,4 @@ PL/SQL code.
    schema_diff
    erd_tool
    psql_tool
+   ai_tools

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/domain_dialog.rst

@@ -89,7 +89,7 @@ Use the *Security Labels* panel to assign security labels. Click the *Add* icon
 
 * Specify a security label provider in the *Provider* field. The named provider
   must be loaded and must consent to the proposed labeling operation.
-* Specify a a security label in the *Security Label* field. The meaning of a
+* Specify a security label in the *Security Label* field. The meaning of a
   given label is at the discretion of the label provider. PostgreSQL places no
   restrictions on whether or how a label provider must interpret security
   labels; it merely provides a mechanism for storing them.

docs/en_US/editgrid.rst

@@ -5,9 +5,9 @@
 `View/Edit Data`:index:
 ***********************
 
-To view or modify data, right click on a table or view name in the *Browser*
-tree control.  When the context menu opens, use the *View/Edit Data* menu to
-specify the number of rows you would like to display in the editor panel.
+To view or modify data, right click on a table or view name in the
+*Object Explorer*. When the context menu opens, use the *View/Edit Data* menu
+to specify the number of rows you would like to display in the editor panel.
 
 .. image:: images/editgrid.png
     :alt: Edit grid window
@@ -49,7 +49,7 @@ To modify the displayed data:
 * To change a numeric value within the grid, double-click the value to select
   the field.  Modify the content in the square in which it is displayed.
 * To change a non-numeric value within the grid, double-click the content to
-  access the edit bubble.  After modifying the contentof the edit bubble, click
+  access the edit bubble.  After modifying the content of the edit bubble, click
   the *Ok* button to display your changes in the data grid, or *Cancel* to
   exit the edit bubble without saving.
 
@@ -62,7 +62,7 @@ table. As soon as you store the data, the row is assigned a row number, and a
 fresh empty line is added to the data grid.
 
 To write a SQL NULL to the table, simply leave the field empty. When you store
-the new row, the will server fill in the default value for that column. If you
+the new row, the server will fill in the default value for that column. If you
 store a change to an existing row, the value NULL will explicitly be written.
 
 To write an empty string to the table, enter the special string '' (two single
@@ -101,6 +101,11 @@ properties of the geometries directly in map, just click the specific geometry:
       viewer will render geometries with the same SRID in the map. If SRID=4326 the
       OSM tile layer will be added into the map.
 
+    - *Custom tile provider:* A custom map tile provider ({z}/{x}/{y} URL template,
+      in EPSG:3857, EPSG:4326 or EPSG:3395) can be configured as a base layer via
+      *Preferences > Query Tool > Geometry Viewer*. When configured, it is
+      selected as the default base layer.
+
     - *Data size:* For performance reasons, the viewer will render no more than
       100000 geometries, totaling up to 20MB.
 
@@ -110,9 +115,9 @@ properties of the geometries directly in map, just click the specific geometry:
 
 **JSON Data Editor**
 
-A built in json editor is provided for *JSON/JSONB Data*.Double clicking on json/jsonb
-data type cell in data grid will open JSON Editor.Editor provides different mode to
-view and edit json data.
+A built-in JSON editor is provided for *JSON/JSONB Data*. Double-clicking on a JSON/JSONB
+data type cell in the data grid will open the JSON Editor. The editor provides different modes to
+view and edit JSON data.
 
 
 .. image:: images/json_editor_modes.png
@@ -120,21 +125,21 @@ view and edit json data.
     :align: center
 
 *Code Mode*:
-Provides way to format & compact json data.Also provides ability to repair json data
-by fixing quotes and escape characters, removing comments and JSONP notation and
-turn JavaScript objects into JSON.
+Provides a way to format and compact JSON data. Also provides the ability to repair JSON data
+by fixing quotes and escape characters, removing comments and JSONP notation, and
+turning JavaScript objects into JSON.
 
 *Tree Mode*:
-Enabled to change, add, move, remove, and duplicate fields and values.Provides ability
-to searh & hilight data.
+Enables changing, adding, moving, removing, and duplicating fields and values. Provides the ability
+to search and highlight data.
 
 *Form Mode*:
-Allows only to edit values in json data there by providing ability to keep data structure
+Allows editing only the values in JSON data, thereby providing the ability to keep the data structure
 unchanged while editing.
 
 *Preview Mode*:
-Provides ability to check data before saving and also shows size of current json data.
-Format and compact json data as well.
+Provides the ability to check data before saving and also shows the size of the current JSON data.
+Allows formatting and compacting JSON data as well.
 
 
 *Editor Toolbar*
@@ -170,18 +175,18 @@ Tree/Form mode:
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
    | *Transform*          | Click to *Transform*  to filter data  using JSME query language.                       | Code, Preview, Tree       |
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
-   | *Undo*               | Click to *Undo* to undo last action performed on data .                                | Code, Preview, Tree, From |
+   | *Undo*               | Click to *Undo* to undo last action performed on data.                                 | Code, Preview, Tree, Form |
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
-   | *Redo*               | Click to *Redo* to repat last action performed on data .                               | Code, Preview, Tree, From |
+   | *Redo*               | Click to *Redo* to repeat last action performed on data.                               | Code, Preview, Tree, Form |
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
-   | *Mode*               | Click to *Mode* dropdown to change dipaly mode of editor.Different modes avaialble     | Code, Tree, From, Preview |
-   |                      | are Code, Preview, Tree, From.                                                         |                           |
+   | *Mode*               | Click the *Mode* dropdown to change the display mode of the editor. Different modes    | Code, Tree, Form, Preview |
+   |                      | available are Code, Preview, Tree, and Form.                                           |                           |
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
-   | *Expand All*         | Click to *Expand All* to expand json data.                                             | Tree, From                |
+   | *Expand All*         | Click *Expand All* to expand JSON data.                                                | Tree, Form                |
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
-   | *Collapse All*       | Click to *Redo* to collapse json data.                                                 | Tree, From                |
+   | *Collapse All*       | Click *Collapse All* to collapse JSON data.                                            | Tree, Form                |
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
-   | *Search Box*         | Enter partial/complete string to search in data.                                       | Tree, From                |
+   | *Search Box*         | Enter partial/complete string to search in data.                                       | Tree, Form                |
    +----------------------+----------------------------------------------------------------------------------------+---------------------------+
 
 
@@ -212,6 +217,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 +228,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 "Preferences -> 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

@@ -12,13 +12,20 @@ The Entity-Relationship Diagram (ERD) tool is a database design tool that provid
 * Save the diagram and open it later to continue working on it.
 * Generate ready to run SQL from the database design.
 * Generate the database diagram for an existing database.
-* Drag and drop tables from browser tree to the diagram.
+* Drag and drop tables from object explorer to the diagram.
 
 .. image:: images/erd_tool.png
     :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 an image format.                       | Option/Alt +   |
+   |                      |                                                                                                   | Ctrl + I       |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
 
 Editing Options
@@ -79,6 +86,9 @@ Editing Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
+   | *Search table*       | Click to search for a table in the diagram. Selecting a table from the search results will bring  | Option/Alt +   |
+   |                      | it into view and highlight it.                                                                    | Ctrl + F       |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | *Add table*          | Click this button to add a new table to the diagram. On clicking, this will open a table dialog   | Option/Alt +   |
    |                      | where you can put the table details.                                                              | Ctrl + A       |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
@@ -102,11 +112,14 @@ Table Relationship Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
-   | *1M*                 | Click this button to open a one-to-many relationship dialog to add a relationship between the     | Option/Alt +   |
+   | *1-1*                | Click this button to open a one-to-one relationship dialog to add a relationship between the      | Option/Alt +   |
+   |                      | two tables. The selected table becomes the referencing table.                                     | Ctrl + B       |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *1-M*                | Click this button to open a one-to-many relationship dialog to add a relationship between the     | Option/Alt +   |
    |                      | two tables. The selected table becomes the referencing table and will have the *many* endpoint of | Ctrl + O       |
    |                      | the link.                                                                                         |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *MM*                 | Click this button to open a many-to-many relationship dialog to add a relationship between the    | Option/Alt +   |
+   | *M-M*                | Click this button to open a many-to-many relationship dialog to add a relationship between the    | Option/Alt +   |
    |                      | two tables. This option will create a new table based on the selected columns for the two relating| Ctrl + M       |
    |                      | tables and link them.                                                                             |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
@@ -122,7 +135,7 @@ Node Color Options
    | Icon                 | Behavior                                                                                                 |
    +======================+==========================================================================================================+
    | *Fill Color*         | Use Fill Color to change the background color of a table node. This is helpful if you want to            |
-   |                      | identify a of group tables. Once set, all the newly added tables will take the same color.               |
+   |                      | identify a group of tables. Once set, all the newly added tables will take the same color.               |
    +----------------------+----------------------------------------------------------------------------------------------------------+
    | *Text Color*         | Use Text Color to change the text color of a table node based on the fill color to make text             |
    |                      | easily readable.                                                                                         |
@@ -135,18 +148,21 @@ Utility Options
    :class: longtable
    :widths: 1 4 1
 
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | Icon                 | Behavior                                                                                          | Shortcut       |
-   +======================+===================================================================================================+================+
-   | *Add/Edit note*      | Click this button to make notes on tables nodes while designing the database.                     | Option/Alt +   |
-   |                      |                                                                                                   | Ctrl + N       |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Auto align*         | Click this button to auto align all tables and links to make it look more cleaner.                | Option/Alt +   |
-   |                      |                                                                                                   | Ctrl + L       |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Show details*       | Click this button to toggle the column details visibility. It allows you to show few or more      | Option/Alt +   |
-   |                      | column details.                                                                                   | Shift + D      |
-   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   +-------------------------+------------------------------------------------------------------------------------------------+----------------+
+   | Icon                    | Behavior                                                                                       | Shortcut       |
+   +=========================+================================================================================================+================+
+   | *Add/Edit note*         | Click this button to make notes on tables nodes while designing the database.                  | Option/Alt +   |
+   |                         |                                                                                                | Ctrl + N       |
+   +-------------------------+------------------------------------------------------------------------------------------------+----------------+
+   | *Auto align*            | Click this button to auto-align all tables and links to make them look cleaner.                | Option/Alt +   |
+   |                         |                                                                                                | Ctrl + L       |
+   +-------------------------+------------------------------------------------------------------------------------------------+----------------+
+   | *Show details*          | Click this button to toggle the column details visibility. It allows you to show few or more   | Option/Alt +   |
+   |                         | column details.                                                                                | Shift + D      |
+   +-------------------------+------------------------------------------------------------------------------------------------+----------------+
+   | *Cardinality Notation*  | Change the cardinality notation format used to present relationship links. Options available   |                |
+   |                         | are - Crow's Foot Notation and Chen Notation.                                                  |                |
+   +-------------------------+------------------------------------------------------------------------------------------------+----------------+
 
 Zoom Options
 ************
@@ -178,7 +194,7 @@ Table Dialog
 The table dialog allows you to:
 
 * Change the table structure details.
-* It can be used edit an existing table or add a new one.
+* It can be used to edit an existing table or add a new one.
 * Refer :ref:`table dialog <table_dialog>` for information on different fields.
 
 Table Node
@@ -190,13 +206,29 @@ Table Node
 
 The table node shows table details in a graphical representation:
 
-* The top bar has a *details toggle button* that is used to toggle column details visibility. There is also a *note button* that is visible only if there is some note added. you can click on this button to quickly change the note.
+* The top bar has a *details toggle button* that is used to toggle column details visibility. There is also a *note button* that is visible only if there is some note added. You can click on this button to quickly change the note.
 * The first row shows the schema name of the table. Eg. *public* in above image.
 * The second row shows the table name. Eg. *users* in above image.
 * All other rows below the table name are the columns of the table along with data type. If the column is a primary key then it will have lock key icon eg. id is the primary key in above image. Otherwise, it will have column icon.
-* you can click on the node and drag to move on the canvas.
+* 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 a one-to-one relationship, the *Local Column* must have a primary 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
 ***************************
 
@@ -240,7 +272,7 @@ The table link shows relationship between tables:
 * The single line endpoint of the link shows the column that is being referred.
 * The three line endpoint of the link shows the column that refers.
 * If one of the columns that is being referred or that refers is removed from the table then the link will get dropped.
-* you can click on the link and drag to move on the canvas.
+* You can click on the link and drag to move on the canvas.
 
 
 The Table Notes

docs/en_US/event_trigger_dialog.rst

@@ -67,7 +67,7 @@ in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 
-Your entries in the *Event Trigger* dialog generate a generate a SQL command.
+Your entries in the *Event Trigger* dialog generate a SQL command.
 Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
 SQL command.
 

docs/en_US/export_data_using_query.rst

@@ -0,0 +1,91 @@
+.. _export_data_using_query:
+
+***************************************
+`Export Data Using Query Dialog`:index:
+***************************************
+
+Use the *Export Data Using Query* dialog to copy data to a file.
+
+The *Export Data Using Query* dialog organizes the export of data through the
+*General*, *Options* and *Query* tabs.
+
+.. image:: images/export_query_general.png
+    :alt: Export data using query dialog general tab
+    :align: center
+
+Use the fields in the *General* tab to specify export preferences:
+
+* Enter the name of the target file in the *Filename* field.
+  Optionally, select the *Browse* icon (ellipsis) to the right to navigate
+  into a directory and select a file.
+
+* Use the drop-down listbox in the *Format* field to specify the file type.
+  Select:
+
+  * *binary* for a .bin file.
+  * *csv* for a .csv file.
+  * *text* for a .txt file.
+
+* Use the drop-down listbox in the *Encoding* field to specify the type of
+  character encoding.
+
+.. image:: images/export_query_options.png
+    :alt: Export data using query dialog options tab
+    :align: center
+
+* Use the fields in the *Options* tab to specify additional information:
+
+   * Move the *Header* switch to the *Yes* position to include the table header
+     with the data rows. If you include the table header, the first row of the
+     file will contain the column names.
+   * If you are exporting data, specify the delimiter that will separate the
+     columns within the target file in the *Delimiter* field. The separating
+     character can be a colon, semicolon, a vertical bar, or a tab.
+   * Specify a quoting character used in the *Quote* field. Quoting can be
+     applied to string columns only (i.e. numeric columns will not be quoted)
+     or all columns regardless of data type. The character used for quoting can
+     be a single quote or a double quote.
+   * Specify a character that should appear before a data character that matches
+     the *QUOTE* value in the *Escape* field.
+   * Use the *NULL String* field to specify a string that will represent a null
+     value within the source or target file.
+
+Click the *Query* tab to continue.
+
+.. image:: images/export_query.png
+    :alt: Export data using query dialog query tab
+    :align: center
+
+Use the fields in the *Query* tab to write the query that will be exported:
+
+* Use the *Export Data Query* field to specify a SELECT, VALUES, INSERT, UPDATE,
+  DELETE, or MERGE command whose results are to be copied.
+
+* Use *Force Quote columns* field to forces quoting to be used for all non-NULL
+  values in each specified column. NULL output is never quoted. This is a creatable
+  select control. If you would like to quote all columns then provide only '*' in
+  the field.
+
+After completing the *Export Data Using Query* dialog, click the *OK* button to
+perform the export. pgAdmin will notify you when the background
+process completes:
+
+.. image:: images/export_query_complete.png
+    :alt: Export data using query completion notification
+    :align: center
+
+
+Use the *View Processes* button on the notification to open the *Process
+Watcher* and review detailed information about the execution of the command
+that performed the export:
+
+Use the **End Process** button to end the Export process.
+
+.. image:: images/export_query_pw.png
+    :alt: Export data using query process watcher
+    :align: center
+
+.. note:: If you are running *pgAdmin* in *Server Mode* you can click on the |sm_icon| icon in the process watcher window to open the file location in the Storage Manager. You can use the :ref:`Storage Manager <storage_manager>` to download the exported file on the client machine .
+
+
+.. |sm_icon| image:: images/sm_icon.png

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?* to the *Yes* 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/foreign_table_dialog.rst

@@ -131,7 +131,7 @@ function. Click the *Add* icon (+) to add each security label selection:
 
 * Specify a security label provider in the *Provider* field. The named provider
   must be loaded and must consent to the proposed labeling operation.
-* Specify a a security label in the *Security Label* field. The meaning of a
+* Specify a security label in the *Security Label* field. The meaning of a
   given label is at the discretion of the label provider. PostgreSQL places no
   restrictions on whether or how a label provider must interpret security
   labels; it merely provides a mechanism for storing them.

docs/en_US/function_dialog.rst

@@ -35,10 +35,15 @@ 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 drop-down listbox next to *Depends on extensions* to select the extension that this function
+  depends on (for example, plpgsql). If set, dropping the extension will automatically drop the
+  function as well.
 * Use the fields in the *Arguments* to define an argument. Click the *Add*
   icon (+) to set parameters and values for the argument:
 
@@ -151,7 +156,7 @@ function. Click the *Add* icon (+) to add each security label selection:
 
 * Specify a security label provider in the *Provider* field. The named provider
   must be loaded and must consent to the proposed labeling operation.
-* Specify a a security label in the *Security Label* field. The meaning of a
+* Specify a security label in the *Security Label* field. The meaning of a
   given label is at the discretion of the label provider. PostgreSQL places no
   restrictions on whether or how a label provider must interpret security
   labels; it merely provides a mechanism for storing them.
@@ -162,7 +167,7 @@ in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 
-Your entries in the *Function* dialog generate a generate a SQL command (see an
+Your entries in the *Function* 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.
 
@@ -176,8 +181,8 @@ the *Function* dialog:
     :alt: Function dialog sql tab
     :align: center
 
-The example demonstrates creating an *plpgsql* function named *hire_salesmen*. The
-function have three columns (p_ename, p_sal and p_comm).
+The example demonstrates creating a *plpgsql* function named *hire_salesmen*. The
+function has three columns (p_ename, p_sal and p_comm).
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.

docs/en_US/grant_wizard.rst

@@ -46,7 +46,7 @@ Use the fields in the *Privileges Selection* window to grant
 privileges. If you grant a privilege WITH GRANT OPTION, the Grantee will have
 the right to grant privileges on the object to others. If WITH GRANT OPTION is
 subsequently revoked, any role who received access to that object from that
-Grantee (directly or through a chain of grants) will lose thier privileges on
+Grantee (directly or through a chain of grants) will lose their privileges on
 the object.
 
 * Click the *Add* icon (+) to assign a set of privileges.