Fixed one wcDocker issue.

2) Doc updates for webserver authentication.
3) Cleanup task for API tests.

.dockerignore

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

DEPENDENCIES

@@ -23,64 +23,78 @@ Python Dependencies
 
 Name                                                             Version          Licence                              URL
 ----                                                             -------          -------                              ---
-cheroot                                                          8.5.2            UNKNOWN                              https://cheroot.cherrypy.org
-Flask                                                            1.1.2            BSD-3-Clause                         https://palletsprojects.com/p/flask/
+Flask                                                            2.0.2            BSD-3-Clause                         https://palletsprojects.com/p/flask
 Flask-Gravatar                                                   0.5.0            BSD                                  https://github.com/zzzsochi/Flask-Gravatar/
 Flask-Login                                                      0.5.0            MIT                                  https://github.com/maxcountryman/flask-login
 Flask-Mail                                                       0.9.1            BSD                                  https://github.com/rduplain/flask-mail
-Flask-Migrate                                                    2.6.0            MIT                                  http://github.com/miguelgrinberg/flask-migrate/
-Flask-SQLAlchemy                                                 2.4.4            BSD-3-Clause                         https://github.com/pallets/flask-sqlalchemy
-Flask-WTF                                                        0.14.3           BSD                                  https://github.com/lepture/flask-wtf
-Flask-Compress                                                   1.8.0            MIT                                  https://github.com/colour-science/flask-compress
-passlib                                                          1.7.4            BSD                                  https://passlib.readthedocs.io
-pytz                                                             2021.1           MIT                                  http://pythonhosted.org/pytz
-simplejson                                                       3.17.2           MIT License                          https://github.com/simplejson/simplejson
-six                                                              1.15.0           MIT                                  https://github.com/benjaminp/six
-speaklater3                                                      1.4              UNKNOWN                              https://github.com/ThomasWaldmann/speaklater
-sqlparse                                                         0.4.1            BSD-3-Clause                         https://github.com/andialbrecht/sqlparse
-WTForms                                                          2.3.3            BSD-3-Clause                         https://wtforms.readthedocs.io/
+Flask-Migrate                                                    3.1.0            UNKNOWN                              https://github.com/miguelgrinberg/flask-migrate
+Flask-SQLAlchemy                                                 2.5.1            BSD-3-Clause                         https://github.com/pallets/flask-sqlalchemy
+Flask-WTF                                                        1.0.0            BSD-3-Clause                         https://github.com/wtforms/flask-wtf/
+Flask-Compress                                                   1.10.1           MIT                                  https://github.com/colour-science/flask-compress
 Flask-Paranoid                                                   0.2.0            MIT                                  http://github.com/miguelgrinberg/flask-paranoid/
-psutil                                                           5.8.0            BSD                                  https://github.com/giampaolo/psutil
-psycopg2                                                         2.8.6            LGPL with exceptions                 https://psycopg.org/
-python-dateutil                                                  2.8.1            Dual License                         https://dateutil.readthedocs.io
-SQLAlchemy                                                       1.3.23           MIT                                  http://www.sqlalchemy.org
-Flask-Security-Too                                               3.4.5            MIT                                  https://github.com/Flask-Middleware/flask-security
+Flask-Babel                                                      2.0.0            BSD                                  http://github.com/python-babel/flask-babel
+Flask-Security-Too                                               4.1.2            MIT                                  https://github.com/Flask-Middleware/flask-security
+Flask-SocketIO                                                   5.1.1            UNKNOWN                              https://github.com/miguelgrinberg/flask-socketio
+WTForms                                                          3.0.1            BSD-3-Clause                         https://wtforms.readthedocs.io/
+passlib                                                          1.7.4            BSD                                  https://passlib.readthedocs.io
+pytz                                                             2021.3           MIT                                  http://pythonhosted.org/pytz
+simplejson                                                       3.17.6           MIT License                          https://github.com/simplejson/simplejson
+six                                                              1.16.0           MIT                                  https://github.com/benjaminp/six
+speaklater3                                                      1.4              UNKNOWN                              https://github.com/ThomasWaldmann/speaklater
+sqlparse                                                         0.4.2            BSD-3-Clause                         https://github.com/andialbrecht/sqlparse
+psutil                                                           5.9.0            BSD                                  https://github.com/giampaolo/psutil
+psycopg2                                                         2.9.3            LGPL with exceptions                 https://psycopg.org/
+python-dateutil                                                  2.8.2            Dual License                         https://github.com/dateutil/dateutil
+SQLAlchemy                                                       1.4.31           MIT                                  https://www.sqlalchemy.org
 bcrypt                                                           3.2.0            Apache License, Version 2.0          https://github.com/pyca/bcrypt/
-cryptography                                                     3.3.1            BSD or Apache License, Version 2.0   https://github.com/pyca/cryptography
+cryptography                                                     3.4.8            BSD or Apache License, Version 2.0   https://github.com/pyca/cryptography
 sshtunnel                                                        0.4.0            MIT                                  https://github.com/pahaz/sshtunnel
-ldap3                                                            2.9              LGPL v3                              https://github.com/cannatag/ldap3
-Flask-BabelEx                                                    0.9.4            BSD                                  http://github.com/mrjoes/flask-babelex
-gssapi                                                           1.6.12           LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
+ldap3                                                            2.9.1            LGPL v3                              https://github.com/cannatag/ldap3
+gssapi                                                           1.7.2            LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
+eventlet                                                         0.33.0           UNKNOWN                              http://eventlet.net
+httpagentparser                                                  1.9.2            http://www.opensource.org/licenses/mit-license.php https://github.com/shon/httpagentparser
+user-agents                                                      2.2.0            MIT                                  https://github.com/selwin/python-user-agents
+pywinpty                                                         1.1.*            Unknown                              Unknown
+Authlib                                                          0.15.5           BSD-3-Clause                         https://authlib.org/
+requests                                                         2.25.1           Apache 2.0                           https://requests.readthedocs.io
+pyotp                                                            2.6.0            MIT License                          https://github.com/pyotp/pyotp
+qrcode                                                           7.3.1            BSD                                  https://github.com/lincolnloop/python-qrcode
+Pillow                                                           8.3.2            HPND                                 https://python-pillow.org
 
-28 dependencies listed.
+NOTE: This report was generated using Python 3.10. Full information may not be
+shown for Python modules that are not required with this version.
+
+37 dependencies listed.
 
 Javascript Dependencies
 =======================
 
 Name                                                             Version          Licence                              URL
 ----                                                             -------          -------                              ---
+@babel/code-frame                                                7.14.5           MIT                                  https://github.com/babel/babel.git
 @babel/code-frame                                                7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/compat-data                                               7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/core                                                      7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/generator                                                 7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-annotate-as-pure                                   7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-compilation-targets                                7.13.16          MIT                                  https://github.com/babel/babel.git
-@babel/helper-create-class-features-plugin                       7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-function-name                                      7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-get-function-arity                                 7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-member-expression-to-functions                     7.13.12          MIT                                  https://github.com/babel/babel.git
+@babel/compat-data                                               7.14.7           MIT                                  https://github.com/babel/babel.git
+@babel/core                                                      7.13.8           MIT                                  https://github.com/babel/babel.git
+@babel/generator                                                 7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-annotate-as-pure                                   7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-compilation-targets                                7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-create-class-features-plugin                       7.14.6           MIT                                  https://github.com/babel/babel.git
+@babel/helper-function-name                                      7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-get-function-arity                                 7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-hoist-variables                                    7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-member-expression-to-functions                     7.14.7           MIT                                  https://github.com/babel/babel.git
 @babel/helper-module-imports                                     7.13.12          MIT                                  https://github.com/babel/babel.git
-@babel/helper-module-transforms                                  7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/helper-optimise-call-expression                           7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-plugin-utils                                       7.13.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-replace-supers                                     7.13.12          MIT                                  https://github.com/babel/babel.git
+@babel/helper-module-transforms                                  7.13.0           MIT                                  https://github.com/babel/babel.git
+@babel/helper-optimise-call-expression                           7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-plugin-utils                                       7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-replace-supers                                     7.14.5           MIT                                  https://github.com/babel/babel.git
 @babel/helper-simple-access                                      7.13.12          MIT                                  https://github.com/babel/babel.git
-@babel/helper-split-export-declaration                           7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-identifier                               7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/helper-validator-option                                   7.12.17          MIT                                  https://github.com/babel/babel.git
-@babel/helpers                                                   7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/highlight                                                 7.14.0           MIT                                  https://github.com/babel/babel.git
-@babel/parser                                                    7.14.2           MIT                                  https://github.com/babel/babel.git
+@babel/helper-split-export-declaration                           7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helper-validator-identifier                               7.14.9           MIT                                  https://github.com/babel/babel.git
+@babel/helper-validator-option                                   7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/helpers                                                   7.13.0           MIT                                  https://github.com/babel/babel.git
+@babel/highlight                                                 7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/parser                                                    7.14.7           MIT                                  https://github.com/babel/babel.git
 @babel/plugin-proposal-class-properties                          7.13.0           MIT                                  https://github.com/babel/babel.git
 @babel/plugin-syntax-jsx                                         7.12.13          MIT                                  https://github.com/babel/babel.git
 @babel/plugin-transform-react-display-name                       7.14.2           MIT                                  https://github.com/babel/babel.git
@@ -88,36 +102,75 @@ Name                                                             Version
 @babel/plugin-transform-react-jsx-development                    7.12.17          MIT                                  https://github.com/babel/babel.git
 @babel/plugin-transform-react-pure-annotations                   7.12.1           MIT                                  https://github.com/babel/babel.git
 @babel/preset-react                                              7.13.13          MIT                                  https://github.com/babel/babel.git
-@babel/template                                                  7.12.13          MIT                                  https://github.com/babel/babel.git
-@babel/traverse                                                  7.14.2           MIT                                  https://github.com/babel/babel.git
-@babel/types                                                     7.14.2           MIT                                  https://github.com/babel/babel.git
+@babel/runtime                                                   7.14.0           MIT                                  https://github.com/babel/babel.git
+@babel/template                                                  7.14.5           MIT                                  https://github.com/babel/babel.git
+@babel/traverse                                                  7.14.7           MIT                                  https://github.com/babel/babel.git
+@babel/types                                                     7.15.4           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/cache                                                   11.4.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/is-prop-valid                                           0.8.8            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/is-prop-valid
+@emotion/memoize                                                 0.7.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/memoize
+@emotion/memoize                                                 0.7.4            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/memoize
+@emotion/react                                                   11.4.0           MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/react
+@emotion/serialize                                               1.0.2            MIT                                  https://github.com/emotion-js/emotion/tree/main/packages/serialize
+@emotion/sheet                                                   1.0.1            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/sheet
+@emotion/stylis                                                  0.8.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/stylis
+@emotion/unitless                                                0.7.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/unitless
+@emotion/utils                                                   1.0.0            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/utils
+@emotion/weak-memoize                                            0.2.5            MIT                                  https://github.com/emotion-js/emotion/tree/master/packages/weak-memoize
 @istanbuljs/schema                                               0.1.3            MIT                                  git+https://github.com/istanbuljs/schema.git
-@popperjs/core                                                   2.9.2            MIT                                  https://github.com/popperjs/popper-core.git
-@projectstorm/geometry                                           6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-canvas-core                                  6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams                                     6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-core                                6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-defaults                            6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
-@projectstorm/react-diagrams-routing                             6.5.2            MIT                                  https://github.com/projectstorm/react-diagrams.git
+@material-ui/core                                                4.11.0           MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/icons                                               4.11.2           MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/lab                                                 4.0.0-alpha.58   MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/pickers                                             3.2.10           MIT                                  https://github.com/mui-org/material-ui-pickers
+@material-ui/styles                                              4.11.4           MIT                                  https://github.com/mui-org/material-ui.git
+@material-ui/system                                              4.12.1           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.2           MIT                                  https://github.com/mui-org/material-ui.git
+@popperjs/core                                                   2.9.0            MIT                                  https://github.com/popperjs/popper-core.git
+@projectstorm/geometry                                           6.6.1            MIT                                  https://github.com/projectstorm/react-diagrams.git
+@projectstorm/react-canvas-core                                  6.6.1            MIT                                  https://github.com/projectstorm/react-diagrams.git
+@projectstorm/react-diagrams                                     6.6.1            MIT                                  https://github.com/projectstorm/react-diagrams.git
+@projectstorm/react-diagrams-core                                6.6.1            MIT                                  https://github.com/projectstorm/react-diagrams.git
+@projectstorm/react-diagrams-defaults                            6.6.1            MIT                                  https://github.com/projectstorm/react-diagrams.git
+@projectstorm/react-diagrams-routing                             6.6.1            MIT                                  https://github.com/projectstorm/react-diagrams.git
 @simonwep/pickr                                                  1.8.1            MIT                                  https://github.com/Simonwep/pickr.git
-@tippyjs/react                                                   4.2.5            MIT                                  git+https://github.com/atomiks/tippyjs-react.git
+@sindresorhus/is                                                 0.7.0            MIT                                  https://github.com/sindresorhus/is.git
+@tippyjs/react                                                   4.2.3            MIT                                  git+https://github.com/atomiks/tippyjs-react.git
+@types/classnames                                                2.3.1            MIT                                  Unknown
+@types/component-emitter                                         1.2.10           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 @types/json-schema                                               7.0.7            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
-@types/node                                                      15.0.3           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/node                                                      14.14.32         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.3           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     16.14.10         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react                                                     16.14.18         MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react-dom                                                 16.9.14          MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/react-transition-group                                    4.4.1            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/scheduler                                                 0.16.1           MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
+@types/styled-jsx                                                2.2.8            MIT                                  https://github.com/DefinitelyTyped/DefinitelyTyped.git
 acitree                                                          4.5.0-rc.7       MIT                                  https://github.com/imsurinder90/jquery-aciTree.git
 ajv                                                              6.12.6           MIT                                  https://github.com/ajv-validator/ajv.git
 ajv                                                              5.5.2            MIT                                  https://github.com/epoberezkin/ajv.git
+ajv-errors                                                       1.0.1            MIT                                  git+https://github.com/epoberezkin/ajv-errors.git
 ajv-keywords                                                     3.5.2            MIT                                  git+https://github.com/epoberezkin/ajv-keywords.git
 alertifyjs                                                       1.7.1            MIT                                  git@github.com:MohammadYounes/AlertifyJS.git
 alphanum-sort                                                    1.0.2            MIT                                  https://github.com/TrySound/alphanum-sort.git
 ansi-regex                                                       2.1.1            MIT                                  https://github.com/chalk/ansi-regex.git
 ansi-styles                                                      3.2.1            MIT                                  https://github.com/chalk/ansi-styles.git
-ansi-styles                                                      4.3.0            MIT                                  https://github.com/chalk/ansi-styles.git
 ansi-styles                                                      2.2.1            MIT                                  https://github.com/chalk/ansi-styles.git
-axios                                                            0.21.1           MIT                                  https://github.com/axios/axios.git
+aspen-core                                                       1.0.4            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.3            MIT                                  https://github.com/caolan/async.git
+axios                                                            0.21.4           MIT                                  https://github.com/axios/axios.git
 babel-code-frame                                                 6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-code-frame
 babel-generator                                                  6.26.1           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-generator
 babel-messages                                                   6.23.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-messages
+babel-plugin-styled-components                                   1.12.0           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
 babel-runtime                                                    6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-runtime
 babel-template                                                   6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-template
 babel-traverse                                                   6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-traverse
@@ -131,70 +184,86 @@ backform                                                         0.2.0
 backgrid                                                         0.3.8            MIT                                  http://github.com/cloudflare/backgrid
 backgrid-filter                                                  0.3.7            MIT                                  git://github.com/wyuenho/backgrid-text-cell.git
 backgrid-select-all                                              0.3.5            MIT                                  git://github.com/wyuenho/backgrid-select-all.git
+backo2                                                           1.0.2            MIT                                  https://github.com/mokesmokes/backo.git
 balanced-match                                                   1.0.2            MIT                                  git://github.com/juliangruber/balanced-match.git
 base64-arraybuffer                                               0.2.0            MIT                                  https://github.com/niklasvh/base64-arraybuffer
+base64-arraybuffer                                               0.1.4            MIT                                  https://github.com/niklasvh/base64-arraybuffer
 big.js                                                           5.2.2            MIT                                  https://github.com/MikeMcl/big.js.git
 bignumber.js                                                     9.0.1            MIT                                  https://github.com/MikeMcl/bignumber.js.git
 bignumber.js                                                     7.2.1            MIT                                  https://github.com/MikeMcl/bignumber.js.git
 bootstrap                                                        4.6.0            MIT                                  git+https://github.com/twbs/bootstrap.git
 bootstrap4-toggle                                                3.6.1            MIT                                  https://github.com/gitbrent/bootstrap4-toggle.git
 brace-expansion                                                  1.1.11           MIT                                  git://github.com/juliangruber/brace-expansion.git
+browserfs                                                        1.4.3            MIT                                  https://github.com/jvilk/BrowserFS.git
 browserslist                                                     4.16.6           MIT                                  https://github.com/browserslist/browserslist.git
 callsites                                                        3.1.0            MIT                                  https://github.com/sindresorhus/callsites.git
 camelcase                                                        6.2.0            MIT                                  https://github.com/sindresorhus/camelcase.git
+camelize                                                         1.0.0            MIT                                  git://github.com/substack/camelize.git
 caniuse-api                                                      3.0.0            MIT                                  https://github.com/nyalab/caniuse-api.git
 chalk                                                            2.4.2            MIT                                  https://github.com/chalk/chalk.git
-chalk                                                            4.1.1            MIT                                  https://github.com/chalk/chalk.git
 chalk                                                            1.1.3            MIT                                  https://github.com/chalk/chalk.git
 chart.js                                                         2.9.4            MIT                                  https://github.com/chartjs/Chart.js.git
 chartjs-color                                                    2.4.1            MIT                                  https://github.com/chartjs/chartjs-color.git
 chartjs-color-string                                             0.6.0            MIT                                  https://github.com/chartjs/chartjs-color-string.git
+classnames                                                       2.3.1            MIT                                  https://github.com/JedWatson/classnames.git
 closest                                                          0.0.1            MIT                                  https://github.com/ForbesLindesay/closest.git
+clsx                                                             1.1.1            MIT                                  https://github.com/lukeed/clsx.git
 co                                                               4.6.0            MIT                                  https://github.com/tj/co.git
-codemirror                                                       5.61.0           MIT                                  https://github.com/codemirror/CodeMirror.git
-color                                                            3.1.3            MIT                                  https://github.com/Qix-/color.git
+codemirror                                                       5.59.4           MIT                                  https://github.com/codemirror/CodeMirror.git
 color-convert                                                    1.9.3            MIT                                  https://github.com/Qix-/color-convert.git
-color-convert                                                    2.0.1            MIT                                  https://github.com/Qix-/color-convert.git
 color-name                                                       1.1.3            MIT                                  git@github.com:dfcreative/color-name.git
 color-name                                                       1.1.4            MIT                                  git@github.com:colorjs/color-name.git
-color-string                                                     1.5.5            MIT                                  https://github.com/Qix-/color-string.git
+colord                                                           2.0.0            MIT                                  https://github.com/omgovich/colord.git
 colorette                                                        1.2.2            MIT                                  https://github.com/jorgebucaran/colorette.git
 commander                                                        7.2.0            MIT                                  https://github.com/tj/commander.js.git
+component-emitter                                                1.3.0            MIT                                  https://github.com/component/emitter.git
 concat-map                                                       0.0.1            MIT                                  git://github.com/substack/node-concat-map.git
-convert-source-map                                               1.7.0            MIT                                  git://github.com/thlorenz/convert-source-map.git
+context-menu                                                     2.0.0            MIT                                  https://github.com/chipto/context-menu.git
+convert-source-map                                               1.8.0            MIT                                  git://github.com/thlorenz/convert-source-map.git
 core-js                                                          3.12.1           MIT                                  https://github.com/zloirock/core-js.git
 core-js                                                          2.6.12           MIT                                  https://github.com/zloirock/core-js.git
 cosmiconfig                                                      7.0.0            MIT                                  git+https://github.com/davidtheclark/cosmiconfig.git
 css-color-names                                                  1.0.1            MIT                                  git://github.com/bahamas10/css-color-names.git
 css-color-names                                                  0.0.4            MIT                                  git://github.com/bahamas10/css-color-names.git
 css-line-break                                                   1.1.1            MIT                                  git+ssh://git@github.com/niklasvh/css-line-break.git
-css-loader                                                       5.2.4            MIT                                  https://github.com/webpack-contrib/css-loader.git
+css-loader                                                       5.1.1            MIT                                  https://github.com/webpack-contrib/css-loader.git
+css-to-react-native                                              3.0.0            MIT                                  git+https://github.com/styled-components/css-to-react-native.git
 css-tree                                                         1.1.3            MIT                                  https://github.com/csstree/csstree.git
+css-vendor                                                       2.0.8            MIT                                  git@github.com:cssinjs/css-vendor.git
 cssesc                                                           3.0.0            MIT                                  https://github.com/mathiasbynens/cssesc.git
-cssnano                                                          5.0.2            MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-preset-default                                           5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
-cssnano-utils                                                    2.0.0            MIT                                  https://github.com/cssnano/cssnano.git
+cssnano                                                          5.0.4            MIT                                  https://github.com/cssnano/cssnano.git
+cssnano-preset-default                                           5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
+cssnano-utils                                                    2.0.1            MIT                                  https://github.com/cssnano/cssnano.git
 csso                                                             4.2.0            MIT                                  https://github.com/css/csso.git
+csstype                                                          2.6.16           MIT                                  https://github.com/frenic/csstype
+csstype                                                          3.0.8            MIT                                  https://github.com/frenic/csstype
 dagre                                                            0.8.5            MIT                                  https://github.com/dagrejs/dagre.git
+date-fns                                                         2.24.0           MIT                                  https://github.com/date-fns/date-fns
 debug                                                            4.3.1            MIT                                  git://github.com/visionmedia/debug.git
 debug                                                            2.6.9            MIT                                  git://github.com/visionmedia/debug.git
+deep-diff                                                        1.0.2            MIT                                  git://github.com/flitbit/diff.git
 detect-indent                                                    4.0.0            MIT                                  https://github.com/sindresorhus/detect-indent.git
-dom-serializer                                                   1.3.1            MIT                                  git://github.com/cheeriojs/dom-renderer.git
-dot-prop                                                         5.3.0            MIT                                  https://github.com/sindresorhus/dot-prop.git
-dropzone                                                         5.9.2            MIT                                  https://github.com/dropzone/dropzone.git
+diff-arrays-of-objects                                           1.1.8            MIT                                  git+https://github.com/malcolmvr/diff-arrays-of-objects.git
+dom-helpers                                                      5.2.0            MIT                                  git+https://github.com/react-bootstrap/dom-helpers.git
+dom-serializer                                                   1.3.2            MIT                                  git://github.com/cheeriojs/dom-renderer.git
+dropzone                                                         5.9.3            MIT                                  https://github.com/dropzone/dropzone.git
 emojis-list                                                      3.0.0            MIT                                  git+https://github.com/kikobeats/emojis-list.git
+engine.io-client                                                 5.1.1            MIT                                  https://github.com/socketio/engine.io-client.git
+engine.io-parser                                                 4.0.2            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
 fast-deep-equal                                                  3.1.3            MIT                                  git+https://github.com/epoberezkin/fast-deep-equal.git
 fast-deep-equal                                                  1.1.0            MIT                                  git+https://github.com/epoberezkin/fast-deep-equal.git
 fast-json-stable-stringify                                       2.1.0            MIT                                  git://github.com/epoberezkin/fast-json-stable-stringify.git
-follow-redirects                                                 1.14.1           MIT                                  git@github.com:follow-redirects/follow-redirects.git
+filename-reserved-regex                                          2.0.0            MIT                                  https://github.com/sindresorhus/filename-reserved-regex.git
+follow-redirects                                                 1.14.7           MIT                                  git@github.com:follow-redirects/follow-redirects.git
 gensync                                                          1.0.0-beta.2     MIT                                  https://github.com/loganfsmyth/gensync.git
 globals                                                          11.12.0          MIT                                  https://github.com/sindresorhus/globals.git
 globals                                                          9.18.0           MIT                                  https://github.com/sindresorhus/globals.git
 graphlib                                                         2.1.8            MIT                                  https://github.com/dagrejs/graphlib.git
 has-ansi                                                         2.0.0            MIT                                  https://github.com/sindresorhus/has-ansi.git
+has-cors                                                         1.1.0            MIT                                  git://github.com/component/has-cors.git
 has-flag                                                         3.0.0            MIT                                  https://github.com/sindresorhus/has-flag.git
 has-flag                                                         4.0.0            MIT                                  https://github.com/sindresorhus/has-flag.git
 hex-color-regex                                                  1.1.0            MIT                                  https://github.com/regexps/hex-color-regex.git
@@ -205,20 +274,22 @@ html2canvas                                                      1.0.0-rc.7
 immutability-helper                                              3.1.1            MIT                                  git+https://github.com/kolodny/immutability-helper.git
 import-fresh                                                     3.3.0            MIT                                  https://github.com/sindresorhus/import-fresh.git
 imports-loader                                                   2.0.0            MIT                                  https://github.com/webpack-contrib/imports-loader.git
-indexes-of                                                       1.0.1            MIT                                  git://github.com/dominictarr/indexes-of.git
+insert-if                                                        1.2.0            MIT                                  git+https://github.com/chipto/insert-if.git
 invariant                                                        2.2.4            MIT                                  https://github.com/zertosh/invariant
 ip-address                                                       7.1.0            MIT                                  git://github.com/beaugunderson/ip-address.git
 is-absolute-url                                                  3.0.3            MIT                                  https://github.com/sindresorhus/is-absolute-url.git
 is-any-array                                                     1.0.0            MIT                                  https://github.com/cheminfo-js/is-any-array.git
 is-arrayish                                                      0.2.1            MIT                                  https://github.com/qix-/node-is-arrayish.git
-is-arrayish                                                      0.3.2            MIT                                  https://github.com/qix-/node-is-arrayish.git
 is-color-stop                                                    1.1.0            MIT                                  git+https://github.com/pigcan/is-color-stop.git
 is-finite                                                        1.1.0            MIT                                  https://github.com/sindresorhus/is-finite.git
-is-obj                                                           2.0.0            MIT                                  https://github.com/sindresorhus/is-obj.git
+is-in-browser                                                    1.1.3            MIT                                  git+https://github.com/tuxsudo/is-in-browser.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
 istanbul-instrumenter-loader                                     3.0.1            MIT                                  https://github.com/webpack-contrib/istanbul-instrumenter-loader.git
+javascript-natural-sort                                          0.7.1            MIT                                  https://github.com/Bill4Time/javascript-natural-sort.git
 jquery                                                           3.6.0            MIT                                  https://github.com/jquery/jquery.git
 jquery-contextmenu                                               2.9.2            MIT                                  git://github.com/swisnl/jQuery-contextMenu.git
-jquery-ui                                                        1.12.1           MIT                                  git://github.com/jquery/jquery-ui.git
+jquery-ui                                                        1.13.0           MIT                                  git://github.com/jquery/jquery-ui.git
 js-tokens                                                        4.0.0            MIT                                  https://github.com/lydell/js-tokens.git
 js-tokens                                                        3.0.2            MIT                                  https://github.com/lydell/js-tokens.git
 jsbn                                                             1.1.0            MIT                                  https://github.com/andyperlitch/jsbn.git
@@ -228,8 +299,17 @@ json-bignumber                                                   1.0.2
 json-parse-even-better-errors                                    2.3.1            MIT                                  https://github.com/npm/json-parse-even-better-errors
 json-schema-traverse                                             0.4.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
 json-schema-traverse                                             0.3.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
+json-source-map                                                  0.6.1            MIT                                  git+https://github.com/epoberezkin/json-source-map.git
 json5                                                            2.2.0            MIT                                  git+https://github.com/json5/json5.git
 json5                                                            1.0.1            MIT                                  git+https://github.com/json5/json5.git
+jss                                                              10.5.1           MIT                                  https://github.com/cssinjs/jss
+jss-plugin-camel-case                                            10.5.1           MIT                                  https://github.com/cssinjs/jss
+jss-plugin-default-unit                                          10.5.1           MIT                                  https://github.com/cssinjs/jss
+jss-plugin-global                                                10.5.1           MIT                                  https://github.com/cssinjs/jss
+jss-plugin-nested                                                10.5.1           MIT                                  https://github.com/cssinjs/jss
+jss-plugin-props-sort                                            10.5.1           MIT                                  https://github.com/cssinjs/jss
+jss-plugin-rule-value-function                                   10.5.1           MIT                                  https://github.com/cssinjs/jss
+jss-plugin-vendor-prefixer                                       10.5.1           MIT                                  https://github.com/cssinjs/jss
 karma-coverage                                                   2.0.3            MIT                                  git://github.com/karma-runner/karma-coverage.git
 lines-and-columns                                                1.1.6            MIT                                  https://github.com/eventualbuddha/lines-and-columns.git
 loader-utils                                                     2.0.0            MIT                                  https://github.com/webpack/loader-utils.git
@@ -241,135 +321,170 @@ loose-envify                                                     1.4.0
 lunr                                                             0.7.2            MIT                                  https://github.com/olivernn/lunr.js.git
 make-dir                                                         3.1.0            MIT                                  https://github.com/sindresorhus/make-dir.git
 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
+mime                                                             2.5.2            MIT                                  https://github.com/broofa/mime
 minimist                                                         1.2.5            MIT                                  git://github.com/substack/minimist.git
 ml-array-max                                                     1.2.3            MIT                                  git+https://github.com/mljs/array.git
 ml-array-min                                                     1.2.2            MIT                                  git+https://github.com/mljs/array.git
 ml-array-rescale                                                 1.3.5            MIT                                  git+https://github.com/mljs/array.git
 ml-matrix                                                        6.8.0            MIT                                  https://github.com/mljs/matrix.git
+mobius1-selectr                                                  2.4.13           MIT                                  git+https://github.com/Mobius1/Selectr.git
 moment                                                           2.29.1           MIT                                  https://github.com/moment/moment.git
 moment                                                           2.24.0           MIT                                  https://github.com/moment/moment.git
 moment-timezone                                                  0.5.33           MIT                                  https://github.com/moment/moment-timezone.git
 ms                                                               2.1.2            MIT                                  https://github.com/zeit/ms.git
 ms                                                               2.0.0            MIT                                  https://github.com/zeit/ms.git
-nanoid                                                           3.1.23           MIT                                  https://github.com/ai/nanoid.git
+nanocolors                                                       0.1.12           MIT                                  https://github.com/ai/nanocolors.git
+nanoid                                                           3.2.0            MIT                                  https://github.com/ai/nanoid.git
 nanopop                                                          2.1.0            MIT                                  https://github.com/Simonwep/nanopop.git
-node-releases                                                    1.1.71           MIT                                  git+https://github.com/chicoxyzzy/node-releases.git
-normalize-url                                                    4.5.0            MIT                                  https://github.com/sindresorhus/normalize-url.git
+node-releases                                                    1.1.72           MIT                                  git+https://github.com/chicoxyzzy/node-releases.git
+normalize-url                                                    4.5.1            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-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
+parseqs                                                          0.0.6            MIT                                  https://github.com/get/querystring.git
+parseuri                                                         0.0.6            MIT                                  https://github.com/get/parseuri.git
+path-fx                                                          2.1.1            MIT                                  git+https://github.com/NeekSandhu/path-fx.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
+pgadmin4-tree                                                    1.0.0            MIT                                  Unknown
+picomodal                                                        3.0.0            MIT                                  https://github.com/Nycto/PicoModal.git
+popper.js                                                        1.16.1-lts       MIT                                  git+https://github.com/FezVrasta/popper.js.git
 popper.js                                                        1.16.1           MIT                                  git+https://github.com/FezVrasta/popper.js.git
 postcss                                                          8.2.15           MIT                                  https://github.com/postcss/postcss.git
 postcss-calc                                                     8.0.0            MIT                                  https://github.com/postcss/postcss-calc.git
-postcss-colormin                                                 5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-convert-values                                           5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-comments                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-duplicates                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-empty                                            5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-discard-overridden                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-longhand                                           5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-merge-rules                                              5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-font-values                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-gradients                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-params                                            5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-minify-selectors                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-colormin                                                 5.1.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-convert-values                                           5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-discard-comments                                         5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-discard-duplicates                                       5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-discard-empty                                            5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-discard-overridden                                       5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-merge-longhand                                           5.0.2            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-merge-rules                                              5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-minify-font-values                                       5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-minify-gradients                                         5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-minify-params                                            5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-minify-selectors                                         5.1.0            MIT                                  https://github.com/cssnano/cssnano.git
 postcss-modules-local-by-default                                 4.0.0            MIT                                  https://github.com/css-modules/postcss-modules-local-by-default.git
-postcss-normalize-charset                                        5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-display-values                                 5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-positions                                      5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-repeat-style                                   5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-string                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-timing-functions                               5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-unicode                                        5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-url                                            5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-normalize-whitespace                                     5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-ordered-values                                           5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-initial                                           5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-reduce-transforms                                        5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-charset                                        5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-display-values                                 5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-positions                                      5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-repeat-style                                   5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-string                                         5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-timing-functions                               5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-unicode                                        5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-url                                            5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-normalize-whitespace                                     5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-ordered-values                                           5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-reduce-initial                                           5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-reduce-transforms                                        5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
 postcss-selector-parser                                          6.0.6            MIT                                  https://github.com/postcss/postcss-selector-parser.git
-postcss-selector-parser                                          3.1.2            MIT                                  https://github.com/postcss/postcss-selector-parser.git
-postcss-svgo                                                     5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
-postcss-unique-selectors                                         5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-svgo                                                     5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+postcss-unique-selectors                                         5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
 postcss-value-parser                                             4.1.0            MIT                                  https://github.com/TrySound/postcss-value-parser.git
+prop-types                                                       15.7.2           MIT                                  https://github.com/facebook/prop-types.git
 punycode                                                         2.1.1            MIT                                  https://github.com/bestiejs/punycode.js.git
 raf                                                              3.4.1            MIT                                  git://github.com/chrisdickinson/raf.git
+react                                                            16.14.0          MIT                                  git+https://github.com/facebook/react.git
 react                                                            17.0.2           MIT                                  https://github.com/facebook/react.git
+react-aspen                                                      1.1.1            MIT                                  https://github.com/neeksandhu/react-aspen.git
+react-checkbox-tree                                              1.7.2            MIT                                  https://github.com/jakezatecky/react-checkbox-tree
+react-dom                                                        16.14.0          MIT                                  git+https://github.com/facebook/react.git
 react-dom                                                        17.0.2           MIT                                  https://github.com/facebook/react.git
+react-draggable                                                  4.4.4            MIT                                  https://github.com/react-grid-layout/react-draggable.git
+react-input-autosize                                             3.0.0            MIT                                  https://github.com/JedWatson/react-input-autosize.git
+react-is                                                         16.13.1          MIT                                  https://github.com/facebook/react.git
+react-is                                                         17.0.2           MIT                                  https://github.com/facebook/react.git
+react-select                                                     4.3.1            MIT                                  https://github.com/JedWatson/react-select/tree/master/packages/react-select
+react-table                                                      7.7.0            MIT                                  https://github.com/tannerlinsley/react-table
+react-virtualized-auto-sizer                                     1.0.6            MIT                                  https://github.com/bvaughn/react-virtualized-auto-sizer.git
+react-window                                                     1.8.6            MIT                                  https://github.com/bvaughn/react-window.git
+regenerator-runtime                                              0.13.7           MIT                                  https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime
 regenerator-runtime                                              0.11.1           MIT                                  https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime
 repeating                                                        2.0.1            MIT                                  https://github.com/sindresorhus/repeating.git
 resolve-from                                                     4.0.0            MIT                                  https://github.com/sindresorhus/resolve-from.git
 rgb-regex                                                        1.0.1            MIT                                  https://github.com/regexps/rgb-regex.git
 rgba-regex                                                       1.0.0            MIT                                  https://github.com/johnotander/rgba-regex.git
+rifm                                                             0.7.0            MIT                                  https://github.com/istarkov/rifm.git
 safe-buffer                                                      5.1.2            MIT                                  git://github.com/feross/safe-buffer.git
+scheduler                                                        0.19.1           MIT                                  https://github.com/facebook/react.git
 scheduler                                                        0.20.2           MIT                                  https://github.com/facebook/react.git
 schema-utils                                                     3.0.0            MIT                                  https://github.com/webpack/schema-utils.git
 schema-utils                                                     0.3.0            MIT                                  git+https://github.com/webpack-contrib/schema-utils.git
+schema-utils                                                     1.0.0            MIT                                  https://github.com/webpack-contrib/schema-utils
 select2                                                          4.0.13           MIT                                  git://github.com/select2/select2.git
+shallowequal                                                     1.1.0            MIT                                  https://github.com/dashed/shallowequal.git
 shim-loader                                                      1.0.1            MIT                                  https://github.com/zinserjan/shim-loader
-simple-swizzle                                                   0.2.2            MIT                                  https://github.com/qix-/node-simple-swizzle.git
 slickgrid                                                        2.3.16           MIT                                  git+https://github.com/6pac/SlickGrid.git
 snapsvg-cjs                                                      0.0.6            MIT                                  git+https://github.com/geelen/Snap.svg-cjs.git
+socket.io-client                                                 4.1.2            MIT                                  https://github.com/socketio/socket.io-client.git
+socket.io-parser                                                 4.0.4            MIT                                  https://github.com/socketio/socket.io-parser.git
 source-list-map                                                  1.1.2            MIT                                  https://github.com/webpack/source-list-map.git
 split.js                                                         1.6.4            MIT                                  https://github.com/nathancahill/split
 stable                                                           0.1.8            MIT                                  https://github.com/Two-Screen/stable.git
 strip-ansi                                                       3.0.1            MIT                                  https://github.com/chalk/strip-ansi.git
 strip-comments                                                   2.0.1            MIT                                  https://github.com/jonschlinkert/strip-comments.git
-stylehacks                                                       5.0.0            MIT                                  https://github.com/cssnano/cssnano.git
+styled-components                                                5.2.1            MIT                                  git+https://github.com/styled-components/styled-components.git
+stylehacks                                                       5.0.1            MIT                                  https://github.com/cssnano/cssnano.git
+stylis                                                           4.0.10           MIT                                  https://github.com/thysultan/stylis.js
 supports-color                                                   5.5.0            MIT                                  https://github.com/chalk/supports-color.git
-supports-color                                                   7.2.0            MIT                                  https://github.com/chalk/supports-color.git
 supports-color                                                   2.0.0            MIT                                  https://github.com/chalk/supports-color.git
-svgo                                                             2.3.0            MIT                                  git://github.com/svg/svgo.git
+supports-color                                                   7.2.0            MIT                                  https://github.com/chalk/supports-color.git
+svgo                                                             2.7.0            MIT                                  git://github.com/svg/svgo.git
+symbol-observable                                                1.2.0            MIT                                  https://github.com/blesh/symbol-observable.git
 tempusdominus-bootstrap-4                                        5.39.0           MIT                                  https://github.com/tempusdominus/bootstrap-4.git
 tempusdominus-core                                               5.19.0           MIT                                  https://github.com/tempusdominus/core.git
 timsort                                                          0.3.0            MIT                                  https://github.com/mziccard/node-timsort.git
+tiny-emitter                                                     2.1.0            MIT                                  https://github.com/scottcorgan/tiny-emitter.git
+tiny-warning                                                     1.0.3            MIT                                  https://github.com/alexreardon/tiny-warning.git
 tippy.js                                                         6.3.1            MIT                                  git+https://github.com/atomiks/tippyjs.git
 to-fast-properties                                               2.0.0            MIT                                  https://github.com/sindresorhus/to-fast-properties.git
 to-fast-properties                                               1.0.3            MIT                                  https://github.com/sindresorhus/to-fast-properties.git
 trim-right                                                       1.0.1            MIT                                  https://github.com/sindresorhus/trim-right.git
+unc-path-regex                                                   0.1.2            MIT                                  https://github.com/regexhq/unc-path-regex.git
 underscore                                                       1.13.1           MIT                                  git://github.com/jashkenas/underscore.git
-uniq                                                             1.0.1            MIT                                  git://github.com/mikolalysenko/uniq.git
 uniqs                                                            2.0.0            MIT                                  git://github.com/fgnass/uniqs.git
+url-loader                                                       1.1.2            MIT                                  https://github.com/webpack-contrib/url-loader.git
 util-deprecate                                                   1.0.2            MIT                                  git://github.com/TooTallNate/util-deprecate.git
+valid-filename                                                   2.0.1            MIT                                  https://github.com/sindresorhus/valid-filename.git
 vendors                                                          1.0.4            MIT                                  https://github.com/wooorm/vendors.git
 webpack-sources                                                  0.2.3            MIT                                  git+https://github.com/webpack/webpack-sources.git
 wkx                                                              0.5.0            MIT                                  http://github.com/cschwarz/wkx.git
-@fortawesome/fontawesome-free                                    5.15.3           (CC-BY-4.0 AND OFL-1.1 AND MIT)      https://github.com/FortAwesome/Font-Awesome
-@trysound/sax                                                    0.1.1            ISC                                  git://github.com/svg/sax.git
+ws                                                               7.4.6            MIT                                  https://github.com/websockets/ws.git
+xterm                                                            4.12.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.0            MIT                                  https://github.com/xtermjs/xterm.js
+xterm-addon-web-links                                            0.4.0            MIT                                  https://github.com/xtermjs/xterm.js
+yeast                                                            0.1.2            MIT                                  https://github.com/unshiftio/yeast.git
+@fortawesome/fontawesome-free                                    5.15.4           (CC-BY-4.0 AND OFL-1.1 AND MIT)      https://github.com/FortAwesome/Font-Awesome
+@sphinxxxx/color-conversion                                      2.2.2            ISC                                  git+https://github.com/Sphinxxxx/color-conversion.git
+@trysound/sax                                                    0.2.0            ISC                                  git://github.com/svg/sax.git
 boolbase                                                         1.0.0            ISC                                  https://github.com/fb55/boolbase
-css-declaration-sorter                                           6.0.0            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
-electron-to-chromium                                             1.3.727          ISC                                  https://github.com/kilian/electron-to-chromium/
+css-color-keywords                                               1.0.0            ISC                                  https://github.com/sonicdoe/css-color-keywords.git
+css-declaration-sorter                                           6.0.3            ISC                                  https://github.com/Siilwyn/css-declaration-sorter.git
+electron-to-chromium                                             1.3.740          ISC                                  https://github.com/kilian/electron-to-chromium/
 icss-utils                                                       5.1.0            ISC                                  git+https://github.com/css-modules/icss-utils.git
 is-resolvable                                                    1.1.0            ISC                                  https://github.com/shinnn/is-resolvable.git
+jsonrepair                                                       2.2.1            ISC                                  https://github.com/josdejong/jsonrepair.git
 lru-cache                                                        6.0.0            ISC                                  git://github.com/isaacs/node-lru-cache.git
 minimatch                                                        3.0.4            ISC                                  git://github.com/isaacs/minimatch.git
 postcss-modules-extract-imports                                  3.0.0            ISC                                  https://github.com/css-modules/postcss-modules-extract-imports.git
 postcss-modules-scope                                            3.0.0            ISC                                  https://github.com/css-modules/postcss-modules-scope.git
 postcss-modules-values                                           4.0.0            ISC                                  git+https://github.com/css-modules/postcss-modules-values.git
-semver                                                           7.3.5            ISC                                  https://github.com/npm/node-semver
+semver                                                           7.3.4            ISC                                  https://github.com/npm/node-semver
 semver                                                           5.7.1            ISC                                  https://github.com/npm/node-semver
 semver                                                           6.3.0            ISC                                  https://github.com/npm/node-semver
+vanilla-picker                                                   2.11.2           ISC                                  https://github.com/Sphinxxxx/vanilla-picker.git
 yallist                                                          4.0.0            ISC                                  git+https://github.com/isaacs/yallist.git
 yaml                                                             1.10.2           ISC                                  https://github.com/eemeli/yaml.git
-bootstrap-datepicker                                             1.9.0            Apache-2.0                           https://github.com/uxsolutions/bootstrap-datepicker.git
-eve                                                              0.5.4            Apache-2.0                           git@github.com:adobe-webplatform/eve.git
-paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
-snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
-caniuse-lite                                                     1.0.30001228     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
-css-select                                                       3.1.2            BSD-2-Clause                         git://github.com/fb55/css-select.git
-css-what                                                         4.0.0            BSD-2-Clause                         https://github.com/fb55/css-what
-domelementtype                                                   2.2.0            BSD-2-Clause                         git://github.com/fb55/domelementtype.git
-domhandler                                                       4.2.0            BSD-2-Clause                         git://github.com/fb55/domhandler.git
-domutils                                                         2.6.0            BSD-2-Clause                         git://github.com/fb55/domutils.git
-entities                                                         2.2.0            BSD-2-Clause                         git://github.com/fb55/entities.git
-esutils                                                          2.0.3            BSD-2-Clause                         http://github.com/estools/esutils.git
-leaflet                                                          1.7.1            BSD-2-Clause                         git://github.com/Leaflet/Leaflet.git
-nth-check                                                        2.0.0            BSD-2-Clause                         https://github.com/fb55/nth-check
-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
+ace-builds                                                       1.4.12           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                                            1.2.1            BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
 istanbul-lib-coverage                                            3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
 istanbul-lib-instrument                                          1.10.2           BSD-3-Clause                         git@github.com:istanbuljs/istanbuljs.git
@@ -377,14 +492,36 @@ istanbul-lib-instrument                                          4.0.3
 istanbul-lib-report                                              3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
 istanbul-lib-source-maps                                         4.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
 istanbul-reports                                                 3.0.2            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
+react-transition-group                                           4.4.1            BSD-3-Clause                         https://github.com/reactjs/react-transition-group.git
 source-map                                                       0.5.7            BSD-3-Clause                         http://github.com/mozilla/source-map.git
 source-map                                                       0.6.1            BSD-3-Clause                         http://github.com/mozilla/source-map.git
 sprintf-js                                                       1.1.2            BSD-3-Clause                         https://github.com/alexei/sprintf.js.git
+bootstrap-datepicker                                             1.9.0            Apache-2.0                           https://github.com/uxsolutions/bootstrap-datepicker.git
+eve                                                              0.5.4            Apache-2.0                           git@github.com:adobe-webplatform/eve.git
+indefinite-observable                                            2.0.1            Apache-2.0                           git@github.com:material-motion/indefinite-observable-js.git
+jmespath                                                         0.15.0           Apache-2.0                           git://github.com/jmespath/jmespath.js
+jsoneditor                                                       9.5.6            Apache-2.0                           https://github.com/josdejong/jsoneditor.git
+paths-js                                                         0.4.11           Apache-2.0                           https://github.com/andreaferretti/paths-js.git
+snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
+caniuse-lite                                                     1.0.30001230     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
+css-select                                                       4.1.3            BSD-2-Clause                         git://github.com/fb55/css-select.git
+css-what                                                         5.1.0            BSD-2-Clause                         https://github.com/fb55/css-what
+domelementtype                                                   2.2.0            BSD-2-Clause                         git://github.com/fb55/domelementtype.git
+domhandler                                                       4.2.0            BSD-2-Clause                         git://github.com/fb55/domhandler.git
+domutils                                                         2.6.0            BSD-2-Clause                         git://github.com/fb55/domutils.git
+entities                                                         2.2.0            BSD-2-Clause                         git://github.com/fb55/entities.git
+esutils                                                          2.0.3            BSD-2-Clause                         http://github.com/estools/esutils.git
+leaflet                                                          1.7.1            BSD-2-Clause                         git://github.com/Leaflet/Leaflet.git
+nth-check                                                        2.0.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
 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
 precond                                                          0.2.3            MIT*                                 https://github.com/MathieuTurcotte/node-precond.git
-webcabin-docker                                                  2.2.4-dev        MIT*                                 Unknown
+webcabin-docker                                                  2.2.5            MIT*                                 Unknown
 tablesorter                                                      2.31.3           (MIT OR GPL-2.0)                     git://github.com/Mottie/tablesorter.git
 
-326 dependencies listed.
+451 dependencies listed.
 

Dockerfile

@@ -12,7 +12,7 @@
 # and clean up the web/ source code
 #########################################################################
 
-FROM alpine:3.13 AS app-builder
+FROM alpine:3.15 AS app-builder
 
 RUN apk add --no-cache \
     autoconf \
@@ -60,7 +60,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
 # Next, create the base environment for Python
 #########################################################################
 
-FROM alpine:3.13 as env-builder
+FROM alpine:3.15 as env-builder
 
 # Install dependencies
 COPY requirements.txt /
@@ -76,6 +76,9 @@ RUN     apk add --no-cache \
         krb5-dev \
         rust \
         cargo \
+        zlib-dev \
+        libjpeg-turbo-dev \
+        libpng-dev \
         python3-dev && \
     python3 -m venv --system-site-packages --without-pip /venv && \
     /venv/bin/python3 -m pip install --no-cache-dir -r requirements.txt && \
@@ -108,20 +111,15 @@ RUN rm -rf /pgadmin4/docs/en_US/_build/html/_static/*.png
 # Create additional builders to get all of the PostgreSQL utilities
 #########################################################################
 
-FROM postgres:9.6-alpine as pg96-builder
 FROM postgres:10-alpine as pg10-builder
 FROM postgres:11-alpine as pg11-builder
 FROM postgres:12-alpine as pg12-builder
 FROM postgres:13-alpine as pg13-builder
+FROM postgres:14-alpine as pg14-builder
 
-FROM alpine:3.13 as tool-builder
+FROM alpine:3.15 as tool-builder
 
 # Copy the PG binaries
-COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/
-COPY --from=pg96-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.6/
-COPY --from=pg96-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.6/
-COPY --from=pg96-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.6/
-
 COPY --from=pg10-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-10/
 COPY --from=pg10-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-10/
 COPY --from=pg10-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-10/
@@ -142,17 +140,25 @@ COPY --from=pg13-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-13/
 COPY --from=pg13-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-13/
 
+COPY --from=pg14-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-14/
+COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
+
 #########################################################################
 # Assemble everything into the final container.
 #########################################################################
 
-FROM alpine:3.13
+FROM alpine:3.15
 
 # Copy in the Python packages
 COPY --from=env-builder /venv /venv
 
 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
+COPY --from=pg14-builder /usr/local/lib/libpq.so.5.14 /usr/lib/
+RUN ln -s libpq.so.5.14 /usr/lib/libpq.so.5 && \
+    ln -s libpq.so.5.14 /usr/lib/libpq.so
 
 WORKDIR /pgadmin4
 ENV PYTHONPATH=/pgadmin4
@@ -173,11 +179,12 @@ RUN apk add \
         python3 \
         py3-pip \
         postfix \
-        postgresql-libs \
         krb5-libs \
+        libjpeg-turbo \
         shadow \
         sudo \
         libedit \
+        libldap \
         libcap && \
     /venv/bin/python3 -m pip install --no-cache-dir gunicorn && \
     find / -type d -name '__pycache__' -exec rm -rf {} + && \
@@ -187,7 +194,7 @@ RUN apk add \
     chown pgadmin:pgadmin /var/lib/pgadmin && \
     touch /pgadmin4/config_distro.py && \
     chown pgadmin:pgadmin /pgadmin4/config_distro.py && \
-    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.8 && \
+    setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.9 && \
     echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix
 
 USER pgadmin

LICENSE

@@ -1,6 +1,6 @@
 pgAdmin 4
 
-Copyright (C) 2013 - 2021, The pgAdmin Development Team
+Copyright (C) 2013 - 2022, The pgAdmin Development Team
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement is

Makefile

@@ -142,7 +142,7 @@ msg-extract:
 	cd web && pybabel extract -F babel.cfg -o pgadmin/messages.pot pgadmin
 
 msg-update:
-	cd web && pybabel update -i pgadmin/messages.pot -d pgadmin/translations
+	cd web && pybabel update --no-fuzzy-matching -i pgadmin/messages.pot -d pgadmin/translations
 
 .PHONY: docs
 

README.md

@@ -35,27 +35,15 @@ paths it would expect to find in the standard package for your platform.
 
 You can then execute the runtime by running something like:
 
-    node_modules/nw/nwjs/nw .
+```bash
+node_modules/nw/nwjs/nw .
+```
 
 or on macOS:
 
-    node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
-
-# Create Database Migrations
-
-In order to make changes to the SQLite DB, navigate to the 'web' directory:
-
-    (pgadmin4) $ cd $PGADMIN4_SRC/web
-
-Create a migration file with the following command:
-
-    (pgadmin4) $ FLASK_APP=pgAdmin4.py flask db revision
-
-This will create a file in: $PGADMIN4_SRC/web/migrations/versions/ .
-Add any changes to the 'upgrade' function.
-Increment the SCHEMA_VERSION in $PGADMIN4_SRC/web/pgadmin/model/__init__.py file.
-
-There is no need to increment the SETTINGS_SCHEMA_VERSION.
+```bash
+node_modules/nw/nwjs/nwjs.app/Contents/MacOS/nwjs .
+```
 
 # Configuring the Python Environment
 
@@ -65,40 +53,47 @@ Python Virtual Environment is setup for this purpose, rather than using the
 system Python environment. On Linux and Mac systems, the process is fairly
 simple - adapt as required for your distribution:
 
-1. Install the virtualenv packages into the system Python environment
+1. Create a virtual environment in an appropriate directory. The last argument is
+   the name of the environment; that can be changed as desired:
 
-       $ sudo pip install virtualenv virtualenvwrapper
-
-2. Source the virtualenv wrapper tools script. You may want to add this command
-   to your ~/.bash_profile file for future convenience:
-
-       $ source /usr/local/bin/virtualenvwrapper.sh
-
-3. Create a virtual environment:
-
-       $ mkvirtualenv pgadmin4
-
-   To make use of the virtual environment in the future, use the following
-   command to re-activate it:
-
-       $ workon pgadmin4
+   ```bash
+   $ python3 -m venv venv
+   ```
+   
+2. Now activate the virtual environment:
 
+   ```bash
+   $ source venv/bin/activate
+   ```
+   
+3. Some of the components used by pgAdmin require a very recent version of *pip*,
+   so update that to the latest:
+   
+   ```bash
+   $ pip install --upgrade pip
+   ```
+   
 4. Ensure that a PostgreSQL installation's bin/ directory is in the path (so
    pg_config can be found for building psycopg2), and install the required
    packages:
 
-       (pgadmin4) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
-
+   ```bash
+   (venv) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
+   ```
+   
    If you are planning to run the regression tests, you also need to install
    additional requirements from web/regression/requirements.txt:
 
-       (pgadmin4) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
-
+   ```bash
+   (venv) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
+   ```
+   
 5. Create a local configuration file for pgAdmin. Edit
    $PGADMIN4_SRC/web/config_local.py and add any desired configuration options
    (use the config.py file as a reference - any settings duplicated in
    config_local.py will override those in config.py). A typical development
    configuration may look like:
+   
     ```python
     from config import *
 
@@ -131,6 +126,7 @@ simple - adapt as required for your distribution:
             'pgadmin4-server.db'
         )
    ```
+   
    This configuration allows easy switching between server and desktop modes
    for testing.
 
@@ -138,12 +134,16 @@ simple - adapt as required for your distribution:
    mode, and non-interactive in desktop mode. You can run it either by
    running:
 
-       (pgadmin4) $ python $PGADMIN4_SRC/web/setup.py
-
+   ```bash
+   (venv) $ python3 $PGADMIN4_SRC/web/setup.py
+   ```
+   
    or by starting pgAdmin 4:
 
-       (pgadmin4) $ python $PGADMIN4_SRC/web/pgAdmin4.py
-
+   ```bash
+   (venv) $ python3 $PGADMIN4_SRC/web/pgAdmin4.py
+   ```
+   
    Whilst it is possible to automatically run setup in desktop mode by running
    the runtime, that will not work in server mode as the runtime doesn't allow
    command line interaction with the setup program.
@@ -155,10 +155,7 @@ the terminal once pgAdmin has started up.
 Setup of an environment on Windows is somewhat more complicated unfortunately,
 please see *pkg/win32/README.txt* for complete details.
 
-Once a virtual environment has been created and enabled, setup can continue
-from step 4 above.
-
-## Building the Web Assets
+# Building the Web Assets
 
 pgAdmin is dependent on a number of third party Javascript libraries. These,
 along with it's own Javascript code, SCSS/CSS code and images must be
@@ -170,18 +167,22 @@ To create the bundle, you will need the 'yarn' package management tool to be
 installed. Then, you can run the following commands on a *nix system to
 download the required packages and build the bundle:
 
-    (pgadmin4) $ cd $PGADMIN4_SRC
-    (pgadmin4) $ make install-node
-    (pgadmin4) $ make bundle
+```bash
+(venv) $ cd $PGADMIN4_SRC
+(venv) $ make install-node
+(venv) $ make bundle
+```
 
 On Windows systems (where "make" is not available), the following commands
 can be used:
 
-    C:\> cd $PGADMIN4_SRC\web
-    C:\$PGADMIN4_SRC\web> yarn install
-    C:\$PGADMIN4_SRC\web> yarn run bundle
+```
+C:\> cd $PGADMIN4_SRC\web
+C:\$PGADMIN4_SRC\web> yarn install
+C:\$PGADMIN4_SRC\web> yarn run bundle
+```
 
-## Creating pgAdmin themes
+# Creating pgAdmin themes
 
 To create a pgAdmin theme, you need to create a directory under
 *web/pgadmin/static/scss/resources*.
@@ -202,12 +203,16 @@ hyphens (-) will be replaced with spaces and the result will be camel cased.
 In order to build the docs, an additional Python package is required in the
 virtual environment. This can be installed with the pip package manager:
 
-    $ workon pgadmin4
-    (pgadmin4) $ pip install Sphinx
-    
+```bash
+$ source venv/bin/activate
+(venv) $ pip install Sphinx
+```
+
 The docs can then be built using the Makefile in *$PGADMIN4_SRC*, e.g.
 
-    (pgadmin4) $ make docs
+```bash
+(venv) $ make docs
+```
 
 The output can be found in *$PGADMIN4_SRC/docs/en_US/_build/html/index.html*
 
@@ -218,22 +223,45 @@ the setup and configuration above has been completed.
 
 To build a source tarball:
 
-    (pgadmin4) $ make src
+```bash
+(venv) $ make src
+```
 
 To build a PIP Wheel, activate either a Python 3 virtual environment, configured 
 with all the required packages, and then run:
 
-    (pgadmin4) $ make pip
+```bash
+(venv) $ make pip
+```
 
 To build the macOS AppBundle, please see *pkg/mac/README*.
 
 To build the Windows installer, please see *pkg/win32/README.txt*.
+# Create Database Migrations
 
-## Support
+In order to make changes to the SQLite DB, navigate to the 'web' directory:
+
+```bash
+(venv) $ cd $PGADMIN4_SRC/web
+```
+
+Create a migration file with the following command:
+
+```bash
+(venv) $ FLASK_APP=pgAdmin4.py flask db revision
+```
+
+This will create a file in: $PGADMIN4_SRC/web/migrations/versions/ .
+Add any changes to the 'upgrade' function.
+Increment the SCHEMA_VERSION in $PGADMIN4_SRC/web/pgadmin/model/__init__.py file.
+
+There is no need to increment the SETTINGS_SCHEMA_VERSION.
+
+# Support
 
 See https://www.pgadmin.org/support/ for support options.
 
-## Project info
+# Project info
 
 The source code repository can be found here:
 

docs/en_US/add_restore_point_dialog.rst

@@ -6,8 +6,8 @@
 
 Use the *Add named restore point* dialog to take a named snapshot of the state
 of the server for use in a recovery file. To create a named restore point, the
-server's postgresql.conf file must specify a *wal_level* value of *archive*,
-*hot_standby*, or *logical*.  You must be a database superuser to create a
+server's postgresql.conf file must specify a *wal_level* value of *replica*,
+*logical*, or *minimal*.  You must be a database superuser to create a
 restore point.
 
 .. image:: images/add_restore_point.png

docs/en_US/backup_dialog.rst

@@ -67,8 +67,8 @@ Use the fields in the *General* tab to specify parameters for the backup:
 * Use the dropdown listbox next to *Rolename* to specify the role that owns the
   backup.
 
-Click the *Dump options* tab to continue. Use the box fields in the *Dump
-options* tab to provide options for *pg_dump*.
+Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
+tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
 
 .. image:: images/backup_sections.png
     :alt: Sections option on backup dialog
@@ -77,13 +77,13 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Sections** field box to select a portion of the object
   that will be backed up.
 
-   * Move the switch next to *Pre-data* to the *Yes* position to include all
+   * Move the switch next to *Pre-data* towards right position to include all
      data definition items not included in the data or post-data item lists.
 
-   * Move the switch next to *Data* to the *Yes* position to backup actual table
+   * Move the switch next to *Data* towards right position to backup actual table
      data, large-object contents, and sequence values.
 
-   * Move the switch next to *Post-data* to the *Yes* position to include
+   * Move the switch next to *Post-data* towards right position to include
      definitions of indexes, triggers, rules, and constraints other than
      validated check constraints.
 
@@ -94,13 +94,13 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Type of objects** field box to specify details about
   the type of objects that will be backed up.
 
-   * Move the switch next to *Only data* to the *Yes* position to limit the back
+   * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
    * Move the switch next to *Only schema* to limit the back up to schema-level
      database objects.
 
-   * Move the switch next to *Blobs* to the *No* position to exclude large
+   * Move the switch next to *Blobs* towards left position to exclude large
      objects in the backup.
 
 .. image:: images/backup_do_not_save.png
@@ -110,22 +110,26 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Do not save** field box to select the objects that will
   not be included in the backup.
 
-   * Move the switch next to *Owner* to the *Yes* position to exclude commands
+   * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* to the *Yes* position to exclude
+   * Move the switch next to *Privilege* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* to the *Yes* position to exclude
+   * Move the switch next to *Tablespace* towards right position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* to the *Yes* position to
+   * Move the switch next to *Unlogged table data* towards right position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* to the *Yes* position to exclude
+   * Move the switch next to *Comments* towards right position to exclude
      commands that set the comments. **Note:** This option is visible only for
      database server greater than or equal to 11.
 
+Click the *Options* tab to continue. Use these additional fields to specify
+options like including ddl statements, verbose message or using set session
+authorization corresponding to *pg_dump* options.
+
 .. image:: images/backup_queries.png
     :alt: Queries option on backup dialog
     :align: center
@@ -133,24 +137,24 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Queries** field box to specify the type of statements
   that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* to the *Yes* position to dump
+   * Move the switch next to *Use Column Inserts* towards right position to dump
      the data in the form of INSERT statements and include explicit column
      names.  Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Use Insert commands* to the *Yes* position to
+   * Move the switch next to *Use Insert commands* towards right position to
      dump the data in the form of INSERT statements rather than using a COPY
      command.  Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Include CREATE DATABASE statement* to the *Yes*
+   * Move the switch next to *Include CREATE DATABASE statement* towards right
      position to include a command in the backup that creates a new database
      when restoring the backup.
 
-   * Move the switch next to *Include DROP DATABASE statement* to the *Yes*
+   * Move the switch next to *Include DROP DATABASE statement* towards right
      position to include a command in the backup that will drop any existing
      database object with the same name before recreating the object during a
      backup.
 
-   * Move the switch next to *Load Via Partition Root* to the *Yes* position,
+   * Move the switch next to *Load Via Partition Root* towards right position,
      so when dumping a COPY or INSERT statement for a partitioned table, target
      the root of the partitioning hierarchy which contains it rather than the
      partition itself. **Note:** This option is visible only for database server
@@ -164,10 +168,10 @@ options* tab to provide options for *pg_dump*.
   that should be excluded from the backup.
 
    * Move the switch next to *Trigger* (active when creating a data-only backup)
-     to the *Yes* position to include commands that will disable triggers on the
+     towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
+   * Move the switch next to *$ quoting* towards right position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -178,16 +182,16 @@ options* tab to provide options for *pg_dump*.
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* to the *Yes* position to include object
+   * Move the switch next to *With OIDs* towards right position to include object
      identifiers as part of the table data for each table.
 
-   * Move the switch next to *Verbose messages* to the *No* position to instruct
+   * Move the switch next to *Verbose messages* towards left position to instruct
      *pg_dump* to exclude verbose messages.
 
-   * Move the switch next to *Force double quotes on identifiers* to the *Yes*
+   * Move the switch next to *Force double quotes on identifiers* towards right
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
      position to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 

docs/en_US/backup_server_dialog.rst

@@ -28,10 +28,13 @@ Use the fields in the *General* tab to specify the following:
     :alt: Type of objects option on backup server dialog
     :align: center
 
+Click the *Data/Objects* tab to continue. Use the fields in the *Data/Objects*
+tab to provide options related to data or pgAdmin objects that correspond to *pg_dump*.
+
 * Move switches in the **Type of objects** field box to specify details about
   the type of objects that will be backed up.
 
-   * Move the switch next to *Only data* to the *Yes* position to limit the back
+   * Move the switch next to *Only data* towards right position to limit the back
      up to data.
 
    * Move the switch next to *Only schema* to limit the back up to schema-level
@@ -44,19 +47,19 @@ Use the fields in the *General* tab to specify the following:
 * Move switches in the **Do not save** field box to select the objects that will
   not be included in the backup.
 
-   * Move the switch next to *Owner* to the *Yes* position to exclude commands
+   * Move the switch next to *Owner* towards right position to exclude commands
      that set object ownership.
 
-   * Move the switch next to *Privilege* to the *Yes* position to exclude
+   * Move the switch next to *Privilege* towards right position to exclude
      commands that create access privileges.
 
-   * Move the switch next to *Tablespace* to the *Yes* position to exclude
+   * Move the switch next to *Tablespace* towards right position to exclude
      tablespaces.
 
-   * Move the switch next to *Unlogged table data* to the *Yes* position to
+   * Move the switch next to *Unlogged table data* towards right position to
      exclude the contents of unlogged tables.
 
-   * Move the switch next to *Comments* to the *Yes* position to exclude
+   * Move the switch next to *Comments* towards right position to exclude
      commands that set the comments. **Note:** This option is visible only for
      database server greater than or equal to 11.
 
@@ -67,15 +70,15 @@ Use the fields in the *General* tab to specify the following:
 * Move switches in the **Queries** field box to specify the type of statements
   that should be included in the backup.
 
-   * Move the switch next to *Use Column Inserts* to the *Yes* position to dump
+   * Move the switch next to *Use Column Inserts* towards right position to dump
      the data in the form of INSERT statements and include explicit column
      names. Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Use Insert commands* to the *Yes* position to dump
+   * Move the switch next to *Use Insert commands* towards right position to dump
      the data in the form of INSERT statements rather than using a COPY command.
      Please note: this may make restoration from backup slow.
 
-   * Move the switch next to *Include DROP DATABASE statement* to the *Yes*
+   * Move the switch next to *Include DROP DATABASE statement* towards right
      position to include a command in the backup that will drop any existing
      database object with the same name before recreating the object during a
      backup.
@@ -89,10 +92,10 @@ Use the fields in the *General* tab to specify the following:
   that should be excluded from the backup.
 
    * Move the switch next to *Trigger* (active when creating a data-only backup)
-     to the *Yes* position to include commands that will disable triggers on the
+     towards right position to include commands that will disable triggers on the
      target table while the data is being loaded.
 
-   * Move the switch next to *$ quoting* to the *Yes* position to enable dollar
+   * Move the switch next to *$ quoting* towards right position to enable dollar
      quoting within function bodies; if disabled, the function body will be
      quoted using SQL standard string syntax.
 
@@ -103,16 +106,16 @@ Use the fields in the *General* tab to specify the following:
 * Move switches in the **Miscellaneous** field box to specify miscellaneous
   backup options.
 
-   * Move the switch next to *With OIDs* to the *Yes* position to include object
+   * Move the switch next to *With OIDs* towards right position to include object
      identifiers as part of the table data for each table.
 
-   * Move the switch next to *Verbose messages* to the *No* position to instruct
+   * Move the switch next to *Verbose messages* towards left position to instruct
      *pg_dump* to exclude verbose messages.
 
-   * Move the switch next to *Force double quotes on identifiers* to the *Yes*
+   * Move the switch next to *Force double quotes on identifiers* towards right
      position to force the quoting of all identifiers.
 
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
+   * Move the switch next to *Use SET SESSION AUTHORIZATION* towards right
      position to include a statement that will use a SET SESSION AUTHORIZATION
      command to determine object ownership (instead of an ALTER OWNER command).
 

docs/en_US/cast_dialog.rst

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

docs/en_US/check_dialog.rst

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

docs/en_US/code_overview.rst

@@ -212,5 +212,5 @@ Backform for generating properties/create dialog for selected node. We have
 divided each module in small chunks as much as possible. Not all javascript
 modules are required to be loaded (i.e. loading a javascript module for
 database will make sense only when a server node is loaded completely.) Please
-look at the the javascript files node.js, browser.js, menu.js, panel.js, etc for
+look at the javascript files node.js, browser.js, menu.js, panel.js, etc for
 better understanding of the code.

docs/en_US/code_review.rst

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

docs/en_US/coding_standards.rst

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

docs/en_US/collation_dialog.rst

@@ -79,7 +79,7 @@ rules specified for the locale, *fr-BI-x-icu.  The collation is owned by
    https://www.postgresql.org/docs/current/locale.html
 
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 
 

docs/en_US/column_dialog.rst

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

docs/en_US/compound_trigger_dialog.rst

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

docs/en_US/config_py.rst

@@ -43,7 +43,7 @@ The configuration files are as follows:
 
      Linux,/etc/pgadmin/config_system.py
      macOS,/Library/Preferences/pgadmin/config_system.py
-     Windows,%CommonProgramFiles%\pgadmin\config_system.py
+     Windows,%CommonProgramFiles%\\pgadmin\\config_system.py
 
 .. note:: If the SERVER_MODE setting is changed in ``config_distro.py``,
      ``config_local.py``, or ``config_system.py`` you will most likely need to

docs/en_US/container_deployment.rst

@@ -17,14 +17,25 @@ maintenance functions to be executed. Multiple versions are included in the
 following directories to allow use with different versions of the database
 server:
 
-* PostgreSQL 9.6: */usr/local/pgsql-9.6*
 * PostgreSQL 10: */usr/local/pgsql-10*
 * PostgreSQL 11: */usr/local/pgsql-11*
 * PostgreSQL 12: */usr/local/pgsql-12*
 * PostgreSQL 13: */usr/local/pgsql-13*
+* PostgreSQL 14: */usr/local/pgsql-14*
 
-The most recent version of the utilities is used by default; this may be
-changed in the :ref:`preferences`.
+The default binary paths set in the container are as follows:
+
+.. code-block:: bash
+
+    DEFAULT_BINARY_PATHS = {
+        'pg-14': '/usr/local/pgsql-14',
+        'pg-13': '/usr/local/pgsql-13',
+        'pg-12': '/usr/local/pgsql-12',
+        'pg-11': '/usr/local/pgsql-11',
+        'pg-10': '/usr/local/pgsql-10'
+    }
+
+this may be changed in the :ref:`preferences`.
 
 Environment Variables
 *********************
@@ -104,7 +115,7 @@ Adjust the number of threads the Gunicorn server uses to handle incoming
 requests. This should typically be left as-is, except in highly loaded systems
 where it may be increased.
 
-**PGADMIN_CONFIG_**
+**PGADMIN_CONFIG_***
 
 This is a variable prefix that can be used to override any of the configuration
 options in pgAdmin's *config.py* file. Add the *PGADMIN_CONFIG_* prefix to any
@@ -117,6 +128,12 @@ is read after */pgadmin4/config.py* and before */pgadmin4/config_local.py*.
 Any settings given will therefore override anything in config.py, but can be
 overridden by settings in config_local.py.
 
+Settings are only written to */pgadmin4/config_distro.py* once, typically on
+first launch of the container. If */pgadmin4/config_distro.py* contains one or
+more lines, then no changes are made; for example, if the container instance is
+restarted, or */pgadmin4/config_distro.py* is mapped to a file on persistent
+storage (not recommended - use */pgadmin4/config_local.py* instead)!
+
 See :ref:`config_py` for more information on the available configuration settings.
 
 Mapped Files and Directories

docs/en_US/database_dialog.rst

@@ -131,5 +131,5 @@ allows unlimited connections, and is available to all authenticated users.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

docs/en_US/debugger.rst

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

docs/en_US/desktop_deployment.rst

@@ -78,22 +78,25 @@ Use the *Runtime Menu* to access the *Configuration* dialog:
     :alt: Runtime Configuration
     :align: center
 
-Following are the details of the *Fixed port number?*, *Port Number*, and *Connection
-Timeout* configuration parameters:
+Following are the details of the *Fixed port number?*, *Port Number*, *Connection
+Timeout*, and 'Open Documentation in Default Browser?' configuration parameters:
 
 .. table::
    :class: longtable
    :widths: 2 1 4
 
-   +--------------------------+--------------------+---------------------------------------------------------------+
-   | Key                      | Type               | Purpose                                                       |
-   +==========================+====================+===============================================================+
-   | FixedPort                | Boolean            | Use a fixed network port number rather than a random one.     |
-   +--------------------------+--------------------+---------------------------------------------------------------+
-   | PortNumber               | Integer            | The port number to use, if using a fixed port.                |
-   +--------------------------+--------------------+---------------------------------------------------------------+
-   | ConnectionTimeout        | Integer            | The number of seconds to wait for application server startup. |
-   +--------------------------+--------------------+---------------------------------------------------------------+
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | Key                                    | Type               | Purpose                                                       |
+   +========================================+====================+===============================================================+
+   | FixedPort                              | Boolean            | Use a fixed network port number rather than a random one.     |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | PortNumber                             | Integer            | The port number to use, if using a fixed port.                |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | ConnectionTimeout                      | Integer            | The number of seconds to wait for application server startup. |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
+   | Open Documentation in Default Browser  | Boolean            | By checking this option, all documentation links will open in |
+   |                                        |                    | the default browser instead of in a new window.               |
+   +----------------------------------------+--------------------+---------------------------------------------------------------+
 
 Log dialog
 ----------

docs/en_US/developer_tools.rst

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

docs/en_US/domain_constraint_dialog.rst

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

docs/en_US/domain_dialog.rst

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

docs/en_US/editgrid.rst

@@ -107,6 +107,86 @@ properties of the geometries directly in map, just click the specific geometry:
     - *Internet access:* An internet connection is required for the Geometry Viewer
       to function correctly.
 
+
+**JSON Data Editor**
+
+A built in json editor is provided for *JSON/JSONB Data*.Double clicking on json/jsonb
+data type cell in data grid will open JSON Editor.Editor provides different mode to
+view and edit json data.
+
+
+.. image:: images/json_editor_modes.png
+    :alt: Json Editor
+    :align: center
+
+*Code Mode*:
+Provides way to format & compact json data.Also provides ability to repair json data
+by fixing quotes and escape characters, removing comments and JSONP notation and
+turn JavaScript objects into JSON.
+
+*Tree Mode*:
+Enabled to change, add, move, remove, and duplicate fields and values.Provides ability
+to searh & hilight data.
+
+*Form Mode*:
+Allows only to edit values in json data there by providing ability to keep data structure
+unchanged while editing.
+
+*Preview Mode*:
+Provides ability to check data before saving and also shows size of current json data.
+Format and compact json data as well.
+
+
+*Editor Toolbar*
+
+Different options are provided to manipulate json data.
+
+Code/Preview mode:
+
+.. image:: images/json_editor_code_preview_tool_bar.png
+    :alt: Json Editor Code/Preview mode Tool Bar
+    :align: center
+
+
+Tree/Form mode:
+
+.. image:: images/json_editor_tree_form_mode_tool_bar.png
+    :alt: Json Editor Tree/Form mode Tool Bar
+    :align: center
+
+
+.. table::
+   :class: longtable
+   :widths: 1 3 2
+
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | Icon                 | Behavior                                                                               | Available in mode         |
+   +======================+========================================================================================+===========================+
+   | *Format Json*        | Click to *Format Json* format json data with proper indentation.                       | Code, Preview             |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Compact Json*       | Click to *Compact Json* get compacted json data.                                       | Code, Preview             |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Sort*               | Click to *Sort* icon to set sorting criteria for the data using file values.           | Code, Preview, Tree       |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Transform*          | Click to *Transform*  to filter data  using JSME query language.                       | Code, Preview, Tree       |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Undo*               | Click to *Undo* to undo last action performed on data .                                | Code, Preview, Tree, From |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Redo*               | Click to *Redo* to repat last action performed on data .                               | Code, Preview, Tree, From |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Mode*               | Click to *Mode* dropdown to change dipaly mode of editor.Different modes avaialble     | Code, Tree, From, Preview |
+   |                      | are Code, Preview, Tree, From.                                                         |                           |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Expand All*         | Click to *Expand All* to expand json data.                                             | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Collapse All*       | Click to *Redo* to collapse json data.                                                 | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+   | *Search Box*         | Enter partial/complete string to search in data.                                       | Tree, From                |
+   +----------------------+----------------------------------------------------------------------------------------+---------------------------+
+
+
+
+
 Sort/Filter options dialog
 **************************
 

docs/en_US/erd_tool.rst

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

docs/en_US/event_trigger_dialog.rst

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

docs/en_US/exclusion_constraint_dialog.rst

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

docs/en_US/extension_dialog.rst

@@ -54,11 +54,11 @@ the *Extension* dialog:
     :alt: Extension dialog sql tab
     :align: center
 
-The command creates the *chkpass* extension in the *public* schema.  It is
-version *1.0* of *chkpass*.
+The command creates the *adminpack* extension in the *public* schema.  It is
+version *1.0* of *adminpack*.
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.
 

docs/en_US/foreign_data_wrapper_dialog.rst

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

docs/en_US/foreign_key_dialog.rst

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

docs/en_US/foreign_server_dialog.rst

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

docs/en_US/foreign_table_dialog.rst

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

docs/en_US/fts_configuration_dialog.rst

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

docs/en_US/fts_dictionary_dialog.rst

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

docs/en_US/fts_parser_dialog.rst

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

docs/en_US/fts_template_dialog.rst

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

docs/en_US/function_dialog.rst

@@ -181,5 +181,5 @@ function have three columns (p_ename, p_sal and p_comm).
 
 * Click the *Info* button (i) to access online help.
 * Click the *Save* button to save work.
-* Click the *Cancel* button to exit without saving work.
+* Click the *Close* button to exit without saving work.
 * Click the *Reset* button to restore configuration parameters.

docs/en_US/getting_started.rst

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

docs/en_US/grant_wizard.rst

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