Fix the issue where the query tool documentation screen-shot displays the incorrect function key. #7507

2. Fixed an issue where the recover password button was enabled even when no email id was provided. #7487

.dockerignore

@@ -3,6 +3,12 @@ web/node_modules
 web/*.log
 web/regression
 web/**/tests/
+web/**/*.pyc
+web/**/__pycache__
 .DS_Store
 web/pgadmin/messages.pot
 web/pgadmin/translations/??/LC_MESSAGES/messages.po
+Dockerfile
+docs/en_US/_build/**/*
+src-build/**/*
+dist/**/*

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,44 @@
+---
+name: Bug report
+about: Create a report to help us improve pgAdmin
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+**_Please note that security bugs or issues should be reported to security@pgadmin.org._**
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. See the error
+
+**Expected behavior**
+
+A clear and concise description of what you expected to happen.
+
+**Error message**
+
+If possible, include the full, unedited text of any error messages displayed.
+
+**Screenshots**
+
+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]
+ - 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.]
+
+**Additional context**
+
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea or new feature for pgAdmin
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+**Describe the solution you'd like**
+
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+
+Add any other context or screenshots about the feature request here.

.github/dependabot.yml

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

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

@@ -0,0 +1,23 @@
+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-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build the container
+        run: docker build .

.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-latest
+
+    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

@@ -0,0 +1,35 @@
+name: Check Javascript style
+
+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-javascript-style:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
+      - name: Install Node modules
+        run: |
+          cd web
+          yarn install
+
+      - name: Run the 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-latest
+
+    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

@@ -0,0 +1,37 @@
+name: Check Python style
+
+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-python-style:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Python dependencies
+        run: |
+          sudo pip install --upgrade pip
+          sudo pip install pycodestyle
+
+      - name: Check the documentation
+        run: pycodestyle --config=.pycodestyle docs/
+
+      - name: Check the packaging
+        run: pycodestyle --config=.pycodestyle pkg/
+
+      - name: Check the application
+        run: pycodestyle --config=.pycodestyle web/
+
+      - name: Check the 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-latest
+
+    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-latest
+
+    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,178 @@
+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: [12, 13, 14, 15, 16]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup the EDB APT repo on Linux
+        run: |
+          sudo su -c 'echo "deb [arch=amd64] https://apt.enterprisedb.com/$(lsb_release -cs)-edb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/edb-$(lsb_release -cs).list'
+          sudo su -c 'echo "machine apt.enterprisedb.com login ${{ secrets.EDB_REPO_USERNAME }} password ${{ secrets.EDB_REPO_PASSWORD }}" > /etc/apt/auth.conf.d/edb.conf'
+          sudo wget -q -O - https://apt.enterprisedb.com/edb-deb.gpg.key | sudo apt-key add -
+
+      - 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 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
+
+          psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+
+      - name: Install Python dependencies
+        run: make install-python-testing
+
+      - name: Create the test configuration
+        run: |
+          cat <<EOF > web/config_local.py
+          from config import *
+
+          # Debug mode
+          DEBUG = True
+
+          # App mode
+          SERVER_MODE = False
+
+          # Log
+          CONSOLE_LOG_LEVEL = DEBUG
+          FILE_LOG_LEVEL = DEBUG
+
+          DEFAULT_SERVER = '127.0.0.1'
+
+          UPGRADE_CHECK_ENABLED = False
+
+          LOG_FILE = "$(pwd)/var/pgadmin4.log"
+          SESSION_DB_PATH = "$(pwd)/var/sessions"
+          STORAGE_DIR = "$(pwd)/var/storage"
+          SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          TEST_SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          AZURE_CREDENTIAL_CACHE_DIR = "$(pwd)/var/azurecredentialcache"
+          EOF
+
+          cat <<EOF > web/regression/test_config.json
+          {
+            "headless_chrome": false,
+            "default_browser": "Chrome",
+            "pgAdmin4_login_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_user_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER2@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_non_admin_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "server_group": 1,
+            "server_credentials": [
+              {
+                "name": "EPAS ${{ matrix.pgver }}",
+                "comment": "EPAS ${{ matrix.pgver }} Server",
+                "db_username": "enterprisedb",
+                "host": "/var/run/edb-as",
+                "db_password": "",
+                "db_port": 58${{ matrix.pgver }},
+                "maintenance_db": "postgres",
+                "sslmode": "prefer",
+                "tablespace_path": "/var/lib/edb-as/tablespaces/${{ matrix.pgver }}",
+                "enabled": true,
+                "default_binary_paths": {
+                  "pg": "",
+                  "ppas": "/usr/lib/edb-as/${{ matrix.pgver }}/bin"
+                }
+              }
+            ],
+            "server_update_data": [
+              {
+                "comment": "This is test update comment"
+              }
+            ]
+          }
+          EOF
+
+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
+      - name: Build the JS bundle
+        run: |
+          cd web
+          yarn install
+          yarn run bundle
+
+      - name: Run the tests
+        run: |
+          . venv/bin/activate
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          export DISPLAY=:99
+          cd web
+          python regression/runtests.py --pkg feature_tests
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: server-log-pg${{ matrix.pgver }}
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-log-pg${{ matrix.pgver }}
+          path: web/regression/regression.log
+
+      - name: Archive screenshots
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshots-pg${{ matrix.pgver }}
+          path: web/regression/screenshots
+          if-no-files-found: ignore

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

@@ -0,0 +1,181 @@
+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: [12, 13, 14, 15, 16]
+
+    runs-on: ubuntu-latest
+
+    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: Install platform dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent
+
+      - name: Create the tablespace directory
+        run: |
+          sudo mkdir -p /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
+          sudo chown postgres:postgres /var/lib/postgresql/tablespaces/${{ matrix.pgver }}
+
+      - name: Re-create stats directory, just in case
+        run: |
+          sudo rm -rf /var/run/postgresql/${{ matrix.pgver }}-main.pg_stat_tmp/
+          sudo mkdir -p /var/run/postgresql/${{ matrix.pgver }}-main.pg_stat_tmp/
+          sudo chown postgres:postgres /var/run/postgresql/${{ matrix.pgver }}-main.pg_stat_tmp/
+
+      - name: Start PostgreSQL
+        run: |
+          sudo su -c "echo local all all trust > /etc/postgresql/${{ matrix.pgver }}/main/pg_hba.conf"
+          sudo sed -i "s/port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
+          sudo sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = '\$libdir\/plugin_debugger'/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
+          sudo su - postgres -c "/usr/lib/postgresql/${{ matrix.pgver }}/bin/postgres -D /var/lib/postgresql/${{ matrix.pgver }}/main -c config_file=/etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf &"
+
+          until sudo runuser -l postgres -c "pg_isready -p 59${{ matrix.pgver }}" 2>/dev/null; do
+            >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
+            sleep 2
+          done
+
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'
+
+      - name: Install Python dependencies
+        run: make install-python-testing
+
+      - name: Create the test configuration
+        run: |
+          cat <<EOF > web/config_local.py
+          from config import *
+
+          # Debug mode
+          DEBUG = True
+
+          # App mode
+          SERVER_MODE = False
+
+          # Log
+          CONSOLE_LOG_LEVEL = DEBUG
+          FILE_LOG_LEVEL = DEBUG
+
+          DEFAULT_SERVER = '127.0.0.1'
+
+          UPGRADE_CHECK_ENABLED = False
+
+          LOG_FILE = "$(pwd)/var/pgadmin4.log"
+          SESSION_DB_PATH = "$(pwd)/var/sessions"
+          STORAGE_DIR = "$(pwd)/var/storage"
+          SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          TEST_SQLITE_PATH = "$(pwd)/var/pgadmin4.db"
+          AZURE_CREDENTIAL_CACHE_DIR = "$(pwd)/var/azurecredentialcache"
+          EOF
+
+          cat <<EOF > web/regression/test_config.json
+          {
+            "headless_chrome": false,
+            "default_browser": "Chrome",
+            "pgAdmin4_login_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_user_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER2@EXAMPLE.COM"
+            },
+            "pgAdmin4_test_non_admin_credentials": {
+              "new_password": "NEWPASSWORD",
+              "login_password": "PASSWORD",
+              "login_username": "USER@EXAMPLE.COM"
+            },
+            "server_group": 1,
+            "server_credentials": [
+              {
+                "name": "PostgreSQL ${{ matrix.pgver }}",
+                "comment": "PostgreSQL ${{ matrix.pgver }} Server",
+                "db_username": "postgres",
+                "host": "/var/run/postgresql",
+                "db_password": "postgres",
+                "db_port": 59${{ matrix.pgver }},
+                "maintenance_db": "postgres",
+                "sslmode": "prefer",
+                "tablespace_path": "/var/lib/postgresql/tablespaces/${{ matrix.pgver }}",
+                "enabled": true,
+                "default_binary_paths": {
+                  "pg": "/usr/lib/postgresql/${{ matrix.pgver }}/bin",
+                  "ppas": ""
+                }
+              }
+            ],
+            "server_update_data": [
+              {
+                "comment": "This is test update comment"
+              }
+            ]
+          }
+          EOF
+
+      - name: Upgrade yarn
+        run: |
+          yarn set version berry
+          yarn set version 3
+
+      - name: Build the JS bundle
+        run: |
+          cd web
+          yarn install
+          yarn run bundle
+
+      - name: Run the tests
+        run: |
+          . venv/bin/activate
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          export DISPLAY=:99
+          cd web
+          python regression/runtests.py --pkg feature_tests
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: server-log-pg${{ matrix.pgver }}
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-log-pg${{ matrix.pgver }}
+          path: web/regression/regression.log
+
+      - name: Archive screenshots
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshots-pg${{ matrix.pgver }}
+          path: web/regression/screenshots
+          if-no-files-found: ignore

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

@@ -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-latest, 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 3
+
+      - 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,291 @@
+# 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: [12, 13, 14, 15, 16]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup the EDB APT repo on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          sudo su -c 'echo "deb [arch=amd64] https://apt.enterprisedb.com/$(lsb_release -cs)-edb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/edb-$(lsb_release -cs).list'
+          sudo su -c 'echo "machine apt.enterprisedb.com login ${{ secrets.EDB_REPO_USERNAME }} password ${{ secrets.EDB_REPO_PASSWORD }}" > /etc/apt/auth.conf.d/edb.conf'
+          sudo wget -q -O - https://apt.enterprisedb.com/edb-deb.gpg.key | sudo apt-key add -
+
+      - name: Install platform dependencies on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          sudo apt update
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-pgagent
+
+      - 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: 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
+          
+          psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+
+      - name: Install Python dependencies on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        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,307 @@
+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-latest, windows-latest]
+        pgver: [12, 13, 14, 15, 16]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup the PGDG APT repo on Linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        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: Install platform dependencies on Linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        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: 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
+        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\${{ matrix.pgver }} --datadir C:\PostgreSQL\${{ matrix.pgver }}\data --serverport 59${{ matrix.pgver }} --superpassword postgres --install_runtimes 0 --mode unattended --unattendedmodeui none --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
+          choco install -y mitkerberos
+          
+          REM Ignore error 3010 (reboot required)
+          IF %ERRORLEVEL% EQU 3010 cmd /c "exit /b 0"
+        shell: cmd
+
+      - name: Create the tablespace directory on Linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        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-latest' }}
+        run: |
+          sudo su -c "echo local all all trust > /etc/postgresql/${{ matrix.pgver }}/main/pg_hba.conf"
+          sudo sed -i "s/port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
+          sudo sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = '\$libdir\/plugin_debugger'/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf
+          sudo su - postgres -c "/usr/lib/postgresql/${{ matrix.pgver }}/bin/postgres -D /var/lib/postgresql/${{ matrix.pgver }}/main -c config_file=/etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf &"
+          
+          until sudo runuser -l postgres -c "pg_isready -p 59${{ matrix.pgver }}" 2>/dev/null; do
+            >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
+            sleep 2
+          done
+          
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'
+
+      - name: Start PostgreSQL on macOS
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          echo local all all trust > /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-latest' }}
+        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-latest' }}
+        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-latest' && '/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-latest' }}
+        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/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-latest
+
+    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@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }}

.gitignore

@@ -9,6 +9,7 @@
 .DS_Store
 .idea
 .vscode
+.yarn
 /*.diff
 /*.patch
 /dist

.pycodestyle

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

DEPENDENCIES

@@ -12,379 +12,575 @@ Name                                                             Version
 ----                                                             -------          -------                              ---
 Python                                                           3.6+             PSF                                  https://www.python.org/
 nw                                                               0.50.2           MIT                                  git://github.com/nwjs/npm-installer.git
-axios                                                            0.21.0           MIT                                  https://github.com/axios/axios.git
-bootstrap                                                        4.5.3            MIT                                  git+https://github.com/twbs/bootstrap.git
-follow-redirects                                                 1.13.1           MIT                                  git@github.com:follow-redirects/follow-redirects.git
+asynckit                                                         0.4.0            MIT                                  git+https://github.com/alexindigo/asynckit.git
+axios                                                            1.4.0            MIT                                  https://github.com/axios/axios.git
+bootstrap                                                        4.6.2            MIT                                  git+https://github.com/twbs/bootstrap.git
+combined-stream                                                  1.0.8            MIT                                  git://github.com/felixge/node-combined-stream.git
+delayed-stream                                                   1.0.0            MIT                                  git://github.com/felixge/node-delayed-stream.git
+follow-redirects                                                 1.15.2           MIT                                  git@github.com:follow-redirects/follow-redirects.git
+form-data                                                        4.0.0            MIT                                  git://github.com/form-data/form-data.git
+mime-db                                                          1.52.0           MIT                                  https://github.com/jshttp/mime-db.git
+mime-types                                                       2.1.35           MIT                                  https://github.com/jshttp/mime-types.git
+proxy-from-env                                                   1.1.0            MIT                                  https://github.com/Rob--W/proxy-from-env.git
 
-5 dependencies listed.
+12 dependencies listed.
 
 Python Dependencies
 ===================
 
 Name                                                             Version          Licence                              URL
 ----                                                             -------          -------                              ---
-cheroot                                                          8.5.2            UNKNOWN                              https://cheroot.cherrypy.org
-Flask                                                            1.1.2            BSD-3-Clause                         https://palletsprojects.com/p/flask/
+Flask                                                            2.2.4            BSD-3-Clause                         https://palletsprojects.com/p/flask
 Flask-Gravatar                                                   0.5.0            BSD                                  https://github.com/zzzsochi/Flask-Gravatar/
-Flask-Login                                                      0.5.0            MIT                                  https://github.com/maxcountryman/flask-login
+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                                                    2.6.0            MIT                                  http://github.com/miguelgrinberg/flask-migrate/
-Flask-SQLAlchemy                                                 2.4.4            BSD-3-Clause                         https://github.com/pallets/flask-sqlalchemy
-Flask-WTF                                                        0.14.3           BSD                                  https://github.com/lepture/flask-wtf
-Flask-Compress                                                   1.8.0            MIT                                  https://github.com/colour-science/flask-compress
+Flask-Migrate                                                    4.0.4            MIT                                  https://github.com/miguelgrinberg/flask-migrate
+Flask-SQLAlchemy                                                 3.0.3            BSD-3-Clause                         Unknown
+Flask-WTF                                                        1.1.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                                                      3.1.0            BSD-3-Clause                         https://github.com/python-babel/flask-babel
+Flask-Security-Too                                               5.1.2            MIT                                  https://github.com/Flask-Middleware/flask-security
+Flask-SocketIO                                                   5.3.3            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.1           MIT                                  http://pythonhosted.org/pytz
-simplejson                                                       3.17.2           MIT License                          https://github.com/simplejson/simplejson
-six                                                              1.15.0           MIT                                  https://github.com/benjaminp/six
+pytz                                                             2023.3           MIT                                  http://pythonhosted.org/pytz
 speaklater3                                                      1.4              UNKNOWN                              https://github.com/ThomasWaldmann/speaklater
-sqlparse                                                         0.4.1            BSD-3-Clause                         https://github.com/andialbrecht/sqlparse
-WTForms                                                          2.3.3            BSD-3-Clause                         https://wtforms.readthedocs.io/
-Flask-Paranoid                                                   0.2.0            MIT                                  http://github.com/miguelgrinberg/flask-paranoid/
-psutil                                                           5.8.0            BSD                                  https://github.com/giampaolo/psutil
-psycopg2                                                         2.8.6            LGPL with exceptions                 https://psycopg.org/
-python-dateutil                                                  2.8.1            Dual License                         https://dateutil.readthedocs.io
-SQLAlchemy                                                       1.3.23           MIT                                  http://www.sqlalchemy.org
-Flask-Security-Too                                               3.4.5            MIT                                  https://github.com/Flask-Middleware/flask-security
-bcrypt                                                           3.2.0            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
-cryptography                                                     3.3.1            BSD or Apache License, Version 2.0   https://github.com/pyca/cryptography
+sqlparse                                                         0.4.4            Unknown                              Unknown
+psutil                                                           5.9.5            BSD-3-Clause                         https://github.com/giampaolo/psutil
+psycopg                                                          3.1.8            GNU Lesser General Public License v3 (LGPLv3) https://psycopg.org/psycopg3/
+python-dateutil                                                  2.8.2            Dual License                         https://github.com/dateutil/dateutil
+SQLAlchemy                                                       2.0.11           MIT                                  https://www.sqlalchemy.org
+bcrypt                                                           4.0.1            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
+cryptography                                                     40.0.2           (Apache-2.0 OR BSD-3-Clause) AND PSF-2.0 https://github.com/pyca/cryptography
 sshtunnel                                                        0.4.0            MIT                                  https://github.com/pahaz/sshtunnel
-ldap3                                                            2.9              LGPL v3                              https://github.com/cannatag/ldap3
-Flask-BabelEx                                                    0.9.4            BSD                                  http://github.com/mrjoes/flask-babelex
-gssapi                                                           1.6.12           LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
+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.3           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                                                         2.0.*            Unknown                              Unknown
+Authlib                                                          1.2.0            BSD 3-Clause License                 https://authlib.org/
+pyotp                                                            2.8.0            MIT License                          https://github.com/pyotp/pyotp
+qrcode                                                           7.4.2            BSD                                  https://github.com/lincolnloop/python-qrcode
+Pillow                                                           9.5.0            HPND                                 https://python-pillow.org
+boto3                                                            1.26.121         Apache License 2.0                   https://github.com/boto/boto3
+botocore                                                         1.29.121         Apache License 2.0                   https://github.com/boto/botocore
+urllib3                                                          1.26.15          MIT                                  https://urllib3.readthedocs.io/
+azure-mgmt-rdbms                                                 10.1.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
+azure-mgmt-resource                                              23.0.1           MIT License                          https://github.com/Azure/azure-sdk-for-python
+azure-mgmt-subscription                                          3.1.1            MIT License                          https://github.com/Azure/azure-sdk-for-python
+azure-identity                                                   1.13.0           MIT License                          https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity
+google-api-python-client                                         2.86.0           Apache 2.0                           https://github.com/googleapis/google-api-python-client/
+google-auth-oauthlib                                             1.0.0            Apache 2.0                           https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib
+Werkzeug                                                         2.2.3            BSD-3-Clause                         https://palletsprojects.com/p/werkzeug/
+keyring                                                          23.13.1          Unknown                              https://github.com/jaraco/keyring
 
-28 dependencies listed.
+NOTE: This report was generated using Python 3.11. Full information may not be
+shown for Python modules that are not required with this version.
+
+45 dependencies listed.
 
 Javascript Dependencies
 =======================
 
 Name                                                             Version          Licence                              URL
 ----                                                             -------          -------                              ---
-@babel/code-frame                                                7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/compat-data                                               7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/core                                                      7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/generator                                                 7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-annotate-as-pure                                   7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-compilation-targets                                7.13.16          MIT                                  https://github.com/babel/babel.git
-@babel/helper-create-class-features-plugin                       7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-function-name                                      7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-get-function-arity                                 7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-member-expression-to-functions                     7.13.12          MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-imports                                     7.13.12          MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-transforms                                  7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-optimise-call-expression                           7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-plugin-utils                                       7.13.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-replace-supers                                     7.13.12          MIT                                  https://github.com/babel/babel.git
-@babel/helper-simple-access                                      7.13.12          MIT                                  https://github.com/babel/babel.git
-@babel/helper-split-export-declaration                           7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-identifier                               7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-option                                   7.12.17          MIT                                  https://github.com/babel/babel.git
-@babel/helpers                                                   7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/highlight                                                 7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/parser                                                    7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-proposal-class-properties                          7.13.0           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-syntax-jsx                                         7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-display-name                       7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-jsx                                7.13.12          MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-jsx-development                    7.12.17          MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-pure-annotations                   7.12.1           MIT                                  https://github.com/babel/babel.git
-@babel/preset-react                                              7.13.13          MIT                                  https://github.com/babel/babel.git
-@babel/template                                                  7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/traverse                                                  7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/types                                                     7.14.2           MIT                                  https://github.com/babel/babel.git
+@ampproject/remapping                                            2.2.1            Apache-2.0                           git+https://github.com/ampproject/remapping.git
+anti-trojan-source                                               1.4.1            Apache-2.0                           https://github.com/lirantal/anti-trojan-source.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.10.2           Apache-2.0                           https://github.com/josdejong/jsoneditor.git
+paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
+rc-dock                                                          3.2.18           Apache-2.0                           https://github.com/ticlo/rc-dock.git
+rc-new-window                                                    0.1.13           Apache-2.0                           https://github.com/ticlo/rc-new-window.git
+snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
+spdx-correct                                                     3.2.0            Apache-2.0                           https://github.com/jslicense/spdx-correct.js.git
+validate-npm-package-license                                     3.0.4            Apache-2.0                           https://github.com/kemitchell/validate-npm-package-license.js.git
+@babel/code-frame                                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/compat-data                                               7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/core                                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/generator                                                 7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-annotate-as-pure                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-compilation-targets                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-create-class-features-plugin                       7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-environment-visitor                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-function-name                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-hoist-variables                                    7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-member-expression-to-functions                     7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-module-imports                                     7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-module-transforms                                  7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-optimise-call-expression                           7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-plugin-utils                                       7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-replace-supers                                     7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-simple-access                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-skip-transparent-expression-wrappers               7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-split-export-declaration                           7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-string-parser                                      7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-validator-identifier                               7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-validator-option                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/helpers                                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/highlight                                                 7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/parser                                                    7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-proposal-class-properties                          7.18.6           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-syntax-jsx                                         7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-display-name                       7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-jsx                                7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-jsx-development                    7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-pure-annotations                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/preset-react                                              7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/runtime                                                   7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/template                                                  7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/traverse                                                  7.22.5           MIT                                  https://github.com/babel/babel.git
+@babel/types                                                     7.22.5           MIT                                  https://github.com/babel/babel.git
+@date-io/core                                                    1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
+@date-io/date-fns                                                1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
+@emotion/babel-plugin                                            11.11.0          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin
+@emotion/cache                                                   11.11.0          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.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/hash
+@emotion/is-prop-valid                                           1.2.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/is-prop-valid
+@emotion/memoize                                                 0.8.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/memoize
+@emotion/react                                                   11.11.1          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
+@emotion/serialize                                               1.1.2            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/serialize
+@emotion/sheet                                                   1.2.2            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/sheet
+@emotion/stylis                                                  0.8.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/stylis
+@emotion/unitless                                                0.8.1            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.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/use-insertion-effect-with-fallbacks
+@emotion/utils                                                   1.2.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/utils
+@emotion/weak-memoize                                            0.3.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/weak-memoize
+@floating-ui/core                                                1.3.1            MIT                                  https://github.com/floating-ui/floating-ui.git
+@floating-ui/dom                                                 1.4.2            MIT                                  https://github.com/floating-ui/floating-ui.git
 @istanbuljs/schema                                               0.1.3            MIT                                  git+https://github.com/istanbuljs/schema.git
-@popperjs/core                                                   2.9.2            MIT                                  https://github.com/popperjs/popper-core.git
-@projectstorm/geometry                                           6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-canvas-core                                  6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams                                     6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-core                                6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-defaults                            6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-routing                             6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@simonwep/pickr                                                  1.8.1            MIT                                  https://github.com/Simonwep/pickr.git
-@tippyjs/react                                                   4.2.5            MIT                                  git+https://github.com/atomiks/tippyjs-react.git
-@types/json-schema                                               7.0.7            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/node                                                      15.0.3           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@jridgewell/gen-mapping                                          0.3.3            MIT                                  https://github.com/jridgewell/gen-mapping
+@jridgewell/resolve-uri                                          3.1.0            MIT                                  https://github.com/jridgewell/resolve-uri
+@jridgewell/set-array                                            1.1.2            MIT                                  https://github.com/jridgewell/set-array
+@jridgewell/sourcemap-codec                                      1.4.15           MIT                                  git+https://github.com/jridgewell/sourcemap-codec.git
+@jridgewell/sourcemap-codec                                      1.4.14           MIT                                  git+https://github.com/jridgewell/sourcemap-codec.git
+@jridgewell/trace-mapping                                        0.3.18           MIT                                  git+https://github.com/jridgewell/trace-mapping.git
+@material-ui/core                                                4.12.4           MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/icons                                               4.11.3           MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/lab                                                 4.0.0-alpha.61   MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/pickers                                             3.3.10           MIT                                  https://github.com/mui-org/material-ui-pickers
+@material-ui/styles                                              4.11.5           MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/system                                              4.12.2           MIT                                  https://github.com/mui-org/material-ui.git
+@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
+@rc-component/portal                                             1.1.1            MIT                                  https://github.com/react-component/portal.git
+@rc-component/trigger                                            1.13.6           MIT                                  https://github.com/react-component/trigger.git
+@react-dnd/asap                                                  5.0.2            MIT                                  https://github.com/react-dnd/react-dnd
+@react-dnd/invariant                                             4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
+@react-dnd/shallowequal                                          4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
+@remix-run/router                                                1.6.3            MIT                                  https://github.com/remix-run/react-router
+@simonwep/pickr                                                  1.8.2            MIT                                  https://github.com/Simonwep/pickr.git
+@sindresorhus/is                                                 0.7.0            MIT                                  https://github.com/sindresorhus/is.git
+@socket.io/component-emitter                                     3.1.0            MIT                                  https://github.com/socketio/emitter.git
+@szhsin/react-menu                                               2.3.4            MIT                                  https://github.com/szhsin/react-menu.git
+@types/classnames                                                2.3.1            MIT                                  Unknown
+@types/minimist                                                  1.2.2            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/node                                                      20.3.1           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/normalize-package-data                                    2.4.1            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/parse-json                                                4.0.0            MIT                                  https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
-acitree                                                          4.5.0-rc.7       MIT                                  https://github.com/imsurinder90/jquery-aciTree.git
+@types/prop-types                                                15.7.5           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     18.2.13          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     16.14.43         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     17.0.62          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react-dom                                                 17.0.20          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react-transition-group                                    4.4.6            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/scheduler                                                 0.16.3           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/styled-jsx                                                2.2.9            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+ajv                                                              8.12.0           MIT                                  https://github.com/ajv-validator/ajv.git
 ajv                                                              6.12.6           MIT                                  https://github.com/ajv-validator/ajv.git
-ajv                                                              5.5.2            MIT                                  https://github.com/epoberezkin/ajv.git
-ajv-keywords                                                     3.5.2            MIT                                  git+https://github.com/epoberezkin/ajv-keywords.git
-alertifyjs                                                       1.7.1            MIT                                  git@github.com:MohammadYounes/AlertifyJS.git
-alphanum-sort                                                    1.0.2            MIT                                  https://github.com/TrySound/alphanum-sort.git
-ansi-regex                                                       2.1.1            MIT                                  https://github.com/chalk/ansi-regex.git
 ansi-styles                                                      3.2.1            MIT                                  https://github.com/chalk/ansi-styles.git
-ansi-styles                                                      4.3.0            MIT                                  https://github.com/chalk/ansi-styles.git
-ansi-styles                                                      2.2.1            MIT                                  https://github.com/chalk/ansi-styles.git
-axios                                                            0.21.1           MIT                                  https://github.com/axios/axios.git
-babel-code-frame                                                 6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-code-frame
-babel-generator                                                  6.26.1           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-generator
-babel-messages                                                   6.23.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-messages
-babel-runtime                                                    6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-runtime
-babel-template                                                   6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-template
-babel-traverse                                                   6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-traverse
-babel-types                                                      6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-types
+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.1.3            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
-babylon                                                          6.18.0           MIT                                  https://github.com/babel/babylon
-backbone                                                         1.4.0            MIT                                  https://github.com/jashkenas/backbone.git
-backbone                                                         1.2.3            MIT                                  https://github.com/jashkenas/backbone.git
-backbone                                                         1.3.3            MIT                                  https://github.com/jashkenas/backbone.git
-backform                                                         0.2.0            MIT                                  https://github.com/AmiliaApp/backform
-backgrid                                                         0.3.8            MIT                                  http://github.com/cloudflare/backgrid
-backgrid-filter                                                  0.3.7            MIT                                  git://github.com/wyuenho/backgrid-text-cell.git
-backgrid-select-all                                              0.3.5            MIT                                  git://github.com/wyuenho/backgrid-select-all.git
 balanced-match                                                   1.0.2            MIT                                  git://github.com/juliangruber/balanced-match.git
-base64-arraybuffer                                               0.2.0            MIT                                  https://github.com/niklasvh/base64-arraybuffer
-big.js                                                           5.2.2            MIT                                  https://github.com/MikeMcl/big.js.git
-bignumber.js                                                     9.0.1            MIT                                  https://github.com/MikeMcl/bignumber.js.git
-bignumber.js                                                     7.2.1            MIT                                  https://github.com/MikeMcl/bignumber.js.git
-bootstrap                                                        4.6.0            MIT                                  git+https://github.com/twbs/bootstrap.git
-bootstrap4-toggle                                                3.6.1            MIT                                  https://github.com/gitbrent/bootstrap4-toggle.git
+base64-arraybuffer                                               1.0.2            MIT                                  https://github.com/niklasvh/base64-arraybuffer
+bignumber.js                                                     9.1.1            MIT                                  https://github.com/MikeMcl/bignumber.js.git
+bootstrap                                                        4.6.2            MIT                                  git+https://github.com/twbs/bootstrap.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
-browserslist                                                     4.16.6           MIT                                  https://github.com/browserslist/browserslist.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.9           MIT                                  https://github.com/browserslist/browserslist.git
 callsites                                                        3.1.0            MIT                                  https://github.com/sindresorhus/callsites.git
-camelcase                                                        6.2.0            MIT                                  https://github.com/sindresorhus/camelcase.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
-chalk                                                            4.1.1            MIT                                  https://github.com/chalk/chalk.git
-chalk                                                            1.1.3            MIT                                  https://github.com/chalk/chalk.git
-chart.js                                                         2.9.4            MIT                                  https://github.com/chartjs/Chart.js.git
-chartjs-color                                                    2.4.1            MIT                                  https://github.com/chartjs/chartjs-color.git
-chartjs-color-string                                             0.6.0            MIT                                  https://github.com/chartjs/chartjs-color-string.git
+chart.js                                                         3.9.1            MIT                                  https://github.com/chartjs/Chart.js.git
+chartjs-plugin-zoom                                              2.0.1            MIT                                  https://github.com/chartjs/chartjs-plugin-zoom.git
+classnames                                                       2.3.2            MIT                                  https://github.com/JedWatson/classnames.git
 closest                                                          0.0.1            MIT                                  https://github.com/ForbesLindesay/closest.git
-co                                                               4.6.0            MIT                                  https://github.com/tj/co.git
-codemirror                                                       5.61.0           MIT                                  https://github.com/codemirror/CodeMirror.git
-color                                                            3.1.3            MIT                                  https://github.com/Qix-/color.git
+clsx                                                             1.2.1            MIT                                  https://github.com/lukeed/clsx.git
+codemirror                                                       5.65.13          MIT                                  https://github.com/codemirror/CodeMirror.git
 color-convert                                                    1.9.3            MIT                                  https://github.com/Qix-/color-convert.git
-color-convert                                                    2.0.1            MIT                                  https://github.com/Qix-/color-convert.git
 color-name                                                       1.1.3            MIT                                  git@github.com:dfcreative/color-name.git
-color-name                                                       1.1.4            MIT                                  git@github.com:colorjs/color-name.git
-color-string                                                     1.5.5            MIT                                  https://github.com/Qix-/color-string.git
-colorette                                                        1.2.2            MIT                                  https://github.com/jorgebucaran/colorette.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.7.0            MIT                                  git://github.com/thlorenz/convert-source-map.git
-core-js                                                          3.12.1           MIT                                  https://github.com/zloirock/core-js.git
-core-js                                                          2.6.12           MIT                                  https://github.com/zloirock/core-js.git
-cosmiconfig                                                      7.0.0            MIT                                  git+https://github.com/davidtheclark/cosmiconfig.git
-css-color-names                                                  1.0.1            MIT                                  git://github.com/bahamas10/css-color-names.git
-css-color-names                                                  0.0.4            MIT                                  git://github.com/bahamas10/css-color-names.git
-css-line-break                                                   1.1.1            MIT                                  git+ssh://git@github.com/niklasvh/css-line-break.git
-css-loader                                                       5.2.4            MIT                                  https://github.com/webpack-contrib/css-loader.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.31.0           MIT                                  https://github.com/zloirock/core-js.git
+cosmiconfig                                                      7.1.0            MIT                                  git+https://github.com/davidtheclark/cosmiconfig.git
+css-line-break                                                   2.1.0            MIT                                  git+ssh://git@github.com/niklasvh/css-line-break.git
+css-to-react-native                                              3.2.0            MIT                                  git+https://github.com/styled-components/css-to-react-native.git
 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.0.2            MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-preset-default                                           5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-utils                                                    2.0.0            MIT                                  https://github.com/cssnano/cssnano.git
+cssnano                                                          5.1.15           MIT                                  https://github.com/cssnano/cssnano.git
+cssnano-preset-default                                           5.2.14           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.2            MIT                                  https://github.com/frenic/csstype
 dagre                                                            0.8.5            MIT                                  https://github.com/dagrejs/dagre.git
-debug                                                            4.3.1            MIT                                  git://github.com/visionmedia/debug.git
-debug                                                            2.6.9            MIT                                  git://github.com/visionmedia/debug.git
-detect-indent                                                    4.0.0            MIT                                  https://github.com/sindresorhus/detect-indent.git
-dom-serializer                                                   1.3.1            MIT                                  git://github.com/cheeriojs/dom-renderer.git
-dot-prop                                                         5.3.0            MIT                                  https://github.com/sindresorhus/dot-prop.git
-dropzone                                                         5.9.2            MIT                                  https://github.com/dropzone/dropzone.git
-emojis-list                                                      3.0.0            MIT                                  git+https://github.com/kikobeats/emojis-list.git
+date-fns                                                         2.30.0           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.5.0            MIT                                  https://github.com/socketio/engine.io-client.git
+engine.io-parser                                                 5.1.0            MIT                                  git@github.com:socketio/engine.io-parser.git
 error-ex                                                         1.3.2            MIT                                  https://github.com/qix-/node-error-ex.git
 escalade                                                         3.1.1            MIT                                  https://github.com/lukeed/escalade.git
 escape-string-regexp                                             1.0.5            MIT                                  https://github.com/sindresorhus/escape-string-regexp.git
+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-deep-equal                                                  1.1.0            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
-follow-redirects                                                 1.14.1           MIT                                  git@github.com:follow-redirects/follow-redirects.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
-globals                                                          9.18.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
-has-ansi                                                         2.0.0            MIT                                  https://github.com/sindresorhus/has-ansi.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
-hex-color-regex                                                  1.1.0            MIT                                  https://github.com/regexps/hex-color-regex.git
-hsl-regex                                                        1.0.0            MIT                                  https://github.com/regexps/hsl-regex.git
-hsla-regex                                                       1.0.0            MIT                                  https://github.com/regexps/hsla-regex.git
 html-escaper                                                     2.0.2            MIT                                  https://github.com/WebReflection/html-escaper.git
-html2canvas                                                      1.0.0-rc.7       MIT                                  git@github.com:niklasvh/html2canvas.git
+html2canvas                                                      1.4.1            MIT                                  git@github.com:niklasvh/html2canvas.git
+ignore                                                           5.2.4            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
-imports-loader                                                   2.0.0            MIT                                  https://github.com/webpack-contrib/imports-loader.git
-indexes-of                                                       1.0.1            MIT                                  git://github.com/dominictarr/indexes-of.git
-invariant                                                        2.2.4            MIT                                  https://github.com/zertosh/invariant
+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-absolute-url                                                  3.0.3            MIT                                  https://github.com/sindresorhus/is-absolute-url.git
-is-any-array                                                     1.0.0            MIT                                  https://github.com/cheminfo-js/is-any-array.git
+is-any-array                                                     2.0.1            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-arrayish                                                      0.3.2            MIT                                  https://github.com/qix-/node-is-arrayish.git
-is-color-stop                                                    1.1.0            MIT                                  git+https://github.com/pigcan/is-color-stop.git
-is-finite                                                        1.1.0            MIT                                  https://github.com/sindresorhus/is-finite.git
-is-obj                                                           2.0.0            MIT                                  https://github.com/sindresorhus/is-obj.git
-istanbul-instrumenter-loader                                     3.0.1            MIT                                  https://github.com/webpack-contrib/istanbul-instrumenter-loader.git
-jquery                                                           3.6.0            MIT                                  https://github.com/jquery/jquery.git
+is-core-module                                                   2.12.1           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.7.0            MIT                                  https://github.com/jquery/jquery.git
 jquery-contextmenu                                               2.9.2            MIT                                  git://github.com/swisnl/jQuery-contextMenu.git
-jquery-ui                                                        1.12.1           MIT                                  git://github.com/jquery/jquery-ui.git
 js-tokens                                                        4.0.0            MIT                                  https://github.com/lydell/js-tokens.git
-js-tokens                                                        3.0.2            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
-jsesc                                                            1.3.0            MIT                                  https://github.com/mathiasbynens/jsesc.git
-json-bignumber                                                   1.0.2            MIT                                  git@github.com:wbuss/JSONBigNumber.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-schema-traverse                                             0.3.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
-json5                                                            2.2.0            MIT                                  git+https://github.com/json5/json5.git
-json5                                                            1.0.1            MIT                                  git+https://github.com/json5/json5.git
-karma-coverage                                                   2.0.3            MIT                                  git://github.com/karma-runner/karma-coverage.git
-lines-and-columns                                                1.1.6            MIT                                  https://github.com/eventualbuddha/lines-and-columns.git
-loader-utils                                                     2.0.0            MIT                                  https://github.com/webpack/loader-utils.git
-loader-utils                                                     1.4.0            MIT                                  https://github.com/webpack/loader-utils.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
+jss                                                              10.10.0          MIT                                  https://github.com/cssinjs/jss.git
+jss-plugin-camel-case                                            10.10.0          MIT                                  https://github.com/cssinjs/jss.git
+jss-plugin-default-unit                                          10.10.0          MIT                                  https://github.com/cssinjs/jss.git
+jss-plugin-global                                                10.10.0          MIT                                  https://github.com/cssinjs/jss.git
+jss-plugin-nested                                                10.10.0          MIT                                  https://github.com/cssinjs/jss.git
+jss-plugin-props-sort                                            10.10.0          MIT                                  https://github.com/cssinjs/jss.git
+jss-plugin-rule-value-function                                   10.10.0          MIT                                  https://github.com/cssinjs/jss.git
+jss-plugin-vendor-prefixer                                       10.10.0          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.1.0            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
-lunr                                                             0.7.2            MIT                                  https://github.com/olivernn/lunr.js.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
-minimist                                                         1.2.5            MIT                                  git://github.com/substack/minimist.git
-ml-array-max                                                     1.2.3            MIT                                  git+https://github.com/mljs/array.git
-ml-array-min                                                     1.2.2            MIT                                  git+https://github.com/mljs/array.git
-ml-array-rescale                                                 1.3.5            MIT                                  git+https://github.com/mljs/array.git
-ml-matrix                                                        6.8.0            MIT                                  https://github.com/mljs/matrix.git
-moment                                                           2.29.1           MIT                                  https://github.com/moment/moment.git
-moment                                                           2.24.0           MIT                                  https://github.com/moment/moment.git
-moment-timezone                                                  0.5.33           MIT                                  https://github.com/moment/moment-timezone.git
+memoize-one                                                      5.2.1            MIT                                  https://github.com/alexreardon/memoize-one.git
+memoize-one                                                      6.0.0            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.43           MIT                                  https://github.com/moment/moment-timezone.git
 ms                                                               2.1.2            MIT                                  https://github.com/zeit/ms.git
-ms                                                               2.0.0            MIT                                  https://github.com/zeit/ms.git
-nanoid                                                           3.1.23           MIT                                  https://github.com/ai/nanoid.git
-nanopop                                                          2.1.0            MIT                                  https://github.com/Simonwep/nanopop.git
-node-releases                                                    1.1.71           MIT                                  git+https://github.com/chicoxyzzy/node-releases.git
-normalize-url                                                    4.5.0            MIT                                  https://github.com/sindresorhus/normalize-url.git
+nanoid                                                           3.3.6            MIT                                  https://github.com/ai/nanoid.git
+nanopop                                                          2.3.0            MIT                                  https://github.com/Simonwep/nanopop.git
+node-releases                                                    2.0.12           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.2.15           MIT                                  https://github.com/postcss/postcss.git
-postcss-calc                                                     8.0.0            MIT                                  https://github.com/postcss/postcss-calc.git
-postcss-colormin                                                 5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-convert-values                                           5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-comments                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-duplicates                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-empty                                            5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-overridden                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-longhand                                           5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-rules                                              5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-font-values                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-gradients                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-params                                            5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-selectors                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-modules-local-by-default                                 4.0.0            MIT                                  https://github.com/css-modules/postcss-modules-local-by-default.git
-postcss-normalize-charset                                        5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-display-values                                 5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-positions                                      5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-repeat-style                                   5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-string                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-timing-functions                               5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-unicode                                        5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-url                                            5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-whitespace                                     5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-ordered-values                                           5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-initial                                           5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-transforms                                        5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-selector-parser                                          6.0.6            MIT                                  https://github.com/postcss/postcss-selector-parser.git
-postcss-selector-parser                                          3.1.2            MIT                                  https://github.com/postcss/postcss-selector-parser.git
-postcss-svgo                                                     5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-unique-selectors                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-value-parser                                             4.1.0            MIT                                  https://github.com/TrySound/postcss-value-parser.git
-punycode                                                         2.1.1            MIT                                  https://github.com/bestiejs/punycode.js.git
+postcss                                                          8.4.24           MIT                                  https://github.com/postcss/postcss.git
+postcss-calc                                                     8.2.4            MIT                                  https://github.com/postcss/postcss-calc.git
+postcss-colormin                                                 5.3.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-convert-values                                           5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
+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.4            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.2            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.13           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.3.0            MIT                                  https://github.com/mathiasbynens/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.15           MIT                                  git@github.com:react-component/align.git
+rc-dropdown                                                      3.6.2            MIT                                  git@github.com:react-component/dropdown.git
+rc-dropdown                                                      4.0.1            MIT                                  git@github.com:react-component/dropdown.git
+rc-menu                                                          9.9.2            MIT                                  git@github.com:react-component/menu.git
+rc-menu                                                          9.6.4            MIT                                  git@github.com:react-component/menu.git
+rc-motion                                                        2.7.3            MIT                                  git@github.com:react-component/motion.git
+rc-overflow                                                      1.3.1            MIT                                  git@github.com:react-component/overflow.git
+rc-resize-observer                                               1.3.1            MIT                                  git@github.com:react-component/resize-observer.git
+rc-tabs                                                          11.16.1          MIT                                  git@github.com:react-component/tabs.git
+rc-trigger                                                       5.3.4            MIT                                  https://github.com/react-component/trigger.git
+rc-util                                                          5.34.0           MIT                                  git@github.com:react-component/util.git
+re-resizable                                                     6.9.6            MIT                                  https://github.com/bokuweb/react-resizable-box.git
 react                                                            17.0.2           MIT                                  https://github.com/facebook/react.git
+react-aspen                                                      1.2.0            MIT                                  https://github.com/neeksandhu/react-aspen.git
+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
-regenerator-runtime                                              0.11.1           MIT                                  https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime
-repeating                                                        2.0.1            MIT                                  https://github.com/sindresorhus/repeating.git
+react-draggable                                                  4.4.5            MIT                                  https://github.com/react-grid-layout/react-draggable.git
+react-dropzone                                                   14.2.3           MIT                                  https://github.com/react-dropzone/react-dropzone.git
+react-is                                                         17.0.2           MIT                                  https://github.com/facebook/react.git
+react-is                                                         16.13.1          MIT                                  https://github.com/facebook/react.git
+react-resize-detector                                            9.1.0            MIT                                  git+https://github.com/maslianok/react-resize-detector.git
+react-rnd                                                        10.4.1           MIT                                  https://github.com/bokuweb/react-rnd.git
+react-router                                                     6.13.0           MIT                                  https://github.com/remix-run/react-router
+react-router-dom                                                 6.13.0           MIT                                  https://github.com/remix-run/react-router
+react-select                                                     5.7.3            MIT                                  https://github.com/JedWatson/react-select/tree/master/packages/react-select
+react-table                                                      7.8.0            MIT                                  https://github.com/tannerlinsley/react-table
+react-transition-state                                           1.1.5            MIT                                  https://github.com/szhsin/react-transition-state.git
+react-virtualized-auto-sizer                                     1.0.20           MIT                                  https://github.com/bvaughn/react-virtualized-auto-sizer.git
+react-window                                                     1.8.9            MIT                                  https://github.com/bvaughn/react-window.git
+read-pkg                                                         6.0.0            MIT                                  https://github.com/sindresorhus/read-pkg.git
+read-pkg-up                                                      8.0.0            MIT                                  https://github.com/sindresorhus/read-pkg-up.git
+redent                                                           4.0.0            MIT                                  https://github.com/sindresorhus/redent.git
+redux                                                            4.2.1            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.2           MIT                                  git://github.com/browserify/resolve.git
 resolve-from                                                     4.0.0            MIT                                  https://github.com/sindresorhus/resolve-from.git
-rgb-regex                                                        1.0.1            MIT                                  https://github.com/regexps/rgb-regex.git
-rgba-regex                                                       1.0.0            MIT                                  https://github.com/johnotander/rgba-regex.git
-safe-buffer                                                      5.1.2            MIT                                  git://github.com/feross/safe-buffer.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
-schema-utils                                                     3.0.0            MIT                                  https://github.com/webpack/schema-utils.git
-schema-utils                                                     0.3.0            MIT                                  git+https://github.com/webpack-contrib/schema-utils.git
-select2                                                          4.0.13           MIT                                  git://github.com/select2/select2.git
-shim-loader                                                      1.0.1            MIT                                  https://github.com/zinserjan/shim-loader
-simple-swizzle                                                   0.2.2            MIT                                  https://github.com/qix-/node-simple-swizzle.git
-slickgrid                                                        2.3.16           MIT                                  git+https://github.com/6pac/SlickGrid.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
-source-list-map                                                  1.1.2            MIT                                  https://github.com/webpack/source-list-map.git
-split.js                                                         1.6.4            MIT                                  https://github.com/nathancahill/split
+socket.io-client                                                 4.7.0            MIT                                  https://github.com/socketio/socket.io-client.git
+socket.io-parser                                                 4.2.4            MIT                                  https://github.com/socketio/socket.io-parser.git
+spdx-expression-parse                                            3.0.1            MIT                                  https://github.com/jslicense/spdx-expression-parse.js.git
+split.js                                                         1.6.5            MIT                                  https://github.com/nathancahill/split
 stable                                                           0.1.8            MIT                                  https://github.com/Two-Screen/stable.git
-strip-ansi                                                       3.0.1            MIT                                  https://github.com/chalk/strip-ansi.git
-strip-comments                                                   2.0.1            MIT                                  https://github.com/jonschlinkert/strip-comments.git
-stylehacks                                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
+strip-indent                                                     4.0.0            MIT                                  https://github.com/sindresorhus/strip-indent.git
+styled-components                                                5.3.11           MIT                                  git+https://github.com/styled-components/styled-components.git
+stylehacks                                                       5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
+stylis                                                           4.2.0            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-color                                                   2.0.0            MIT                                  https://github.com/chalk/supports-color.git
-svgo                                                             2.3.0            MIT                                  git://github.com/svg/svgo.git
-tempusdominus-bootstrap-4                                        5.39.0           MIT                                  https://github.com/tempusdominus/bootstrap-4.git
-tempusdominus-core                                               5.19.0           MIT                                  https://github.com/tempusdominus/core.git
-timsort                                                          0.3.0            MIT                                  https://github.com/mziccard/node-timsort.git
-tippy.js                                                         6.3.1            MIT                                  git+https://github.com/atomiks/tippyjs.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-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-fast-properties                                               1.0.3            MIT                                  https://github.com/sindresorhus/to-fast-properties.git
-trim-right                                                       1.0.1            MIT                                  https://github.com/sindresorhus/trim-right.git
-underscore                                                       1.13.1           MIT                                  git://github.com/jashkenas/underscore.git
-uniq                                                             1.0.1            MIT                                  git://github.com/mikolalysenko/uniq.git
-uniqs                                                            2.0.0            MIT                                  git://github.com/fgnass/uniqs.git
+to-regex-range                                                   5.0.1            MIT                                  https://github.com/micromatch/to-regex-range.git
+trim-newlines                                                    4.1.1            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.11           MIT                                  https://github.com/browserslist/update-db.git
+uplot                                                            1.6.24           MIT                                  git+https://github.com/leeoniya/uPlot.git
+uplot-react                                                      1.1.4            MIT                                  https://github.com/skalinichev/uplot-wrappers.git
+use-isomorphic-layout-effect                                     1.1.2            MIT                                  git+https://github.com/Andarist/use-isomorphic-layout-effect.git
 util-deprecate                                                   1.0.2            MIT                                  git://github.com/TooTallNate/util-deprecate.git
-vendors                                                          1.0.4            MIT                                  https://github.com/wooorm/vendors.git
-webpack-sources                                                  0.2.3            MIT                                  git+https://github.com/webpack/webpack-sources.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
-@fortawesome/fontawesome-free                                    5.15.3           (CC-BY-4.0 AND OFL-1.1 AND MIT)      https://github.com/FortAwesome/Font-Awesome
-@trysound/sax                                                    0.1.1            ISC                                  git://github.com/svg/sax.git
+ws                                                               8.11.0           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-declaration-sorter                                           6.0.0            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
-electron-to-chromium                                             1.3.727          ISC                                  https://github.com/kilian/electron-to-chromium/
-icss-utils                                                       5.1.0            ISC                                  git+https://github.com/css-modules/icss-utils.git
-is-resolvable                                                    1.1.0            ISC                                  https://github.com/shinnn/is-resolvable.git
+css-color-keywords                                               1.0.0            ISC                                  https://github.com/sonicdoe/css-color-keywords.git
+css-declaration-sorter                                           6.4.0            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
+electron-to-chromium                                             1.4.437          ISC                                  https://github.com/kilian/electron-to-chromium/
+fastq                                                            1.15.0           ISC                                  git+https://github.com/mcollina/fastq.git
+glob-parent                                                      5.1.2            ISC                                  https://github.com/gulpjs/glob-parent.git
+hosted-git-info                                                  4.1.0            ISC                                  git+https://github.com/npm/hosted-git-info.git
+jsonrepair                                                       3.2.0            ISC                                  https://github.com/josdejong/jsonrepair.git
 lru-cache                                                        6.0.0            ISC                                  git://github.com/isaacs/node-lru-cache.git
-minimatch                                                        3.0.4            ISC                                  git://github.com/isaacs/minimatch.git
-postcss-modules-extract-imports                                  3.0.0            ISC                                  https://github.com/css-modules/postcss-modules-extract-imports.git
-postcss-modules-scope                                            3.0.0            ISC                                  https://github.com/css-modules/postcss-modules-scope.git
-postcss-modules-values                                           4.0.0            ISC                                  git+https://github.com/css-modules/postcss-modules-values.git
-semver                                                           7.3.5            ISC                                  https://github.com/npm/node-semver
-semver                                                           5.7.1            ISC                                  https://github.com/npm/node-semver
+lru-cache                                                        5.1.1            ISC                                  git://github.com/isaacs/node-lru-cache.git
+minimatch                                                        3.1.2            ISC                                  git://github.com/isaacs/minimatch.git
+picocolors                                                       1.0.0            ISC                                  https://github.com/alexeyraspopov/picocolors.git
+react-timer-hook                                                 3.0.6            ISC                                  git+https://github.com/amrlabib/react-timer-hook.git
 semver                                                           6.3.0            ISC                                  https://github.com/npm/node-semver
+semver                                                           7.5.2            ISC                                  https://github.com/npm/node-semver.git
+vanilla-picker                                                   2.12.1           ISC                                  https://github.com/Sphinxxxx/vanilla-picker.git
 yallist                                                          4.0.0            ISC                                  git+https://github.com/isaacs/yallist.git
+yallist                                                          3.1.1            ISC                                  git+https://github.com/isaacs/yallist.git
 yaml                                                             1.10.2           ISC                                  https://github.com/eemeli/yaml.git
-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
-paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
-snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
-caniuse-lite                                                     1.0.30001228     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
-css-select                                                       3.1.2            BSD-2-Clause                         git://github.com/fb55/css-select.git
-css-what                                                         4.0.0            BSD-2-Clause                         https://github.com/fb55/css-what
-domelementtype                                                   2.2.0            BSD-2-Clause                         git://github.com/fb55/domelementtype.git
-domhandler                                                       4.2.0            BSD-2-Clause                         git://github.com/fb55/domhandler.git
-domutils                                                         2.6.0            BSD-2-Clause                         git://github.com/fb55/domutils.git
+yargs-parser                                                     20.2.9           ISC                                  https://github.com/yargs/yargs-parser.git
+ace-builds                                                       1.23.0           BSD-3-Clause                         https://github.com/ajaxorg/ace-builds.git
+hoist-non-react-statics                                          3.3.2            BSD-3-Clause                         git://github.com/mridgway/hoist-non-react-statics.git
+hyphenate-style-name                                             1.0.4            BSD-3-Clause                         git+ssh://git@github.com/rexxars/hyphenate-style-name.git
+istanbul-lib-coverage                                            3.2.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
+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.30001506     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
+css-select                                                       4.3.0            BSD-2-Clause                         git://github.com/fb55/css-select.git
+css-what                                                         6.1.0            BSD-2-Clause                         https://github.com/fb55/css-what
+domelementtype                                                   2.3.0            BSD-2-Clause                         git://github.com/fb55/domelementtype.git
+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
-esutils                                                          2.0.3            BSD-2-Clause                         http://github.com/estools/esutils.git
-leaflet                                                          1.7.1            BSD-2-Clause                         git://github.com/Leaflet/Leaflet.git
-nth-check                                                        2.0.0            BSD-2-Clause                         https://github.com/fb55/nth-check
+leaflet                                                          1.9.4            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
-istanbul-lib-coverage                                            1.2.1            BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
-istanbul-lib-coverage                                            3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-instrument                                          1.10.2           BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
-istanbul-lib-instrument                                          4.0.3            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.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-reports                                                 3.0.2            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-source-map                                                       0.5.7            BSD-3-Clause                         http://github.com/mozilla/source-map.git
-source-map                                                       0.6.1            BSD-3-Clause                         http://github.com/mozilla/source-map.git
-sprintf-js                                                       1.1.2            BSD-3-Clause                         https://github.com/alexei/sprintf.js.git
 mdn-data                                                         2.0.14           CC0-1.0                              https://github.com/mdn/data.git
+spdx-license-ids                                                 3.0.13           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
-precond                                                          0.2.3            MIT*                                 https://github.com/MathieuTurcotte/node-precond.git
-webcabin-docker                                                  2.2.4-dev        MIT*                                 Unknown
-tablesorter                                                      2.31.3           (MIT OR GPL-2.0)                     git://github.com/Mottie/tablesorter.git
+pako                                                             1.0.11           (MIT AND Zlib)                       https://github.com/nodeca/pako.git
+spdx-exceptions                                                  2.3.0            CC-BY-3.0                            https://github.com/kemitchell/spdx-exceptions.json.git
+tslib                                                            2.5.3            0BSD                                 https://github.com/Microsoft/tslib.git
+tslib                                                            2.3.1            0BSD                                 https://github.com/Microsoft/tslib.git
+type-fest                                                        1.4.0            (MIT OR CC0-1.0)                     https://github.com/sindresorhus/type-fest.git
+webcabin-docker                                                  2.2.5            MIT*                                 Unknown
 
-326 dependencies listed.
+495 dependencies listed.
 

Dockerfile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# Copyright (C) 2013 - 2024, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -12,7 +12,7 @@
 # and clean up the web/ source code
 #########################################################################
 
-FROM alpine:3.13 AS app-builder
+FROM alpine:latest AS app-builder
 
 RUN apk add --no-cache \
     autoconf \
@@ -27,6 +27,7 @@ RUN apk add --no-cache \
     make \
     nasm \
     nodejs \
+    npm \
     yarn \
     zlib-dev
 
@@ -45,6 +46,10 @@ WORKDIR /pgadmin4/web
 
 # Build the JS vendor code in the app-builder, and then remove the vendor source.
 RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
+    npm install -g corepack && \
+    corepack enable && \
+    yarn set version berry && \
+    yarn set version 3 && \
     yarn install && \
     yarn run bundle && \
     rm -rf node_modules \
@@ -53,14 +58,15 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
            .[^.]* \
            babel.cfg \
            webpack.* \
-           karma.conf.js \
+           jest.config.js \
+           babel.* \
            ./pgadmin/static/js/generated/.cache
 
 #########################################################################
 # Next, create the base environment for Python
 #########################################################################
 
-FROM alpine:3.13 as env-builder
+FROM alpine:latest AS env-builder
 
 # Install dependencies
 COPY requirements.txt /
@@ -76,6 +82,9 @@ RUN     apk add --no-cache \
         krb5-dev \
         rust \
         cargo \
+        zlib-dev \
+        libjpeg-turbo-dev \
+        libpng-dev \
         python3-dev && \
     python3 -m venv --system-site-packages --without-pip /venv && \
     /venv/bin/python3 -m pip install --no-cache-dir -r requirements.txt && \
@@ -85,10 +94,11 @@ 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
+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
 # may be present
@@ -108,30 +118,15 @@ RUN rm -rf /pgadmin4/docs/en_US/_build/html/_static/*.png
 # Create additional builders to get all of the PostgreSQL utilities
 #########################################################################
 
-FROM postgres:9.6-alpine as pg96-builder
-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:12-alpine AS pg12-builder
+FROM postgres:13-alpine AS pg13-builder
+FROM postgres:14-alpine AS pg14-builder
+FROM postgres:15-alpine AS pg15-builder
+FROM postgres:16-alpine AS pg16-builder
 
-FROM alpine:3.13 as tool-builder
+FROM alpine:latest AS tool-builder
 
 # Copy the PG binaries
-COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/
-COPY --from=pg96-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.6/
-COPY --from=pg96-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.6/
-COPY --from=pg96-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.6/
-
-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/
@@ -142,17 +137,40 @@ 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/
 COPY --from=pg13-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-13/
 
+COPY --from=pg14-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
+
+COPY --from=pg15-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-15/
+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/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
 
-FROM alpine:3.13
+FROM alpine:latest
 
 # 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=pg16-builder /usr/local/lib/libpq.so.5.16 /usr/lib/
+COPY --from=pg16-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
+COPY --from=pg16-builder /usr/lib/liblz4.so.1.9.4 /usr/lib/
+
+RUN ln -s libpq.so.5.16 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.16 /usr/lib/libpq.so && \
+    ln -s libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
+    ln -s liblz4.so.1.9.4 /usr/lib/liblz4.so.1
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -173,22 +191,27 @@ RUN apk add \
         python3 \
         py3-pip \
         postfix \
-        postgresql-libs \
         krb5-libs \
+        libjpeg-turbo \
         shadow \
         sudo \
+        tzdata \
         libedit \
+        libldap \
         libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn && \
+    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==20.1.0 && \
     find / -type d -name '__pycache__' -exec rm -rf {} + && \
-    groupadd -g 5050 pgadmin && \
-    useradd -r -u 5050 -g pgadmin pgadmin && \
-    mkdir -p /var/lib/pgadmin && \
-    chown pgadmin:pgadmin /var/lib/pgadmin && \
+    useradd -r -u 5050 -g root -s /sbin/nologin pgadmin && \
+    mkdir -p /run/pgadmin /var/lib/pgadmin && \
+    chown pgadmin:root /run/pgadmin /var/lib/pgadmin && \
+    chmod g=u /var/lib/pgadmin && \
     touch /pgadmin4/config_distro.py && \
-    chown pgadmin:pgadmin /pgadmin4/config_distro.py && \
-    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.8 && \
-    echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix
+    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.12 && \
+    echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
+    echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix
 
 USER pgadmin
 

LICENSE

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

Make.bat

@@ -26,6 +26,7 @@ CALL :CLEAN || EXIT /B 1
 CALL :CREATE_VIRTUAL_ENV || EXIT /B 1
 CALL :CREATE_PYTHON_ENV || EXIT /B 1
 CALL :CREATE_RUNTIME_ENV || EXIT /B 1
+CALL :GENERATE_SBOM || EXIT /B 1
 CALL :CREATE_INSTALLER || EXIT /B 1
 CALL :SIGN_INSTALLER || EXIT /B 1
 
@@ -62,13 +63,13 @@ REM Main build sequence Ends
     set "VCREDIST_FILE=vcredist_x64.exe"
 
     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
@@ -211,11 +212,13 @@ REM Main build sequence Ends
     RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache" 1> nul 2>&1
 
     ECHO Copying web directory...
-    XCOPY /S /I /E /H /Y "%WD%\web" "%BUILDROOT%\web" > nul || EXIT /B 1
+    ROBOCOPY /S "%WD%\web" "%BUILDROOT%\web" > nul
+    CALL :CHECK_ROBOCOPY_ERROR
 
     ECHO Installing javascript dependencies...
     CD "%BUILDROOT%\web"
     CALL yarn install || EXIT /B 1
+    CALL npm rebuild || EXIT /B 1
 
     ECHO Bundling javascript...
     CALL yarn run bundle || EXIT /B 1
@@ -246,6 +249,7 @@ REM Main build sequence Ends
 
     ECHO Building docs...
     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"
     CALL "%TMPDIR%\venv\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
@@ -272,10 +276,16 @@ REM Main build sequence Ends
     REM YARN END
 
     REM WGET
-    FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_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"
-        IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
+    REM Comment out the below line as the latest version having some
+    REM problem https://github.com/nwjs/nw.js/issues/7964, so for the time being
+    REM hardcoded the version to 0.77.0
+    REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
+    REM :GET_NW
+    REM    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
+    REM    IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
+
+    SET "NW_VERSION=0.77.0"
+    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
 
     tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1
     REM WGET END
@@ -289,6 +299,15 @@ REM Main build sequence Ends
     REM WGET END
 
     MOVE "%BUILDROOT%\runtime\nw.exe" "%BUILDROOT%\runtime\pgAdmin4.exe"
+    ECHO Attempting to sign the pgAdmin4.exe...
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%BUILDROOT%\runtime\pgAdmin4.exe"
+    IF %ERRORLEVEL% NEQ 0 (
+        ECHO.
+        ECHO ************************************************************
+        ECHO * Failed to sign the pgAdmin4.exe
+        ECHO ************************************************************
+        PAUSE
+    )
 
     ECHO Replacing executable icon...
     CALL yarn --cwd "%TMPDIR%" add winresourcer || EXIT /B
@@ -296,11 +315,11 @@ REM Main build sequence Ends
 
     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
+    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
@@ -332,7 +351,7 @@ REM Main build sequence Ends
     DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
 
     ECHO Creating windows installer using INNO tool...
-    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
+    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" "%WD%\pkg\win32\installer.iss" || EXIT /B 1
 
     ECHO Renaming installer...
     MOVE "%WD%\pkg\win32\Output\pgadmin4-setup.exe" "%DISTROOT%\%INSTALLERNAME%" > nul || EXIT /B 1
@@ -343,10 +362,13 @@ 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 /t http://time.certum.pl "%DISTROOT%\%INSTALLERNAME%"
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%DISTROOT%\%INSTALLERNAME%"
     IF %ERRORLEVEL% NEQ 0 (
         ECHO.
         ECHO ************************************************************
@@ -365,3 +387,6 @@ REM Main build sequence Ends
 
     EXIT /B 1
 
+:CHECK_ROBOCOPY_ERROR
+    IF %ERRORLEVEL% GEQ 8 EXIT /B %ERRORLEVEL%
+    EXIT /B 0

Makefile

@@ -2,23 +2,23 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# Copyright (C) 2013 - 2024, 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
 
 appbundle:
 	./pkg/mac/build.sh
@@ -26,6 +26,12 @@ appbundle:
 install-node:
 	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 +42,7 @@ linter:
 	cd web && yarn run linter
 
 check: install-node bundle linter check-pep8
-	cd web && yarn run karma start --single-run && python regression/runtests.py
+	cd web && yarn run test:js-once && python regression/runtests.py
 
 check-audit:
 	cd web && yarn run audit
@@ -71,28 +77,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,7 +118,7 @@ debian:
 
 docker:
 	echo $(APP_NAME)
-	docker build -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .
+	docker build --pull -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .
 
 docs:
 	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html
@@ -142,7 +138,7 @@ msg-extract:
 	cd web && pybabel extract -F babel.cfg -o pgadmin/messages.pot pgadmin
 
 msg-update:
-	cd web && pybabel update -i pgadmin/messages.pot -d pgadmin/translations
+	cd web && pybabel update --no-fuzzy-matching -i pgadmin/messages.pot -d pgadmin/translations
 
 .PHONY: 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,9 +9,8 @@ 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/
@@ -22,7 +21,7 @@ which will execute the Python server and display the UI.
 
 To build the runtime, the following packages must be installed:
 
-* NodeJS 12+
+* NodeJS 16+
 * Yarn
 
 Change into the runtime directory, and run *yarn install*. This will install the
@@ -35,70 +34,65 @@ paths it would expect to find in the standard package for your platform.
 
 You can then execute the runtime by running something like:
 
-    node_modules/nw/nwjs/nw .
+```bash
+node_modules/nw/nwjs/nw .
+```
 
 or on macOS:
 
-    node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
-
-# Create Database Migrations
-
-In order to make changes to the SQLite DB, navigate to the 'web' directory:
-
-    (pgadmin4) $ cd $PGADMIN4_SRC/web
-
-Create a migration file with the following command:
-
-    (pgadmin4) $ 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.
-Increment the SCHEMA_VERSION in $PGADMIN4_SRC/web/pgadmin/model/__init__.py file.
-
-There is no need to increment the SETTINGS_SCHEMA_VERSION.
+```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 version 3.7 and later are currently supported. It is recommended that a
 Python Virtual Environment is setup for this purpose, rather than using the
 system Python environment. On Linux and Mac systems, the process is fairly
 simple - adapt as required for your distribution:
 
-1. Install the virtualenv packages into the system Python environment
+1. Create a virtual environment in an appropriate directory. The last argument is
+   the name of the environment; that can be changed as desired:
 
-       $ sudo pip install virtualenv virtualenvwrapper
+   ```bash
+   $ python3 -m venv venv
+   ```
 
-2. Source the virtualenv wrapper tools script. You may want to add this command
-   to your ~/.bash_profile file for future convenience:
+2. Now activate the virtual environment:
 
-       $ source /usr/local/bin/virtualenvwrapper.sh
+   ```bash
+   $ source venv/bin/activate
+   ```
 
-3. Create a virtual environment:
+3. Some of the components used by pgAdmin require a very recent version of *pip*,
+   so update that to the latest:
 
-       $ mkvirtualenv pgadmin4
-
-   To make use of the virtual environment in the future, use the following
-   command to re-activate it:
-
-       $ workon pgadmin4
+   ```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
+   pg_config can be found for building psycopg3), and install the required
    packages:
 
-       (pgadmin4) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
+   ```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:
 
-       (pgadmin4) $ pip install -r $PGADMIN4_SRC/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 *
 
@@ -131,6 +125,7 @@ simple - adapt as required for your distribution:
             'pgadmin4-server.db'
         )
    ```
+
    This configuration allows easy switching between server and desktop modes
    for testing.
 
@@ -138,11 +133,15 @@ simple - adapt as required for your distribution:
    mode, and non-interactive in desktop mode. You can run it either by
    running:
 
-       (pgadmin4) $ python $PGADMIN4_SRC/web/setup.py
+   ```bash
+   (venv) $ python3 $PGADMIN4_SRC/web/setup.py
+   ```
 
    or by starting pgAdmin 4:
 
-       (pgadmin4) $ python $PGADMIN4_SRC/web/pgAdmin4.py
+   ```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
@@ -155,10 +154,7 @@ 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.
 
-Once a virtual environment has been created and enabled, setup can continue
-from step 4 above.
-
-## Building the Web Assets
+# 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
@@ -170,18 +166,22 @@ 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:
 
-    (pgadmin4) $ cd $PGADMIN4_SRC
-    (pgadmin4) $ make install-node
-    (pgadmin4) $ make bundle
+```bash
+(venv) $ cd $PGADMIN4_SRC
+(venv) $ make install-node
+(venv) $ make bundle
+```
 
 On Windows systems (where "make" is not available), the following commands
 can be used:
 
-    C:\> cd $PGADMIN4_SRC\web
-    C:\$PGADMIN4_SRC\web> yarn install
-    C:\$PGADMIN4_SRC\web> yarn run bundle
+```
+C:\> cd $PGADMIN4_SRC\web
+C:\$PGADMIN4_SRC\web> yarn install
+C:\$PGADMIN4_SRC\web> yarn run bundle
+```
 
-## Creating pgAdmin themes
+# Creating pgAdmin themes
 
 To create a pgAdmin theme, you need to create a directory under
 *web/pgadmin/static/scss/resources*.
@@ -202,12 +202,17 @@ hyphens (-) will be replaced with spaces and the result will be camel cased.
 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:
 
-    $ workon pgadmin4
-    (pgadmin4) $ pip install Sphinx
-    
+```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.
 
-    (pgadmin4) $ make docs
+```bash
+(venv) $ make docs
+```
 
 The output can be found in *$PGADMIN4_SRC/docs/en_US/_build/html/index.html*
 
@@ -218,32 +223,61 @@ the setup and configuration above has been completed.
 
 To build a source tarball:
 
-    (pgadmin4) $ make src
+```bash
+(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:
 
-    (pgadmin4) $ make pip
+```bash
+(venv) $ make pip
+```
 
 To build the macOS AppBundle, please see *pkg/mac/README*.
 
 To build the Windows installer, please see *pkg/win32/README.txt*.
+# Create Database Migrations
 
-## Support
+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.
+Increment the SCHEMA_VERSION in $PGADMIN4_SRC/web/pgadmin/model/__init__.py file.
+
+There is no need to increment the SETTINGS_SCHEMA_VERSION.
+
+# Support
 
 See https://www.pgadmin.org/support/ for support options.
 
-## Project info
+# Security Issues
 
-The source code repository can be found here:
+If you would like to report a security issue with pgAdmin, please email
+**security (at) pgadmin (dot) org**.
 
-http://git.postgresql.org/gitweb/?p=pgadmin4.git;a=summary
+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.
 
-A Redmine project for pgAdmin 4 can be found at the address below. A PostgreSQL
-community account is required to access this site. Please note that at present
-only project developers can log bug and feature requests:
+# Project info
 
-https://redmine.postgresql.org/projects/pgadmin4
+A GitHub project for pgAdmin 4 can be found at the address below:
+
+https://github.com/pgadmin-org/pgadmin4
+
+Please submit any changes as Pull Requests against the *master* branch of the
+*pgadmin-org/pgadmin4* repository.
 
 If you wish to discuss pgAdmin 4, or contribute to the project, please use the
 pgAdmin Hackers mailing list:

docs/en_US/add_restore_point_dialog.rst

@@ -6,8 +6,8 @@
 
 Use the *Add named restore point* dialog to take a named snapshot of the state
 of the server for use in a recovery file. To create a named restore point, the
-server's postgresql.conf file must specify a *wal_level* value of *archive*,
-*hot_standby*, or *logical*.  You must be a database superuser to create a
+server's postgresql.conf file must specify a *wal_level* value of *replica*,
+*logical*, or *minimal*.  You must be a database superuser to create a
 restore point.
 
 .. image:: images/add_restore_point.png
@@ -19,7 +19,7 @@ the restore point to add* to provide a descriptive name for the restore point.
 
 For more information about using a restore point as a recovery target, please
 see the
-`PostgreSQL documentation <https://www.postgresql.org/docs/current/recovery-target-settings.html#RECOVERY-TARGET-NAME>`_.
+`PostgreSQL documentation <https://www.postgresql.org/docs/current/runtime-config-wal.html#RUNTIME-CONFIG-WAL-RECOVERY-TARGET>`_.
 
 * Click the *OK* button to save the restore point.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Cancel* button to exit without saving work.

docs/en_US/backup_dialog.rst

@@ -67,8 +67,8 @@ 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 *Dump options* tab to continue. Use the box fields in the *Dump
-options* tab to provide options for *pg_dump*.
+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
     :alt: Sections option on backup dialog
@@ -77,13 +77,13 @@ options* tab to provide options for *pg_dump*.
 * 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* to the *Yes* position to include all
+   * Move the switch next to *Pre-data* towards right position to include all
      data definition items not included in the data or post-data item lists.
 
-   * Move the switch next to *Data* to the *Yes* position to backup actual table
+   * Move the switch next to *Data* towards right position to backup actual table
      data, large-object contents, and sequence values.
 
-   * Move the switch next to *Post-data* to the *Yes* position to include
+   * Move the switch next to *Post-data* towards right position to include
      definitions of indexes, triggers, rules, and constraints other than
      validated check constraints.
 
@@ -94,13 +94,13 @@ options* tab to provide options for *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* to the *Yes* position to limit the back
+   * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
-   * Move the switch next to *Only schema* to limit the back up to schema-level
+   * Move the switch next to *Only schemas* to limit the back up to schema-level
      database objects.
 
-   * Move the switch next to *Blobs* to the *No* position to exclude large
+   * Move the switch next to *Blobs* towards left position to exclude large
      objects in the backup.
 
 .. image:: images/backup_do_not_save.png
@@ -110,52 +110,123 @@ options* tab to provide options for *pg_dump*.
 * 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* to the *Yes* position to exclude commands
+   * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* to the *Yes* position to exclude
+   * Move the switch next to *Privileges* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* to the *Yes* position to exclude
+   * Move the switch next to *Tablespaces* towards right position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* to the *Yes* position to
+   * Move the switch next to *Unlogged table data* towards right position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* to the *Yes* position to exclude
+   * Move the switch next to *Comments* towards right 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* towards right position to exclude
+     publications.
+
+   * Move the switch next to *Subscriptions* towards right position to exclude
+     subscriptions.
+
+   * Move the switch next to *Security labels* towards right position to exclude
+     Security labels.
+
+   * Move the switch next to *Toast compressions* towards right position to exclude
+     Toast compressions. **Note:** This option is visible only for
+     database server greater than or equal to 14.
+
+   * Move the switch next to *Table access methods* towards right position to exclude
+     Table access methods. **Note:** This option is visible only for
+     database server greater than or equal to 15.
+
 .. image:: images/backup_queries.png
     :alt: Queries option on backup dialog
     :align: center
 
-* Move switches in the **Queries** field box to specify the type of statements
-  that should be included in the backup.
+Click the *Query Options* tab to continue. Use these additional fields to specify
+the type of statements that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* 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 *Use Insert commands* to the *Yes* position to
+   * Move the switch next to *Use INSERT commands* towards right position to
      dump the data in the form of INSERT statements rather than using a COPY
      command.  Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Include CREATE DATABASE statement* to the *Yes*
+   * Use the *Maximum rows per INSERT command* field to controls the maximum
+     number of rows per INSERT command. **Note:** This option is visible only for
+     database server greater than or equal to 12.
+
+   * Move the switch next to *On conflict do nothing to INSERT command* towards
+     right position to add ON CONFLICT DO NOTHING to INSERT command.
+     This option is not valid unless *Use INSERT commands*, *Use Column INSERTS*
+     or *Maximum rows per INSERT command* is also specified.
+     **Note:** This option is visible only for database server greater than or
+     equal to 12.
+
+   * Move the switch next to *Include CREATE DATABASE statement* towards right
      position to include a command in the backup that creates a new database
      when restoring the backup.
 
-   * Move the switch next to *Include DROP DATABASE statement* to the *Yes*
+   * Move the switch next to *Include DROP DATABASE statement* towards right
      position to include a command in the backup that will drop any existing
      database object with the same name before recreating the object during a
      backup.
 
-   * Move the switch next to *Load Via Partition Root* to the *Yes* position,
+   * Move the switch next to *Include IF EXISTS clause* towards right
+     position to add an IF EXISTS clause to drop databases and other objects.
+     This option is not valid unless *Include DROP DATABASE statement* is also set.
+
+.. image:: images/backup_table.png
+    :alt: Backup dialog tables section
+    :align: center
+
+Click the *Table Options* tab to continue. Use the fields in the *Table Options*
+tab related to tables that should be included in the backup.
+
+   * Move the switch next to *Use Column INSERTS* towards right position to dump
+     the data in the form of INSERT statements and include explicit column
+     names. Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Load via partition root* towards right position,
      so when dumping a COPY or INSERT statement for a partitioned table, target
      the root of the partitioning hierarchy which contains it rather than the
      partition itself. **Note:** This option is visible only for database server
      greater than or equal to 11.
 
+   * Move the switch next to *Enable row security* towards right position to
+     set row_security to on instead, allowing the user to dump the parts of the
+     contents of the table that they have access to. This option is relevant
+     only when dumping the contents of a table which has row security.
+
+   * Use the *Include table(s) and Children* field to dump the tables and any partitions 
+     or inheritance child tables of the tables matching the pattern.
+     **Note:** This option is visible only for database server greater than or
+     equal to 16.
+    
+   * The Exclude patterns field is utilized to exclude patterns in the following manner:
+
+   * Use the *Table(s)* field to not dump the tables matching the
+     pattern. Multiple patterns can be given separated by space.
+
+   * Use the *Table(s) data* field to not dump data for any tables
+     matching the pattern. Multiple patterns can be given separated by
+     spaces.
+
+   * Use the *Table(s) and children* field to not dump the tables and any
+     partitions or inheritance child tables of the tables matching the pattern.
+     **Note:** This option is visible only for database server greater than or
+     equal to 16.
+
+   * Use the *Table(s) data and children* field to not dump data for the
+     tables and any partitions or inheritance child tables of the tables matching 
+     the table pattern. **Note:** This option is visible only for database server
+     greater than or equal to 16.
+
+Click the *Options* tab to continue. Use the fields in the *Options*
+tab to provide other backup options.
+
 .. image:: images/backup_disable.png
     :alt: Disable option on backup dialog
     :align: center
@@ -163,11 +234,11 @@ options* tab to provide options for *pg_dump*.
 * 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)
-     to the *Yes* position to include commands that will disable triggers on the
+   * Move the switch next to *Triggers* (active when creating a data-only backup)
+     towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
+   * Move the switch next to *$ quoting* towards right position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -178,19 +249,36 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* to the *Yes* 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
+   * 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* to the *Yes*
+   * Move the switch next to *Force double quotes on identifiers* towards right
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
      position to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 
+   * Use the *Exclude schema* field to not dump schemas whose name matches
+     pattern.
+
+   * Use the *Extra float digits* field to use the specified value when dumping
+     floating-point data, instead of the maximum available precision.
+
+   * Use the *Lock wait timeout* field to do not wait forever to acquire shared
+     table locks at the beginning of the dump. Instead, fail if unable to lock a
+     table within the specified timeout.
+
+Click the *Objects* tab to continue.
+
+.. image:: images/backup_object_selection.png
+    :alt: Select objects in backup dialog
+    :align: center
+
+* Select the objects from tree to take backup of selected objects only.
+    * If Schema is selected then it will take the backup of that selected schema only.
+    * If any Table, View, Materialized View, Sequences, or Foreign Table is selected then it will take the backup of those selected objects.
+
 When you’ve specified the details that will be incorporated into the pg_dump
 command:
 
@@ -199,21 +287,6 @@ command:
 
 * Click the *Cancel* button to exit without saving work.
 
-.. image:: images/backup_messages.png
-    :alt: Backup success notification popup
-    :align: center
-
-Use the **Stop Process** button to stop the Backup process.
-
-If the backup is successful, a popup window will confirm success. Click *More details* on the popup window to launch the *Process Watcher*. The *Process Watcher* logs all the activity associated with the backup and provides additional information for troubleshooting.
-
-.. image:: images/backup_process_watcher.png
-    :alt:  Backup process watcher
-    :align: center
-
-If the backup is unsuccessful, you can review the error messages returned by the
-backup command on the *Process Watcher*.
-
-.. 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 backup file on the client machine .
-
-.. |sm_icon| image:: images/sm_icon.png
+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

docs/en_US/backup_globals_dialog.rst

@@ -34,24 +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.
 
-.. image:: images/backup_globals_messages.png
-    :alt: Backup globals success notification popup
-    :align: center
-
-Use the **Stop Process** button to stop the Backup process.
-
-If the backup is successful, a popup window will confirm success. Click *Click
-here for details* on the popup window to launch the *Process Watcher*. The
-*Process Watcher* logs all the activity associated with the backup and provides
-additional information for troubleshooting.
-
-.. image:: images/backup_globals_process_watcher.png
-    :alt:  Backup globals process watcher
-    :align: center
-
-If the backup is unsuccessful, review the error message returned by the
-*Process Watcher* to resolve any issue.
-
-.. 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 backup file on the client machine .
-
-.. |sm_icon| image:: images/sm_icon.png
+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

docs/en_US/backup_server_dialog.rst

@@ -24,6 +24,9 @@ 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
@@ -31,12 +34,17 @@ Use the fields in the *General* tab to specify the following:
 * 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* to the *Yes* position to limit the back
+   * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
-   * Move the switch next to *Only schema* to limit the back up to schema-level
+   * Move the switch next to *Only schemas* to limit the back up to schema-level
      database objects.
 
+   * Move the switch next to *Only tablespaces* to limit the back
+     up to tablespaces only.
+
+   * Move the switch next to *Only roles* to limit the back up to roles only.
+
 .. image:: images/backup_server_do_not_save.png
     :alt: Do not save option on backup server dialog
     :align: center
@@ -44,42 +52,92 @@ Use the fields in the *General* tab to specify the following:
 * 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* to the *Yes* position to exclude commands
+   * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* to the *Yes* position to exclude
+   * Move the switch next to *Role passwords* towards right position to exclude
+     passwords for roles.
+
+   * Move the switch next to *Privileges* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* to the *Yes* position to exclude
+   * Move the switch next to *Tablespaces* towards right position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* to the *Yes* position to
+   * Move the switch next to *Unlogged table data* towards right position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* to the *Yes* position to exclude
+   * Move the switch next to *Comments* towards right 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* towards right position to exclude
+     publications.
+
+   * Move the switch next to *Subscriptions* towards right position to exclude
+     subscriptions.
+
+   * Move the switch next to *Security labels* towards right position to exclude
+     Security labels.
+
+   * Move the switch next to *Toast compressions* towards right position to exclude
+     Toast compressions. **Note:** This option is visible only for
+     database server greater than or equal to 14.
+
+   * Move the switch next to *Table access methods* towards right position to exclude
+     Table access methods. **Note:** This option is visible only for
+     database server greater than or equal to 15.
+
 .. image:: images/backup_server_queries.png
     :alt: Queries option on backup server dialog
     :align: center
 
-* Move switches in the **Queries** field box to specify the type of statements
-  that should be included in the backup.
+Click the *Query Options* tab to continue. Use these additional fields to specify
+the type of statements that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* 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 *Use INSERT commands* towards right position to
+     dump the data in the form of INSERT statements rather than using a COPY
+     command.  Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Use Insert commands* 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.
+   * 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* to the *Yes*
+   * Move the switch next to *On conflict do nothing to INSERT command* towards
+     right position to add ON CONFLICT DO NOTHING to INSERT command.
+     This option is not valid unless *Use INSERT commands*, *Use Column INSERTS*
+     or *Maximum rows per INSERT command* is also specified.
+     **Note:** This option is visible only for database server greater than or
+     equal to 12.
+
+   * Move the switch next to *Include DROP DATABASE statement* towards right
      position to include a command in the backup that will drop any existing
      database object with the same name before recreating the object during a
      backup.
 
+   * Move the switch next to *Include IF EXISTS clause* towards right
+     position to add an IF EXISTS clause to drop databases and other objects.
+     This option is not valid unless *Include DROP DATABASE statement* is also set.
+
+.. image:: images/backup_server_table.png
+    :alt: Backup dialog tables section
+    :align: center
+
+Click the *Table Options* tab to continue. Use the fields in the *Table Options*
+tab related to tables that should be included in the backup.
+
+   * Move the switch next to *Use Column INSERTS* towards right position to dump
+     the data in the form of INSERT statements and include explicit column
+     names. Please note: this may make restoration from backup slow.
+
+   * Move the switch next to *Load via partition root* towards right position,
+     so when dumping a COPY or INSERT statement for a partitioned table, target
+     the root of the partitioning hierarchy which contains it rather than the
+     partition itself. **Note:** This option is visible only for database server
+     greater than or equal to 11.
+
+Click the *Options* tab to continue. Use the fields in the *Options*
+tab to provide other backup options.
 
 .. image:: images/backup_server_disable.png
     :alt: Disable option on backup server dialog
@@ -88,11 +146,11 @@ Use the fields in the *General* tab to specify the following:
 * 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)
-     to the *Yes* position to include commands that will disable triggers on the
+   * Move the switch next to *Triggers* (active when creating a data-only backup)
+     towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
+   * Move the switch next to *$ quoting* towards right position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -103,40 +161,34 @@ Use the fields in the *General* tab to specify the following:
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* to the *Yes* position to include object
-     identifiers as part of the table data for each table.
+   * Move the switch next to *Verbose messages* towards left position to instruct
+     *pg_dumpall* to exclude verbose messages.
 
-   * 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* to the *Yes*
+   * Move the switch next to *Force double quotes on identifiers* towards right
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
      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.
 
-.. image:: images/backup_server_messages.png
-    :alt: Backup server success notification popup
-    :align: center
+   * Use the *Extra float digits* field to use the specified value when dumping
+     floating-point data, instead of the maximum available precision.
 
-Use the **Stop Process** button to stop the Backup process.
+   * Use the *Lock wait timeout* field to do not wait forever to acquire shared
+     table locks at the beginning of the dump. Instead, fail if unable to lock a
+     table within the specified timeout.
 
-If the backup is successful, a popup window will confirm success. Click *Click
-here for details* on the popup window to launch the *Process Watcher*. The
-*Process Watcher* logs all the activity associated with the backup and provides
-additional information for troubleshooting.
+When you’ve specified the details that will be incorporated into the pg_dumpall
+command:
 
-.. image:: images/backup_server_process_watcher.png
-    :alt:  Backup server process watcher
-    :align: center
+* Click the *Backup* button to build and execute a command that builds a backup
+  based on your selections on the *Backup Server* dialog.
 
-If the backup is unsuccessful, review the error message returned by the
-*Process Watcher* to resolve any issue.
+* Click the *Cancel* button to exit without saving work.
 
-.. 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 backup file on the client machine .
-
-.. |sm_icon| image:: images/sm_icon.png
+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

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

@@ -38,7 +38,7 @@ Use the fields in the *Definition* tab to define parameters:
 * Use the drop-down listbox next to *Function* to select the function used to
   perform the cast. The function's result data type must match the target type
   of the cast.
-* Move the *Context* switch to the *Implicit* position if the cast is implicit.
+* Select *Context* toggle to *Implicit* if the cast is implicit.
   By default, a cast can be invoked only by an explicit cast request. If the
   cast is marked *Implicit* then it can be invoked implicitly in any context,
   whether by assignment or internally in an expression.
@@ -58,10 +58,7 @@ the *Cast* dialog:
     :alt: Cast dialog sql tab
     :align: center
 
-The cast uses a function named *int4(bigint)* to convert a biginteger data type
-to an integer.
-
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/change_ownership.rst

@@ -0,0 +1,27 @@
+.. _change_ownership:
+
+************************************
+`Change Ownership Dialog`:index:
+************************************
+
+Use the *Change Ownership* dialog to change the ownership of the shared servers.
+This dialog will appear if a user has been deleted from
+:ref:`User Management <user_management>` and owned some shared servers.
+
+Choose the user who will own the shared servers from the drop-down.
+
+.. image:: images/change_ownership.png
+    :alt: Change ownership dialog
+    :align: center
+
+Click the *Change* button to change the ownership.
+
+The shared servers owned by the user will be deleted if the user is not
+selected from the drop-down.
+
+.. image:: images/change_ownership_info.png
+    :alt: Change ownership dialog
+    :align: center
+
+Click the *Change* button to change the ownership; click *Close* to
+exit the dialog.

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
@@ -36,5 +39,8 @@ Use the *Change Password* dialog to change your password:
 * Enter the desired password for in the *New Password* field.
 * Re-enter the new password in the *Confirm Password* field.
 
-Click the *OK* button to change your password; click *Cancel* to exit the dialog
-without changing your password.
+Click the *Save* button to change your password.
+
+Click the *Close* button to exit without changing your password.
+
+Click the *Reset* button to reset the values.

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

@@ -55,12 +55,11 @@ the *Check* dialog:
     :alt: Check dialog sql tab
     :align: center
 
-The example shown demonstrates creating a check constraint named *check_price*
-on the *price* column of the *products* table.  The constraint confirms that
-any values added to the column are greater than 0.
+The example shown demonstrates creating a check constraint named *jobhist_date_chk*
+on the *startdate* column of the *jobhist* table.
 
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

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

@@ -0,0 +1,98 @@
+.. _cloud_aws_rds:
+
+******************************************
+`Amazon RDS Cloud Deployment`:index:
+******************************************
+
+To deploy a PostgreSQL server on the Amazon cloud, follow the below steps.
+
+.. image:: images/cloud_provider_for_postgresql.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+Once you launch the tool, select the Amazon RDS option.
+Click on the *Next* button to proceed further.
+
+.. image:: images/cloud_aws_credentials.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+In the Credentials dialog, provide the region in which you want to deploy the
+instance along with the *AWS access key* and *AWS secret access key*.
+Provide *AWS session token* only if your AWS session is temporary.
+
+To proceed further, click on the next button. Before going further, pgAdmin
+will validate your credentials.
+
+.. image:: images/cloud_aws_instance.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+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 *Object Explorer* too.
+
+* Use the *Public IP* field to specify the IP Address range for permitting the
+  inbound traffic.
+
+* Use the *Database version* field to specify the PostgreSQL version to deploy.
+
+* 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 type* field to select the instance storage type. Three
+  options are available. General Purpose (SSD) storage, Provisioned IOPS (SSD)
+  and Magnetic storage.
+
+* Use the *Allocated storage* field to specify the storage capacity in GiB.
+
+* Use the *Provisioned IOPS* in case of  Provisioned IOPS (SSD) storage type.
+
+* Use the *High Availability* option to specify High Availability
+  option. This option creates a standby in a different Availability Zone(AZ).
+
+.. image:: images/cloud_aws_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 *Object Explorer*
+  within the specified group.
+
+* Use the *Database name* field to add the database name for the PostgreSQL
+  server.
+
+* Use the *Username* field to specify the name of a role that will be used when
+  authenticating with the 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.
+
+* Enter the listener port number of the server host in the *Port* field.
+
+.. image:: images/cloud_aws_review.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+At the end, review the Instance details that you provided. Click on Finish
+button to deploy the instance on Amazon RDS.
+
+.. 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_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 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

@@ -0,0 +1,21 @@
+.. _cloud_deployment:
+
+*************************************
+`PostgreSQL Cloud Deployment`:index:
+*************************************
+
+A PostgreSQL server can be deployed on the Amazon, EDB BigAnimal, 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
+*Register* menu.
+
+.. toctree::
+   :maxdepth: 2
+
+   cloud_aws_rds
+   cloud_edb_biganimal
+   cloud_azure_database
+   cloud_google_cloud_sql

docs/en_US/cloud_edb_biganimal.rst

@@ -0,0 +1,110 @@
+.. _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_provider_for_postgresql.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 *Project* field to choose a project in your Biganimal account.
+
+* 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 choose 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 *Object Explorer* 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.
+
+* Use the *Disk throughput* field to specify the disk throughput. This field is specific to AWS.
+
+
+.. image:: images/cloud_biganimal_database.png
+    :alt: Cloud Deployment Provider
+    :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 *Object Explorer*
+  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 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.
+
+.. image:: images/cloud_google_deployment_tree.png
+    :alt: Cloud Deployment Provider
+    :align: center

docs/en_US/code_overview.rst

@@ -5,7 +5,7 @@
 **********************
 
 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).
 
@@ -44,7 +44,7 @@ the **Flask-Security** module to manage application security and users, and
 provides options for self-service password reset and password changes etc.
 
 Whether in desktop or server mode, each user's settings are stored in a SQLite
-database which is also used to store the user accounts. This is initially
+OR external database which is also used to store the user accounts. This is initially
 created using the **setup.py** script which will create the database file and
 schema within it, and add the first user account (with administrative
 privileges) and a default server group for them. A **settings** table is also
@@ -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,10 +207,9 @@ 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 for UI look and feel, Backbone for data manipulation of a node,
-Backform 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
-look at the the javascript files node.js, browser.js, menu.js, panel.js, etc for
+look at the javascript files node.js, browser.js, menu.js, panel.js, etc for
 better understanding of the code.

docs/en_US/code_review.rst

@@ -5,7 +5,7 @@
 **************************
 
 This document lists a number of standard items that will be checked during the
-review process for any patches submitted for inclusion in pgAdmin.
+review process for any changes submitted for inclusion in pgAdmin.
 
 * Ensure all code follows the pgAdmin :doc:`coding_standards`.
 
@@ -16,7 +16,7 @@ review process for any patches 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 - 2021, The pgAdmin Development Team
+    Copyright (C) 2013 - 2024, The pgAdmin Development Team
 
 * Ensure there's a blank line immediately following any copyright headers.
 
@@ -52,10 +52,13 @@ review process for any patches submitted for inclusion in pgAdmin.
   current schema/user as appropriate. In general, if there are common or sensible
   default values available, put them in the fields for the user.
 
-* 1 patch == 1 feature. If you need to fix/update existing infrastructure in
-  your patch, it's usually easier if it's in a separate patch. Patches containing
-  multiple new features or unrelated changes are likely to be rejected.
+* 1 Pull Request == 1 feature. If you need to fix/update existing
+  infrastructure in your change, it's usually easier if it's in a separate
+  Pull Request. Pull Requests containing multiple new features or unrelated
+  changes are likely to be rejected.
 
-* Ensure the patch is fully functional, and works! If a patch is being sent as
-  a work in progress, not intended for commit, clearly state that it's a WIP,
-  and note what does or does not yet work.
+* Ensure the change is fully functional, and works! If you wish to send a
+  work in progress (WIP) change that is not intended for commit, instead of
+  submitting a Pull Request, send either as a link to a repository fork or a
+  patch to the pgadmin-hackers@postgresql.org mailing list, clearly stating
+  that it's a WIP, and noting what does or does not yet work.

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 - 2021, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2024, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

docs/en_US/collation_dialog.rst

@@ -50,6 +50,16 @@ settings:
 * Use the *LC_CTYPE* field to specify a locale with specified character
   classification. The locale must be applicable to the current database encoding.
   (See CREATE DATABASE for details.)
+* Use the drop-down listbox next to *Locale Provider* to select a locale services associated
+  with the collation. Possible values are: icu, libc. libc is the default.
+* Move the switch next to *Deterministic* to *YES* to specify whether the collation should use
+  deterministic comparisons. By default, this option is set to true. In a
+  deterministic comparison, strings that are not byte-wise equal are considered
+  unequal, even if they are considered logically equal in the comparison.
+* Use the *Rules* field to specify a rules for customizing the behavior of the collation.
+  It includes considerations such as character ordering, case sensitivity, and accent
+  sensitivity.
+* Use the *Version* field to specify version string to store with the collation object.
 
 
 Click the *SQL* tab to continue.
@@ -79,7 +89,7 @@ rules specified for the locale, *fr-BI-x-icu.  The collation is owned by
    https://www.postgresql.org/docs/current/locale.html
 
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

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.
 
@@ -163,10 +169,10 @@ the *Column* dialog:
     :alt: Column dialog sql tab
     :align: center
 
-The example shown demonstrates creating a column named *territory* in the table
-named *distributors*.
+The example shown demonstrates creating a column named *sal* in the table
+named *jobhist*.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/compound_trigger_dialog.rst

@@ -79,5 +79,5 @@ The example demonstrates creating a compound trigger named *test_ct*.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/conf.py

@@ -36,7 +36,7 @@ import config
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
+extensions = ["sphinxcontrib.youtube"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

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.
 
@@ -43,13 +43,14 @@ The configuration files are as follows:
 
      Linux,/etc/pgadmin/config_system.py
      macOS,/Library/Preferences/pgadmin/config_system.py
-     Windows,%CommonProgramFiles%\pgadmin\config_system.py
+     Windows,%CommonProgramFiles%\\pgadmin\\config_system.py
 
-.. note:: If the SERVER_MODE setting is changed in ``config_distro.py``,
-     ``config_local.py``, or ``config_system.py`` you will most likely need to
-     re-set the LOG_FILE, SQLITE_PATH, SESSION_DB_PATH and STORAGE_DIR values
-     as well as they will have been set based on the default configuration or
-     overridden by the runtime.
+.. note:: If the SERVER_MODE or DATA_DIR settings are changed in
+     ``config_distro.py``, ``config_local.py``, or ``config_system.py``
+     LOG_FILE, SQLITE_PATH, SESSION_DB_PATH, STORAGE_DIR, KERBEROS_CCACHE_DIR,
+     and AZURE_CREDENTIAL_CACHE_DIR values will be set based on DATA_DIR unless
+     values are explicitly overridden for any of the variable in any of the
+     above file.
 
 The default ``config.py`` file is shown below for reference:
 

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

@@ -18,12 +18,19 @@ control, and select *Server Group* from the *Create* menu.
 Use the fields on the *Server* dialog to define the connection properties for
 each new server that you wish to manage with pgAdmin.  To open the *Server*
 dialog, right-click on the *Servers* node of the tree control, and select
-*Server* from the *Create* menu.
+*Server* from the *Register* menu.
 
 .. toctree::
 
    server_dialog
 
+Alternatively you can use the *Cloud Deployment* wizard to deploy a new
+PostgreSQL instance in the cloud, and connect to it.
+
+.. toctree::
+
+   cloud_deployment
+
 A master password is required to secure and later unlock saved server passwords.
 It is set by the user and can be disabled using config.
 

docs/en_US/container_deployment.rst

@@ -8,6 +8,31 @@ pgAdmin can be deployed in a container using the image at:
 
     https://hub.docker.com/r/dpage/pgadmin4/
 
+There are various tags that you can select from to get the version of pgAdmin
+that you want, using a command such as this if you're using Docker:
+
+.. code-block:: bash
+
+   docker pull dpage/pgadmin4:<tag name>
+
+where *<tag name>* is one of the following:
+
+.. table::
+   :class: longtable
+   :widths: 1 4
+
+   +----------+-------------------------------------------------------------------------------+
+   | Tag name | Description                                                                   |
+   +==========+===============================================================================+
+   | latest   | The most recent release.                                                      |
+   +----------+-------------------------------------------------------------------------------+
+   | 8.4      | A specific version (8.4 in this case).                                        |
+   +----------+-------------------------------------------------------------------------------+
+   | 8        | the latest release of a specific major version (major version 8 in this case).|
+   +----------+-------------------------------------------------------------------------------+
+   | snapshot | The latest nightly test build.                                                |
+   +----------+-------------------------------------------------------------------------------+
+
 PostgreSQL Utilities
 ********************
 
@@ -17,14 +42,25 @@ maintenance functions to be executed. Multiple versions are included in the
 following directories to allow use with different versions of the database
 server:
 
-* PostgreSQL 9.6: */usr/local/pgsql-9.6*
-* 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 most recent version of the utilities is used by default; this may be
-changed in the :ref:`preferences`.
+The default binary paths set in the container are as follows:
+
+.. code-block:: bash
+
+    DEFAULT_BINARY_PATHS = {
+        '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'
+    }
+
+this may be changed in the :ref:`preferences`.
 
 Environment Variables
 *********************
@@ -41,6 +77,14 @@ to login to pgAdmin. This variable is required and must be set at launch time.
 This is the password used when setting up the initial administrator account to
 login to pgAdmin. This variable is required and must be set at launch time.
 
+**PGADMIN_DEFAULT_PASSWORD_FILE**
+
+This is the password used when setting up the initial administrator account to
+login to pgAdmin. This value should be set to *docker secret* in order to set
+the password. This variable is supported in docker swarm environment or while creating
+container with docker compose. PGADMIN_DEFAULT_PASSWORD or PGADMIN_DEFAULT_PASSWORD_FILE
+variable is required and must be set at launch time.
+
 **PGADMIN_DISABLE_POSTFIX**
 
 *Default: <null>*
@@ -87,7 +131,16 @@ than using the default.
 *Default: /pgadmin4/servers.json*
 
 Override the default file path for the server definition list. See the
-/pgadmin4/servers.json mapped file below for more information.
+/pgadmin4/servers.json mapped file below for more information. See the format
+of the `Servers JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
+
+**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>`_.
 
 **GUNICORN_ACCESS_LOGFILE**
 
@@ -96,6 +149,15 @@ Override the default file path for the server definition list. See the
 Specify an output file in which to store the Gunicorn access logs, instead of
 sending them to stdout.
 
+**GUNICORN_LIMIT_REQUEST_LINE**
+
+*Default: 8190*
+
+Set the maximum size of HTTP request line in bytes. By default the pgAdmin
+container uses the maximum limited size offered by Gunicorn as some requests
+can be quite large. In exceptional cases this value can be set to 0 (zero) to
+specify "unlimited", however this poses a potential denial of service hazard.
+
 **GUNICORN_THREADS**
 
 *Default: 25*
@@ -104,7 +166,7 @@ Adjust the number of threads the Gunicorn server uses to handle incoming
 requests. This should typically be left as-is, except in highly loaded systems
 where it may be increased.
 
-**PGADMIN_CONFIG_**
+**PGADMIN_CONFIG_***
 
 This is a variable prefix that can be used to override any of the configuration
 options in pgAdmin's *config.py* file. Add the *PGADMIN_CONFIG_* prefix to any
@@ -117,6 +179,12 @@ is read after */pgadmin4/config.py* and before */pgadmin4/config_local.py*.
 Any settings given will therefore override anything in config.py, but can be
 overridden by settings in config_local.py.
 
+Settings are only written to */pgadmin4/config_distro.py* once, typically on
+first launch of the container. If */pgadmin4/config_distro.py* contains one or
+more lines, then no changes are made; for example, if the container instance is
+restarted, or */pgadmin4/config_distro.py* is mapped to a file on persistent
+storage (not recommended - use */pgadmin4/config_local.py* instead)!
+
 See :ref:`config_py` for more information on the available configuration settings.
 
 Mapped Files and Directories
@@ -168,6 +236,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.
@@ -397,7 +473,7 @@ If you wish to host pgAdmin under a subdirectory using Traefik, the
 configuration changes are typically made to the way the container is launched
 and not to Traefik itself. For example, to host pgAdmin under */pgadmin4/*
 instead of at the root directory, the Traefik configuration above may be used if
-the container is launched like this:
+the container is launched like this while using the version v1 of Traefik:
 
 .. code-block:: bash
 
@@ -413,3 +489,16 @@ The *SCRIPT_NAME* environment variable has been set to tell the container it is
 being hosted under a subdirectory (in the same way as the *X-Script-Name* header
 is used with Nginx), and a label has been added to tell Traefik to route
 requests under the subdirectory to this container.
+
+While using the Traefik configuration for version v2 for hosting pgAdmin under subdirectory
+the container is typically launched per the example below:
+
+.. code-block:: bash
+
+    docker pull dpage/pgadmin4
+    docker run --name "pgadmin4" \
+        -e "PGADMIN_DEFAULT_EMAIL=user@domain.com" \
+        -e "PGADMIN_DEFAULT_PASSWORD=SuperSecret" \
+        -e "SCRIPT_NAME=/pgadmin4" \
+        -l "traefik.frontend.pgadmin4.rule=Host(`host.example.com`) && PathPrefix(`/pgadmin4`)" \
+        -d dpage/pgadmin4

docs/en_US/contributions.rst

@@ -15,7 +15,7 @@ development process used to develop, improve, and maintain the pgAdmin client.
 
 .. toctree::
    
-   submitting_patches
+   submitting_pull_requests
    code_overview
    coding_standards
    code_snippets

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,14 +41,26 @@ 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.
+  This option is available from v15 and above.
 * 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.
 * 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.
 
 Click the *Security* tab to continue.
 
@@ -131,5 +146,5 @@ allows unlimited connections, and is available to all authenticated users.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

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

@@ -15,7 +15,7 @@ installation, and is distributed as part of Advanced Server.  You must have
 superuser privileges to use the debugger.
 
 Before using the debugger, you must modify the *postgresql.conf* file, adding
-the server-side debugger components to the the value of the
+the server-side debugger components to the value of the
 *shared_preload_libraries* parameter, for example:
 
   shared_preload_libraries = '$libdir/plugin_debugger'
@@ -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,23 +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.                                                 |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
+.. 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

@@ -19,7 +19,7 @@ pgAdmin server and opens a window to render the user interface.
 .. seealso:: For detailed instructions on building and configuring pgAdmin from
     scratch, please see the README file in the top level directory of the source code.
     For convenience, you can find the latest version of the file
-    `here <https://git.postgresql.org/gitweb/?p=pgadmin4.git;a=blob;f=README.md>`_,
+    `here <https://github.com/pgadmin-org/pgadmin4/blob/master/README.md>`_,
     but be aware that this may differ from the version included with the source code
     for a specific version of pgAdmin.
 
@@ -78,22 +78,25 @@ Use the *Runtime Menu* to access the *Configuration* dialog:
     :alt: Runtime Configuration
     :align: center
 
-Following are the details of the *Fixed port number?*, *Port Number*, and *Connection
-Timeout* configuration parameters:
+Following are the details of the *Fixed port number?*, *Port Number*, *Connection
+Timeout*, and 'Open Documentation in Default Browser?' configuration parameters:
 
 .. table::
    :class: longtable
    :widths: 2 1 4
 
-   +--------------------------+--------------------+---------------------------------------------------------------+
-   | Key                      | Type               | Purpose                                                       |
-   +==========================+====================+===============================================================+
-   | FixedPort                | Boolean            | Use a fixed network port number rather than a random one.     |
-   +--------------------------+--------------------+---------------------------------------------------------------+
-   | PortNumber               | Integer            | The port number to use, if using a fixed port.                |
-   +--------------------------+--------------------+---------------------------------------------------------------+
-   | ConnectionTimeout        | Integer            | The number of seconds to wait for application server startup. |
-   +--------------------------+--------------------+---------------------------------------------------------------+
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | Key                                    | Type               | Purpose                                                       |
+   +========================================+====================+===============================================================+
+   | FixedPort                              | Boolean            | Use a fixed network port number rather than a random one.     |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | PortNumber                             | Integer            | The port number to use, if using a fixed port.                |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | ConnectionTimeout                      | Integer            | The number of seconds to wait for application server startup. |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | Open Documentation in Default Browser  | Boolean            | By checking this option, all documentation links will open in |
+   |                                        |                    | the default browser instead of in a new window.               |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
 
 Log dialog
 ----------

docs/en_US/developer_tools.rst

@@ -16,3 +16,4 @@ PL/SQL code.
    editgrid
    schema_diff
    erd_tool
+   psql_tool

docs/en_US/domain_constraint_dialog.rst

@@ -59,11 +59,11 @@ the *Domain Constraints* dialog:
     :align: center
 
 The example shown demonstrates creating a domain constraint on the domain
-*timesheets* named *weekday*. It constrains a value to equal *Friday*.
+*timesheets* named *weekday*. It constrains a value equal to *Friday*.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

docs/en_US/domain_dialog.rst

@@ -114,12 +114,12 @@ the *Domain* dialog:
     :alt: Domain dialog sql tab
     :align: center
 
-The example shown demonstrates creating a domain named *minimum-wage* that
-confirms that the value entered is greater than or equal to *7.25*.
+The example shown demonstrates creating a domain named *postal_code* that
+confirms that the value entered is in proper format.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

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
@@ -107,6 +107,86 @@ properties of the geometries directly in map, just click the specific geometry:
     - *Internet access:* An internet connection is required for the Geometry Viewer
       to function correctly.
 
+
+**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.
+
+
+.. image:: images/json_editor_modes.png
+    :alt: Json Editor
+    :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.
+
+*Tree Mode*:
+Enabled to change, add, move, remove, and duplicate fields and values.Provides ability
+to searh & hilight data.
+
+*Form Mode*:
+Allows only to edit values in json data there by providing ability to keep 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.
+
+
+*Editor Toolbar*
+
+Different options are provided to manipulate json data.
+
+Code/Preview mode:
+
+.. image:: images/json_editor_code_preview_tool_bar.png
+    :alt: Json Editor Code/Preview mode Tool Bar
+    :align: center
+
+
+Tree/Form mode:
+
+.. image:: images/json_editor_tree_form_mode_tool_bar.png
+    :alt: Json Editor Tree/Form mode Tool Bar
+    :align: center
+
+
+.. table::
+   :class: longtable
+   :widths: 1 3 2
+
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | Icon                 | Behavior                                                                               | Available in mode         |
+   +======================+========================================================================================+===========================+
+   | *Format Json*        | Click to *Format Json* format json data with proper indentation.                       | Code, Preview             |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Compact Json*       | Click to *Compact Json* get compacted json data.                                       | Code, Preview             |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Sort*               | Click to *Sort* icon to set sorting criteria for the data using file values.           | Code, Preview, Tree       |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *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 |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Redo*               | Click to *Redo* to repat last action performed on data .                               | Code, Preview, Tree, From |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Mode*               | Click to *Mode* dropdown to change dipaly mode of editor.Different modes avaialble     | Code, Tree, From, Preview |
+   |                      | are Code, Preview, Tree, From.                                                         |                           |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Expand All*         | Click to *Expand All* to expand json data.                                             | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Collapse All*       | Click to *Redo* to collapse json data.                                                 | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Search Box*         | Enter partial/complete string to search in data.                                       | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+
+
+
+
 Sort/Filter options dialog
 **************************
 
@@ -135,11 +215,25 @@ To add new column(s) in data sorting grid, click on the [+] icon.
 
 To delete a row from the grid, click the trash icon.
 
-* Click the *Help* button (?) to access online help.
-* Click the *Ok* button to save work.
+* Click the *Save* button to save work.
 * Click the *Close* button to discard current changes and close the dialog.
 
 .. toctree::
    :maxdepth: 2
 
-   viewdata_filter
+   viewdata_filter
+
+
+
+Promote View/Edit Data to Query Tool
+************************************
+
+A View/Edit Data tab can be converted to a Query Tool Tab just by editing the query. Once you start editing, it will ask if you really want to move away from View/Edit.
+
+.. image:: images/promote_view_edit_data_warning.png
+    :alt: Promote View/Edit Data tab to Query Tool tab warning
+    :align: center
+
+You can disable the dialog by selecting the "Don't Ask again" checkbox. If you wish to resume the confirmation dialog, you can do it from "Prefrences -> Query Tool -> Editor -> Show View/Edit Data Promotion Warning?"
+
+Once you chose to continue, you won't be able to use the features of View/Edit mode like the filter and sorting options, limit, etc. It is a one-way conversion. It will be a query tool now.

docs/en_US/erd_tool.rst

@@ -12,12 +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 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
 *******
@@ -40,13 +48,13 @@ 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 + |
-   |                      |                                                                                                   | S              |
+   |                      | You need to click the down arrow beside the save button to see *Save As*.                         | S              |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
 
 Export Options
@@ -59,11 +67,13 @@ Export Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
-   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option + Ctrl +|
-   |                      | with the generated SQL ready for execution.                                                       | S              |
+   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option/Alt +   |
+   |                      | with the generated SQL ready for execution.                                                       | Ctrl + S       |
+   |                      | You can select the option *With DROP Table* if you wish to have DROP Table DDL statements before  |                |
+   |                      | each CREATE Table DDL. You can see the option by clicking the down arrow beside the SQL button.   |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option + Ctrl +|
-   |                      |                                                                                                   | I              |
+   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option/Alt +   |
+   |                      |                                                                                                   | Ctrl + I       |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
 
 Editing Options
@@ -108,6 +118,23 @@ Table Relationship Options
    |                      | tables and link them.                                                                             |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
 
+Node Color Options
+**************************
+
+.. table::
+   :class: longtable
+   :widths: 1 5
+
+   +----------------------+----------------------------------------------------------------------------------------------------------+
+   | 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.               |
+   +----------------------+----------------------------------------------------------------------------------------------------------+
+   | *Text Color*         | Use Text Color to change the text color of a table node based on the fill color to make text             |
+   |                      | easily readable.                                                                                         |
+   +----------------------+----------------------------------------------------------------------------------------------------------+
+
 Utility Options
 ***************
 
@@ -115,18 +142,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 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      |
+   +-------------------------+------------------------------------------------------------------------------------------------+----------------+
+   | *Cardinality Notation*  | Change the cardinality notation format used to present relationship links. Options available   |                |
+   |                         | are - Crow's Foot Notation and Chen Notation.                                                  |                |
+   +-------------------------+------------------------------------------------------------------------------------------------+----------------+
 
 Zoom Options
 ************

docs/en_US/event_trigger_dialog.rst

@@ -4,14 +4,14 @@
 `Event Trigger Dialog`:index:
 *****************************
 
-Use the *Domain Trigger* dialog to define an event trigger. Unlike regular
+Use the *Event Trigger* dialog to define an event trigger. Unlike regular
 triggers, which are attached to a single table and capture only DML events,
 event triggers are global to a particular database and are capable of capturing
 DDL events.  Like regular triggers, event triggers can be written in any
 procedural language that includes event trigger support, or in C, but not in
 SQL.
 
-The *Domain Trigger* dialog organizes the development of a event trigger through
+The *Event Trigger* dialog organizes the development of a event trigger through
 the following dialog tabs: *General*, *Definition*, and *Security Labels*. The
 *SQL* tab displays the SQL code generated by dialog selections.
 
@@ -67,7 +67,7 @@ in the *Delete Row* popup.
 
 Click the *SQL* tab to continue.
 
-Your entries in the *Domain Trigger* dialog generate a generate a SQL command.
+Your entries in the *Event Trigger* dialog generate a generate a SQL command.
 Use the *SQL* tab for review; revisit or switch tabs to make any changes to the
 SQL command.
 
@@ -75,18 +75,18 @@ Example
 *******
 
 The following is an example of the sql command generated by user selections in
-the *Domain Trigger* dialog:
+the *Event Trigger* dialog:
 
 .. image:: images/event_trigger_sql.png
     :alt: Event trigger dialog sql tab
     :align: center
 
 The command creates an event trigger named *accounts* that invokes the procedure
-named *acct_due*.
+named *evt_tri_fun*.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

docs/en_US/exclusion_constraint_dialog.rst

@@ -96,11 +96,9 @@ the *Exclusion Constraint* dialog:
     :align: center
 
 The example shown demonstrates creating an exclusion constraint named
-*exclude_department* that restricts additions to the dept table to those
-additions that are not equal to the value of the *deptno* column.  The
-constraint uses a btree index.
+*ex_dept_no*. The constraint uses a btree index.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/extension_dialog.rst

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

docs/en_US/external_database.rst

@@ -0,0 +1,65 @@
+.. _external_database:
+
+****************************************************
+`External database for pgAdmin user settings`:index:
+****************************************************
+
+The user settings used by pgAdmin are stored in a SQLite database. In this
+database, many settings are stored, such as preferences, user accounts,
+auto-discovered servers, and many more.
+
+As SQLite is a file-based database and it can be anywhere in the file system,
+so it is not designed to take care of failures (no HA support). Furthermore,
+it isn't designed to handle multiple connections concurrently reading/writing
+data to it. Example: In environments such as Kubernetes it may be useful to
+use an alternate backend to avoid using SQLite on non-ephemeral storage and to
+allow HA of the settings database.
+
+In order to prevent this, pgAdmin now supports storing user settings in an
+external database using the new 'CONFIG_DATABASE_URI' parameter in the
+:ref:`config.py <config_py>` file.
+
+Use SQLite Database
+*******************
+
+In order to use SQLite Database, make sure CONFIG_DATABASE_URI parameter is
+set to an empty string like ''. By default it is set to an empty string in the
+config.py so if you would like to use SQLite database then no need to change
+anything.
+
+Use External Database
+*********************
+
+In order to use an external database, make sure CONFIG_DATABASE_URI parameter
+is set like "dialect+driver://username:password@host:port/database".
+
+**Note** It is recommended to create the database in advance.
+
+Use PostgreSQL Database
+***********************
+
+Following are the formats to use PostgreSQL as an external database.
+
+Basic syntax:
+
+.. code-block:: bash
+
+    postgresql://username:password@host:port/database
+
+Using specific schema (It is recommended to create the schema in advance):
+
+.. code-block:: bash
+
+    postgresql://username:password@host:port/database?options=-csearch_path=<schema name>
+
+Using default pgpass path for the service account:
+
+.. code-block:: bash
+
+    postgresql://username@host:port?options=-csearch_path=<schema name>
+
+Specifying pgpass file path:
+
+.. code-block:: bash
+
+    postgresql://username@host:port?passfile=<path of the pgpass file>&options=-csearch_path=<schema name>

docs/en_US/foreign_data_wrapper_dialog.rst

@@ -53,7 +53,7 @@ Click the *Options* tab to continue.
 
 Use the fields in the *Options* tab to specify options:
 
-* Click the the *Add* icon (+) button to add an option/value pair for the
+* Click the *Add* icon (+) button to add an option/value pair for the
   foreign data wrapper. Supported option/value pairs will be specific to the
   selected foreign data wrapper.
 * Specify the option name in the *Option* field and provide a corresponding
@@ -97,12 +97,12 @@ the *Foreign Data Wrapper* dialog:
     :alt: Foreign data wrapper dialog sql tab
     :align: center
 
-The example creates a foreign data wrapper named *libpq_debug* that uses
+The example creates a foreign data wrapper named *lib_qp_debug* that uses
 pre-existing validator and handler functions, *dblink_fdw_validator* and
 *libpg_fdw_handler*.  Selections on the *Options* tab set *debug* equal to
 *true*.  The foreign data wrapper is owned by *postgres*.
 
 * Click the *Help* button (?) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

docs/en_US/foreign_key_dialog.rst

@@ -129,10 +129,10 @@ the *Foreign key* dialog:
     :align: center
 
 The example shown demonstrates creating a foreign key constraint named
-*territory_fkey* that matches values in the *distributors* table *territory*
-column with those of the *sales_territories* table *region* column.
+*jobhist_ref_dept_fk* that matches values in the *jobhist* table *dept_no*
+column with those of the *dept* table *deptno* column.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
-* Click the *Reset* button to restore configuration parameters.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.

docs/en_US/foreign_server_dialog.rst

@@ -93,5 +93,5 @@ Options for the foreign server include a host and a port.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

docs/en_US/foreign_table_dialog.rst

@@ -157,10 +157,10 @@ the *Foreign Table* dialog:
     :align: center
 
 The example shown demonstrates creating a foreign table *weblogs* with multiple
-columns and two options.
+columns.
 
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

docs/en_US/fts_configuration_dialog.rst

@@ -49,7 +49,7 @@ Click the *Tokens* tab to continue.
 Use the fields in the *Tokens* tab to add a token:
 
 * Use the *Tokens* field to specify the name of a token.
-* Click the *Add* icon (+) to create a token.
+* Click the *Add* button to create a token.
 * Use the *Dictionaries* field to specify a dictionary.
 
 Repeat these steps to add additional tokens; to discard a token, click the
@@ -73,11 +73,11 @@ the *FTS Configuration* dialog:
     :align: center
 
 The example shown demonstrates creating a FTS configuration named
-*meme_phrases*. It uses the *default* parser.
+*english_phrases*. It uses the *default* parser.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

docs/en_US/fts_dictionary_dialog.rst

@@ -108,7 +108,7 @@ The example shown demonstrates creating a custom dictionary named
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

docs/en_US/fts_parser_dialog.rst

@@ -58,7 +58,7 @@ command.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

docs/en_US/fts_template_dialog.rst

@@ -52,12 +52,12 @@ the *FTS Template* dialog:
     :alt: FTS template dialog sql tab
     :align: center
 
-The example shown demonstrates creating a fts template named *ru_template* that
+The example shown demonstrates creating a fts template named *eng.template* that
 uses the ispell dictionary.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

docs/en_US/function_dialog.rst

@@ -35,8 +35,10 @@ Click the *Definition* tab to continue.
 
 Use the fields in the *Definition* tab to define the function:
 
+* Move the *Custom return type?* switch to provide a user defined return type.
 * Use the drop-down listbox next to *Return type* to select the data type
-  returned by the function, if any.
+  returned by the function, if any. If *Custom return type?* is enabled this field
+  will change to an input text field.
 * Use the drop-down listbox next to *Language* to select the implementation
   language. The default is *sql*.
 * Use the fields in the *Arguments* to define an argument. Click the *Add*
@@ -181,5 +183,5 @@ function have 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.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

docs/en_US/getting_started.rst

@@ -33,10 +33,15 @@ Mode is pre-configured for security.
 
    deployment
    login
+   mfa
    user_management
+   change_ownership
    change_user_password
+   restore_locked_user
    ldap
    kerberos
+   oauth2
+   webserver
 
 
 .. note:: Pre-compiled and configured installation packages are available for

docs/en_US/grant_wizard.rst

@@ -10,8 +10,8 @@ search box, dropdown lists, and checkboxes facilitate quick selections of
 database objects, roles and privileges.
 
 The wizard organizes privilege management through a sequence of windows:
-*Object Selection (step 1 of 3)*, *Privileges Selection (step 2 of 3)* and
-*Final (Review Selection) (step 3 of 3)*. The *Final (Review Selection)* window
+*Object Selection*, *Privileges Selection* and
+*Review Selection*. The *Review Selection* window
 displays the SQL code generated by wizard selections.
 
 To launch the *Grant Wizard* tool, select a database object in the *pgAdmin*
@@ -22,7 +22,7 @@ tree control, then navigate through *Tools* on the menu bar to click on the
     :alt: Grant wizard step one page
     :align: center
 
-Use the fields in the *Object Selection (step 1 of 3)* window to select the
+Use the fields in the *Object Selection* window to select the
 object or objects on which you are modifying privileges. Use the *Search by
 object type or name* field to locate a database object, or use the scrollbar
 to scroll through the list of all accessible objects.
@@ -35,14 +35,14 @@ to scroll through the list of all accessible objects.
     * The schema in which the object resides in the *Schema* field
     * The object name in the *Name* field.
 
-Click the *Next* button to continue, or the *Cancel* button to close the wizard
+Click the *Next* button to continue, or the *X* button to close the wizard
 without modifying privileges.
 
 .. image:: images/grant_wizard_step2.png
     :alt: Grant wizard step two page
     :align: center
 
-Use the fields in the *Privileges Selection (step 2 of 3)* window to grant
+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
@@ -64,11 +64,11 @@ For more information about granting privileges on database objects, see the
 `PostgreSQL core documentation <https://www.postgresql.org/docs/current/sql-grant.html>`_.
 
 Click the *Next* button to continue, the *Back* button to select or deselect
-additional database objects, or the *Cancel* button to close the wizard without
+additional database objects, or the *X* button to close the wizard without
 modifying privileges.
 
 Your entries in the *Grant Wizard* tool generate a SQL command; you can review
-the command in the *Final (Review Selection) (step 3 of 3)* window (see an
+the command in the *Review Selection* window (see an
 example below).
 
 Example
@@ -81,11 +81,6 @@ the *Grant Wizard* tool:
     :alt: Grant wizard step three page
     :align: center
 
-The commands displayed assign a role named *Bob* *INSERT* and *UPDATE*
-privileges *WITH GRANT OPTION* on the *sales_meetings* and the
-*sales_territories* tables.
-
 * Click the *Back* button to select or deselect additional database objects,
   roles and privileges.
-* Click the *Cancel* button to exit without saving work.
 * Click the *Finish* button to save selections and exit the wizard.