Skip to content

Commit 76ad0e6

Browse files
amb26amb26
committed
Revert "Merge branch 'GPII-3119-part2'"
This reverts commit e864be5, reversing changes made to eaac911.
1 parent e864be5 commit 76ad0e6

File tree

13 files changed

+377
-334
lines changed

13 files changed

+377
-334
lines changed

‎gpii/node_modules/flatMatchMaker/test/data/pre_mm_payload2.json‎

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gpii/node_modules/lifecycleManager/src/LifecycleManager.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -736,11 +736,6 @@ var fluid = fluid || require("infusion"),
736736
options: handlerSpec.options
737737
}];
738738

739-
// GPII-3119 Optionally include supportedSettings if there are any
740-
if (handlerSpec.supportedSettings !== undefined) {
741-
returnObj[solutionId][0].supportedSettings = handlerSpec.supportedSettings;
742-
}
743-
744739
return returnObj;
745740
};
746741

‎gpii/node_modules/matchMakerFramework/test/data/app_specific_only.json‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gpii/node_modules/matchMakerFramework/test/data/multi_context.json‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gpii/node_modules/matchMakerFramework/test/data/os_win.json‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ gpii.settingsHandlers.invokeSettingsHandler = function (handler, payload) {
175175
var response = gpii.settingsHandlers.transformPayload(payload, function (element, path) {
176176
var solutionId = path[0]; // first entry of path will always be solution ID
177177
// Note shallow copy performed within filterKeys
178-
var directLoad = fluid.filterKeys(element, ["settings", "options", "supportedSettings"]);
179-
var others = fluid.censorKeys(element, ["settings", "options", "supportedSettings"]);
178+
var directLoad = fluid.filterKeys(element, ["settings", "options"]);
179+
var others = fluid.censorKeys(element, ["settings", "options"]);
180180
worklist.push({
181181
path: path,
182182
result: handler(directLoad, solutionId),

‎gpii/node_modules/solutionsRegistry/src/schemas/solution-schema.json5‎

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gpii/node_modules/transformer/test/TransformerTests.js‎

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,6 @@ var testSolutionsEntry = {
269269
"description": "Swap mouse left/right buttons",
270270
"type": "boolean",
271271
"default": false
272-
},
273-
"path": {
274-
"get": "pvParam",
275-
"set": "uiParam"
276272
}
277273
}
278274
},
@@ -282,6 +278,12 @@ var testSolutionsEntry = {
282278
"type": "fluid.transforms.value",
283279
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
284280
"outputPath": "value"
281+
},
282+
"path": {
283+
"literalValue": {
284+
"get": "pvParam",
285+
"set": "uiParam"
286+
}
285287
}
286288
}
287289
},
@@ -320,10 +322,6 @@ var testSolutionsEntry = {
320322
"enumLabels": ["full-page"]
321323
}
322324
]
323-
},
324-
"path": {
325-
"get": "pvParam",
326-
"set": "uiParam"
327325
}
328326
}
329327
},
@@ -333,6 +331,12 @@ var testSolutionsEntry = {
333331
"type": "fluid.transforms.value",
334332
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.ScrollLines",
335333
"outputPath": "value"
334+
},
335+
"path": {
336+
"literalValue": {
337+
"get": "pvParam",
338+
"set": "uiParam"
339+
}
336340
}
337341
}
338342
},
@@ -386,8 +390,7 @@ var testSolutionsEntry = {
386390
"description": "Whether to enable/disable High Contrast",
387391
"type": "boolean",
388392
"default": false
389-
},
390-
"path": "pvParam.dwFlags.HCF_HIGHCONTRASTON"
393+
}
391394
}
392395
},
393396
"capabilities": [
@@ -420,6 +423,12 @@ var testSolutionsEntry = {
420423
}
421424
},
422425
"outputPath": "value"
426+
},
427+
"path": {
428+
"transform": {
429+
"type": "fluid.transforms.literalValue",
430+
"input": "pvParam.dwFlags.HCF_HIGHCONTRASTON"
431+
}
423432
}
424433
}
425434
},
@@ -1116,6 +1125,7 @@ gpii.tests.transformer.configurationToSettingsTestSpecs = [
11161125
"http://registry.gpii.net/common/highContrast/enabled": true,
11171126
"http://registry.gpii.net/applications/com.microsoft.windows.highContrast": {
11181127
"HighContrastOn": {
1128+
"path": "pvParam.dwFlags.HCF_HIGHCONTRASTON",
11191129
"value": true
11201130
}
11211131
}
@@ -1165,6 +1175,7 @@ gpii.tests.transformer.configurationToSettingsTestSpecs = [
11651175
},
11661176
"settings": {
11671177
"HighContrastOn": {
1178+
"path": "pvParam.dwFlags.HCF_HIGHCONTRASTON",
11681179
"value": true
11691180
}
11701181
},
@@ -1409,6 +1420,12 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
14091420
"type": "fluid.transforms.value",
14101421
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
14111422
"outputPath": "value"
1423+
},
1424+
"path": {
1425+
"literalValue": {
1426+
"get": "pvParam",
1427+
"set": "uiParam"
1428+
}
14121429
}
14131430
}
14141431
},
@@ -1427,6 +1444,12 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
14271444
"type": "fluid.transforms.value",
14281445
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
14291446
"outputPath": "value"
1447+
},
1448+
"path": {
1449+
"literalValue": {
1450+
"get": "pvParam",
1451+
"set": "uiParam"
1452+
}
14301453
}
14311454
}
14321455
},
@@ -1449,6 +1472,12 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
14491472
"type": "fluid.transforms.value",
14501473
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
14511474
"outputPath": "value"
1475+
},
1476+
"path": {
1477+
"literalValue": {
1478+
"get": "pvParam",
1479+
"set": "uiParam"
1480+
}
14521481
}
14531482
}
14541483
},
@@ -1467,6 +1496,12 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
14671496
"true": "",
14681497
"false": "",
14691498
"outputPath": "value"
1499+
},
1500+
"path": {
1501+
"transform": {
1502+
"type": "fluid.transforms.literalValue",
1503+
"input": "pvParam"
1504+
}
14701505
}
14711506
}
14721507
},
@@ -1484,6 +1519,12 @@ gpii.tests.transformer.hasSupportedSettingsTests = [
14841519
"type": "fluid.transforms.value",
14851520
"inputPath": "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons",
14861521
"outputPath": "value"
1522+
},
1523+
"path": {
1524+
"literalValue": {
1525+
"get": "pvParam",
1526+
"set": "uiParam"
1527+
}
14871528
}
14881529
}
14891530
},

0 commit comments

Comments
 (0)