1) Added accessibility support in AlertifyJS. Fixes #5154

2) Fix accessibility issue for the maximize button of the Alertify dialog. Fixes #5143

docs/en_US/release_notes_4_19.rst

@@ -9,6 +9,7 @@ This release contains a number of bug fixes and new features since the release o
 New features
 ************
 
+| `Issue #5154 <https://redmine.postgresql.org/issues/5154>`_ -  Added accessibility support in AlertifyJS.
 | `Issue #5170 <https://redmine.postgresql.org/issues/5170>`_ -  Added Czech language support.
 | `Issue #5179 <https://redmine.postgresql.org/issues/5179>`_ -  Added Python 3.8 support.
 
@@ -29,5 +30,6 @@ Bug fixes
 | `Issue #5077 <https://redmine.postgresql.org/issues/5077>`_ -  Changed background pattern for geometry viewer to use #fff for all themes.
 | `Issue #5107 <https://redmine.postgresql.org/issues/5107>`_ -  Set proper focus on tab navigation for file manager dialog.
 | `Issue #5115 <https://redmine.postgresql.org/issues/5115>`_ -  Fix an issue where command and statements were parsed incorrectly for Rules.
+| `Issue #5143 <https://redmine.postgresql.org/issues/5143>`_ -  Fix accessibility issue for the maximize button of the Alertify dialog.
 | `Issue #5184 <https://redmine.postgresql.org/issues/5184>`_ -  Fixed Firefox monospaced issue by updating the font to the latest version.
 | `Issue #5215 <https://redmine.postgresql.org/issues/5215>`_ -  Fix syntax error when changing the event type for the existing rule.

web/package.json

@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7",
-    "alertifyjs": "1.7.1",
+    "alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263",
     "axios": "^0.18.1",
     "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
     "babel-preset-es2015-without-strict": "~0.0.4",

web/pgadmin/static/js/alertify/dialog_wrapper.js

@@ -64,7 +64,7 @@ export class DialogWrapper {
     $(alertifyDialog.elements.footer).on('keydown', 'button', function(event) {
       if (event.keyCode == 9 && $(this).nextAll('button:not([disabled])').length == 0) {
         // set focus back to first editable input element of current active tab once we cycle through all enabled buttons.
-        commonUtils.findAndSetFocus($(alertifyDialog.elements.body).find('.tab-content div.active'));
+        commonUtils.findAndSetFocus($(alertifyDialog.elements.dialog));
         return false;
       }
     });

web/pgadmin/static/js/utils.js

@@ -37,6 +37,7 @@ export function findAndSetFocus(container) {
         .find(`
           .pgadmin-controls:first input:enabled,
           .pgadmin-controls:first .btn:not(.toggle),
+          .ajs-commands:first,
           .CodeMirror-scroll`)
         .find('*[tabindex]:not([tabindex="-1"])');
     }

web/pgadmin/static/scss/_alertify.overrides.scss

@@ -279,3 +279,10 @@
     transform: none;
   }
 }
+
+
+.ajs-maximize {
+    @extend .btn-secondary;
+    outline: none !important;
+}
+

web/pgadmin/tools/backup/static/js/backup_dialog_wrapper.js

@@ -44,6 +44,7 @@ export class BackupDialogWrapper extends DialogWrapper {
           type: 'button',
           url: 'backup.html',
           label: gettext('Backup'),
+          'aria-label': gettext('Backup')
         },
       }, {
         text: '',
@@ -52,7 +53,7 @@ export class BackupDialogWrapper extends DialogWrapper {
         attrs: {
           name: 'dialog_help',
           type: 'button',
-          label: gettext('Backup'),
+          label: gettext('Help'),
           'aria-label': gettext('Help'),
           url: url_for('help.static', {
             'filename': get_help_file(this.typeOfDialog),

web/yarn.lock

@@ -910,10 +910,9 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-alertifyjs@1.7.1:
+"alertifyjs@git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263":
   version "1.7.1"
-  resolved "https://registry.yarnpkg.com/alertifyjs/-/alertifyjs-1.7.1.tgz#3c7b8ac67609aea737fe8e06d7fac885ce18ba8f"
+  resolved "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263"
-  integrity sha1-PHuKxnYJrqc3/o4G1/rIhc4Yuo8=
 
 alphanum-sort@^1.0.0:
   version "1.0.2"