Increase the value of --max-old-space-size to fix the Treser Plugin issue.

Update version for release.
Ensure that upload paths are children of the storage directory. Fixes #7233
2026-10-27 23:20:05 -05:00 · 2022-03-14 09:56:15 +05:30 · 2022-03-11 18:22:53 +05:30 · 2022-03-11 18:20:16 +05:30 · 2022-03-11 14:33:30 +05:30 · 2022-03-10 19:02:11 +05:30
1652 changed files with 61717 additions and 54387 deletions
@@ -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/**/*
@@ -23,46 +23,51 @@ Python Dependencies

 Name                                                             Version          Licence                              URL
 ----                                                             -------          -------                              ---
-Flask                                                            1.1.4            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.7.0            MIT                                  http://github.com/miguelgrinberg/flask-migrate/
+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                                                        0.15.1           BSD                                  https://github.com/wtforms/flask-wtf
+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/
+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.5           MIT License                          https://github.com/simplejson/simplejson
+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
-WTForms                                                          2.3.3            BSD-3-Clause                         https://wtforms.readthedocs.io/
-Flask-Paranoid                                                   0.2.0            MIT                                  http://github.com/miguelgrinberg/flask-paranoid/
-psutil                                                           5.8.0            BSD                                  https://github.com/giampaolo/psutil
-psycopg2                                                         2.8.6            LGPL with exceptions                 https://psycopg.org/
+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.3.24           MIT                                  http://www.sqlalchemy.org
-itsdangerous                                                     1.1.0            BSD                                  https://palletsprojects.com/p/itsdangerous/
-Flask-Security-Too                                               4.1.2            MIT                                  https://github.com/Flask-Middleware/flask-security
+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.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.1            LGPL v3                              https://github.com/cannatag/ldap3
-Flask-BabelEx                                                    0.9.4            BSD                                  http://github.com/mrjoes/flask-babelex
-gssapi                                                           1.6.14           LICENSE.txt                          https://github.com/pythongssapi/python-gssapi
-Flask-SocketIO                                                   5.1.1            UNKNOWN                              https://github.com/miguelgrinberg/flask-socketio
-eventlet                                                         0.31.0           UNKNOWN                              http://eventlet.net
-httpagentparser                                                  1.9.1            http://www.opensource.org/licenses/mit-license.php http://shon.github.com/httpagentparser
+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.1            Unknown                              Unknown
+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                                                           9.0.1            HPND                                 https://python-pillow.org
+boto3                                                            1.20.54          Apache License 2.0                   https://github.com/boto/boto3
+botocore                                                         1.23.54          Apache License 2.0                   https://github.com/boto/botocore
+urllib3                                                          1.26.8           MIT                                  https://urllib3.readthedocs.io/

-NOTE: This report was generated using Python 3.9. Full information may not be
+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.

-35 dependencies listed.
+40 dependencies listed.

 Javascript Dependencies
 =======================
@@ -101,6 +106,7 @@ Name                                                             Version
@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/runtime                                                   7.14.0           MIT                                  https://github.com/babel/babel.git
+@babel/runtime                                                   7.17.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
@@ -136,6 +142,7 @@ Name                                                             Version
@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
@sindresorhus/is                                                 0.7.0            MIT                                  https://github.com/sindresorhus/is.git
+@szhsin/react-menu                                               2.3.3            MIT                                  https://github.com/szhsin/react-menu.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
@@ -150,31 +157,21 @@ Name                                                             Version
@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                                                              8.9.0            MIT                                  https://github.com/ajv-validator/ajv.git
 ajv                                                              6.12.6           MIT                                  https://github.com/ajv-validator/ajv.git
-ajv                                                              5.5.2            MIT                                  https://github.com/epoberezkin/ajv.git
 ajv-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                                                      2.2.1            MIT                                  https://github.com/chalk/ansi-styles.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
-babel-types                                                      6.26.0           MIT                                  https://github.com/babel/babel/tree/master/packages/babel-types
 babelify                                                         10.0.0           MIT                                  https://github.com/babel/babelify.git
-babylon                                                          6.18.0           MIT                                  https://github.com/babel/babylon
 backbone                                                         1.4.0            MIT                                  https://github.com/jashkenas/backbone.git
 backbone                                                         1.2.3            MIT                                  https://github.com/jashkenas/backbone.git
 backbone                                                         1.3.3            MIT                                  https://github.com/jashkenas/backbone.git
@@ -191,6 +188,8 @@ bignumber.js                                                     9.0.1
 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
+bowser                                                           2.11.0           MIT                                  git+https://github.com/lancedikson/bowser.git
+brace                                                            0.11.1           MIT                                  git://github.com/thlorenz/brace.git
 brace-expansion                                                  1.1.11           MIT                                  git://github.com/juliangruber/brace-expansion.git
 browserfs                                                        1.4.3            MIT                                  https://github.com/jvilk/BrowserFS.git
 browserslist                                                     4.16.6           MIT                                  https://github.com/browserslist/browserslist.git
@@ -199,14 +198,12 @@ camelcase                                                        6.2.0
 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                                                            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.59.4           MIT                                  https://github.com/codemirror/CodeMirror.git
 color-convert                                                    1.9.3            MIT                                  https://github.com/Qix-/color-convert.git
 color-name                                                       1.1.3            MIT                                  git@github.com:dfcreative/color-name.git
@@ -218,8 +215,8 @@ component-emitter                                                1.3.0
 concat-map                                                       0.0.1            MIT                                  git://github.com/substack/node-concat-map.git
 context-menu                                                     2.0.0            MIT                                  https://github.com/chipto/context-menu.git
 convert-source-map                                               1.8.0            MIT                                  git://github.com/thlorenz/convert-source-map.git
+copy-to-clipboard                                                3.3.1            MIT                                  git+https://github.com/sudodoki/copy-to-clipboard
 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
@@ -238,13 +235,12 @@ csstype                                                          3.0.8
 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
 diff-arrays-of-objects                                           1.1.8            MIT                                  git+https://github.com/malcolmvr/diff-arrays-of-objects.git
+dom-align                                                        1.12.2           MIT                                  git@github.com:yiminghe/dom-align.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.8.0            MIT                                  https://github.com/dropzone/dropzone.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
@@ -252,15 +248,12 @@ error-ex                                                         1.3.2
 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
 filename-reserved-regex                                          2.0.0            MIT                                  https://github.com/sindresorhus/filename-reserved-regex.git
-follow-redirects                                                 1.14.4           MIT                                  git@github.com:follow-redirects/follow-redirects.git
+follow-redirects                                                 1.14.8           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
@@ -273,33 +266,29 @@ immutability-helper                                              3.1.1
 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
 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-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-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.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
 jsesc                                                            2.5.2            MIT                                  https://github.com/mathiasbynens/jsesc.git
-jsesc                                                            1.3.0            MIT                                  https://github.com/mathiasbynens/jsesc.git
 json-bignumber                                                   1.0.2            MIT                                  git@github.com:wbuss/JSONBigNumber.git
 json-parse-even-better-errors                                    2.3.1            MIT                                  https://github.com/npm/json-parse-even-better-errors
+json-schema-traverse                                             1.0.0            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
 json-schema-traverse                                             0.4.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
-json-schema-traverse                                             0.3.1            MIT                                  git+https://github.com/epoberezkin/json-schema-traverse.git
 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
+jsoneditor-react                                                 3.1.2            MIT                                  git+https://github.com/vankop/jsoneditor-react.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
@@ -331,13 +320,13 @@ moment                                                           2.29.1
 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
 nanocolors                                                       0.1.12           MIT                                  https://github.com/ai/nanocolors.git
-nanoid                                                           3.1.23           MIT                                  https://github.com/ai/nanoid.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.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
@@ -387,21 +376,33 @@ postcss-value-parser                                             4.1.0
 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
+rc-align                                                         4.0.11           MIT                                  git@github.com:react-component/align.git
+rc-dropdown                                                      3.3.0            MIT                                  git@github.com:react-component/dropdown.git
+rc-menu                                                          9.3.2            MIT                                  git@github.com:react-component/menu.git
+rc-motion                                                        2.4.4            MIT                                  git@github.com:react-component/motion.git
+rc-overflow                                                      1.2.2            MIT                                  git@github.com:react-component/overflow.git
+rc-resize-observer                                               1.2.0            MIT                                  git@github.com:react-component/resize-observer.git
+rc-tabs                                                          11.10.5          MIT                                  git@github.com:react-component/tabs.git
+rc-trigger                                                       5.2.10           MIT                                  https://github.com/react-component/trigger.git
+rc-util                                                          5.17.0           MIT                                  git@github.com:react-component/util.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-transition-state                                           1.1.3            MIT                                  https://github.com/szhsin/react-transition-state.git
 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
+require-from-string                                              2.0.2            MIT                                  https://github.com/floatdrop/require-from-string.git
+resize-observer-polyfill                                         1.5.1            MIT                                  https://github.com/que-etc/resize-observer-polyfill.git
 resolve-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
@@ -410,7 +411,6 @@ safe-buffer                                                      5.1.2
 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
@@ -422,13 +422,11 @@ socket.io-parser                                                 4.0.4
 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
 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                                                   2.0.0            MIT                                  https://github.com/chalk/supports-color.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
@@ -439,8 +437,7 @@ tiny-emitter                                                     2.1.0
 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
+toggle-selection                                                 1.0.6            MIT                                  git+https://github.com/sudodoki/toggle-selection
 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
 uniqs                                                            2.0.0            MIT                                  git://github.com/fgnass/uniqs.git
@@ -471,8 +468,8 @@ minimatch                                                        3.0.4
 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
+react-timer-hook                                                 3.0.5            ISC                                  git+https://github.com/amrlabib/react-timer-hook.git
 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
@@ -480,9 +477,7 @@ yaml                                                             1.10.2
 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
 istanbul-lib-instrument                                          4.0.3            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
 istanbul-lib-report                                              3.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
 istanbul-lib-source-maps                                         4.0.0            BSD-3-Clause                         git+ssh://git@github.com/istanbuljs/istanbuljs.git
@@ -497,15 +492,16 @@ indefinite-observable                                            2.0.1
 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
+rc-dock                                                          3.2.10           Apache-2.0                           https://github.com/ticlo/rc-dock.git
+rc-new-window                                                    0.1.13           Apache-2.0                           https://github.com/ticlo/rc-new-window.git
 snapsvg                                                          0.5.1            Apache-2.0                           git@github.com:adobe-webplatform/Snap.svg.git
-caniuse-lite                                                     1.0.30001230     CC-BY-4.0                            https://github.com/browserslist/caniuse-lite.git
+caniuse-lite                                                     1.0.30001309     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
@@ -518,5 +514,5 @@ precond                                                          0.2.3
 webcabin-docker                                                  2.2.5            MIT*                                 Unknown
 tablesorter                                                      2.31.3           (MIT OR GPL-2.0)                     git://github.com/Mottie/tablesorter.git

-448 dependencies listed.
+439 dependencies listed.

@@ -12,7 +12,7 @@
 # and clean up the web/ source code
 #########################################################################

-FROM alpine:3.14 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.14 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,21 +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.14 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/
@@ -152,7 +149,7 @@ COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
 # Assemble everything into the final container.
 #########################################################################

-FROM alpine:3.14
+FROM alpine:3.15

 # Copy in the Python packages
 COPY --from=env-builder /venv /venv
@@ -183,9 +180,11 @@ RUN apk add \
        py3-pip \
        postfix \
        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 {} + && \
@@ -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
@@ -211,7 +211,8 @@ REM Main build sequence Ends
    RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache" 1> nul 2>&1

    ECHO Copying web directory...
-    XCOPY /S /I /E /H /Y "%WD%\web" "%BUILDROOT%\web" > nul || EXIT /B 1
+    ROBOCOPY /S "%WD%\web" "%BUILDROOT%\web" > nul
+    CALL :CHECK_ROBOCOPY_ERROR

    ECHO Installing javascript dependencies...
    CD "%BUILDROOT%\web"
@@ -272,17 +273,16 @@ REM Main build sequence Ends
    REM YARN END

    REM WGET
-    REM Comment out the below for loop as the latest version (0.57.0) having
-    REM some problem, so for the time being hardcoded the version to 0.55.0
+    REM Comment out the below for loop as the latest version (0.62.0) having
+    REM some problem, so for the time being hardcoded the version to 0.61.0
    REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i"
    REM :GET_NW
    REM    wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip"
    REM    IF %ERRORLEVEL% NEQ 0 GOTO GET_NW

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

@@ -371,3 +371,6 @@ REM Main build sequence Ends

    EXIT /B 1

+:CHECK_ROBOCOPY_ERROR
+    IF %ERRORLEVEL% GEQ 8 EXIT /B %ERRORLEVEL%
+    EXIT /B 0
@@ -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
@@ -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).

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

@@ -0,0 +1,87 @@
+.. _cloud_deployment:
+
+******************************
+`Cloud Deployment`:index:
+******************************
+
+The PostgreSQL server can be deployed on the Amazon AWS cloud using this module.
+Currently only RDS is available, but in the future more cloud options will be available.
+
+To launch the *Cloud Deployment...* tool, right click on the *Server Group* or *Server* of the tree control, and select
+*Deploy a Cloud Instance* from the *Register* menu.
+
+.. image:: images/cloud_deployment_provider.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+Once you launch the tool, the Amazon RDS is already selected as this is the only option currently available.
+Click on the *Next* button to proceed further.
+
+.. image:: images/cloud_deployment_credentials.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+In the Credentials dialog, provide the region in which you want to deploy the instance along with
+*AWS access key* and *AWS secret access key*.
+Provide *AWS session token* only if your AWS session is temporary.
+
+To proceed further, click on the next button. Before going further, pgAdmin will validate your credentials.
+
+.. image:: images/cloud_deployment_instance.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+Use the fields from the Instance Specification tab to specify the Instance details.
+
+* Use the *Instance name* field to add an instance name for the PostgreSQL server; the name
+  specified will be displayed in the *Browser* tree control too.
+
+* Use the *Public IP* field to specify the IP Address range for permitting the inbound traffic.
+
+* Use the *Database version* field to specify the PostgreSQL version to deploy.
+
+* Use the *Instance class* field to allocate the computational, network, and memory capacity required by planned workload of this DB instance.
+
+* Use the *Instance type* field to select the instance type.
+
+* Use the *Storage type* field to select the instance storage type. Three options are available. General Purpose (SSD) storage, Provisioned IOPS (SSD) and Magnetic storage.
+
+* Use the *Allocated storage* field to specify the storage capacity in GiB.
+
+* Use the *Provisioned IOPS* in case of  Provisioned IOPS (SSD) storage type.
+
+.. image:: images/cloud_deployment_database.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+Use the fields from the Database Details tab to specify the Instance details.
+
+* Use the drop-down list box in the *Server group* field to select the parent
+  node for the server; the server will be displayed in the *Browser* tree
+  control within the specified group.
+
+* Use the *Database name* field to add the database name for the PostgreSQL server.
+
+* Use the *Username* field to specify the name of a role that will be used when
+  authenticating with the server.
+
+* Use the *Password* field to provide a password that will be supplied when
+  authenticating with the server.
+
+* Use the *Confirm password* field to repeat the password.
+
+* Enter the listener port number of the server host in the *Port* field.
+
+.. image:: images/cloud_deployment_review.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+At the end, review the Instance details that you provided. Click on Finish button to deploy the instance on Amazon RDS.
+
+.. image:: images/cloud_deployment_tree.png
+    :alt: Cloud Deployment Provider
+    :align: center
+
+Once you click on the finish, one background process will start which will deploy the instance in the cloud
+and monitor the progress of the deployment. The Server will be added to the tree with the cloud uploading icon.
+Once the deployment is done, the necessary server details will be updated.
@@ -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.

@@ -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
    #
    ##########################################################################
@@ -18,7 +18,7 @@ control, and select *Server Group* from the *Create* menu.
 Use the fields on the *Server* dialog to define the connection properties for
 each new server that you wish to manage with pgAdmin.  To open the *Server*
 dialog, right-click on the *Servers* node of the tree control, and select
-*Server* from the *Create* menu.
+*Server* from the *Register* menu.

 .. toctree::

@@ -17,7 +17,6 @@ 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*
@@ -33,8 +32,7 @@ The default binary paths set in the container are as follows:
        'pg-13': '/usr/local/pgsql-13',
        'pg-12': '/usr/local/pgsql-12',
        'pg-11': '/usr/local/pgsql-11',
-        'pg-10': '/usr/local/pgsql-10',
-        'pg-9.6': '/usr/local/pgsql-9.6'
+        'pg-10': '/usr/local/pgsql-10'
    }

 this may be changed in the :ref:`preferences`.
@@ -17,3 +17,4 @@ will provide detailed information about creating a custom deployment.
   desktop_deployment
   server_deployment
   container_deployment
+   cloud_deployment
@@ -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
 ----------
@@ -33,6 +33,7 @@ Mode is pre-configured for security.

   deployment
   login
+   mfa
   user_management
   change_user_password
   restore_locked_user
@@ -1,4 +1,4 @@
-.. _export_import_servers:
+.. _import_export_servers:

 ******************************
 `Import/Export Servers`:index:
@@ -6,14 +6,56 @@

 Server definitions (and their groups) can be exported to a JSON file and
 re-imported to the same or a different system to enable easy pre-configuration
-of pgAdmin. The ``setup.py`` script is used for this purpose.
+of pgAdmin.

-.. note:: To export or import servers, you must use the Python interpreter that
-        is normally used to run pgAdmin to ensure that the required Python
-        packages are available. In most packages, this can be found in the
-        Python Virtual Environment that can be found in the installation
-        directory. When using platform-native packages, the system installation
-        of Python may be the one used by pgAdmin.
+Using pgAdmin 4 GUI
+###################
+
+To launch the *Import/Export Servers...* tool, navigate through *Tools* on the
+menu bar to click on the *Import/Export Servers* option.
+
+.. image:: images/import_export_servers_step1.png
+    :alt: Import/Export Servers step one page
+    :align: center
+
+* Use the *Import/Export* field to select the Server Groups/Servers
+  to be imported or exported.
+
+* Use the *Filename* field to select the JSON file to import servers or create the
+  new file in case of Export where the servers to be exported in the JSON format.
+
+* Use the *Remove all the existing servers?* field to specify whether to remove all the
+  existing servers or not before importing the new selected servers.
+  This field is applicable only in case of Import Servers.
+
+Click the *Next* button to continue, or the *X* button to close the wizard.
+
+.. image:: images/import_export_servers_step2.png
+    :alt: Import/Export Servers step two page
+    :align: center
+
+* Select the Server Groups/ Servers to be imported/exported.
+
+Click the *Next* button to continue, or the *X* button to close the wizard.
+
+.. image:: images/import_export_servers_step3.png
+    :alt: Import/Export Servers step three page
+    :align: center
+
+Check the summary of the servers that are going to be imported/exported on the
+Summary page.
+
+Click the *Finish* button to close the wizard.
+
+Using 'setup.py' command line script
+####################################
+
+.. note:: To export or import servers using ``setup.py`` script, you must use
+        the Python interpreter that is normally used to run pgAdmin to ensure
+        that the required Python packages are available. In most packages, this
+        can be found in the Python Virtual Environment that can be found in the
+        installation directory. When using platform-native packages, the system
+        installation of Python may be the one used by pgAdmin.

 Exporting Servers
 *****************
@@ -23,7 +65,7 @@ the ``--dump-servers`` command line option, followed by the name (and if require
 path) to the desired output file. By default, servers owned by the desktop mode
 user will be dumped (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
 setting in ``config.py``). This can be overridden with the ``--user`` command
-line option. There can be multiple configuations of pgAdmin on the same system.
+line option. There can be multiple configurations of pgAdmin on the same system.
 To dump the servers from specific pgAdmin config DB file, ``--sqlite-path`` option
 can be used. It is also recommended to use this option when running pgAdmin in
 desktop mode. By default SQLITE_PATH setting in ``config.py`` is taken.
@@ -56,7 +98,7 @@ the ``--load-servers`` command line option, followed by the name (and if require
 path) of the JSON file containing the server definitions. Servers will be owned
 by the desktop mode user (pgadmin4@pgadmin.org by default - see the DESKTOP_USER
 setting in ``config.py``). This can be overridden with the ``--user`` command
-line option. There can be multiple configuations of pgAdmin on the same system.
+line option. There can be multiple configurations of pgAdmin on the same system.
 The default behaviour is for the imported servers to be added to the existent list,
 which might lead to duplicates. This can be overridden with the ``--replace`` command
 line option, which will replace the list of servers with the newly imported one.
@@ -27,3 +27,7 @@ of database objects.
   contributions
   release_notes
   licence
+
+.. note:: Postgres, PostgreSQL and the Slonik Logo are trademarks or
+    registered trademarks of the `PostgreSQL Community Association of Canada
+    <https://www.postgres.ca/>`_, and used with their permission.
@@ -13,7 +13,7 @@ documentation is attributed to the

 .. topic:: 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
@@ -15,7 +15,6 @@ database, right-click on the *Databases* node, and select *Create Database...*
   :maxdepth: 1

   database_dialog
-   move_objects
   resource_group_dialog
   role_dialog
   tablespace_dialog
@@ -53,20 +53,20 @@ following options (in alphabetical order):
 | *Clear SSH Tunnel Password* | If you have saved the ssh tunnel password, click to clear the saved password.                                            |
 |                             | Enable only when password is already saved.                                                                              |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Connect Server...*         | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
+| *Connect Server*            | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server.           |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Create*                    | Click *Create* to access a context menu that provides context-sensitive selections.                                      |
 |                             | Your selection opens a *Create* dialog for creating a new object.                                                        |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Delete/Drop*               | Click to delete the currently selected object from the server.                                                           |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Disconnect Server...*      | Click to disconnect the currently selected server.                                                                       |
+| *Disconnect from server*    | Click to disconnect from the currently selected server.                                                                  |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Drop Cascade*              | Click to delete the currently selected object and all dependent objects from the server.                                 |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Properties...*             | Click to review or modify the currently selected object's properties.                                                    |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Refresh...*                | Click to refresh the currently selected object.                                                                          |
+| *Refresh*                   | Click to refresh the currently selected object.                                                                          |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Remove Server*             | Click to remove the currently selected server.                                                                           |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
@@ -96,40 +96,40 @@ Use the *Tools* menu to access the following options (in alphabetical order):
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | Option                    | Action                                                                                                                                    |
 +===========================+===========================================================================================================================================+
-| *Add named restore point* | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current     |
-|                           | server state.                                                                                                                             |
+| *ERD Tool*                | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database.                                                           |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Backup...*               | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects.                                                     |
+| *Grant Wizard...*         | Click to access the :ref:`Grant Wizard <grant_wizard>` tool.                                                                              |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *PSQL Tool*               | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context.                                            |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Query tool*              | Click to open the :ref:`Query tool <query_tool>` for the currently selected object.                                                       |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Schema Diff*             | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema.                                |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Backup Globals...*       | Click to open the :ref:`Backup Globals... <backup_globals_dialog>` dialog to backup cluster objects.                                      |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Backup Server...*        | Click to open the :ref:`Backup Server... <backup_server_dialog>` dialog to backup a server.                                               |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Grant Wizard...*         | Click to access the :ref:`Grant Wizard <grant_wizard>` tool.                                                                              |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Import/Export...*        | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table.                         |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Maintenance...*          | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER.                              |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Pause replay of WAL*     | Click to pause the replay of the WAL log.                                                                                                 |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Query tool*              | Click to open the :ref:`Query tool <query_tool>` for the currently selected object.                                                       |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Reload Configuration...* | Click to update configuration files without restarting the server.                                                                        |
+| *Backup...*               | Click to open the :ref:`Backup... <backup_dialog>` dialog to backup database objects.                                                     |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Restore...*              | Click to access the :ref:`Restore <restore_dialog>` dialog to restore database files from a backup.                                       |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Resume replay of WAL*    | Click to resume the replay of the WAL log.                                                                                                |
+| *Import/Export Data...*   | Click to open the :ref:`Import/Export data... <import_export_data>` dialog to import or export data from a table.                         |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Storage Manager*         | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files.                               |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *New ERD Project*         | Click to open the :ref:`ERD Tool <erd_tool>` and start designing your database.                                                           |
-+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *Schema Diff*             | Click to open the :ref:`Schema Diff <schema_diff_feature>` and start comparing two database or two schema.                                |
+| *Maintenance...*          | Click to open the :ref:`Maintenance... <maintenance_dialog>` dialog to VACUUM, ANALYZE, REINDEX, or CLUSTER.                              |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
 | *Search Objects...*       | Click to open the :ref:`Search Objects... <search_objects>` and start searching any kind of objects in a database.                        |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
-| *PSQL Tool*               | Click to open the :ref:`PSQL Tool <psql_tool>` and start PSQL in the current database context.                                            |
+| *Add named restore point* | Click to open the :ref:`Add named restore point... <add_restore_point_dialog>` dialog to take a point-in-time snapshot of the current     |
+|                           | server state.                                                                                                                             |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Pause replay of WAL*     | Click to pause the replay of the WAL log.                                                                                                 |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Resume replay of WAL*    | Click to resume the replay of the WAL log.                                                                                                |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Reload Configuration...* | Click to update configuration files without restarting the server.                                                                        |
+---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
+| *Storage Manager*         | Click to open the :ref:`Storage Manager <storage_manager>` to upload, delete, or download the backup files.                               |
 +---------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+

 The Help Menu
@@ -0,0 +1,57 @@
+.. _mfa:
+
+*************************************************
+`Enabling two-factor authentication (2FA)`:index:
+*************************************************
+
+About two-factor authentication
+===============================
+Two-factor authentication (2FA) is an extra layer of security used when logging
+into websites or apps. With 2FA, you have to log in with your username and
+password and provide another form of authentication that only you know or have
+access to.
+
+
+Setup two-factor authentication
+===============================
+To set up 2FA for pgAdmin 4, you must configure the Two-factor Authentication
+settings in *config_local.py* or *config_system.py* (see the
+:ref:`config.py <config_py>` documentation) on the system where pgAdmin is
+installed in Server mode. You can copy these settings from *config.py* file and
+modify the values for the following parameters.
+
+.. csv-table::
+   :header: "**Parameter**", "**Description**"
+   :class: longtable
+   :widths: 35, 55
+
+   "MFA_ENABLED","The default value for this parameter is True.
+   To disable 2FA, set the value to *False*"
+   "SUPPORTED_MFA_LIST", "Set the authentication methods to be supported "
+   "MFA_EMAIL_SUBJECT", "<APP_NAME> - Verification Code e.g. pgAdmin 4 -
+   Verification Code"
+   "MFA_FORCE_REGISTRATION", "Force the user to configure the authentication
+   method on login (if no authentication is already configured)."
+
+*NOTE: You must set the 'Mail server settings' in config_local.py or
+config_system.py in order to use 'email' as two-factor authentication method
+(see the* :ref:`config.py <config_py>` *documentation).*
+
+
+Configure two-factor authentication
+===================================
+To configure 2FA for a user, you must click on 'Two-factor Authentication'
+in the `User` menu in right-top corner. It will list down all the supported
+multi factor authentication methods. Click on 'Setup' of one of those methods
+and follow the steps for each authentication method. You will see the `Delete`
+button for the authentication method, which is already been configured.
+Clicking on `Delete` button will deregister the authentication method for the
+current user.
+
+.. image:: images/mfa_registration.png
+    :alt: Configure two-factor authentication
+    :align: center
+
+You can also force users to configure the two-factor
+authentication methods on login by setting *MFA_FORCE_REGISTRATION* parameter
+to *True*.
@@ -1,65 +0,0 @@
-.. _move_objects:
-
-****************************
-`Move Objects Dialog`:index:
-****************************
-
-Use the *Move Objects* dialog to move database objects from one tablespace to
-another tablespace.
-
-The *Move Objects* dialog organizes the movement of database objects with the
-*General* tab; the *SQL* tab displays the SQL code generated by dialog
-selections.
-
-.. image:: images/move_objects_general.png
-    :alt: Move objects dialog general tab
-    :align: center
-
-Use the fields in the *General* tab to identify the items that will be moved and
-the tablespace to which they will be moved:
-
-* Use the *New tablespace* drop-down listbox to select a pre-existing
-  tablespace to which the object will be moved. (To create a tablespace, use the
-  *Tablespace* dialog; access the dialog by right clicking *Tablespaces* in the
-  *pgAdmin* tree control and selecting *Create Tablespace...* from the
-  context-menu.)
-* Use the *Object type* drop-down listbox to select from the following:
-
-   * Select *All* to move all tables, indexes, and materialized views from the
-     current tablespace (currently selected in the *pgAdmin* tree control) to
-     the new tablespace.
-   * Select *Tables* to move tables from the current tablespace to the new
-     tablespace.
-   * Select *Indexes* to move indexes from the current tablespace to the new
-     tablespace.
-   * Select *Materialized views* to move materialized views from the current
-     tablespace to the new tablespace.
-
-* Use the *Object owner* drop-down listbox to select the role that owns the
-  objects selected in the *Object type* field. This field is optional.
-
-Click the *SQL* tab to continue.
-
-Your entries in the *Move Objects* dialog generate a SQL command (see an example
-below). Use the *SQL* tab for review; revisit the *General* tab to modify the
-SQL command.
-
-Example
-*******
-
-The following is an example of the sql command generated by user selections in
-the *Move Objects* dialog:
-
-.. image:: images/move_objects_sql.png
-    :alt: Move Objects dialog sql tab
-    :align: center
-
-The example shown demonstrates moving materialized views owned by Alice from
-tablespace *tbspace_01* to *tbspace_02*.
-
-* Click the *Help* button (?) to access online help.
-* Click the *OK* button to save work.
-* Click the *Cancel* button to exit without saving work.
-
-
-
@@ -207,7 +207,7 @@ the *Data Output* tab.
 * Table

 *Table* tab shows the plan details in table format, it generates table format
-similar to *explain.depsez.com*. Each row of the table represent the data for a
+similar to *explain.depesz.com*. Each row of the table represent the data for a
 *Explain Plan Node*. It may contain the node information, exclusive timing,
 inclusive timing, actual vs planned rows differences, actual rows, planned
 rows, loops.
@@ -11,6 +11,11 @@ notes for it.
 .. toctree::
   :maxdepth: 1

+   release_notes_6_7
+   release_notes_6_6
+   release_notes_6_5
+   release_notes_6_4
+   release_notes_6_3
   release_notes_6_2
   release_notes_6_1
   release_notes_6_0
@@ -0,0 +1,50 @@
+************
+Version 6.3
+************
+
+Release date: 2021-12-16
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.2.
+
+New features
+************
+
+| `Issue #6543 <https://redmine.postgresql.org/issues/6543>`_ -  Added support for Two-factor authentication for improving security.
+| `Issue #6872 <https://redmine.postgresql.org/issues/6872>`_ -  Include GSSAPI support in the PostgreSQL libraries and utilities on macOS.
+| `Issue #7039 <https://redmine.postgresql.org/issues/7039>`_ -  Added support to disable the auto-discovery of the database servers.
+
+Housekeeping
+************
+
+| `Issue #6088 <https://redmine.postgresql.org/issues/6088>`_ -  Replace Flask-BabelEx with Flask-Babel.
+| `Issue #6984 <https://redmine.postgresql.org/issues/6984>`_ -  Port Backup Global, Backup Server, and Backup object dialog in React.
+| `Issue #7004 <https://redmine.postgresql.org/issues/7004>`_ -  Replaced alertifyjs notifiers with React-based notistack.
+| `Issue #7010 <https://redmine.postgresql.org/issues/7010>`_ -  Upgrade Flask to version 2.
+| `Issue #7053 <https://redmine.postgresql.org/issues/7053>`_ -  Replace Alertify alert and confirm with React-based model dialog.
+
+Bug fixes
+*********
+
+| `Issue #6840 <https://redmine.postgresql.org/issues/6840>`_ -  Fixed an issue where tooltip data are not displaying on downloaded graphical explain plan.
+| `Issue #6877 <https://redmine.postgresql.org/issues/6877>`_ -  Fixed schema diff owner related issue.
+| `Issue #6906 <https://redmine.postgresql.org/issues/6906>`_ -  Fixed an issue where referenced table drop-down should be disabled in foreign key -> columns after one row is added.
+| `Issue #6955 <https://redmine.postgresql.org/issues/6955>`_ -  Ensure that sort order should be maintained when renaming a server group.
+| `Issue #6957 <https://redmine.postgresql.org/issues/6957>`_ -  Fixed schema diff related some issues.
+| `Issue #6963 <https://redmine.postgresql.org/issues/6963>`_ -  Ensure that the user should be allowed to set the schema of an extension while creating it.
+| `Issue #6978 <https://redmine.postgresql.org/issues/6978>`_ -  Increase the width of the scrollbars.
+| `Issue #6986 <https://redmine.postgresql.org/issues/6986>`_ -  Fixed an issue where the user can't debug function with timestamp parameter.
+| `Issue #6989 <https://redmine.postgresql.org/issues/6989>`_ -  Fixed an issue where the Change Password menu option is missing for internal authentication source when more than one authentication source is defined.
+| `Issue #7005 <https://redmine.postgresql.org/issues/7005>`_ -  Fixed an issue where On-demand rows throw an error when any row cell is edited and saved it then scroll to get more rows.
+| `Issue #7006 <https://redmine.postgresql.org/issues/7006>`_ -  Ensure that Python 3.10 and the latest eventlet dependency should not break the application.
+| `Issue #7013 <https://redmine.postgresql.org/issues/7013>`_ -  Fix an RPM build issue that could lead to a conflict with python3 at installation.
+| `Issue #7015 <https://redmine.postgresql.org/issues/7015>`_ -  Fixed an issue where the error is thrown while creating a new server using Add New Server from the dashboard while tree item is not selected.
+| `Issue #7020 <https://redmine.postgresql.org/issues/7020>`_ -  Ensure that statue message should not hide the last line of messages when running a long query.
+| `Issue #7024 <https://redmine.postgresql.org/issues/7024>`_ -  Fixed an issue where reverse engineering SQL is wrong for Aggregate.
+| `Issue #7029 <https://redmine.postgresql.org/issues/7029>`_ -  Correct the SQL definition for function/procedure with the Atomic keyword in PG14.
+| `Issue #7031 <https://redmine.postgresql.org/issues/7031>`_ -  Fixed an issue where SQLite database definition is wrong because the USER_ID FK references the table user_old which is not available.
+| `Issue #7040 <https://redmine.postgresql.org/issues/7040>`_ -  Add "section" to the Debian package control files.
+| `Issue #7044 <https://redmine.postgresql.org/issues/7044>`_ -  Update the dropzone version to 5.9.3 and Flask-SQLAlchemy to 2.5.*.
+| `Issue #7046 <https://redmine.postgresql.org/issues/7046>`_ -  Fixed some accessibility issues.
+| `Issue #7048 <https://redmine.postgresql.org/issues/7048>`_ -  Fixed unhashable type issue while opening the about dialog.
+| `Issue #7064 <https://redmine.postgresql.org/issues/7064>`_ -  Ensure that the Owner should not be disabled while creating the procedure.
+| `Issue #7071 <https://redmine.postgresql.org/issues/7071>`_ -  Fixed an issue where confirmation pop-up is hidden behind Reassign/Drop Owned Dialog.
@@ -0,0 +1,32 @@
+************
+Version 6.4
+************
+
+Release date: 2022-01-13
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.3.
+
+New features
+************
+
+| `Issue #4803 <https://redmine.postgresql.org/issues/4803>`_ -  Added support to import/export server groups and servers from GUI.
+
+Housekeeping
+************
+
+| `Issue #7018 <https://redmine.postgresql.org/issues/7018>`_ -  Port Restore dialog to React.
+| `Issue #7019 <https://redmine.postgresql.org/issues/7019>`_ -  Port Maintenance dialog to React.
+
+Bug fixes
+*********
+
+| `Issue #6745 <https://redmine.postgresql.org/issues/6745>`_ -  Fixed an issue where Tablespace is created though an error is shown on the dialog.
+| `Issue #7003 <https://redmine.postgresql.org/issues/7003>`_ -  Fixed an issue where Explain Analyze shows negative exclusive time.
+| `Issue #7034 <https://redmine.postgresql.org/issues/7034>`_ -  Fixed an issue where Columns with default value not showing when adding a new row.
+| `Issue #7075 <https://redmine.postgresql.org/issues/7075>`_ -  Ensure that help should be visible properly for Procedures.
+| `Issue #7077 <https://redmine.postgresql.org/issues/7077>`_ -  Fixed an issue where the Owner is not displayed in the reverse engineering SQL for Procedures.
+| `Issue #7078 <https://redmine.postgresql.org/issues/7078>`_ -  Fixed an issue where an operation error message pop up showing the database object's name incorrectly.
+| `Issue #7081 <https://redmine.postgresql.org/issues/7081>`_ -  Fixed an issue in SQL generation for PostgreSQL-14 functions.
+| `Issue #7093 <https://redmine.postgresql.org/issues/7093>`_ -  Fixed an issue where SubPlans may overlap other nodes & make them inaccessible in Graphical EXPLAIN View.
+| `Issue #7096 <https://redmine.postgresql.org/issues/7096>`_ -  Ensure that Truncate and Reset statistics should work.
+| `Issue #7102 <https://redmine.postgresql.org/issues/7102>`_ -  Fixed a schema diff issue where generated script adds unwanted line endings for Functions/Procedures/Trigger Functions.
@@ -0,0 +1,42 @@
+************
+Version 6.5
+************
+
+Release date: 2022-02-11
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.4.
+
+New features
+************
+
+| `Issue #7139 <https://redmine.postgresql.org/issues/7139>`_ -  Added support to open SQL help, Dialog help, and online help in an external web browser.
+
+Housekeeping
+************
+
+| `Issue #7016 <https://redmine.postgresql.org/issues/7016>`_ -  Port Dependent, dependencies, statistics panel to React.
+| `Issue #7017 <https://redmine.postgresql.org/issues/7017>`_ -  Port Import/Export dialog to React.
+| `Issue #7163 <https://redmine.postgresql.org/issues/7163>`_ -  Rename the menu 'Disconnect Server' to 'Disconnect from server'.
+
+Bug fixes
+*********
+
+| `Issue #6916 <https://redmine.postgresql.org/issues/6916>`_ -  Added flag in runtime to disable GPU hardware acceleration.
+| `Issue #7035 <https://redmine.postgresql.org/issues/7035>`_ -  Fixed an issue where connections keep open to (closed) connections on the initial connection to the database server.
+| `Issue #7085 <https://redmine.postgresql.org/issues/7085>`_ -  Ensure that Partitioned tables should be visible correctly when creating multiple partition levels.
+| `Issue #7086 <https://redmine.postgresql.org/issues/7086>`_ -  Correct documentation for 'Add named restore point'.
+| `Issue #7100 <https://redmine.postgresql.org/issues/7100>`_ -  Fixed an issue where the Browser tree gets disappears when scrolling sequences.
+| `Issue #7109 <https://redmine.postgresql.org/issues/7109>`_ -  Make the size blank for all the directories in the file select dialog.
+| `Issue #7110 <https://redmine.postgresql.org/issues/7110>`_ -  Ensure that cursor should be focused on the first options of the Utility dialogs.
+| `Issue #7118 <https://redmine.postgresql.org/issues/7118>`_ -  Ensure that JSON files should be downloaded properly from the storage manager.
+| `Issue #7123 <https://redmine.postgresql.org/issues/7123>`_ -  Fixed an issue where restore generates incorrect options for the schema.
+| `Issue #7126 <https://redmine.postgresql.org/issues/7126>`_ -  Fixed an issue where the F2 Function key removes browser panel contents.
+| `Issue #7127 <https://redmine.postgresql.org/issues/7127>`_ -  Added validation for Hostname in the server dialog.
+| `Issue #7135 <https://redmine.postgresql.org/issues/7135>`_ -  Enforce the minimum Windows version that the installer will run on.
+| `Issue #7136 <https://redmine.postgresql.org/issues/7136>`_ -  Fixed an issue where the query tool is displaying an incorrect label.
+| `Issue #7142 <https://redmine.postgresql.org/issues/7142>`_ -  Fixed an issue where a warning message was shown after database creation/modification.
+| `Issue #7145 <https://redmine.postgresql.org/issues/7145>`_ -  Ensure that owner should be ignored while comparing extensions.
+| `Issue #7146 <https://redmine.postgresql.org/issues/7146>`_ -  Fixed event trigger comparing issue in Schema Diff tool.
+| `Issue #7150 <https://redmine.postgresql.org/issues/7150>`_ -  Fixed an issue when uploading a CSV throwing an error in the Desktop mode.
+| `Issue #7151 <https://redmine.postgresql.org/issues/7151>`_ -  Fixed value error in the restore dialog.
+| `Issue #7154 <https://redmine.postgresql.org/issues/7154>`_ -  Ensure that the layout should not be reset if a query tool is opened and pgAdmin is restarted.
@@ -0,0 +1,33 @@
+************
+Version 6.6
+************
+
+Release date: 2022-03-10
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.5.
+
+New features
+************
+
+| `Issue #7177 <https://redmine.postgresql.org/issues/7177>`_ -  Added capability to deploy PostgreSQL servers on Amazon RDS.
+
+Housekeeping
+************
+
+| `Issue #7180 <https://redmine.postgresql.org/issues/7180>`_ -  Rename the menu 'Disconnect Database' to 'Disconnect from database'.
+
+
+Bug fixes
+*********
+
+| `Issue #6956 <https://redmine.postgresql.org/issues/6956>`_ -  Fixed a schema diff issue in which user mappings were not compared correctly.
+| `Issue #6991 <https://redmine.postgresql.org/issues/6991>`_ -  Fixed an issue where pgadmin cannot connect to LDAP when STARTTLS is required before bind.
+| `Issue #6999 <https://redmine.postgresql.org/issues/6999>`_ -  Fixed an issue where a warning is flashed every time for an email address when authentication sources are internal and ldap.
+| `Issue #7105 <https://redmine.postgresql.org/issues/7105>`_ -  Fixed an issue where the parent partition table was not displayed during autocomplete.
+| `Issue #7124 <https://redmine.postgresql.org/issues/7124>`_ -  Fixed the schema diff issue where tables have different column positions and a column has a default value.
+| `Issue #7152 <https://redmine.postgresql.org/issues/7152>`_ -  Added comments column for the functions collection node.
+| `Issue #7172 <https://redmine.postgresql.org/issues/7172>`_ -  Allow users to scroll and enter input when there is a validation error.
+| `Issue #7173 <https://redmine.postgresql.org/issues/7173>`_ -  Fixed an issue where the User Management dialog is not opening.
+| `Issue #7181 <https://redmine.postgresql.org/issues/7181>`_ -  Ensure that the user should be able to add new server with unix socket connection.
+| `Issue #7186 <https://redmine.postgresql.org/issues/7186>`_ -  Fixes an issue where the connect server/database menu was not updated correctly.
+| `Issue #7202 <https://redmine.postgresql.org/issues/7202>`_ -  Ensure that Flask-Security-Too is using the latest version.
@@ -0,0 +1,26 @@
+************
+Version 6.7
+************
+
+Release date: 2022-03-14
+
+This release contains a number of bug fixes and new features since the release of pgAdmin4 6.6.
+
+.. note::  **Security Release**
+
+    Please note that this release includes a security update to fix an issue
+    where a user could upload files to directories outside of their storage directory, when using pgAdmin
+    running in server mode.
+
+    Users running pgAdmin in server mode, including the standard container based distribution, should upgrade
+    to this release as soon as possible.
+
+    This issue does not affect users running in desktop mode.
+
+Bug fixes
+*********
+
+  | `Issue #7220 <https://redmine.postgresql.org/issues/7220>`_ -  Fixed a schema diff issue where difference SQL isn't generated when foreign key values for a table differ.
+  | `Issue #7228 <https://redmine.postgresql.org/issues/7228>`_ -  Fixed a schema diff issue where string separator '_$PGADMIN$_' is visible for identical user mappings.
+  | `Issue #7230 <https://redmine.postgresql.org/issues/7230>`_ -  Fixed an issue where pgAdmin 4 took ~75 seconds to display the 'Starting pgAdmin' text on the splash screen.
+  | `Issue #7233 <https://redmine.postgresql.org/issues/7233>`_ -  Ensure that upload paths are children of the storage directory.
@@ -38,8 +38,9 @@ restore process:
 * Use the drop-down listbox next to *Rolename* to specify the role that will be
  used to authenticate with the server during the restore process.

-Click the *Restore options* tab to continue. Use the fields on the *Restore
-options* tab to specify options that correspond to *pg_restore* options.
+Click the *Data/Objects* tab to continue. Use the fields on the *Data/Objects*
+tab to specify options related to data or pgAdmin objects that correspond to
+*pg_restore* options.

 .. image:: images/restore_sections.png
    :alt: Restore dialog options section
@@ -48,11 +49,11 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Sections** box to specify the content that will be
  restored:

-   * Move the switch next to *Pre-data* to the *Yes* position to restore all
+   * Move the switch next to *Pre-data* towards right position to restore 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 restore actual
+   * Move the switch next to *Data* towards right position to restore actual
     table data, large-object contents, and sequence values.
-   * Move the switch next to *Post-data* to the *Yes* position to restore
+   * Move the switch next to *Post-data* towards right position position to restore
     definitions of indexes, triggers, rules, and constraints (other than
     validated check constraints).

@@ -63,7 +64,7 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Type of objects** box to specify the objects that
  will be restored:

-   * Move the switch next to *Only data* to the *Yes* position to limit the
+   * Move the switch next to *Only data* towards right position to limit the
     restoration to data.
   * Move the switch next to *Only schema* to limit the restoration to
     schema-level database objects.
@@ -75,16 +76,20 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Do not save** box to specify which objects will not
  be restored:

-   * 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 *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 cleaning before restore, verbose message or using set session
+authorization that correspond to *pg_restore* options.
+
 .. image:: images/restore_queries.png
    :alt: Restore dialog queries section
    :align: center
@@ -92,12 +97,11 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Queries** box to specify the type of statements that
  should be included in the restore:

-   * Move the switch next to *Include CREATE DATABASE statement* to the *Yes*
-     position to include a command that creates a new database before performing
-     the restore.
-   * Move the switch next to *Clean before restore* to the *Yes* position to
+   * Move the switch next to *Include CREATE DATABASE statement* towards right position
+     to include a command that creates a new database before performing the restore.
+   * Move the switch next to *Clean before restore* towards right position to
     drop each existing database object (and data) before restoring.
-   * Move the switch next to *Single transaction* to the *Yes* position to
+   * Move the switch next to *Single transaction* towards right position to
     execute the restore as a single transaction (that is, wrap the emitted
     commands in *BEGIN/COMMIT*). This ensures that either all the commands
     complete successfully, or no changes are applied. This option implies
@@ -111,9 +115,9 @@ options* tab to specify options that correspond to *pg_restore* options.
  should be excluded from the restore:

   * Move the switch next to *Trigger* (active when creating a data-only
-     restore) to the *Yes* position to include commands that will disable
+     restore) 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 *No data for Failed Tables* to the *Yes* position
+   * Move the switch next to *No data for Failed Tables* towards right position
     to ignore data that fails a trigger.

 .. image:: images/restore_miscellaneous.png
@@ -123,13 +127,13 @@ options* tab to specify options that correspond to *pg_restore* options.
 * Use the switches in the **Miscellaneous/Behavior** box to specify
  miscellaneous restore options:

-   * Move the switch next to *Verbose messages* to the *No* position to instruct
+   * Move the switch next to *Verbose messages* towards left to instruct
     *pg_restore* to exclude verbose messages.
-   * Move the switch next to *Use SET SESSION AUTHORIZATION* to the *Yes*
-     position to include a statement that will use a SET SESSION AUTHORIZATION
+   * 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).

-   * Move the switch next to *Exit on error* to the *Yes* position to instruct
+   * Move the switch next to *Exit on error* towards right position to instruct
     *pg_restore* to exit restore if there is an error in sending SQL commands.
     The default is to continue and to display a count of errors at the end of
     the restore.
@@ -53,7 +53,7 @@ following selections (options appear in alphabetical order):
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
 | *Disconnect Database...*  | Click to terminate a database connection.                                                                                 |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
-| *Disconnect Server...*    | Click to refresh the currently selected object.                                                                           |
+| *Disconnect from server*  | Click to disconnect from the currently selected server.                                                                   |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
 | *Drop Cascade*            | Click to delete the currently selected object and all dependent objects from the server.                                  |
 +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
@@ -79,7 +79,7 @@ The context-sensitive menus associated with *Tables* and nested *Table* nodes pr
 +-------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | Option                  | Action                                                                                                                       |
 +=========================+==============================================================================================================================+
-| *Import/Export...*      | Click open the :ref:`Import/Export... <import_export_data>` dialog to import data to or export data from the selected table. |
+| *Import/Export Data...* | Click open the :ref:`Import/Export... <import_export_data>` dialog to import data to or export data from the selected table. |
 +-------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | *Reset Statistics*      | Click to reset statistics for the selected table.                                                                            |
 +-------------------------+------------------------------------------------------------------------------------------------------------------------------+
@@ -32,8 +32,9 @@ and modify the values for the following parameters:
    "WEBSERVER_AUTO_CREATE_USER", "Set the value to *True* if you want to automatically
    create a pgAdmin user corresponding to a successfully authenticated Webserver user.
    Please note that password is not stored in the pgAdmin database."
-    "WEBSERVER_REMOTE_USER", "The default value is REMOTE_USER, set this variable to any header
-    or environemnt variable to get the webserver remote user details. Possible values: REMOTE_USER,
+    "WEBSERVER_REMOTE_USER", "To get the web server remote user details, set this variable to any header or
+    environment variable name which comes from the web server after webserver authentication.
+    The default value is REMOTE_USER and the possible values are REMOTE_USER,
    HTTP_X_FORWARDED_USER, X-Forwarded-User."


@@ -10,6 +10,9 @@ OS_VERSION=$(cat /etc/os-release | grep "^VERSION_ID=" | awk -F "=" '{ print $2
 OS_NAME=$(cat /etc/os-release | grep "^ID=" | awk -F "=" '{ print $2 }' | sed 's/"//g')
 OS_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)

+# Stop creating pyc files.
+export PYTHONDONTWRITEBYTECODE=1
+
 # Common Linux build functions
 source pkg/linux/build-functions.sh

@@ -34,6 +37,8 @@ cat << EOF > "${SERVERROOT}/DEBIAN/control"
 Package: ${APP_NAME}-server
 Version: ${APP_LONG_VERSION}
 Architecture: ${OS_ARCH}
+Section: database
+Priority: optional
 Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
 Recommends: postgresql-client | postgresql-client-14 | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
 Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
@@ -55,6 +60,8 @@ cat << EOF > "${DESKTOPROOT}/DEBIAN/control"
 Package: ${APP_NAME}-desktop
 Version: ${APP_LONG_VERSION}
 Architecture: ${OS_ARCH}
+Section: database
+Priority: optional
 Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), libatomic1, xdg-utils
 Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
 Description: The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -79,6 +86,8 @@ cat << EOF > "${WEBROOT}/DEBIAN/control"
 Package: ${APP_NAME}-web
 Version: ${APP_LONG_VERSION}
 Architecture: all
+Section: database
+Priority: optional
 Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), apache2, libapache2-mod-wsgi-py3
 Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
 Description: The web interface for pgAdmin, hosted under Apache HTTPD. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -102,6 +111,8 @@ cat << EOF > "${METAROOT}/DEBIAN/control"
 Package: ${APP_NAME}
 Version: ${APP_LONG_VERSION}
 Architecture: all
+Section: database
+Priority: optional
 Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), ${APP_NAME}-desktop (= ${APP_LONG_VERSION}), ${APP_NAME}-web (= ${APP_LONG_VERSION})
 Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
 Description: Installs all required components to run pgAdmin in desktop and web modes. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
@@ -15,8 +15,7 @@ DEFAULT_BINARY_PATHS = {
        'pg-13': '/usr/local/pgsql-13',
        'pg-12': '/usr/local/pgsql-12',
        'pg-11': '/usr/local/pgsql-11',
-        'pg-10': '/usr/local/pgsql-10',
-        'pg-9.6': '/usr/local/pgsql-9.6'
+        'pg-10': '/usr/local/pgsql-10'
 }
 EOF

@@ -65,6 +65,9 @@ _create_python_virtualenv() {
    sed -i 's/setenv VIRTUAL_ENV .*/setenv VIRTUAL_ENV "\/usr\/pgadmin4\/venv"/g' venv/bin/activate.csh
    sed -i 's/set -gx VIRTUAL_ENV .*/set -gx VIRTUAL_ENV "\/usr\/pgadmin4\/venv"/g' venv/bin/activate.fish

+    # Remove __pycache__
+    find . -name "__pycache__" -type d -print0 | xargs -0 rm -rf
+
    # Fixup hash bangs
    sed -i 's/#!.*\/python3/#\!\/usr\/pgadmin4\/venv\/bin\/python3/g' venv/bin/*

@@ -125,10 +128,11 @@ _build_runtime() {
    # YARN END

    # WGET:
-    # Comment out the below line as the latest version (0.57.0) having some
-    # problem, so for the time being hardcoded the version to 0.55.0
+    # Comment out the below line as the latest version (0.62.0) having some
+    # problem, so for the time being hardcoded the version to 0.61.0
    # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
-    NW_VERSION="0.55.0"
+    NW_VERSION="0.61.0"
+
    pushd "${BUILDROOT}" > /dev/null
        while true;do
            wget https://dl.nwjs.io/v${NW_VERSION}/nwjs-v${NW_VERSION}-linux-x64.tar.gz && break
@@ -215,12 +219,14 @@ _copy_code() {
    mkdir -p "${WEBROOT}/usr/${APP_NAME}/bin/"
    cp "${SOURCEDIR}/pkg/linux/setup-web.sh" "${WEBROOT}/usr/${APP_NAME}/bin/"

-    # Ensure our venv will use the correct Python interpretor, even if the
+    # Ensure our venv will use the correct Python interpreter, even if the
    # user has configured an alternative default.
    # DO THIS LAST!
    cd "${SERVERROOT}/usr/${APP_NAME}/venv/bin"
    PYTHON_INTERPRETER=$(/usr/bin/python3 -c "import os, sys; print(os.path.realpath(sys.executable))")
+    PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('%d.%d' % (sys.version_info.major, sys.version_info.minor))")
    rm python && ln -s python3 python
+    rm python${PYTHON_VERSION} && ln -s python3 python${PYTHON_VERSION}
    rm python3 && ln -s "${PYTHON_INTERPRETER}" python3
 }

@@ -1,10 +1,11 @@
 _setup_env() {
-    APP_RELEASE=`grep "^APP_RELEASE" web/config.py | cut -d"=" -f2 | sed 's/ //g'`
-    APP_REVISION=`grep "^APP_REVISION" web/config.py | cut -d"=" -f2 | sed 's/ //g'`
-    APP_NAME=`grep "^APP_NAME" web/config.py | cut -d"=" -f2 | sed "s/'//g" | sed 's/^ //'`
+    FUNCS_DIR=$(cd `dirname $0` && pwd)/../..
+    APP_RELEASE=`grep "^APP_RELEASE" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g'`
+    APP_REVISION=`grep "^APP_REVISION" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g'`
+    APP_NAME=`grep "^APP_NAME" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed "s/'//g" | sed 's/^ //'`
    APP_LONG_VERSION=${APP_RELEASE}.${APP_REVISION}
    APP_SHORT_VERSION=`echo ${APP_LONG_VERSION} | cut -d . -f1,2`
-    APP_SUFFIX=`grep "^APP_SUFFIX" web/config.py | cut -d"=" -f2 | sed 's/ //g' | sed "s/'//g"`
+    APP_SUFFIX=`grep "^APP_SUFFIX" ${FUNCS_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g' | sed "s/'//g"`
    if [ ! -z ${APP_SUFFIX} ]; then
        APP_LONG_VERSION=${APP_LONG_VERSION}-${APP_SUFFIX}
    fi
@@ -32,10 +33,11 @@ _build_runtime() {
    # YARN END

    # WGET:
-    # Comment out the below line as the latest version (0.57.0) having some
-    # problem, so for the time being hardcoded the version to 0.55.0
+    # Comment out the below line as the latest version (0.62.0) having some
+    # problem, so for the time being hardcoded the version to 0.61.0
    # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}')
-    NW_VERSION="0.55.0"
+    NW_VERSION="0.61.0"
+
    pushd "${BUILD_ROOT}" > /dev/null
        while true;do
            wget https://dl.nwjs.io/v${NW_VERSION}/nwjs-v${NW_VERSION}-osx-x64.zip && break
@@ -182,7 +184,7 @@ _fixup_imports() {
            for LIB in $(
                otool -L ${TODO_OBJ} | \
                sed -n 's|^.*[[:space:]]\([^[:space:]]*\.dylib\).*$|\1|p' | \
-                egrep -v '^(/usr/lib)|(/System)|@executable_path' \
+                egrep -v '^(/usr/lib)|(/System)|@executable_path|@loader_path|/DLC/PIL/' \
            ); do
                # Copy in any required dependencies
                LIB_BN="$(basename "${LIB}")" ;
@@ -242,8 +244,8 @@ _complete_bundle() {
    sed -i '' "s/%APPVER%/${APP_LONG_VERSION}/g" "${BUNDLE_DIR}/Contents/Info.plist"
    sed -i '' "s/%APPID%/org.pgadmin.pgadmin4/g" "${BUNDLE_DIR}/Contents/Info.plist"
    for FILE in "${BUNDLE_DIR}"/Contents/Resources/*.lproj/InfoPlist.strings; do
-        sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2021, The pgAdmin Development Team";/g' "${FILE}"
-        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2021, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/CFBundleGetInfoString =.*/CFBundleGetInfoString = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
+        sed -i '' 's/NSHumanReadableCopyright =.*/NSHumanReadableCopyright = "Copyright (C) 2013 - 2022, The pgAdmin Development Team";/g' "${FILE}"
        echo CFBundleDisplayName = \"${APP_NAME}\"\; >> "${FILE}"
    done

@@ -46,8 +46,8 @@ if [ "x${PGADMIN_POSTGRES_DIR}" == "x" ]; then
 fi

 if [ "x${PGADMIN_PYTHON_VERSION}" == "x" ]; then
-    echo "PGADMIN_PYTHON_VERSION not set. Setting it to the default: 3.9.5"
-    export PGADMIN_PYTHON_VERSION=3.9.5
+    echo "PGADMIN_PYTHON_VERSION not set. Setting it to the default: 3.9.9"
+    export PGADMIN_PYTHON_VERSION=3.9.9
 fi

 source ${SCRIPT_DIR}/build-functions.sh
@@ -10,7 +10,7 @@
 \fs22 \
 \

-\f1\i Copyright (C) 2013 - 2021, The pgAdmin Development Team
+\f1\i Copyright (C) 2013 - 2022, The pgAdmin Development Team
 \f0\i0 \
 \
 Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.\
@@ -4,7 +4,7 @@
 #
 # 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
 #
 #########################################################################
@@ -2,7 +2,7 @@
 #
 # 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
 #
 ##########################################################################
@@ -56,8 +56,12 @@ setup(
    version=config.APP_VERSION,

    description='PostgreSQL Tools',
-    long_description='Administration and management tools for '
-                     'the PostgreSQL database.',
+    long_description='pgAdmin is the most popular and feature rich Open '
+                     'Source administration and development platform for '
+                     'PostgreSQL, the most advanced Open Source database in '
+                     'the world.\n\npgAdmin may be used on Linux, Unix, '
+                     'macOS and Windows to manage PostgreSQL and EDB '
+                     'Advanced Server 10 and above.',

    url='https://www.pgadmin.org/',

@@ -74,7 +78,8 @@ setup(
        'Programming Language :: Python :: 3.6',
        'Programming Language :: Python :: 3.7',
        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9'
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10'
    ],

    keywords='pgadmin4,postgresql,postgres',
@@ -5,8 +5,10 @@ Redhat distributions.

 ## Supported platforms

-* Fedora 30, 31 & 32
-* RHEL/CentOS 7 & 8
+* Fedora 34 & 35
+* RHEL 7 & 8
+* CentOS 7
+* Rocky Linux 8 (x86_64)

 ## Build configuration

@@ -13,6 +13,9 @@ OS_ARCH=$(arch)
 # Make sure we get the right libpq
 export PATH=/usr/pgsql-14/bin:$PATH

+# Stop creating pyc files.
+export PYTHONDONTWRITEBYTECODE=1
+
 # Common Linux build functions
 source pkg/linux/build-functions.sh

@@ -41,6 +44,11 @@ echo "Creating the server package..."
 cat << EOF > "${BUILDROOT}/server.spec"
 %global __requires_exclude_from ^/.*$
 %global __provides_exclude_from ^/.*$
+%global _build_id_links none
+
+# Disable RPATH checking, as it will fail with some of the paths in the Python
+# virtualenv, in particular Pillow.libs.
+%global __brp_check_rpaths %{nil}

 # Bytecompiling Python 3 doesn't work on RHEL/CentOS 7, so make it a no-op
 %if 0%{?rhel} && 0%{?rhel} == 7
@@ -84,6 +92,7 @@ echo "Creating the desktop package..."
 cat << EOF > "${BUILDROOT}/desktop.spec"
 %global __requires_exclude_from ^/.*$
 %global __provides_exclude_from ^/.*$
+%global _build_id_links none

 %undefine __brp_mangle_shebangs
 %undefine __brp_ldconfig
@@ -131,6 +140,7 @@ echo "Creating the web package..."
 cat << EOF > "${BUILDROOT}/web.spec"
 %global __requires_exclude_from ^/.*$
 %global __provides_exclude_from ^/.*$
+%global _build_id_links none

 %undefine __brp_mangle_shebangs
 %undefine __brp_ldconfig
@@ -178,6 +188,7 @@ echo "Creating the meta package..."
 cat << EOF > "${BUILDROOT}/meta.spec"
 %global __requires_exclude_from ^/.*$
 %global __provides_exclude_from ^/.*$
+%global _build_id_links none

 %undefine __brp_mangle_shebangs
 %undefine __brp_ldconfig
@@ -211,7 +222,7 @@ rpmbuild --define "pga_build_root ${BUILDROOT}" -bb "${BUILDROOT}/meta.spec"
 if [ ${OS_VERSION} == 7 ]; then
    cp "${SOURCEDIR}/pkg/redhat/pgadmin4-python3-mod_wsgi-exports.patch" ${HOME}/rpmbuild/SOURCES
    cp "${SOURCEDIR}/pkg/redhat/pgadmin4-python3-mod_wsgi.conf" ${HOME}/rpmbuild/SOURCES
-    curl -o ${HOME}/rpmbuild/SOURCES/mod_wsgi-4.7.1.tar.gz https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.7.1
+    curl -o ${HOME}/rpmbuild/SOURCES/mod_wsgi-4.9.0.tar.gz https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.9.0
    rpmbuild -bb "${SOURCEDIR}/pkg/redhat/pgadmin4-python-mod_wsgi.spec"
 fi

@@ -224,7 +235,7 @@ yumdownloader -y --downloadonly --destdir=$DISTROOT postgresql14-libs
 cp ${HOME}/rpmbuild/RPMS/${OS_ARCH}/${APP_NAME}-*${RPM_VERSION}-*.${OS_ARCH}.rpm "${DISTROOT}/"
 cp ${HOME}/rpmbuild/RPMS/noarch/${APP_NAME}-*${RPM_VERSION}-*.noarch.rpm "${DISTROOT}/"
 if [ ${OS_VERSION} == 7 ]; then
-    cp ${HOME}/rpmbuild/RPMS/${OS_ARCH}/pgadmin4-python3-mod_wsgi-4.7.1-2.el7.x86_64.rpm "${DISTROOT}/"
+    cp ${HOME}/rpmbuild/RPMS/${OS_ARCH}/pgadmin4-python3-mod_wsgi-4.9.0-1.el7.x86_64.rpm "${DISTROOT}/"
 fi

 echo "Completed. RPMs created in ${DISTROOT}."
@@ -11,8 +11,8 @@
 %global debug_package %{nil}

 Name:		pgadmin4-python3-%{sname}
-Version:	4.7.1
-Release:	2%{?dist}
+Version:	4.9.0
+Release:	1%{?dist}
 Summary:	A WSGI interface for Python web applications in Apache (customized for pgAdmin4)
 License:	ASL 2.0
 URL:		https://modwsgi.readthedocs.io/
@@ -4,7 +4,7 @@
 #
 # 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
 #
 #########################################################################