Skip to content

Commit

Permalink
Revert "Merge branch 'GPII-3119-part2'"
Browse files Browse the repository at this point in the history 
This reverts commit e864be5, reversing
changes made to eaac911.
  • Loading branch information
@amb26
amb26 committed Jan 29, 2020
1 parent e864be5 commit 76ad0e6
Show file tree
Hide file tree
Showing 13 changed files with 377 additions and 334 deletions.
9 changes: 7 additions & 2 deletions gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload2.json
View file

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

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

// GPII-3119 Optionally include supportedSettings if there are any
if (handlerSpec.supportedSettings !== undefined) {
returnObj[solutionId][0].supportedSettings = handlerSpec.supportedSettings;
}

return returnObj;
};

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

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

1 change: 1 addition & 0 deletions gpii/node_modules/matchMakerFramework/test/data/multi_context.json
View file

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

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

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
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", "supportedSettings"]);
var others = fluid.censorKeys(element, ["settings", "options", "supportedSettings"]);
var directLoad = fluid.filterKeys(element, ["settings", "options"]);
var others = fluid.censorKeys(element, ["settings", "options"]);
worklist.push({
path: path,
result: handler(directLoad, solutionId),
Expand Down
6 changes: 1 addition & 5 deletions gpii/node_modules/solutionsRegistry/src/schemas/solution-schema.json5
View file

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

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

0 comments on commit 76ad0e6

Please sign in to comment.