Skip to content

GPII-3119 SPI Settings Refactor for Lookup Paths #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amb26 merged 15 commits into from
Jan 29, 2020
Merged

GPII-3119 SPI Settings Refactor for Lookup Paths #832

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
46b0a25
GPII-3119 Adding SPI to supportedSettings sections. Waiting to remov…
sgithens Dec 6, 2019
8a595aa
GPII-3119 Adding optional SPI settings path to solutions registry jso…
sgithens Dec 7, 2019
09c1160
GPII-3119 Removing now redundant path from capabilities transforms an…
sgithens Dec 10, 2019
de4ec4c
GPII-3119 Testing addition of supported settings to acceptance tests.
sgithens Dec 10, 2019
c06e078
GPII-3119 Adding supported settings metadata to invoke settings handl…
sgithens Dec 11, 2019
eaa4234
GPII-3119 Removing more uncessary paths from prefssets and putting mo…
sgithens Dec 11, 2019
a7b973a
GPII-3119 Temporarily commenting out integration tests.
sgithens Dec 11, 2019
97fd0bb
GPII-3119 Removing another missed path setting
sgithens Dec 11, 2019
334476e
GPII-3119 Fixing remaining tests.
sgithens Dec 12, 2019
33b230e
GPII-3119 Minor linting, and passing supportedSettings through lifecy…
sgithens Dec 12, 2019
c066375
GPII-3119 Minor stubs for supportedSettings to browser tests
sgithens Dec 13, 2019
262638b
GPII-3119 Optionally including supportedSettings in payload if they e…
sgithens Jan 9, 2020
ba5a0be
Merge remote-tracking branch 'GPII/master' into GPII-3119-part2
sgithens Jan 9, 2020
a13858d
Merge remote-tracking branch 'GPII/master' into GPII-3119-part2
sgithens Jan 23, 2020
957c992
GPII-3119 Adding ticket number to comment
sgithens Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload2.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions gpii/node_modules/lifecycleManager/src/LifecycleManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,11 @@ var fluid = fluid || require("infusion"),
options: handlerSpec.options
}];

// Optionally include supportedSettings if there are any
Comment thread
sgithens marked this conversation as resolved.
Outdated
if (handlerSpec.supportedSettings !== undefined) {
returnObj[solutionId][0].supportedSettings = handlerSpec.supportedSettings;
}

return returnObj;
};

Expand Down
5 changes: 0 additions & 5 deletions gpii/node_modules/matchMakerFramework/test/data/app_specific_only.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gpii/node_modules/matchMakerFramework/test/data/multi_context.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions gpii/node_modules/matchMakerFramework/test/data/os_win.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ gpii.settingsHandlers.invokeSettingsHandler = function (handler, payload) {
var response = gpii.settingsHandlers.transformPayload(payload, function (element, path) {
var solutionId = path[0]; // first entry of path will always be solution ID
// Note shallow copy performed within filterKeys
var directLoad = fluid.filterKeys(element, ["settings", "options"]);
var others = fluid.censorKeys(element, ["settings", "options"]);
var directLoad = fluid.filterKeys(element, ["settings", "options", "supportedSettings"]);
var others = fluid.censorKeys(element, ["settings", "options", "supportedSettings"]);
worklist.push({
path: path,
result: handler(directLoad, solutionId),
Expand Down
6 changes: 5 additions & 1 deletion gpii/node_modules/solutionsRegistry/src/schemas/solution-schema.json5
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 10 additions & 51 deletions gpii/node_modules/transformer/test/TransformerTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ var testSolutionsEntry = {
"description": "Swap mouse left/right buttons",
"type": "boolean",
"default": false
},
"path": {
"get": "pvParam",
"set": "uiParam"
}
}
},
Expand All @@ -278,12 +282,6 @@ var testSolutionsEntry = {
"type": "fluid.transforms.value",
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
"outputPath": "value"
},
"path": {
"literalValue": {
"get": "pvParam",
"set": "uiParam"
}
}
}
},
Expand Down Expand Up @@ -322,6 +320,10 @@ var testSolutionsEntry = {
"enumLabels": ["full-page"]
}
]
},
"path": {
"get": "pvParam",
"set": "uiParam"
}
}
},
Expand All @@ -331,12 +333,6 @@ var testSolutionsEntry = {
"type": "fluid.transforms.value",
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.ScrollLines",
"outputPath": "value"
},
"path": {
"literalValue": {
"get": "pvParam",
"set": "uiParam"
}
}
}
},
Expand Down Expand Up @@ -390,7 +386,8 @@ var testSolutionsEntry = {
"description": "Whether to enable/disable High Contrast",
"type": "boolean",
"default": false
}
},
"path": "pvParam.dwFlags.HCF_HIGHCONTRASTON"
}
},
"capabilities": [
Expand Down Expand Up @@ -423,12 +420,6 @@ var testSolutionsEntry = {
}
},
"outputPath": "value"
},
"path": {
"transform": {
"type": "fluid.transforms.literalValue",
"input": "pvParam.dwFlags.HCF_HIGHCONTRASTON"
}
}
}
},
Expand Down Expand Up @@ -1125,7 +1116,6 @@ gpii.tests.transformer.configurationToSettingsTestSpecs = [
"http://registry.gpii.net/common/highContrast/enabled": true,
"http://registry.gpii.net/applications/com.microsoft.windows.highContrast": {
"HighContrastOn": {
"path": "pvParam.dwFlags.HCF_HIGHCONTRASTON",
"value": true
}
}
Expand Down Expand Up @@ -1175,7 +1165,6 @@ gpii.tests.transformer.configurationToSettingsTestSpecs = [
},
"settings": {
"HighContrastOn": {
"path": "pvParam.dwFlags.HCF_HIGHCONTRASTON",
"value": true
}
},
Expand Down Expand Up @@ -1420,12 +1409,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
"type": "fluid.transforms.value",
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
"outputPath": "value"
},
"path": {
"literalValue": {
"get": "pvParam",
"set": "uiParam"
}
}
}
},
Expand All @@ -1444,12 +1427,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
"type": "fluid.transforms.value",
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
"outputPath": "value"
},
"path": {
"literalValue": {
"get": "pvParam",
"set": "uiParam"
}
}
}
},
Expand All @@ -1472,12 +1449,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
"type": "fluid.transforms.value",
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
"outputPath": "value"
},
"path": {
"literalValue": {
"get": "pvParam",
"set": "uiParam"
}
}
}
},
Expand All @@ -1496,12 +1467,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
"true": "",
"false": "",
"outputPath": "value"
},
"path": {
"transform": {
"type": "fluid.transforms.literalValue",
"input": "pvParam"
}
}
}
},
Expand All @@ -1519,12 +1484,6 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
"type": "fluid.transforms.value",
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
"outputPath": "value"
},
"path": {
"literalValue": {
"get": "pvParam",
"set": "uiParam"
}
}
}
},
Expand Down
Loading