Fixed a security issue where the OAuth2 client ID and secret exposed through the web browser (CVE-2024-9014). #7945

Fixed the dynamic column updation in the Unique & Primary Keys while creating a table.
* Updated the columns for the unique and primary keys while creating a table. Use the 'editable' option for a Cell instead of 'disabled'. * Don't need to define the hidden member as fields in GridHeaderSchema * Updated the columns for the exclusion constraints while creating a table. * Signaled the relevant field, when column options have changed, for all the children of a table. * Use current snapshot of data for the GrigFormHeadeer * Fixed the styling for the search input box * Don't check for the 'colOptions.editable' flag, as it could be indirect call as well.
2026-10-27 15:10:05 -05:00 · 2024-09-20 08:45:37 +05:30 · 2024-09-19 18:57:09 +05:30 · 2024-09-19 18:54:38 +05:30 · 2024-09-19 14:03:43 +05:30 · 2024-09-19 10:51:06 +05:30
752 changed files with 72553 additions and 53420 deletions
@@ -1,4 +1,3 @@
-.git
 web/node_modules
 web/*.log
 web/regression
@@ -18,6 +18,11 @@ jobs:

    steps:
      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2

      - name: Build the container
-        run: docker build .
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          context: .
@@ -44,6 +44,7 @@ jobs:
        if: ${{ matrix.os == 'macos-latest' }}
        run: |
          brew install postgresql@${{ matrix.pgver }}
+          echo "/opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin" >> $GITHUB_PATH

      - name: Uninstall PostgreSQL if already present
        if: ${{ matrix.os == 'windows-latest' }}
@@ -75,7 +76,7 @@ jobs:
      - name: Create the tablespace directory on macOS
        if: ${{ matrix.os == 'macos-latest' }}
        run: |
-          mkdir -p /usr/local/var/tablespaces/${{ matrix.pgver }}
+          mkdir -p /opt/homebrew/var/tablespaces/${{ matrix.pgver }}

      - name: Create the tablespace directory on Windows
        if: ${{ matrix.os == 'windows-latest' }}
@@ -103,11 +104,11 @@ jobs:
      - name: Start PostgreSQL on macOS
        if: ${{ matrix.os == 'macos-latest' }}
        run: |
-          echo local all all trust > /usr/local/var/postgresql@${{ matrix.pgver }}/pg_hba.conf
-          sed -i '' "s/#port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /usr/local/var/postgresql@${{ matrix.pgver }}/postgresql.conf
+          echo local all all trust > /opt/homebrew/var/postgresql@${{ matrix.pgver }}/pg_hba.conf
+          sed -i '' "s/#port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /opt/homebrew/var/postgresql@${{ matrix.pgver }}/postgresql.conf
          brew services restart postgresql@${{ matrix.pgver }}
          
-          until /usr/local/opt/postgresql@${{ matrix.pgver }}/bin/pg_isready -p 59${{ matrix.pgver }} 2>/dev/null; do
+          until /opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin/pg_isready -p 59${{ matrix.pgver }} 2>/dev/null; do
            >&2 echo "Postgres is unavailable - sleeping for 2 seconds"
            sleep 2
          done
@@ -185,10 +186,10 @@ jobs:
                "db_port": 59${{ matrix.pgver }},
                "maintenance_db": "postgres",
                "sslmode": "prefer",
-                "tablespace_path": "${{ matrix.os == 'macos-latest' && format('/usr/local/var/tablespaces/{0}', matrix.pgver) || format('/var/lib/postgresql/tablespaces/{0}', matrix.pgver) }}",
+                "tablespace_path": "${{ matrix.os == 'macos-latest' && format('/opt/homebrew/var/tablespaces/{0}', matrix.pgver) || format('/var/lib/postgresql/tablespaces/{0}', matrix.pgver) }}",
                "enabled": true,
                "default_binary_paths": {
-                  "pg": "${{ matrix.os == 'macos-latest' && format('/usr/local/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
+                  "pg": "${{ matrix.os == 'macos-latest' && format('/opt/homebrew/opt/postgresql@{0}/bin', matrix.pgver) || format('/usr/lib/postgresql/{0}/bin', matrix.pgver) }}",
                  "ppas": ""
                }
              }
@@ -9,6 +9,7 @@
 .DS_Store
 .idea
 .vscode
+.sonarlint
 .yarn
 /*.diff
 /*.patch
@@ -38,6 +39,7 @@ runtime/pgAdmin4.app/
 runtime/pgAdmin4.pro.user*
 runtime/pgAdmin4_resource.rc
 runtime/release/
+runtime/dev_config.json
 runtime/ui_BrowserWindow.h
 web/config_local.py
 web/pgadmin/misc/themes/pgadmin.themes.json
@@ -48,6 +50,7 @@ node_modules/
 web/pgAdmin/static/js/generated
 web/pgadmin/static/js/generated
 web/yarn-error.log
+web/commit_hash
 /web/cacert.pem
 auditjs.html
 auditpy.txt
@@ -31,6 +31,7 @@ RUN apk add --no-cache \
    yarn \
    zlib-dev

+COPY .git .git
 # Create the /pgadmin4 directory and copy the source into it. Explicitly
 # remove the node_modules directory as we'll recreate a clean version, as well
 # as various other files we don't want
@@ -46,6 +47,8 @@ WORKDIR /pgadmin4/web

 # Build the JS vendor code in the app-builder, and then remove the vendor source.
 RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
+    npm install -g corepack && \
+    corepack enable && \
    yarn set version berry && \
    yarn set version 3 && \
    yarn install && \
@@ -58,7 +61,8 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
           webpack.* \
           jest.config.js \
           babel.* \
-           ./pgadmin/static/js/generated/.cache
+           ./pgadmin/static/js/generated/.cache \
+           /pgadmin4/.git

 #########################################################################
 # Next, create the base environment for Python
@@ -68,7 +72,7 @@ FROM alpine:latest AS env-builder

 # Install dependencies
 COPY requirements.txt /
-RUN     apk add --no-cache \
+RUN apk add --no-cache \
        make \
        python3 \
        py3-pip && \
@@ -162,12 +166,12 @@ COPY --from=env-builder /venv /venv
 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
 COPY --from=pg16-builder /usr/local/lib/libpq.so.5.16 /usr/lib/
-COPY --from=pg16-builder /usr/lib/libzstd.so.1.5.5 /usr/lib/
+COPY --from=pg16-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
 COPY --from=pg16-builder /usr/lib/liblz4.so.1.9.4 /usr/lib/

 RUN ln -s libpq.so.5.16 /usr/lib/libpq.so.5 && \
    ln -s libpq.so.5.16 /usr/lib/libpq.so && \
-    ln -s libzstd.so.1.5.5 /usr/lib/libzstd.so.1 && \
+    ln -s libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
    ln -s liblz4.so.1.9.4 /usr/lib/liblz4.so.1

 WORKDIR /pgadmin4
@@ -185,7 +189,7 @@ COPY LICENSE /pgadmin4/LICENSE
 COPY DEPENDENCIES /pgadmin4/DEPENDENCIES

 # Install runtime dependencies and configure everything in one RUN step
-RUN apk add \
+RUN apk add --no-cache \
        python3 \
        py3-pip \
        postfix \
@@ -197,7 +201,7 @@ RUN apk add \
        libedit \
        libldap \
        libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==20.1.0 && \
+    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==22.0.0 && \
    find / -type d -name '__pycache__' -exec rm -rf {} + && \
    useradd -r -u 5050 -g root -s /sbin/nologin pgadmin && \
    mkdir -p /run/pgadmin /var/lib/pgadmin && \
@@ -207,7 +211,7 @@ RUN apk add \
    chown pgadmin:root /pgadmin4/config_distro.py && \
    chmod g=u /pgadmin4/config_distro.py && \
    chmod g=u /etc/passwd && \
-    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.11 && \
+    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.12 && \
    echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
    echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix

@@ -217,6 +217,8 @@ REM Main build sequence Ends

    ECHO Installing javascript dependencies...
    CD "%BUILDROOT%\web"
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version 3 || EXIT /B 1
    CALL yarn install || EXIT /B 1
    CALL npm rebuild || EXIT /B 1

@@ -231,6 +233,8 @@ REM Main build sequence Ends
    RD /Q /S "%BUILDROOT%\web\regression" 1> nul 2>&1
    ECHO Removing tools...
    RD /Q /S "%BUILDROOT%\web\tools" 1> nul 2>&1
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\web\.yarn" 1> nul 2>&1
    ECHO Removing any existing configurations...
    DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
    DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1
@@ -260,45 +264,51 @@ REM Main build sequence Ends
    RD /Q /S "%BUILDROOT%\docs\en_US\html\_sources" 1> nul 2>&1

    ECHO Staging runtime components...
-    XCOPY /S /I /E /H /Y "%WD%\runtime\assets" "%BUILDROOT%\runtime\assets" > nul || EXIT /B 1
-    XCOPY /S /I /E /H /Y "%WD%\runtime\src" "%BUILDROOT%\runtime\src" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\runtime\resources\app"
+    XCOPY /S /I /E /H /Y "%WD%\runtime\assets" "%BUILDROOT%\runtime\resources\app\assets" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%WD%\runtime\src" "%BUILDROOT%\runtime\resources\app\src" > nul || EXIT /B 1

-    COPY "%WD%\runtime\package.json" "%BUILDROOT%\runtime\" > nul || EXIT /B 1
-    CD "%BUILDROOT%\runtime\"
-    CALL yarn install --production=true || EXIT /B 1
+    COPY "%WD%\runtime\package.json" "%BUILDROOT%\runtime\resources\app\" > nul || EXIT /B 1
+    COPY "%WD%\runtime\.yarnrc.yml" "%BUILDROOT%\runtime\resources\app\" > nul || EXIT /B 1

-    ECHO Downloading NWjs to %TMPDIR%...
-    REM Get a fresh copy of nwjs.
-    REM NOTE: The nw download servers seem to be very unreliable, so at the moment we're using wget which retries
+    CD "%BUILDROOT%\runtime\resources\app\"

-    REM YARN
-    REM CALL yarn --cwd "%TMPDIR%" add nw || EXIT /B
-    REM YARN END
+    CALL yarn set version berry || EXIT /B 1
+    CALL yarn set version 3 || EXIT /B 1
+    CALL yarn plugin import workspace-tools || EXIT /B 1
+    CALL yarn workspaces focus --production || EXIT /B 1
+
+    ECHO Removing yarn cache...
+    RD /Q /S "%BUILDROOT%\runtime\resources\app\.yarn" 1> nul 2>&1
+
+    ECHO Downloading Electron to %TMPDIR%...
+    REM Get a fresh copy of electron.

    REM WGET
-    REM Comment out the below line as the latest version having some
-    REM problem https://github.com/nwjs/nw.js/issues/7964, so for the time being
-    REM hardcoded the version to 0.77.0
-    REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
-    REM :GET_NW
-    REM    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
-    REM    IF %ERRORLEVEL% NEQ 0 GOTO GET_NW
+    FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
+    :GET_NW
+        wget https://github.com/electron/electron/releases/download/v%ELECTRON_VERSION%/electron-v%ELECTRON_VERSION%-win32-x64.zip -O "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip"
+        IF %ERRORLEVEL% NEQ 0 GOTO GET_NW

-    SET "NW_VERSION=0.77.0"
-    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
-
-    tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1
+    MKDIR "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64" || EXIT /B 1
+    tar -C "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64" -xvf "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64.zip" || EXIT /B 1
    REM WGET END

-    REM YARN
-    REM XCOPY /S /I /E /H /Y "%TMPDIR%\node_modules\nw\nwjs\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    REM YARN END
+    REM XCOPY
+    XCOPY /S /I /E /H /Y "%TMPDIR%\electron-v%ELECTRON_VERSION%-win32-x64\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    REM XCOPY END

-    REM WGET
-    XCOPY /S /I /E /H /Y "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64\*" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    REM WGET END
+    MOVE "%BUILDROOT%\runtime\electron.exe" "%BUILDROOT%\runtime\pgAdmin4.exe"
+
+    ECHO Downloading rcedit.exe...
+    wget https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe -O "%TMPDIR%\rcedit-x64.exe"
+
+    ECHO Replacing executable icon, description, version...
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-icon "%WD%\pkg\win32\Resources\pgAdmin4.ico"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-version-string "FileDescription" "%APP_NAME%"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-version-string "ProductName" "%APP_NAME%"
+    %TMPDIR%\rcedit-x64.exe "%BUILDROOT%\runtime\pgAdmin4.exe" --set-product-version "%APP_VERSION%""

-    MOVE "%BUILDROOT%\runtime\nw.exe" "%BUILDROOT%\runtime\pgAdmin4.exe"
    ECHO Attempting to sign the pgAdmin4.exe...
    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%BUILDROOT%\runtime\pgAdmin4.exe"
    IF %ERRORLEVEL% NEQ 0 (
@@ -309,17 +319,13 @@ REM Main build sequence Ends
        PAUSE
    )

-    ECHO Replacing executable icon...
-    CALL yarn --cwd "%TMPDIR%" add winresourcer || EXIT /B
-    "%TMPDIR%\node_modules\winresourcer\bin\Resourcer.exe" -op:upd -src:"%BUILDROOT%\runtime\pgAdmin4.exe" -type:Icongroup -name:IDR_MAINFRAME -file:"%WD%\pkg\win32\Resources\pgAdmin4.ico"
-
    ECHO Staging PostgreSQL components...
    COPY "%PGADMIN_POSTGRES_DIR%\bin\libpq.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" "%BUILDROOT%\runtime" > nul
    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" "%BUILDROOT%\runtime" > nul
-    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dump.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dumpall.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1L%
    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_restore.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
@@ -366,6 +372,8 @@ REM Main build sequence Ends
    ECHO Generating SBOM...
    CALL syft "%BUILDROOT%" -o cyclonedx-json > "%BUILDROOT%\sbom.json"

+    EXIT /B 0
+
 :SIGN_INSTALLER
    ECHO Attempting to sign the installer...
    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /tr http://timestamp.digicert.com "%DISTROOT%\%INSTALLERNAME%"
@@ -118,6 +118,7 @@ debian:

 docker:
 	echo $(APP_NAME)
+	git checkout HEAD
 	docker build --pull -t ${APP_NAME} -t $(APP_NAME):latest -t $(APP_NAME):$(APP_RELEASE) -t $(APP_NAME):$(APP_RELEASE).$(APP_REVISION) .

 docs:
@@ -14,7 +14,7 @@ and ReactJS, HTML5 with CSS for the client side processing and UI.

 Although developed using web technologies, pgAdmin 4 can be deployed either on
 a web server using a browser, or standalone on a workstation. The runtime/
-subdirectory contains an NWjs based runtime application intended to allow this,
+subdirectory contains an Electron based runtime application intended to allow this,
 which will execute the Python server and display the UI.

 ## Building the Runtime
@@ -35,13 +35,7 @@ paths it would expect to find in the standard package for your platform.
 You can then execute the runtime by running something like:

 ```bash
-node_modules/nw/nwjs/nw .
-```
-
-or on macOS:
-
-```bash
-node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
+yarn run start
 ```

 # Configuring the Python Environment
@@ -8,6 +8,7 @@ Use *Clear Saved Password* functionality to clear the saved password for the
 database server.

 .. image:: images/clear_saved_password.png
+    :alt: Clear saved password
    :align: center

 *Clear Saved Password* shows in the context menu for the selected server as well
@@ -17,6 +18,7 @@ Use *Clear SSH Tunnel Password* functionality to clear the saved password of SSH
 Tunnel to connect to the database server.

 .. image:: images/clear_tunnel_password.png
+    :alt: Clear SSH tunnel password
    :align: center

 *Clear SSH Tunnel Password* shows in the context menu for the selected server as
@@ -7,12 +7,12 @@
 The bulk of pgAdmin is a Python web application written using the Flask framework
 on the backend, and HTML5 with CSS3,ReactJS on the front end. A
 desktop runtime is also included for users that prefer a desktop application to
-a web application, which is written using NWjs (Node Webkit).
+a web application, which is written using Electron.

 Runtime
 *******

-The runtime is based on NWjs which integrates a browser and the Python server
+The runtime is based on Electron which integrates a browser and the Python server
 creating a standalone application. The source code can be found in the
 **/runtime** directory in the source tree.

@@ -11,6 +11,7 @@ and select *Connect Server...* from the context menu.

 .. image:: images/connect_to_server.png
    :alt: Connect to server dialog
+    :align: center

 Provide authentication information for the selected server:

@@ -26,6 +27,7 @@ Tunnel and Database server passwords if not already saved.

 .. image:: images/connect_to_tunneled_server.png
    :alt: Connect to server dialog
+    :align: center

 Provide authentication information for the selected server:

@@ -61,6 +61,7 @@ values required by the program:

 .. image:: images/debug_params.png
    :alt: Debugger parameter dialog
+    :align: center

 Use the fields on the *Debugger* dialog to provide a value for each parameter:

@@ -100,25 +101,29 @@ The toolbar options are:
    :alt: Debugger navigation toolbar
    :align: center

-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| Option                  | Action                                                                                                    |
-+=========================+===========================================================================================================+
-| *Step into*             | Click the *Step into* icon to execute the currently highlighted line of code.                             |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Step over*             | Click the *Step over* icon to execute a line of code, stepping over any sub-functions invoked by the code.|
-|                         | The sub-function executes, but is not debugged unless it contains a breakpoint.                           |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Continue/Start*        | Click the *Continue/Start* icon to execute the highlighted code, and continue until the program           |
-|                         | encounters a breakpoint or completes.                                                                     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Toggle breakpoint*     | Use the *Toggle breakpoint* icon to enable or disable a breakpoint (without removing the breakpoint).     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Clear all breakpoints* | Click the *Clear all breakpoints* icon to remove all breakpoints from the program.                        |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Stop*                  | Click the *Stop* icon to halt the execution of a program.                                                 |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
-| *Help*                  | Click the *Help* icon to open debugger documentation.                                                     |
-+-------------------------+-----------------------------------------------------------------------------------------------------------+
+.. table::
+    :class: longtable
+    :widths: 1 4 1
+
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | Option                  | Action                                                                                                    | Shortcut               |
+    +=========================+===========================================================================================================+========================+
+    | *Step into*             | Click the *Step into* icon to execute the currently highlighted line of code.                             | Option/Alt + Shift + I |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Step over*             | Click the *Step over* icon to execute a line of code, stepping over any sub-functions invoked by the code.| Option/Alt + Shift + O |
+    |                         | The sub-function executes, but is not debugged unless it contains a breakpoint.                           |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Continue/Start*        | Click the *Continue/Start* icon to execute the highlighted code, and continue until the program           | Option/Alt + Shift + C |
+    |                         | encounters a breakpoint or completes.                                                                     |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Toggle breakpoint*     | Use the *Toggle breakpoint* icon to enable or disable a breakpoint (without removing the breakpoint).     | Option/Alt + Shift + T |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Clear all breakpoints* | Click the *Clear all breakpoints* icon to remove all breakpoints from the program.                        | Option/Alt + Shift + X |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Stop*                  | Click the *Stop* icon to halt the execution of a program.                                                 | Option/Alt + Shift + S |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+
+    | *Help*                  | Click the *Help* icon to open debugger documentation.                                                     |                        |
+    +-------------------------+-----------------------------------------------------------------------------------------------------------+------------------------+

 The top panel of the debugger window displays the program body; click in the
 grey margin next to a line number to add a breakpoint.  The highlighted line in
@@ -36,7 +36,7 @@ See :ref:`config_py` for more information on configuration settings.
 Desktop Runtime Standalone Application
 ======================================

-The Desktop Runtime is based on `NWjs <https://nwjs.io/>`_ which integrates a
+The Desktop Runtime is based on `Electron <https://www.electronjs.org/>`_ which integrates a
 browser and the Python server creating a standalone application.

 .. image:: images/runtime_standalone.png
@@ -48,9 +48,9 @@ File Options
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Icon                 | Behavior                                                                                          | Shortcut       |
   +======================+===================================================================================================+================+
-   | *Open File*          | Click the *Open File* icon to load a previously saved diagram.                                    | Ctrl + O       |
+   | *Open File*          | Click the *Open File* icon to load a previously saved diagram.                                    | Cmd/Ctrl + O   |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Save*               | Click the *Save* icon to perform a quick-save of a previously saved diagram, or to save the       | Ctrl + S       |
+   | *Save*               | Click the *Save* icon to perform a quick-save of a previously saved diagram, or to save the       | Cmd/Ctrl + S   |
   |                      | diagram to a file.                                                                                |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | *Save as*            | Click the *Save As* to open a new browser dialog and specify a new location to save the diagram.  | Ctrl + Shift + |
@@ -67,13 +67,13 @@ Export Options
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Icon                 | Behavior                                                                                          | Shortcut       |
   +======================+===================================================================================================+================+
-   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option + Ctrl +|
-   |                      | with the generated SQL ready for execution.                                                       | S              |
+   | *Generate SQL*       | Click the *Generate SQL* icon to generate the DDL SQL for the diagram and open a query tool       | Option/Alt +   |
+   |                      | with the generated SQL ready for execution.                                                       | Ctrl + S       |
   |                      | You can select the option *With DROP Table* if you wish to have DROP Table DDL statements before  |                |
   |                      | each CREATE Table DDL. You can see the option by clicking the down arrow beside the SQL button.   |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option + Ctrl +|
-   |                      |                                                                                                   | I              |
+   | *Download image*     | Click the *Download image* icon to save the ERD diagram in a image formate                        | Option/Alt +   |
+   |                      |                                                                                                   | Ctrl + I       |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+

 Editing Options
@@ -13,47 +13,47 @@ When using main browser window, the following keyboard shortcuts are available:

 .. table::
   :class: longtable
-   :widths: 2 3
+   :widths: 2 2 3

-   +----------------------------+-------------------------------------------------------+
-   | Shortcut for all platforms | Function                                              |
-   +============================+=======================================================+
-   | Shift+Ctrl+a               | Add grid row                                          |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+b                | Object explorer                                       |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+n                | Create object                                         |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+d                | Delete object                                         |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+g                | Direct debugging                                      |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+e                | Edit object properties                                |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+f                | File main menu                                        |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+h                | Help main menu                                        |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+o                | Object main menu                                      |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+c                | Open context menu                                     |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+q                | Open query tool                                       |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Ctrl+f               | Quick Search                                          |
-   +----------------------------+-------------------------------------------------------+
-   | F5                         | Refresh object explorer                               |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+s                | Search objects                                        |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+[                | Tabbed panel backward                                 |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+]                | Tabbed panel forward                                  |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+l                | Tools main menu                                       |
-   +----------------------------+-------------------------------------------------------+
-   | Shift+Alt+v                | View data                                             |
-   +----------------------------+-------------------------------------------------------+
+   +----------------------------+--------------------+------------------------------------+
+   | Shortcut (Windows/Linux)   | Shortcut (Mac)     | Function                           |
+   +============================+====================+====================================+
+   | Shift + Ctrl + a           | Shift + Ctrl + a   | Add grid row                       |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + b            | Shift + Option + b | Object explorer                    |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + n            | Shift + Option + n | Create object                      |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + d            | Shift + Option + d | Delete object                      |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + g            | Shift + Option + g | Direct debugging                   |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + e            | Shift + Option + e | Edit object properties             |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + f            | Shift + Option + f | File main menu                     |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + h            | Shift + Option + h | Help main menu                     |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + o            | Shift + Option + o | Object main menu                   |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + q            | Shift + Option + q | Open query tool                    |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Ctrl + f           | Shift + Ctrl + f   | Quick Search                       |
+   +----------------------------+--------------------+------------------------------------+
+   | F5                         | F5                 | Refresh object explorer            |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + s            | Shift + Option + s | Search objects                     |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + [            | Shift + Option + [ | Tabbed panel backward              |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + ]            | Shift + Option + ] | Tabbed panel forward               |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + w            | Shift + Ctrl + w   | Close tab panel                    |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + l            | Shift + Option + l | Tools main menu                    |
+   +----------------------------+--------------------+------------------------------------+
+   | Shift + Alt + v            | Shift + Option + v | View data                          |
+   +----------------------------+--------------------+------------------------------------+

 Property Grid Controls
 **********************
@@ -67,16 +67,14 @@ Use the shortcuts below when working with property grid controls:
   +----------------------------+-------------------------------------------------------+
   | Shortcut for all platforms | Function                                              |
   +============================+=======================================================+
-   | Control+Shift+A            | Add row in Grid                                       |
+   | Ctrl + Shift + A           | Add row in Grid                                       |
   +----------------------------+-------------------------------------------------------+
   | Tab                        | Move focus to the next control                        |
   +----------------------------+-------------------------------------------------------+
-   | Shift+Tab                  | Move focus to the previous control                    |
+   | Shift + Tab                | Move focus to the previous control                    |
   +----------------------------+-------------------------------------------------------+
   | Return                     | Pick the selected an item in a combo box              |
   +----------------------------+-------------------------------------------------------+
-   | Control+Shift+A            | Add row in Grid                                       |
-   +----------------------------+-------------------------------------------------------+

 SQL Editors
 ***********
@@ -98,11 +96,7 @@ When using the syntax-highlighting SQL editors, the following shortcuts are avai
   +--------------------------+----------------------+-------------------------------------+
   | Ctrl + Alt + Right       | Cmd + Option + Right | Move right one word                 |
   +--------------------------+----------------------+-------------------------------------+
-   | Ctrl + /                 | Cmd + /              | Comment selected code (Inline)      |
-   +--------------------------+----------------------+-------------------------------------+
-   | Ctrl + .                 | Cmd + .              | Uncomment selected code (Inline)    |
-   +--------------------------+----------------------+-------------------------------------+
-   | Ctrl + Shift + /         | Cmd + Shift + /      | Comment/Uncomment code (Block)      |
+   | Ctrl + /                 | Cmd + /              | Comment/Uncomment code (Block)      |
   +--------------------------+----------------------+-------------------------------------+
   | Ctrl + a                 | Cmd + a              | Select all                          |
   +--------------------------+----------------------+-------------------------------------+
@@ -124,11 +118,7 @@ When using the syntax-highlighting SQL editors, the following shortcuts are avai
   +--------------------------+----------------------+-------------------------------------+
   | Ctrl + f                 | Cmd + f              | Find                                |
   +--------------------------+----------------------+-------------------------------------+
-   | Ctrl + g                 | Cmd + g              | Find next                           |
-   +--------------------------+----------------------+-------------------------------------+
-   | Ctrl + Shift + g         | Cmd + Shift + g      | Find previous                       |
-   +--------------------------+----------------------+-------------------------------------+
-   | Ctrl + Shift + f         | Cmd + Shift + f      | Replace                             |
+   | Ctrl + Shift + f         | Option + Cmd + f     | Replace                             |
   +--------------------------+----------------------+-------------------------------------+

 Query Tool
@@ -140,55 +130,55 @@ When using the Query Tool, the following shortcuts are available:
   :class: longtable
   :widths: 2 2 3

-   +--------------------------+--------------------+-----------------------------------+
-   | Shortcut (Windows/Linux) | Shortcut (Mac)     | Function                          |
-   +==========================+====================+===================================+
-   | <accesskey> + q          | <accesskey> + q    | Cancel query                      |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + t          | <accesskey> + t    | Connection status                 |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + d          | <accesskey> + d    | Delete rows                       |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + x          | <accesskey> + x    | Execute options                   |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + f          | <accesskey> + f    | Filter dialog                     |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + i          | <accesskey> + i    | Filter options                    |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + n          | <accesskey> + n    | Find options                      |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + o          | <accesskey> + o    | Open file                         |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + p          | <accesskey> + p    | Paste rows                        |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + r          | <accesskey> + r    | Rows limit                        |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + s          | <accesskey> + s    | Save file                         |
-   +--------------------------+--------------------+-----------------------------------+
-   | Ctrl + Alt + L           | Ctrl + option + L  | Clear query                       |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Ctrl + m         | Shift + Ctrl + m   | Commit                            |
-   +--------------------------+--------------------+-----------------------------------+
-   | F8                       | F8                 | Download Results                  |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + F7               | Shift + F7         | EXPLAIN ANALYZE query             |
-   +--------------------------+--------------------+-----------------------------------+
-   | F7                       | F7                 | EXPLAIN query                     |
-   +--------------------------+--------------------+-----------------------------------+
-   | F5                       | F5                 | Execute query                     |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Alt + ]          | Shift + option + ] | Next tab                          |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Alt + [          | Shift + option + [ | Previous tab                      |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Ctrl + r         | Shift + Ctrl + r   | Rollback                          |
-   +--------------------------+--------------------+-----------------------------------+
-   | F6                       | F6                 | Save data changes                 |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Alt + Tab        | Shift + option +Tab| Switch Panel                      |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Ctrl + u         |  Shift + Ctrl + u  | Toggle case of selected text      |
-   +--------------------------+--------------------+-----------------------------------+
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shortcut (Windows/Linux) | Shortcut (Mac)        | Function                          |
+   +==========================+=======================+===================================+
+   | Ctrl + o                 | Cmd + o               | Open file                         |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Ctrl + s                 | Cmd + s               | Save file                         |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + n          | Option + Shift + n    | Edit options                      |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + f          | Option + Shift + f    | Sort/Filter                       |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + i          | Option + Shift + i    | Filter options                    |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + q          | Option + Shift + q    | Cancel query                      |
+   +--------------------------+-----------------------+-----------------------------------+
+   | F5                       | F5                    | Execute Script                    |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + x          | Option + Shift + x    | Execute options                   |
+   +--------------------------+-----------------------+-----------------------------------+
+   | F7                       | F7                    | EXPLAIN query                     |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shift + F7               | Shift + F7            | EXPLAIN ANALYZE query             |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shift + Ctrl + m         | Shift + Ctrl + m      | Commit                            |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shift + Ctrl + r         | Shift + Ctrl + r      | Rollback                          |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Ctrl + a           | Option + Ctrl + a     | Add row                           |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Ctrl + c                 | Cmd + c               | Copy rows                         |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + p          | Option + Shift + p    | Paste rows                        |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + d          | Option + Shift + d    | Delete rows                       |
+   +--------------------------+-----------------------+-----------------------------------+
+   | F6                       | F6                    | Save data changes                 |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Ctrl + Alt + L           | Ctrl + option + L     | Clear query                       |
+   +--------------------------+-----------------------+-----------------------------------+
+   | F8                       | F8                    | Download Results                  |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shift + Alt + ]          | Shift + option + ]    | Next tab                          |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shift + Alt + [          | Shift + option + [    | Previous tab                      |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shift + Alt + Tab        | Shift + option + Tab  | Switch Panel                      |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shift + Ctrl + u         |  Shift + Ctrl + u     | Toggle case of selected text      |
+   +--------------------------+-----------------------+-----------------------------------+

 Debugger
 ********
@@ -199,29 +189,29 @@ When using the Debugger, the following shortcuts are available:
   :class: longtable
   :widths: 2 2 3

-   +--------------------------+--------------------+-----------------------------------+
-   | Shortcut (Windows/Linux) | Shortcut (Mac)     | Function                          |
-   +==========================+====================+===================================+
-   | <accesskey> + x          | <accesskey> + x    | Clear all breakpoints             |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + c          | <accesskey> + c    | Continue/Start                    |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + i          | <accesskey> + i    | Step into                         |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + o          | <accesskey> + o    | Step over                         |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + s          | <accesskey> + s    | Stop                              |
-   +--------------------------+--------------------+-----------------------------------+
-   | <accesskey> + t          | <accesskey> + t    | Toggle breakpoint                 |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Alt + q          | Shift + option + q | Edit grid values                  |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Alt + ]          | Shift + option + ] | Next tab                          |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Alt + [          | Shift + option + ] | Previous tab                      |
-   +--------------------------+--------------------+-----------------------------------+
-   | Shift + Alt + Tab        | Shift + option +Tab| Switch Panel                      |
-   +--------------------------+--------------------+-----------------------------------+
+   +--------------------------+-----------------------+-----------------------------------+
+   | Shortcut (Windows/Linux) | Shortcut (Mac)        | Function                          |
+   +==========================+=======================+===================================+
+   | Alt + Shift + x          | Option + Shift + x    | Clear all breakpoints             |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + c          | Option + Shift + c    | Continue/Start                    |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + i          | Option + Shift + i    | Step into                         |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + o          | Option + Shift + o    | Step over                         |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + s          | Option + Shift + s    | Stop                              |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + t          | Option + Shift + t    | Toggle breakpoint                 |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + q          | Option + Shift + q    | Edit grid values                  |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + ]          | Option + Shift + ]    | Next tab                          |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + [          | Option + Shift + ]    | Previous tab                      |
+   +--------------------------+-----------------------+-----------------------------------+
+   | Alt + Shift + Tab        | Option + Shift + Tab  | Switch Panel                      |
+   +--------------------------+-----------------------+-----------------------------------+

 ERD Tool
 ********
@@ -276,38 +266,17 @@ Inner Tab and Panel Navigation
 When using the Query Tool and Debugger, the following shortcuts are available
 for inner panel navigation:

-.. table::I
+.. table::
   :class: longtable
   :widths: 2 2 3

   +--------------------------+---------------------------+------------------------------------+
   | Shortcut (Windows/Linux) | Shortcut (Mac)            | Function                           |
   +==========================+===========================+====================================+
-   | Alt + Shift + ]          | Alt + Shift + ]           | Move to next tab within a panel    |
+   | Alt + Shift + ]          | Option + Shift + ]        | Move to next tab within a panel    |
   +--------------------------+---------------------------+------------------------------------+
-   | Alt + Shift + [          | Alt + Shift + [           | Move to previous tab within a panel|
+   | Alt + Shift + [          | Option + Shift + [        | Move to previous tab within a panel|
   +--------------------------+---------------------------+------------------------------------+
-   | Alt + Shift + Tab        | Alt + Shift + Tab         | Move between inner panels          |
+   | Alt + Shift + Tab        | Option + Shift + Tab      | Move between inner panels          |
   +--------------------------+---------------------------+------------------------------------+

-Access Key
-**********
-
-<accesskey> is browser and platform dependant. The following table lists the
-default access keys for supported browsers.
-
-.. table::
-   :class: longtable
-   :widths: 2 1 1 1
-
-   +-------------------+-------------+-------------+---------------+
-   |                   | Windows     | Linux       | Mac           |
-   +===================+=============+=============+===============+
-   | Edge              | Alt         |             |               |
-   +-------------------+-------------+-------------+---------------+
-   | Chrome            | Alt         | Alt         | Ctrl + Option |
-   +-------------------+-------------+-------------+---------------+
-   | Firefox           | Alt + Shift | Alt + Shift | Ctrl + Option |
-   +-------------------+-------------+-------------+---------------+
-   | Safari            | Alt         |             | Ctrl + Option |
-   +-------------------+-------------+-------------+---------------+
@@ -3,7 +3,7 @@
 *********************************
 `Managing Cluster Objects`:index:
 *********************************
-   
+
 Some object definitions reside at the cluster level; pgAdmin 4 provides dialogs
 that allow you to create these objects, manage them, and control their
 relationships to each other.  To access a dialog that allows you to create a
@@ -12,11 +12,12 @@ and select the *Create* option for that object.  For example, to create a new
 database, right-click on the *Databases* node, and select *Create Database...*

 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 3

   database_dialog
   resource_group_dialog
   role_dialog
   tablespace_dialog
   replica_nodes_dialog
+   pgd_replication_group_dialog
   role_reassign_dialog
@@ -0,0 +1,40 @@
+.. _pgd_replication_group_dialog:
+
+******************************************
+`PGD Replication Group Node Dialog`:index:
+******************************************
+
+Use the *Replication Group Node* dialog to view a PGD group/sub-group.
+A PGD cluster's nodes are gathered in groups. A group can also contain zero or more subgroups.
+Subgroups can be used to represent data centers or locations allowing commit scopes to refer to
+nodes in a particular region as a whole.
+
+The dialog organizes the information through the following tabs:
+*General*
+
+.. image:: images/pgd_group_node_dialog.png
+    :alt: Replication Group Node Dialog general tab
+    :align: center
+
+* The *ID* field is the ID of the node group.
+* The *Name* field is the name of the node group.
+* The *Location* field is the name of the location associated with the node group.
+* The *Type* field is the type of the node group, one of "global", "data", "shard" or "subscriber-only".
+* The *Streaming Mode* field is the transaction streaming setting of the node group, one of "off", "file", "writer",
+  "auto" or "default"
+* The *Enable Proxy Routing?* field tells whether the node group allows routing from pgd-proxy.
+* The *Enable Raft?* field tells whether the node group allows Raft Consensus.
+
+
+Other buttons:
+
+* Click the *Info* button (i) to access online help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
+
+
+A group can have multiple servers and will be visible in the object explorer tree.
+
+.. toctree::
+   pgd_replication_server_dialog
@@ -0,0 +1,30 @@
+.. _pgd_replication_server_dialog:
+
+*******************************************
+`PGD Replication Server Node Dialog`:index:
+*******************************************
+
+Use The *Replication Server Node* dialog to view an element that run
+databases and participate in the PGD cluster. A typical PGD node runs a Postgres
+database, the BDR extension, and optionally a PGD Proxy service.
+
+The dialog organizes the information through the following tabs:
+*General*
+
+.. image:: images/pgd_server_node_dialog.png
+    :alt: Replication Server Node Dialog general tab
+    :align: center
+
+* The *Sequence ID* field is the identifier of the node used for generating unique sequence numbers.
+* The *ID* field is the OID of the node.
+* The *Name* field is the name of the node.
+* The *Kind* field is the node kind name.
+* The *Group Name* field is the PGD group the node is part of.
+* The *Local DB Name* field is the database name of the node.
+
+Other buttons:
+
+* Click the *Info* button (i) to access online help.
+* Click the *Save* button to save work.
+* Click the *Close* button to exit without saving work.
+* Click the *Reset* button to restore configuration parameters.
@@ -11,9 +11,7 @@ The left pane of the *Preferences* dialog displays a tree control; each node of
 the tree control provides access to options that are related to the node under
 which they are displayed.

-* Use the plus sign (+) to the left of a node name to expand a segment of the
-  tree control.
-* Use the minus sign (-) to the left of a node name to close that node.
+* Click the *Reset all preferences* button to restore all preferences to their default values.

 The Browser Node
 ****************
@@ -44,7 +42,8 @@ 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 object explorer.
+  all the shared servers from the object explorer. **Note:** This option is visible only when
+  pgAdmin is running in server mode.

 * When the *Show empty object collections?* switch is turned off, then all object
  collections which are empty will be hidden from browser tree.
@@ -157,12 +156,37 @@ Expand the *Dashboards* node to specify your dashboard display preferences.
 Use the fields on the *Refresh rates* panel to specify your refersh rates
 preferences for the graphs on the *Dashboard* tab:

+* Use the *Average load statistics refresh rate* field to specify the number of
+  seconds between average load statistics samples displayed in graphs.
+
 * Use the *Block I/O statistics refresh rate* field to specify the number of
  seconds between block I/O statistic samples displayed in graphs.

+* Use the *CPU usage per process statistics refresh rate* field to specify the number of
+  seconds between CPU usage per process statistics samples displayed in graphs.
+
+* Use the *Handle & Process count statistics refresh rate* field to specify the number
+  of seconds between handle & process count statistics samples displayed in graphs.
+
+* Use the *I/O analysis statistics refresh rate* field to specify the number
+  of seconds between I/O analysis statistics samples displayed in graphs.
+
+* Use the *Memory usage per process statistics refresh rate* field to specify the number
+  of seconds between memory usage per process statistics samples displayed in graphs.
+
+* Use the *Memory usage statistics refresh rate* field to specify the number
+  of seconds between memory usage statistics samples displayed in graphs.
+
+* Use the *Percentage of CPU time used by different process modes statistics refresh rate*
+  field to specify the number of seconds between Percentage of CPU time used by different
+  process modes samples displayed in graphs.
+
 * Use the *Session statistics refresh rate* field to specify the number of
  seconds between session statistic samples displayed in graphs.

+* Use the *Swap memory usage statistics refresh rate* field to specify the number of
+  seconds between swap memory usage statistics samples displayed in graphs.
+
 * Use the *Transaction throughput refresh rate* field to specify the number of
  seconds between transaction throughput samples displayed in graphs.

@@ -205,6 +229,9 @@ Use the fields on the *Options* panel to manage ERD preferences.
    :align: center


+* Use *Cardinality Notation* to change the cardinality notation format
+  used to present relationship links. 
+
 * When the *SQL With DROP Table* switch is set to *True*, the SQL
  generated by the ERD Tool will add DROP table DDL before each CREATE
  table DDL.
@@ -251,9 +278,10 @@ Expand the *Miscellaneous* node to specify miscellaneous display preferences.
    :align: center

 * Use the *Themes* drop-down listbox to select the theme for pgAdmin. You'll also get a preview just below the
-  drop down. Note that, to apply the theme you need to refresh the pgAdmin page. You can also submit your
-  own themes, check `here <https://github.com/pgadmin-org/pgadmin4/blob/master/README.md>`_ how.
-  Currently we support Standard, Dark and High Contrast theme.
+  drop down. You can also submit your own themes,
+  check `here <https://github.com/pgadmin-org/pgadmin4/blob/master/README.md>`_ how.
+  Currently we support Standard, Dark and High Contrast and System theme. Selecting System option will follow
+  your computer's settings.

 The Paths Node
 **************
@@ -290,9 +318,6 @@ programs (pg_dump, pg_dumpall, pg_restore and psql) and there respective version

 Use the fields on the *Help* panel to specify the location of help files.

-* Use the *EDB Advanced Server Help Path* to specify the path to EDB Postgres
-  Advanced Server documentation.
-
 * Use the *PostgreSQL Help Path* to specify the path to PostgreSQL
  documentation.

@@ -345,11 +370,8 @@ Tool display.
 * Use the *Connection status refresh rate* field to specify the number of
  seconds between connection/transaction status updates.

-* Use the *Query info notifier timeout* field to control the behaviour of the
-  notifier that is displayed when query execution completes. A value of *-1*
-  will disable the notifier, and a value of 0 will display it until clicked. If
-  a positive value above zero is specified, the notifier will be displayed for
-  the specified number of seconds. The default is *5*.
+* When the *Show query success notification?* switch is set to *True*, the Query Tool
+  will show notifications on successful query execution.

 .. image:: images/preferences_sql_editor.png
    :alt: Preferences dialog sqleditor editor settings
@@ -376,6 +398,9 @@ Use the fields on the *Editor* panel to change settings of the query editor.
  changed to text/plain. Keyword highlighting and code folding will be disabled.
  This will improve editor performance with large files.

+* When the *Highlight selection matches?* switch is set to *True*, the editor will 
+  highlight matched selected text.
+
 .. image:: images/preferences_sql_explain.png
    :alt: Preferences dialog sqleditor explain options
    :align: center
@@ -448,6 +473,16 @@ Use the fields on the *Options* panel to manage editor preferences.
  by the Primary Key columns by default. When using the First/Last 100 Rows options,
  data is always sorted.

+* When the *Show View/Edit Data Promotion Warning?* switch is set to *True*
+  View/Edit Data tool will show promote to Query tool confirm dialog on query edit.
+
+* When the *Underline query at cursor?* switch is set to *True*, query tool will 
+  parse and underline the query at the cursor position.
+
+* When the *Underlined query execute warning?* switch is set to *True*, query tool 
+  will warn upon clicking the *Execute Query* button in the query tool.  The warning 
+  will appear only if *Underline query at cursor?* is set to *False*.
+
 .. image:: images/preferences_sql_results_grid.png
    :alt: Preferences dialog sql results grid section
    :align: center
@@ -477,7 +512,7 @@ preferences for copied data.
    :align: center

 Use the fields on the *Keyboard shortcuts* panel to configure shortcuts for the
-Query Tool window navigation:
+Query Tool window navigation.

 .. image:: images/preferences_sql_formatting.png
    :alt: Preferences dialog SQL Formatting section
@@ -26,13 +26,12 @@ allows you to:
    :align: center

 You can open multiple copies of the Query tool in individual tabs
-simultaneously.  To close a copy of the Query tool, click the *X* in the
-upper-right hand corner of the tab bar.
+simultaneously.  To close a copy of the Query tool, click the *X* of the tab.

 The Query Tool features two panels:

 * The upper panel displays the *SQL Editor*. You can use the panel to enter,
-  edit, or execute a query. It also shows the *History* tab which can be used
+  edit, or execute a query or a script. It also shows the *History* tab which can be used
  to view the queries that have been executed in the session, and a *Scratch Pad*
  which can be used to hold text snippets during editing. If the Scratch Pad is
  closed, it can be re-opened (or additional ones opened) by right-clicking in
@@ -75,14 +74,30 @@ key combination to select from a popup menu of autocomplete options.

 After entering a query, select the *Execute script* icon from the toolbar. The
 complete contents of the SQL editor panel will be sent to the database server
-for execution. To execute only a section of the code that is displayed in the
-SQL editor, highlight the text that you want the server to execute, and click
-the *Execute script* icon.
+for execution. To execute only a section of the code that is displayed in the 
+SQL editor, highlight the text that you want the server to execute, and click the 
+*Execute script* icon.

-.. image:: images/query_execute_section.png
+.. image:: images/query_execute_script.png
+    :alt: Query tool execute script section
+    :align: center
+
+You can also execute a query based on cursor position. Query tool will detect
+a query and underline it when cursor position changes. Now, to execute the
+current underlined query, hit the *Execute query* button on the toolbar. If a section
+is highlighted then it will behave like normal execute.
+
+.. image:: images/query_execute_query.png
    :alt: Query tool execute query section
    :align: center

+The warning will appear only if *Underline query at cursor?* is set to *False* and
+the *Underlined query execute warning?* switch is set to *True* Preferences Query tool's Options.
+
+.. image:: images/query_execute_warning.png
+    :alt: Query tool execute query warning
+    :align: center
+
 The message returned by the server when a command executes is displayed on the
 *Messages* tab.  If the command is successful, the *Messages* tab displays
 execution details.
@@ -159,8 +174,6 @@ The *Data Output* tab displays the result set of the query in a table format.
 You can:

 * Select and copy from the displayed result set.
-* Use the *Execute script* options to retrieve query execution information and
-  set query execution options.
 * Use the *Save results to file* icon to save the content of the *Data Output*
  tab as a comma-delimited file.
 * Edit the data in the result set of a SELECT query if it is updatable.
@@ -485,6 +498,12 @@ To create a macro, select the *Manage Macros* option from the *Macros* menu on t
   :alt: Query Tool Manage Macros dialogue
   :align: center

+To add a query to macros, write and select your query, then go to the *Macros* menu in the Query Tool and click *Add to macros*. Your query will be automatically saved to macros.
+
+.. image:: images/query_tool_add_to_macro.png
+   :alt: Query Tool Add To Macros
+   :align: center
+
 To delete a macro, select the macro on the *Manage Macros* dialogue, and then click the *Delete* button.
 The server will prompt you for confirmation to delete the macro.

@@ -29,9 +29,9 @@ File Options
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Icon                 | Behavior                                                                                          | Shortcut       |
   +======================+===================================================================================================+================+
-   | *Open File*          | Click the *Open File* icon to display a previously saved query in the SQL Editor.                 | Accesskey + O  |
+   | *Open File*          | Click the *Open File* icon to display a previously saved query in the SQL Editor.                 | Cmd/Ctrl + O   |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Save File*          | Click the *Save* icon to perform a quick-save of a previously saved query, or to access the       | Accesskey + S  |
+   | *Save File*          | Click the *Save* icon to perform a quick-save of a previously saved query, or to access the       | Cmd/Ctrl + S   |
   |                      | *Save* menu:                                                                                      |                |
   |                      |                                                                                                   |                |
   |                      |  * Select *Save* to save the selected content of the SQL Editor panel in a  file.                 |                |
@@ -50,7 +50,7 @@ Filter/Limit Options
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Icon                 | Behavior                                                                                          | Shortcut       |
   +======================+===================================================================================================+================+
-   | *Filter*             | Click the *Filter* icon to set filtering and sorting criteria for the data when in *View/Edit data| Accesskey + F  |
+   | *Filter*             | Click the *Filter* icon to set filtering and sorting criteria for the data when in *View/Edit data| Option/Alt + F |
   |                      | mode*. Click the down arrow to access other filtering and sorting options:                        |                |
   |                      |                                                                                                   |                |
   |                      |  * In the *SQL Filter*, you can enter a SQL query as filtering criteria.                          |                |
@@ -63,7 +63,7 @@ Filter/Limit Options
   |                      |                                                                                                   |                |
   |                      |  * Click *Remove Sort/Filter* to remove any previously selected sort or filtering options.        |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | Limit Selector       | Select a value in the *Limit Selector* to limit the size of the dataset to a number of rows.      | Accesskey + R  |
+   | Limit Selector       | Select a value in the *Limit Selector* to limit the size of the dataset to a number of rows.      | Option/Alt + R |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+

 Query Editing Options
@@ -80,24 +80,25 @@ Query Editing Options
   +----------------------+---------------------------------------------------------------------------------------------------+-----------------------+
   | Icon                 | Behavior                                                                                          | Shortcut              |
   +======================+===================================================================================================+=======================+
-   | *Edit*               | Use the *Edit* menu to search, replace, or navigate the code displayed in the SQL Editor:         |                       |
+   | *Edit*               | Use the *Edit* menu to search, replace, or navigate the code displayed in the SQL Editor:         | Option/Alt + Shift + N|
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
-   |                      | Select *Find* to provide a search target, and search the SQL Editor contents.                     | Cmd+F                 |
+   |                      | Select *Find* to provide a search target, and search the SQL Editor contents.                     | Cmd/Ctrl + F          |
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
-   |                      | Select *Replace* to locate and replace (with prompting) individual occurrences of the target.     | Option+Cmd+F (MAC)    |
-   |                      |                                                                                                   | Ctrl+Shift+F (Others) |
+   |                      | Select *Replace* to locate and replace (with prompting) individual occurrences of the target.     | Option + Cmd + F (MAC)|
+   |                      |                                                                                                   | Ctrl + Shift + F      |
+   |                      |                                                                                                   | (Others)              |
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
-   |                      | Select *Go to Line/Column* to go to specified line number and column position                     | Cmd+L or Ctrl+L       |
+   |                      | Select *Go to Line/Column* to go to specified line number and column position                     | Cmd/Ctrl + L          |
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
   |                      | Select *Indent Selection* to indent the currently selected text.                                  | Tab                   |
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
-   |                      | Select *Unindent Selection* to remove indentation from the currently selected text.               | Shift+Tab             |
+   |                      | Select *Unindent Selection* to remove indentation from the currently selected text.               | Shift + Tab           |
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
-   |                      | Select *Toggle Comment* to comment/uncomment any lines that contain the selection in SQL style.   | Cmd+/                 |
+   |                      | Select *Toggle Comment* to comment/uncomment any lines that contain the selection in SQL style.   | Cmd/Ctrl + /          |
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
-   |                      | Select *Clear Query* to clear the query editor window.                                            | Cmd+.                 |
+   |                      | Select *Clear Query* to clear the query editor window.                                            | Option/Alt + Ctrl + L |
   |                      +---------------------------------------------------------------------------------------------------+-----------------------+
-   |                      | Select *Format SQL* to format the selected SQL or all the SQL if none is selected                 | Shift+Cmd+K           |
+   |                      | Select *Format SQL* to format the selected SQL or all the SQL if none is selected                 | Cmd/Ctrl + K          |
   +----------------------+---------------------------------------------------------------------------------------------------+-----------------------+

 Query Execution
@@ -114,7 +115,8 @@ Query Execution
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Icon                 | Behavior                                                                                          | Shortcut       |
   +======================+===================================================================================================+================+
-   | *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     | Accesskey + Q  |
+   | *Stop*               | Click the *Stop* icon to cancel the execution of the currently running query.                     |Option + Shift +|
+   |                      |                                                                                                   |Q               |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | *Execute script*     | Click the *Execute script* icon to either execute or refresh the query highlighted in the SQL     | F5             |
   |                      | editor panel. Click the down arrow to access other execution options:                             |                |
@@ -126,11 +128,14 @@ Query Execution
   |                      |    transaction.  Any changes made by the transaction will be visible to others, and               |                |
   |                      |    durable in the event of a crash.                                                               |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *Execute query*      | Click the *Execute query* icon to either execute the query where the cursor is present or         | Option+F5 (MAC)|
+   |                      | refresh the query highlighted in the SQL editor panel.                                            | Alt+F5 (Others)|
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | *Explain*            | Click the *Explain* icon to view an explanation plan for the current query. The result of the     | F7             |
   |                      | EXPLAIN is displayed graphically on the *Explain* tab of the output panel, and in text            |                |
   |                      | form on the *Data Output* tab.                                                                    |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Explain analyze*    | Click the *Explain analyze* icon to invoke an EXPLAIN ANALYZE command on the current query.       | Shift+F7       |
+   | *Explain analyze*    | Click the *Explain analyze* icon to invoke an EXPLAIN ANALYZE command on the current query.       | Shift + F7     |
   |                      |                                                                                                   |                |
   |                      | Navigate through the *Explain Options* menu to select options for the EXPLAIN command:            |                |
   |                      |                                                                                                   |                |
@@ -151,9 +156,9 @@ Query Execution
   |                      |                                                                                                   |                |
   |                      |  * Select *Wal* to include the information on WAL record generation.                              |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Commit*             | Click the *Commit* icon to commit the transaction.                                                | Shift+CTRL+M   |
+   | *Commit*             | Click the *Commit* icon to commit the transaction.                                                |Shift + Ctrl + M|
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Rollback*           | Click the *Rollback* icon to rollback the transaction.                                            | Shift+CTRL+R   |
+   | *Rollback*           | Click the *Rollback* icon to rollback the transaction.                                            |Shift + Ctrl + R|
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | *Macros*             | Click the *Macros* icon to manage the macros. You can create, edit or clear the macros through    |                |
   |                      | the *Manage Macros* option.                                                                       |                |
@@ -175,21 +180,25 @@ Data Editing Options
   +======================+===================================================================================================+================+
   | *Add row*            | Click the *Add row* icon to add a new row                                                         |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Copy*               | Click the *Copy* icon to copy the content with or without header:                                 |  Accesskey + C |
+   | *Copy*               | Click the *Copy* icon to copy the content with or without header:                                 | Cmd/Ctrl + C   |
   |                      |                                                                                                   |                |
   |                      |  * Click the *Copy* icon to copy the content that is currently highlighted in the Data Output     |                |
   |                      |     panel.                                                                                        |                |
   |                      |                                                                                                   |                |
   |                      |  *  Click *Copy with headers* to copy the highlighted content along with the header.              |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Paste*              | Click the *Paste* icon to paste a previously copied row with or without serial/identity values:   | Accesskey + P  |
+   | *Paste*              | Click the *Paste* icon to paste a previously copied row with or without serial/identity values:   | Option/Alt +   |
+   |                      |                                                                                                   | Shift + P      |
   |                      |                                                                                                   |                |
   |                      |  * Click the *Paste* icon to paste a previously copied row into a new row.                        |                |
   |                      |                                                                                                   |                |
   |                      |  * Click the *Paste with SERIAL/IDENTITY values?* if you want to paste the copied column values   |                |
   |                      |    in the serial/identity columns.                                                                |                |
+   |                      |                                                                                                   |                |
+   |                      | Note that copied row having *Bytea* datatype cell will be pasted as *Null*.                       |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *Delete*             | Click the *Delete* icon to mark the selected rows for deletion. These marked rows get deleted     | Accesskey + D  |
+   | *Delete*             | Click the *Delete* icon to mark the selected rows for deletion. These marked rows get deleted     | Option/Alt +   |
+   |                      |                                                                                                   | Shift + D      |
   |                      | when you click the *Save Data Changes* icon.                                                      |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | *Save Data Changes*  | Click the *Save Data Changes* icon to save data changes (insert, update, or delete) in the Data   | F6             |
@@ -202,6 +211,8 @@ Data Editing Options
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
   | Graph Visualiser     | Use the Graph Visualiser button to generate graphs of the query results.                          |                |
   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | SQL                  | Use the SQL button to check the current query that gave the data.                                 |                |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+

 Status Bar
 **********
@@ -12,6 +12,12 @@ notes for it.
   :maxdepth: 1


+   release_notes_8_12
+   release_notes_8_11
+   release_notes_8_10
+   release_notes_8_9
+   release_notes_8_8
+   release_notes_8_7
   release_notes_8_6
   release_notes_8_5
   release_notes_8_4
@@ -0,0 +1,59 @@
+************
+Version 8.10
+************
+
+Release date: 2024-07-29
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.9.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.3
+
+
+New features
+************
+
+  | `Issue #3981 <https://github.com/pgadmin-org/pgadmin4/issues/3981>`_ -  Add support for Postgres Server Logs for Text, CSV and JSON format in plain and tabular formats. Upgrade React to version 18.
+  | `Issue #6572 <https://github.com/pgadmin-org/pgadmin4/issues/6572>`_ -  Add a keyboard shortcut to close active tab panel.
+  | `Issue #7530 <https://github.com/pgadmin-org/pgadmin4/issues/7530>`_ -  Add support for highlighting selection matches in the query editor.
+
+Housekeeping
+************
+
+  | `Issue #7494 <https://github.com/pgadmin-org/pgadmin4/issues/7494>`_ -  Replace pgAdmin NW.js container with Electron container.
+  | `Issue #7501 <https://github.com/pgadmin-org/pgadmin4/issues/7501>`_ -  Updated to the latest version of the Notistack library.
+  | `Issue #7537 <https://github.com/pgadmin-org/pgadmin4/issues/7537>`_ -  Ensure that pgAdmin 4 is compatible with PostgreSQL v17.
+  | `Issue #7607 <https://github.com/pgadmin-org/pgadmin4/issues/7607>`_ -  Automatically apply virtualization in the DataGridView of SchemaView if the schema contains only one collection.
+  | `Issue #7623 <https://github.com/pgadmin-org/pgadmin4/issues/7623>`_ -  Add the git commit hash details to the About dialog.
+
+Bug fixes
+*********
+
+  | `Issue #3199 <https://github.com/pgadmin-org/pgadmin4/issues/3199>`_ -  Fixed an issue where paste operation in query tool data grid should skip bytea columns and put the value as NULL instead.
+  | `Issue #4165 <https://github.com/pgadmin-org/pgadmin4/issues/4165>`_ -  Fixed an issue where the taskbar icon appeared as a red square for the query tool and schema diff when opened in a new window.
+  | `Issue #5345 <https://github.com/pgadmin-org/pgadmin4/issues/5345>`_ -  Fix issue with missing new added records in download file.
+  | `Issue #5610 <https://github.com/pgadmin-org/pgadmin4/issues/5610>`_ -  Fixed an issue where the File Open dialog did not show files without a dot extension.
+  | `Issue #6548 <https://github.com/pgadmin-org/pgadmin4/issues/6548>`_ -  Ensure pgAdmin never makes network requests to Google etc.
+  | `Issue #6571 <https://github.com/pgadmin-org/pgadmin4/issues/6571>`_ -  Fixed an issue where pop-up notifications from Object Explorer wouldn't get dismissed automatically if the Query Tool was opened.
+  | `Issue #7035 <https://github.com/pgadmin-org/pgadmin4/issues/7035>`_ -  Fixed the permission denied issue for functions of the pgstattuple extension when accessing statistics with a non-admin user.
+  | `Issue #7219 <https://github.com/pgadmin-org/pgadmin4/issues/7219>`_ -  Ensure processes related notifiers disappears.
+  | `Issue #7297 <https://github.com/pgadmin-org/pgadmin4/issues/7297>`_ -  Updated entrypoint.sh to utilize the email-validator package for email validation.
+  | `Issue #7511 <https://github.com/pgadmin-org/pgadmin4/issues/7511>`_ -  Fixed an issue where users could not insert characters at the desired location, as it was added to the end of the line.
+  | `Issue #7554 <https://github.com/pgadmin-org/pgadmin4/issues/7554>`_ -  Fixed an issue where sorting the database activity table on the dashboard by any column caused the details to expand in the wrong position.
+  | `Issue #7618 <https://github.com/pgadmin-org/pgadmin4/issues/7618>`_ -  Fix an issue where the preferences JSON file has no effect when an external database is used.
+  | `Issue #7626 <https://github.com/pgadmin-org/pgadmin4/issues/7626>`_ -  Fixed an issue where theme preview under theme options was broken in pgAdmin server mode.
+  | `Issue #7627 <https://github.com/pgadmin-org/pgadmin4/issues/7627>`_ -  Fixed an issue where users could not autofill their saved passwords in the connect server dialog in the browser.
+  | `Issue #7638 <https://github.com/pgadmin-org/pgadmin4/issues/7638>`_ -  Fixed an issue where Generate Script button should be disabled if no objects are selected in the schema diff result.
+  | `Issue #7639 <https://github.com/pgadmin-org/pgadmin4/issues/7639>`_ -  Fixed an issue where ERD Open/Save shorcuts were not working on Windows/Linux.
+  | `Issue #7660 <https://github.com/pgadmin-org/pgadmin4/issues/7660>`_ -  Add a precautionary check for the query tool connection cursor to fix the error 'NoneType' object has no attribute '_query'.
+  | `Issue #7662 <https://github.com/pgadmin-org/pgadmin4/issues/7662>`_ -  Fixed an issue where boolean values in node details of graphical explain plan were not interpreted correctly.
+  | `Issue #7663 <https://github.com/pgadmin-org/pgadmin4/issues/7663>`_ -  Fixed an issue where Reassign/Drop Owned dialog not opening for Role.
+  | `Issue #7679 <https://github.com/pgadmin-org/pgadmin4/issues/7679>`_ -  Ensure pgadmin does not try to connect to the server if saved password is not available.
+  | `Issue #7681 <https://github.com/pgadmin-org/pgadmin4/issues/7681>`_ -  Ensure that pgAdmin works when opened in an iframe.
@@ -0,0 +1,45 @@
+************
+Version 8.11
+************
+
+Release date: 2024-08-22
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.10.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.3
+
+
+New features
+************
+
+  | `Issue #2046 <https://github.com/pgadmin-org/pgadmin4/issues/2046>`_ -  Add a home button to the geometry viewer to set original zoom level when the viewer was opened.
+
+Housekeeping
+************
+
+  | `Issue #7705 <https://github.com/pgadmin-org/pgadmin4/issues/7705>`_ -  Upgrade react-data-grid fork to latest and change pgAdmin accordingly.
+  | `Issue #7776 <https://github.com/pgadmin-org/pgadmin4/issues/7776>`_ -  Introduce custom React Hook useSchemaState to simplify SchemaView component.
+
+Bug fixes
+*********
+
+  | `Issue #7499 <https://github.com/pgadmin-org/pgadmin4/issues/7499>`_ -  Fixed an issue where refreshing the Schema Diff tool opened in a new tab caused an error.
+  | `Issue #7540 <https://github.com/pgadmin-org/pgadmin4/issues/7540>`_ -  Fix server heartbeat logging error after deleting the server.
+  | `Issue #7682 <https://github.com/pgadmin-org/pgadmin4/issues/7682>`_ -  Fixed an issue where the Generate Script ignored filter conditions when a parent node was selected.
+  | `Issue #7683 <https://github.com/pgadmin-org/pgadmin4/issues/7683>`_ -  Fixed an issue where delete object(shortcut key) affecting both text and Object Explorer items.
+  | `Issue #7688 <https://github.com/pgadmin-org/pgadmin4/issues/7688>`_ -  Fix an issue where ERD tool should to be able to open saved pgerd file when using keyboard shortcuts.
+  | `Issue #7728 <https://github.com/pgadmin-org/pgadmin4/issues/7728>`_ -  Updated the documentation for web server authentication.
+  | `Issue #7737 <https://github.com/pgadmin-org/pgadmin4/issues/7737>`_ -  Fixed an issue where the REVOKE statement in the create script was throwing an error if the role contained special characters.
+  | `Issue #7748 <https://github.com/pgadmin-org/pgadmin4/issues/7748>`_ -  Improve code highlighting in query editor.
+  | `Issue #7754 <https://github.com/pgadmin-org/pgadmin4/issues/7754>`_ -  Fix an issue where the wheel package is not getting installed on the arm64-based macOS version < 14.
+  | `Issue #7772 <https://github.com/pgadmin-org/pgadmin4/issues/7772>`_ -  Fixed an issue where column resizing is not working in search objects dialog.
+  | `Issue #7775 <https://github.com/pgadmin-org/pgadmin4/issues/7775>`_ -  Fixed an issue where the value in the find box is not updating with selected text in editor if find is already open and re-triggered.
+  | `Issue #7793 <https://github.com/pgadmin-org/pgadmin4/issues/7793>`_ -  Fixed paths for Flatpak broken after Electron changes.
@@ -0,0 +1,43 @@
+************
+Version 8.12
+************
+
+Release date: 2024-09-23
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.11.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.4
+
+
+New features
+************
+
+  | `Issue #1900 <https://github.com/pgadmin-org/pgadmin4/issues/1900>`_ -  Added feature to restore preferences to their default values.
+  | `Issue #6222 <https://github.com/pgadmin-org/pgadmin4/issues/6222>`_ -  Add a new config variable - ALLOW_SPECIAL_EMAIL_DOMAINS to allow special domains for pgAdmin user emails.
+  | `Issue #7293 <https://github.com/pgadmin-org/pgadmin4/issues/7293>`_ -  Allow running non-continuous selected SQL code blocks in the query tool.
+
+Housekeeping
+************
+
+  | `Issue #7884 <https://github.com/pgadmin-org/pgadmin4/issues/7884>`_ -  Improved the extendability of the SchemaView and DataGridView.
+
+Bug fixes
+*********
+
+  | `Issue #6502 <https://github.com/pgadmin-org/pgadmin4/issues/6502>`_ -  Fix the query tool restore connection issue on the server disconnection from the left side object explorer.
+  | `Issue #7076 <https://github.com/pgadmin-org/pgadmin4/issues/7076>`_ -  Revamp the current password saving implementation to a keyring and reduce repeated OS user password prompts.
+  | `Issue #7571 <https://github.com/pgadmin-org/pgadmin4/issues/7571>`_ -  Fixed an issue where users could not use pgAdmin if they did not have access to the management database.
+  | `Issue #7811 <https://github.com/pgadmin-org/pgadmin4/issues/7811>`_ -  Fixed an issue where servers listed in the servers.json file were being reimported upon container restart.
+  | `Issue #7839 <https://github.com/pgadmin-org/pgadmin4/issues/7839>`_ -  Added support for OIDC based OAuth2 authentication.
+  | `Issue #7878 <https://github.com/pgadmin-org/pgadmin4/issues/7878>`_ -  Fixed an issue where cursor moves to end of line when editing input fields.
+  | `Issue #7890 <https://github.com/pgadmin-org/pgadmin4/issues/7890>`_ -  Fixed an issue where "Quit App" confirmation modal in desktop app is not respecting "Confirm on close or refresh?".
+  | `Issue #7895 <https://github.com/pgadmin-org/pgadmin4/issues/7895>`_ -  Fixed an issue where different client backend shows all SQL are same.
+  | `Issue #7945 <https://github.com/pgadmin-org/pgadmin4/issues/7945>`_ -  Fixed a security issue where the OAuth2 client ID and secret exposed through the web browser (CVE-2024-9014).
@@ -0,0 +1,49 @@
+***********
+Version 8.7
+***********
+
+Release date: 2024-05-30
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.6.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, and 16
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.3
+
+
+New features
+************
+
+  | `Issue #4735 <https://github.com/pgadmin-org/pgadmin4/issues/4735>`_ -  Added support for the 'Add to macros' feature and fixed various usability issues.
+  | `Issue #6841 <https://github.com/pgadmin-org/pgadmin4/issues/6841>`_ -  Added support for executing the query at the cursor position in the query tool.
+  | `Issue #7192 <https://github.com/pgadmin-org/pgadmin4/issues/7192>`_ -  Changes in Query Tool, Debugger, and ERD Tool shortcuts to remove the use of Accesskey which will allow them to be customized.
+  | `Issue #7215 <https://github.com/pgadmin-org/pgadmin4/issues/7215>`_ -  Added support for viewing PGD Clusters.
+  | `Issue #7411 <https://github.com/pgadmin-org/pgadmin4/issues/7411>`_ -  Enhance the Delete dialog by highlighting the names of the objects to be deleted in bold.
+  | `Issue #7437 <https://github.com/pgadmin-org/pgadmin4/issues/7437>`_ -  Added support for platform Ubuntu 24.04 and Fedora 40.
+
+Housekeeping
+************
+
+  | `Issue #7419 <https://github.com/pgadmin-org/pgadmin4/issues/7419>`_ -  Upgrade react-table from v7 to v8.
+  | `Issue #7472 <https://github.com/pgadmin-org/pgadmin4/issues/7472>`_ -  Replace the current FontAwesome based PSQL tool icon with MUI Terminal icon.
+
+Bug fixes
+*********
+
+  | `Issue #5762 <https://github.com/pgadmin-org/pgadmin4/issues/5762>`_ -  Ensure that Schema Diff does not indicate a table as different when the trigger names are the same but the trigger function body is different.
+  | `Issue #5849 <https://github.com/pgadmin-org/pgadmin4/issues/5849>`_ -  Disable ERD for system catalogs.
+  | `Issue #6060 <https://github.com/pgadmin-org/pgadmin4/issues/6060>`_ -  Disable Debugger for system catalogs.
+  | `Issue #6086 <https://github.com/pgadmin-org/pgadmin4/issues/6086>`_ -  Fixed an issue where drag and drop publication and subscription name in SQL editors was not working.
+  | `Issue #6464 <https://github.com/pgadmin-org/pgadmin4/issues/6464>`_ -  Fixed an issue of the pgAdmin window size increasing each time it was reopened.
+  | `Issue #7349 <https://github.com/pgadmin-org/pgadmin4/issues/7349>`_ -  Update the documentation for preferences dialog and keyboard shortcuts.
+  | `Issue #7439 <https://github.com/pgadmin-org/pgadmin4/issues/7439>`_ -  Fixed an issue where pgAdmin fails to start when Ubuntu OS is upgraded to a major version.
+  | `Issue #7458 <https://github.com/pgadmin-org/pgadmin4/issues/7458>`_ -  Remove query info notifier timeout field from Query Tool Preferences Dialog.
+  | `Issue #7485 <https://github.com/pgadmin-org/pgadmin4/issues/7485>`_ -  Fixed incorrect highlighting for C-Style escape strings in SQL editor.
+  | `Issue #7487 <https://github.com/pgadmin-org/pgadmin4/issues/7487>`_ -  Fixed an issue where the recover password button was enabled even when no email was provided.
+  | `Issue #7500 <https://github.com/pgadmin-org/pgadmin4/issues/7500>`_ -  Fixed an issue where resetting the password from the password reset link was not working.
@@ -0,0 +1,35 @@
+***********
+Version 8.8
+***********
+
+Release date: 2024-06-06
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.7.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, and 16
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.3
+
+
+New features
+************
+
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+  | `Issue #5785 <https://github.com/pgadmin-org/pgadmin4/issues/5785>`_ -  Fix an issue where user authentication fails with special characters in password.
+  | `Issue #7480 <https://github.com/pgadmin-org/pgadmin4/issues/7480>`_ -  Fixed an issue where canceling a query without privilege does not display any message on query tool.
+  | `Issue #7520 <https://github.com/pgadmin-org/pgadmin4/issues/7520>`_ -  Fix the issue where docker with SSL v8.7 fails to start.
+  | `Issue #7524 <https://github.com/pgadmin-org/pgadmin4/issues/7524>`_ -  Fixed an issue where the size displayed as 'NaN B' for all databases in the statistics tab.
+  | `Issue #7526 <https://github.com/pgadmin-org/pgadmin4/issues/7526>`_ -  Fixed an issue where backup and restore operations failed with the error 'This build does not support compression with gzip'.
@@ -0,0 +1,50 @@
+***********
+Version 8.9
+***********
+
+Release date: 2024-06-27
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v8.8.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 12, 13, 14, 15, and 16
+
+**EDB Advanced Server**: 12, 13, 14, 15, and 16
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.3
+
+
+New features
+************
+
+  | `Issue #5932 <https://github.com/pgadmin-org/pgadmin4/issues/5932>`_ -  Provide option to set theme based on OS theme preference.
+
+Housekeeping
+************
+
+  | `Issue #7363 <https://github.com/pgadmin-org/pgadmin4/issues/7363>`_ -  Remove the usage of MUI makeStyles as it doesn't support React 18.
+
+Bug fixes
+*********
+
+  | `Issue #6357 <https://github.com/pgadmin-org/pgadmin4/issues/6357>`_ -  Disable the query tool editor input if any SQL is being loaded to prevent users from typing.
+  | `Issue #7241 <https://github.com/pgadmin-org/pgadmin4/issues/7241>`_ -  Fixed an issue where resizable data editors in query tool should not be allowed to resize beyond the app window bounds.
+  | `Issue #7295 <https://github.com/pgadmin-org/pgadmin4/issues/7295>`_ -  Fixed new line indentation in query editor and add a user preference to disable it.
+  | `Issue #7306 <https://github.com/pgadmin-org/pgadmin4/issues/7306>`_ -  Ensure that a user can connect to a server using SSL certificates and identity files from a shared storage.
+  | `Issue #7316 <https://github.com/pgadmin-org/pgadmin4/issues/7316>`_ -  Fixed an issue where object explorer toolbar button not showing shortcut in the tooltip.
+  | `Issue #7414 <https://github.com/pgadmin-org/pgadmin4/issues/7414>`_ -  Add support for comments on RLS policy object.
+  | `Issue #7476 <https://github.com/pgadmin-org/pgadmin4/issues/7476>`_ -  Fixed an issue where changing a column name should reflect in all the constraints in table object dialog and ERD table dialog.
+  | `Issue #7481 <https://github.com/pgadmin-org/pgadmin4/issues/7481>`_ -  Fixed an issue where dark theme shows white background when all tabs are closed.
+  | `Issue #7516 <https://github.com/pgadmin-org/pgadmin4/issues/7516>`_ -  Ensure preferences can be loaded using preferences.json.
+  | `Issue #7523 <https://github.com/pgadmin-org/pgadmin4/issues/7523>`_ -  Fixed an issue where the schema diff incorrectly marked tables as different due to schema-qualified trigger functions in the trigger definitions.
+  | `Issue #7528 <https://github.com/pgadmin-org/pgadmin4/issues/7528>`_ -  Fixed an issue where backslash breaks syntax highlighting.
+  | `Issue #7536 <https://github.com/pgadmin-org/pgadmin4/issues/7536>`_ -  Search Objects dialog should focus on search input on open.
+  | `Issue #7542 <https://github.com/pgadmin-org/pgadmin4/issues/7542>`_ -  Fixed incorrect sorting of size in statistics tab.
+  | `Issue #7555 <https://github.com/pgadmin-org/pgadmin4/issues/7555>`_ -  Fixed an issue where query tool shortcuts for find/replace are not working.
+  | `Issue #7556 <https://github.com/pgadmin-org/pgadmin4/issues/7556>`_ -  Fixed migration failure while using external database.
+  | `Issue #7593 <https://github.com/pgadmin-org/pgadmin4/issues/7593>`_ -  Fixed an issue where query tool auto-complete stops working after connection change.
+  | `Issue #7605 <https://github.com/pgadmin-org/pgadmin4/issues/7605>`_ -  Fix the permissions issue in the pgAdmin installation directory on Debian and RHEL-8 platforms (CVE-2024-6238).
+  | `Issue #7616 <https://github.com/pgadmin-org/pgadmin4/issues/7616>`_ -  Fixed an issue where delete button in Users data was enabled for incorrect rows.
@@ -21,6 +21,7 @@ Use the fields in the *General* tab to define the RLS Policy:
 * Use the *Name* field to add a descriptive name for the RLS Policy. The name will be displayed in the *pgAdmin* tree control.
 * Use the drop-down listbox next to *Role* to select the Role to which the RLS Policy is to be applied.
 * Use the drop-down listbox next to *Type* to select the type of the policy.
+* Store notes about the policy in the Comment field.

 Click the *Commands* tab to continue.

@@ -9,14 +9,14 @@ display information about the object currently selected in the *pgAdmin* tree
 control in the left window.  Select a tab to access information about the
 highlighted object in the tree control.

-.. image:: images/main_dashboard_general.png
-    :alt: Dashboard panel
+.. image:: images/dashboard_activity.png
+    :alt: Dashboard Activity
    :align: center

 The graphs and tables on the *Dashboard* tab provides an active analysis of system statistics and the usage
 statistics for the selected server or database.

-Click the *General* tab to get the usage statistics for the selected server or database:
+Click the *Activity* tab to get the usage statistics for the selected server or database:

 * The *Server sessions* or *Database sessions* graph displays the interactions
  with the server or database.
@@ -30,8 +30,14 @@ Click the *General* tab to get the usage statistics for the selected server or d
  or fetched from the buffer cache (but not the operating system's file system
  cache) for the server or database.

-The *Server activity* panel displays information about sessions, locks, prepared
-transactions, and server configuration (if applicable). The information is
+.. image:: images/dashboard_stat.png
+    :alt: Dashboard Activity
+    :align: center
+
+Click the *Stat* tab to get the usage statistics for the selected server or database:
+
+The *Stat* panel displays information about sessions, locks, prepared
+transactions. The information is
 presented in context-sensitive tables.  Use controls located above the table to:

 * Click the *Refresh* button to update the information displayed in each table.
@@ -56,6 +62,23 @@ session:
 * Use the *Details* icon (located in the third column) to open the *Details*
  tab; the tab displays information about the selected session.

+.. image:: images/dashboard_config.png
+    :alt: Dashboard Activity
+    :align: center
+
+Click the *Configuration* tab to get the server configuration details.
+
+
+.. image:: images/dashboard_logs.png
+    :alt: Dashboard Activity
+    :align: center
+
+Click the *Logs* tab to get the server logs.
+
+* Use the Log Format switch to select the format you want. Text/Plain, JSON and CSV are supported.
+  The enable/disable state of the log format depends on the Postgresql.conf setting.
+* Use the Logs in tabular format? switch if you want to see the logs in a tabular format.
+
 Click the *System Statistics* tab to get the statistics for the system:

 .. image:: images/main_dashboard_sys_statistics_summary.png
@@ -14,12 +14,12 @@
              {% trans copyright=copyright|e %}<li class="left" style="margin-left: 10px">&#169; Copyright {{ copyright }}.</li>{% endtrans %}
              {%- endif %}
            {%- endif %}
-            <li class="right" style="margin-right: 10px"><a href="genindex.html" title="General Index" accesskey="I">index</a></li>
+            <li class="right" style="margin-right: 10px"><a href="genindex.html" title="General Index">index</a></li>
            {%- if next %}
-            <li class="right" ><a href="{{ next.link|e }}" title="{{ next.title|striptags|e }}" accesskey="N">next</a> |</li>
+            <li class="right" ><a href="{{ next.link|e }}" title="{{ next.title|striptags|e }}">next</a> |</li>
            {%- endif %}
            {%- if prev %}
-            <li class="right" ><a href="{{ prev.link|e }}" title="{{ prev.title|striptags|e }}" accesskey="P">previous</a> |</li>
+            <li class="right" ><a href="{{ prev.link|e }}" title="{{ prev.title|striptags|e }}">previous</a> |</li>
            {%- endif %}
          </ul>
        </div>
@@ -37,6 +37,7 @@ and modify the values for the following parameters:
    The default value is REMOTE_USER and the possible values are REMOTE_USER,
    HTTP_X_FORWARDED_USER, X-Forwarded-User."

+.. note:: If REMOTE_USER does not work, try replacing it with either REMOTE-USER or Remote-user.

 Master Password
 ===============
@@ -21,7 +21,7 @@ _setup_dirs
 _create_python_virtualenv "debian"
 _build_runtime
 _build_docs "debian"
-_copy_code
+_copy_code "debian"
 _generate_sbom

 #
@@ -57,6 +57,7 @@ Description: The core server package for pgAdmin. pgAdmin is the most popular an
 EOF

 # Build the Debian package for the server
+chmod -R u+rwX,go+rX,go-w "${SERVERROOT}"
 fakeroot dpkg-deb --build "${SERVERROOT}" "${DISTROOT}/${APP_NAME}-server_${APP_LONG_VERSION}_${OS_ARCH}.deb"

 #
@@ -67,6 +68,27 @@ fakeroot dpkg-deb --build "${SERVERROOT}" "${DISTROOT}/${APP_NAME}-server_${APP_
 echo "Creating the desktop package..."
 mkdir "${DESKTOPROOT}/DEBIAN"

+# Ubuntu 24 requires apparmor profile to work.
+OS_ID=$(grep "^ID=" /etc/os-release | awk -F "=" '{ print $2 }')
+OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g' | awk -F "." '{ print $1 }')
+
+if [ "${OS_ID}" == 'ubuntu' ] && [ "${OS_VERSION}" -ge "24" ]; then
+  cat << EOF > "${DESKTOPROOT}/DEBIAN/conffiles"
+/etc/apparmor.d/pgadmin4
+EOF
+
+  mkdir -p "${DESKTOPROOT}/etc/apparmor.d"
+  cp "${SOURCEDIR}/pkg/debian/pgadmin4-aa-profile" "${DESKTOPROOT}/etc/apparmor.d/pgadmin4"
+
+  cat << EOF > "${DESKTOPROOT}/DEBIAN/postinst"
+#!/bin/sh
+
+echo "Load apparmor pgAdmin profile..."
+apparmor_parser -r /etc/apparmor.d/pgadmin4
+EOF
+  chmod 755 "${DESKTOPROOT}/DEBIAN/postinst"
+fi
+
 cat << EOF > "${DESKTOPROOT}/DEBIAN/control"
 Package: ${APP_NAME}-desktop
 Version: ${APP_LONG_VERSION}
@@ -79,6 +101,7 @@ Description: The desktop user interface for pgAdmin. pgAdmin is the most popular
 EOF

 # Build the Debian package for the desktop
+chmod -R u+rwX,go+rX,go-w "${DESKTOPROOT}"
 fakeroot dpkg-deb --build "${DESKTOPROOT}" "${DISTROOT}/${APP_NAME}-desktop_${APP_LONG_VERSION}_${OS_ARCH}.deb"

 #
@@ -108,6 +131,7 @@ mkdir -p "${WEBROOT}/etc/apache2/conf-available"
 cp "${SOURCEDIR}/pkg/debian/pgadmin4.conf" "${WEBROOT}/etc/apache2/conf-available"

 # Build the Debian package for the web
+chmod -R u+rwX,go+rX,go-w "${WEBROOT}"
 fakeroot dpkg-deb --build "${WEBROOT}" "${DISTROOT}/${APP_NAME}-web_${APP_LONG_VERSION}_all.deb"

 #
@@ -0,0 +1,12 @@
+# This profile allows everything and only exists to give the
+# application a name instead of having the label "unconfined"
+
+abi <abi/4.0>,
+include <tunables/global>
+
+profile pgadmin4 /usr/pgadmin4/bin/pgadmin4 flags=(unconfined) {
+  userns,
+
+  # Site-specific additions and overrides. See local/README for details.
+  include if exists <local/pgadmin4>
+}
@@ -37,16 +37,37 @@ EOF
    done
 fi

-if [ ! -f /var/lib/pgadmin/pgadmin4.db ]; then
+# Check whether the external configuration database exists if it is being used.
+external_config_db_exists="False"
+if [ -n "${PGADMIN_CONFIG_CONFIG_DATABASE_URI}" ]; then
+     external_config_db_exists=$(cd /pgadmin4/pgadmin/utils && /venv/bin/python3 -c "from check_external_config_db import check_external_config_db; val = check_external_config_db(${PGADMIN_CONFIG_CONFIG_DATABASE_URI}); print(val)")
+fi
+
+if [ ! -f /var/lib/pgadmin/pgadmin4.db ] && [ "${external_config_db_exists}" = "False" ]; then
    if [ -z "${PGADMIN_DEFAULT_EMAIL}" ] || { [ -z "${PGADMIN_DEFAULT_PASSWORD}" ] && [ -z "${PGADMIN_DEFAULT_PASSWORD_FILE}" ]; }; then
        echo 'You need to define the PGADMIN_DEFAULT_EMAIL and PGADMIN_DEFAULT_PASSWORD or PGADMIN_DEFAULT_PASSWORD_FILE environment variables.'
        exit 1
    fi

-    if ! echo "${PGADMIN_DEFAULT_EMAIL}" | grep -E "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$" > /dev/null; then
-        echo "'${PGADMIN_DEFAULT_EMAIL}' does not appear to be a valid email address. Please reset the PGADMIN_DEFAULT_EMAIL environment variable and try again."
-        exit 1
+    # Validate PGADMIN_DEFAULT_EMAIL
+    CHECK_EMAIL_DELIVERABILITY="False"
+    if [ -n "${PGADMIN_CONFIG_CHECK_EMAIL_DELIVERABILITY}" ]; then
+        CHECK_EMAIL_DELIVERABILITY=${PGADMIN_CONFIG_CHECK_EMAIL_DELIVERABILITY}
    fi
+    ALLOW_SPECIAL_EMAIL_DOMAINS="[]"
+    if [ -n "${PGADMIN_CONFIG_ALLOW_SPECIAL_EMAIL_DOMAINS}" ]; then
+        ALLOW_SPECIAL_EMAIL_DOMAINS=${PGADMIN_CONFIG_ALLOW_SPECIAL_EMAIL_DOMAINS}
+    fi
+     email_config="{'CHECK_EMAIL_DELIVERABILITY': ${CHECK_EMAIL_DELIVERABILITY}, 'ALLOW_SPECIAL_EMAIL_DOMAINS': ${ALLOW_SPECIAL_EMAIL_DOMAINS}}"
+#    email_config="{'CHECK_EMAIL_DELIVERABILITY': ${CHECK_EMAIL_DELIVERABILITY}}"
+    echo "email config is ${email_config}"
+     is_valid_email=$(cd /pgadmin4/pgadmin/utils && /venv/bin/python3 -c "from validation_utils import validate_email; val = validate_email('${PGADMIN_DEFAULT_EMAIL}', ${email_config}); print(val)")
+     if echo "${is_valid_email}" | grep "False" > /dev/null; then
+         echo "'${PGADMIN_DEFAULT_EMAIL}' does not appear to be a valid email address. Please reset the PGADMIN_DEFAULT_EMAIL environment variable and try again."
+         exit 1
+     fi
+    # Switch back to root directory for further process
+    cd /pgadmin4

    # Read secret contents
    if [ -n "${PGADMIN_DEFAULT_PASSWORD_FILE}" ]; then