From 4951ea2cafeb33c8bdf48eec7fb5978250fcb2b1 Mon Sep 17 00:00:00 2001
From: Jim Unger <BigFunger@gmail.com>
Date: Thu, 10 Aug 2017 10:24:56 -0500
Subject: [PATCH] Adds getAriaName function and applies it to advanced settings

---
 .../sections/settings/advanced_row.html       |  3 +++
 .../settings/lib/__tests__/get_aria_name.js   | 26 +++++++++++++++++++
 .../sections/settings/lib/get_aria_name.js    | 13 ++++++++++
 .../settings/lib/to_editable_config.js        |  3 +++
 4 files changed, 45 insertions(+)
 create mode 100644 src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_aria_name.js
 create mode 100644 src/core_plugins/kibana/public/management/sections/settings/lib/get_aria_name.js

diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_row.html b/src/core_plugins/kibana/public/management/sections/settings/advanced_row.html
index 400ff1c4cf6a0..b1b62c526ebf3 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/advanced_row.html
+++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_row.html
@@ -131,6 +131,7 @@
           ng-click="edit(conf)"
           class="kuiMenuButton kuiMenuButton--basic kuiMenuButton--iconText"
           ng-disabled="conf.tooComplex"
+          aria-label="Edit {{conf.ariaName}}"
           data-test-subj="advancedSetting-{{conf.name}}-editButton"
         >
           <span
@@ -146,6 +147,7 @@
           ng-click="save(conf)"
           class="kuiMenuButton kuiMenuButton--primary kuiMenuButton--iconText"
           ng-disabled="conf.loading || conf.tooComplex || forms.configEdit.$invalid"
+          aria-label="Save edit"
           data-test-subj="advancedSetting-{{conf.name}}-saveButton"
         >
           <span
@@ -166,6 +168,7 @@
           ng-if="!conf.editing"
           ng-click="clear(conf)"
           ng-hide="isDefaultValue(conf)"
+          aria-label="Clear {{conf.ariaName}}"
           class="kuiMenuButton kuiMenuButton--danger kuiMenuButton--iconText"
         >
           <span
diff --git a/src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_aria_name.js b/src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_aria_name.js
new file mode 100644
index 0000000000000..a2badd99a0dc7
--- /dev/null
+++ b/src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_aria_name.js
@@ -0,0 +1,26 @@
+
+import { getAriaName } from '../get_aria_name';
+import expect from 'expect.js';
+
+describe('Settings', function () {
+  describe('Advanced', function () {
+    describe('getAriaName(name)', function () {
+      it('should be a function', function () {
+        expect(getAriaName).to.be.a(Function);
+      });
+
+      it('should return a space delimited lower-case string with no special characters', function () {
+        expect(getAriaName('xPack:defaultAdminEmail')).to.be('x pack default admin email');
+        expect(getAriaName('search:queryLanguage:switcher:enable')).to.be('search query language switcher enable');
+        expect(getAriaName('doc_table:highlight')).to.be('doc table highlight');
+        expect(getAriaName('foo')).to.be('foo');
+      });
+
+      it('should return an empty string if passed undefined or null', function () {
+        expect(getAriaName()).to.be('');
+        expect(getAriaName(undefined)).to.be('');
+        expect(getAriaName(null)).to.be('');
+      });
+    });
+  });
+});
diff --git a/src/core_plugins/kibana/public/management/sections/settings/lib/get_aria_name.js b/src/core_plugins/kibana/public/management/sections/settings/lib/get_aria_name.js
new file mode 100644
index 0000000000000..96389e862f836
--- /dev/null
+++ b/src/core_plugins/kibana/public/management/sections/settings/lib/get_aria_name.js
@@ -0,0 +1,13 @@
+
+import { words } from 'lodash';
+
+/**
+ * @name {string} the name of the configuration object
+ * @returns {string} a space demimited, lowercase string with
+ *          special characters removed.
+ *
+ * Example: 'xPack:fooBar:foo_bar_baz' -> 'x pack foo bar foo bar baz'
+ */
+export function getAriaName(name) {
+  return words(name).map(word => word.toLowerCase()).join(' ');
+}
diff --git a/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js b/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
index fd837bc9630d3..a50abaf171560 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
+++ b/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
@@ -1,5 +1,6 @@
 import { getValType } from './get_val_type';
 import { getEditorType } from './get_editor_type';
+import { getAriaName } from './get_aria_name';
 
 /**
  * @param {object} advanced setting definition object
@@ -13,6 +14,7 @@ export function toEditableConfig({ def, name, value, isCustom }) {
   }
   const conf = {
     name,
+    ariaName: getAriaName(name),
     value,
     isCustom,
     readonly: !!def.readonly,
@@ -33,3 +35,4 @@ export function toEditableConfig({ def, name, value, isCustom }) {
 
   return conf;
 }
+