From e5ecc135e67f0b3510ea017538b15d3b695c3c57 Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Thu, 31 Oct 2019 14:10:47 -0700 Subject: [PATCH 1/8] GPII-4207 Adding some JAWS settings from the Basic Settings Dialog --- testData/solutions/win32.json5 | 97 +++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 8 deletions(-) diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 5c7fd28be..0d01af2d4 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -917,6 +917,15 @@ "default": 0 } }, + "Options.AutomaticNotificationOfUpdates": { + "schema": { + "title": "Automatic Notification of Updates", + "description": "Whether to show automatic notifications for updates.", + "enum": [0, 1], + "enumLabels": ["off", "on"], + "default": 0 + } + }, // This does not seem safe to update, as we have no idea which displays are available on a given machine. // "Options.BrailleDisplay": { // "schema": { @@ -926,6 +935,15 @@ // "default": "Braille1" // } // }, + "Options.bVirtViewer": { + "schema": { + "title": "Show Virtual Viewer on screen", + "description": "Whether to show the virtual viewer on screen.", + "enum": [0, 1], + "enumLabels": ["off", "on"], + "default": 0 + } + }, "Options.CapIndicator": { "schema": { "title": "Cap Indicator", @@ -1283,14 +1301,24 @@ } }, // No documentation, disabled for now. - // "Options.KeyboardType": { - // "schema": { - // "title": "Keyboard Type", - // "description": "Can be one of the types defined in the default.jkm settings file.", - // "type": "string", - // "default": "Laptop" - // } - // }, + "Options.KeyboardType": { + "schema": { + "title": "Keyboard Type", + "description": "Can be one of the types defined in the default.jkm settings file.", + "type": "string", + "default": "Desktop", + "enum": [ + "Desktop", + "Laptop", + "Kinesis" + ], + "enumLabels": [ + "Desktop", + "Laptop", + "Kinesis" + ] + } + }, "Options.KeyRepeat": { "schema": { "title": "Key Repeat", @@ -2311,6 +2339,21 @@ ] } }, + "Options.ViewMode": { + "schema": { + "title": "Run JAWS from System Tray", + "description": "Whether to run JAWS from the System Tray", + "default": 0, + "enum": [ + 0, + 1 + ], + "enumLabels": [ + "off", + "on" + ] + } + }, "Options.VirtualDocumentLinkActivationMethod": { "schema": { "title": "Virtual Document Link Activation Method", @@ -2617,6 +2660,44 @@ "default": 0 } }, + "OutputModes.ACCESS_KEY": { + "schema": { + "title": "Access Key", + "description": "Which items to speak with the access key???", + "type": "string", + "default": "1|1|1|Access Key", + "enum": [ + "0|0|0|Access Key", + "1|1|1|Access Key", + "2|2|2|Access Key", + "3|3|3|Access Key" + ], + "enumLabels": [ + "Off", + "Speak all", + "Speak menus only", + "Speak dialogs only" + ] + } + }, + "OutputModes.TUTOR": { + "schema": { + "title": "Tutor Messages", + "description": "Which items to speak with the access key???", + "type": "string", + "default": "1|1|1|Tutor", + "enum": [ + "0|0|0|Tutor", + "1|1|1|Tutor", + "2|2|2|Tutor" + ], + "enumLabels": [ + "Turn off menu and control help", + "Announce menu and control help", + "Announce custom messages only" + ] + } + }, // TODO: Document default. "Touch.FlickVelocityMin": { "schema": { From de1a98aeffbe0fc92260ce2c70ffea7f75200771 Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Thu, 31 Oct 2019 17:22:39 -0700 Subject: [PATCH 2/8] GPII-4207 Default Settings Investigation - Adding temporary notes on some settings during investigation - Fixing some ranges and default values on settings that are straight forward. --- testData/solutions/win32.json5 | 73 +++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 9 deletions(-) diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 0d01af2d4..0ab33f8f4 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -5045,6 +5045,7 @@ "title": "Desktop background wallpaper", "description": "The path to the image to be set as the new desktop wallpaper.", // TODO: Discuss somehow simplifying the structure of SPI settings for easier UI input. + // GPII-4207 Test with the new find `default` value function "properties": { "path": { "type": "string"}, "value": { @@ -6377,6 +6378,7 @@ } }, "supportedSettings": { + // GPII-4207 Add the check for defaults in `properties.value.default` "FilterKeysEnable": { "schema": { "title": "Filter keys", @@ -6392,6 +6394,7 @@ } } }, + // GPII-4207 it looks like the default in the control panel for this may be 1000... "SlowKeysInterval": { "schema": { "title": "Slow keys interval", @@ -6400,13 +6403,26 @@ "properties": { "path": { "type": "string", "required": true}, "value": { + // GPII-4207 In the current Windows 10 UI this goes from 0.0 seconds + // to 20.0 seconds in somewhat random steps in a combo box: + // 0.0, 0.3, 0.5, 0.7, 1.0, 1.4, 2.0, 5.0, 10.0, 20.0 + // TODO try manually setting a differnet value under the covers, + // not sure if this should really be an enum... "required": true, "type": "integer", - "default": 0 // 0 means no interval time + "minimum": 0, + "maximum": 20000, + "default": 1000 // 0 means no interval time } } } }, + // GPII-4207 This default looks correct... it probably isn't getting casted to + // a number during the default check... + // + // Currently in the control panel it goes from 0.3 to 20 seconds in a drop down + // + // Having issues capturing changes to this... am I looking at the correct setting "BounceKeysInterval": { "schema": { "title": "Bounce keys interval", @@ -6824,6 +6840,7 @@ "schema": { "title": "Video audio description", "description": "Hear descriptions of what's happening in videos", + // GPII-4207 Test to see if this `default` is getting cast correctly "default": 0, "enum": [ 0, @@ -7094,6 +7111,7 @@ "title": "ToggleKeys accesibility feature", "description": "Enable/Disable ToggleKeys feature", "type": "boolean", + // GPII-4207 check `default` cast "default": false } } @@ -7152,6 +7170,7 @@ "title": "Enable/Disable underlaying menu shortcuts", "description": "Displays a underline showing which is the shortcut to active a menu item", "type": "boolean", + // GPII-4207 This is coming out of the capture as 0 rather than false... TODO "default": false } } @@ -7192,6 +7211,7 @@ "title": "Keyboard as preferred input method", "description": "Set the keyboard as the preferred input method", "type": "boolean", + // GPII-4207 This is coming out of the capture as 0 rather than false... TODO "default": false } } @@ -7693,6 +7713,15 @@ "name": "MOUSEKEYS" } }, + /* + * Some interesting notes from testing on GPII-4207 + * the `MouseKeysOn` isn't getting defaulted because we still need to add + * support for checkingin the `properties` block. + * + * The MaxSpeed and Acceleration both have slightly different values + * + * Defaults are from observing 2 different peoples windows captures (Gregg and sgithens) + */ "supportedSettings": { "MouseKeysOn": { "schema": { @@ -7709,22 +7738,40 @@ } } }, + // GPII-4207 sgithens speed + // Having tested this in conjuction with the control panel it seems the + // max and min values are: (what is shown when you hover over the slider) + // + // Control Panel UI GPII Capture + // low: 10 10 + // high: 358 358 + // default: 80 80 "MaxSpeed": { "schema": { "title": "Mouse keys speed", "description": "Speed of mouse keys", "type": "number", - "multipleOf": 10 + "multipleOf": 10, + "default": 80 } }, + // GPII-4207 sgithens acceleration + // Having tested this in conjuction with the control panel it seems the + // max and min values are: (what is shown when you hover over the slider) + // + // Control Panel UI GPII Capture + // low: 100 5000 + // high: 500 1000 (yes it's inverse) + // default: 300 3000 "Acceleration": { "schema": { "title": "Mouse keys acceleration", "description": "Acceleration of mouse keys", "type": "number", - "minimum": -1000, + "minimum": 1000, // TODO: Not clear how to describe this setting - "maximum": 1000 + "maximum": 5000, + "default": 3000 } } }, @@ -8596,7 +8643,8 @@ "required": true, "type": "integer", "minimum": 0, - "maximum": 10 + "maximum": 10, + "default": 0 } } } @@ -9719,7 +9767,11 @@ "description": "Whether or not sticky keys should be turned on.", "properties": { "path": { "type": "string", "required": true}, - "value": { "type": "boolean", "required": true} + "value": { + "type": "boolean", + "required": true, + "default": false + } } } } @@ -14824,7 +14876,7 @@ // TODO: Figure out a way to more cleanly reuse material between language-supporting features. Common term? "enum": [ "af", "sq", "am", "ar", "an", "hy-arevela", "hyw", "as", "az", "eu", "bn", "bpy", "bs", - "bg", "ca", "zh-yue", "zh-cmn", "hr", "cs", "da", "nl", "en-us", "en-029", "en-gb", + "bg", "ca", "zh-yue", "zh-cmn", "hr", "cs", "da", "nl", "en", "en-us", "en-029", "en-gb", "en-gb-x-gbclan", "en-gb-x-rp", "en-gb-scotland", "en-gb-x-gbcwmd", "eo", "et", "fi", "fr-be", "fr-fr", "fr-ch", "ga", "gd", "ka", "de", "grc", "el", "kl", "gn", "gu", "ht", "hak", "hi", "hu", "is", "id", "ia", "it", "ja", "quc", "kn", "kk", "kok", "ko", "ku", "ky", @@ -14837,7 +14889,7 @@ "Afrikaans", "Albanian", "Amharic", "Arabic", "Aragonese", "Armenian (East Armenia)", "Armenian (West Armenia)", "Assamese", "Azerbaijani", "Basque", "Bengali", "Bishnupriya Manipuri", "Bosnian", "Bulgarian", "Catalan", "Chinese (Cantonese)", - "Chinese (Mandarin)", "Croatian", "Czech", "Danish", "Dutch", "English (America)", + "Chinese (Mandarin)", "Croatian", "Czech", "Danish", "Dutch", "English", "English (America)", "English (Caribbean)", "English (Great Britain)", "English (Lancaster)", "English (Received Pronunciation)", "English (Scotland)", "English (West Midlands)", "Esperanto", "Estonian", "Finnish", "French (Belgium)", "French (France)", @@ -14853,7 +14905,8 @@ "Shan (Tai Yai)", "Sindhi", "Sinhala", "Slovak", "Slovenian", "Spanish (Latin America)", "Spanish (Spain)", "Swahili", "Swedish", "Tamil", "Tatar", "Telugu", "Turkish", "Urdu", "Vietnamese (Central)", "Vietnamese (Northern)", "Vietnamese (Southern)", "Welsh" - ] + ], + "default": "en" } }, "speech.espeak.volume": { @@ -16171,6 +16224,8 @@ "supportedSettings": { "OverrideTabletMode": { "schema": { + // GPII-4207 OverrideTabletMode and Enable Tablet Mode before look to have cut and paste issues + // with their title and description... TODO "title": "Enable Tablet Mode", "description": "Display larger ribbon buttons that are easier to touch", "type": "number", From 2835aab9ae6876397c7c27af8b10e9bc1802eee9 Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Sun, 3 Nov 2019 16:59:03 -0800 Subject: [PATCH 3/8] GPII-4207 Adding utility function and tests for finding the default value of a solution setting. --- .../src/js/SolutionsUtils.js | 99 ++++++++++++++ .../test/SolutionsUtilsTests.js | 122 ++++++++++++++++++ .../solutionsRegistry/test/all-tests.js | 1 + 3 files changed, 222 insertions(+) create mode 100644 gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js create mode 100644 gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js diff --git a/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js b/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js new file mode 100644 index 000000000..393168122 --- /dev/null +++ b/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js @@ -0,0 +1,99 @@ +/* + * GPII Solutions Utils - Independent helper functions and utilities for working with + * solutions and their schemas. + * + * Copyright 2019 Raising the Floor - US + * + * Licensed under the New BSD license. You may not use this file except in + * compliance with this License. + * + * The research leading to these results has received funding from the European Union's + * Seventh Framework Programme (FP7/2007-2013) + * under grant agreement no. 289016. + * + * You may obtain a copy of the License at + * https://github.com/GPII/universal/blob/master/LICENSE.txt + */ +"use strict"; +var fluid = require("infusion"); +var gpii = fluid.registerNamespace("gpii"); + +fluid.registerNamespace("gpii.universal.solutionsRegistry"); + +/** + * This function will take a schema from a supported setting in the solutions + * registry and return metadata on it's default value, including the type of + * the default value. The function will always return a block of json in order + * to avoid any ambiguities for a situation where the default value is perhaps + * `null`. A key `hasDefault` will be `true` or `false` to communicate this. + * If the schema does have a default value, then the properties `type` and + * `default` will also be included. + * + * This is NOT meant to be an exhaustive coverage of all the possible ways + * default values can be set for any JSON Schema. We merely want to cover the + * cases in use in the solutions registry, focussing on single primitive values, + * and situations where we next one level deep due to a requirement of having a + * `properties` entry in the schema. + * + * @param {Object} schema - Schema to search for a default value. This is what + * would be in the solutions registry under `supportedSettings` and a + * configuration. An example from the Windows Mouse Keys MaxSpeed setting is: + * ```json + * { + * "title": "Mouse keys speed", + * "description": "Speed of mouse keys", + * "type": "number", + * "multipleOf": 10, + * "default": 80 + * } + * ``` + * @return {Object} Always returns a json block. For the example above the + * return value would be: + * ```json + * { + * "hasDefault": true, + * "type": "number", + * "default": 80 + * } + * ``` + * If a default value cannot be detected the return payload will be: + * ```json + * { + * "hasDefault": false + * } + * ``` + */ +gpii.universal.solutionsRegistry.findDefaultValue = function (schema) { + var togo; + + // 1. The most simple, and hopefull case is that there is a top level + // default value. + if (schema["default"] !== undefined) { + togo = { + hasDefault: true, + default: schema["default"] + }; + } + // 2. Sometimes we have a properties structure that can be interogated, example: + // "properties": { + // "path": { "type": "string"}, + // "value": { + // "type": "string", + // "default": "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" + // } + // } + else if (schema.properties && schema.properties.value && schema.properties.value["default"] !== undefined) { + togo = { + hasDefault: true, + default: schema.properties.value["default"] + }; + } + // We cannot find a default value for our simplified usage of json schema... + else { + togo = { + hasDefault: false + }; + } + + return togo; +}; diff --git a/gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js b/gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js new file mode 100644 index 000000000..d54dec915 --- /dev/null +++ b/gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js @@ -0,0 +1,122 @@ +/* + * Tests for GPII Solutions Utils + * + * Copyright 2019 Raising the Floor - US + * + * Licensed under the New BSD license. You may not use this file except in + * compliance with this License. + * + * The research leading to these results has received funding from the European Union's + * Seventh Framework Programme (FP7/2007-2013) + * under grant agreement no. 289016. + * + * You may obtain a copy of the License at + * https://github.com/GPII/universal/blob/master/LICENSE.txt + */ + +"use strict"; +var fluid = require("infusion"); +var gpii = fluid.registerNamespace("gpii"); +var jqUnit = require("node-jqunit"); + +require("../src/js/SolutionsUtils"); + +jqUnit.module("Tests for Solutions Registry Utility functions."); + +fluid.registerNamespace("gpii.tests.universal.solutionsRegistry.solutionsUtils"); + +gpii.tests.universal.solutionsRegistry.solutionsUtils.defaultValueTests = [ + { + schema: { + "title": "Attribute Rotation Delay", + "description": "When in Attribute...", + "type": "integer", + "default": 1000 + }, + result: { + hasDefault: true, + default: 1000 + } + }, + { + schema: { + "title": "Attribute Rotation Delay With No Default...", + "description": "When in Attribute...", + "type": "integer" + }, + result: { + hasDefault: false + } + }, + { + schema: { + "title": "Desktop background wallpaper", + "description": "The path to the image to be set as the new desktop wallpaper.", + "properties": { + "path": { "type": "string"}, + "value": { + "type": "string", + "default": "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" + } + } + }, + result: { + hasDefault: true, + default: "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" + } + }, + { + schema: { + "title": "Desktop background wallpaper", + "description": "The path to the image to be set as the new desktop wallpaper.", + "properties": { + "path": { "type": "string", "required": true}, + "value": { + "type": "string", + "required": true, + "default": "" + } + } + }, + result: { + hasDefault: true, + default: "" + } + }, + { + schema: { + "title": "Screen mirroring", + "description": "Mirrors the primary screen into a secondary screen.", + "type": "boolean", + "default": false + }, + result: { + hasDefault: true, + default: false + } + } +]; + +gpii.tests.universal.solutionsRegistry.solutionsUtils.findDefaultValueTest = function (schema, expectedResult) { + var result = gpii.universal.solutionsRegistry.findDefaultValue(schema); + jqUnit.assertDeepEq("Checking default value for: " + schema.title, expectedResult, result); +}; + +gpii.tests.universal.solutionsRegistry.solutionsUtils.findDefaultValueTests = function () { + jqUnit.test("Testing my empty stubs...", function () { + fluid.each(gpii.tests.universal.solutionsRegistry.solutionsUtils.defaultValueTests, function (item) { + gpii.tests.universal.solutionsRegistry.solutionsUtils.findDefaultValueTest(item.schema, item.result); + }); + }); +}; + +fluid.defaults("gpii.tests.universal.solutionsRegistry.solutionsUtils", { + gradeNames: ["fluid.component"], + listeners: { + "onCreate.findDefaultValueTest": { + funcName: "gpii.tests.universal.solutionsRegistry.solutionsUtils.findDefaultValueTests" + } + } +}); + +gpii.tests.universal.solutionsRegistry.solutionsUtils(); diff --git a/gpii/node_modules/solutionsRegistry/test/all-tests.js b/gpii/node_modules/solutionsRegistry/test/all-tests.js index f439c559f..240b53c5a 100644 --- a/gpii/node_modules/solutionsRegistry/test/all-tests.js +++ b/gpii/node_modules/solutionsRegistry/test/all-tests.js @@ -5,3 +5,4 @@ require("./FilteredSettingsMiddlewareTests.js"); require("./GenericTermsTests.js"); require("./SettingsPayloadTests.js"); require("./SolutionsRegistryFileTests.js"); +require("./SolutionsUtilsTests.js"); From f1ac07a37ae26aa43d70574ca0ba264a6b14a57f Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Mon, 4 Nov 2019 13:05:02 -0800 Subject: [PATCH 4/8] GPII-4207 Adding type information back in to `findDefaultValue` --- .../src/js/SolutionsUtils.js | 10 +++++- .../test/SolutionsUtilsTests.js | 31 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js b/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js index 393168122..ea054ff6c 100644 --- a/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js +++ b/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js @@ -27,7 +27,9 @@ fluid.registerNamespace("gpii.universal.solutionsRegistry"); * to avoid any ambiguities for a situation where the default value is perhaps * `null`. A key `hasDefault` will be `true` or `false` to communicate this. * If the schema does have a default value, then the properties `type` and - * `default` will also be included. + * `default` can also be included. Note that there may not always be a `type` + * that can be included, the inclusion of this in the return if optional and + * will be included if a `type` is declared. * * This is NOT meant to be an exhaustive coverage of all the possible ways * default values can be set for any JSON Schema. We merely want to cover the @@ -73,6 +75,9 @@ gpii.universal.solutionsRegistry.findDefaultValue = function (schema) { hasDefault: true, default: schema["default"] }; + if (schema.type) { + togo.type = schema.type; + } } // 2. Sometimes we have a properties structure that can be interogated, example: // "properties": { @@ -87,6 +92,9 @@ gpii.universal.solutionsRegistry.findDefaultValue = function (schema) { hasDefault: true, default: schema.properties.value["default"] }; + if (schema.properties.value.type) { + togo.type = schema.properties.value.type; + } } // We cannot find a default value for our simplified usage of json schema... else { diff --git a/gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js b/gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js index d54dec915..195c0793c 100644 --- a/gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js +++ b/gpii/node_modules/solutionsRegistry/test/SolutionsUtilsTests.js @@ -33,6 +33,18 @@ gpii.tests.universal.solutionsRegistry.solutionsUtils.defaultValueTests = [ "type": "integer", "default": 1000 }, + result: { + hasDefault: true, + type: "integer", + default: 1000 + } + }, + { + schema: { + "title": "Attribute Rotation Delay", + "description": "When in Attribute...", + "default": 1000 + }, result: { hasDefault: true, default: 1000 @@ -60,6 +72,23 @@ gpii.tests.universal.solutionsRegistry.solutionsUtils.defaultValueTests = [ } } }, + result: { + hasDefault: true, + type: "string", + default: "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" + } + }, + { + schema: { + "title": "Desktop background wallpaper", + "description": "The path to the image to be set as the new desktop wallpaper.", + "properties": { + "path": { "type": "string"}, + "value": { + "default": "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" + } + } + }, result: { hasDefault: true, default: "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" @@ -80,6 +109,7 @@ gpii.tests.universal.solutionsRegistry.solutionsUtils.defaultValueTests = [ }, result: { hasDefault: true, + type: "string", default: "" } }, @@ -92,6 +122,7 @@ gpii.tests.universal.solutionsRegistry.solutionsUtils.defaultValueTests = [ }, result: { hasDefault: true, + type: "boolean", default: false } } From 556a578053c87bee98f87e4f7f98c3f55e109019 Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Mon, 4 Nov 2019 13:09:24 -0800 Subject: [PATCH 5/8] GPII-4207 Updating mousekeys acceleration to be an integer type. --- testData/solutions/win32.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 0ab33f8f4..6af6beae4 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -7767,7 +7767,7 @@ "schema": { "title": "Mouse keys acceleration", "description": "Acceleration of mouse keys", - "type": "number", + "type": "integer", "minimum": 1000, // TODO: Not clear how to describe this setting "maximum": 5000, From b0416bde8b57379ab91657f522b8617523623f4d Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Thu, 7 Nov 2019 10:21:20 -0800 Subject: [PATCH 6/8] GPII-4207 Disambiguating win32 desktop personalization names --- testData/solutions/win32.json5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 6af6beae4..3ccede8d0 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -4878,7 +4878,7 @@ ] }, "com.microsoft.windows.desktopBackground": { - "name": "Windows desktop background personalization", + "name": "Windows desktop background wallpaper", "contexts": { "OS": [ { @@ -5083,7 +5083,7 @@ ] }, "com.microsoft.windows.desktopBackgroundColor": { - "name": "Windows desktop background personalization", + "name": "Windows desktop background color", "contexts": { "OS": [ { From 37687db153cf0982d073fbae39b4e7018f760036 Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Wed, 20 Nov 2019 13:35:05 -0800 Subject: [PATCH 7/8] GPII-4207 Removing some debug/investigating comments. --- testData/solutions/win32.json5 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 3ccede8d0..2972952f7 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -5045,7 +5045,6 @@ "title": "Desktop background wallpaper", "description": "The path to the image to be set as the new desktop wallpaper.", // TODO: Discuss somehow simplifying the structure of SPI settings for easier UI input. - // GPII-4207 Test with the new find `default` value function "properties": { "path": { "type": "string"}, "value": { @@ -6378,7 +6377,6 @@ } }, "supportedSettings": { - // GPII-4207 Add the check for defaults in `properties.value.default` "FilterKeysEnable": { "schema": { "title": "Filter keys", @@ -6394,7 +6392,6 @@ } } }, - // GPII-4207 it looks like the default in the control panel for this may be 1000... "SlowKeysInterval": { "schema": { "title": "Slow keys interval", @@ -6403,7 +6400,7 @@ "properties": { "path": { "type": "string", "required": true}, "value": { - // GPII-4207 In the current Windows 10 UI this goes from 0.0 seconds + // In the current Windows 10 UI this goes from 0.0 seconds // to 20.0 seconds in somewhat random steps in a combo box: // 0.0, 0.3, 0.5, 0.7, 1.0, 1.4, 2.0, 5.0, 10.0, 20.0 // TODO try manually setting a differnet value under the covers, @@ -6840,7 +6837,6 @@ "schema": { "title": "Video audio description", "description": "Hear descriptions of what's happening in videos", - // GPII-4207 Test to see if this `default` is getting cast correctly "default": 0, "enum": [ 0, @@ -7111,7 +7107,6 @@ "title": "ToggleKeys accesibility feature", "description": "Enable/Disable ToggleKeys feature", "type": "boolean", - // GPII-4207 check `default` cast "default": false } } From 3b26e2d4654b91c8ac57f84eaa91e3e015133a3b Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Mon, 3 Feb 2020 14:23:43 -0800 Subject: [PATCH 8/8] GPII-4207 Cleaning up property access with fluid.get --- gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js b/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js index ea054ff6c..070c6c02a 100644 --- a/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js +++ b/gpii/node_modules/solutionsRegistry/src/js/SolutionsUtils.js @@ -87,7 +87,7 @@ gpii.universal.solutionsRegistry.findDefaultValue = function (schema) { // "default": "%SystemRoot%\\Web\\Wallpaper\\Windows\\img0.jpg" // } // } - else if (schema.properties && schema.properties.value && schema.properties.value["default"] !== undefined) { + else if (fluid.get(schema, "properties.value.default") !== undefined) { togo = { hasDefault: true, default: schema.properties.value["default"]