Fixed CSV export from Query Tool results does not include all columns for multiple CTEs. #6122

This adds parallelism for the different versions, and separates the logs.

.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: "Python dependency"  
+      
+  - package-ecosystem: "npm"
+    directory: "/web"
+    schedule:
+      interval: "daily"
+    labels:
+      - "Dependencies"
+    commit-message:
+      prefix: "Python 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:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build the container
+        run: docker build .

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

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

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

@@ -0,0 +1,61 @@
+name: Check documentation builds
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - 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@v3
+        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@v3
+        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@v3
+        with:
+          name: pgadmin4-pdf-build-output
+          path: docs/en_US/_build/latex/pgadmin4.pdf

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

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

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

@@ -0,0 +1,39 @@
+name: Check Python build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - 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@v3
+        with:
+          name: pgadmin4-python-build-output
+          path: dist/*

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

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

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

@@ -0,0 +1,39 @@
+name: Check tarball build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+  workflow_dispatch:
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - 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@v3
+        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:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - 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-javascript-tests.yml

@@ -0,0 +1,35 @@
+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:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Node modules
+        run: |
+          cd web
+          yarn install
+
+      - name: Run the tests
+        run: |
+          cd web
+          yarn run test:karma-once

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

@@ -0,0 +1,163 @@
+# 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
+
+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:
+  build:
+    # 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: [11, 12, 13, 14, 15]
+
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup the EDB APT repo
+        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 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
+          {
+            "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: Run the tests
+        run: |
+          . venv/bin/activate
+          make check-python
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: server-log-pg${{ matrix.pgver }}
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: regression-log-pg${{ matrix.pgver }}
+          path: web/regression/regression.log

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

@@ -0,0 +1,179 @@
+name: Run Python tests on PostgreSQL
+
+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:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-latest]
+        pgver: [11, 12, 13, 14, 15]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup the PGDG APT repo
+        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 }}
+
+      - 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 /usr/local/var/tablespaces/${{ matrix.pgver }}
+
+      - name: Start PostgreSQL on Linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        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/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: |
+          # Note: we use a custom port for PostgreSQL as the runner may already have a version of PostgreSQL installed
+          echo local all all trust > /usr/local/var/postgresql@${{ matrix.pgver }}/pg_hba.conf
+          sed -i '' "s/#port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /usr/local/var/postgresql@${{ matrix.pgver }}/postgresql.conf
+          brew services restart postgresql@${{ matrix.pgver }}
+          
+          until /usr/local/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
+        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
+          {
+            "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' || '/var/run/postgresql' }}",
+                "db_password": "postgres",
+                "db_port": 59${{ matrix.pgver }},
+                "maintenance_db": "postgres",
+                "sslmode": "prefer",
+                "tablespace_path": "${{  matrix.os == 'macos-latest' && format('/usr/local/var/tablespaces/{0}', matrix.pgver) || format('/var/lib/postgresql/tablespaces/{0}', matrix.pgver) }}",
+                "enabled": true,
+                "default_binary_paths": {
+                  "pg": "${{ matrix.os == 'macos-latest' && format('/usr/local/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
+                  "ppas": ""
+                }
+              }
+            ],
+            "server_update_data": [
+              {
+                "comment": "This is test update comment"
+              }
+            ]
+          }
+          EOF
+
+      - name: Run the tests
+        run: |
+          . venv/bin/activate
+          make check-python
+
+      - name: Archive server log
+        if: success() || failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: server-log-${{ matrix.os }}-pg${{ matrix.pgver }}
+          path: var/pgadmin4.log
+
+      - name: Archive regression log
+        if: success() || failure()
+        uses: actions/upload-artifact@v3
+        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:
+  build:
+    # Only run if the project key is set
+    if: vars.SONARQUBE_PROJECT_KEY != null
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        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,8 @@
 .DS_Store
 .idea
 .vscode
+.yarn
+.yarnrc.yml
 /*.diff
 /*.patch
 /dist

DEPENDENCIES

@@ -12,63 +12,70 @@ 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.4           MIT                                  https://github.com/axios/axios.git
+asynckit                                                         0.4.0            MIT                                  git+https://github.com/alexindigo/asynckit.git
+axios                                                            1.3.4            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
 ----                                                             -------          -------                              ---
-Flask                                                            2.1.3            BSD-3-Clause                         https://palletsprojects.com/p/flask
+Flask                                                            2.2.3            BSD-3-Clause                         https://palletsprojects.com/p/flask
 Flask-Gravatar                                                   0.5.0            BSD                                  https://github.com/zzzsochi/Flask-Gravatar/
 Flask-Login                                                      0.6.2            MIT                                  https://github.com/maxcountryman/flask-login
 Flask-Mail                                                       0.9.1            BSD                                  https://github.com/rduplain/flask-mail
-Flask-Migrate                                                    3.1.0            UNKNOWN                              https://github.com/miguelgrinberg/flask-migrate
-Flask-SQLAlchemy                                                 2.5.1            BSD-3-Clause                         https://github.com/pallets/flask-sqlalchemy
-Flask-WTF                                                        1.0.1            BSD-3-Clause                         https://github.com/wtforms/flask-wtf/
+Flask-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                                                      2.0.0            BSD                                  http://github.com/python-babel/flask-babel
-Flask-Security-Too                                               4.1.5            MIT                                  https://github.com/Flask-Middleware/flask-security
-Flask-SocketIO                                                   5.2.0            Unknown                              https://github.com/miguelgrinberg/flask-socketio
+flask-babel                                                      3.0.1            BSD-3-Clause                         Unknown
+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.3           MIT                                  http://pythonhosted.org/pytz
-simplejson                                                       3.17.6           MIT License                          https://github.com/simplejson/simplejson
+pytz                                                             2022.7.1         MIT                                  http://pythonhosted.org/pytz
 speaklater3                                                      1.4              UNKNOWN                              https://github.com/ThomasWaldmann/speaklater
 sqlparse                                                         0.4.3            BSD-3-Clause                         https://github.com/andialbrecht/sqlparse
-psutil                                                           5.9.3            BSD-3-Clause                         https://github.com/giampaolo/psutil
-psycopg2                                                         2.9.5            LGPL with exceptions                 https://psycopg.org/
+psutil                                                           5.9.4            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                                                       1.4.44           MIT                                  https://www.sqlalchemy.org
-bcrypt                                                           3.2.2            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
-cryptography                                                     3.4.8            BSD or Apache License, Version 2.0   https://github.com/pyca/cryptography
+SQLAlchemy                                                       2.0.7            MIT                                  https://www.sqlalchemy.org
+bcrypt                                                           4.0.1            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
+cryptography                                                     40.0.1           (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.1            LGPL v3                              https://github.com/cannatag/ldap3
 gssapi                                                           1.8.2            LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
-eventlet                                                         0.33.0           UNKNOWN                              http://eventlet.net
+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                                                         1.1.*            Unknown                              Unknown
-Authlib                                                          0.15.6           BSD-3-Clause                         https://authlib.org/
-requests                                                         2.25.1           Apache 2.0                           https://requests.readthedocs.io
-pyotp                                                            2.7.0            MIT License                          https://github.com/pyotp/pyotp
-qrcode                                                           7.3.1            BSD                                  https://github.com/lincolnloop/python-qrcode
-Pillow                                                           9.3.0            HPND                                 https://python-pillow.org
-boto3                                                            1.20.54          Apache License 2.0                   https://github.com/boto/boto3
-botocore                                                         1.23.54          Apache License 2.0                   https://github.com/boto/botocore
-urllib3                                                          1.26.12          MIT                                  https://urllib3.readthedocs.io/
-Werkzeug                                                         2.1.2            BSD-3-Clause                         https://palletsprojects.com/p/werkzeug/
+pywinpty                                                         2.0.*            Unknown                              Unknown
+Authlib                                                          1.2.0            BSD 3-Clause License                 https://authlib.org/
+requests                                                         2.28.2           Apache 2.0                           https://requests.readthedocs.io
+pyotp                                                            2.8.0            MIT License                          https://github.com/pyotp/pyotp
+qrcode                                                           7.4.2            BSD                                  https://github.com/lincolnloop/python-qrcode
+Pillow                                                           9.4.0            HPND                                 https://python-pillow.org
+boto3                                                            1.26.101         Apache License 2.0                   https://github.com/boto/boto3
+botocore                                                         1.29.101         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                                              21.0.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-mgmt-subscription                                          3.0.0            MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-identity                                                   1.9.0            MIT License                          https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity
+azure-mgmt-resource                                              23.0.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
+azure-mgmt-subscription                                          3.1.1            MIT License                          https://github.com/Azure/azure-sdk-for-python
+azure-identity                                                   1.12.0           MIT License                          https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity
+google-api-python-client                                         2.83.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
 
-NOTE: This report was generated using Python 3.10. Full information may not be
+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.
 
 44 dependencies listed.
@@ -79,61 +86,61 @@ Javascript Dependencies
 Name                                                             Version          Licence                              URL
 ----                                                             -------          -------                              ---
 @ampproject/remapping                                            2.2.0            Apache-2.0                           git+https://github.com/ampproject/remapping.git
-anti-trojan-source                                               1.4.0            Apache-2.0                           https://github.com/lirantal/anti-trojan-source.git
-bootstrap-datepicker                                             1.9.0            Apache-2.0                           https://github.com/uxsolutions/bootstrap-datepicker.git
+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.9.2            Apache-2.0                           https://github.com/josdejong/jsoneditor.git
 paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
-rc-dock                                                          3.2.14           Apache-2.0                           https://github.com/ticlo/rc-dock.git
+rc-dock                                                          3.2.16           Apache-2.0                           https://github.com/ticlo/rc-dock.git
 rc-new-window                                                    0.1.13           Apache-2.0                           https://github.com/ticlo/rc-new-window.git
 snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
 spdx-correct                                                     3.1.1            Apache-2.0                           https://github.com/jslicense/spdx-correct.js.git
 validate-npm-package-license                                     3.0.4            Apache-2.0                           https://github.com/kemitchell/validate-npm-package-license.js.git
 @babel/code-frame                                                7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/compat-data                                               7.20.1           MIT                                  https://github.com/babel/babel.git
-@babel/core                                                      7.20.2           MIT                                  https://github.com/babel/babel.git
-@babel/generator                                                 7.20.4           MIT                                  https://github.com/babel/babel.git
+@babel/compat-data                                               7.20.10          MIT                                  https://github.com/babel/babel.git
+@babel/core                                                      7.20.12          MIT                                  https://github.com/babel/babel.git
+@babel/generator                                                 7.20.7           MIT                                  https://github.com/babel/babel.git
 @babel/helper-annotate-as-pure                                   7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-compilation-targets                                7.20.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-create-class-features-plugin                       7.20.2           MIT                                  https://github.com/babel/babel.git
+@babel/helper-compilation-targets                                7.20.7           MIT                                  https://github.com/babel/babel.git
+@babel/helper-create-class-features-plugin                       7.20.12          MIT                                  https://github.com/babel/babel.git
 @babel/helper-environment-visitor                                7.18.9           MIT                                  https://github.com/babel/babel.git
 @babel/helper-function-name                                      7.19.0           MIT                                  https://github.com/babel/babel.git
 @babel/helper-hoist-variables                                    7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-member-expression-to-functions                     7.18.9           MIT                                  https://github.com/babel/babel.git
+@babel/helper-member-expression-to-functions                     7.20.7           MIT                                  https://github.com/babel/babel.git
 @babel/helper-module-imports                                     7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-transforms                                  7.20.2           MIT                                  https://github.com/babel/babel.git
+@babel/helper-module-transforms                                  7.20.11          MIT                                  https://github.com/babel/babel.git
 @babel/helper-optimise-call-expression                           7.18.6           MIT                                  https://github.com/babel/babel.git
 @babel/helper-plugin-utils                                       7.20.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-replace-supers                                     7.19.1           MIT                                  https://github.com/babel/babel.git
+@babel/helper-replace-supers                                     7.20.7           MIT                                  https://github.com/babel/babel.git
 @babel/helper-simple-access                                      7.20.2           MIT                                  https://github.com/babel/babel.git
+@babel/helper-skip-transparent-expression-wrappers               7.20.0           MIT                                  https://github.com/babel/babel.git
 @babel/helper-split-export-declaration                           7.18.6           MIT                                  https://github.com/babel/babel.git
 @babel/helper-string-parser                                      7.19.4           MIT                                  https://github.com/babel/babel.git
 @babel/helper-validator-identifier                               7.19.1           MIT                                  https://github.com/babel/babel.git
 @babel/helper-validator-option                                   7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/helpers                                                   7.20.1           MIT                                  https://github.com/babel/babel.git
+@babel/helpers                                                   7.20.13          MIT                                  https://github.com/babel/babel.git
 @babel/highlight                                                 7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/parser                                                    7.20.3           MIT                                  https://github.com/babel/babel.git
+@babel/parser                                                    7.20.13          MIT                                  https://github.com/babel/babel.git
 @babel/plugin-proposal-class-properties                          7.18.6           MIT                                  https://github.com/babel/babel.git
 @babel/plugin-syntax-jsx                                         7.18.6           MIT                                  https://github.com/babel/babel.git
 @babel/plugin-transform-react-display-name                       7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-jsx                                7.19.0           MIT                                  https://github.com/babel/babel.git
+@babel/plugin-transform-react-jsx                                7.20.13          MIT                                  https://github.com/babel/babel.git
 @babel/plugin-transform-react-jsx-development                    7.18.6           MIT                                  https://github.com/babel/babel.git
 @babel/plugin-transform-react-pure-annotations                   7.18.6           MIT                                  https://github.com/babel/babel.git
 @babel/preset-react                                              7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/runtime                                                   7.20.1           MIT                                  https://github.com/babel/babel.git
-@babel/template                                                  7.18.10          MIT                                  https://github.com/babel/babel.git
-@babel/traverse                                                  7.20.1           MIT                                  https://github.com/babel/babel.git
-@babel/types                                                     7.20.2           MIT                                  https://github.com/babel/babel.git
+@babel/runtime                                                   7.20.13          MIT                                  https://github.com/babel/babel.git
+@babel/template                                                  7.20.7           MIT                                  https://github.com/babel/babel.git
+@babel/traverse                                                  7.20.13          MIT                                  https://github.com/babel/babel.git
+@babel/types                                                     7.20.7           MIT                                  https://github.com/babel/babel.git
 @date-io/core                                                    1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
 @date-io/date-fns                                                1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
-@emotion/babel-plugin                                            11.10.5          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin
+@emotion/babel-plugin                                            11.10.6          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin
 @emotion/cache                                                   11.10.5          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/cache
 @emotion/hash                                                    0.8.0            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/hash
 @emotion/hash                                                    0.9.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/hash
 @emotion/is-prop-valid                                           1.2.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/is-prop-valid
 @emotion/memoize                                                 0.8.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/memoize
-@emotion/react                                                   11.10.5          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
+@emotion/react                                                   11.10.6          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
 @emotion/serialize                                               1.1.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/serialize
 @emotion/sheet                                                   1.2.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/sheet
 @emotion/stylis                                                  0.8.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/stylis
@@ -142,6 +149,8 @@ validate-npm-package-license                                     3.0.4
 @emotion/use-insertion-effect-with-fallbacks                     1.0.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/use-insertion-effect-with-fallbacks
 @emotion/utils                                                   1.2.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/utils
 @emotion/weak-memoize                                            0.3.0            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/weak-memoize
+@floating-ui/core                                                1.2.5            MIT                                  https://github.com/floating-ui/floating-ui.git
+@floating-ui/dom                                                 1.2.5            MIT                                  https://github.com/floating-ui/floating-ui.git
 @istanbuljs/schema                                               0.1.3            MIT                                  git+https://github.com/istanbuljs/schema.git
 @jridgewell/gen-mapping                                          0.3.2            MIT                                  https://github.com/jridgewell/gen-mapping
 @jridgewell/gen-mapping                                          0.1.1            MIT                                  https://github.com/jridgewell/gen-mapping
@@ -169,24 +178,24 @@ validate-npm-package-license                                     3.0.4
 @react-dnd/asap                                                  5.0.2            MIT                                  https://github.com/react-dnd/react-dnd
 @react-dnd/invariant                                             4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
 @react-dnd/shallowequal                                          4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
-@remix-run/router                                                1.0.3            MIT                                  https://github.com/remix-run/react-router
+@remix-run/router                                                1.3.0            MIT                                  https://github.com/remix-run/react-router
 @simonwep/pickr                                                  1.8.2            MIT                                  https://github.com/Simonwep/pickr.git
 @sindresorhus/is                                                 0.7.0            MIT                                  https://github.com/sindresorhus/is.git
 @socket.io/component-emitter                                     3.1.0            MIT                                  https://github.com/socketio/emitter.git
 @szhsin/react-menu                                               2.3.4            MIT                                  https://github.com/szhsin/react-menu.git
 @types/classnames                                                2.3.1            MIT                                  Unknown
 @types/minimist                                                  1.2.2            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/node                                                      18.11.9          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/node                                                      18.11.18         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/normalize-package-data                                    2.4.1            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/parse-json                                                4.0.0            MIT                                  https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/prop-types                                                15.7.5           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     18.0.25          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     16.14.34         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     18.0.27          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     16.14.35         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/react-dom                                                 16.9.17          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/react-transition-group                                    4.4.5            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/scheduler                                                 0.16.2           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/styled-jsx                                                2.2.9            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-ajv                                                              8.11.2           MIT                                  https://github.com/ajv-validator/ajv.git
+ajv                                                              8.12.0           MIT                                  https://github.com/ajv-validator/ajv.git
 ajv                                                              6.12.6           MIT                                  https://github.com/ajv-validator/ajv.git
 ansi-styles                                                      3.2.1            MIT                                  https://github.com/chalk/ansi-styles.git
 array-union                                                      3.0.1            MIT                                  https://github.com/sindresorhus/array-union.git
@@ -203,9 +212,8 @@ babel-plugin-syntax-jsx                                          6.18.0
 babelify                                                         10.0.0           MIT                                  https://github.com/babel/babelify.git
 balanced-match                                                   1.0.2            MIT                                  git://github.com/juliangruber/balanced-match.git
 base64-arraybuffer                                               1.0.2            MIT                                  https://github.com/niklasvh/base64-arraybuffer
-bignumber.js                                                     9.1.0            MIT                                  https://github.com/MikeMcl/bignumber.js.git
+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
-bootstrap4-toggle                                                3.6.1            MIT                                  https://github.com/gitbrent/bootstrap4-toggle.git
 bowser                                                           2.11.0           MIT                                  git+https://github.com/lancedikson/bowser.git
 brace                                                            0.11.1           MIT                                  git://github.com/thlorenz/brace.git
 brace-expansion                                                  1.1.11           MIT                                  git://github.com/juliangruber/brace-expansion.git
@@ -223,19 +231,18 @@ chartjs-plugin-zoom                                              1.3.0
 classnames                                                       2.3.2            MIT                                  https://github.com/JedWatson/classnames.git
 closest                                                          0.0.1            MIT                                  https://github.com/ForbesLindesay/closest.git
 clsx                                                             1.2.1            MIT                                  https://github.com/lukeed/clsx.git
-codemirror                                                       5.65.10          MIT                                  https://github.com/codemirror/CodeMirror.git
+codemirror                                                       5.65.11          MIT                                  https://github.com/codemirror/CodeMirror.git
 color-convert                                                    1.9.3            MIT                                  https://github.com/Qix-/color-convert.git
 color-name                                                       1.1.3            MIT                                  git@github.com:dfcreative/color-name.git
 colord                                                           2.9.3            MIT                                  https://github.com/omgovich/colord.git
 commander                                                        7.2.0            MIT                                  https://github.com/tj/commander.js.git
 concat-map                                                       0.0.1            MIT                                  git://github.com/substack/node-concat-map.git
-context-menu                                                     2.0.0            MIT                                  https://github.com/chipto/context-menu.git
 convert-source-map                                               1.9.0            MIT                                  git://github.com/thlorenz/convert-source-map.git
 convert-units                                                    2.3.4            MIT                                  git://github.com/ben-ng/convert-units.git
-core-js                                                          3.26.1           MIT                                  https://github.com/zloirock/core-js.git
+core-js                                                          3.27.2           MIT                                  https://github.com/zloirock/core-js.git
 cosmiconfig                                                      7.1.0            MIT                                  git+https://github.com/davidtheclark/cosmiconfig.git
 css-line-break                                                   2.1.0            MIT                                  git+ssh://git@github.com/niklasvh/css-line-break.git
-css-to-react-native                                              3.0.0            MIT                                  git+https://github.com/styled-components/css-to-react-native.git
+css-to-react-native                                              3.1.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
@@ -259,7 +266,7 @@ dom-align                                                        1.12.4
 dom-helpers                                                      5.2.1            MIT                                  git+https://github.com/react-bootstrap/dom-helpers.git
 dom-serializer                                                   1.4.1            MIT                                  git://github.com/cheeriojs/dom-renderer.git
 engine.io-client                                                 6.2.3            MIT                                  https://github.com/socketio/engine.io-client.git
-engine.io-parser                                                 5.0.4            MIT                                  git@github.com:socketio/engine.io-parser.git
+engine.io-parser                                                 5.0.6            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
@@ -286,7 +293,7 @@ has-flag                                                         3.0.0
 has-flag                                                         4.0.0            MIT                                  https://github.com/sindresorhus/has-flag.git
 html-escaper                                                     2.0.2            MIT                                  https://github.com/WebReflection/html-escaper.git
 html2canvas                                                      1.4.1            MIT                                  git@github.com:niklasvh/html2canvas.git
-ignore                                                           5.2.1            MIT                                  git@github.com:kaelzhang/node-ignore.git
+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
 indent-string                                                    5.0.0            MIT                                  https://github.com/sindresorhus/indent-string.git
@@ -303,9 +310,8 @@ is-plain-obj                                                     1.1.0
 is-relative                                                      1.0.0            MIT                                  https://github.com/jonschlinkert/is-relative.git
 is-unc-path                                                      1.0.0            MIT                                  https://github.com/jonschlinkert/is-unc-path.git
 javascript-natural-sort                                          0.7.1            MIT                                  https://github.com/Bill4Time/javascript-natural-sort.git
-jquery                                                           3.6.1            MIT                                  https://github.com/jquery/jquery.git
+jquery                                                           3.6.3            MIT                                  https://github.com/jquery/jquery.git
 jquery-contextmenu                                               2.9.2            MIT                                  git://github.com/swisnl/jQuery-contextMenu.git
-jquery-ui                                                        1.13.2           MIT                                  git://github.com/jquery/jquery-ui.git
 js-tokens                                                        4.0.0            MIT                                  https://github.com/lydell/js-tokens.git
 jsbn                                                             1.1.0            MIT                                  https://github.com/andyperlitch/jsbn.git
 jsesc                                                            2.5.2            MIT                                  https://github.com/mathiasbynens/jsesc.git
@@ -314,8 +320,7 @@ json-parse-even-better-errors                                    2.3.1
 json-schema-traverse                                             1.0.0            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
 json-schema-traverse                                             0.4.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
 json-source-map                                                  0.6.1            MIT                                  git+https://github.com/epoberezkin/json-source-map.git
-json5                                                            2.2.1            MIT                                  git+https://github.com/json5/json5.git
-jsoneditor-react                                                 3.1.2            MIT                                  git+https://github.com/vankop/jsoneditor-react.git
+json5                                                            2.2.3            MIT                                  git+https://github.com/json5/json5.git
 jss                                                              10.9.2           MIT                                  https://github.com/cssinjs/jss.git
 jss-plugin-camel-case                                            10.9.2           MIT                                  https://github.com/cssinjs/jss.git
 jss-plugin-default-unit                                          10.9.2           MIT                                  https://github.com/cssinjs/jss.git
@@ -357,6 +362,7 @@ map-obj                                                          4.3.0
 map-obj                                                          1.0.1            MIT                                  https://github.com/sindresorhus/map-obj.git
 matches-selector                                                 0.0.1            MIT                                  https://github.com/ForbesLindesay/matches-selector.git
 memoize-one                                                      5.2.1            MIT                                  https://github.com/alexreardon/memoize-one.git
+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
@@ -368,11 +374,11 @@ ml-array-rescale                                                 1.3.7
 ml-matrix                                                        6.10.4           MIT                                  https://github.com/mljs/matrix.git
 mobius1-selectr                                                  2.4.13           MIT                                  git+https://github.com/Mobius1/Selectr.git
 moment                                                           2.29.4           MIT                                  https://github.com/moment/moment.git
-moment-timezone                                                  0.5.39           MIT                                  https://github.com/moment/moment-timezone.git
+moment-timezone                                                  0.5.40           MIT                                  https://github.com/moment/moment-timezone.git
 ms                                                               2.1.2            MIT                                  https://github.com/zeit/ms.git
 nanoid                                                           3.3.4            MIT                                  https://github.com/ai/nanoid.git
 nanopop                                                          2.2.0            MIT                                  https://github.com/Simonwep/nanopop.git
-node-releases                                                    2.0.6            MIT                                  https://github.com/chicoxyzzy/node-releases.git
+node-releases                                                    2.0.8            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
@@ -389,12 +395,11 @@ path-parse                                                       1.0.7
 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
-pgadmin4-tree                                                    1.0.0            MIT                                  Unknown
 picomatch                                                        2.3.1            MIT                                  https://github.com/micromatch/picomatch.git
 picomodal                                                        3.0.0            MIT                                  https://github.com/Nycto/PicoModal.git
 popper.js                                                        1.16.1-lts       MIT                                  git+https://github.com/FezVrasta/popper.js.git
 popper.js                                                        1.16.1           MIT                                  git+https://github.com/FezVrasta/popper.js.git
-postcss                                                          8.4.19           MIT                                  https://github.com/postcss/postcss.git
+postcss                                                          8.4.21           MIT                                  https://github.com/postcss/postcss.git
 postcss-calc                                                     8.2.4            MIT                                  https://github.com/postcss/postcss-calc.git
 postcss-colormin                                                 5.3.0            MIT                                  https://github.com/cssnano/cssnano.git
 postcss-convert-values                                           5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
@@ -425,41 +430,38 @@ postcss-svgo                                                     5.1.0
 postcss-unique-selectors                                         5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
 postcss-value-parser                                             4.2.0            MIT                                  https://github.com/TrySound/postcss-value-parser.git
 prop-types                                                       15.8.1           MIT                                  https://github.com/facebook/prop-types.git
-punycode                                                         2.1.1            MIT                                  https://github.com/bestiejs/punycode.js.git
+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.12           MIT                                  git@github.com:react-component/align.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.8.0            MIT                                  git@github.com:react-component/menu.git
+rc-menu                                                          9.8.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.6.2            MIT                                  git@github.com:react-component/motion.git
+rc-motion                                                        2.6.3            MIT                                  git@github.com:react-component/motion.git
 rc-overflow                                                      1.2.8            MIT                                  git@github.com:react-component/overflow.git
-rc-resize-observer                                               1.2.0            MIT                                  git@github.com:react-component/resize-observer.git
+rc-resize-observer                                               1.2.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.24.6           MIT                                  git@github.com:react-component/util.git
+rc-util                                                          5.27.1           MIT                                  git@github.com:react-component/util.git
 re-resizable                                                     6.9.6            MIT                                  https://github.com/bokuweb/react-resizable-box.git
-react                                                            16.14.0          MIT                                  git+https://github.com/facebook/react.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                                                        16.14.0          MIT                                  git+https://github.com/facebook/react.git
 react-dom                                                        17.0.2           MIT                                  https://github.com/facebook/react.git
 react-draggable                                                  4.4.5            MIT                                  https://github.com/react-grid-layout/react-draggable.git
-react-draggable                                                  4.4.4            MIT                                  https://github.com/react-grid-layout/react-draggable.git
 react-dropzone                                                   14.2.3           MIT                                  https://github.com/react-dropzone/react-dropzone.git
-react-input-autosize                                             3.0.0            MIT                                  https://github.com/JedWatson/react-input-autosize.git
 react-is                                                         16.13.1          MIT                                  https://github.com/facebook/react.git
 react-is                                                         17.0.2           MIT                                  https://github.com/facebook/react.git
-react-rnd                                                        10.3.7           MIT                                  https://github.com/bokuweb/react-rnd.git
-react-router                                                     6.4.3            MIT                                  https://github.com/remix-run/react-router
-react-router-dom                                                 6.4.3            MIT                                  https://github.com/remix-run/react-router
-react-select                                                     4.3.1            MIT                                  https://github.com/JedWatson/react-select/tree/master/packages/react-select
+react-resize-detector                                            8.0.3            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.7.0            MIT                                  https://github.com/remix-run/react-router
+react-router-dom                                                 6.7.0            MIT                                  https://github.com/remix-run/react-router
+react-select                                                     5.7.2            MIT                                  https://github.com/JedWatson/react-select/tree/master/packages/react-select
 react-table                                                      7.8.0            MIT                                  https://github.com/tannerlinsley/react-table
 react-transition-state                                           1.1.5            MIT                                  https://github.com/szhsin/react-transition-state.git
 react-virtualized-auto-sizer                                     1.0.7            MIT                                  https://github.com/bvaughn/react-virtualized-auto-sizer.git
@@ -476,14 +478,12 @@ resolve-from                                                     4.0.0
 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.19.1           MIT                                  https://github.com/facebook/react.git
 scheduler                                                        0.20.2           MIT                                  https://github.com/facebook/react.git
-select2                                                          4.0.13           MIT                                  git://github.com/select2/select2.git
 shallowequal                                                     1.1.0            MIT                                  https://github.com/dashed/shallowequal.git
 slash                                                            4.0.0            MIT                                  https://github.com/sindresorhus/slash.git
 snapsvg-cjs                                                      0.0.6            MIT                                  git+https://github.com/geelen/Snap.svg-cjs.git
 socket.io-client                                                 4.5.4            MIT                                  https://github.com/socketio/socket.io-client.git
-socket.io-parser                                                 4.2.1            MIT                                  https://github.com/socketio/socket.io-parser.git
+socket.io-parser                                                 4.2.2            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
@@ -495,16 +495,17 @@ supports-color                                                   5.5.0
 supports-color                                                   7.2.0            MIT                                  https://github.com/chalk/supports-color.git
 supports-preserve-symlinks-flag                                  1.0.0            MIT                                  git+https://github.com/inspect-js/node-supports-preserve-symlinks-flag.git
 svgo                                                             2.8.0            MIT                                  git://github.com/svg/svgo.git
-tempusdominus-bootstrap-4                                        5.39.2           MIT                                  https://github.com/tempusdominus/bootstrap-4.git
 tempusdominus-core                                               5.19.3           MIT                                  https://github.com/tempusdominus/core.git
 text-segmentation                                                1.0.3            MIT                                  git+ssh://git@github.com/niklasvh/text-segmentation.git
-tiny-emitter                                                     2.1.0            MIT                                  https://github.com/scottcorgan/tiny-emitter.git
 tiny-warning                                                     1.0.3            MIT                                  https://github.com/alexreardon/tiny-warning.git
 to-fast-properties                                               2.0.0            MIT                                  https://github.com/sindresorhus/to-fast-properties.git
 to-regex-range                                                   5.0.1            MIT                                  https://github.com/micromatch/to-regex-range.git
 trim-newlines                                                    4.0.2            MIT                                  https://github.com/sindresorhus/trim-newlines.git
 unc-path-regex                                                   0.1.2            MIT                                  https://github.com/regexhq/unc-path-regex.git
 update-browserslist-db                                           1.0.10           MIT                                  https://github.com/browserslist/update-db.git
+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
 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
@@ -525,11 +526,12 @@ boolbase                                                         1.0.0
 css-color-keywords                                               1.0.0            ISC                                  https://github.com/sonicdoe/css-color-keywords.git
 css-declaration-sorter                                           6.3.1            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
 electron-to-chromium                                             1.4.284          ISC                                  https://github.com/kilian/electron-to-chromium/
-fastq                                                            1.13.0           ISC                                  git+https://github.com/mcollina/fastq.git
+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                                                       2.2.1            ISC                                  https://github.com/josdejong/jsonrepair.git
 lru-cache                                                        6.0.0            ISC                                  git://github.com/isaacs/node-lru-cache.git
+lru-cache                                                        5.1.1            ISC                                  git://github.com/isaacs/node-lru-cache.git
 minimatch                                                        3.1.2            ISC                                  git://github.com/isaacs/minimatch.git
 picocolors                                                       1.0.0            ISC                                  https://github.com/alexeyraspopov/picocolors.git
 react-timer-hook                                                 3.0.5            ISC                                  git+https://github.com/amrlabib/react-timer-hook.git
@@ -537,9 +539,10 @@ semver                                                           7.3.8
 semver                                                           6.3.0            ISC                                  https://github.com/npm/node-semver
 vanilla-picker                                                   2.12.1           ISC                                  https://github.com/Sphinxxxx/vanilla-picker.git
 yallist                                                          4.0.0            ISC                                  git+https://github.com/isaacs/yallist.git
+yallist                                                          3.1.1            ISC                                  git+https://github.com/isaacs/yallist.git
 yaml                                                             1.10.2           ISC                                  https://github.com/eemeli/yaml.git
 yargs-parser                                                     20.2.9           ISC                                  https://github.com/yargs/yargs-parser.git
-ace-builds                                                       1.13.1           BSD-3-Clause                         https://github.com/ajaxorg/ace-builds.git
+ace-builds                                                       1.14.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
@@ -552,7 +555,7 @@ source-map                                                       0.6.1
 source-map                                                       0.5.7            BSD-3-Clause                         http://github.com/mozilla/source-map.git
 source-map-js                                                    1.0.2            BSD-3-Clause                         https://github.com/7rulnik/source-map-js.git
 sprintf-js                                                       1.1.2            BSD-3-Clause                         https://github.com/alexei/sprintf.js.git
-caniuse-lite                                                     1.0.30001434     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
+caniuse-lite                                                     1.0.30001448     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
@@ -575,5 +578,5 @@ tslib                                                            2.3.1
 type-fest                                                        1.4.0            (MIT OR CC0-1.0)                     https://github.com/sindresorhus/type-fest.git
 webcabin-docker                                                  2.2.5            MIT*                                 Unknown
 
-496 dependencies listed.
+492 dependencies listed.
 

Dockerfile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# Copyright (C) 2013 - 2023, 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.16 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,7 @@ 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" && \
+    yarn set version berry && \
     yarn install && \
     yarn run bundle && \
     rm -rf node_modules \
@@ -60,7 +62,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
 # Next, create the base environment for Python
 #########################################################################
 
-FROM alpine:3.16 as env-builder
+FROM alpine:latest as env-builder
 
 # Install dependencies
 COPY requirements.txt /
@@ -92,6 +94,7 @@ 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
@@ -118,7 +121,7 @@ FROM postgres:13-alpine as pg13-builder
 FROM postgres:14-alpine as pg14-builder
 FROM postgres:15-alpine as pg15-builder
 
-FROM alpine:3.16 as tool-builder
+FROM alpine:latest as tool-builder
 
 # Copy the PG binaries
 COPY --from=pg10-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-10/
@@ -155,7 +158,7 @@ COPY --from=pg15-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-15/
 # Assemble everything into the final container.
 #########################################################################
 
-FROM alpine:3.16
+FROM alpine:latest
 
 # Copy in the Python packages
 COPY --from=env-builder /venv /venv

LICENSE

@@ -1,6 +1,6 @@
 pgAdmin 4
 
-Copyright (C) 2013 - 2022, The pgAdmin Development Team
+Copyright (C) 2013 - 2023, 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

@@ -247,6 +247,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
@@ -273,10 +274,15 @@ 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 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
+
+    REM Remove the above commented code once below issue is fixed
+    REM Pining NWjs because of https://github.com/nwjs/nw.js/issues/8039 in 0.74.0
+    SET "NW_VERSION=0.72.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

Makefile

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# Copyright (C) 2013 - 2023, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################
@@ -18,13 +18,19 @@ APP_REVISION := $(shell grep ^APP_REVISION web/config.py | awk -F"=" '{print $$N
 #########################################################################
 
 # Include only platform-independent builds in all
-all: docs pip src runtime
+all: docs pip src
 
 appbundle:
 	./pkg/mac/build.sh
 
 install-node:
-	cd web && yarn install && npm rebuild
+	cd web && yarn install
+
+install-python:
+	./tools/setup-python-env.sh
+
+install-python-testing:
+	./tools/setup-python-env.sh --test
 
 bundle:
 	cd web && yarn run bundle
@@ -76,23 +82,13 @@ check-js: install-node linter
 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
-
 # 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/
 

README.md

@@ -48,7 +48,7 @@ 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:
@@ -74,7 +74,7 @@ simple - adapt as required for your distribution:
    ```
    
 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:
 
    ```bash
@@ -206,6 +206,7 @@ virtual environment. This can be installed with the pip package manager:
 ```bash
 $ source venv/bin/activate
 (venv) $ pip install Sphinx
+(venv) $ pip install sphinxcontrib-youtube
 ```
 
 The docs can then be built using the Makefile in *$PGADMIN4_SRC*, e.g.

docs/en_US/change_password_dialog.rst

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

docs/en_US/change_user_password.rst

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

docs/en_US/cloud_aws_rds.rst

@@ -1,12 +1,12 @@
 .. _cloud_aws_rds:
 
 ******************************************
-`Amazon AWS RDS Cloud Deployment`:index:
+`Amazon RDS Cloud Deployment`:index:
 ******************************************
 
-To deploy a PostgreSQL server on the Amazon AWS cloud, follow the below steps.
+To deploy a PostgreSQL server on the Amazon cloud, follow the below steps.
 
-.. image:: images/cloud_aws_provider.png
+.. image:: images/cloud_provider_for_postgresql.png
     :alt: Cloud Deployment Provider
     :align: center
 
@@ -32,8 +32,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Instance name* field to add an instance name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control
-  too.
+  server; the name specified will be displayed in the *Object Explorer* too.
 
 * Use the *Public IP* field to specify the IP Address range for permitting the
   inbound traffic.
@@ -63,8 +62,8 @@ details.
 Use the fields from the Database Details tab to specify the Instance details.
 
 * Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
-  control within the specified group.
+  node for the server; the server will be displayed in the *Object Explorer*
+  within the specified group.
 
 * Use the *Database name* field to add the database name for the PostgreSQL
   server.

docs/en_US/cloud_azure_database.rst

@@ -1,16 +1,16 @@
-.. _cloud_azure_postgresql:
+.. cloud_azure_database:
 
 ******************************************
-`Azure PostgreSQL Cloud Deployment`:index:
+`Azure Database Cloud Deployment`:index:
 ******************************************
 
-To deploy a PostgreSQL server on the Azure cloud, follow the below steps.
+To deploy a PostgreSQL server on the Azure Database, follow the below steps.
 
-.. image:: images/cloud_azure_provider.png
+.. image:: images/cloud_provider_for_postgresql.png
     :alt: Cloud Deployment
     :align: center
 
-Once you launch the tool, select the Azure PostgreSQL option.
+Once you launch the tool, select the Azure Database option.
 Click on the *Next* button to proceed further.
 
 
@@ -41,7 +41,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Cluster name* field to add a name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control too.
+  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.
@@ -85,8 +85,8 @@ details.
 Use the fields from the Database Details tab to specify the PostgreSQL database details.
 
 * Use the drop-down list in the *pgAdmin server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
-  control within the specified group.
+  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.
@@ -103,7 +103,7 @@ Click on the next button to proceed.
     :align: center
 
 At the end, review the instance details that you provided. Click on Finish
-button to deploy the instance on Azure PostgreSQL.
+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.

docs/en_US/cloud_deployment.rst

@@ -1,11 +1,12 @@
 .. _cloud_deployment:
 
-******************************
-`Cloud Deployment`:index:
-******************************
+*************************************
+`PostgreSQL Cloud Deployment`:index:
+*************************************
 
-A PostgreSQL server can be deployed on the Amazon AWS and EDB BigAnimal
-cloud using this module. In future more cloud options will be available.
+A PostgreSQL server can be deployed on the Amazon, 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
@@ -16,4 +17,5 @@ To launch the *Cloud Deployment...* tool, right click on the *Server Group* or
 
    cloud_aws_rds
    cloud_edb_biganimal
-   cloud_azure_postgresql
+   cloud_azure_database
+   cloud_google_cloud_sql

docs/en_US/cloud_edb_biganimal.rst

@@ -6,7 +6,7 @@
 
 To deploy a PostgreSQL server on the EDB BigAnimal cloud, follow the below steps.
 
-.. image:: images/cloud_biganimal_provider.png
+.. image:: images/cloud_provider_for_postgresql.png
     :alt: Cloud Deployment Provider
     :align: center
 
@@ -23,6 +23,19 @@ 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
@@ -31,8 +44,7 @@ Use the fields from the Instance Specification tab to specify the Instance
 details.
 
 * Use the *Cluster name* field to add a cluster name for the PostgreSQL
-  server; the name specified will be displayed in the *Browser* tree control
-  too.
+  server; the name specified will be displayed in the *Object Explorer* too.
 
 * Use the *Region* field to select the region.
 
@@ -48,8 +60,11 @@ details.
 
 * Use the *Volume type* field to select the instance storage type.
 
-* Use the *Volume properties* field to specify the storage capacity.
+* Use the *Volume properties* field to specify the storage capacity. This field is specific to Azure.
 
+* Use the *Volume size* field to specify the storage size. This field is specific to AWS.
+
+* Use the *Volume IOPS* field to specify the storage IOPS. This field is specific to AWS.
 
 
 .. image:: images/cloud_biganimal_database.png
@@ -59,8 +74,8 @@ details.
 Use the fields from the Database Details tab to specify the Instance details.
 
 * Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
-  control within the specified group.
+  node for the server; the server will be displayed in the *Object Explorer*
+  within the specified group.
 
 * Use the *Database type* field to specify the PostgreSQL
   type, EnterpriseDB PostgreSQL Advanced Server or PostgreSQL.
@@ -72,11 +87,6 @@ Use the fields from the Database Details tab to specify the Instance details.
 
 * Use the *Confirm password* field to repeat the password.
 
-* Use the *High Availability* field to create the cluster with high availability, which creates a cluster
-  with one primary and up to two standby replicas in different availability zones.
-
-* Use the *Number of standby replicas* field to specify the standby replicas.
-
 
 .. image:: images/cloud_biganimal_review.png
     :alt: Cloud Deployment Provider

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

@@ -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

docs/en_US/code_review.rst

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

docs/en_US/coding_standards.rst

@@ -122,7 +122,7 @@ with the required file header is shown below::
     #
     # pgAdmin 4 - PostgreSQL Tools
     #
-    # Copyright (C) 2013 - 2022, The pgAdmin Development Team
+    # Copyright (C) 2013 - 2023, The pgAdmin Development Team
     # This software is released under the PostgreSQL Licence
     #
     ##########################################################################

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/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

docs/en_US/erd_tool.rst

@@ -12,7 +12,7 @@ The Entity-Relationship Diagram (ERD) tool is a database design tool that provid
 * Save the diagram and open it later to continue working on it.
 * Generate ready to run SQL from the database design.
 * Generate the database diagram for an existing database.
-* Drag and drop tables from browser tree to the diagram.
+* Drag and drop tables from object explorer to the diagram.
 
 .. image:: images/erd_tool.png
     :alt: ERD tool window
@@ -135,18 +135,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/import_export_data.rst

@@ -20,7 +20,7 @@ Use the fields in the *General* tab to specify import and export preferences:
   server should import data to a table from a file. The default is *Import*.
 
 * Enter the name of the source or target file in the *Filename* field.
-  Optionally, select the *Browser* icon (ellipsis) to the right to navigate
+  Optionally, select the *Browse* icon (ellipsis) to the right to navigate
   into a directory and select a file.
 
 * Use the drop-down listbox in the *Format* field to specify the file type.

docs/en_US/keyboard_shortcuts.rst

@@ -20,7 +20,7 @@ When using main browser window, the following keyboard shortcuts are available:
    +============================+=======================================================+
    | Shift+Ctrl+a               | Add grid row                                          |
    +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+b                | Browser tree                                          |
+   | Shift+Alt+b                | Object explorer                                       |
    +----------------------------+-------------------------------------------------------+
    | Shift+Alt+n                | Create object                                         |
    +----------------------------+-------------------------------------------------------+
@@ -50,7 +50,7 @@ When using main browser window, the following keyboard shortcuts are available:
    +----------------------------+-------------------------------------------------------+
    | Shift+Ctrl+f               | Quick Search                                          |
    +----------------------------+-------------------------------------------------------+
-   | F5                         | Refresh browser tree                                  |
+   | F5                         | Refresh object explorer                               |
    +----------------------------+-------------------------------------------------------+
    | Shift+Alt+s                | Search objects                                        |
    +----------------------------+-------------------------------------------------------+

docs/en_US/licence.rst

@@ -13,7 +13,7 @@ documentation is attributed to the
 
 .. topic:: pgAdmin 4
 
-    Copyright (C) 2013 - 2022, The pgAdmin Development Team
+    Copyright (C) 2013 - 2023, 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

docs/en_US/oauth2.rst

@@ -28,6 +28,7 @@ and modify the values for the following parameters:
     "OAUTH2_CLIENT_SECRET", "Oauth2 Client Secret"
     "OAUTH2_TOKEN_URL", "Oauth2 Access Token endpoint"
     "OAUTH2_AUTHORIZATION_URL", "Endpoint for user authorization"
+    "OAUTH2_SERVER_METADATA_URL", "Server metadata url for your OAuth2 provider"
     "OAUTH2_API_BASE_URL", "Oauth2 base URL endpoint to make requests simple, ex: *https://api.github.com/*"
     "OAUTH2_USERINFO_ENDPOINT", "User Endpoint, ex: *user* (for github) and *useinfo* (for google)"
     "OAUTH2_SCOPE", "Oauth scope, ex: 'openid email profile'. Note that an 'email' claim is required in the resulting profile."

docs/en_US/preferences.rst

@@ -31,7 +31,7 @@ Use the fields on the *Display* panel to specify general display preferences:
   be automatically expanded if a treeview node is expanded and has only a single
   child.
 
-* Use the *Browser tree state saving interval* field to set the treeview state
+* Use the *Object explorer state saving interval* field to set the treeview state
   saving interval. A value of *-1* will disable the treeview state saving
   functionality.
 
@@ -44,7 +44,7 @@ Use the fields on the *Display* panel to specify general display preferences:
   them to continue.
 
 * When the *Hide shared servers?* switch is set to *True*, the client will hide
-  all the shared servers from the browser tree.
+  all the shared servers from the object explorer.
 
 * Use the *Lock layout* field to lock the UI layout at different levels. This
   can also be changed from File menu on the :ref:`menu bar <menu_bar>`

docs/en_US/processes.rst

@@ -46,4 +46,10 @@ Use the **Stop Process** button to stop the Backup process.
 
 .. 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
+.. |sm_icon| image:: images/sm_icon.png
+
+Watch the demo
+*********************
+.. youtube:: jjP6O_xuHxE
+    :align: center
+    :width: 800

docs/en_US/psql_tool.rst

@@ -7,10 +7,10 @@
 The PSQL tool allows users to connect to PostgreSQL or EDB Advanced server using
 the psql command line interface through their browser.
 
-* Open the PSQL tool from the Tools or browser tree context menu, or use PSQL
-  tool button at the top of the browser tree.
+* Open the PSQL tool from the Tools or object explorer context menu, or use PSQL
+  tool button at the top of the object explorer.
 
-* PSQL will connect to the current connected database from the browser tree.
+* PSQL will connect to the current connected database from the object explorer.
 
 .. image:: images/psql_tool.png
     :alt: PSQL tool window

docs/en_US/query_tool.rst

@@ -7,7 +7,7 @@
 The Query Tool is a powerful, feature-rich environment that allows you to
 execute arbitrary SQL commands and review the result set.  You can access the
 Query Tool via the *Query Tool* menu option on the *Tools* menu, or through the
-context menu of select nodes of the Browser tree control.  The Query Tool
+context menu of select nodes of the Object explorer control.  The Query Tool
 allows you to:
 
 * Issue ad-hoc SQL queries.

docs/en_US/release_notes.rst

@@ -11,6 +11,11 @@ notes for it.
 .. toctree::
    :maxdepth: 1
 
+   release_notes_7_0
+   release_notes_6_21
+   release_notes_6_20
+   release_notes_6_19
+   release_notes_6_18
    release_notes_6_17
    release_notes_6_16
    release_notes_6_15

docs/en_US/release_notes_6_18.rst

@@ -0,0 +1,38 @@
+************
+Version 6.18
+************
+
+Release date: 2022-12-19
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.17.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 10, 11, 12, 13, 14 and 15
+
+**EDB Advanced Server**: 10, 11, 12, 13, 14 and 15
+
+New features
+************
+
+  | `Issue #4088 <https://github.com/pgadmin-org/pgadmin4/issues/4088>`_ -  Enhancements to the ERD when selecting a relationship.
+  | `Issue #5503 <https://github.com/pgadmin-org/pgadmin4/issues/5503>`_ -  Added native menu support in desktop mode.
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+  | `Issue #5453 <https://github.com/pgadmin-org/pgadmin4/issues/5453>`_ -  Fixed an issue where Transaction IDs were not found in session in the Query Tool.
+  | `Issue #5470 <https://github.com/pgadmin-org/pgadmin4/issues/5470>`_ -  Fixed an issue where tablespace was missing on partition tables in SQL.
+  | `Issue #5536 <https://github.com/pgadmin-org/pgadmin4/issues/5536>`_ -  Fixed an issue where properties tab was refreshing on tab change even if the selected node is same.
+  | `Issue #5551 <https://github.com/pgadmin-org/pgadmin4/issues/5551>`_ -  Fixed an issue with auto-complete not working as expected with double quotes.
+  | `Issue #5564 <https://github.com/pgadmin-org/pgadmin4/issues/5564>`_ -  Ensure that table statistics are sorted by size.
+  | `Issue #5598 <https://github.com/pgadmin-org/pgadmin4/issues/5598>`_ -  Fixed an issue while updating server node info removes the clear saved password menu.
+  | `Issue #5603 <https://github.com/pgadmin-org/pgadmin4/issues/5603>`_ -  Fixed an issue where master password was not set correctly with external config database.
+  | `Issue #5606 <https://github.com/pgadmin-org/pgadmin4/issues/5606>`_ -  Fixed an error in the collation create script for PG-15.
+  | `Issue #5629 <https://github.com/pgadmin-org/pgadmin4/issues/5629>`_ -  Fixed BigAnimal authentication aborted issue.
+  | `Issue #5637 <https://github.com/pgadmin-org/pgadmin4/issues/5637>`_ -  Ensure that the BigAnimal displays PG version 11-14 for Oracle compatible databases type.
+  | `Issue #5645 <https://github.com/pgadmin-org/pgadmin4/issues/5645>`_ -  Fixed a typo.

docs/en_US/release_notes_6_19.rst

@@ -0,0 +1,45 @@
+************
+Version 6.19
+************
+
+Release date: 2023-01-17
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.18.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 10, 11, 12, 13, 14 and 15
+
+**EDB Advanced Server**: 10, 11, 12, 13, 14 and 15
+
+New features
+************
+
+  | `Issue #5569 <https://github.com/pgadmin-org/pgadmin4/issues/5569>`_ -  Added support of AWS provider for BigAnimal cloud deployment.
+
+Housekeeping
+************
+
+  | `Issue #5563 <https://github.com/pgadmin-org/pgadmin4/issues/5563>`_ -  Allow YouTube video demo links to be added to appropriate pgAdmin documentation.
+  | `Issue #5615 <https://github.com/pgadmin-org/pgadmin4/issues/5615>`_ -  Rewrite pgAdmin main menu bar to use React.
+
+Bug fixes
+*********
+
+  | `Issue #5487 <https://github.com/pgadmin-org/pgadmin4/issues/5487>`_ -  Fixed an issue where incorrect password used with shared server.
+  | `Issue #5541 <https://github.com/pgadmin-org/pgadmin4/issues/5541>`_ -  Ensure the browser tree does not freeze while rendering 10k+ nodes/objects.
+  | `Issue #5542 <https://github.com/pgadmin-org/pgadmin4/issues/5542>`_ -  Fixed an issue updating the schema node de-select the node in the tree if only one schema is present in the collection node.
+  | `Issue #5559 <https://github.com/pgadmin-org/pgadmin4/issues/5559>`_ -  Fixed tree flickering issue on scroll.
+  | `Issue #5577 <https://github.com/pgadmin-org/pgadmin4/issues/5577>`_ -  Fixed an issue where the default value of string for columns should wrap in quotes in the create script.
+  | `Issue #5586 <https://github.com/pgadmin-org/pgadmin4/issues/5586>`_ -  Fix the webserver and internal authentication setup issue.
+  | `Issue #5613 <https://github.com/pgadmin-org/pgadmin4/issues/5613>`_ -  Ensure the appbundle has correct permissions so that pgAdmin can be accessed by users other than owner.
+  | `Issue #5622 <https://github.com/pgadmin-org/pgadmin4/issues/5622>`_ -  Fixed an issue where the ignore owner flag is not working for some cases in the Schema Diff.
+  | `Issue #5626 <https://github.com/pgadmin-org/pgadmin4/issues/5626>`_ -  Fixed an issue where actions performed on the tree node should update the context menu options.
+  | `Issue #5627 <https://github.com/pgadmin-org/pgadmin4/issues/5627>`_ -  Ensure that the submenus under the trigger's context menu are enabled/disabled correctly.
+  | `Issue #5640 <https://github.com/pgadmin-org/pgadmin4/issues/5640>`_ -  Update boto3 & botocore to the latest version.
+  | `Issue #5641 <https://github.com/pgadmin-org/pgadmin4/issues/5641>`_ -  Fixed an issue where Geometry viewer does not show popup when columns are less than 3.
+  | `Issue #5647 <https://github.com/pgadmin-org/pgadmin4/issues/5647>`_ -  Fixed an issue where row count notification was disappearing automatically.
+  | `Issue #5661 <https://github.com/pgadmin-org/pgadmin4/issues/5661>`_ -  Fix select dropdown border issue.
+  | `Issue #5666 <https://github.com/pgadmin-org/pgadmin4/issues/5666>`_ -  Fixed a missing "jwks_uri" in metadata error that occurred when logging in with an oAuth2 provider like Azure or Google.
+  | `Issue #5675 <https://github.com/pgadmin-org/pgadmin4/issues/5675>`_ -  Fixed an issue where rename panel was losing focus when trying to add name if input box is empty.
+  | `Issue #5734 <https://github.com/pgadmin-org/pgadmin4/issues/5734>`_ -  Ensure that the authenticated users can't access each other's directories and files by providing relative paths.(CVE-2023-0241)

docs/en_US/release_notes_6_20.rst

@@ -0,0 +1,48 @@
+************
+Version 6.20
+************
+
+Release date: 2023-02-09
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.19.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 10, 11, 12, 13, 14 and 15
+
+**EDB Advanced Server**: 10, 11, 12, 13, 14 and 15
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 15.1
+
+
+New features
+************
+
+  | `Issue #4728 <https://github.com/pgadmin-org/pgadmin4/issues/4728>`_ -  Added support for setting PostgreSQL connection parameters.
+
+Housekeeping
+************
+
+  | `Issue #4320 <https://github.com/pgadmin-org/pgadmin4/issues/4320>`_ -  Added bundled PG utilities in the release note.
+  | `Issue #5525 <https://github.com/pgadmin-org/pgadmin4/issues/5525>`_ -  Upgrade Flask-Migrate to 4.x.
+  | `Issue #5723 <https://github.com/pgadmin-org/pgadmin4/issues/5723>`_ -  Improve performance by removing signal-based zoom-in, zoom-out, etc functionality from the runtime environment.
+  | `Issue #5794 <https://github.com/pgadmin-org/pgadmin4/issues/5794>`_ -  Use uplot for Dashboard graphs to reduce CPU usage.
+
+Bug fixes
+*********
+
+  | `Issue #5532 <https://github.com/pgadmin-org/pgadmin4/issues/5532>`_ -  Fixed an issue where the client cert location was not stored on the shared servers.
+  | `Issue #5567 <https://github.com/pgadmin-org/pgadmin4/issues/5567>`_ -  Fix orphan database connections resulting in an inability to connect to databases.
+  | `Issue #5702 <https://github.com/pgadmin-org/pgadmin4/issues/5702>`_ -  Fix an issue where role is used as username for newly added servers when opening query tool.
+  | `Issue #5705 <https://github.com/pgadmin-org/pgadmin4/issues/5705>`_ -  Ensure that all parts of the application recommend and enforce the same length of passwords.
+  | `Issue #5732 <https://github.com/pgadmin-org/pgadmin4/issues/5732>`_ -  Fixed an issue where Kerberos authentication to the server is not imported/exported.
+  | `Issue #5733 <https://github.com/pgadmin-org/pgadmin4/issues/5733>`_ -  Ensure that the system columns should not visible in the import/export data.
+  | `Issue #5746 <https://github.com/pgadmin-org/pgadmin4/issues/5746>`_ -  Increase the length of the value column of the setting table.
+  | `Issue #5748 <https://github.com/pgadmin-org/pgadmin4/issues/5748>`_ -  Fixed console error while attaching the partition.
+  | `Issue #5751 <https://github.com/pgadmin-org/pgadmin4/issues/5751>`_ -  Fix failing import servers CLI due to vulnerability fix.
+  | `Issue #5761 <https://github.com/pgadmin-org/pgadmin4/issues/5761>`_ -  Fix an issue where drag and drop object names is not working.
+  | `Issue #5763 <https://github.com/pgadmin-org/pgadmin4/issues/5763>`_ -  Ensure that keyboard hotkey to open query tool and search object should work properly.
+  | `Issue #5781 <https://github.com/pgadmin-org/pgadmin4/issues/5781>`_ -  Fixed an issue where Query history is not getting loaded with external database.
+  | `Issue #5796 <https://github.com/pgadmin-org/pgadmin4/issues/5796>`_ -  Ensure nested menu items are shown in quick search result.

docs/en_US/release_notes_6_21.rst

@@ -0,0 +1,49 @@
+************
+Version 6.21
+************
+
+Release date: 2023-03-09
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.20.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 10, 11, 12, 13, 14 and 15
+
+**EDB Advanced Server**: 10, 11, 12, 13, 14 and 15
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 15.1
+
+
+New features
+************
+
+  | `Issue #5832 <https://github.com/pgadmin-org/pgadmin4/issues/5832>`_ -  Allow changing cardinality notation in ERD to use Chen notation.
+  | `Issue #5842 <https://github.com/pgadmin-org/pgadmin4/issues/5842>`_ -  Add additional logging for successful logins and user creation.
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+  | `Issue #5269 <https://github.com/pgadmin-org/pgadmin4/issues/5269>`_ -  Ensure that the schema diff tool should pick up the change in the column grants.
+  | `Issue #5685 <https://github.com/pgadmin-org/pgadmin4/issues/5685>`_ -  Ensure that Grant column permission to a view is visible in the SQL tab.
+  | `Issue #5747 <https://github.com/pgadmin-org/pgadmin4/issues/5747>`_ -  Ensure that content on the DDL comparison panel should get refreshed on selecting the object using the up and down arrow keys.
+  | `Issue #5756 <https://github.com/pgadmin-org/pgadmin4/issues/5756>`_ -  Fix for query tool prompting for unsaved changes even if no changes have been made.
+  | `Issue #5758 <https://github.com/pgadmin-org/pgadmin4/issues/5758>`_ -  Fixed an issue where lock layout menu was not in sync with preferences.
+  | `Issue #5760 <https://github.com/pgadmin-org/pgadmin4/issues/5760>`_ -  Fixed an issue where query was not pasted to editor after trojan source warning.
+  | `Issue #5764 <https://github.com/pgadmin-org/pgadmin4/issues/5764>`_ -  Fix an issue where the maintenance dialog for Materialized View gives an error.
+  | `Issue #5773 <https://github.com/pgadmin-org/pgadmin4/issues/5773>`_ -  Fixed an issue where Clear Saved Password should be disabled if the password is already cleared.
+  | `Issue #5790 <https://github.com/pgadmin-org/pgadmin4/issues/5790>`_ -  Fixed an issue where the user can't create trigger AFTER UPDATE OF.
+  | `Issue #5803 <https://github.com/pgadmin-org/pgadmin4/issues/5803>`_ -  Fix an issue where query tool is stripping spaces in grid cell.
+  | `Issue #5810 <https://github.com/pgadmin-org/pgadmin4/issues/5810>`_ -  Fix an issue where sequence owner is remove on sequence edit.
+  | `Issue #5822 <https://github.com/pgadmin-org/pgadmin4/issues/5822>`_ -  Do not allow to save invalid JSON in query tool JSON editor.
+  | `Issue #5847 <https://github.com/pgadmin-org/pgadmin4/issues/5847>`_ -  Fixed an issue where pgAdmin failed to connect when the Postgres password included special characters.
+  | `Issue #5870 <https://github.com/pgadmin-org/pgadmin4/issues/5870>`_ -  Ensure that the database migration does not fail with a NoSuchTableError exception.
+  | `Issue #5872 <https://github.com/pgadmin-org/pgadmin4/issues/5872>`_ -  Handle MERGE operation in query tool explain introduced in PostgreSQL 15.
+  | `Issue #5889 <https://github.com/pgadmin-org/pgadmin4/issues/5889>`_ -  Fixed an issue where the database server is not connected using a service file.
+  | `Issue #5909 <https://github.com/pgadmin-org/pgadmin4/issues/5909>`_ -  Fixed an issue where the file name in the query tool tab was not changing if another file is opened.

docs/en_US/release_notes_7_0.rst

@@ -0,0 +1,73 @@
+***********
+Version 7.0
+***********
+
+Release date: 2023-04-13
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v6.21.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 11, 12, 13, 14 and 15
+
+**EDB Advanced Server**: 11, 12, 13, 14 and 15
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 15.2
+
+
+New features
+************
+
+  | `Issue #3298 <https://github.com/pgadmin-org/pgadmin4/issues/3298>`_ -  Auto expand row edit form when a new row is added for Primary Key, Foreign Key, Unique Constraint and Exclusion Constraint.
+  | `Issue #5014 <https://github.com/pgadmin-org/pgadmin4/issues/5014>`_ -  Added support for mounting shared storage in server mode.
+  | `Issue #5022 <https://github.com/pgadmin-org/pgadmin4/issues/5022>`_ -  Add a note on top of keyboard shortcuts preferences to show the Accesskey of the browser.
+  | `Issue #5750 <https://github.com/pgadmin-org/pgadmin4/issues/5750>`_ -  Added capability to deploy PostgreSQL servers on Google Cloud.
+  | `Issue #5805 <https://github.com/pgadmin-org/pgadmin4/issues/5805>`_ -  Added support of BigAnimal v3 API.
+  | `Issue #5854 <https://github.com/pgadmin-org/pgadmin4/issues/5854>`_ -  On pressing Ctrl+C on a tree object, copy the fully qualified name to clipboard.
+  | `Issue #5855 <https://github.com/pgadmin-org/pgadmin4/issues/5855>`_ -  Added option to create unique constraint with nulls not distinct.
+
+Housekeeping
+************
+
+  | `Issue #4734 <https://github.com/pgadmin-org/pgadmin4/issues/4734>`_ -  Rename the "Properties..." context menu option of the objects to "Edit Object..." and the "Browser" tree to "Object Explorer".
+  | `Issue #5011 <https://github.com/pgadmin-org/pgadmin4/issues/5011>`_ -  Upgrade from psycopg2 to psycopg3.
+  | `Issue #5701 <https://github.com/pgadmin-org/pgadmin4/issues/5701>`_ -  Remove Bootstrap and jQuery usage.
+  | `Issue #5830 <https://github.com/pgadmin-org/pgadmin4/issues/5830>`_ -  Add .ts and .tsx files under linter and fix linter issues.
+  | `Issue #5901 <https://github.com/pgadmin-org/pgadmin4/issues/5901>`_ -  Update SQLAlchemy, Flask, Flask-SQLAlchemy, and other packages to current versions.
+
+Bug fixes
+*********
+
+  | `Issue #4423 <https://github.com/pgadmin-org/pgadmin4/issues/4423>`_ -  Fixed an issue where list of tables is not displayed in a SQL_ASCII database.
+  | `Issue #4784 <https://github.com/pgadmin-org/pgadmin4/issues/4784>`_ -  Handle errors occurring during decoding UTF-8 encoded query result data which contains ascii characters.
+  | `Issue #4884 <https://github.com/pgadmin-org/pgadmin4/issues/4884>`_ -  Fixed an issue where it is not possible to import csv data to tables having columns with german umlauts in their name.
+  | `Issue #4891 <https://github.com/pgadmin-org/pgadmin4/issues/4891>`_ -  Fixed 'rawunicodeescape' codec can't decode issue in a SQL_ASCII database.
+  | `Issue #5504 <https://github.com/pgadmin-org/pgadmin4/issues/5504>`_ -  Fixed an issue where incorrect view of text[] fields in query and table results when use other then UTF8 (win1251) codepage and symbols.
+  | `Issue #5735 <https://github.com/pgadmin-org/pgadmin4/issues/5735>`_ -  Show appropriate error message when master password is not set instead of 'Crypt key missing'.
+  | `Issue #5775 <https://github.com/pgadmin-org/pgadmin4/issues/5775>`_ -  Display the 'No menu available for this object' message if the selected tree node does not have any options.
+  | `Issue #5824 <https://github.com/pgadmin-org/pgadmin4/issues/5824>`_ -  Ensure that the user's storage directory is created when the users are created, as well as for those users whose directories have not yet been created.
+  | `Issue #5833 <https://github.com/pgadmin-org/pgadmin4/issues/5833>`_ -  Fixed an issue where user MFA entry was not getting delete after deleting a user.
+  | `Issue #5834 <https://github.com/pgadmin-org/pgadmin4/issues/5834>`_ -  Fixed issue where pgAgent jobs were not getting dropped from properties tab.
+  | `Issue #5874 <https://github.com/pgadmin-org/pgadmin4/issues/5874>`_ -  Make "using" and "with check" fields a textarea in the RLS policy.
+  | `Issue #5894 <https://github.com/pgadmin-org/pgadmin4/issues/5894>`_ -  Use fetch instead of axios to close connections in SQLEditor, ERD, Schema Diff and Debugger to ensure it completes.
+  | `Issue #5904 <https://github.com/pgadmin-org/pgadmin4/issues/5904>`_ -  Fixed an issue where the count query should not be triggered when the estimated count is less than zero.
+  | `Issue #5907 <https://github.com/pgadmin-org/pgadmin4/issues/5907>`_ -  Validate user inputs provided in configuration files before starting pgadmin server.
+  | `Issue #5916 <https://github.com/pgadmin-org/pgadmin4/issues/5916>`_ -  Fix an issue in search objects where objects were unable to locate occasionally.
+  | `Issue #5919 <https://github.com/pgadmin-org/pgadmin4/issues/5919>`_ -  While restoring the database connections due to lost server connection, ensure that the databases which were previously connected are only reconnected.
+  | `Issue #5921 <https://github.com/pgadmin-org/pgadmin4/issues/5921>`_ -  Ensure that when pasting rows the rows are added right below the selected rows for copying.
+  | `Issue #5929 <https://github.com/pgadmin-org/pgadmin4/issues/5929>`_ -  Dashboard graph Y-axis width should increase with label.
+  | `Issue #5934 <https://github.com/pgadmin-org/pgadmin4/issues/5934>`_ -  Ensure that default values are set only for insert statement if user does not provide any values, in case of updating existing values to blank it should be set to null.
+  | `Issue #5941 <https://github.com/pgadmin-org/pgadmin4/issues/5941>`_ -  Fixed an issue where migration on external database is not working.
+  | `Issue #5943 <https://github.com/pgadmin-org/pgadmin4/issues/5943>`_ -  Use http for SVG namespace URLs which were changed to https for SonarQube fixes.
+  | `Issue #5952 <https://github.com/pgadmin-org/pgadmin4/issues/5952>`_ -  Ensure that the schema diff tool should not allow comparison between Postgres Server and EDB Postgres Advanced Server.
+  | `Issue #5953 <https://github.com/pgadmin-org/pgadmin4/issues/5953>`_ -  Fixed error while executing continue in debugging session after some time of debug execution.
+  | `Issue #5955 <https://github.com/pgadmin-org/pgadmin4/issues/5955>`_ -  Fix an issue where query tool is stuck when running query after discarding changed data.
+  | `Issue #5958 <https://github.com/pgadmin-org/pgadmin4/issues/5958>`_ -  Fix an issue where new dashboard graphs are partially following theme colors.
+  | `Issue #5959 <https://github.com/pgadmin-org/pgadmin4/issues/5959>`_ -  Fix an issue where Backup, Restore, and Maintenance not working if connection timeout is set in the server dialog.
+  | `Issue #6018 <https://github.com/pgadmin-org/pgadmin4/issues/6018>`_ -  Change the foreground color of the code mirror text for Dark Theme.
+  | `Issue #6093 <https://github.com/pgadmin-org/pgadmin4/issues/6093>`_ -  Fix the dependents SQL of Roles which is throwing a type casting error on PostgreSQL 15.
+  | `Issue #6100 <https://github.com/pgadmin-org/pgadmin4/issues/6100>`_ -  Fixed the LDAP authentication issue for the simultaneous login attempts.(CVE-2023-1907)
+  | `Issue #6109 <https://github.com/pgadmin-org/pgadmin4/issues/6109>`_ -  Fixed asyncio random task error messages in Query tool.
+  | `Issue #6122 <https://github.com/pgadmin-org/pgadmin4/issues/6122>`_ -  Fixed CSV export from Query Tool results does not include all columns for multiple CTEs.

docs/en_US/restore_dialog.rst

@@ -30,7 +30,7 @@ restore process:
    * Select *Directory* to restore from a compressed directory-format archive.
 
 * Enter the complete path to the backup file in the *Filename* field.
-  Optionally, select the *Browser* icon (ellipsis) to the right to navigate
+  Optionally, select the *Browse* icon (ellipsis) to the right to navigate
   into a directory and select the file that contains the archive.
 * Use the *Number of Jobs* field to specify if pg_restore should use multiple
   (concurrent) jobs to process the restore.  Each job uses a separate connection

docs/en_US/schema_diff.rst

@@ -54,7 +54,7 @@ The Schema Diff Object Comparison Panel
 
 In the object comparison panel, you can select the source and target servers
 of the same major version, and databases to be compared. You can
-select any server listed under the browser tree whether it is connected or
+select any server listed under the object explorer whether it is connected or
 disconnected. If you select a server that is not connected then it will
 prompt you for the password before using the server.
 

docs/en_US/search_objects.rst

@@ -21,9 +21,9 @@ You can only search for object names currently. Examples are: abc,
 %ab%, ab%c, %%%, etc.
 
 The result is presented in the grid with object name, object type and
-the object tree path in the :ref:`browser <tree_control>`. You can double
+the object path in the :ref:`object explorer <tree_control>`. You can double
 click on a result row to select the object in the
-:ref:`browser <tree_control>`. If the object is greyed out, this means that you
+:ref:`object explorer <tree_control>`. If the object is greyed out, this means that you
 have not enabled those object types in the :ref:`preferences <preferences>`,
 so you can't double click on it. You can click on the ellipsis appended to
 the function and procedure names to see their arguments.
@@ -33,5 +33,5 @@ You can filter based on a particular object type by selecting one from the
 object type dropdown. If the search button is hit when one of the object type
 is selected then only those types will be fetch from the database.
 An object type will not be visible in the dropdown if the database server
-does not support it or if it is not enabled from the 
+does not support it or if it is not enabled from the
 :ref:`preferences <preferences>`.

docs/en_US/server_dialog.rst

@@ -15,10 +15,10 @@ allows connections from the host of the client.
 Use the fields in the *General* tab to identify the server:
 
 * Use the *Name* field to add a descriptive name for the server; the name
-  specified will be displayed in the *Browser* tree control.
+  specified will be displayed in the *Object Explorer*.
 
 * Use the drop-down list box in the *Server group* field to select the parent
-  node for the server; the server will be displayed in the *Browser* tree
+  node for the server; the server will be displayed in the *Object Explorer*
   control within the specified group.
 
 * Use the color-picker in the *Background* field to specify the background
@@ -42,7 +42,7 @@ Use the fields in the *General* tab to identify the server:
     * Change of host, port, and maintenance database
 
   Please note that once the server is shared, it's icon is changed in the
-  browser tree.
+  object explorer.
 
 * Provide a comment about the server in the *Comments* field.
 
@@ -82,17 +82,30 @@ Use the fields in the *Connection* tab to configure a connection:
   see
   `Section 33.16 of the Postgres documentation <https://www.postgresql.org/docs/current/libpq-pgservice.html>`_.
 
-Click the *SSL* tab to continue.
+Click the *Parameters* tab to continue.
 
-.. image:: images/server_ssl.png
+.. image:: images/server_parameters.png
     :alt: Server dialog ssl tab
     :align: center
 
-Use the fields in the *SSL* tab to configure SSL:
+Use the fields in the *Parameters* tab to configure a connection:
 
-* Use the drop-down list box in the *SSL* field to select the type of SSL
-  connection the server should use. For more information about using SSL
-  encryption, see
+Click on the *+* button to add a new parameter. Some of the parameters are:
+
+* *Host address* using this field to specify the host IP address may save time
+  by avoiding a DNS lookup on connection, but it may be useful to specify both
+  a host name and address when using Kerberos, GSSAPI, or SSPI authentication
+  methods, as well as for verify-full SSL certificate verification.
+* *Password File* field to specify the location of a password file
+  (.pgpass). A .pgpass file allows a user to login without providing a password
+  when they connect.  For more information, see
+  `Section 33.15 of the Postgres documentation <https://www.postgresql.org/docs/current/libpq-pgpass.html>`_.
+* *Connection timeout* field to specify the maximum wait for connection,
+  in seconds. Zero or not specified means wait indefinitely. It is not
+  recommended to use a timeout of less than 2 seconds. By default it is set to
+  10 seconds.
+* *SSL mode* field to select the type of SSL connection the server should use.
+  For more information about using SSL encryption, see
   `Section 33.18 of the Postgres documentation <https://www.postgresql.org/docs/current/libpq-ssl.html>`_.
 
 If pgAdmin is installed in Server mode (the default mode), you can use the
@@ -100,27 +113,27 @@ platform-specific File manager dialog to upload files that support SSL
 encryption to the server.  To access the File manager dialog, click the
 icon that is located to the right of each of the following fields.
 
-* Use the *Client certificate* field to specify the file containing the client
+* *Client certificate* field to specify the file containing the client
   SSL certificate.  This file will replace the default
   *~/.postgresql/postgresql.crt* if pgAdmin is installed in Desktop mode, and
   *<STORAGE_DIR>/<USERNAME>/.postgresql/postgresql.crt* if pgAdmin is installed
   in Web mode. This parameter is ignored if an SSL connection is not made.
-* Use the *Client certificate key* field to specify the file containing the
+* *Client certificate key* field to specify the file containing the
   secret key used for the client certificate.  This file will replace the
   default *~/.postgresql/postgresql.key* if pgAdmin is installed in Desktop
   mode, and *<STORAGE_DIR>/<USERNAME>/.postgresql/postgresql.key* if pgAdmin
   is installed in Web mode. This parameter is ignored if an SSL connection is
   not made.
-* Use the *Root certificate* field to specify the file containing the SSL
+* *Root certificate* field to specify the file containing the SSL
   certificate authority.  This file will replace the default
   *~/.postgresql/root.crt*. This parameter is ignored if an SSL connection is
   not made.
-* Use the *Certificate revocation list* field to specify the file containing
+* *Certificate revocation list* field to specify the file containing
   the SSL certificate revocation list.  This list will replace the default list,
   found in *~/.postgresql/root.crl*. This parameter is ignored if an SSL
   connection is not made.
-* When *SSL compression?* is set to *True*, data sent over SSL connections will
-  be compressed.  The default value is *False* (compression is disabled).  This
+* *SSL compression?* is set to *True*, data sent over SSL connections will
+  be compressed.  The default value is *False* (compression is disabled). This
   parameter is ignored if an SSL connection is not made.
 
 .. warning:: In Server mode, certificates, private keys, and the revocation list
@@ -175,20 +188,11 @@ Click the *Advanced* tab to continue.
 
 Use the fields in the *Advanced* tab to configure a connection:
 
-* Specify the IP address of the server host in the *Host address* field. Using
-  this field to specify the host IP address may save time by avoiding a DNS
-  lookup on connection, but it may be useful to specify both a host name and
-  address when using Kerberos, GSSAPI, or SSPI authentication methods, as well
-  as for verify-full SSL certificate verification.
 * Use the *DB restriction* field to provide a SQL restriction that will be used
   against the pg_database table to limit the databases that you see. For
   example, you might enter: *live_db test_db* so that only live_db and test_db
   are shown in the pgAdmin browser. Separate entries with a comma or tab as you
   type.
-* Use the *Password File* field to specify the location of a password file
-  (.pgpass). A .pgpass file allows a user to login without providing a password
-  when they connect.  For more information, see
-  `Section 33.15 of the Postgres documentation <https://www.postgresql.org/docs/current/libpq-pgpass.html>`_.
 * Use the *Password exec command* field to specify a shell command to be executed
   to retrieve a password to be used for SQL authentication. The ``stdout`` of the
   command will be used as the SQL password. This may be useful when the password
@@ -199,10 +203,6 @@ Use the fields in the *Advanced* tab to configure a connection:
   the password will not expire until your pgAdmin session does.
   Zero means the command will be executed for each new connection or reconnection that is made.
   If the generated password is not valid indefinitely, set this value to slightly before it will expire.
-* Use the *Connection timeout* field to specify the maximum wait for connection,
-  in seconds. Zero or not specified means wait indefinitely. It is not
-  recommended to use a timeout of less than 2 seconds. By default it is set to
-  10 seconds.
 
 .. note:: The password file option is only supported when pgAdmin is using libpq
     v10.0 or later to connect to the server.

docs/en_US/storage_manager.rst

@@ -7,6 +7,7 @@
 *Storage Manager* is a feature that helps you manage your systems storage device. You can use *Storage Manager* to:
 
 * Download, upload, or manage operating system files. To use this feature, *pgAdmin* must be running in *Server Mode* on your client machine.
+* The shared storage option allows users to access the shared storages that are shared by admin users.
 * Download *backup* or *export* files (custom, tar and plain text format) on a client machine.
 * Download *export* dump files of tables.
 
@@ -18,6 +19,12 @@ You can access *Storage Manager* from the *Tools* Menu.
 
 Use icons on the top of the *Storage Manager* window to manage storage:
 
+Use the ``Folder`` icon |Shared Storage| to access shared storage. In order to enable shared storage,
+admins need to add the SHARED_STORAGE variable to the config file. Users can access the shared storage
+with this and share files with one another.
+
+.. |Shared Storage| image:: images/sm_ss.png
+
 Use the ``Home`` icon |home| to return to the home directory.
 
 .. |home| image:: images/sm_home.png
@@ -40,6 +47,22 @@ Use the ``New Folder`` icon |folder| to add a new folder.
 
 Use the *Format* drop down list to select the format of the files to be displayed; choose from *sql*, *csv*, or *All Files*.
 
+Shared Storage
+*********************
+.. image:: images/shared_storage.png
+    :alt: Other options
+    :align: center
+
+
+In the storage manager, ``My Storage`` is the pgAdmin user’s storage directory, and other listed directories are shared
+storages set by the pgAdmin server administrator. Using these, pgAdmin users can have common storages to share files.
+pgAdmin server administrator can configure the shared storages using the :ref:`config file <config_py>`. Storages can be
+marked as restricted to give read-only access to non-admin pgAdmin users.
+
+
+.. note:: You must ensure the directories specified are writeable by the user that the web server processes will be running as, e.g. apache or www-data.*
+
+
 Other Options
 *********************
 

docs/en_US/table_dialog.rst

@@ -470,7 +470,7 @@ Use the *Partition* tab to create that partition as a partitioned table.
 * Select a partition type from the *Partition Type* selection box.
 * Use the *Partition Keys* panel to define the partition keys.
 
-View of multi level Partitioned Table in browser tree:
+View of multi level Partitioned Table in object explorer:
 
 .. image:: images/table_partition_tree.png
     :alt: Table dialog partition tree

docs/en_US/tree_control.rst

@@ -8,7 +8,7 @@ The left pane of the main window displays a tree control (the *pgAdmin* tree
 control) that provides access to the objects that reside on a server.
 
 .. image:: /images/main_left_pane.png
-    :alt: Browser tree panel
+    :alt: object explorer panel
     :align: center
 
 You can expand nodes in the tree control to view the database objects that

docs/en_US/user_interface.rst

@@ -22,7 +22,7 @@ Features of pgAdmin 4 include:
 * online help and information about using pgAdmin dialogs and tools.
 
 When pgAdmin opens, the interface features a menu bar and a window divided into
-two panes: the *Browser* tree control in the left pane, and a tabbed browser in
+two panes: the *Object Explorer* tree control in the left pane, and a tabbed browser in
 the right pane.
 
 .. image:: images/welcome.png

pkg/debian/build.sh

@@ -6,7 +6,6 @@ set -e
 # Debugging shizz
 trap 'ERRCODE=$? && if [ ${ERRCODE} -ne 0 ]; then echo "The command \"${BASH_COMMAND}\" failed in \"${FUNCNAME}\" with exit code ${ERRCODE}."; fi' EXIT
 
-OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g')
 OS_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 
 # Stop creating pyc files.
@@ -32,13 +31,25 @@ _copy_code
 echo "Creating the server package..."
 mkdir "${SERVERROOT}/DEBIAN"
 
+echo "Creating preinst script..."
+cat << EOF > "${SERVERROOT}/DEBIAN/preinst"
+#!/bin/sh
+
+rm -rf /usr/pgadmin4/venv
+if [ -d /usr/pgadmin4/web ]; then
+  cd /usr/pgadmin4/web && rm -rf \$(ls -A -I config_local.py)
+fi
+EOF
+
+chmod 755 "${SERVERROOT}/DEBIAN/preinst"
+
 cat << EOF > "${SERVERROOT}/DEBIAN/control"
 Package: ${APP_NAME}-server
 Version: ${APP_LONG_VERSION}
 Architecture: ${OS_ARCH}
 Section: database
 Priority: optional
-Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
+Depends: ${PYTHON_BINARY}, libpq5 (>= 11.0), libgssapi-krb5-2
 Recommends: postgresql-client | postgresql-client-15 | postgresql-client-14 | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
 Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
 Description: The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -122,7 +133,7 @@ fakeroot dpkg-deb --build "${METAROOT}" "${DISTROOT}/${APP_NAME}_${APP_LONG_VERS
 
 # Get the libpq package
 pushd "${DISTROOT}" 1> /dev/null
-apt-get download libpq5
+apt-get download libpq5 libpq-dev
 popd 1> /dev/null
 
 echo "Completed. DEBs created in ${DISTROOT}."

pkg/debian/setup.sh

@@ -33,5 +33,5 @@ apt update
 
 # Install pre-reqs
 echo "Installing build pre-requisites..."
-apt install -y build-essential python3-dev python3-venv python3-sphinx python3-wheel libpq-dev libffi-dev nodejs yarn libkrb5-dev
-
+apt install -y build-essential python3-dev python3-venv python3-sphinx python3-wheel python3-pip libpq-dev libffi-dev nodejs yarn libkrb5-dev
+python3 -m pip install sphinxcontrib-youtube

pkg/linux/build-functions.sh

@@ -18,6 +18,17 @@ _setup_env() {
     if [ -n "${APP_SUFFIX}" ]; then
         APP_LONG_VERSION=${APP_LONG_VERSION}-${APP_SUFFIX}
     fi
+
+    # Setting up the correct Python version for Ubuntu 18 and EL-8, which have
+    # new Python versions installed parallel to the old ones.
+    OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g' | awk -F "." '{ print $1 }')
+    SYSTEM_PYTHON_PATH='/usr/bin/python3'
+    PYTHON_BINARY='python3'
+    if [ "$2" == 'redhat' ] && [ "${OS_VERSION}" == "8" ]; then
+      SYSTEM_PYTHON_PATH='/usr/bin/python3.9'
+      PYTHON_BINARY='python3.9'
+    fi
+    PYTHON_BINARY_WITHOUT_DOTS=$(echo ${PYTHON_BINARY} | sed -e 's/\.//g')
 }
 
 _cleanup() {
@@ -51,16 +62,16 @@ _create_python_virtualenv() {
     cd "usr/${APP_NAME}" || exit
 
     # Create the blank venv
-    python3 -m venv venv
+    "${SYSTEM_PYTHON_PATH}" -m venv venv
     # shellcheck disable=SC1091
-    source venv/bin/activate
+    . venv/bin/activate
 
     # Make sure we have the wheel package present, as well as the latest pip
     pip3 install --upgrade pip
     pip3 install wheel
 
     # Install the requirements
-    pip3 install --no-cache-dir --no-binary psycopg2 -r "${SOURCEDIR}/requirements.txt"
+    pip3 install --no-cache-dir --no-binary psycopg -r "${SOURCEDIR}/requirements.txt"
 
     # Fixup the paths in the venv activation scripts
     sed -i 's/VIRTUAL_ENV=.*/VIRTUAL_ENV="\/usr\/pgadmin4\/venv"/g' venv/bin/activate
@@ -78,11 +89,11 @@ _create_python_virtualenv() {
     PYMODULES_PATH=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
     DIR_PYMODULES_PATH=$(dirname "${PYMODULES_PATH}")
 
-    # Use /usr/bin/python3 here as we want the system path
+    # Use {SYSTEM_PYTHON_PATH} here as we want the system path
     if [ "$1" == "debian" ]; then
-        PYSYSLIB_PATH=$(/usr/bin/python3 -c "import sys; print('%s/lib/python%d.%.d' % (sys.prefix, sys.version_info.major, sys.version_info.minor))")
+        PYSYSLIB_PATH=$("${SYSTEM_PYTHON_PATH}" -c "import sys; print('%s/lib/python%d.%.d' % (sys.prefix, sys.version_info.major, sys.version_info.minor))")
     else
-        PYSYSLIB_PATH=$(/usr/bin/python3 -c "import sys; print('%s/lib64/python%d.%.d' % (sys.prefix, sys.version_info.major, sys.version_info.minor))")
+        PYSYSLIB_PATH=$("${SYSTEM_PYTHON_PATH}" -c "import sys; print('%s/lib64/python%d.%.d' % (sys.prefix, sys.version_info.major, sys.version_info.minor))")
     fi
 
     # Symlink in the rest of the Python libs. This is required because the runtime
@@ -130,7 +141,10 @@ _build_runtime() {
     # YARN END
 
     # WGET:
-    NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    # Remove the above commented code once below issue is fixed
+    # Pining NWjs because of https://github.com/nwjs/nw.js/issues/8039 in 0.74.0
+    NW_VERSION="0.72.0"
 
     pushd "${BUILDROOT}" > /dev/null || exit
         while true;do
@@ -188,13 +202,9 @@ _build_docs() {
     cd "${SERVERROOT}" && mkdir -p "usr/${APP_NAME}/share/docs/en_US/html"
     cd "${SOURCEDIR}/docs/en_US" || exit
     python3 build_code_snippet.py
-    SYS_PYTHONPATH=$(/usr/bin/python3 -c "import sys; print(':'.join([p for p in sys.path if p]))")
+    SYS_PYTHONPATH=$("${SYSTEM_PYTHON_PATH}" -c "import sys; print(':'.join([p for p in sys.path if p]))")
     # shellcheck disable=SC2153
-    if [ "$1" == "redhat" ] && [ "${OS_VERSION}" == "7" ]; then
-            PYTHONPATH=$PYTHONPATH:${SYS_PYTHONPATH} python3 /usr/local/bin/sphinx-build . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
-    else
-        PYTHONPATH=$PYTHONPATH:${SYS_PYTHONPATH} python3 -msphinx . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
-    fi
+    PYTHONPATH=$PYTHONPATH:${SYS_PYTHONPATH} python3 -msphinx . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
 }
 
 _copy_code() {
@@ -230,8 +240,8 @@ _copy_code() {
     # user has configured an alternative default.
     # DO THIS LAST!
     cd "${SERVERROOT}/usr/${APP_NAME}/venv/bin" || exit
-    PYTHON_INTERPRETER=$(/usr/bin/python3 -c "import os, sys; print(os.path.realpath(sys.executable))")
-    PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('%d.%d' % (sys.version_info.major, sys.version_info.minor))")
+    PYTHON_INTERPRETER=$("${SYSTEM_PYTHON_PATH}" -c "import os, sys; print(os.path.realpath(sys.executable))")
+    PYTHON_VERSION=$("${SYSTEM_PYTHON_PATH}" -c "import sys; print('%d.%d' % (sys.version_info.major, sys.version_info.minor))")
     rm python && ln -s python3 python
     rm "python${PYTHON_VERSION}" && ln -s python3 "python${PYTHON_VERSION}"
     rm python3 && ln -s "${PYTHON_INTERPRETER}" python3

pkg/mac/build-functions.sh

@@ -34,7 +34,10 @@ _build_runtime() {
     # YARN END
 
     # WGET:
-    NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
+    # Remove the above commented code once below issue is fixed
+    # Pining NWjs because of https://github.com/nwjs/nw.js/issues/8039 in 0.74.0
+    NW_VERSION="0.72.0"
 
     pushd "${BUILD_ROOT}" > /dev/null || exit
         while true;do
@@ -134,6 +137,7 @@ _build_docs() {
     pip3 install --upgrade pip
     pip3 install -r "${SOURCE_DIR}/requirements.txt"
     pip3 install sphinx
+    pip3 install sphinxcontrib-youtube
 
     cd "${SOURCE_DIR}" || exit
     make docs
@@ -252,8 +256,8 @@ _complete_bundle() {
     sed -i '' "s/%APPVER%/${APP_LONG_VERSION}/g" "${BUNDLE_DIR}/Contents/Info.plist"
     sed -i '' "s/%APPID%/org.pgadmin.pgadmin4/g" "${BUNDLE_DIR}/Contents/Info.plist"
     for FILE in "${BUNDLE_DIR}"/Contents/Resources/*.lproj/InfoPlist.strings; do
-        sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
-        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2023, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2023, The pgAdmin Development Team";/g' "${FILE}"
         echo CFBundleDisplayName = \""${APP_NAME}"\"\; >> "${FILE}"
     done
 
@@ -304,6 +308,10 @@ _complete_bundle() {
 
     # Remove the .pyc files if any
     find "${BUNDLE_DIR}" -name "*.pyc" -print0 | xargs -0 rm -f
+
+    # Update permissions to make sure all users can access installed pgadmin.
+    chmod -R og=u "${BUNDLE_DIR}"
+    chmod -R og-w "${BUNDLE_DIR}"
 }
 
 _codesign_binaries() {

pkg/mac/licence.rtf

@@ -10,7 +10,7 @@
 \fs22 \
 \
 
-\f1\i Copyright (C) 2013 - 2022, The pgAdmin Development Team
+\f1\i Copyright (C) 2013 - 2023, The pgAdmin Development Team
 \f0\i0 \
 \
 Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.\

pkg/pip/build.sh

@@ -4,7 +4,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2022, The pgAdmin Development Team
+# Copyright (C) 2013 - 2023, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 #########################################################################

pkg/pip/setup_pip.py

@@ -2,7 +2,7 @@
 #
 # pgAdmin 4 - PostgreSQL Tools
 #
-# Copyright (C) 2013 - 2022, The pgAdmin Development Team
+# Copyright (C) 2013 - 2023, The pgAdmin Development Team
 # This software is released under the PostgreSQL Licence
 #
 ##########################################################################
@@ -36,11 +36,11 @@ with open(req_file, 'r') as req_lines:
 
 requires = []
 kerberos_extras = []
-# Ensure the Wheel will use psycopg2-binary, not the source distro, and stick
+# Ensure the Wheel will use psycopg-binary, not the source distro, and stick
 # gssapi in it's own list
 for index, req in enumerate(all_requires):
-    if 'psycopg2' in req:
-        req = req.replace('psycopg2', 'psycopg2-binary')
+    if 'psycopg[c]' in req:
+        req = req.replace('psycopg[c]', 'psycopg[binary]')
 
     if 'gssapi' in req:
         kerberos_extras.append(req)
@@ -75,11 +75,11 @@ setup(
         'Development Status :: 5 - Production/Stable',
 
         # Supported programming languages
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10'
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11'
     ],
 
     keywords='pgadmin4,postgresql,postgres',

pkg/redhat/README.md

@@ -5,10 +5,10 @@ Redhat distributions.
 
 ## Supported platforms
 
-* Fedora 34 & 35
-* RHEL 7 & 8
-* CentOS 7
+* Fedora 36 & 37
+* RHEL 8
 * Rocky Linux 8 (x86_64)
+* AlmaLinux/RHEL/Rocky Linux 9 (x86_64)
 
 ## Build configuration
 
@@ -46,11 +46,6 @@ The desktop runtime. Requires the server package.
 The server mode setup script for configuring Apache HTTPD. Requires the server 
 package.
 
-*pgadmin4-python3-mod_wsgi-4.7.1-2.el7.<arch>.rpm*
-
-The Python 3 build of mod_wsgi for the Apache HTTPD server. Only built on 
-RHEL/CentOS 7.
-
 ## Signing Packages
 
 It is good practice to sign RPMs to prove their provenance. The build scripts

pkg/redhat/build.sh

@@ -6,11 +6,10 @@ set -e
 # Debugging shizz
 trap 'ERRCODE=$? && if [ ${ERRCODE} -ne 0 ]; then echo "The command \"${BASH_COMMAND}\" failed in \"${FUNCNAME}\" with exit code ${ERRCODE}."; fi' EXIT
 
-OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g')
 OS_ARCH=$(arch)
 
-# Make sure we get the right libpq
-export PATH=/usr/pgsql-14/bin:$PATH
+# Make sure we get the latest libpq
+export PATH=$(ls -d /usr/pgsql-1* | sort -r | head -1)/bin:$PATH
 
 # Stop creating pyc files.
 export PYTHONDONTWRITEBYTECODE=1
@@ -50,11 +49,6 @@ cat << EOF > "${BUILDROOT}/server.spec"
 # virtualenv, in particular Pillow.libs.
 %global __brp_check_rpaths %{nil}
 
-# Bytecompiling Python 3 doesn't work on RHEL/CentOS 7, so make it a no-op
-%if 0%{?rhel} && 0%{?rhel} == 7
-%define __python /bin/true
-%endif
-
 # Don't strip binaries when packaging them as this might break cpython modules
 %define __strip /bin/true
 
@@ -68,11 +62,17 @@ Summary:	The core server package for pgAdmin.
 License:	PostgreSQL
 URL:		https://www.pgadmin.org/
 
-Requires:	python3, postgresql-libs >= 11, krb5-libs
+Requires:	${PYTHON_BINARY}, libpq5, krb5-libs
 
 %description
 The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
 
+%pre
+rm -rf /usr/pgadmin4/venv
+if [ -d /usr/pgadmin4/web ]; then
+  cd /usr/pgadmin4/web && rm -rf \$(ls -A -I config_local.py)
+fi
+
 %build
 
 %install
@@ -155,11 +155,7 @@ BuildArch:	noarch
 Summary:	The web interface for pgAdmin, hosted under Apache HTTPD.
 License:	PostgreSQL
 URL:		https://www.pgadmin.org/
-%if 0%{?rhel} && 0%{?rhel} == 7
-Requires:	${APP_NAME}-server = ${RPM_VERSION}, httpd, pgadmin4-python3-mod_wsgi
-%else
-Requires:	${APP_NAME}-server = ${RPM_VERSION}, httpd, python3-mod_wsgi
-%endif
+Requires:	${APP_NAME}-server = ${RPM_VERSION}, httpd, ${PYTHON_BINARY_WITHOUT_DOTS}-mod_wsgi
 
 %description
 The web interface for pgAdmin, hosted under Apache HTTPD. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -219,26 +215,13 @@ EOF
 # Build the Redhat package for the meta package
 rpmbuild --define "pga_build_root ${BUILDROOT}" -bb "${BUILDROOT}/meta.spec"
 
-#
-# mod_wsgi for CentOS 7
-#
-if [ "${OS_VERSION}" == 7 ]; then
-    cp "${SOURCEDIR}/pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch" "${HOME}/rpmbuild/SOURCES"
-    cp "${SOURCEDIR}/pkg/redhat/pgadmin4-python3-mod_wsgi.conf" "${HOME}/rpmbuild/SOURCES"
-    curl -o "${HOME}/rpmbuild/SOURCES/mod_wsgi-4.9.0.tar.gz" https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.9.0
-    rpmbuild -bb "${SOURCEDIR}/pkg/redhat/pgadmin4-python-mod_wsgi.spec"
-fi
-
 # Get the libpq we need
-yumdownloader -y --downloadonly --destdir="${DISTROOT}" postgresql14-libs
+yumdownloader -y --downloadonly --destdir="${DISTROOT}" libpq5 libpq5-devel postgresql$(ls -d /usr/pgsql-1* | sort -r | head -1 | awk -F '-' '{ print $2 }')-libs
 
 #
 # Get the results!
 #
 cp "${HOME}/rpmbuild/RPMS/${OS_ARCH}/${APP_NAME}-"*"${RPM_VERSION}-"*".${OS_ARCH}.rpm" "${DISTROOT}/"
 cp "${HOME}/rpmbuild/RPMS/noarch/${APP_NAME}-"*"${RPM_VERSION}-"*".noarch.rpm" "${DISTROOT}/"
-if [ "${OS_VERSION}" == 7 ]; then
-    cp "${HOME}/rpmbuild/RPMS/${OS_ARCH}/pgadmin4-python3-mod_wsgi-4.9.0-1.el7.x86_64.rpm" "${DISTROOT}/"
-fi
 
 echo "Completed. RPMs created in ${DISTROOT}."

pkg/redhat/pgadmin4-python-mod_wsgi.spec

@@ -1,71 +0,0 @@
-%global sname mod_wsgi
-
-%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
-
-%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}}
-%{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
-# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
-%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
-%{!?_httpd_moddir: %{expand: %%global _httpd_moddir    %%{_libdir}/httpd/modules}}
-
-%global debug_package %{nil}
-
-Name:		pgadmin4-python3-%{sname}
-Version:	4.9.0
-Release:	1%{?dist}
-Summary:	A WSGI interface for Python web applications in Apache (customized for pgAdmin4)
-License:	ASL 2.0
-URL:		https://modwsgi.readthedocs.io/
-Source0:	https://github.com/GrahamDumpleton/%{sname}/archive/%{version}.tar.gz#/mod_wsgi-%{version}.tar.gz
-Source2:	%{name}.conf
-Patch1:		%{name}-exports.patch
-
-Requires:	httpd-mmn = %{_httpd_mmn}
-BuildRequires:	python3-devel
-BuildRequires:	httpd-devel
-BuildRequires:	gcc
-
-# Suppress auto-provides for module DSO
-%{?filter_provides_in: %filter_provides_in %{_httpd_moddir}/.*\.so$}
-%{?filter_setup}
-
-%global _description\
-The mod_wsgi adapter is an Apache module that provides a WSGI compliant\
-interface for hosting Python based web applications within Apache. The\
-adapter is written completely in C code against the Apache C runtime and\
-for hosting WSGI applications within Apache has a lower overhead than using\
-existing WSGI adapters for mod_python or CGI.\
-
-%description %_description
-
-%prep
-%autosetup -p1 -n %{sname}-%{version}
-
-%build
-export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}"
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-
-%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python3
-%{__make} %{?_smp_mflags}
-%{_bindir}/python3 setup.py build
-
-%install
-%{__make} install DESTDIR=%{buildroot} LIBEXECDIR=%{_httpd_moddir}
-%{__install} -d -m 755 %{buildroot}%{_httpd_modconfdir}
-%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_httpd_modconfdir}/10-pgadmin4-python3-mod_wsgi.conf
-%{_bindir}/python3 setup.py install -O1 --skip-build --root %{buildroot}
-%{__mv} %{buildroot}%{_httpd_moddir}/mod_wsgi.so %{buildroot}%{_httpd_moddir}/pgadmin4-python3-mod_wsgi.so
-%{__mv} %{buildroot}%{_bindir}/mod_wsgi-express %{buildroot}%{_bindir}/pgadmin4-mod_wsgi-express-3
-
-%files
-%license LICENSE
-%doc CREDITS.rst README.rst
-%config(noreplace) %{_httpd_modconfdir}/*pgadmin4-python3-mod_wsgi.conf
-%{_httpd_moddir}/pgadmin4-python3-mod_wsgi.so
-%{python3_sitearch}/mod_wsgi-*.egg-info
-%{python3_sitearch}/mod_wsgi
-%{_bindir}/pgadmin4-mod_wsgi-express-3
-
-%changelog
-* Fri Mar 6 2020 Devrim Gündüz <devrim@gunduz.org> - 4.6.8-2
-- Initial packaging for the PostgreSQL YUM repository

pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch

@@ -1,11 +0,0 @@
---- mod_wsgi-4.5.20/Makefile.in.exports
-+++ mod_wsgi-4.5.20/Makefile.in
-@@ -28,7 +28,7 @@
- all : src/server/mod_wsgi.la
- 
- src/server/mod_wsgi.la : $(SRCFILES)
--	$(APXS) -c $(CPPFLAGS) $(CFLAGS) $(SRCFILES) $(LDFLAGS) $(LDLIBS)
-+	$(APXS) -Wl,-export-symbols-regex -Wl,wsgi_module -c $(CPPFLAGS) $(CFLAGS) $(SRCFILES) $(LDFLAGS) $(LDLIBS)
- 
- $(DESTDIR)$(LIBEXECDIR) :
- 	mkdir -p $@

pkg/redhat/pgadmin4-python3-mod_wsgi.conf

@@ -1,4 +0,0 @@
-<IfModule !wsgi_module>
-    LoadModule wsgi_module modules/pgadmin4-python3-mod_wsgi.so
-</IfModule>
-

pkg/redhat/setup.sh

@@ -8,18 +8,18 @@ fi
 OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g' | awk -F "." '{ print $1 }')
 
 # EPEL & other repos
-if [ "${OS_VERSION}" != 9 ]; then
+if [ "${OS_VERSION}" != "9" ]; then
     yum -y install centos-release-scl
 fi
 
 yum install -y "https://dl.fedoraproject.org/pub/epel/epel-release-latest-${OS_VERSION}.noarch.rpm"
-if [ "${OS_VERSION}" == 8 ] || [ "${OS_VERSION}" == 9 ]; then
+if [ "${OS_VERSION}" == "8" ] || [ "${OS_VERSION}" == "9" ]; then
     yum config-manager --enable PowerTools AppStream BaseOS "*epel"
     dnf -qy module disable postgresql
 fi
 
 # PostgreSQL repo
-if [ "${OS_VERSION}" == 7 ] || [ "${OS_VERSION}" == 8 ] || [ "${OS_VERSION}" == 9 ]; then
+if [ "${OS_VERSION}" == "8" ] || [ "${OS_VERSION}" == "9" ]; then
     yum install -y "https://download.postgresql.org/pub/repos/yum/reporpms/EL-${OS_VERSION}-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
 else
     yum install -y "https://download.postgresql.org/pub/repos/yum/reporpms/F-${OS_VERSION}-x86_64/pgdg-fedora-repo-latest.noarch.rpm"
@@ -37,32 +37,23 @@ curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | sudo tee /etc/yu
 echo "Installing build pre-requisites..."
 yum groupinstall -y "Development Tools"
 
-if [ "${OS_VERSION}" == 7 ]; then
-    yum install -y expect fakeroot httpd-devel postgresql14-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
-    pip3 install sphinx
-elif [ "${OS_VERSION}" == 9 ]; then
-    yum install -y expect postgresql14-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
+if [ "${OS_VERSION}" == "8" ]; then
+    yum install -y expect fakeroot postgresql15-devel python3.9-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
+    pip3.9 install sphinx
+    pip3.9 install sphinxcontrib-youtube
+elif [ "${OS_VERSION}" == "9" ]; then
+    yum install -y expect libpq5-devel postgresql15-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
     pip3 install sphinx
+    pip3 install sphinxcontrib-youtube
 else
-    yum install -y expect fakeroot postgresql14-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
+    yum install -y expect fakeroot postgresql15-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
     pip3 install sphinx
+    pip3 install sphinxcontrib-youtube
 fi
 
 # Setup RPM macros for signing
 echo "Please add the following macros to ~/.rpmmacros for the user that will sign the RPMs if required:"
 echo
-if [ "${OS_VERSION}" == 7 ]; then
-    cat << EOF
-# Macros for signing RPMs.
-
-%_signature gpg
-%_gpg_path ~/.gnupg
-%_gpg_name Package Manager
-%_gpgbin /usr/bin/gpg2
-%__gpg_sign_cmd %{__gpg} gpg --force-v3-sigs --batch --verbose --no-armor --passphrase-fd 3 --no-secmem-warning -u "%{_gpg_name}" -sbo %{__
-signature_filename} --digest-algo sha256 %{__plaintext_filename}
-EOF
-else
     cat << EOF
 # Macros for signing RPMs.
 
@@ -73,6 +64,5 @@ else
 %__gpg_sign_cmd %{__gpg} gpg --force-v3-sigs --batch --verbose --no-armor --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename
 } --digest-algo sha256 %{__plaintext_filename}
 EOF
-fi
 
 echo