Fixed API test case for restore.

2) Fixed LDAP injection vulnerability in LDAP authentication flow (CVE-2025-12764). #9325

.github/ISSUE_TEMPLATE/bug_report.md

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

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

@@ -22,7 +22,7 @@ jobs:
       - name: Upgrade yarn
         run: |
           yarn set version berry
-          yarn set version 3
+          yarn set version 4
 
       - name: Install Node modules
         run: |

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

@@ -144,7 +144,7 @@ jobs:
       - name: Upgrade yarn
         run: |
           yarn set version berry
-          yarn set version 3
+          yarn set version 4
 
       - name: Build the JS bundle
         run: |

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

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgver: [13, 14, 15, 16, 17]
+        pgver: [13, 14, 15, 16, 17, 18]
 
     runs-on: ubuntu-22.04
 
@@ -32,6 +32,18 @@ jobs:
           sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
           wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 
+      - name: Uninstall PostgreSQL if already present
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
       - name: Install platform dependencies
         run: |
           sudo apt update
@@ -119,7 +131,7 @@ jobs:
                 "comment": "PostgreSQL ${{ matrix.pgver }} Server",
                 "db_username": "postgres",
                 "host": "/var/run/postgresql",
-                "db_password": "postgres",
+                "db_password": "",
                 "db_port": 59${{ matrix.pgver }},
                 "maintenance_db": "postgres",
                 "sslmode": "prefer",
@@ -142,7 +154,7 @@ jobs:
       - name: Upgrade yarn
         run: |
           yarn set version berry
-          yarn set version 3
+          yarn set version 4
 
       - name: Build the JS bundle
         run: |

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

@@ -31,7 +31,7 @@ jobs:
       - name: Upgrade yarn
         run: |
           yarn set version berry
-          yarn set version 3
+          yarn set version 4
 
       - name: Install Node modules
         run: |

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

@@ -39,6 +39,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Update python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
       - name: Setup the EDB APT repo on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
@@ -48,7 +53,7 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev edb-as${{ matrix.pgver }}-server edb-as${{ matrix.pgver }}-server-pldebugger edb-as${{ matrix.pgver }}-postgis34
 
       - name: Install pgagent on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
@@ -68,6 +73,14 @@ jobs:
           IF %ERRORLEVEL% EQU 3010 cmd /c "exit /b 0"
         shell: cmd
 
+      - name: Add pg_config path to PATH
+        shell: pwsh
+        run: |
+          $pgPath = "C:\\EPAS\\${{ matrix.pgver }}\\bin"
+          Write-Output $pgPath
+          Add-Content -Path $env:GITHUB_PATH -Value $pgPath
+          pg_config --version
+
       - name: Create the tablespace directory on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
@@ -105,6 +118,10 @@ jobs:
       - name: Create pgagent extension on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' &&  matrix.pgver <= 16 }}
         run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS pgagent;'
+      
+      - name: Create postgis extension on Linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: psql -U enterprisedb -d postgres -p 58${{ matrix.pgver }} -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
 
       - name: Install Python dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}

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

@@ -21,24 +21,42 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-22.04, windows-latest]
-        pgver: [13, 14, 15, 16, 17]
+        pgver: [13, 14, 15, 16, 17, 18]
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
 
+      - name: Update python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
       - name: Setup the PGDG APT repo on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
           wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
 
+      - name: Uninstall PostgreSQL if already present on linux
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: |
+          if [ -n "$(ls /etc/postgresql/*/*/postgresql.conf 2>/dev/null)" ]; then
+            # Extract the major version from pg_config
+            installed_pg_version=$( pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1 )
+            echo "Installed PostgreSQL version: $installed_pg_version"
+            if [ $installed_pg_version != ${{ matrix.pgver }} ]; then
+              sudo pg_dropcluster $installed_pg_version main --stop
+              sudo apt-get -y remove "postgresql-${installed_pg_version}"
+            fi
+          fi
+
       - name: Install platform dependencies on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
-          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent
+          sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent postgresql-${{ matrix.pgver }}-postgis-3
 
       - name: Install platform dependencies on macOS
         if: ${{ matrix.os == 'macos-latest' }}
@@ -46,7 +64,8 @@ jobs:
           brew install postgresql@${{ matrix.pgver }}
           echo "/opt/homebrew/opt/postgresql@${{ matrix.pgver }}/bin" >> $GITHUB_PATH
 
-      - name: Uninstall PostgreSQL if already present
+
+      - name: Uninstall PostgreSQL if already present on windows
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
           if exist "C:\Program Files\PostgreSQL\{{ matrix.pgver }}\uninstall-postgresql.exe" (
@@ -60,13 +79,21 @@ jobs:
         run: |
           FOR /f "delims=" %%F IN ('python tools\get_sb_package.py "https://www.postgresql.org/applications-v2.xml" "postgresql_${{ matrix.pgver }}" "windows-x64"') DO SET INSTALLER_EXE=%%F
           ECHO Running %INSTALLER_EXE%...
-          %INSTALLER_EXE% --prefix C:\PostgreSQL\${{ matrix.pgver }} --datadir C:\PostgreSQL\${{ matrix.pgver }}\data --serverport 59${{ matrix.pgver }} --superpassword postgres --install_runtimes 0 --mode unattended --unattendedmodeui none --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
+          %INSTALLER_EXE% --prefix C:\PostgreSQL_custom\${{ matrix.pgver }} --datadir C:\PostgreSQL_custom\${{ matrix.pgver }}\data --serverport 59${{ matrix.pgver }} --superpassword postgres --install_runtimes 0 --mode unattended --unattendedmodeui none --disable-components pgAdmin,stackbuilder --enable-components server,commandlinetools"
           choco install -y mitkerberos
 
           REM Ignore error 3010 (reboot required)
           IF %ERRORLEVEL% EQU 3010 cmd /c "exit /b 0"
         shell: cmd
 
+      - name: Add pg_config path to PATH
+        shell: pwsh
+        run: |
+          $pgPath = "C:\\PostgreSQL_custom\\${{ matrix.pgver }}\\bin"
+          Write-Output $pgPath
+          Add-Content -Path $env:GITHUB_PATH -Value $pgPath
+          pg_config --version
+
       - name: Create the tablespace directory on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
@@ -100,6 +127,7 @@ jobs:
 
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pgagent;'
           psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION pldbgapi;'
+          psql -U postgres -p 59${{ matrix.pgver }} -c 'CREATE EXTENSION postgis;'
 
       - name: Start PostgreSQL on macOS
         if: ${{ matrix.os == 'macos-latest' }}

.pycodestyle

@@ -6,4 +6,4 @@ show-source = False
 show-pep8 = False
 count = True
 format = pylint
-exclude = migrations,node_modules,config_local.py,config_distro.py
+exclude = node_modules,config_local.py,config_distro.py

.python-version

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

DEPENDENCIES

@@ -1,586 +0,0 @@
-pgAdmin 4 Dependency Inventory
-==============================
-
-pgAdmin 4 is built on Python, Javascript and NW.js (node-webkit), and is
-dependent on various third party libraries. These are automatically compiled
-from the system, requirements.txt and packages.json and listed below.
-
-Runtime Dependencies
-====================
-
-Name                                                             Version          Licence                              URL
-----                                                             -------          -------                              ---
-Python                                                           3.6+             PSF                                  https://www.python.org/
-nw                                                               0.50.2           MIT                                  git://github.com/nwjs/npm-installer.git
-asynckit                                                         0.4.0            MIT                                  git+https://github.com/alexindigo/asynckit.git
-axios                                                            1.4.0            MIT                                  https://github.com/axios/axios.git
-bootstrap                                                        4.6.2            MIT                                  git+https://github.com/twbs/bootstrap.git
-combined-stream                                                  1.0.8            MIT                                  git://github.com/felixge/node-combined-stream.git
-delayed-stream                                                   1.0.0            MIT                                  git://github.com/felixge/node-delayed-stream.git
-follow-redirects                                                 1.15.2           MIT                                  git@github.com:follow-redirects/follow-redirects.git
-form-data                                                        4.0.0            MIT                                  git://github.com/form-data/form-data.git
-mime-db                                                          1.52.0           MIT                                  https://github.com/jshttp/mime-db.git
-mime-types                                                       2.1.35           MIT                                  https://github.com/jshttp/mime-types.git
-proxy-from-env                                                   1.1.0            MIT                                  https://github.com/Rob--W/proxy-from-env.git
-
-12 dependencies listed.
-
-Python Dependencies
-===================
-
-Name                                                             Version          Licence                              URL
-----                                                             -------          -------                              ---
-Flask                                                            2.2.4            BSD-3-Clause                         https://palletsprojects.com/p/flask
-Flask-Gravatar                                                   0.5.0            BSD                                  https://github.com/zzzsochi/Flask-Gravatar/
-Flask-Login                                                      0.6.2            MIT                                  https://github.com/maxcountryman/flask-login
-Flask-Mail                                                       0.9.1            BSD                                  https://github.com/rduplain/flask-mail
-Flask-Migrate                                                    4.0.4            MIT                                  https://github.com/miguelgrinberg/flask-migrate
-Flask-SQLAlchemy                                                 3.0.3            BSD-3-Clause                         Unknown
-Flask-WTF                                                        1.1.1            BSD-3-Clause                         https://github.com/wtforms/flask-wtf/
-Flask-Compress                                                   1.13             MIT                                  https://github.com/colour-science/flask-compress
-Flask-Paranoid                                                   0.3.0            UNKNOWN                              https://github.com/miguelgrinberg/flask-paranoid
-flask-babel                                                      3.1.0            BSD-3-Clause                         https://github.com/python-babel/flask-babel
-Flask-Security-Too                                               5.1.2            MIT                                  https://github.com/Flask-Middleware/flask-security
-Flask-SocketIO                                                   5.3.3            Unknown                              https://github.com/miguelgrinberg/flask-socketio
-WTForms                                                          3.0.1            BSD-3-Clause                         https://wtforms.readthedocs.io/
-passlib                                                          1.7.4            BSD                                  https://passlib.readthedocs.io
-pytz                                                             2023.3           MIT                                  http://pythonhosted.org/pytz
-speaklater3                                                      1.4              UNKNOWN                              https://github.com/ThomasWaldmann/speaklater
-sqlparse                                                         0.4.4            Unknown                              Unknown
-psutil                                                           5.9.5            BSD-3-Clause                         https://github.com/giampaolo/psutil
-psycopg                                                          3.1.8            GNU Lesser General Public License v3 (LGPLv3) https://psycopg.org/psycopg3/
-python-dateutil                                                  2.8.2            Dual License                         https://github.com/dateutil/dateutil
-SQLAlchemy                                                       2.0.11           MIT                                  https://www.sqlalchemy.org
-bcrypt                                                           4.0.1            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
-cryptography                                                     40.0.2           (Apache-2.0 OR BSD-3-Clause) AND PSF-2.0 https://github.com/pyca/cryptography
-sshtunnel                                                        0.4.0            MIT                                  https://github.com/pahaz/sshtunnel
-ldap3                                                            2.9.1            LGPL v3                              https://github.com/cannatag/ldap3
-gssapi                                                           1.8.2            LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
-eventlet                                                         0.33.3           Unknown                              http://eventlet.net
-httpagentparser                                                  1.9.5            http://www.opensource.org/licenses/mit-license.php https://github.com/shon/httpagentparser
-user-agents                                                      2.2.0            MIT                                  https://github.com/selwin/python-user-agents
-pywinpty                                                         2.0.*            Unknown                              Unknown
-Authlib                                                          1.2.0            BSD 3-Clause License                 https://authlib.org/
-pyotp                                                            2.8.0            MIT License                          https://github.com/pyotp/pyotp
-qrcode                                                           7.4.2            BSD                                  https://github.com/lincolnloop/python-qrcode
-Pillow                                                           9.5.0            HPND                                 https://python-pillow.org
-boto3                                                            1.26.121         Apache License 2.0                   https://github.com/boto/boto3
-botocore                                                         1.29.121         Apache License 2.0                   https://github.com/boto/botocore
-urllib3                                                          1.26.15          MIT                                  https://urllib3.readthedocs.io/
-azure-mgmt-rdbms                                                 10.1.0           MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-mgmt-resource                                              23.0.1           MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-mgmt-subscription                                          3.1.1            MIT License                          https://github.com/Azure/azure-sdk-for-python
-azure-identity                                                   1.13.0           MIT License                          https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity
-google-api-python-client                                         2.86.0           Apache 2.0                           https://github.com/googleapis/google-api-python-client/
-google-auth-oauthlib                                             1.0.0            Apache 2.0                           https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib
-Werkzeug                                                         2.2.3            BSD-3-Clause                         https://palletsprojects.com/p/werkzeug/
-keyring                                                          23.13.1          Unknown                              https://github.com/jaraco/keyring
-
-NOTE: This report was generated using Python 3.11. Full information may not be
-shown for Python modules that are not required with this version.
-
-45 dependencies listed.
-
-Javascript Dependencies
-=======================
-
-Name                                                             Version          Licence                              URL
-----                                                             -------          -------                              ---
-@ampproject/remapping                                            2.2.1            Apache-2.0                           git+https://github.com/ampproject/remapping.git
-anti-trojan-source                                               1.4.1            Apache-2.0                           https://github.com/lirantal/anti-trojan-source.git
-eve                                                              0.5.4            Apache-2.0                           git@github.com:adobe-webplatform/eve.git
-jmespath                                                         0.16.0           Apache-2.0                           git://github.com/jmespath/jmespath.js
-jsoneditor                                                       9.10.2           Apache-2.0                           https://github.com/josdejong/jsoneditor.git
-paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
-rc-dock                                                          3.2.18           Apache-2.0                           https://github.com/ticlo/rc-dock.git
-rc-new-window                                                    0.1.13           Apache-2.0                           https://github.com/ticlo/rc-new-window.git
-snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
-spdx-correct                                                     3.2.0            Apache-2.0                           https://github.com/jslicense/spdx-correct.js.git
-validate-npm-package-license                                     3.0.4            Apache-2.0                           https://github.com/kemitchell/validate-npm-package-license.js.git
-@babel/code-frame                                                7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/compat-data                                               7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/core                                                      7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/generator                                                 7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-annotate-as-pure                                   7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-compilation-targets                                7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-create-class-features-plugin                       7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-environment-visitor                                7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-function-name                                      7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-hoist-variables                                    7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-member-expression-to-functions                     7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-imports                                     7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-transforms                                  7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-optimise-call-expression                           7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-plugin-utils                                       7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-replace-supers                                     7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-simple-access                                      7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-skip-transparent-expression-wrappers               7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-split-export-declaration                           7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-string-parser                                      7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-identifier                               7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-option                                   7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/helpers                                                   7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/highlight                                                 7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/parser                                                    7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-proposal-class-properties                          7.18.6           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-syntax-jsx                                         7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-display-name                       7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-jsx                                7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-jsx-development                    7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/plugin-transform-react-pure-annotations                   7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/preset-react                                              7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/runtime                                                   7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/template                                                  7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/traverse                                                  7.22.5           MIT                                  https://github.com/babel/babel.git
-@babel/types                                                     7.22.5           MIT                                  https://github.com/babel/babel.git
-@date-io/core                                                    1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
-@date-io/date-fns                                                1.3.13           MIT                                  https://github.com/dmtrKovalenko/date-io
-@emotion/babel-plugin                                            11.11.0          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin
-@emotion/cache                                                   11.11.0          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/cache
-@emotion/hash                                                    0.8.0            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/hash
-@emotion/hash                                                    0.9.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/hash
-@emotion/is-prop-valid                                           1.2.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/is-prop-valid
-@emotion/memoize                                                 0.8.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/memoize
-@emotion/react                                                   11.11.1          MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
-@emotion/serialize                                               1.1.2            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/serialize
-@emotion/sheet                                                   1.2.2            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/sheet
-@emotion/stylis                                                  0.8.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/stylis
-@emotion/unitless                                                0.8.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/unitless
-@emotion/unitless                                                0.7.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/unitless
-@emotion/use-insertion-effect-with-fallbacks                     1.0.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/use-insertion-effect-with-fallbacks
-@emotion/utils                                                   1.2.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/utils
-@emotion/weak-memoize                                            0.3.1            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/weak-memoize
-@floating-ui/core                                                1.3.1            MIT                                  https://github.com/floating-ui/floating-ui.git
-@floating-ui/dom                                                 1.4.2            MIT                                  https://github.com/floating-ui/floating-ui.git
-@istanbuljs/schema                                               0.1.3            MIT                                  git+https://github.com/istanbuljs/schema.git
-@jridgewell/gen-mapping                                          0.3.3            MIT                                  https://github.com/jridgewell/gen-mapping
-@jridgewell/resolve-uri                                          3.1.0            MIT                                  https://github.com/jridgewell/resolve-uri
-@jridgewell/set-array                                            1.1.2            MIT                                  https://github.com/jridgewell/set-array
-@jridgewell/sourcemap-codec                                      1.4.15           MIT                                  git+https://github.com/jridgewell/sourcemap-codec.git
-@jridgewell/sourcemap-codec                                      1.4.14           MIT                                  git+https://github.com/jridgewell/sourcemap-codec.git
-@jridgewell/trace-mapping                                        0.3.18           MIT                                  git+https://github.com/jridgewell/trace-mapping.git
-@material-ui/core                                                4.12.4           MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/icons                                               4.11.3           MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/lab                                                 4.0.0-alpha.61   MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/pickers                                             3.3.10           MIT                                  https://github.com/mui-org/material-ui-pickers
-@material-ui/styles                                              4.11.5           MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/system                                              4.12.2           MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/types                                               5.1.0            MIT                                  https://github.com/mui-org/material-ui.git
-@material-ui/utils                                               4.11.3           MIT                                  https://github.com/mui-org/material-ui.git
-@nodelib/fs.scandir                                              2.1.5            MIT                                  https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.scandir
-@nodelib/fs.stat                                                 2.0.5            MIT                                  https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.stat
-@nodelib/fs.walk                                                 1.2.8            MIT                                  https://github.com/nodelib/nodelib/tree/master/packages/fs/fs.walk
-@projectstorm/geometry                                           6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-canvas-core                                  6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams                                     6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-core                                6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-defaults                            6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-routing                             6.7.4            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@rc-component/portal                                             1.1.1            MIT                                  https://github.com/react-component/portal.git
-@rc-component/trigger                                            1.13.6           MIT                                  https://github.com/react-component/trigger.git
-@react-dnd/asap                                                  5.0.2            MIT                                  https://github.com/react-dnd/react-dnd
-@react-dnd/invariant                                             4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
-@react-dnd/shallowequal                                          4.0.2            MIT                                  https://github.com/react-dnd/react-dnd
-@remix-run/router                                                1.6.3            MIT                                  https://github.com/remix-run/react-router
-@simonwep/pickr                                                  1.8.2            MIT                                  https://github.com/Simonwep/pickr.git
-@sindresorhus/is                                                 0.7.0            MIT                                  https://github.com/sindresorhus/is.git
-@socket.io/component-emitter                                     3.1.0            MIT                                  https://github.com/socketio/emitter.git
-@szhsin/react-menu                                               2.3.4            MIT                                  https://github.com/szhsin/react-menu.git
-@types/classnames                                                2.3.1            MIT                                  Unknown
-@types/minimist                                                  1.2.2            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/node                                                      20.3.1           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/normalize-package-data                                    2.4.1            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/parse-json                                                4.0.0            MIT                                  https://www.github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/prop-types                                                15.7.5           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     18.2.13          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     16.14.43         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react                                                     17.0.62          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react-dom                                                 17.0.20          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/react-transition-group                                    4.4.6            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/scheduler                                                 0.16.3           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/styled-jsx                                                2.2.9            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-ajv                                                              8.12.0           MIT                                  https://github.com/ajv-validator/ajv.git
-ajv                                                              6.12.6           MIT                                  https://github.com/ajv-validator/ajv.git
-ansi-styles                                                      3.2.1            MIT                                  https://github.com/chalk/ansi-styles.git
-array-union                                                      3.0.1            MIT                                  https://github.com/sindresorhus/array-union.git
-arrify                                                           1.0.1            MIT                                  https://github.com/sindresorhus/arrify.git
-aspen-core                                                       1.0.5            MIT                                  git+https://github.com/neeksandhu/aspen-core.git
-aspen-decorations                                                1.1.1            MIT                                  git+https://github.com/neeksandhu/aspen-decorations.git
-aspen-tree-model                                                 1.0.5            MIT                                  git+https://github.com/neeksandhu/aspen-tree-model.git
-async                                                            2.6.4            MIT                                  https://github.com/caolan/async.git
-attr-accept                                                      2.2.2            MIT                                  https://github.com/react-dropzone/attr-accept.git
-axios                                                            0.21.4           MIT                                  https://github.com/axios/axios.git
-babel-plugin-macros                                              3.1.0            MIT                                  https://github.com/kentcdodds/babel-plugin-macros
-babel-plugin-styled-components                                   2.1.3            MIT                                  https://github.com/styled-components/babel-plugin-styled-components.git
-babel-plugin-syntax-jsx                                          6.18.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-jsx
-babelify                                                         10.0.0           MIT                                  https://github.com/babel/babelify.git
-balanced-match                                                   1.0.2            MIT                                  git://github.com/juliangruber/balanced-match.git
-base64-arraybuffer                                               1.0.2            MIT                                  https://github.com/niklasvh/base64-arraybuffer
-bignumber.js                                                     9.1.1            MIT                                  https://github.com/MikeMcl/bignumber.js.git
-bootstrap                                                        4.6.2            MIT                                  git+https://github.com/twbs/bootstrap.git
-bowser                                                           2.11.0           MIT                                  git+https://github.com/lancedikson/bowser.git
-brace                                                            0.11.1           MIT                                  git://github.com/thlorenz/brace.git
-brace-expansion                                                  1.1.11           MIT                                  git://github.com/juliangruber/brace-expansion.git
-braces                                                           3.0.2            MIT                                  https://github.com/micromatch/braces.git
-browserfs                                                        1.4.3            MIT                                  https://github.com/jvilk/BrowserFS.git
-browserslist                                                     4.21.9           MIT                                  https://github.com/browserslist/browserslist.git
-callsites                                                        3.1.0            MIT                                  https://github.com/sindresorhus/callsites.git
-camelcase                                                        6.3.0            MIT                                  https://github.com/sindresorhus/camelcase.git
-camelcase-keys                                                   7.0.2            MIT                                  https://github.com/sindresorhus/camelcase-keys.git
-camelize                                                         1.0.1            MIT                                  git://github.com/ljharb/camelize.git
-caniuse-api                                                      3.0.0            MIT                                  https://github.com/nyalab/caniuse-api.git
-chalk                                                            2.4.2            MIT                                  https://github.com/chalk/chalk.git
-chart.js                                                         3.9.1            MIT                                  https://github.com/chartjs/Chart.js.git
-chartjs-plugin-zoom                                              2.0.1            MIT                                  https://github.com/chartjs/chartjs-plugin-zoom.git
-classnames                                                       2.3.2            MIT                                  https://github.com/JedWatson/classnames.git
-closest                                                          0.0.1            MIT                                  https://github.com/ForbesLindesay/closest.git
-clsx                                                             1.2.1            MIT                                  https://github.com/lukeed/clsx.git
-codemirror                                                       5.65.13          MIT                                  https://github.com/codemirror/CodeMirror.git
-color-convert                                                    1.9.3            MIT                                  https://github.com/Qix-/color-convert.git
-color-name                                                       1.1.3            MIT                                  git@github.com:dfcreative/color-name.git
-colord                                                           2.9.3            MIT                                  https://github.com/omgovich/colord.git
-commander                                                        7.2.0            MIT                                  https://github.com/tj/commander.js.git
-concat-map                                                       0.0.1            MIT                                  git://github.com/substack/node-concat-map.git
-convert-source-map                                               1.9.0            MIT                                  git://github.com/thlorenz/convert-source-map.git
-convert-units                                                    2.3.4            MIT                                  git://github.com/ben-ng/convert-units.git
-core-js                                                          3.31.0           MIT                                  https://github.com/zloirock/core-js.git
-cosmiconfig                                                      7.1.0            MIT                                  git+https://github.com/davidtheclark/cosmiconfig.git
-css-line-break                                                   2.1.0            MIT                                  git+ssh://git@github.com/niklasvh/css-line-break.git
-css-to-react-native                                              3.2.0            MIT                                  git+https://github.com/styled-components/css-to-react-native.git
-css-tree                                                         1.1.3            MIT                                  https://github.com/csstree/csstree.git
-css-vendor                                                       2.0.8            MIT                                  git@github.com:cssinjs/css-vendor.git
-cssesc                                                           3.0.0            MIT                                  https://github.com/mathiasbynens/cssesc.git
-cssnano                                                          5.1.15           MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-preset-default                                           5.2.14           MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-utils                                                    3.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-csso                                                             4.2.0            MIT                                  https://github.com/css/csso.git
-csstype                                                          2.6.21           MIT                                  https://github.com/frenic/csstype
-csstype                                                          3.1.2            MIT                                  https://github.com/frenic/csstype
-dagre                                                            0.8.5            MIT                                  https://github.com/dagrejs/dagre.git
-date-fns                                                         2.30.0           MIT                                  https://github.com/date-fns/date-fns
-debug                                                            4.3.4            MIT                                  git://github.com/debug-js/debug.git
-decamelize                                                       5.0.1            MIT                                  https://github.com/sindresorhus/decamelize.git
-decamelize                                                       1.2.0            MIT                                  https://github.com/sindresorhus/decamelize.git
-decamelize-keys                                                  1.1.1            MIT                                  https://github.com/sindresorhus/decamelize-keys.git
-deep-diff                                                        1.0.2            MIT                                  git://github.com/flitbit/diff.git
-diff-arrays-of-objects                                           1.1.9            MIT                                  git+https://github.com/malcolmvr/diff-arrays-of-objects.git
-dir-glob                                                         3.0.1            MIT                                  https://github.com/kevva/dir-glob.git
-dnd-core                                                         16.0.1           MIT                                  https://github.com/react-dnd/react-dnd.git
-dom-align                                                        1.12.4           MIT                                  git@github.com:yiminghe/dom-align.git
-dom-helpers                                                      5.2.1            MIT                                  git+https://github.com/react-bootstrap/dom-helpers.git
-dom-serializer                                                   1.4.1            MIT                                  git://github.com/cheeriojs/dom-renderer.git
-engine.io-client                                                 6.5.0            MIT                                  https://github.com/socketio/engine.io-client.git
-engine.io-parser                                                 5.1.0            MIT                                  git@github.com:socketio/engine.io-parser.git
-error-ex                                                         1.3.2            MIT                                  https://github.com/qix-/node-error-ex.git
-escalade                                                         3.1.1            MIT                                  https://github.com/lukeed/escalade.git
-escape-string-regexp                                             1.0.5            MIT                                  https://github.com/sindresorhus/escape-string-regexp.git
-escape-string-regexp                                             4.0.0            MIT                                  https://github.com/sindresorhus/escape-string-regexp.git
-fast-deep-equal                                                  3.1.3            MIT                                  git+https://github.com/epoberezkin/fast-deep-equal.git
-fast-glob                                                        3.2.12           MIT                                  https://github.com/mrmlnc/fast-glob.git
-fast-json-stable-stringify                                       2.1.0            MIT                                  git://github.com/epoberezkin/fast-json-stable-stringify.git
-fast-memoize                                                     2.5.2            MIT                                  git+https://github.com/caiogondim/fast-memoize.git
-file-selector                                                    0.6.0            MIT                                  https://github.com/react-dropzone/file-selector.git
-filename-reserved-regex                                          2.0.0            MIT                                  https://github.com/sindresorhus/filename-reserved-regex.git
-fill-range                                                       7.0.1            MIT                                  https://github.com/jonschlinkert/fill-range.git
-find-root                                                        1.1.0            MIT                                  git@github.com:js-n/find-root.git
-find-up                                                          5.0.0            MIT                                  https://github.com/sindresorhus/find-up.git
-follow-redirects                                                 1.15.2           MIT                                  git@github.com:follow-redirects/follow-redirects.git
-function-bind                                                    1.1.1            MIT                                  git://github.com/Raynos/function-bind.git
-gensync                                                          1.0.0-beta.2     MIT                                  https://github.com/loganfsmyth/gensync.git
-globals                                                          11.12.0          MIT                                  https://github.com/sindresorhus/globals.git
-globby                                                           12.2.0           MIT                                  https://github.com/sindresorhus/globby.git
-graphlib                                                         2.1.8            MIT                                  https://github.com/dagrejs/graphlib.git
-hammerjs                                                         2.0.8            MIT                                  git://github.com/hammerjs/hammer.js.git
-hard-rejection                                                   2.1.0            MIT                                  https://github.com/sindresorhus/hard-rejection.git
-has                                                              1.0.3            MIT                                  git://github.com/tarruda/has.git
-has-flag                                                         3.0.0            MIT                                  https://github.com/sindresorhus/has-flag.git
-has-flag                                                         4.0.0            MIT                                  https://github.com/sindresorhus/has-flag.git
-html-escaper                                                     2.0.2            MIT                                  https://github.com/WebReflection/html-escaper.git
-html2canvas                                                      1.4.1            MIT                                  git@github.com:niklasvh/html2canvas.git
-ignore                                                           5.2.4            MIT                                  git@github.com:kaelzhang/node-ignore.git
-immutability-helper                                              3.1.1            MIT                                  git+https://github.com/kolodny/immutability-helper.git
-import-fresh                                                     3.3.0            MIT                                  https://github.com/sindresorhus/import-fresh.git
-indent-string                                                    5.0.0            MIT                                  https://github.com/sindresorhus/indent-string.git
-insert-if                                                        1.2.0            MIT                                  git+https://github.com/chipto/insert-if.git
-ip-address                                                       7.1.0            MIT                                  git://github.com/beaugunderson/ip-address.git
-is-any-array                                                     2.0.1            MIT                                  https://github.com/cheminfo-js/is-any-array.git
-is-arrayish                                                      0.2.1            MIT                                  https://github.com/qix-/node-is-arrayish.git
-is-core-module                                                   2.12.1           MIT                                  git+https://github.com/inspect-js/is-core-module.git
-is-extglob                                                       2.1.1            MIT                                  https://github.com/jonschlinkert/is-extglob.git
-is-glob                                                          4.0.3            MIT                                  https://github.com/micromatch/is-glob.git
-is-in-browser                                                    1.1.3            MIT                                  git+https://github.com/tuxsudo/is-in-browser.git
-is-number                                                        7.0.0            MIT                                  https://github.com/jonschlinkert/is-number.git
-is-plain-obj                                                     1.1.0            MIT                                  https://github.com/sindresorhus/is-plain-obj.git
-is-relative                                                      1.0.0            MIT                                  https://github.com/jonschlinkert/is-relative.git
-is-unc-path                                                      1.0.0            MIT                                  https://github.com/jonschlinkert/is-unc-path.git
-javascript-natural-sort                                          0.7.1            MIT                                  https://github.com/Bill4Time/javascript-natural-sort.git
-jquery                                                           3.7.0            MIT                                  https://github.com/jquery/jquery.git
-jquery-contextmenu                                               2.9.2            MIT                                  git://github.com/swisnl/jQuery-contextMenu.git
-js-tokens                                                        4.0.0            MIT                                  https://github.com/lydell/js-tokens.git
-jsbn                                                             1.1.0            MIT                                  https://github.com/andyperlitch/jsbn.git
-jsesc                                                            2.5.2            MIT                                  https://github.com/mathiasbynens/jsesc.git
-json-bignumber                                                   1.1.1            MIT                                  git@github.com:wbuss/JSONBigNumber.git
-json-parse-even-better-errors                                    2.3.1            MIT                                  https://github.com/npm/json-parse-even-better-errors
-json-schema-traverse                                             1.0.0            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
-json-schema-traverse                                             0.4.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
-json-source-map                                                  0.6.1            MIT                                  git+https://github.com/epoberezkin/json-source-map.git
-json5                                                            2.2.3            MIT                                  git+https://github.com/json5/json5.git
-jss                                                              10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-camel-case                                            10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-default-unit                                          10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-global                                                10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-nested                                                10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-props-sort                                            10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-rule-value-function                                   10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-jss-plugin-vendor-prefixer                                       10.10.0          MIT                                  https://github.com/cssinjs/jss.git
-karma-coverage                                                   2.2.0            MIT                                  git://github.com/karma-runner/karma-coverage.git
-kind-of                                                          6.0.3            MIT                                  https://github.com/jonschlinkert/kind-of.git
-lilconfig                                                        2.1.0            MIT                                  https://github.com/antonk52/lilconfig
-lines-and-columns                                                1.2.4            MIT                                  https://github.com/eventualbuddha/lines-and-columns.git
-locate-path                                                      6.0.0            MIT                                  https://github.com/sindresorhus/locate-path.git
-lodash                                                           4.17.21          MIT                                  https://github.com/lodash/lodash.git
-lodash._basebind                                                 2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._basecreate                                               2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._basecreatecallback                                       2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._basecreatewrapper                                        2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._createwrapper                                            2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._objecttypes                                              2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._renative                                                 2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._setbinddata                                              2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._shimkeys                                                 2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash._slice                                                    2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.bind                                                      2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.foreach                                                   2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.forown                                                    2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.identity                                                  2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.isfunction                                                2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.isobject                                                  2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.keys                                                      2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.memoize                                                   4.1.2            MIT                                  https://github.com/lodash/lodash.git
-lodash.noop                                                      2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.support                                                   2.3.0            MIT                                  https://github.com/lodash/lodash-cli.git
-lodash.uniq                                                      4.5.0            MIT                                  https://github.com/lodash/lodash.git
-loose-envify                                                     1.4.0            MIT                                  git://github.com/zertosh/loose-envify.git
-make-dir                                                         3.1.0            MIT                                  https://github.com/sindresorhus/make-dir.git
-map-obj                                                          4.3.0            MIT                                  https://github.com/sindresorhus/map-obj.git
-map-obj                                                          1.0.1            MIT                                  https://github.com/sindresorhus/map-obj.git
-matches-selector                                                 0.0.1            MIT                                  https://github.com/ForbesLindesay/matches-selector.git
-memoize-one                                                      5.2.1            MIT                                  https://github.com/alexreardon/memoize-one.git
-memoize-one                                                      6.0.0            MIT                                  https://github.com/alexreardon/memoize-one.git
-meow                                                             10.1.5           MIT                                  https://github.com/sindresorhus/meow.git
-merge2                                                           1.4.1            MIT                                  git@github.com:teambition/merge2.git
-micromatch                                                       4.0.5            MIT                                  https://github.com/micromatch/micromatch.git
-min-indent                                                       1.0.1            MIT                                  https://github.com/thejameskyle/min-indent
-minimist-options                                                 4.1.0            MIT                                  https://github.com/vadimdemedes/minimist-options.git
-ml-array-max                                                     1.2.4            MIT                                  git+https://github.com/mljs/array.git
-ml-array-min                                                     1.2.3            MIT                                  git+https://github.com/mljs/array.git
-ml-array-rescale                                                 1.3.7            MIT                                  git+https://github.com/mljs/array.git
-ml-matrix                                                        6.10.4           MIT                                  https://github.com/mljs/matrix.git
-mobius1-selectr                                                  2.4.13           MIT                                  git+https://github.com/Mobius1/Selectr.git
-moment                                                           2.29.4           MIT                                  https://github.com/moment/moment.git
-moment-timezone                                                  0.5.43           MIT                                  https://github.com/moment/moment-timezone.git
-ms                                                               2.1.2            MIT                                  https://github.com/zeit/ms.git
-nanoid                                                           3.3.6            MIT                                  https://github.com/ai/nanoid.git
-nanopop                                                          2.3.0            MIT                                  https://github.com/Simonwep/nanopop.git
-node-releases                                                    2.0.12           MIT                                  https://github.com/chicoxyzzy/node-releases.git
-normalize-url                                                    6.1.0            MIT                                  https://github.com/sindresorhus/normalize-url.git
-notificar                                                        1.0.1            MIT                                  git+https://github.com/neeksandhu/notificar.git
-notistack                                                        1.0.10           MIT                                  git+https://github.com/iamhosseindhv/notistack.git
-object-assign                                                    4.1.1            MIT                                  https://github.com/sindresorhus/object-assign.git
-p-limit                                                          3.1.0            MIT                                  https://github.com/sindresorhus/p-limit.git
-p-locate                                                         5.0.0            MIT                                  https://github.com/sindresorhus/p-locate.git
-p-reduce                                                         1.0.0            MIT                                  https://github.com/sindresorhus/p-reduce.git
-p-series                                                         1.1.0            MIT                                  https://github.com/sindresorhus/p-series.git
-parent-module                                                    1.0.1            MIT                                  https://github.com/sindresorhus/parent-module.git
-parse-json                                                       5.2.0            MIT                                  https://github.com/sindresorhus/parse-json.git
-path-exists                                                      4.0.0            MIT                                  https://github.com/sindresorhus/path-exists.git
-path-fx                                                          2.1.2            MIT                                  git+https://github.com/NeekSandhu/path-fx.git
-path-parse                                                       1.0.7            MIT                                  https://github.com/jbgutierrez/path-parse.git
-path-type                                                        4.0.0            MIT                                  https://github.com/sindresorhus/path-type.git
-pathfinding                                                      0.4.18           MIT                                  git://github.com/qiao/PathFinding.js.git
-performance-now                                                  2.1.0            MIT                                  git://github.com/braveg1rl/performance-now.git
-picomatch                                                        2.3.1            MIT                                  https://github.com/micromatch/picomatch.git
-picomodal                                                        3.0.0            MIT                                  https://github.com/Nycto/PicoModal.git
-popper.js                                                        1.16.1-lts       MIT                                  git+https://github.com/FezVrasta/popper.js.git
-popper.js                                                        1.16.1           MIT                                  git+https://github.com/FezVrasta/popper.js.git
-postcss                                                          8.4.24           MIT                                  https://github.com/postcss/postcss.git
-postcss-calc                                                     8.2.4            MIT                                  https://github.com/postcss/postcss-calc.git
-postcss-colormin                                                 5.3.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-convert-values                                           5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-comments                                         5.1.2            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-duplicates                                       5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-empty                                            5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-overridden                                       5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-longhand                                           5.1.7            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-rules                                              5.1.4            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-font-values                                       5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-gradients                                         5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-params                                            5.1.4            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-selectors                                         5.2.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-charset                                        5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-display-values                                 5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-positions                                      5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-repeat-style                                   5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-string                                         5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-timing-functions                               5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-unicode                                        5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-url                                            5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-whitespace                                     5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-ordered-values                                           5.1.3            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-initial                                           5.1.2            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-transforms                                        5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-selector-parser                                          6.0.13           MIT                                  https://github.com/postcss/postcss-selector-parser.git
-postcss-svgo                                                     5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-unique-selectors                                         5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-value-parser                                             4.2.0            MIT                                  https://github.com/TrySound/postcss-value-parser.git
-prop-types                                                       15.8.1           MIT                                  https://github.com/facebook/prop-types.git
-punycode                                                         2.3.0            MIT                                  https://github.com/mathiasbynens/punycode.js.git
-queue-microtask                                                  1.2.3            MIT                                  git://github.com/feross/queue-microtask.git
-quick-lru                                                        5.1.1            MIT                                  https://github.com/sindresorhus/quick-lru.git
-raf                                                              3.4.1            MIT                                  git://github.com/chrisdickinson/raf.git
-rc-align                                                         4.0.15           MIT                                  git@github.com:react-component/align.git
-rc-dropdown                                                      3.6.2            MIT                                  git@github.com:react-component/dropdown.git
-rc-dropdown                                                      4.0.1            MIT                                  git@github.com:react-component/dropdown.git
-rc-menu                                                          9.9.2            MIT                                  git@github.com:react-component/menu.git
-rc-menu                                                          9.6.4            MIT                                  git@github.com:react-component/menu.git
-rc-motion                                                        2.7.3            MIT                                  git@github.com:react-component/motion.git
-rc-overflow                                                      1.3.1            MIT                                  git@github.com:react-component/overflow.git
-rc-resize-observer                                               1.3.1            MIT                                  git@github.com:react-component/resize-observer.git
-rc-tabs                                                          11.16.1          MIT                                  git@github.com:react-component/tabs.git
-rc-trigger                                                       5.3.4            MIT                                  https://github.com/react-component/trigger.git
-rc-util                                                          5.34.0           MIT                                  git@github.com:react-component/util.git
-re-resizable                                                     6.9.6            MIT                                  https://github.com/bokuweb/react-resizable-box.git
-react                                                            17.0.2           MIT                                  https://github.com/facebook/react.git
-react-aspen                                                      1.2.0            MIT                                  https://github.com/neeksandhu/react-aspen.git
-react-checkbox-tree                                              1.8.0            MIT                                  https://github.com/jakezatecky/react-checkbox-tree
-react-data-grid                                                  7.0.0-beta.14    MIT                                  https://github.com/adazzle/react-data-grid.git
-react-dnd                                                        16.0.1           MIT                                  https://github.com/react-dnd/react-dnd.git
-react-dnd-html5-backend                                          16.0.1           MIT                                  https://github.com/react-dnd/react-dnd.git
-react-dom                                                        17.0.2           MIT                                  https://github.com/facebook/react.git
-react-draggable                                                  4.4.5            MIT                                  https://github.com/react-grid-layout/react-draggable.git
-react-dropzone                                                   14.2.3           MIT                                  https://github.com/react-dropzone/react-dropzone.git
-react-is                                                         17.0.2           MIT                                  https://github.com/facebook/react.git
-react-is                                                         16.13.1          MIT                                  https://github.com/facebook/react.git
-react-resize-detector                                            9.1.0            MIT                                  git+https://github.com/maslianok/react-resize-detector.git
-react-rnd                                                        10.4.1           MIT                                  https://github.com/bokuweb/react-rnd.git
-react-router                                                     6.13.0           MIT                                  https://github.com/remix-run/react-router
-react-router-dom                                                 6.13.0           MIT                                  https://github.com/remix-run/react-router
-react-select                                                     5.7.3            MIT                                  https://github.com/JedWatson/react-select/tree/master/packages/react-select
-react-table                                                      7.8.0            MIT                                  https://github.com/tannerlinsley/react-table
-react-transition-state                                           1.1.5            MIT                                  https://github.com/szhsin/react-transition-state.git
-react-virtualized-auto-sizer                                     1.0.20           MIT                                  https://github.com/bvaughn/react-virtualized-auto-sizer.git
-react-window                                                     1.8.9            MIT                                  https://github.com/bvaughn/react-window.git
-read-pkg                                                         6.0.0            MIT                                  https://github.com/sindresorhus/read-pkg.git
-read-pkg-up                                                      8.0.0            MIT                                  https://github.com/sindresorhus/read-pkg-up.git
-redent                                                           4.0.0            MIT                                  https://github.com/sindresorhus/redent.git
-redux                                                            4.2.1            MIT                                  https://github.com/reduxjs/redux.git
-regenerator-runtime                                              0.13.11          MIT                                  https://github.com/facebook/regenerator/tree/main/packages/runtime
-require-from-string                                              2.0.2            MIT                                  https://github.com/floatdrop/require-from-string.git
-resize-observer-polyfill                                         1.5.1            MIT                                  https://github.com/que-etc/resize-observer-polyfill.git
-resolve                                                          1.22.2           MIT                                  git://github.com/browserify/resolve.git
-resolve-from                                                     4.0.0            MIT                                  https://github.com/sindresorhus/resolve-from.git
-reusify                                                          1.0.4            MIT                                  git+https://github.com/mcollina/reusify.git
-rifm                                                             0.7.0            MIT                                  https://github.com/istarkov/rifm.git
-run-parallel                                                     1.2.0            MIT                                  git://github.com/feross/run-parallel.git
-scheduler                                                        0.20.2           MIT                                  https://github.com/facebook/react.git
-shallowequal                                                     1.1.0            MIT                                  https://github.com/dashed/shallowequal.git
-slash                                                            4.0.0            MIT                                  https://github.com/sindresorhus/slash.git
-snapsvg-cjs                                                      0.0.6            MIT                                  git+https://github.com/geelen/Snap.svg-cjs.git
-socket.io-client                                                 4.7.0            MIT                                  https://github.com/socketio/socket.io-client.git
-socket.io-parser                                                 4.2.4            MIT                                  https://github.com/socketio/socket.io-parser.git
-spdx-expression-parse                                            3.0.1            MIT                                  https://github.com/jslicense/spdx-expression-parse.js.git
-split.js                                                         1.6.5            MIT                                  https://github.com/nathancahill/split
-stable                                                           0.1.8            MIT                                  https://github.com/Two-Screen/stable.git
-strip-indent                                                     4.0.0            MIT                                  https://github.com/sindresorhus/strip-indent.git
-styled-components                                                5.3.11           MIT                                  git+https://github.com/styled-components/styled-components.git
-stylehacks                                                       5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
-stylis                                                           4.2.0            MIT                                  https://github.com/thysultan/stylis.js
-supports-color                                                   5.5.0            MIT                                  https://github.com/chalk/supports-color.git
-supports-color                                                   7.2.0            MIT                                  https://github.com/chalk/supports-color.git
-supports-preserve-symlinks-flag                                  1.0.0            MIT                                  git+https://github.com/inspect-js/node-supports-preserve-symlinks-flag.git
-svgo                                                             2.8.0            MIT                                  git://github.com/svg/svgo.git
-tempusdominus-core                                               5.19.3           MIT                                  https://github.com/tempusdominus/core.git
-text-segmentation                                                1.0.3            MIT                                  git+ssh://git@github.com/niklasvh/text-segmentation.git
-tiny-warning                                                     1.0.3            MIT                                  https://github.com/alexreardon/tiny-warning.git
-to-fast-properties                                               2.0.0            MIT                                  https://github.com/sindresorhus/to-fast-properties.git
-to-regex-range                                                   5.0.1            MIT                                  https://github.com/micromatch/to-regex-range.git
-trim-newlines                                                    4.1.1            MIT                                  https://github.com/sindresorhus/trim-newlines.git
-unc-path-regex                                                   0.1.2            MIT                                  https://github.com/regexhq/unc-path-regex.git
-update-browserslist-db                                           1.0.11           MIT                                  https://github.com/browserslist/update-db.git
-uplot                                                            1.6.24           MIT                                  git+https://github.com/leeoniya/uPlot.git
-uplot-react                                                      1.1.4            MIT                                  https://github.com/skalinichev/uplot-wrappers.git
-use-isomorphic-layout-effect                                     1.1.2            MIT                                  git+https://github.com/Andarist/use-isomorphic-layout-effect.git
-util-deprecate                                                   1.0.2            MIT                                  git://github.com/TooTallNate/util-deprecate.git
-utrie                                                            1.0.2            MIT                                  git+ssh://git@github.com/niklasvh/utrie.git
-valid-filename                                                   2.0.1            MIT                                  https://github.com/sindresorhus/valid-filename.git
-wkx                                                              0.5.0            MIT                                  http://github.com/cschwarz/wkx.git
-ws                                                               8.11.0           MIT                                  https://github.com/websockets/ws.git
-xmlhttprequest-ssl                                               2.0.0            MIT                                  git://github.com/mjwwit/node-XMLHttpRequest.git
-xterm                                                            4.19.0           MIT                                  https://github.com/xtermjs/xterm.js
-xterm-addon-fit                                                  0.5.0            MIT                                  https://github.com/xtermjs/xterm.js
-xterm-addon-search                                               0.8.2            MIT                                  https://github.com/xtermjs/xterm.js
-xterm-addon-web-links                                            0.4.0            MIT                                  https://github.com/xtermjs/xterm.js
-yocto-queue                                                      0.1.0            MIT                                  https://github.com/sindresorhus/yocto-queue.git
-@fortawesome/fontawesome-free                                    5.15.4           (CC-BY-4.0 AND OFL-1.1 AND MIT)      https://github.com/FortAwesome/Font-Awesome
-@react-leaflet/core                                              1.1.1            Hippocratic-2.1                      https://github.com/PaulLeCam/react-leaflet.git
-react-leaflet                                                    3.2.5            Hippocratic-2.1                      https://github.com/PaulLeCam/react-leaflet.git
-@sphinxxxx/color-conversion                                      2.2.2            ISC                                  git+https://github.com/Sphinxxxx/color-conversion.git
-@trysound/sax                                                    0.2.0            ISC                                  git://github.com/svg/sax.git
-boolbase                                                         1.0.0            ISC                                  https://github.com/fb55/boolbase
-css-color-keywords                                               1.0.0            ISC                                  https://github.com/sonicdoe/css-color-keywords.git
-css-declaration-sorter                                           6.4.0            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
-electron-to-chromium                                             1.4.437          ISC                                  https://github.com/kilian/electron-to-chromium/
-fastq                                                            1.15.0           ISC                                  git+https://github.com/mcollina/fastq.git
-glob-parent                                                      5.1.2            ISC                                  https://github.com/gulpjs/glob-parent.git
-hosted-git-info                                                  4.1.0            ISC                                  git+https://github.com/npm/hosted-git-info.git
-jsonrepair                                                       3.2.0            ISC                                  https://github.com/josdejong/jsonrepair.git
-lru-cache                                                        6.0.0            ISC                                  git://github.com/isaacs/node-lru-cache.git
-lru-cache                                                        5.1.1            ISC                                  git://github.com/isaacs/node-lru-cache.git
-minimatch                                                        3.1.2            ISC                                  git://github.com/isaacs/minimatch.git
-picocolors                                                       1.0.0            ISC                                  https://github.com/alexeyraspopov/picocolors.git
-react-timer-hook                                                 3.0.6            ISC                                  git+https://github.com/amrlabib/react-timer-hook.git
-semver                                                           6.3.0            ISC                                  https://github.com/npm/node-semver
-semver                                                           7.5.2            ISC                                  https://github.com/npm/node-semver.git
-vanilla-picker                                                   2.12.1           ISC                                  https://github.com/Sphinxxxx/vanilla-picker.git
-yallist                                                          4.0.0            ISC                                  git+https://github.com/isaacs/yallist.git
-yallist                                                          3.1.1            ISC                                  git+https://github.com/isaacs/yallist.git
-yaml                                                             1.10.2           ISC                                  https://github.com/eemeli/yaml.git
-yargs-parser                                                     20.2.9           ISC                                  https://github.com/yargs/yargs-parser.git
-ace-builds                                                       1.23.0           BSD-3-Clause                         https://github.com/ajaxorg/ace-builds.git
-hoist-non-react-statics                                          3.3.2            BSD-3-Clause                         git://github.com/mridgway/hoist-non-react-statics.git
-hyphenate-style-name                                             1.0.4            BSD-3-Clause                         git+ssh://git@github.com/rexxars/hyphenate-style-name.git
-istanbul-lib-coverage                                            3.2.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-instrument                                          5.2.1            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-report                                              3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-lib-source-maps                                         4.0.1            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-istanbul-reports                                                 3.1.5            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
-react-transition-group                                           4.4.5            BSD-3-Clause                         https://github.com/reactjs/react-transition-group.git
-source-map                                                       0.6.1            BSD-3-Clause                         http://github.com/mozilla/source-map.git
-source-map                                                       0.5.7            BSD-3-Clause                         http://github.com/mozilla/source-map.git
-source-map-js                                                    1.0.2            BSD-3-Clause                         https://github.com/7rulnik/source-map-js.git
-sprintf-js                                                       1.1.2            BSD-3-Clause                         https://github.com/alexei/sprintf.js.git
-caniuse-lite                                                     1.0.30001506     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
-css-select                                                       4.3.0            BSD-2-Clause                         git://github.com/fb55/css-select.git
-css-what                                                         6.1.0            BSD-2-Clause                         https://github.com/fb55/css-what
-domelementtype                                                   2.3.0            BSD-2-Clause                         git://github.com/fb55/domelementtype.git
-domhandler                                                       4.3.1            BSD-2-Clause                         git://github.com/fb55/domhandler.git
-domutils                                                         2.8.0            BSD-2-Clause                         git://github.com/fb55/domutils.git
-entities                                                         2.2.0            BSD-2-Clause                         git://github.com/fb55/entities.git
-leaflet                                                          1.9.4            BSD-2-Clause                         git://github.com/Leaflet/Leaflet.git
-normalize-package-data                                           3.0.3            BSD-2-Clause                         git://github.com/npm/normalize-package-data.git
-nth-check                                                        2.1.1            BSD-2-Clause                         https://github.com/fb55/nth-check
-uri-js                                                           4.4.1            BSD-2-Clause                         http://github.com/garycourt/uri-js
-FileSaver                                                        0.10.0           UNKNOWN                              Unknown
-heap                                                             0.2.5            UNKNOWN                              git://github.com/qiao/heap.js.git
-mdn-data                                                         2.0.14           CC0-1.0                              https://github.com/mdn/data.git
-spdx-license-ids                                                 3.0.13           CC0-1.0                              https://github.com/jslicense/spdx-license-ids.git
-mousetrap                                                        1.6.5            Apache-2.0 WITH LLVM-exception       git://github.com/ccampbell/mousetrap.git
-pako                                                             1.0.11           (MIT AND Zlib)                       https://github.com/nodeca/pako.git
-spdx-exceptions                                                  2.3.0            CC-BY-3.0                            https://github.com/kemitchell/spdx-exceptions.json.git
-tslib                                                            2.5.3            0BSD                                 https://github.com/Microsoft/tslib.git
-tslib                                                            2.3.1            0BSD                                 https://github.com/Microsoft/tslib.git
-type-fest                                                        1.4.0            (MIT OR CC0-1.0)                     https://github.com/sindresorhus/type-fest.git
-webcabin-docker                                                  2.2.5            MIT*                                 Unknown
-
-495 dependencies listed.
-

Dockerfile

@@ -50,7 +50,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
     npm install -g corepack && \
     corepack enable && \
     yarn set version berry && \
-    yarn set version 3 && \
+    yarn set version 4 && \
     yarn install && \
     yarn run bundle && \
     rm -rf node_modules \
@@ -120,21 +120,16 @@ RUN rm -rf /pgadmin4/docs/en_US/_build/html/_static/*.png
 # Create additional builders to get all of the PostgreSQL utilities
 #########################################################################
 
-FROM postgres:12-alpine AS pg12-builder
 FROM postgres:13-alpine AS pg13-builder
 FROM postgres:14-alpine AS pg14-builder
 FROM postgres:15-alpine AS pg15-builder
 FROM postgres:16-alpine AS pg16-builder
 FROM postgres:17-alpine AS pg17-builder
+FROM postgres:18-alpine AS pg18-builder
 
 FROM alpine:latest AS tool-builder
 
 # Copy the PG binaries
-COPY --from=pg12-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-12/
-COPY --from=pg12-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-12/
-COPY --from=pg12-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-12/
-COPY --from=pg12-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-12/
-
 COPY --from=pg13-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-13/
@@ -160,6 +155,11 @@ COPY --from=pg17-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-17/
 COPY --from=pg17-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-17/
 COPY --from=pg17-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-17/
 
+COPY --from=pg18-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-18/
+COPY --from=pg18-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-18/
+COPY --from=pg18-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-18/
+COPY --from=pg18-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-18/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
@@ -171,13 +171,13 @@ COPY --from=env-builder /venv /venv
 
 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
-COPY --from=pg17-builder /usr/local/lib/libpq.so.5.17 /usr/lib/
-COPY --from=pg17-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
-COPY --from=pg17-builder /usr/lib/liblz4.so.1.10.0 /usr/lib/
+COPY --from=pg18-builder /usr/local/lib/libpq.so.5.18 /usr/lib/
+COPY --from=pg18-builder /usr/lib/libzstd.so.1.5.7 /usr/lib/
+COPY --from=pg18-builder /usr/lib/liblz4.so.1.10.0 /usr/lib/
 
-RUN ln -s libpq.so.5.17 /usr/lib/libpq.so.5 && \
-    ln -s libpq.so.5.17 /usr/lib/libpq.so && \
-    ln -s libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
+RUN ln -s libpq.so.5.18 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.18 /usr/lib/libpq.so && \
+    ln -s libzstd.so.1.5.7 /usr/lib/libzstd.so.1 && \
     ln -s liblz4.so.1.10.0 /usr/lib/liblz4.so.1
 
 WORKDIR /pgadmin4
@@ -192,7 +192,6 @@ COPY pkg/docker/entrypoint.sh /entrypoint.sh
 
 # License files
 COPY LICENSE /pgadmin4/LICENSE
-COPY DEPENDENCIES /pgadmin4/DEPENDENCIES
 
 # Install runtime dependencies and configure everything in one RUN step
 RUN apk add --no-cache \
@@ -208,7 +207,7 @@ RUN apk add --no-cache \
         libedit \
         libldap \
         libcap && \
-    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==22.0.0 && \
+    /venv/bin/python3 -m pip install --no-cache-dir gunicorn==23.0.0 && \
     find / -type d -name '__pycache__' -exec rm -rf {} + && \
     useradd -r -u 5050 -g root -s /sbin/nologin pgadmin && \
     mkdir -p /run/pgadmin /var/lib/pgadmin && \
@@ -222,7 +221,7 @@ RUN apk add --no-cache \
     echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
     echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix
 
-USER pgadmin
+USER 5050
 
 # Finish up
 VOLUME /var/lib/pgadmin

Make.bat

@@ -28,7 +28,7 @@ CALL :CREATE_PYTHON_ENV || EXIT /B 1
 CALL :CREATE_RUNTIME_ENV || EXIT /B 1
 CALL :GENERATE_SBOM || EXIT /B 1
 CALL :CREATE_INSTALLER || EXIT /B 1
-CALL :SIGN_INSTALLER || EXIT /B 1
+CALL :VERIFY_SIGNATURE || EXIT /B 1
 
 EXIT /B %ERRORLEVEL%
 REM Main build sequence Ends
@@ -216,7 +216,7 @@ 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 set version 4 || EXIT /B 1
     CALL yarn install || EXIT /B 1
     CALL npm rebuild || EXIT /B 1
 
@@ -239,7 +239,6 @@ REM Main build sequence Ends
 
     ECHO Staging license files...
     COPY "%WD%\LICENSE" "%BUILDROOT%\" > nul || EXIT /B 1
-    COPY "%WD%\DEPENDENCIES" "%BUILDROOT%\" > nul || EXIT /B 1
 
     ECHO Creating config_distro.py
     ECHO SERVER_MODE = False > "%BUILDROOT%\web\config_distro.py"
@@ -272,8 +271,7 @@ REM Main build sequence Ends
     CD "%BUILDROOT%\runtime\resources\app\"
 
     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 set version 4 || EXIT /B 1
     CALL yarn workspaces focus --production || EXIT /B 1
 
     ECHO Removing yarn cache...
@@ -284,7 +282,7 @@ REM Main build sequence Ends
 
     REM WGET
     FOR /f "tokens=*" %%i IN ('npm info electron version') DO SET "ELECTRON_VERSION=%%i"
-    SET ELECTRON_VERSION="33.3.2"
+
     :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
@@ -358,7 +356,7 @@ REM Main build sequence Ends
     DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
 
     ECHO Creating windows installer using INNO tool...
-    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" "%WD%\pkg\win32\installer.iss" || EXIT /B 1
+    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" "%WD%\pkg\win32\installer.iss" "/SpgAdminSigntool=%PGADMIN_SIGNTOOL_DIR%\signtool.exe sign /fd certHash /tr http://timestamp.digicert.com /td SHA256 $f" || EXIT /B 1
 
     ECHO Renaming installer...
     MOVE "%WD%\pkg\win32\Output\pgadmin4-setup.exe" "%DISTROOT%\%INSTALLERNAME%" > nul || EXIT /B 1
@@ -375,13 +373,14 @@ REM Main build sequence Ends
 
     EXIT /B 0
 
-:SIGN_INSTALLER
-    ECHO Attempting to sign the installer...
-    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign /fd certHash /tr http://timestamp.digicert.com /td SHA256 "%DISTROOT%\%INSTALLERNAME%"
+:VERIFY_SIGNATURE
+    ECHO Verifying the installer signature...
+
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" verify /pa /v "%DISTROOT%\%INSTALLERNAME%"
     IF %ERRORLEVEL% NEQ 0 (
         ECHO.
         ECHO ************************************************************
-        ECHO * Failed to sign the installer
+        ECHO * Failed to verify signature of the installer
         ECHO ************************************************************
         PAUSE
     )

Makefile

@@ -20,8 +20,9 @@ APP_REVISION := $(shell grep ^APP_REVISION web/version.py | awk -F"=" '{print $$
 # Include only platform-independent builds in all
 all: docs pip src
 
+# Add BUILD_OPTS variable to pass arguments
 appbundle:
-	./pkg/mac/build.sh
+	./pkg/mac/build.sh $(BUILD_OPTS)
 
 install-node:
 	cd web && yarn install

README.md

@@ -15,33 +15,51 @@ 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 Electron based runtime application intended to allow this,
-which will execute the Python server and display the UI.
+which will fork a Python server process and display the UI.
 
-## Building the Runtime
+## Prerequisites
+1. Install Node.js 20 and above (https://nodejs.org/en/download)
+2. yarn (https://yarnpkg.com/getting-started/install)
+3. Python 3.9 and above (https://www.python.org/downloads/)
+4. PostgreSQL server (https://www.postgresql.org/download)
 
-To build the runtime, the following packages must be installed:
+Start by enabling Corepack, if it isn't already;
+this will add the yarn binary to your PATH:
+```bash
+corepack enable
+```
 
-* NodeJS 16+
-* Yarn
+# Building the Web Assets
 
-Change into the runtime directory, and run *yarn install*. This will install the
-dependencies required.
+pgAdmin is dependent on a number of third party Javascript libraries. These,
+along with it's own Javascript code, CSS code and images must be
+compiled into a "bundle" which is transferred to the browser for execution
+and rendering. This is far more efficient than simply requesting each
+asset as it's needed by the client.
 
-In order to use the runtime in a development environment, you'll need to copy
-*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
-executable and *pgAdmin.py* file, otherwise the runtime will use the default
-paths it would expect to find in the standard package for your platform.
-
-You can then execute the runtime by running something like:
+To create the bundle, you will need the 'yarn' package management tool to be
+installed. Then, you can run the following commands on a *nix system to
+download the required packages and build the bundle:
 
 ```bash
-yarn run start
+$ cd $PGADMIN4_SRC
+$ make install-node
+$ make bundle
+```
+
+On Windows systems (where "make" is not available), the following commands
+can be used:
+
+```
+C:\> cd $PGADMIN4_SRC\web
+C:\$PGADMIN4_SRC\web> yarn install
+C:\$PGADMIN4_SRC\web> yarn run bundle
 ```
 
 # Configuring the Python Environment
 
 In order to run the Python code, a suitable runtime environment is required.
-Python version 3.7 and later are currently supported. It is recommended that a
+Python version 3.9 and later are currently supported. It is recommended that a
 Python Virtual Environment is setup for this purpose, rather than using the
 system Python environment. On Linux and Mac systems, the process is fairly
 simple - adapt as required for your distribution:
@@ -63,7 +81,7 @@ simple - adapt as required for your distribution:
    so update that to the latest:
 
    ```bash
-   $ pip install --upgrade pip
+   (venv) $ pip install --upgrade pip
    ```
 
 4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
@@ -88,36 +106,44 @@ simple - adapt as required for your distribution:
    configuration may look like:
 
     ```python
-    from config import *
+   import os
+   import logging
 
-    # Debug mode
-    DEBUG = True
+   # Change pgAdmin data directory
+   DATA_DIR = '/Users/myuser/.pgadmin_dev'
 
-    # App mode
-    SERVER_MODE = True
+   #Change pgAdmin server and port
+   DEFAULT_SERVER = '127.0.0.1'
+   DEFAULT_SERVER_PORT = 5051
 
-    # Enable the test module
-    MODULE_BLACKLIST.remove('test')
+   # Switch between server and desktop mode
+   SERVER_MODE = True
 
-    # Log
-    CONSOLE_LOG_LEVEL = DEBUG
-    FILE_LOG_LEVEL = DEBUG
+   #Change pgAdmin config DB path in case external DB is used.
+   CONFIG_DATABASE_URI="postgresql://postgres:postgres@localhost:5436/pgadmin"
 
-    DEFAULT_SERVER = '127.0.0.1'
+   #Setup SMTP
+   MAIL_SERVER = 'smtp.gmail.com'
+   MAIL_PORT = 465
+   MAIL_USE_SSL = True
+   MAIL_USERNAME = 'user@gmail.com'
+   MAIL_PASSWORD = 'xxxxxxxxxx'
 
-    UPGRADE_CHECK_ENABLED = True
+   # Change log level
+   CONSOLE_LOG_LEVEL = logging.INFO
+   FILE_LOG_LEVEL = logging.INFO
 
-    # Use a different config DB for each server mode.
-    if SERVER_MODE == False:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-desktop.db'
-        )
-    else:
-        SQLITE_PATH = os.path.join(
-            DATA_DIR,
-            'pgadmin4-server.db'
-        )
+   # Use a different config DB for each server mode.
+   if SERVER_MODE == False:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-desktop.db'
+     )
+   else:
+     SQLITE_PATH = os.path.join(
+         DATA_DIR,
+         'pgadmin4-server.db'
+     )
    ```
 
    This configuration allows easy switching between server and desktop modes
@@ -137,9 +163,9 @@ simple - adapt as required for your distribution:
    (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
    ```
 
-   Whilst it is possible to automatically run setup in desktop mode by running
-   the runtime, that will not work in server mode as the runtime doesn't allow
-   command line interaction with the setup program.
+Whilst it is possible to automatically run setup in desktop mode by running
+the runtime, that will not work in server mode as the runtime doesn't allow
+command line interaction with the setup program.
 
 At this point you will be able to run pgAdmin 4 from the command line in either
 server or desktop mode, and access it from a web browser using the URL shown in
@@ -148,49 +174,6 @@ the terminal once pgAdmin has started up.
 Setup of an environment on Windows is somewhat more complicated unfortunately,
 please see *pkg/win32/README.txt* for complete details.
 
-# Building the Web Assets
-
-pgAdmin is dependent on a number of third party Javascript libraries. These,
-along with it's own Javascript code, SCSS/CSS code and images must be
-compiled into a "bundle" which is transferred to the browser for execution
-and rendering. This is far more efficient than simply requesting each
-asset as it's needed by the client.
-
-To create the bundle, you will need the 'yarn' package management tool to be
-installed. Then, you can run the following commands on a *nix system to
-download the required packages and build the bundle:
-
-```bash
-(venv) $ cd $PGADMIN4_SRC
-(venv) $ make install-node
-(venv) $ make bundle
-```
-
-On Windows systems (where "make" is not available), the following commands
-can be used:
-
-```
-C:\> cd $PGADMIN4_SRC\web
-C:\$PGADMIN4_SRC\web> yarn install
-C:\$PGADMIN4_SRC\web> yarn run bundle
-```
-
-# Creating pgAdmin themes
-
-To create a pgAdmin theme, you need to create a directory under
-*web/pgadmin/static/scss/resources*.
-Copy the sample file *_theme.variables.scss.sample* to the new directory and
-rename it to *_theme.variables.scss*. Change the desired hexadecimal values of
-the colors and bundle pgAdmin. You can also add a preview image in the theme
-directory with the name as *\<dir name>_preview.png*. It is recommended that the
-preview image should not be larger in size as it may take time to load on slow
-networks. Run the *yarn run bundle* and you're good to go. No other changes are
-required, pgAdmin bundle will read the directory and create other required
-entries to make them available in preferences.
-
-The name of the theme is derived from the directory name. Underscores (_) and
-hyphens (-) will be replaced with spaces and the result will be camel cased.
-
 # Building the documentation
 
 In order to build the docs, an additional Python package is required in the
@@ -210,6 +193,21 @@ The docs can then be built using the Makefile in *$PGADMIN4_SRC*, e.g.
 
 The output can be found in *$PGADMIN4_SRC/docs/en_US/_build/html/index.html*
 
+## Building the Runtime
+Change into the runtime directory, and run *yarn install*. This will install the
+dependencies required.
+
+In order to use the runtime in a development environment, you'll need to copy
+*dev_config.json.in* file to *dev_config.json*, and edit the paths to the Python
+executable and *pgAdmin.py* file, otherwise the runtime will use the default
+paths it would expect to find in the standard package for your platform.
+
+You can then execute the runtime by running something like:
+
+```bash
+yarn run start
+```
+
 # Building packages
 
 Most packages can be built using the Makefile in $PGADMIN4_SRC, provided all

SECURITY.md

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

docs/en_US/auto_update_desktop_app.rst

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

docs/en_US/collation_dialog.rst

@@ -40,6 +40,9 @@ settings:
   as the existing one, but will be an independent object. If you choose to copy
   an existing collation, you cannot modify the collation properties displayed on
   this tab.
+* Use the drop-down listbox next to *Provider* to select a locale services associated
+  with the collation. Possible values are: icu, libc and builtin.
+  **Note:** The builtin option is available from v17 onwards.
 * Use the *Locale* field to specify a locale; a locale specifies language and
   language formatting characteristics. If you specify this, you cannot specify
   either of the following parameters. To view a list of locales supported by
@@ -50,8 +53,6 @@ settings:
 * Use the *LC_CTYPE* field to specify a locale with specified character
   classification. The locale must be applicable to the current database encoding.
   (See CREATE DATABASE for details.)
-* Use the drop-down listbox next to *Locale Provider* to select a locale services associated
-  with the collation. Possible values are: icu, libc. libc is the default.
 * Move the switch next to *Deterministic* to *YES* to specify whether the collation should use
   deterministic comparisons. By default, this option is set to true. In a
   deterministic comparison, strings that are not byte-wise equal are considered

docs/en_US/container_deployment.rst

@@ -53,6 +53,7 @@ The default binary paths set in the container are as follows:
 .. code-block:: bash
 
     DEFAULT_BINARY_PATHS = {
+        'pg-18': '/usr/local/pgsql-18',
         'pg-17': '/usr/local/pgsql-17',
         'pg-16': '/usr/local/pgsql-16',
         'pg-15': '/usr/local/pgsql-15',
@@ -134,6 +135,14 @@ Override the default file path for the server definition list. See the
 /pgadmin4/servers.json mapped file below for more information. See the format
 of the `Servers JSON file <https://www.pgadmin.org/docs/pgadmin4/latest/import_export_servers.html#json-format>`_.
 
+**PGADMIN_REPLACE_SERVERS_ON_STARTUP**
+
+*Default: null*
+
+By default, the server definitions are only loaded on first launch, i.e. when initializing the configuration database. See PGADMIN_SERVER_JSON_FILE above.
+
+If this variable is set to True, the server definitions will be replaced on every launch. This can be used to declaratively manage the server definitions.
+
 **PGADMIN_PREFERENCES_JSON_FILE**
 
 *Default: /pgadmin4/preferences.json*

docs/en_US/desktop_deployment.rst

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

docs/en_US/directory_dialog.rst

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

docs/en_US/erd_tool.rst

@@ -86,6 +86,9 @@ Editing Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
+   | *Search table*       | Click to search for a table in the diagram. Selecting a table from the search results will bring  | Option/Alt +   |
+   |                      | it into view and highlight it.                                                                    | Ctrl + F       |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | *Add table*          | Click this button to add a new table to the diagram. On clicking, this will open a table dialog   | Option/Alt +   |
    |                      | where you can put the table details.                                                              | Ctrl + A       |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
@@ -109,11 +112,14 @@ Table Relationship Options
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
    | Icon                 | Behavior                                                                                          | Shortcut       |
    +======================+===================================================================================================+================+
-   | *1M*                 | Click this button to open a one-to-many relationship dialog to add a relationship between the     | Option/Alt +   |
+   | *1-1*                | Click this button to open a one-to-one relationship dialog to add a relationship between the      | Option/Alt +   |
+   |                      | two tables. The selected table becomes the referencing table.                                     | Ctrl + B       |
+   +----------------------+---------------------------------------------------------------------------------------------------+----------------+
+   | *1-M*                | Click this button to open a one-to-many relationship dialog to add a relationship between the     | Option/Alt +   |
    |                      | two tables. The selected table becomes the referencing table and will have the *many* endpoint of | Ctrl + O       |
    |                      | the link.                                                                                         |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
-   | *MM*                 | Click this button to open a many-to-many relationship dialog to add a relationship between the    | Option/Alt +   |
+   | *M-M*                | Click this button to open a many-to-many relationship dialog to add a relationship between the    | Option/Alt +   |
    |                      | two tables. This option will create a new table based on the selected columns for the two relating| Ctrl + M       |
    |                      | tables and link them.                                                                             |                |
    +----------------------+---------------------------------------------------------------------------------------------------+----------------+
@@ -207,6 +213,22 @@ The table node shows table details in a graphical representation:
 * you can click on the node and drag to move on the canvas.
 * Upon double click on the table node or by clicking the edit button from the toolbar, the table dialog opens where you can change the table details. Refer :ref:`table dialog <table_dialog>` for information on different fields.
 
+The One to One Link Dialog
+***************************
+
+.. image:: images/erd_11_dialog.png
+    :alt: ERD tool 1-1 dialog
+    :align: center
+
+The one to one link dialog allows you to:
+
+* Add a one to one relationship between two tables.
+* *Local Table* is the table that references a table and has the *one* end point.
+* *Local Column* the column that references.
+* *Select Constraint* To implement one to one relationship, the *Local Column* must have primaty key or unique constraint. The default is a unique constraint. Please note that this field is visible only when the selected *Local Column* does not have either of the mentioned constraints.
+* *Referenced Table* is the table that is being referred and has the *one* end point.
+* *Referenced Column* the column that is being referred.
+
 The One to Many Link Dialog
 ***************************
 

docs/en_US/export_data_using_query.rst

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

docs/en_US/function_dialog.rst

@@ -41,6 +41,9 @@ Use the fields in the *Definition* tab to define the function:
   will change to an input text field.
 * Use the drop-down listbox next to *Language* to select the implementation
   language. The default is *sql*.
+* Use the drop-down listbox next to *Depends on extensions* to select the extension that this function
+  depends on (for example, plpgsql). If set, dropping the extension will automatically drop the
+  function as well.
 * Use the fields in the *Arguments* to define an argument. Click the *Add*
   icon (+) to set parameters and values for the argument: