From dae7f396453e1e6f1e6a8463abdda94dae4dcaf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 7 Dec 2017 15:13:08 +0100 Subject: [PATCH 1/2] GPII-2106: Workaround to close firefox when keying-out elaine --- gpii/node_modules/settingsHandlers/src/NoSettingsHandler.js | 1 + testData/solutions/win32.json5 | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gpii/node_modules/settingsHandlers/src/NoSettingsHandler.js b/gpii/node_modules/settingsHandlers/src/NoSettingsHandler.js index 81c159379..f4b6f279c 100644 --- a/gpii/node_modules/settingsHandlers/src/NoSettingsHandler.js +++ b/gpii/node_modules/settingsHandlers/src/NoSettingsHandler.js @@ -20,4 +20,5 @@ var fluid = require("infusion"), settingsHandlers = fluid.registerNamespace("gpii.settingsHandlers"); settingsHandlers.noSettings = fluid.identity; +settingsHandlers.noSettings.set = fluid.identity; diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 6a97097fc..82f4aaf56 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -1762,10 +1762,11 @@ ], "stop": [ { - "type": "gpii.windows.closeProcessByName", - "filename": "firefox.exe" + "type": "gpii.windows.closeProcessByName", + "filename": "firefox.exe" } ], + "configure": [ "settings.configure" ], "isInstalled": [ { "type": "gpii.deviceReporter.alwaysInstalled" From 7a2e35a0b5ba9bfc65021a7e09acf68355e31d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 7 Dec 2017 16:01:23 +0100 Subject: [PATCH 2/2] GPII-2106: Referenced the issue from the solutions registry and added a comment about the workaround applied. --- testData/solutions/win32.json5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5 index 82f4aaf56..7be777595 100644 --- a/testData/solutions/win32.json5 +++ b/testData/solutions/win32.json5 @@ -1766,6 +1766,12 @@ "filename": "firefox.exe" } ], + // Although there are no settings to deal with, we need to pass through + // the "configure" action in order to proceed with the "stop" directive + // when keying out. This is a current limitation of the system, you can + // check https://issues.gpii.net/browse/GPII-2106 and + // https://issues.gpii.net/browse/GPII-1235 for more detailed information. + // "configure": [ "settings.configure" ], "isInstalled": [ {