From b016a14a09356eb86a90225c60f44ab91dcb1461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 7 Mar 2019 21:10:55 +0100 Subject: [PATCH 001/116] GPII-3744+GPII-2338: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a878cce76..79d6f1a8f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "0.3.0-dev.20190301T140415Z.1c8ca11", + "gpii-windows": "javihernandez/windows#c8070dc37ee1d440fd846cd15fb3bb7088230a5c", "infusion": "3.0.0-dev.20180222T160835Z.6e1311a", "nan": "2.10.0", "node-jqunit": "1.1.8", From e579fa2caf8228460ed139ef5263e53e1a982abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 7 Mar 2019 21:36:40 +0100 Subject: [PATCH 002/116] GPII-3744+GPII-2338: Updated windows reference and added GPII_CLOUD_URL --- package.json | 2 +- provisioning/service.json5 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 79d6f1a8f..a27b2d59b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#c8070dc37ee1d440fd846cd15fb3bb7088230a5c", + "gpii-windows": "javihernandez/windows#73088fe715ef0ed91116b68a6dab80ccb9853397", "infusion": "3.0.0-dev.20180222T160835Z.6e1311a", "nan": "2.10.0", "node-jqunit": "1.1.8", diff --git a/provisioning/service.json5 b/provisioning/service.json5 index 7f898cd15..8c5505556 100644 --- a/provisioning/service.json5 +++ b/provisioning/service.json5 @@ -8,6 +8,7 @@ "disabled": false, env: { //NODE_ENV: "app.testing" + GPII_CLOUD_URL: "https://flowmanager.stg.gcp.gpii.net" } } }, From 8ace45fb8f1b3736dadddc11b3984b90d50060a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 12 Mar 2019 17:12:23 +0100 Subject: [PATCH 003/116] GPII-3789: Optionally include sharex module into the installer Also, updated siteconfig.json according to ShareX location. --- provisioning/Installer.ps1 | 10 ++++++++-- siteconfig.json5 | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/provisioning/Installer.ps1 b/provisioning/Installer.ps1 index d6da5363c..718432194 100644 --- a/provisioning/Installer.ps1 +++ b/provisioning/Installer.ps1 @@ -16,8 +16,8 @@ Import-Module (Join-Path $provisioningDir 'Provisioning.psm1') -Force #$installerRepo = "https://github.com/GPII/gpii-wix-installer" #$installerBranch = "HST" -$installerRepo = "https://github.com/stegru/gpii-wix-installer" -$installerBranch = "GPII-2338" +$installerRepo = "https://github.com/javihernandez/gpii-wix-installer" +$installerBranch = "GPII-3789" # Obtaining useful tools location. $installerDir = Join-Path $env:SystemDrive "installer" # a.k.a. C:\installer\ @@ -51,6 +51,12 @@ if (Test-Path $filebeatFile) { Copy-Item $filebeatFile $installerDir } +# Place sharex inside the installer directory, if it's here. +$sharexFile = (Join-Path $provisioningDir 'sharex.msm') +if (Test-Path $sharexFile) { + Copy-Item $sharexFile $installerDir +} + # Create staging folder $stagingWindowsDir = Join-Path (Join-Path $installerDir "staging") "windows" if (Test-Path -Path $stagingWindowsDir) { diff --git a/siteconfig.json5 b/siteconfig.json5 index 7cf4ab443..41a221192 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -35,7 +35,7 @@ }, // the path to the ShareX's executable file, used in the screenCaptureWidget - shareXPath: "C:\\Program Files (x86)\\Morphic\\windows\\resources\\sharex-portable\\sharex.exe" + shareXPath: "C:\\Program Files (x86)\\Morphic\\sharex\\sharex-portable\\sharex.exe" }, // Configuration options for the PSP window From f949fe7f43467892291e7d115e2e7c39bb02bf46 Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Mon, 25 Mar 2019 13:43:33 +0200 Subject: [PATCH 004/116] GPII-3819: on reset to standart use value from siteConfig to set default language for qss --- src/main/gpiiConnector.js | 2 +- src/main/siteConfigurationHandler.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 92450ab6b..abd66a2cd 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -770,7 +770,7 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { "http://registry\\.gpii\\.net/common/highContrastTheme": { value: "regular-contrast" }, "http://registry\\.gpii\\.net/common/selfVoicing/enabled": { value: false }, // use the initial value of the language as default setting - "http://registry\\.gpii\\.net/common/language": { value: "{systemLanguageListener}.model.configuredLanguage" } + "http://registry\\.gpii\\.net/common/language": { value: "{that}.options.defaultPreferences.systemDefaultLanguage" } } }); diff --git a/src/main/siteConfigurationHandler.js b/src/main/siteConfigurationHandler.js index aa634f004..c2ecd594b 100644 --- a/src/main/siteConfigurationHandler.js +++ b/src/main/siteConfigurationHandler.js @@ -97,6 +97,10 @@ fluid.defaults("gpii.app.siteConfigurationHandler", { record: "{that}.options.siteConfig.disableRestartWarning", target: "{app gpiiConnector}.options.defaultPreferences.disableRestartWarning" }, + distributeDefaultLanguageGpiiConnector: { + record: "{that}.options.siteConfig.qss.systemDefaultLanguage", + target: "{app gpiiConnector}.options.defaultPreferences.systemDefaultLanguage" + }, distributeSurveyTriggersUrl: { record: "{that}.options.siteConfig.surveyTriggersUrl", target: "{app surveyConnector}.options.config.surveyTriggersUrl" From 4070f9a06767b2e978f4663821435272a53e5184 Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Mon, 25 Mar 2019 15:27:47 +0200 Subject: [PATCH 005/116] GPII-3819: code review changes --- src/main/gpiiConnector.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index abd66a2cd..e44a34093 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -770,6 +770,7 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { "http://registry\\.gpii\\.net/common/highContrastTheme": { value: "regular-contrast" }, "http://registry\\.gpii\\.net/common/selfVoicing/enabled": { value: false }, // use the initial value of the language as default setting + // This is temporary solution related to GPII-3819 issue. After finding permanent solution the value should be taken from the core. "http://registry\\.gpii\\.net/common/language": { value: "{that}.options.defaultPreferences.systemDefaultLanguage" } } }); From 7aefdbd56410aef47e7fcbe6505b0f64ccf447c8 Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Wed, 27 Mar 2019 17:38:21 +0200 Subject: [PATCH 006/116] GPII-3819: Load default settings from a local file --- siteconfig.json5 | 3 ++ src/main/gpiiConnector.js | 47 +++++++++++++++----------- src/main/siteConfigurationHandler.js | 4 +++ tests/fixtures/siteconfig.json5 | 3 +- tests/fixtures/siteconfigHandler.json5 | 3 +- 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 35144f6db..d492bcb07 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -3,6 +3,9 @@ // `true` if the button should be hidden and `false` otherwise. hideQssSaveButton: false, + // File containing default values which are used after resetting user settings + defaultValues: "C:\\Users\\vagrant\\AppData\\Roaming\\gpii\\defaultSettings.json5", + // Configuration options for the QSS window qss: { // Defines the delay in milliseconds before the tooltip is shown after a QSS button is selected diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index e44a34093..5e302e9ae 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -40,7 +40,8 @@ fluid.defaults("gpii.app.gpiiConnector", { */ closeQssOnBlur: false, closePspOnBlur: true, - disableRestartWarning: false + disableRestartWarning: false, + defaultSettingsPath: null }, events: { @@ -743,7 +744,6 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { funcName: "gpii.app.dev.gpiiConnector.qss.prepareMessageForQss", args: [ "{that}", - "{that}.options.defaultQssSettingValues", "{arguments}.0" // message ] } @@ -761,20 +761,29 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { "{arguments}.0" ] } - }, - - // The "original" values of the QSS settings. These are to be provided from the core - // in the future. - defaultQssSettingValues: { - "http://registry\\.gpii\\.net/common/DPIScale": { value: 0 }, - "http://registry\\.gpii\\.net/common/highContrastTheme": { value: "regular-contrast" }, - "http://registry\\.gpii\\.net/common/selfVoicing/enabled": { value: false }, - // use the initial value of the language as default setting - // This is temporary solution related to GPII-3819 issue. After finding permanent solution the value should be taken from the core. - "http://registry\\.gpii\\.net/common/language": { value: "{that}.options.defaultPreferences.systemDefaultLanguage" } } }); +/** + * Retrieves synchronously the default QSS settings from a file on the local machine + * folder. These are to be provided from the core in the future. + * @param {String} defaultSettingsPath - The path to the file containing the QSS + * @return {Object[]} An array of the loaded settings + */ +gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPath) { + var loadedSettings = fluid.require(defaultSettingsPath), + result = {}; + + fluid.each(loadedSettings.contexts["gpii-default"].preferences, function(value, path) { + var fixedPath = path.replace(/\./g, "\\."), + fixedValue = value; + + result[fixedPath] = { "value": fixedValue }; + }); + + return result; +}; + /** * Decorate the PSP channel message with QSS specific property so that it looks similar * to what it will look like in the future with core improvements on QSS functionality. @@ -783,12 +792,12 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { * In case it is needed (it's a full preference set update after a snapset or active set change), it * also populates with QSS settings that are missing using a predefined set of default values. * @param {Component} that - The instance of `gpii.app.dev.gpiiComponent` component - * @param {Object} defaultQssSettingValues - The default QSS settings in the format - : * @param {Object} message - The raw PSP channel message * @return {Object} The decorated PSP channel message */ -gpii.app.dev.gpiiConnector.qss.prepareMessageForQss = function (that, defaultQssSettingValues, message) { - var payload = message.payload || {}; +gpii.app.dev.gpiiConnector.qss.prepareMessageForQss = function (that, message) { + var loadedSettings = gpii.app.dev.gpiiConnector.qss.loadDefaultSettings(that.options.defaultPreferences.defaultSettingsPath), + payload = message.payload || {}; if (gpii.app.gpiiConnector.isPrefSetUpdate(payload)) { var value = payload.value || {}, @@ -796,11 +805,10 @@ gpii.app.dev.gpiiConnector.qss.prepareMessageForQss = function (that, defaultQss // leave only QSS settings // Note that settings that doesn't have specific values such as "App / Text Zoom" will not receive setting updates - var qssSettingControls = fluid.filterKeys(channelSettingControls, fluid.keys(defaultQssSettingValues)); + var qssSettingControls = fluid.filterKeys(channelSettingControls, fluid.keys(loadedSettings)); // add missing setting values if needed - qssSettingControls = gpii.app.dev.gpiiConnector.qss.applySettingDefaults(that, that.options.defaultQssSettingValues, qssSettingControls, value); - + qssSettingControls = gpii.app.dev.gpiiConnector.qss.applySettingDefaults(that, loadedSettings, qssSettingControls, value); value.qssSettingControls = qssSettingControls; } @@ -852,6 +860,7 @@ gpii.app.dev.gpiiConnector.qss.applySettingDefaults = function (that, defaultQss fluid.log("gpiiConnect.qss: Merge QSS default settings"); // add missing QSS settings to the update list (this is needed for triggering reset of the QSS) + // console.log("applySettingDefaults: ", defaultQssSettingValues, qssSettingControls); qssSettingControls = fluid.extend(true, {}, defaultQssSettingValues, qssSettingControls); } diff --git a/src/main/siteConfigurationHandler.js b/src/main/siteConfigurationHandler.js index c2ecd594b..a70b1708e 100644 --- a/src/main/siteConfigurationHandler.js +++ b/src/main/siteConfigurationHandler.js @@ -101,6 +101,10 @@ fluid.defaults("gpii.app.siteConfigurationHandler", { record: "{that}.options.siteConfig.qss.systemDefaultLanguage", target: "{app gpiiConnector}.options.defaultPreferences.systemDefaultLanguage" }, + distributeDefaultSettingsPath: { + record: "{that}.options.siteConfig.defaultValues", + target: "{app gpiiConnector}.options.defaultPreferences.defaultSettingsPath" + }, distributeSurveyTriggersUrl: { record: "{that}.options.siteConfig.surveyTriggersUrl", target: "{app surveyConnector}.options.config.surveyTriggersUrl" diff --git a/tests/fixtures/siteconfig.json5 b/tests/fixtures/siteconfig.json5 index b695e07df..2fe2b70a2 100644 --- a/tests/fixtures/siteconfig.json5 +++ b/tests/fixtures/siteconfig.json5 @@ -12,5 +12,6 @@ resizable: true, alwaysOnTop: true }, - surveyTriggersUrl: "http://localhost:8083/surveys/triggers.json" + surveyTriggersUrl: "http://localhost:8083/surveys/triggers.json", + defaultValues: "C:\\Users\\vagrant\\AppData\\Roaming\\gpii\\defaultSettings.json5" } diff --git a/tests/fixtures/siteconfigHandler.json5 b/tests/fixtures/siteconfigHandler.json5 index 8ca64481f..2a4e954b0 100644 --- a/tests/fixtures/siteconfigHandler.json5 +++ b/tests/fixtures/siteconfigHandler.json5 @@ -8,5 +8,6 @@ messages: { keyedOut: "To save your settings you need to setup a Morphic Account." } - } + }, + defaultValues: "C:\\Users\\vagrant\\AppData\\Roaming\\gpii\\defaultSettings.json5" } From 81f0d98aa8aacdb66a81d6d7144db2c5c6339480 Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Wed, 27 Mar 2019 19:11:18 +0200 Subject: [PATCH 007/116] NOJIRA: removed forgotten log --- src/main/gpiiConnector.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 5e302e9ae..518e074bb 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -860,7 +860,6 @@ gpii.app.dev.gpiiConnector.qss.applySettingDefaults = function (that, defaultQss fluid.log("gpiiConnect.qss: Merge QSS default settings"); // add missing QSS settings to the update list (this is needed for triggering reset of the QSS) - // console.log("applySettingDefaults: ", defaultQssSettingValues, qssSettingControls); qssSettingControls = fluid.extend(true, {}, defaultQssSettingValues, qssSettingControls); } From 545ee4597c2b9c72bf45f0a9b325474281523671 Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Wed, 27 Mar 2019 22:40:56 +0200 Subject: [PATCH 008/116] GPII-3819: add function to check if the file exists --- src/main/common/utils.js | 10 ++++++++++ src/main/gpiiConnector.js | 21 +++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/common/utils.js b/src/main/common/utils.js index ebbf3953c..726504607 100644 --- a/src/main/common/utils.js +++ b/src/main/common/utils.js @@ -15,6 +15,7 @@ "use strict"; var os = require("os"); +var fs = require("fs"); var fluid = require("infusion"); var electron = require("electron"); var child_process = require("child_process"); @@ -201,3 +202,12 @@ gpii.app.openUSB = function() { }); }); }; + +/** + * Check if a file exists. + * @param {String} path to the file. + * @return {Boolean} `true` if the file exists. + */ +gpii.app.checkIfFileExists = function(file) { + return fs.existsSync(file); +}; diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 518e074bb..3adc1aa5f 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -771,17 +771,22 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { * @return {Object[]} An array of the loaded settings */ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPath) { - var loadedSettings = fluid.require(defaultSettingsPath), - result = {}; + if (gpii.app.checkIfFileExists(defaultSettingsPath)) { - fluid.each(loadedSettings.contexts["gpii-default"].preferences, function(value, path) { - var fixedPath = path.replace(/\./g, "\\."), - fixedValue = value; + var loadedSettings = fluid.require(defaultSettingsPath), + result = {}; - result[fixedPath] = { "value": fixedValue }; - }); + fluid.each(loadedSettings.contexts["gpii-default"].preferences, function(value, path) { + var fixedPath = path.replace(/\./g, "\\."), + fixedValue = value; + + result[fixedPath] = { "value": fixedValue }; + }); - return result; + return result; + } else { + return []; + } }; /** From 2ae50c3a6fda842864f9a704aadac0d1cdd26a02 Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Wed, 27 Mar 2019 23:01:25 +0200 Subject: [PATCH 009/116] NOJIRA: some checks --- src/main/gpiiConnector.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 3adc1aa5f..67f7e5e80 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -776,12 +776,15 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPat var loadedSettings = fluid.require(defaultSettingsPath), result = {}; - fluid.each(loadedSettings.contexts["gpii-default"].preferences, function(value, path) { - var fixedPath = path.replace(/\./g, "\\."), - fixedValue = value; + if (fluid.isValue(loadedSettings.contexts["gpii-default"].preferences)) { - result[fixedPath] = { "value": fixedValue }; - }); + fluid.each(loadedSettings.contexts["gpii-default"].preferences, function(value, path) { + var fixedPath = path.replace(/\./g, "\\."), + fixedValue = value; + + result[fixedPath] = { "value": fixedValue }; + }); + } return result; } else { From be964973c2f694c54366f2c01ff43046de0bd67f Mon Sep 17 00:00:00 2001 From: karadaliev Date: Tue, 9 Apr 2019 11:11:27 +0300 Subject: [PATCH 010/116] GPII-3819: Using %appdata% for the root part of the default setting's path --- siteconfig.json5 | 2 +- src/main/common/utils.js | 11 +++++++++++ src/main/gpiiConnector.js | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index d492bcb07..6706739ae 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -4,7 +4,7 @@ hideQssSaveButton: false, // File containing default values which are used after resetting user settings - defaultValues: "C:\\Users\\vagrant\\AppData\\Roaming\\gpii\\defaultSettings.json5", + defaultValues: "gpii\\defaultSettings.json5", // Configuration options for the QSS window qss: { diff --git a/src/main/common/utils.js b/src/main/common/utils.js index 726504607..3317708c3 100644 --- a/src/main/common/utils.js +++ b/src/main/common/utils.js @@ -211,3 +211,14 @@ gpii.app.openUSB = function() { gpii.app.checkIfFileExists = function(file) { return fs.existsSync(file); }; + +/** + * Uses environment's %appdata% variable and combines it with the data from the site config + * the result should be something like: + * C:\Users\vagrant\AppData\Roaming\gpii\defaultSettings.json5 + * @param {String} defaultSettingsPath + * @returns {String} + */ +gpii.app.compileAppDataPath = function(defaultSettingsPath) { + return process.env.appdata + "\\" + defaultSettingsPath; +}; diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 67f7e5e80..368a0e115 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -771,9 +771,10 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { * @return {Object[]} An array of the loaded settings */ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPath) { - if (gpii.app.checkIfFileExists(defaultSettingsPath)) { + var compiledPath = gpii.app.compileAppDataPath(defaultSettingsPath); - var loadedSettings = fluid.require(defaultSettingsPath), + if (gpii.app.checkIfFileExists(compiledPath)) { + var loadedSettings = fluid.require(compiledPath), result = {}; if (fluid.isValue(loadedSettings.contexts["gpii-default"].preferences)) { @@ -785,7 +786,6 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPat result[fixedPath] = { "value": fixedValue }; }); } - return result; } else { return []; From 0b1245d2056540fb8b7b10aa41afee3a1b02b5c1 Mon Sep 17 00:00:00 2001 From: karadaliev Date: Wed, 10 Apr 2019 14:12:03 +0300 Subject: [PATCH 011/116] GPII-3819: Using path.join to created the path; added comments and logs --- siteconfig.json5 | 2 ++ src/main/common/utils.js | 3 ++- src/main/gpiiConnector.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 6706739ae..bac460e10 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -4,6 +4,8 @@ hideQssSaveButton: false, // File containing default values which are used after resetting user settings + // the path its joined after %appdata%, so the end result its something similar to: + // C:\Users\vagrant\AppData\Roaming\gpii\defaultSettings.json5 defaultValues: "gpii\\defaultSettings.json5", // Configuration options for the QSS window diff --git a/src/main/common/utils.js b/src/main/common/utils.js index 3317708c3..3bad1f7cf 100644 --- a/src/main/common/utils.js +++ b/src/main/common/utils.js @@ -220,5 +220,6 @@ gpii.app.checkIfFileExists = function(file) { * @returns {String} */ gpii.app.compileAppDataPath = function(defaultSettingsPath) { - return process.env.appdata + "\\" + defaultSettingsPath; + const path = require('path'); + return path.join(process.env.appdata, defaultSettingsPath); }; diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 368a0e115..bcc11ee2c 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -788,6 +788,7 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPat } return result; } else { + fluid.log(fluid.logLevel.WARN, "loadDefaultSettings: Cannot find the settings file - " + compiledPath); return []; } }; From bc80b1bf6d7e677124a1744b8bb4965134d8d68f Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Sun, 14 Apr 2019 23:14:46 +0300 Subject: [PATCH 012/116] NOJIRA: added the correct path for defaultSettings.json to tests --- tests/fixtures/siteconfig.json5 | 2 +- tests/fixtures/siteconfigHandler.json5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fixtures/siteconfig.json5 b/tests/fixtures/siteconfig.json5 index 2fe2b70a2..59b62e4e7 100644 --- a/tests/fixtures/siteconfig.json5 +++ b/tests/fixtures/siteconfig.json5 @@ -13,5 +13,5 @@ alwaysOnTop: true }, surveyTriggersUrl: "http://localhost:8083/surveys/triggers.json", - defaultValues: "C:\\Users\\vagrant\\AppData\\Roaming\\gpii\\defaultSettings.json5" + defaultValues: "gpii\\defaultSettings.json5" } diff --git a/tests/fixtures/siteconfigHandler.json5 b/tests/fixtures/siteconfigHandler.json5 index 2a4e954b0..bbdfbf60e 100644 --- a/tests/fixtures/siteconfigHandler.json5 +++ b/tests/fixtures/siteconfigHandler.json5 @@ -9,5 +9,5 @@ keyedOut: "To save your settings you need to setup a Morphic Account." } }, - defaultValues: "C:\\Users\\vagrant\\AppData\\Roaming\\gpii\\defaultSettings.json5" + defaultValues: "gpii\\defaultSettings.json5" } From b2d5d6735286981e521b42273a9c95c1365dd3e5 Mon Sep 17 00:00:00 2001 From: krisYanachkov Date: Mon, 24 Jun 2019 16:19:34 +0300 Subject: [PATCH 013/116] NOJIRA: Addressing code review comment --- siteconfig.json5 | 2 +- src/main/gpiiConnector.js | 4 ++-- src/main/siteConfigurationHandler.js | 2 +- tests/fixtures/siteconfig.json5 | 2 +- tests/fixtures/siteconfigHandler.json5 | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index bac460e10..10ed4f746 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -6,7 +6,7 @@ // File containing default values which are used after resetting user settings // the path its joined after %appdata%, so the end result its something similar to: // C:\Users\vagrant\AppData\Roaming\gpii\defaultSettings.json5 - defaultValues: "gpii\\defaultSettings.json5", + defaultSettingsFileLocation: "gpii\\defaultSettings.json5", // Configuration options for the QSS window qss: { diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index bcc11ee2c..ee60dfa8e 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -770,7 +770,7 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { * @param {String} defaultSettingsPath - The path to the file containing the QSS * @return {Object[]} An array of the loaded settings */ -gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPath) { +gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettingsPath) { var compiledPath = gpii.app.compileAppDataPath(defaultSettingsPath); if (gpii.app.checkIfFileExists(compiledPath)) { @@ -779,7 +779,7 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function(defaultSettingsPat if (fluid.isValue(loadedSettings.contexts["gpii-default"].preferences)) { - fluid.each(loadedSettings.contexts["gpii-default"].preferences, function(value, path) { + fluid.each(loadedSettings.contexts["gpii-default"].preferences, function (value, path) { var fixedPath = path.replace(/\./g, "\\."), fixedValue = value; diff --git a/src/main/siteConfigurationHandler.js b/src/main/siteConfigurationHandler.js index a70b1708e..f3e96b5b8 100644 --- a/src/main/siteConfigurationHandler.js +++ b/src/main/siteConfigurationHandler.js @@ -102,7 +102,7 @@ fluid.defaults("gpii.app.siteConfigurationHandler", { target: "{app gpiiConnector}.options.defaultPreferences.systemDefaultLanguage" }, distributeDefaultSettingsPath: { - record: "{that}.options.siteConfig.defaultValues", + record: "{that}.options.siteConfig.defaultSettingsFileLocation", target: "{app gpiiConnector}.options.defaultPreferences.defaultSettingsPath" }, distributeSurveyTriggersUrl: { diff --git a/tests/fixtures/siteconfig.json5 b/tests/fixtures/siteconfig.json5 index 59b62e4e7..9c5a7fa1e 100644 --- a/tests/fixtures/siteconfig.json5 +++ b/tests/fixtures/siteconfig.json5 @@ -13,5 +13,5 @@ alwaysOnTop: true }, surveyTriggersUrl: "http://localhost:8083/surveys/triggers.json", - defaultValues: "gpii\\defaultSettings.json5" + defaultSettingsFileLocation: "./defaultSettings.json5" } diff --git a/tests/fixtures/siteconfigHandler.json5 b/tests/fixtures/siteconfigHandler.json5 index bbdfbf60e..0e814d57c 100644 --- a/tests/fixtures/siteconfigHandler.json5 +++ b/tests/fixtures/siteconfigHandler.json5 @@ -9,5 +9,5 @@ keyedOut: "To save your settings you need to setup a Morphic Account." } }, - defaultValues: "gpii\\defaultSettings.json5" + defaultSettingsFileLocation: "./defaultSettings.json5" } From 0a16c588898c717dd91ff9ce314e7a97ea2bfb65 Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 24 Jun 2019 22:44:52 +0100 Subject: [PATCH 014/116] GPII-3853: Logging tooltip show/hide --- src/main/metrics.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/metrics.js b/src/main/metrics.js index 51756bc03..fc8474d75 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -117,6 +117,10 @@ fluid.defaults("gpii.app.metrics", { "qssWidget": { "record": "gpii.app.metrics.qssWidget", "target": "{/ gpii.app.qssWidget}.options.gradeNames" + }, + "tooltip": { + "record": "gpii.app.metrics.qssTooltipDialog", + "target": "{/ gpii.app.qssTooltipDialog}.options.gradeNames" } } }); @@ -175,3 +179,22 @@ fluid.defaults("gpii.app.metrics.qssWidget", { } } }); + +/** Mix-in grade to provide metrics for QSS widgets */ +fluid.defaults("gpii.app.metrics.qssTooltipDialog", { + gradeNames: ["fluid.component"], + listeners: { + "onDialogShown.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: [ "tooltip-shown", { + path: "{that}.model.setting.path" + } ] + }, + "onDialogHidden.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: [ "tooltip-hidden", { + path: "{that}.model.setting.path" + } ] + } + } +}); From 0dfe4cbe1f125e99b0bb170f78f4c09f7b9706dc Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 24 Jun 2019 23:15:22 +0100 Subject: [PATCH 015/116] GPII-3853: Logging "Learn more" link clicks --- src/main/dialogs/quickSetStrip/qssWidgetDialog.js | 4 +++- src/main/metrics.js | 7 +++++++ src/renderer/qssWidget/js/qssWidget.js | 10 ++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js index 05293fc9a..2a057be09 100644 --- a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js +++ b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js @@ -108,7 +108,9 @@ fluid.defaults("gpii.app.qssWidget", { onQssWidgetCreated: "{qssWidget}.events.onQssWidgetCreated", // USB related events onQssOpenUsbRequested: null, - onQssUnmountUsbRequested: null + onQssUnmountUsbRequested: null, + onLearnMoreClicked: null + }, listeners: { onQssWidgetClosed: [{ diff --git a/src/main/metrics.js b/src/main/metrics.js index fc8474d75..6919248da 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -176,6 +176,13 @@ fluid.defaults("gpii.app.metrics.qssWidget", { args: [ "widget-hidden", { path: "{that}.model.setting.path" } ] + }, + "{channelListener}.events.onLearnMoreClicked": { + func: "{eventLog}.metrics.uiMetric", + args: [ "learnmore", { + path: "{that}.model.setting.path", + learnMoreLink: "{that}.model.setting.learnMoreLink" + } ] } } }); diff --git a/src/renderer/qssWidget/js/qssWidget.js b/src/renderer/qssWidget/js/qssWidget.js index 6ce7137c0..0406af61d 100644 --- a/src/renderer/qssWidget/js/qssWidget.js +++ b/src/renderer/qssWidget/js/qssWidget.js @@ -86,7 +86,9 @@ // USB related events onQssOpenUsbRequested: null, - onQssUnmountUsbRequested: null + onQssUnmountUsbRequested: null, + + onLearnMoreClicked: null }, sounds: {}, @@ -150,6 +152,9 @@ messages: { learnMore: "{qssWidget}.model.messages.learnMore" } + }, + listeners: { + "onClicked.learnMore": "{qssWidget}.events.onLearnMoreClicked" } } } @@ -221,7 +226,8 @@ onQssWidgetCreated: "{qssWidget}.events.onQssWidgetCreated", // USB buttons onQssOpenUsbRequested: "{qssWidget}.events.onQssOpenUsbRequested", - onQssUnmountUsbRequested: "{qssWidget}.events.onQssUnmountUsbRequested" + onQssUnmountUsbRequested: "{qssWidget}.events.onQssUnmountUsbRequested", + onLearnMoreClicked: "{qssWidget}.events.onLearnMoreClicked" } } } From 0236a53f323be0b15cc7df095255c15df8d51b93 Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 24 Jun 2019 23:19:13 +0100 Subject: [PATCH 016/116] GPII-3853: Documentation for new metrics --- src/main/metrics.js | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/metrics.js b/src/main/metrics.js index 6919248da..4b1bf4886 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -95,6 +95,34 @@ setting-changed: A setting has changed via a quick-strip widget } } +tooltip-shown: QS tooltip was shown +{ + "module": "metrics.app", + "event": "tooltip-shown", + "data": { + "path": "http://registry\\.gpii\\.net/common/language" + } +} + +tooltip-shown: QS tooltip was hidden +{ + "module": "metrics.app", + "event": "tooltip-shown", + "data": { + "path": "http://registry\\.gpii\\.net/common/language" + } +} + +learnMore: "Learn more" link was clicked +{ + "module": "metrics.app", + "event": "learnMore", + "data": { + "path": "http://registry\\.gpii\\.net/common/language", + "learnMoreLink": "https://morphic.world/help/qsshelp#language" + } +} + */ @@ -179,7 +207,7 @@ fluid.defaults("gpii.app.metrics.qssWidget", { }, "{channelListener}.events.onLearnMoreClicked": { func: "{eventLog}.metrics.uiMetric", - args: [ "learnmore", { + args: [ "learnMore", { path: "{that}.model.setting.path", learnMoreLink: "{that}.model.setting.learnMoreLink" } ] From b9ba278e7dd3a82d2fe94b692f5ba558dddb11be Mon Sep 17 00:00:00 2001 From: krisYanachkov Date: Tue, 25 Jun 2019 11:48:40 +0300 Subject: [PATCH 017/116] NOJIRA: Addressing code review comments --- siteconfig.json5 | 7 +++++-- src/main/common/utils.js | 10 +++++----- src/main/gpiiConnector.js | 14 +++++++++----- src/main/siteConfigurationHandler.js | 4 ++-- tests/fixtures/siteconfig.json5 | 4 +++- tests/fixtures/siteconfigHandler.json5 | 4 +++- 6 files changed, 27 insertions(+), 16 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 10ed4f746..6401dc0f3 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -5,8 +5,11 @@ // File containing default values which are used after resetting user settings // the path its joined after %appdata%, so the end result its something similar to: - // C:\Users\vagrant\AppData\Roaming\gpii\defaultSettings.json5 - defaultSettingsFileLocation: "gpii\\defaultSettings.json5", + // gpii\\defaultSettings.json5 + defaultSettingsData: { + relativePath: true, + fileLocation: "gpii\\defaultSettings.json5" + }, // Configuration options for the QSS window qss: { diff --git a/src/main/common/utils.js b/src/main/common/utils.js index 3bad1f7cf..b9790a025 100644 --- a/src/main/common/utils.js +++ b/src/main/common/utils.js @@ -195,7 +195,7 @@ gpii.app.isPointInRect = function (point, rectangle) { * In most cases, there's only a single USB drive. But if there's more than one USB drive, * then those that do not contain the token file are shown. */ -gpii.app.openUSB = function() { +gpii.app.openUSB = function () { gpii.windows.getUserUsbDrives().then(function (paths) { fluid.each(paths, function (path) { child_process.exec("explorer.exe \"" + path + "\""); @@ -205,10 +205,10 @@ gpii.app.openUSB = function() { /** * Check if a file exists. - * @param {String} path to the file. + * @param {String} file to the file. * @return {Boolean} `true` if the file exists. */ -gpii.app.checkIfFileExists = function(file) { +gpii.app.checkIfFileExists = function (file) { return fs.existsSync(file); }; @@ -219,7 +219,7 @@ gpii.app.checkIfFileExists = function(file) { * @param {String} defaultSettingsPath * @returns {String} */ -gpii.app.compileAppDataPath = function(defaultSettingsPath) { - const path = require('path'); +gpii.app.compileAppDataPath = function (defaultSettingsPath) { + var path = require("path"); return path.join(process.env.appdata, defaultSettingsPath); }; diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index ee60dfa8e..3a89f1888 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -41,7 +41,7 @@ fluid.defaults("gpii.app.gpiiConnector", { closeQssOnBlur: false, closePspOnBlur: true, disableRestartWarning: false, - defaultSettingsPath: null + defaultSettingsData: null }, events: { @@ -767,11 +767,14 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { /** * Retrieves synchronously the default QSS settings from a file on the local machine * folder. These are to be provided from the core in the future. - * @param {String} defaultSettingsPath - The path to the file containing the QSS + * @param {String} defaultSettings - The path to the file containing the QSS * @return {Object[]} An array of the loaded settings */ -gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettingsPath) { - var compiledPath = gpii.app.compileAppDataPath(defaultSettingsPath); +gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettings) { + var compiledPath = defaultSettings.fileLocation; + if (defaultSettings.relativePath) { + compiledPath = gpii.app.compileAppDataPath(defaultSettings.fileLocation); + } if (gpii.app.checkIfFileExists(compiledPath)) { var loadedSettings = fluid.require(compiledPath), @@ -786,6 +789,7 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettingsPa result[fixedPath] = { "value": fixedValue }; }); } + return result; } else { fluid.log(fluid.logLevel.WARN, "loadDefaultSettings: Cannot find the settings file - " + compiledPath); @@ -805,7 +809,7 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettingsPa * @return {Object} The decorated PSP channel message */ gpii.app.dev.gpiiConnector.qss.prepareMessageForQss = function (that, message) { - var loadedSettings = gpii.app.dev.gpiiConnector.qss.loadDefaultSettings(that.options.defaultPreferences.defaultSettingsPath), + var loadedSettings = gpii.app.dev.gpiiConnector.qss.loadDefaultSettings(that.options.defaultPreferences.defaultSettingsData), payload = message.payload || {}; if (gpii.app.gpiiConnector.isPrefSetUpdate(payload)) { diff --git a/src/main/siteConfigurationHandler.js b/src/main/siteConfigurationHandler.js index f3e96b5b8..0aeff3143 100644 --- a/src/main/siteConfigurationHandler.js +++ b/src/main/siteConfigurationHandler.js @@ -102,8 +102,8 @@ fluid.defaults("gpii.app.siteConfigurationHandler", { target: "{app gpiiConnector}.options.defaultPreferences.systemDefaultLanguage" }, distributeDefaultSettingsPath: { - record: "{that}.options.siteConfig.defaultSettingsFileLocation", - target: "{app gpiiConnector}.options.defaultPreferences.defaultSettingsPath" + record: "{that}.options.siteConfig.defaultSettingsData", + target: "{app gpiiConnector}.options.defaultPreferences.defaultSettingsData" }, distributeSurveyTriggersUrl: { record: "{that}.options.siteConfig.surveyTriggersUrl", diff --git a/tests/fixtures/siteconfig.json5 b/tests/fixtures/siteconfig.json5 index 9c5a7fa1e..845ade3ac 100644 --- a/tests/fixtures/siteconfig.json5 +++ b/tests/fixtures/siteconfig.json5 @@ -13,5 +13,7 @@ alwaysOnTop: true }, surveyTriggersUrl: "http://localhost:8083/surveys/triggers.json", - defaultSettingsFileLocation: "./defaultSettings.json5" + defaultSettingsData: { + fileLocation: "V:\\tests\\fixtures\\defaultSettings.json5" + } } diff --git a/tests/fixtures/siteconfigHandler.json5 b/tests/fixtures/siteconfigHandler.json5 index 0e814d57c..a8a5d458b 100644 --- a/tests/fixtures/siteconfigHandler.json5 +++ b/tests/fixtures/siteconfigHandler.json5 @@ -9,5 +9,7 @@ keyedOut: "To save your settings you need to setup a Morphic Account." } }, - defaultSettingsFileLocation: "./defaultSettings.json5" + defaultSettingsData: { + fileLocation: "V:\\tests\\fixtures\\defaultSettings123.json5" + } } From fa90dd11516edbd7932ac89151ada8d311499ecb Mon Sep 17 00:00:00 2001 From: krisYanachkov Date: Tue, 25 Jun 2019 12:56:23 +0300 Subject: [PATCH 018/116] NOJIRA: Addressing code review comments --- tests/fixtures/defaultSettings.json5 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tests/fixtures/defaultSettings.json5 diff --git a/tests/fixtures/defaultSettings.json5 b/tests/fixtures/defaultSettings.json5 new file mode 100644 index 000000000..c27fd9185 --- /dev/null +++ b/tests/fixtures/defaultSettings.json5 @@ -0,0 +1,12 @@ +{ + "contexts": { + "gpii-default": { + "preferences": { + "http://registry.gpii.net/common/language": "en-US", + "http://registry.gpii.net/common/DPIScale": 0, + "http://registry.gpii.net/common/highContrastTheme": "regular-contrast", + "http://registry.gpii.net/common/selfVoicing/enabled": false + } + } + } +} From 3429f8d282f3f004c82d35f1f82ebdfabf03e6fe Mon Sep 17 00:00:00 2001 From: karadaliev Date: Tue, 25 Jun 2019 15:01:04 +0300 Subject: [PATCH 019/116] GPII-3819: Clarifying the comments and lint --- siteconfig.json5 | 7 +++++-- src/main/common/utils.js | 8 ++++---- src/main/gpiiConnector.js | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index a2caeaa85..3956010ab 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -4,8 +4,11 @@ hideQssSaveButton: false, // File containing default values which are used after resetting user settings - // the path its joined after %appdata%, so the end result its something similar to: - // gpii\\defaultSettings.json5 + // if relativePath is true then fileLocation is joined after %appdata%, so the + // end result its something similar to: + // "C:\Users\vagrant\AppData\Roaming\gpii\defaultSettings.json5" + // if relativePath is false then fileLocation is assumed that its absolute path + // and no changes are done to it defaultSettingsData: { relativePath: true, fileLocation: "gpii\\defaultSettings.json5" diff --git a/src/main/common/utils.js b/src/main/common/utils.js index 77e519395..e87fa970c 100644 --- a/src/main/common/utils.js +++ b/src/main/common/utils.js @@ -334,10 +334,10 @@ gpii.app.checkIfFileExists = function (file) { * Uses environment's %appdata% variable and combines it with the data from the site config * the result should be something like: * C:\Users\vagrant\AppData\Roaming\gpii\defaultSettings.json5 - * @param {String} defaultSettingsPath - * @returns {String} + * @param {String} fileLocation - path to the file's location + * @return {String} - file location path joined with %appdata% */ -gpii.app.compileAppDataPath = function (defaultSettingsPath) { +gpii.app.compileAppDataPath = function (fileLocation) { var path = require("path"); - return path.join(process.env.appdata, defaultSettingsPath); + return path.join(process.env.appdata, fileLocation); }; diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 3a89f1888..ad83e9082 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -764,24 +764,34 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { } }); +/** + * An object containing information the default setting's location + * @typedef {Object} defaultSetting + * @property {Boolean} relativePath - true if the path should be joined with %appdata% + * @property {String} fileLocation - path to file's location + */ + /** * Retrieves synchronously the default QSS settings from a file on the local machine * folder. These are to be provided from the core in the future. - * @param {String} defaultSettings - The path to the file containing the QSS + * @param {defaultSetting} defaultSettings - data of the file's location * @return {Object[]} An array of the loaded settings */ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettings) { + // by default we are assuming the the fileLocation is absolute path var compiledPath = defaultSettings.fileLocation; if (defaultSettings.relativePath) { + // if the path is relative we join if to %appdata% compiledPath = gpii.app.compileAppDataPath(defaultSettings.fileLocation); } if (gpii.app.checkIfFileExists(compiledPath)) { + // file exists, so we try to load it var loadedSettings = fluid.require(compiledPath), result = {}; if (fluid.isValue(loadedSettings.contexts["gpii-default"].preferences)) { - + // the structure matches our assumption, going through the nodes and collect the data fluid.each(loadedSettings.contexts["gpii-default"].preferences, function (value, path) { var fixedPath = path.replace(/\./g, "\\."), fixedValue = value; From c096922714f3605027bc3fba05e2726b534b9ffd Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 25 Jun 2019 21:38:07 +0100 Subject: [PATCH 020/116] GPII-3853: Added calculation of duration between related events. --- src/main/metrics.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/metrics.js b/src/main/metrics.js index 4b1bf4886..1aa900505 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -127,7 +127,7 @@ learnMore: "Learn more" link was clicked /** - * Component that controls the tray widgets. + * Metrics for gpii-app */ fluid.defaults("gpii.app.metrics", { gradeNames: ["fluid.component"], @@ -139,17 +139,20 @@ fluid.defaults("gpii.app.metrics", { }, distributeOptions: { "qss": { - "record": "gpii.app.metrics.qssInWrapper", - "target": "{/ gpii.app.qssInWrapper}.options.gradeNames" + record: "gpii.app.metrics.qssInWrapper", + target: "{/ gpii.app.qssInWrapper}.options.gradeNames" }, "qssWidget": { - "record": "gpii.app.metrics.qssWidget", - "target": "{/ gpii.app.qssWidget}.options.gradeNames" + record: "gpii.app.metrics.qssWidget", + target: "{/ gpii.app.qssWidget}.options.gradeNames" }, "tooltip": { - "record": "gpii.app.metrics.qssTooltipDialog", - "target": "{/ gpii.app.qssTooltipDialog}.options.gradeNames" + record: "gpii.app.metrics.qssTooltipDialog", + target: "{/ gpii.app.qssTooltipDialog}.options.gradeNames" } + }, + durationEvents: { + "tooltip-shown": "tooltip-hidden" } }); From f506b566e7eda5cbf62f642ffe0f4ecf754d8b78 Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 26 Jun 2019 20:23:29 +0100 Subject: [PATCH 021/116] GPII-3853: Recording clicks of desktop icons --- main.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 28ca8d588..1be80b2ff 100644 --- a/main.js +++ b/main.js @@ -44,9 +44,17 @@ app.disableHardwareAcceleration(); // the second one will be closed and the callback provided to `app.makeSingleInstance` // in the first instance will be triggered enabling it to show the PSP `BrowserWindow`. app.on("second-instance", function (event, commandLine) { + var reset = commandLine.indexOf("--reset") > -1; + + // Log this metric + var eventLog = fluid.queryIoCSelector(fluid.rootComponent, "gpii.eventLog")[0]; + if (eventLog) { + eventLog.logEvent("startup", reset ? "reset" : "open", {commandLine: commandLine}); + } + var qssWrapper = fluid.queryIoCSelector(fluid.rootComponent, "gpii.app.qssWrapper")[0]; qssWrapper.qss.show(); - if (commandLine.indexOf("--reset") > -1) { + if (reset) { setTimeout(function () { // GPII-3455: Call this in another execution stack, to allow electron to free some things, otherwise an // error of a COM object being accessed in the wrong thread is raised - but that doesn't appear to be From f3f3e1b295746ae92f9a6570c499f58675eeb87a Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 26 Jun 2019 21:13:00 +0100 Subject: [PATCH 022/116] GPII-3853: Updated metrics documentation --- src/main/metrics.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/metrics.js b/src/main/metrics.js index 1aa900505..7b62c49ef 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -123,6 +123,25 @@ learnMore: "Learn more" link was clicked } } +reset: The reset to standard desktop icon was clicked: +{ + "module": "startup", + "event": "reset", + "data": { + "commandLine": "morphic-app.exe --reset" + } +} + +open: The show Morphic desktop link was clicked: +{ + "module": "startup", + "event": "open", + "data": { + "commandLine": "morphic-app.exe" + } +} + + */ From 1829ce3f315d354985453b35a32abad2c1fa9077 Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 26 Jun 2019 22:29:37 +0100 Subject: [PATCH 023/116] GPII-3853: added widget shown duration --- src/main/metrics.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/metrics.js b/src/main/metrics.js index 7b62c49ef..ee33b3ff2 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -27,13 +27,14 @@ The following events are captured: qss-shown: The quick-strip was shown. { "module":"metrics.app", - "event":"qss-shown", + "event":"qss-shown" } qss-hidden: The quick-strip was hidden. { "module":"metrics.app", "event":"qss-hidden", + "data": { duration: 56 } } button-focused: A button on the quick-strip has been focused. @@ -82,6 +83,7 @@ widget-hidden: A qss widget is closed "event":"widget-hidden", "data": { "path":"appTextZoom" + "duration": 15 } } @@ -107,9 +109,10 @@ tooltip-shown: QS tooltip was shown tooltip-shown: QS tooltip was hidden { "module": "metrics.app", - "event": "tooltip-shown", + "event": "tooltip-hidden", "data": { "path": "http://registry\\.gpii\\.net/common/language" + "duration": 10 } } @@ -171,7 +174,9 @@ fluid.defaults("gpii.app.metrics", { } }, durationEvents: { - "tooltip-shown": "tooltip-hidden" + "tooltip-shown": "tooltip-hidden", + "qss-shown": "qss-hidden", + "widget-shown": "widget-hidden" } }); From eed1e8bd1a4e97b146b7e13e048eee311401df4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 28 Jun 2019 12:38:29 +0200 Subject: [PATCH 024/116] GPII-3997: Optionally include documorph merge module into the installer --- provisioning/Installer.ps1 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/provisioning/Installer.ps1 b/provisioning/Installer.ps1 index 83284d5b1..8599f0c7a 100644 --- a/provisioning/Installer.ps1 +++ b/provisioning/Installer.ps1 @@ -14,8 +14,8 @@ $projectDir = (Get-Item $provisioningDir).parent.FullName Import-Module (Join-Path $provisioningDir 'Provisioning.psm1') -Force -$installerRepo = "https://github.com/GPII/gpii-wix-installer" -$installerBranch = "HST" +$installerRepo = "https://github.com/javihernandez/gpii-wix-installer" +$installerBranch = "GPII-3997" # Obtaining useful tools location. $installerDir = Join-Path $env:SystemDrive "installer" # a.k.a. C:\installer\ @@ -43,6 +43,12 @@ if (Test-Path -Path $installerDir){ } Invoke-Command $git "clone --branch $($installerBranch) $($installerRepo) $($installerDir)" +# Place documorph inside the installer directory, if it's here. +$documorphFile = (Join-Path $provisioningDir 'documorph.msm') +if (Test-Path $documorphFile) { + Copy-Item $documorphFile $installerDir +} + # Place filebeat inside the installer directory, if it's here. $filebeatFile = (Join-Path $provisioningDir 'filebeat.msm') if (Test-Path $filebeatFile) { From 240a001715b40638bff04bae0c8e25474b4c3ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 28 Jun 2019 12:39:53 +0200 Subject: [PATCH 025/116] GPII-3997: Updated path to docuMorphExecutable in siteconfig.json5 --- siteconfig.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 2dabecc9d..7fc4b6c31 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -56,7 +56,7 @@ ], // the path to the DocuMorph's executable file, used in the service buttons - docuMorphExecutable: "C:\\Windows\\system32\\notepad.exe" + docuMorphExecutable: "C:\\Program Files (x86)\\Morphic\\documorph\\DocuMorph.Widget.exe" }, // Configuration options for the PSP window From 80c49fc5df83c44a69990e31a682024dd8304bfd Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 1 Jul 2019 22:10:15 +0100 Subject: [PATCH 026/116] GPII-3853: Recording tray icon clicks. --- src/main/metrics.js | 30 ++++++++++++++++++++++++++++++ src/main/tray.js | 4 +++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/main/metrics.js b/src/main/metrics.js index ee33b3ff2..26e8dde01 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -144,6 +144,14 @@ open: The show Morphic desktop link was clicked: } } +tray-icon: The tray icon was clicked +{ + "module":"metrics.app", + "event":"setting-changed", + "data":{ + "menu": true // optional: true of icon was right-clicked. + } +} */ @@ -206,6 +214,28 @@ fluid.defaults("gpii.app.metrics.qssInWrapper", { func: "{eventLog}.metrics.uiMetric", args: [ "qss-hidden" ] } + }, + components: { + trayListener: { + createOnEvent: "{app}.events.onPSPReady", + type: "fluid.component", + options: { + listeners: { + "{gpii.app}.tray.events.onTrayIconClicked": { + func: "{eventLog}.metrics.uiMetric", + args: [ "tray-icon" ] + }, + "{gpii.app}.tray.events.onTrayIconMenuShown": { + func: "{eventLog}.metrics.uiMetric", + args: [ "button-activated", { + buttonPath: "{arguments}.0.path", + key: "{arguments}.2.key", + mouse: "{arguments}.2.type" + } ] + } + } + } + } } }); diff --git a/src/main/tray.js b/src/main/tray.js index bfe939cfe..369fdc94a 100644 --- a/src/main/tray.js +++ b/src/main/tray.js @@ -45,7 +45,8 @@ fluid.defaults("gpii.app.tray", { events: { onActivePreferenceSetAltered: null, // passed from parent onMenuUpdated: null, - onTrayIconClicked: null + onTrayIconClicked: null, + onTrayIconMenuShown: null }, model: { isKeyedIn: false, @@ -364,6 +365,7 @@ gpii.app.trayButton.windowMessage = function (that, hwnd, msg, wParam) { case gpii.app.trayButton.notifications.showMenu: if (that.menu) { + that.events.onTrayIconMenuShown.fire(); that.menu.popup({}); } break; From ec0913c22ea6406cbd88fac708a8f27c832b9080 Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 1 Jul 2019 22:11:29 +0100 Subject: [PATCH 027/116] GPII-3853: Recording the state of the QSS. --- src/main/metrics.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/metrics.js b/src/main/metrics.js index 26e8dde01..f8757e410 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -213,6 +213,14 @@ fluid.defaults("gpii.app.metrics.qssInWrapper", { "onDialogHidden.metrics": { func: "{eventLog}.metrics.uiMetric", args: [ "qss-hidden" ] + }, + "onDialogShown.logState": { + func: "{eventLog}.setState", + args: [ "qss", "open" ] + }, + "onDialogHidden.logState": { + func: "{eventLog}.setState", + args: [ "qss" ] } }, components: { From 55ec8f7497102051113229d5d732226aa53807a1 Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 1 Jul 2019 22:56:58 +0100 Subject: [PATCH 028/116] GPII-3853: Recording which qss button is focused and hovered over --- src/main/metrics.js | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/metrics.js b/src/main/metrics.js index f8757e410..6ec04c944 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -192,13 +192,20 @@ fluid.defaults("gpii.app.metrics", { fluid.defaults("gpii.app.metrics.qssInWrapper", { gradeNames: ["fluid.component"], listeners: { - "{channelListener}.events.onQssButtonFocused": { + "{channelListener}.events.onQssButtonFocused": [{ + namespace: "metric", func: "{eventLog}.metrics.uiMetric", args: [ "button-focused", { buttonPath: "{arguments}.0.path" } ] - }, + }, { + priority: "before:metric", + namespace: "metrics-state", + func: "{eventLog}.setState", + args: [ "focus", "{arguments}.0.path" ] + }], "{channelListener}.events.onQssButtonActivated": { + namespace: "metrics", func: "{eventLog}.metrics.uiMetric", args: [ "button-activated", { buttonPath: "{arguments}.0.path", @@ -206,6 +213,21 @@ fluid.defaults("gpii.app.metrics.qssInWrapper", { mouse: "{arguments}.2.type" } ] }, + "{channelListener}.events.onQssButtonMouseEnter": { + namespace: "metric-state", + func: "{eventLog}.setState", + args: [ "hover", "{arguments}.0.path" ] + }, + "{channelListener}.events.onQssButtonMouseLeave": { + namespace: "metric-state", + func: "{eventLog}.setState", + args: [ "hover" ] + }, + "{channelListener}.events.onQssButtonsFocusLost": { + namespace: "metric-state", + func: "{eventLog}.setState", + args: [ "focus" ] + }, "onDialogShown.metrics": { func: "{eventLog}.metrics.uiMetric", args: [ "qss-shown" ] From a4bdf7f807f1c81ad92054f6228ec88178886fd1 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 2 Jul 2019 13:23:43 +0100 Subject: [PATCH 029/116] GPII-3853: Disabling metrics via siteConfig --- siteconfig.json5 | 9 ++++++++- src/main/siteConfigurationHandler.js | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 2d9c7f3aa..98a2d1982 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -109,5 +109,12 @@ surveyTriggersUrl: "http://survey.gpii.net/survey-triggers.json", // The type of widget to use in the task bar - "gpii.app.trayButton", "gpii.app.trayIcon", or both. - trayType: ["gpii.app.trayButton"] + trayType: ["gpii.app.trayButton"], + + metrics: { + // Can be true to disable everything, or "errors-only" to only capture errors. + disable: false, + // true to disable capturing key/mouse timings + disableInput: false + } } diff --git a/src/main/siteConfigurationHandler.js b/src/main/siteConfigurationHandler.js index aa634f004..e83366959 100644 --- a/src/main/siteConfigurationHandler.js +++ b/src/main/siteConfigurationHandler.js @@ -108,6 +108,10 @@ fluid.defaults("gpii.app.siteConfigurationHandler", { distributeTrayType: { record: "{that}.options.siteConfig.trayType", target: "{app tray}.options.trayType" + }, + distributeMetrics: { + record: "{that}.options.siteConfig.metrics", + target: "{/ gpii.app.metrics}.options.siteConfig" } } }); From 5987ea1dbbe1ee8bc5aee654551d60dd2018704e Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 2 Jul 2019 13:34:47 +0100 Subject: [PATCH 030/116] GPII-3853: Added 'site' to siteConfig --- siteconfig.json5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/siteconfig.json5 b/siteconfig.json5 index 98a2d1982..1d457dcc7 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -1,4 +1,7 @@ { + // Unique identifier for the deployment. + site: "default.gpii.net", + // Whether to hide the QSS save button. // `true` if the button should be hidden and `false` otherwise. hideQssSaveButton: false, From 4eaf882dc3a6f1be0500076c6e13787705bf6ff8 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 2 Jul 2019 13:50:52 +0100 Subject: [PATCH 031/116] GPII-3853: Logging the site id --- src/main/metrics.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/metrics.js b/src/main/metrics.js index 6ec04c944..0d16c0ae3 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -192,6 +192,10 @@ fluid.defaults("gpii.app.metrics", { fluid.defaults("gpii.app.metrics.qssInWrapper", { gradeNames: ["fluid.component"], listeners: { + "onCreate.logSite": { + func: "{eventLog}.metrics.uiMetric", + args: [ "site-id", "{siteConfigurationHandler}.options.siteConfig.site" ] + }, "{channelListener}.events.onQssButtonFocused": [{ namespace: "metric", func: "{eventLog}.metrics.uiMetric", From 986c60bf61d566636ad815551442997b584d17c9 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 2 Jul 2019 15:11:39 +0100 Subject: [PATCH 032/116] GPII-3853: Updating package reference to related branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d24158671..0377d00be 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "0.3.0-dev.20190529T130556Z.9a9482e", + "gpii-windows": "stegru/windows#GPII-3853", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From f3854af3aed6c26ac063827502b20b111195825c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 3 Jul 2019 01:57:34 +0200 Subject: [PATCH 033/116] GPII-4004: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 50aeefcfc..0bde15514 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "stegru/windows#GPII-3927", + "gpii-windows": "javihernandez/windows#38fab7d2e305d773ed9ae8f71a6f9b69ddbb455d", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From e8a1fbc048a23055546d08ef05aac2d4d85ff90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 3 Jul 2019 02:08:53 +0200 Subject: [PATCH 034/116] GPII-4004: Updated service.json5 to use prd config and prd cloud --- provisioning/service.json5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioning/service.json5 b/provisioning/service.json5 index bdbbf4111..4626f2ec7 100644 --- a/provisioning/service.json5 +++ b/provisioning/service.json5 @@ -7,8 +7,8 @@ "autoRestart": true, "disabled": false, env: { - //NODE_ENV: "app.testing" - GPII_CLOUD_URL: "https://flowmanager.stg.gcp.gpii.net" + NODE_ENV: "app.production", + GPII_CLOUD_URL: "https://flowmanager.prd.gcp.gpii.net" } } }, From 0b67c88931f9c1d721c598f4e534a67225b7a703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 3 Jul 2019 02:26:13 +0200 Subject: [PATCH 035/116] GPII-4004: Updated gpii-wix-installer reference in Installer.ps1 --- provisioning/Build.ps1 | 2 +- provisioning/Installer.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioning/Build.ps1 b/provisioning/Build.ps1 index d4e78fb97..0ca9a8b01 100644 --- a/provisioning/Build.ps1 +++ b/provisioning/Build.ps1 @@ -30,7 +30,7 @@ Import-Module $bootstrapModule -Verbose -Force # # Run all the windows provisioning scripts # ############ # TODO: Create function for downloading scripts and executing them. -$windowsBootstrapURL = "https://raw.githubusercontent.com/javihernandez/windows/GPII-3744/provisioning" +$windowsBootstrapURL = "https://raw.githubusercontent.com/GPII/windows/master/provisioning" try { $choco = Join-Path $originalBuildScriptPath "Chocolatey.ps1" Write-OutPut "Running windows script: $choco" diff --git a/provisioning/Installer.ps1 b/provisioning/Installer.ps1 index 62f578eae..0f25960d7 100644 --- a/provisioning/Installer.ps1 +++ b/provisioning/Installer.ps1 @@ -15,7 +15,7 @@ $projectDir = (Get-Item $provisioningDir).parent.FullName Import-Module (Join-Path $provisioningDir 'Provisioning.psm1') -Force $installerRepo = "https://github.com/javihernandez/gpii-wix-installer" -$installerBranch = "GPII-3997" +$installerBranch = "GPII-4004" # Obtaining useful tools location. $installerDir = Join-Path $env:SystemDrive "installer" # a.k.a. C:\installer\ From 7a2b7156bc999bca91b6cc55b120fe28035c7dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 3 Jul 2019 02:32:33 +0200 Subject: [PATCH 036/116] GPII-4004: Bumped version to 1.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bde15514..c5d34c161 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.0.1", + "version": "1.2.0", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { From d7c79e57a9b72811d5b0602acb0767193c0de221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 4 Jul 2019 17:43:34 +0200 Subject: [PATCH 037/116] GPII-4004: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c5d34c161..c24ed05e4 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#38fab7d2e305d773ed9ae8f71a6f9b69ddbb455d", + "gpii-windows": "javihernandez/windows#cc1b7ed1e98c09b660647e6673fced1926fca49d", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From 1516c779285df489b4f49ce43ff356cca822b6fc Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 5 Jul 2019 17:19:38 +0100 Subject: [PATCH 038/116] GPII-3853: Capturing focus/hover state of widget components. --- .../dialogs/quickSetStrip/qssWidgetDialog.js | 4 +- src/main/metrics.js | 13 ++- src/renderer/qssWidget/index.html | 1 + src/renderer/qssWidget/js/metrics.js | 98 +++++++++++++++++++ src/renderer/qssWidget/js/qssWidget.js | 22 ++++- 5 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 src/renderer/qssWidget/js/metrics.js diff --git a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js index a7e80c094..5293bd93c 100644 --- a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js +++ b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js @@ -110,7 +110,9 @@ fluid.defaults("gpii.app.qssWidget", { onQssOpenUsbRequested: null, onQssUnmountUsbRequested: null, onQssGetVolumeRequested: null, - onLearnMoreClicked: null + onLearnMoreClicked: null, + onMetric: null, + onMetricState: null }, listeners: { diff --git a/src/main/metrics.js b/src/main/metrics.js index 0d16c0ae3..e37ebc8d5 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -296,12 +296,15 @@ fluid.defaults("gpii.app.metrics.qssWidget", { path: "{that}.model.setting.path" } ] }, - "{channelListener}.events.onLearnMoreClicked": { + "{channelListener}.events.onMetric": { + namespace: "metric", func: "{eventLog}.metrics.uiMetric", - args: [ "learnMore", { - path: "{that}.model.setting.path", - learnMoreLink: "{that}.model.setting.learnMoreLink" - } ] + args: [ "{arguments}.0", "{arguments}.1" ] + }, + "{channelListener}.events.onMetricState": { + namespace: "metrics-state", + func: "{eventLog}.setState", + args: [ "{arguments}.0", "{arguments}.1" ] } } }); diff --git a/src/renderer/qssWidget/index.html b/src/renderer/qssWidget/index.html index a6638eb41..5e9484063 100644 --- a/src/renderer/qssWidget/index.html +++ b/src/renderer/qssWidget/index.html @@ -25,6 +25,7 @@ + diff --git a/src/renderer/qssWidget/js/metrics.js b/src/renderer/qssWidget/js/metrics.js new file mode 100644 index 000000000..fae3a3504 --- /dev/null +++ b/src/renderer/qssWidget/js/metrics.js @@ -0,0 +1,98 @@ +/** + * Metrics for the renderer + * + * Copyright 2019 Raising the Floor - International + * + * 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 + */ + +/* global fluid */ + +"use strict"; + +(function (fluid) { + var gpii = fluid.registerNamespace("gpii"); + + // Mix-in grade for components whose hover/focus state should be captured for metrics. + fluid.defaults("gpii.psp.metrics", { + gradeNames: ["gpii.app.hoverable"], + members: { + metricsID: "@expand:fluid.identity({that}.container.selectorName)" + }, + invokers: { + metric: { + func: "{channelNotifier}.events.onMetric.fire", + args: ["{arguments}.0", "{arguments}.1"] + }, + setState: { + func: "{channelNotifier}.events.onMetricState.fire", + args: ["{arguments}.0", "{arguments}.1"] + } + }, + listeners: { + "onCreate.getId": { + funcName: "gpii.psp.metrics.getMetricsID", + args: ["{that}", "{that}.model.item"] + }, + "onCreate.addFocusHandlers": { + funcName: "gpii.psp.metrics.addFocusHandlers", + args: ["{that}", "{that}.container"] + }, + "onMouseEnter.metricsState": { + func: "{that}.setState", + args: ["widget-hover", "{that}.metricsID"] + }, + "onMouseLeave.metricsState": { + func: "{that}.setState", + args: ["widget-hover"] + } + } + }); + + /** + * Gets a static string which is used to identify this component in metrics. The default value is the container's + * selectorName, which is fit for purpose, however it's not available for dynamically generated components. + * + * @param {Component} that The gpii.psp.metrics instance. + * @param {Object} modelItem [optional] The item member of the component's model. + * @return {String} A string to identify this component, in human readable form. + */ + gpii.psp.metrics.getMetricsID = function (that, modelItem) { + if (that.metricsID === undefined) { + if (modelItem) { + that.metricsID = fluid.firstDefined(modelItem.key, modelItem.indicatorValue); + } + if (that.metricsID === undefined) { + fluid.log("Unable to get metricsID for " + that.typeName); + that.metricsID = that.typeName; + } + } + + return that.metricsID; + }; + + /** + * Adds the focus and blur handlers to the container, so the metrics core can keep an eye on what's currently + * focused. + * + * @param {Component} that The gpii.psp.metrics instance. + * @param {jQuery} container A jQuery object representing the component's container. + * + */ + gpii.psp.metrics.addFocusHandlers = function (that, container) { + container.on("focus", function () { + that.setState("widget-focus", that.metricsID); + that.metric("widget-focus", that.metricsID); + }); + container.on("blur", function () { + that.metric("widget-unfocus", that.metricsID); + that.setState("widget-focus"); + }); + }; + +})(fluid, jQuery); diff --git a/src/renderer/qssWidget/js/qssWidget.js b/src/renderer/qssWidget/js/qssWidget.js index a03999820..e2cd17204 100644 --- a/src/renderer/qssWidget/js/qssWidget.js +++ b/src/renderer/qssWidget/js/qssWidget.js @@ -59,6 +59,20 @@ volume: ".flc-qssVolumeWidget" }, + distributeOptions: { + "clickable": { + target: "{that gpii.app.clickable}.options.gradeNames", + record: "gpii.psp.metrics" + }, + "button": { + target: "{that gpii.psp.widgets.button}.options.gradeNames", + record: "gpii.psp.metrics" + }, + "switch": { + target: "{that gpii.psp.widgets.switch}.options.gradeNames", + record: "gpii.psp.metrics" + } + }, /** * The last part of each grade name should be the name of the selector identifying * the container for the widget. @@ -93,7 +107,9 @@ // Volume & Mute related event onQssGetVolumeRequested: null, - onLearnMoreClicked: null + onLearnMoreClicked: null, + onMetric: null, + onMetricState: null }, sounds: {}, @@ -235,7 +251,9 @@ onQssUnmountUsbRequested: "{qssWidget}.events.onQssUnmountUsbRequested", // Volume button onQssGetVolumeRequested: "{qssWidget}.events.onQssGetVolumeRequested", - onLearnMoreClicked: "{qssWidget}.events.onLearnMoreClicked" + onLearnMoreClicked: "{qssWidget}.events.onLearnMoreClicked", + onMetric: "{qssWidget}.events.onMetric", + onMetricState: "{qssWidget}.events.onMetricState" } } } From d919952e0288a8833216b65393bb535348a86593 Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 5 Jul 2019 17:29:14 +0100 Subject: [PATCH 039/116] GPII-3853: Wrapped component ID into eventData object. --- src/renderer/qssWidget/js/metrics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/qssWidget/js/metrics.js b/src/renderer/qssWidget/js/metrics.js index fae3a3504..8a40c3ec0 100644 --- a/src/renderer/qssWidget/js/metrics.js +++ b/src/renderer/qssWidget/js/metrics.js @@ -87,10 +87,10 @@ gpii.psp.metrics.addFocusHandlers = function (that, container) { container.on("focus", function () { that.setState("widget-focus", that.metricsID); - that.metric("widget-focus", that.metricsID); + that.metric("widget-focus", {id: that.metricsID}); }); container.on("blur", function () { - that.metric("widget-unfocus", that.metricsID); + that.metric("widget-unfocus", {id: that.metricsID}); that.setState("widget-focus"); }); }; From e7ee23c5a534949d8af4cfd4bd5970a5295a0bc6 Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 5 Jul 2019 17:31:12 +0100 Subject: [PATCH 040/116] GPII-3853: Removed onLearnMoreClicked event (this is captured in another way) --- src/main/dialogs/quickSetStrip/qssWidgetDialog.js | 1 - src/main/metrics.js | 10 ---------- src/renderer/qssWidget/js/qssWidget.js | 5 ----- 3 files changed, 16 deletions(-) diff --git a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js index 5293bd93c..1b8d862c5 100644 --- a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js +++ b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js @@ -110,7 +110,6 @@ fluid.defaults("gpii.app.qssWidget", { onQssOpenUsbRequested: null, onQssUnmountUsbRequested: null, onQssGetVolumeRequested: null, - onLearnMoreClicked: null, onMetric: null, onMetricState: null diff --git a/src/main/metrics.js b/src/main/metrics.js index e37ebc8d5..9eeb4d18b 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -116,16 +116,6 @@ tooltip-shown: QS tooltip was hidden } } -learnMore: "Learn more" link was clicked -{ - "module": "metrics.app", - "event": "learnMore", - "data": { - "path": "http://registry\\.gpii\\.net/common/language", - "learnMoreLink": "https://morphic.world/help/qsshelp#language" - } -} - reset: The reset to standard desktop icon was clicked: { "module": "startup", diff --git a/src/renderer/qssWidget/js/qssWidget.js b/src/renderer/qssWidget/js/qssWidget.js index e2cd17204..74b30625a 100644 --- a/src/renderer/qssWidget/js/qssWidget.js +++ b/src/renderer/qssWidget/js/qssWidget.js @@ -107,7 +107,6 @@ // Volume & Mute related event onQssGetVolumeRequested: null, - onLearnMoreClicked: null, onMetric: null, onMetricState: null }, @@ -174,9 +173,6 @@ messages: { learnMore: "{qssWidget}.model.messages.learnMore" } - }, - listeners: { - "onClicked.learnMore": "{qssWidget}.events.onLearnMoreClicked" } } } @@ -251,7 +247,6 @@ onQssUnmountUsbRequested: "{qssWidget}.events.onQssUnmountUsbRequested", // Volume button onQssGetVolumeRequested: "{qssWidget}.events.onQssGetVolumeRequested", - onLearnMoreClicked: "{qssWidget}.events.onLearnMoreClicked", onMetric: "{qssWidget}.events.onMetric", onMetricState: "{qssWidget}.events.onMetricState" } From 4270c84f43b8b9034539f6bbac5cf4c11fafe356 Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 5 Jul 2019 17:55:06 +0100 Subject: [PATCH 041/116] GPII-3853: Updated comments. --- src/main/metrics.js | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/src/main/metrics.js b/src/main/metrics.js index 9eeb4d18b..37eb21370 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -27,14 +27,18 @@ The following events are captured: qss-shown: The quick-strip was shown. { "module":"metrics.app", - "event":"qss-shown" + "event":"qss-shown", + "qss": "open" // This will be present in all subsequent messages, until it is closed. + "app": "active" // This will be present in all subsequent messages, only when the QSS (or any other morphic window) + // is the active window. } qss-hidden: The quick-strip was hidden. { "module":"metrics.app", "event":"qss-hidden", - "data": { duration: 56 } + "data": { duration: 56 } // how long it was shown for + "qss": "open" // This will be removed in all subsequent messages, until it is re-opened. } button-focused: A button on the quick-strip has been focused. @@ -42,8 +46,12 @@ button-focused: A button on the quick-strip has been focused. "module": "metrics.app", "event": "button-focused", "data": { - "buttonPath":"undo" - } + "buttonPath":"openUSB" + }, + "focus": "openUSB" // This will be present in all subsequent messages, while this button has the focus or while + // the widget window is open. Note that this may still be present even when the qss has lost + // focus or hidden. Combine with the "qss" and "app" fields for accuracy. + "hover": "openUSB" // this will be added to all subsequent events, while the mouse is over it. } button-activated: A quick-strip button has been actioned. @@ -83,10 +91,31 @@ widget-hidden: A qss widget is closed "event":"widget-hidden", "data": { "path":"appTextZoom" - "duration": 15 + "duration": 15 // how long it was shown for } } +widget-focus: A component within a widget has gained focus +{ + "module": "metrics.app", + "event": "widget-focus", + "data": { + "id": "en-US" + }, + "widget-focus": "en-US" // this will be added to all subsequent events, until it loses focus. + "widget-hover": "en-US" // this will be added to all subsequent events, while the mouse is over it. +} + +widget-unfocus: A component within a widget has lost focus +{ + "module": "metrics.app", + "event": "widget-unfocus", + "data": { + "id": "learnMoreLink" + } + "widget-focus": "learnMoreLink" // this will not be present in subsequent events, until another gains focus. +} + setting-changed: A setting has changed via a quick-strip widget { "module":"metrics.app", @@ -174,7 +203,8 @@ fluid.defaults("gpii.app.metrics", { durationEvents: { "tooltip-shown": "tooltip-hidden", "qss-shown": "qss-hidden", - "widget-shown": "widget-hidden" + "widget-shown": "widget-hidden", + "widget-focus": "widget-unfocus" } }); @@ -231,10 +261,12 @@ fluid.defaults("gpii.app.metrics.qssInWrapper", { args: [ "qss-hidden" ] }, "onDialogShown.logState": { + priority: "before:metrics", func: "{eventLog}.setState", args: [ "qss", "open" ] }, "onDialogHidden.logState": { + priority: "after:metrics", func: "{eventLog}.setState", args: [ "qss" ] } From dee34b220a485ea94acaa2b898349cd1a1a5a14c Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 5 Jul 2019 23:30:34 +0100 Subject: [PATCH 042/116] GPII-3853: Added required event to test component. --- tests/TrayButtonTests.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/TrayButtonTests.js b/tests/TrayButtonTests.js index 24296344a..e8e45272e 100644 --- a/tests/TrayButtonTests.js +++ b/tests/TrayButtonTests.js @@ -112,7 +112,8 @@ jqUnit.asyncTest("Testing tray button", function () { var trayButton = gpii.app.trayButton({ events: { onMenuUpdated: null, - onTrayIconClicked: null + onTrayIconClicked: null, + onTrayIconMenuShown: null }, listeners: { onMenuUpdated: { From 7475e6b0075c668fadbdd64e9f7d3a14751d1285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Sat, 6 Jul 2019 00:45:20 +0200 Subject: [PATCH 043/116] GPII-4004: Updated windows reference Which includes a fix for GPII-4005 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c24ed05e4..739a486bd 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#cc1b7ed1e98c09b660647e6673fced1926fca49d", + "gpii-windows": "javihernandez/windows#60f764552761462ef0e0a2c8cc46b3fab61e6a1c", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From f4e62a1f8fb2dca7f144d882d7a7e1d8e2387550 Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 8 Jul 2019 21:59:07 +0100 Subject: [PATCH 044/116] GPII-3853: Updated gpii-windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 739a486bd..98e5bceca 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#60f764552761462ef0e0a2c8cc46b3fab61e6a1c", + "gpii-windows": "stegru/windows#GPII-3853", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From d8f6e426ba27d96f43d9dac85a073598f779ad65 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 9 Jul 2019 16:11:31 +0100 Subject: [PATCH 045/116] GPII-3853: Added metrics for notification and error dialogs --- src/main/dialogs/errorDialog.js | 5 +- .../quickSetStrip/qssNotificationDialog.js | 4 +- .../dialogs/quickSetStrip/qssWidgetDialog.js | 1 + src/main/metrics.js | 82 ++++++++++++++++++- .../{qssWidget => common}/js/metrics.js | 68 +++++++++++++-- src/renderer/errorDialog/index.html | 2 + src/renderer/errorDialog/js/errorDialog.js | 8 +- src/renderer/qssNotification/index.html | 2 + .../qssNotification/js/qssNotification.js | 7 +- src/renderer/qssWidget/index.html | 3 +- src/renderer/qssWidget/js/qssWidget.js | 21 +---- 11 files changed, 167 insertions(+), 36 deletions(-) rename src/renderer/{qssWidget => common}/js/metrics.js (61%) diff --git a/src/main/dialogs/errorDialog.js b/src/main/dialogs/errorDialog.js index 426d210af..1ed01a320 100644 --- a/src/main/dialogs/errorDialog.js +++ b/src/main/dialogs/errorDialog.js @@ -69,7 +69,10 @@ fluid.defaults("gpii.app.errorDialog", { events: { onErrorDialogContentHeightChanged: "{errorDialog}.events.onContentHeightChanged", onErrorDialogButtonClicked: null, - onErrorDialogClosed: null + onErrorDialogClosed: null, + + onMetric: null, + onMetricState: null }, listeners: { onErrorDialogButtonClicked: { diff --git a/src/main/dialogs/quickSetStrip/qssNotificationDialog.js b/src/main/dialogs/quickSetStrip/qssNotificationDialog.js index 9578d8c8c..3f52421d0 100644 --- a/src/main/dialogs/quickSetStrip/qssNotificationDialog.js +++ b/src/main/dialogs/quickSetStrip/qssNotificationDialog.js @@ -60,7 +60,9 @@ fluid.defaults("gpii.app.qssNotification", { options: { events: { onQssNotificationClosed: null, - onQssNotificationHeightChanged: "{qssNotification}.events.onContentHeightChanged" + onQssNotificationHeightChanged: "{qssNotification}.events.onContentHeightChanged", + onMetric: null, + onMetricState: null }, listeners: { onQssNotificationClosed: { diff --git a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js index 32c1491bf..25de0af21 100644 --- a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js +++ b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js @@ -111,6 +111,7 @@ fluid.defaults("gpii.app.qssWidget", { onQssOpenUsbRequested: null, onQssUnmountUsbRequested: null, onQssGetVolumeRequested: null, + onMetric: null, onMetricState: null diff --git a/src/main/metrics.js b/src/main/metrics.js index 37eb21370..4ff1856a9 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -198,13 +198,26 @@ fluid.defaults("gpii.app.metrics", { "tooltip": { record: "gpii.app.metrics.qssTooltipDialog", target: "{/ gpii.app.qssTooltipDialog}.options.gradeNames" + }, + "notification": { + record: "gpii.app.metrics.qssNotification", + target: "{/ gpii.app.qssNotification}.options.gradeNames" + }, + "error": { + record: "gpii.app.metrics.errorDialog", + target: "{/ gpii.app.errorDialog}.options.gradeNames" + }, + "more": { + record: "gpii.app.metrics.morePanel", + target: "{/ gpii.app.qssMorePanel}.options.gradeNames" } }, durationEvents: { "tooltip-shown": "tooltip-hidden", "qss-shown": "qss-hidden", "widget-shown": "widget-hidden", - "widget-focus": "widget-unfocus" + "widget-focus": "widget-unfocus", + "notification-shown": "notification-hidden" } }); @@ -349,3 +362,70 @@ fluid.defaults("gpii.app.metrics.qssTooltipDialog", { } } }); + +// Notification dialog +fluid.defaults("gpii.app.metrics.qssNotification", { + gradeNames: ["fluid.component"], + listeners: { + "onQssNotificationShown.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: ["notification-shown", { + description: "{arguments}.0.description" + }] + }, + "onDialogHidden.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: ["notification-hidden"] + }, + "{channelListener}.events.onMetric": { + namespace: "metric", + func: "{eventLog}.metrics.uiMetric", + args: ["{arguments}.0", "{arguments}.1"] + }, + "{channelListener}.events.onMetricState": { + namespace: "metrics-state", + func: "{eventLog}.setState", + args: ["{arguments}.0", "{arguments}.1"] + } + } +}); + +// Error dialog +fluid.defaults("gpii.app.metrics.errorDialog", { + gradeNames: ["fluid.component"], + listeners: { + "onDialogShown.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: ["error-shown", {errCode: "{that}.options.config.params.errCode"}] + }, + "onDialogHidden.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: ["error-hidden", {errCode: "{that}.options.config.params.errCode"}] + }, + "{channelListener}.events.onMetric": { + namespace: "metric", + func: "{eventLog}.metrics.uiMetric", + args: ["{arguments}.0", "{arguments}.1"] + }, + "{channelListener}.events.onMetricState": { + namespace: "metrics-state", + func: "{eventLog}.setState", + args: ["{arguments}.0", "{arguments}.1"] + } + } +}); + +// More panel +fluid.defaults("gpii.app.metrics.morePanel", { + gradeNames: ["fluid.component"], + listeners: { + "onDialogShown.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: ["more-shown"] + }, + "onDialogHidden.metrics": { + func: "{eventLog}.metrics.uiMetric", + args: ["more-hidden"] + } + } +}); diff --git a/src/renderer/qssWidget/js/metrics.js b/src/renderer/common/js/metrics.js similarity index 61% rename from src/renderer/qssWidget/js/metrics.js rename to src/renderer/common/js/metrics.js index 8a40c3ec0..05a37dcc8 100644 --- a/src/renderer/qssWidget/js/metrics.js +++ b/src/renderer/common/js/metrics.js @@ -18,11 +18,54 @@ (function (fluid) { var gpii = fluid.registerNamespace("gpii"); + // Mix-in grade to capture metrics in dialogs. + fluid.defaults("gpii.psp.metrics.dialog", { + gradeNames: ["gpii.psp.metrics"], + distributeOptions: { + "clickable": { + target: "{that gpii.app.clickable}.options.gradeNames", + record: "gpii.psp.metrics" + }, + "button": { + target: "{that gpii.psp.widgets.button}.options.gradeNames", + record: "gpii.psp.metrics" + }, + "switch": { + target: "{that gpii.psp.widgets.switch}.options.gradeNames", + record: "gpii.psp.metrics" + } + }, + events: { + onMetric: null, + onMetricState: null + }, + members: { + componentType: "dialog" + } + }); + + fluid.defaults("gpii.psp.metrics.qssWidget", { + gradeNames: ["gpii.psp.metrics.dialog"], + members: { + componentType: "widget", + metricsID: undefined + }, + invokers: { + getMetricsID: { + funcName: "gpii.psp.metrics.getWidgetMetricsID", + args: ["{that}"] + } + } + }); + // Mix-in grade for components whose hover/focus state should be captured for metrics. fluid.defaults("gpii.psp.metrics", { gradeNames: ["gpii.app.hoverable"], members: { - metricsID: "@expand:fluid.identity({that}.container.selectorName)" + metricsID: "@expand:fluid.identity({that}.container.selectorName)", + componentType: "field", + hoverState: "@expand:fluid.add({that}.componentType,-hover)", + focusState: "@expand:fluid.add({that}.componentType,-focus)" }, invokers: { metric: { @@ -32,12 +75,15 @@ setState: { func: "{channelNotifier}.events.onMetricState.fire", args: ["{arguments}.0", "{arguments}.1"] + }, + getMetricsID: { + funcName: "gpii.psp.metrics.getMetricsID", + args: ["{that}", "{that}.model.item"] } }, listeners: { "onCreate.getId": { - funcName: "gpii.psp.metrics.getMetricsID", - args: ["{that}", "{that}.model.item"] + func: "{that}.getMetricsID" }, "onCreate.addFocusHandlers": { funcName: "gpii.psp.metrics.addFocusHandlers", @@ -45,11 +91,11 @@ }, "onMouseEnter.metricsState": { func: "{that}.setState", - args: ["widget-hover", "{that}.metricsID"] + args: ["{that}.hoverState", "@expand:{that}.getMetricsID()"] }, "onMouseLeave.metricsState": { func: "{that}.setState", - args: ["widget-hover"] + args: ["{that}.hoverState"] } } }); @@ -76,6 +122,10 @@ return that.metricsID; }; + gpii.psp.metrics.getWidgetMetricsID = function (that) { + return fluid.get(that.model, "setting.path") || that.typeName; + }; + /** * Adds the focus and blur handlers to the container, so the metrics core can keep an eye on what's currently * focused. @@ -86,12 +136,12 @@ */ gpii.psp.metrics.addFocusHandlers = function (that, container) { container.on("focus", function () { - that.setState("widget-focus", that.metricsID); - that.metric("widget-focus", {id: that.metricsID}); + that.setState(that.componentType + "-focus", that.getMetricsID()); + that.metric(that.componentType + "-focus", {id: that.getMetricsID()}); }); container.on("blur", function () { - that.metric("widget-unfocus", {id: that.metricsID}); - that.setState("widget-focus"); + that.metric(that.componentType + "-unfocus", {id: that.getMetricsID()}); + that.setState(that.componentType + "-focus"); }); }; diff --git a/src/renderer/errorDialog/index.html b/src/renderer/errorDialog/index.html index 5fac1b5c2..d7cbe955e 100644 --- a/src/renderer/errorDialog/index.html +++ b/src/renderer/errorDialog/index.html @@ -27,6 +27,8 @@ + +
diff --git a/src/renderer/errorDialog/js/errorDialog.js b/src/renderer/errorDialog/js/errorDialog.js index 9b34d6897..4a2d0ce5f 100644 --- a/src/renderer/errorDialog/js/errorDialog.js +++ b/src/renderer/errorDialog/js/errorDialog.js @@ -107,7 +107,8 @@ gradeNames: [ "fluid.viewComponent", "gpii.psp.heightObservable", - "gpii.psp.selectorsTextRenderer" + "gpii.psp.selectorsTextRenderer", + "gpii.psp.metrics.dialog" ], model: { @@ -157,7 +158,10 @@ events: { onErrorDialogClosed: null, onErrorDialogButtonClicked: null, - onErrorDialogContentHeightChanged: "{errorDialog}.events.onHeightChanged" + onErrorDialogContentHeightChanged: "{errorDialog}.events.onHeightChanged", + + onMetric: "{errorDialog}.events.onMetric", + onMetricState: "{errorDialog}.events.onMetricState" } } }, diff --git a/src/renderer/qssNotification/index.html b/src/renderer/qssNotification/index.html index b981aef05..c94e3494a 100644 --- a/src/renderer/qssNotification/index.html +++ b/src/renderer/qssNotification/index.html @@ -28,6 +28,8 @@ + +
diff --git a/src/renderer/qssNotification/js/qssNotification.js b/src/renderer/qssNotification/js/qssNotification.js index 6bc05dda2..1608fc0a3 100644 --- a/src/renderer/qssNotification/js/qssNotification.js +++ b/src/renderer/qssNotification/js/qssNotification.js @@ -37,7 +37,8 @@ * the necessary DOM elements and handling user interaction. */ fluid.defaults("gpii.psp.qssNotification", { - gradeNames: ["fluid.viewComponent", "gpii.psp.selectorsTextRenderer", "gpii.psp.heightObservable", "gpii.psp.linksInterceptor"], + gradeNames: ["fluid.viewComponent", "gpii.psp.selectorsTextRenderer", "gpii.psp.heightObservable", + "gpii.psp.linksInterceptor", "gpii.psp.metrics.dialog"], model: { messages: { @@ -76,7 +77,9 @@ options: { events: { onQssNotificationHeightChanged: "{qssNotification}.events.onHeightChanged", - onQssNotificationClosed: "{qssNotification}.events.onQssNotificationClosed" + onQssNotificationClosed: "{qssNotification}.events.onQssNotificationClosed", + onMetric: "{qssNotification}.events.onMetric", + onMetricState: "{qssNotification}.events.onMetricState" } } }, diff --git a/src/renderer/qssWidget/index.html b/src/renderer/qssWidget/index.html index 505661d14..bcbd830dc 100644 --- a/src/renderer/qssWidget/index.html +++ b/src/renderer/qssWidget/index.html @@ -27,7 +27,6 @@ - @@ -45,6 +44,8 @@ + +
diff --git a/src/renderer/qssWidget/js/qssWidget.js b/src/renderer/qssWidget/js/qssWidget.js index 285aba61c..e56656cdd 100644 --- a/src/renderer/qssWidget/js/qssWidget.js +++ b/src/renderer/qssWidget/js/qssWidget.js @@ -44,7 +44,7 @@ * showing the "Learn more" links, etc. */ fluid.defaults("gpii.psp.qssWidget", { - gradeNames: ["fluid.viewComponent"], + gradeNames: ["fluid.viewComponent", "gpii.psp.metrics.qssWidget"], model: { setting: {} @@ -60,20 +60,6 @@ office: ".flc-qssOfficeWidget" }, - distributeOptions: { - "clickable": { - target: "{that gpii.app.clickable}.options.gradeNames", - record: "gpii.psp.metrics" - }, - "button": { - target: "{that gpii.psp.widgets.button}.options.gradeNames", - record: "gpii.psp.metrics" - }, - "switch": { - target: "{that gpii.psp.widgets.switch}.options.gradeNames", - record: "gpii.psp.metrics" - } - }, /** * The last part of each grade name should be the name of the selector identifying * the container for the widget. @@ -107,10 +93,7 @@ onQssUnmountUsbRequested: null, // Volume & Mute related event - onQssGetVolumeRequested: null, - - onMetric: null, - onMetricState: null + onQssGetVolumeRequested: null }, sounds: {}, From 8ab8ed0e4c915621226a562e8ee7805b812f43d3 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 9 Jul 2019 23:42:54 +0100 Subject: [PATCH 046/116] GPII-3853: Updated documentation --- src/main/metrics.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/metrics.js b/src/main/metrics.js index 4ff1856a9..76427745d 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -24,6 +24,8 @@ var fluid = require("infusion"); The following events are captured: +site-id: Recorded at start-up, to identify the deployment. + qss-shown: The quick-strip was shown. { "module":"metrics.app", From aeb4e733504f382816eb74bb739b88434be03788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 12 Jul 2019 19:09:01 +0200 Subject: [PATCH 047/116] GPII-3819: Support new defaultSettings form See: https://github.com/GPII/universal/blob/828f511192ff5cddb5646cbd5c278c60081788e5/testData/defaultSettings/defaultSettings.win32.json5#L9-L11 --- src/main/gpiiConnector.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index ad83e9082..799cac659 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -793,10 +793,16 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettings) if (fluid.isValue(loadedSettings.contexts["gpii-default"].preferences)) { // the structure matches our assumption, going through the nodes and collect the data fluid.each(loadedSettings.contexts["gpii-default"].preferences, function (value, path) { - var fixedPath = path.replace(/\./g, "\\."), - fixedValue = value; - - result[fixedPath] = { "value": fixedValue }; + var fixedPath = path.replace(/\./g, "\\."); + if (!fluid.isPlainObject(value)) { + var fixedValue = value; + result[fixedPath] = { "value": fixedValue }; + } else { + fluid.each(value, function (v, k) { + var longPath = fixedPath.concat(".", k); + result[longPath] = { "value": v }; + }); + } }); } From 0b6ba1d5ad296508b803500a05b10a19e1feabd0 Mon Sep 17 00:00:00 2001 From: Yanachkov Date: Sun, 14 Jul 2019 18:32:17 +0300 Subject: [PATCH 048/116] NOJIRA: updated the defaultSettings.json used in tests --- tests/fixtures/defaultSettings.json5 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/fixtures/defaultSettings.json5 b/tests/fixtures/defaultSettings.json5 index c27fd9185..9bb7e3dd8 100644 --- a/tests/fixtures/defaultSettings.json5 +++ b/tests/fixtures/defaultSettings.json5 @@ -4,9 +4,13 @@ "preferences": { "http://registry.gpii.net/common/language": "en-US", "http://registry.gpii.net/common/DPIScale": 0, + "http://registry.gpii.net/common/highContrast/enabled": false, "http://registry.gpii.net/common/highContrastTheme": "regular-contrast", - "http://registry.gpii.net/common/selfVoicing/enabled": false + "http://registry.gpii.net/common/selfVoicing/enabled": false, + "http://registry.gpii.net/applications/com.microsoft.office": { + "word-ribbon": "StandardSet" + } } } } -} +} \ No newline at end of file From 76b8243ed5b3776473e91fb2daa7eb27217fb194 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 16 Jul 2019 21:25:39 +0100 Subject: [PATCH 049/116] GPII-3853: Removed duplicate events --- src/main/metrics.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/metrics.js b/src/main/metrics.js index 76427745d..c373b24e1 100644 --- a/src/main/metrics.js +++ b/src/main/metrics.js @@ -378,16 +378,6 @@ fluid.defaults("gpii.app.metrics.qssNotification", { "onDialogHidden.metrics": { func: "{eventLog}.metrics.uiMetric", args: ["notification-hidden"] - }, - "{channelListener}.events.onMetric": { - namespace: "metric", - func: "{eventLog}.metrics.uiMetric", - args: ["{arguments}.0", "{arguments}.1"] - }, - "{channelListener}.events.onMetricState": { - namespace: "metrics-state", - func: "{eventLog}.setState", - args: ["{arguments}.0", "{arguments}.1"] } } }); From 851920a221667c02eff2f0318aca40ef8fd3ffab Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 17 Jul 2019 12:09:17 +0100 Subject: [PATCH 050/116] GPII-3853: Capturing link clicks in tips (for translate tools) --- src/renderer/common/js/metrics.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/renderer/common/js/metrics.js b/src/renderer/common/js/metrics.js index 05a37dcc8..73837d178 100644 --- a/src/renderer/common/js/metrics.js +++ b/src/renderer/common/js/metrics.js @@ -55,6 +55,12 @@ funcName: "gpii.psp.metrics.getWidgetMetricsID", args: ["{that}"] } + }, + listeners: { + "onQssWidgetCreated.metric": { + funcName: "gpii.psp.metrics.addTipLinkHandlers", + args: ["{that}", "{that}.container"] + } } }); @@ -145,4 +151,23 @@ }); }; + /** + * Adds the click handlers to links within the tip element of the container. + * + * @param {Component} that The gpii.psp.metrics instance. + * @param {jQuery} container A jQuery object representing the component's container. + * + */ + gpii.psp.metrics.addTipLinkHandlers = function (that, container) { + container.find(".flc-qssWidget-tip a").on("click", function (eventObject) { + that.metric("link-click", { + widget: that.getMetricsID(), + link: eventObject.target.href, + id: eventObject.target.id, + text: eventObject.target.innerText, + eventType: eventObject.type + }); + }); + }; + })(fluid, jQuery); From 2a7b8c3dba2853a62056ff6c5ac5f99a1e8ab6d0 Mon Sep 17 00:00:00 2001 From: karadaliev Date: Wed, 7 Aug 2019 17:23:46 +0300 Subject: [PATCH 051/116] GPII-3819: TEMPORARY added log on the loadDefaultSettings check (if config file is not found) and changed gpii-windows package --- package.json | 2 +- src/main/gpiiConnector.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 50aeefcfc..03fbf10a6 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "stegru/windows#GPII-3927", + "gpii-windows": "javihernandez/windows#cf9d38fb2baef3b62ad73f43c7a075712f5c4898", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 799cac659..31f4b9243 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -808,6 +808,7 @@ gpii.app.dev.gpiiConnector.qss.loadDefaultSettings = function (defaultSettings) return result; } else { + console.log("loadDefaultSettings: Cannot find the settings file - " + compiledPath); fluid.log(fluid.logLevel.WARN, "loadDefaultSettings: Cannot find the settings file - " + compiledPath); return []; } From 9b7404121f2b621a53bcdf448281143e113a2816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 7 Nov 2019 20:43:21 +0100 Subject: [PATCH 052/116] GPII-4214: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a174abd83..427c28cb7 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "0.3.0-dev.20191017T162536Z.acb3d40", + "gpii-windows": "javihernandez/windows#ff7267edc3aa4225bfbeb378df400b751e17481f", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From bef249a3050d112c87e0dc21ba811266166392d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 7 Nov 2019 20:51:54 +0100 Subject: [PATCH 053/116] GPII-4214: Updated gpii-wix-installer reference --- provisioning/Installer.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/Installer.ps1 b/provisioning/Installer.ps1 index 62f578eae..0f25960d7 100644 --- a/provisioning/Installer.ps1 +++ b/provisioning/Installer.ps1 @@ -15,7 +15,7 @@ $projectDir = (Get-Item $provisioningDir).parent.FullName Import-Module (Join-Path $provisioningDir 'Provisioning.psm1') -Force $installerRepo = "https://github.com/javihernandez/gpii-wix-installer" -$installerBranch = "GPII-3997" +$installerBranch = "GPII-4004" # Obtaining useful tools location. $installerDir = Join-Path $env:SystemDrive "installer" # a.k.a. C:\installer\ From f600c752105788cf91868fcd00212eaf441c05ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 7 Nov 2019 23:35:39 +0100 Subject: [PATCH 054/116] GPII-4214: Bumped to 1.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15f47b453..fc2da0632 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.2.0", + "version": "1.3.0", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { From 4b473b663aed96c7a1456d1326f74de018803cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 8 Nov 2019 16:01:47 +0100 Subject: [PATCH 055/116] GPII-4214: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc2da0632..5f1cd80da 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#ff7267edc3aa4225bfbeb378df400b751e17481f", + "gpii-windows": "javihernandez/windows#0844cfae38aab9dceb2b0bfe29676c05c38e3226", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From a6c0251ee07d48022306d0f5d94756367178d9ed Mon Sep 17 00:00:00 2001 From: krisYanachkov Date: Thu, 21 Nov 2019 17:54:26 +0200 Subject: [PATCH 056/116] NOJIRA: removed an unused icon --- src/renderer/qssWidget/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/renderer/qssWidget/index.html b/src/renderer/qssWidget/index.html index d307b13f1..dbaff5264 100644 --- a/src/renderer/qssWidget/index.html +++ b/src/renderer/qssWidget/index.html @@ -122,9 +122,6 @@
- -
-
From 012b3d0efb6977a5e8caf07d730d2d95ce6c274a Mon Sep 17 00:00:00 2001 From: Danail Karadaliev Date: Thu, 21 Nov 2019 20:33:54 +0200 Subject: [PATCH 057/116] NOJIRA: Finishing touches --- messageBundles/gpii-app-qss-settings_en.json | 8 ++++++-- src/renderer/qssWidget/css/main.css | 4 ++++ src/renderer/qssWidget/index.html | 1 + src/renderer/qssWidget/js/qssMenuWidget.js | 2 +- src/renderer/qssWidget/js/qssStepperWidget.js | 2 -- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/messageBundles/gpii-app-qss-settings_en.json b/messageBundles/gpii-app-qss-settings_en.json index d2471614e..566667314 100644 --- a/messageBundles/gpii-app-qss-settings_en.json +++ b/messageBundles/gpii-app-qss-settings_en.json @@ -119,7 +119,9 @@ "gpii_app_qss_settings_common-mouse": { "tooltip": "

Change Windows Mouse setting.

Works in all applications.

", "title": "Adjust Mouse", - "tip": "

Adjust Mouse

" + "tip": "

Adjust Mouse

", + "sideCart": "

", + "sideCartWithSettings": "

We have provided some of the most commonly used Windows Mouse settings here.

Microsoft also provides other mouse settings. The following links will take you directly to the key additional Mouse settings in the Windows Setting screens.

" }, "gpii_app_qss_settings_windows-swapMouseButtons": { "title": "Swap mouse buttons" @@ -163,6 +165,8 @@ "Red-Green (Green weak)", "Red-Green (Red weak)", "Blue-Yellow (Tritanomaly)" - ] + ], + "sideCart": "

", + "sideCartWithSettings": "

In addition to the Windows color vision options presented in the panel to the left, there are also several grayscale options provided in Windows setting.

Here is the link to take you directly to the full set of Color Vision Options in Windows Settings:

" } } diff --git a/src/renderer/qssWidget/css/main.css b/src/renderer/qssWidget/css/main.css index 103524f80..043c93d60 100644 --- a/src/renderer/qssWidget/css/main.css +++ b/src/renderer/qssWidget/css/main.css @@ -227,3 +227,7 @@ body { border-top-color: #ffffff; margin-left: -11px; } + +.fl-qssMouseWidget { + width: 145px; +} diff --git a/src/renderer/qssWidget/index.html b/src/renderer/qssWidget/index.html index dbaff5264..6385f9f5f 100644 --- a/src/renderer/qssWidget/index.html +++ b/src/renderer/qssWidget/index.html @@ -189,6 +189,7 @@
+
diff --git a/src/renderer/qssWidget/js/qssMenuWidget.js b/src/renderer/qssWidget/js/qssMenuWidget.js index b82a47028..e2998c474 100644 --- a/src/renderer/qssWidget/js/qssMenuWidget.js +++ b/src/renderer/qssWidget/js/qssMenuWidget.js @@ -31,7 +31,7 @@ disabled: false, setting: {}, messages: { - footerTip: "{that}.model.setting.widget.footerTip", + footerTip: "{that}.model.setting.widget.footerTip" } }, modelListeners: { diff --git a/src/renderer/qssWidget/js/qssStepperWidget.js b/src/renderer/qssWidget/js/qssStepperWidget.js index 24a738823..01c226fec 100644 --- a/src/renderer/qssWidget/js/qssStepperWidget.js +++ b/src/renderer/qssWidget/js/qssStepperWidget.js @@ -17,8 +17,6 @@ "use strict"; (function (fluid) { - var gpii = fluid.registerNamespace("gpii"); - /** * Represents the QSS stepper widget. */ From 8feaa183ce5bebf3e6c601f1925b3a520511e136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 21 Nov 2019 20:26:15 +0100 Subject: [PATCH 058/116] GPII-4214: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f1cd80da..30ba99d26 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#0844cfae38aab9dceb2b0bfe29676c05c38e3226", + "gpii-windows": "javihernandez/windows#c5312fd53ddff1d0f1f609e5cbc3a1f2eb7f307c", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From c80b9d5c5a53368369adf6043fa3f9a193984250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 22 Nov 2019 01:32:57 +0100 Subject: [PATCH 059/116] GPII-4214: Commented out channelNotifier component in qssMouseWidget --- src/renderer/qssWidget/js/qssMouseWidget.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/renderer/qssWidget/js/qssMouseWidget.js b/src/renderer/qssWidget/js/qssMouseWidget.js index 50501a4d2..4bf21bdfb 100644 --- a/src/renderer/qssWidget/js/qssMouseWidget.js +++ b/src/renderer/qssWidget/js/qssMouseWidget.js @@ -129,16 +129,16 @@ setting: "{mouse}.model.setting.settings.largerMousePointer" } } - }, - channelNotifier: { - type: "gpii.psp.channelNotifier", - options: { - events: { - // Add events the main process to be notified for - onQssWidgetSettingAltered: "{mouse}.events.onQssWidgetSettingAltered", - onQssWidgetNotificationRequired: "{mouse}.events.onQssWidgetNotificationRequired" - } - } + //}, + //channelNotifier: { + // type: "gpii.psp.channelNotifier", + // options: { + // events: { + // // Add events the main process to be notified for + // onQssWidgetSettingAltered: "{mouse}.events.onQssWidgetSettingAltered", + // onQssWidgetNotificationRequired: "{mouse}.events.onQssWidgetNotificationRequired" + // } + // } } } }); From bf2b72fd459b28596c05b316bf4840b45225210e Mon Sep 17 00:00:00 2001 From: krisYanachkov Date: Fri, 22 Nov 2019 15:33:23 +0200 Subject: [PATCH 060/116] NOJIRA: show or hide error message dialog according to site config setting --- siteconfig.json5 | 5 +++++ src/main/dialogs/dialogManager.js | 8 +++++++- src/main/siteConfigurationHandler.js | 4 ++++ tests/IntegrationTests.js | 4 ++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index f6aa7bf06..1de71a3ac 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -166,6 +166,11 @@ } }, + // Configuration options for the dialog manager + dialogManager: { + showErrorDialog: false + }, + // URL to the the place serving the survey triggers data. Note that it should return triggers in JSON format surveyTriggersUrl: "http://survey.gpii.net/survey-triggers.json", diff --git a/src/main/dialogs/dialogManager.js b/src/main/dialogs/dialogManager.js index cbc9cea34..9eee80fc2 100644 --- a/src/main/dialogs/dialogManager.js +++ b/src/main/dialogs/dialogManager.js @@ -127,6 +127,10 @@ gpii.app.dialogManager.queue.enqueue = function (that, options) { fluid.defaults("gpii.app.dialogManager", { gradeNames: ["fluid.modelComponent"], + siteConfig: { + showErrorDialog: null + }, + model: { isKeyedIn: false, scaleFactor: 1 @@ -298,7 +302,9 @@ gpii.app.dialogManager.show = function (dialogManager, selector, options) { var dialog = dialogManager.get(selector); if (dialog) { if (dialog.typeName === dialogManager.options.sequentialDialogsGrade) { - dialogManager.errorQueue.enqueue(options); + if (dialogManager.options.siteConfig.showErrorDialog) { + dialogManager.errorQueue.enqueue(options); + } } else { dialog.show(options); } diff --git a/src/main/siteConfigurationHandler.js b/src/main/siteConfigurationHandler.js index 01b368c51..cb9c7e7e5 100644 --- a/src/main/siteConfigurationHandler.js +++ b/src/main/siteConfigurationHandler.js @@ -92,6 +92,10 @@ fluid.defaults("gpii.app.siteConfigurationHandler", { record: "{that}.options.siteConfig.aboutDialog", target: "{app aboutDialog}.options.siteConfig" }, + distributeDialogManagerConfig: { + record: "{that}.options.siteConfig.dialogManager", + target: "{app dialogManager}.options.siteConfig" + }, distributeTrayType: { record: "{that}.options.siteConfig.trayType", target: "{app tray}.options.trayType" diff --git a/tests/IntegrationTests.js b/tests/IntegrationTests.js index 71298091e..3d6a458d0 100644 --- a/tests/IntegrationTests.js +++ b/tests/IntegrationTests.js @@ -232,14 +232,14 @@ gpii.tests.app.bootstrapServer([ fluid.copy(gpii.tests.timer.testDefs), fluid.copy(gpii.tests.dialogManager.testDefs), fluid.copy(gpii.tests.qss.testDefs), - fluid.copy(gpii.tests.sequentialDialogs.testDefs), + // fluid.copy(gpii.tests.sequentialDialogs.testDefs), //fluid.copy(gpii.tests.shortcutsManager.testDefs), // NOT OK fluid.copy(gpii.tests.settingsBroker.testDefs), fluid.copy(gpii.tests.surveys.dynamicSurveyConnectorTestDefs), fluid.copy(gpii.tests.surveyTriggerManager.testDefs), fluid.copy(gpii.tests.siteConfigurationHandler.testDefs), fluid.copy(gpii.tests.storage.testDefs), - fluid.copy(gpii.tests.userErrorsHandler.testDefs), + // fluid.copy(gpii.tests.userErrorsHandler.testDefs), fluid.copy(gpii.tests.gpiiConnector.testDefs), // should be changed to match the new specification fluid.copy(gpii.tests.webview.testDefs) ]); From d26bcc621efee82dea9c8fce3e9cd33d81b3aca9 Mon Sep 17 00:00:00 2001 From: Danail Karadaliev Date: Mon, 25 Nov 2019 14:38:01 +0200 Subject: [PATCH 061/116] NOJIRA: Added the proper footerTip for the Color Vision filter --- messageBundles/gpii-app-qss-settings_en.json | 2 +- src/main/qss.js | 4 +++- src/renderer/qssWidget/css/qssMenuWidget.css | 6 ++++++ src/renderer/qssWidget/index.html | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/messageBundles/gpii-app-qss-settings_en.json b/messageBundles/gpii-app-qss-settings_en.json index 566667314..7ca02962f 100644 --- a/messageBundles/gpii-app-qss-settings_en.json +++ b/messageBundles/gpii-app-qss-settings_en.json @@ -159,7 +159,7 @@ "tooltip": "

Change the colors displayed on the screen to make things easier to view or distinguish.

", "title": "Color Vision", "tip": "

Color Vision Filters

Shifts colors to help those with some form of color blindness distinguish colors.

", - "footerTip": "

Pick an option that makes the nine colors below more distinct.

", + "footerTip": "

Pick an option that makes the nine colors below more distinct.

", "enum": [ "Standard colors", "Red-Green (Green weak)", diff --git a/src/main/qss.js b/src/main/qss.js index 7804456d6..68586709e 100644 --- a/src/main/qss.js +++ b/src/main/qss.js @@ -830,9 +830,11 @@ gpii.app.qssWrapper.applySettingTranslation = function (qssSettingMessages, sett translatedSetting.switchTitle = message.switchTitle; } + translatedSetting.widget = translatedSetting.widget || {}; if (fluid.isValue(message.footerTip)) { - translatedSetting.widget = translatedSetting.widget || {}; translatedSetting.widget.footerTip = message.footerTip; + } else { + translatedSetting.widget.footerTip = ""; } if (fluid.isValue(message.sideCart)) { diff --git a/src/renderer/qssWidget/css/qssMenuWidget.css b/src/renderer/qssWidget/css/qssMenuWidget.css index dc731d992..2bd933f26 100644 --- a/src/renderer/qssWidget/css/qssMenuWidget.css +++ b/src/renderer/qssWidget/css/qssMenuWidget.css @@ -143,3 +143,9 @@ margin-top: 5px; } /* Specific version for the Office Simplification's widget: END */ + +/* CSS specific for the color wheel footertip */ +.colorWheelTip { + position: relative; + bottom: 50px; +} diff --git a/src/renderer/qssWidget/index.html b/src/renderer/qssWidget/index.html index 6385f9f5f..12b8e48df 100644 --- a/src/renderer/qssWidget/index.html +++ b/src/renderer/qssWidget/index.html @@ -88,6 +88,7 @@
+
From 971abb670fd932ef9d26f09066149d644c5cb9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 3 Dec 2019 22:30:58 +0100 Subject: [PATCH 062/116] GPII-4214.GPII-3572: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30ba99d26..080ec5adc 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#c5312fd53ddff1d0f1f609e5cbc3a1f2eb7f307c", + "gpii-windows": "javihernandez/windows#417e743d42ad29a417c0a32ca666354a1c92819e", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From ceeab27145be5ca011bb91dca77ac8e41418ca79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 4 Dec 2019 16:02:14 +0100 Subject: [PATCH 063/116] GPII-4214.GPII-3572: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 080ec5adc..0365d4361 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#417e743d42ad29a417c0a32ca666354a1c92819e", + "gpii-windows": "javihernandez/windows#c2ce74cd0eb96e6f63cb2d994f254dc7b0a6e2fa", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From f3a5fef05b55e27a868bba65d2a0a72e2ce742e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 4 Dec 2019 19:57:27 +0100 Subject: [PATCH 064/116] GPII-4214.GPII-3572: Updated universal reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0365d4361..80dd9aab4 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#c2ce74cd0eb96e6f63cb2d994f254dc7b0a6e2fa", + "gpii-windows": "javihernandez/windows#379b32e6910d0891707006f9122f99f7af5a4ae4", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From a48e0f76f76eba9748ab9f71f10948fd5da585f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 5 Dec 2019 10:41:15 +0100 Subject: [PATCH 065/116] GPII-4214.GPII-3572: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80dd9aab4..f663d3d21 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "electron": "3.0.2", "electron-edge-js": "8.3.8", "electron-localshortcut": "3.1.0", - "gpii-windows": "javihernandez/windows#379b32e6910d0891707006f9122f99f7af5a4ae4", + "gpii-windows": "javihernandez/windows#ec8fc7bd88e206f66677a9df78aeb09430c98d68", "infusion": "3.0.0-dev.20190328T144119Z.ec44dbfab", "nan": "2.10.0", "node-jqunit": "1.1.8", From 2699cbbd8abda712003f014853b55ee478750bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 5 Dec 2019 11:15:31 +0100 Subject: [PATCH 066/116] GPII-4214.GPII-3572: Enabled siteconfig autoUpdater --- provisioning/service.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/service.json5 b/provisioning/service.json5 index 085571346..de04848db 100644 --- a/provisioning/service.json5 +++ b/provisioning/service.json5 @@ -17,7 +17,7 @@ }, "secretFile": "%ProgramData%\\Morphic Credentials\\secret.txt", "autoUpdate": { - "enabled": false, + "enabled": true, "lastUpdatesFile": "%ProgramData%\\Morphic\\last-updates.json5", "files": [{ // Auto-update the site config. From a9478f44b5a74f50d1731a76a7796431e36e2ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 5 Dec 2019 11:18:56 +0100 Subject: [PATCH 067/116] GPII-4214.GPII-3572: Supplied url for the service to pull the siteconfig --- provisioning/service.json5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/provisioning/service.json5 b/provisioning/service.json5 index de04848db..f24ab64b3 100644 --- a/provisioning/service.json5 +++ b/provisioning/service.json5 @@ -23,7 +23,8 @@ // Auto-update the site config. path: "%ProgramData%\\Morphic\\siteConfig.json5", // Get the URL from the secrets file - url: "${siteConfigUrl}" + //url: "${siteConfigUrl}" + url: "https://raw.githubusercontent.com/javihernandez/morphic-siteConfigs/master/onOffSwitchTesting/siteconfig_standard.json5" }], }, "siteConfigFile": [ From 268bb94b1a9bfac766dfc217fae79638751b8ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 5 Dec 2019 12:48:12 +0100 Subject: [PATCH 068/116] GPII-4214.GPII-3572: Updated config values for the metricsSwitch --- provisioning/service.json5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioning/service.json5 b/provisioning/service.json5 index f24ab64b3..0cace4fb0 100644 --- a/provisioning/service.json5 +++ b/provisioning/service.json5 @@ -35,12 +35,12 @@ "gpiiConfig": { "env": "NODE_ENV", // Morphic + metrics: - "on:on": "app.testing.metrics", + "on:on": "app.production.metrics", // No metrics or morphic: "off:off": "app.disable", // Metrics only: "off:on": "app.metrics", // No metrics: - "on:off": "app.testing" + "on:off": "app.production" } } From b78cea5a93963613c098b07ec2bcaeadb42633e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 19 Dec 2019 20:28:05 +0100 Subject: [PATCH 069/116] GPII-4214.GPII-3572: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a248262e..6591f96f5 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#ec8fc7bd88e206f66677a9df78aeb09430c98d68" + "gpii-windows": "javihernandez/windows#c98594225292998ec017c7a4c9cb5cbe3174d784" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 4582d339a7bb0be8ce1bfbc9a53ee833696032a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Thu, 9 Jan 2020 13:37:17 +0100 Subject: [PATCH 070/116] GPII-4214.GPII-3572: Show error dialogs by default --- siteconfig.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 60a088386..e17e999cc 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -187,7 +187,7 @@ // Configuration options for the dialog manager dialogManager: { - showErrorDialog: false + showErrorDialog: true }, // URL to the the place serving the survey triggers data. Note that it should return triggers in JSON format From 357b32f5c785edc2962a3634a05673c35ff87a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 10 Jan 2020 11:39:28 +0100 Subject: [PATCH 071/116] GPII-4214.GPII-3572: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6591f96f5..358b3fcfd 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#c98594225292998ec017c7a4c9cb5cbe3174d784" + "gpii-windows": "javihernandez/windows#2c4d82a2847c365ee5514c5eab12a08569dc3df4" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 6d7460d071b9eb04c8bfb84d5be3756018945917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 10 Jan 2020 12:06:35 +0100 Subject: [PATCH 072/116] GPII-4214.GPII-3572: Fixed typo in message bundle --- messageBundles/gpii-app-qss-settings_en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/messageBundles/gpii-app-qss-settings_en.json b/messageBundles/gpii-app-qss-settings_en.json index 2035bbc7f..8404a278d 100644 --- a/messageBundles/gpii-app-qss-settings_en.json +++ b/messageBundles/gpii-app-qss-settings_en.json @@ -164,7 +164,7 @@ "Red-Green (Red weak)", "Blue-Yellow (Tritanomaly)" ], - "sideCart": "

", - "sideCartWithSettings": "

In addition to the Windows color vision options presented in the panel to the left, there are also several grayscale options provided in Windows setting.

Here is the link to take you directly to the full set of Color Vision Options in Windows Settings:

" + "sideCar": "

", + "sideCarWithSettings": "

In addition to the Windows color vision options presented in the panel to the left, there are also several grayscale options provided in Windows setting.

Here is the link to take you directly to the full set of Color Vision Options in Windows Settings:

" } } From 24d177c1bab636b81be76826864d9bd05a1349ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 17 Jan 2020 23:35:06 +0100 Subject: [PATCH 073/116] GPII-4214.GPII-3572: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 358b3fcfd..7fde24586 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#2c4d82a2847c365ee5514c5eab12a08569dc3df4" + "gpii-windows": "javihernandez/windows#26b52d568c57a58e4d5cfc965af45ef23d6e27fc" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From b24bc198bb06c820add069d0f7756405f907ebe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 21 Jan 2020 15:30:41 +0100 Subject: [PATCH 074/116] GPII-4214.GPII-3572: Bumped to 1.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7fde24586..9b9a3dc3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.0", + "version": "1.3.1", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { From ed670a2be0add664386f40a27c5bd91d5827999b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 22 Jan 2020 01:40:18 +0100 Subject: [PATCH 075/116] GPII-4214.GPII-3572: Updated windows reference This update brings the new changes on GPII-4244 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9b9a3dc3e..3d91f00c3 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#26b52d568c57a58e4d5cfc965af45ef23d6e27fc" + "gpii-windows": "javihernandez/windows#9f9c0cad5192c6f4575bb125c9505273f08b9f93" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 312029622129d79b18a8a328e6310c64a3b36212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 27 Jan 2020 12:18:17 +0100 Subject: [PATCH 076/116] GPII-4214.GPII-3572: Updated windows reference This update brings the new changes from stegru/GPII-4244 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d91f00c3..d4d4609b6 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#9f9c0cad5192c6f4575bb125c9505273f08b9f93" + "gpii-windows": "javihernandez/windows#14211ee6d599af43161c8de9ad459de739d7a610" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From b1e4c6e90bccd35a1041f14aa0dc3975d6b8fa68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 31 Jan 2020 12:02:35 +0100 Subject: [PATCH 077/116] GPII-4214.GPII-3572: Updates windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d4d4609b6..7e3c4b996 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#14211ee6d599af43161c8de9ad459de739d7a610" + "gpii-windows": "javihernandez/windows#8cf1c6aad97ba229ea5d065109b572e0b13c4b97" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 12e87784a54c9317699f97a55ae564f88ba242fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 31 Jan 2020 12:02:51 +0100 Subject: [PATCH 078/116] GPII-4214.GPII-3572: Bumped to 1.3.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e3c4b996..7d86a1225 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.1", + "version": "1.3.2", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { From c0a3147ff4e0430e474175e5d194d787b29f42b3 Mon Sep 17 00:00:00 2001 From: krisYanachkov Date: Fri, 6 Mar 2020 15:46:44 +0200 Subject: [PATCH 079/116] GPII-4386: fix for duplicate custom buttons (cherry picked from commit 24a232e3d2ede47dc550faaa02f809bc225f4da2) --- src/main/qss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/qss.js b/src/main/qss.js index 524cf066d..2d614f8ac 100644 --- a/src/main/qss.js +++ b/src/main/qss.js @@ -776,7 +776,7 @@ gpii.app.qssWrapper.alterSetting = function (that, updatedSetting, source) { }); } else { - if (setting.path === updatedSetting.path && !fluid.model.diff(setting, updatedSetting)) { + if (setting.id !== "MakeYourOwn" && setting.path === updatedSetting.path && !fluid.model.diff(setting, updatedSetting)) { // applying primary setting's change that.applier.change("settings." + index, updatedSetting, null, source); From 7a8a6f9a06e24a80d8ec1131d7c983de33bfc92d Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 11 Mar 2020 17:02:47 +0000 Subject: [PATCH 080/116] NOJIRA: Removed site config --- siteconfig.json5 => siteconfig-default.json5 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename siteconfig.json5 => siteconfig-default.json5 (100%) diff --git a/siteconfig.json5 b/siteconfig-default.json5 similarity index 100% rename from siteconfig.json5 rename to siteconfig-default.json5 From 86a7fb361f0aff9b19848365910e622ae636b97f Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 11 Mar 2020 17:03:29 +0000 Subject: [PATCH 081/116] NOJIRA: Updated package.json versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7d86a1225..7bc4fbd62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.2", + "version": "1.3.3", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#8cf1c6aad97ba229ea5d065109b572e0b13c4b97" + "gpii-windows": "stegru/windows#842dce156cf618b47fd5762feacb667b947dfe3b" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 674dbb2434f8be8dc17b6ef14e3839ef16b3e0bd Mon Sep 17 00:00:00 2001 From: ste Date: Thu, 12 Mar 2020 11:20:17 +0000 Subject: [PATCH 082/116] NOJIRA: Disabled site-config auto updates --- provisioning/service.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/service.json5 b/provisioning/service.json5 index fa67c1f0b..925daca75 100644 --- a/provisioning/service.json5 +++ b/provisioning/service.json5 @@ -17,7 +17,7 @@ }, "secretFile": "%ProgramData%\\Morphic Credentials\\secret.txt", "autoUpdate": { - "enabled": true, + "enabled": false, "lastUpdatesFile": "%ProgramData%\\Morphic\\last-updates.json5", "files": [{ // Auto-update the site config. From 8a950fbde023358bb7a7138a8f46b00c33325eed Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 13 Mar 2020 11:08:04 +0000 Subject: [PATCH 083/116] Revert "NOJIRA: Removed site config" This reverts commit 7a8a6f9a --- siteconfig-default.json5 => siteconfig.json5 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename siteconfig-default.json5 => siteconfig.json5 (100%) diff --git a/siteconfig-default.json5 b/siteconfig.json5 similarity index 100% rename from siteconfig-default.json5 rename to siteconfig.json5 From 16eb68e6d4a0b6cc9634e94eb2c89186b545b120 Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 13 Mar 2020 11:29:04 +0000 Subject: [PATCH 084/116] NOJIRA: Updated Windows reference. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bc4fbd62..2b00e9538 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "stegru/windows#842dce156cf618b47fd5762feacb667b947dfe3b" + "gpii-windows": "stegru/windows#8e4024483fe018efe6877db0202d410782259969" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 8f44b973b0dbd86064286817a4157d538a64bb22 Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 13 Mar 2020 13:56:51 +0000 Subject: [PATCH 085/116] NOJIRA: Updated Windows reference. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b00e9538..d31bcbf49 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "stegru/windows#8e4024483fe018efe6877db0202d410782259969" + "gpii-windows": "stegru/windows#62529a8b8affd697c64e38dd4ddf1acf22a451f7" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From b9bded221dfd864d724fe7d3232f16f6ae5f07fb Mon Sep 17 00:00:00 2001 From: ste Date: Sun, 15 Mar 2020 19:28:23 +0000 Subject: [PATCH 086/116] NOJIRA: Updated gpii-windows/gpii-universal references. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d31bcbf49..42382bc79 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "stegru/windows#62529a8b8affd697c64e38dd4ddf1acf22a451f7" + "gpii-windows": "GPII/windows#83af4e86ee618d9796d95ef187bd7a222db553d1" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 51c66e10b013b66f9334a34045703fc516b69dc6 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 11 Feb 2020 14:28:29 +0000 Subject: [PATCH 087/116] GPII-3853: Capturing customised button info --- src/renderer/common/js/metrics.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/renderer/common/js/metrics.js b/src/renderer/common/js/metrics.js index 8eab00e5f..9f11766b9 100644 --- a/src/renderer/common/js/metrics.js +++ b/src/renderer/common/js/metrics.js @@ -78,6 +78,10 @@ func: "{channelNotifier}.events.onMetric.fire", args: ["button-activated", { buttonPath: "{that}.model.item.path", + buttonTitle: "{that}.model.title", + buttonUrl: "{that}.model.item.schema.url", + buttonFile: "{that}.model.item.schema.filepath", + buttonKeys: "{that}.model.item.schema.keyData", mouse: "click" }] }, From 93d232b677e39e0400427e4e1bc8eea17e2ccf71 Mon Sep 17 00:00:00 2001 From: ste Date: Thu, 19 Mar 2020 20:30:29 +0000 Subject: [PATCH 088/116] GPII-4408: Terminating if a signalling command line option is used. --- main.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 67b19e246..7320a5ffc 100644 --- a/main.js +++ b/main.js @@ -15,7 +15,13 @@ var app = require("electron").app; // Perform this check early, do avoid any delay. var singleInstance = app.requestSingleInstanceLock(); -if (!singleInstance) { +if (singleInstance) { + // These command-line options are to signal an already running instance. + if (process.argv.includes("--shutdown") || process.argv.includes("--reset")) { + app.quit(); + return; + } +} else { // The event handler of second-instance (below) will be called in the original instance. console.log("Another instance of Morphic is running"); app.quit(); From 1b3f2eb874e6e9fb22c37dd707d225c8b2e5b1e5 Mon Sep 17 00:00:00 2001 From: ste Date: Sat, 21 Mar 2020 15:24:47 +0000 Subject: [PATCH 089/116] NOJIRA: Updating gpii-windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 42382bc79..35662e3bc 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "GPII/windows#83af4e86ee618d9796d95ef187bd7a222db553d1" + "gpii-windows": "GPII/windows#46fe848370766b751774b6f9a30310546c93ac29" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 82a9b616ab85aa72ae0abdeb0335bd14fb5416ed Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 24 Mar 2020 10:04:10 +0000 Subject: [PATCH 090/116] NOJIRA: Updating gpii-windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35662e3bc..4e7b533a6 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "GPII/windows#46fe848370766b751774b6f9a30310546c93ac29" + "gpii-windows": "GPII/windows#747b34397ae5fdb0400324e608863ca7fc35e667" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 755c72aed0316d79fd236e182c033c91cd131a30 Mon Sep 17 00:00:00 2001 From: ste Date: Tue, 24 Mar 2020 10:19:03 +0000 Subject: [PATCH 091/116] NOJIRA: Updating version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 35662e3bc..ce113cf67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.3", + "version": "1.3.3-r3-82a9b616ab85aa72ae0abdeb0335bd14fb5416ed", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "GPII/windows#46fe848370766b751774b6f9a30310546c93ac29" + "gpii-windows": "GPII/windows#747b34397ae5fdb0400324e608863ca7fc35e667" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 36b476dde40f7bf6ac8b29b0ef93ff459d0b34b2 Mon Sep 17 00:00:00 2001 From: ste Date: Wed, 25 Mar 2020 14:05:51 +0000 Subject: [PATCH 092/116] NOJIRA: Updated versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ce113cf67..c499aa969 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.3-r3-82a9b616ab85aa72ae0abdeb0335bd14fb5416ed", + "version": "1.3.4", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "GPII/windows#747b34397ae5fdb0400324e608863ca7fc35e667" + "gpii-windows": "GPII/windows#cee3522e6828059f0e730762adf770a1c382ad0f" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From a6c396d5a1c78c2d375611ea18c48fe9f456b8a4 Mon Sep 17 00:00:00 2001 From: krisYanachkov Date: Sat, 28 Mar 2020 14:28:51 +0000 Subject: [PATCH 093/116] GPII-4196: close the 'more panel' if a widget is opened outside. --- .../dialogs/quickSetStrip/qssWidgetDialog.js | 14 ++++++++++++- src/renderer/qss/js/qss.js | 20 +++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js index be297c696..d9ddded70 100644 --- a/src/main/dialogs/quickSetStrip/qssWidgetDialog.js +++ b/src/main/dialogs/quickSetStrip/qssWidgetDialog.js @@ -126,7 +126,8 @@ fluid.defaults("gpii.app.qssWidget", { }, listeners: { onMorePanelClosed: { - func: "{qssWidget}.hide" + funcName: "gpii.app.qssWidget.onMorePanelClosed", + args: ["{qssWidget}"] }, onSideCarActivated: { func: "gpii.app.qssWidget.resizeWidget", @@ -233,6 +234,17 @@ fluid.defaults("gpii.app.qssWidget", { } }); + +/** + * Closing the widget window from the More Panel grid when the More Panel itself it’s closed. + * @param {gpii.app.qssWidget} that - The instance of the qssWidget. + */ +gpii.app.qssWidget.onMorePanelClosed = function (that) { + if (fluid.isValue(that.model.setting.schema) && that.model.setting.schema.morePanel) { + that.hide(); + } +}; + /** * Resizing and repositioning the widget when the sideCar is opened or closed. * @param {gpii.app.qssWidget} that - The instance of the qssWidget. diff --git a/src/renderer/qss/js/qss.js b/src/renderer/qss/js/qss.js index 8890a9cf2..3a2a78061 100644 --- a/src/renderer/qss/js/qss.js +++ b/src/renderer/qss/js/qss.js @@ -383,7 +383,7 @@ defaultFocusButtonType: "psp", listeners: { - "onQssOpen": { + onQssOpen: { funcName: "gpii.qss.onQssOpen", args: [ "{quickSetStripList}", @@ -393,11 +393,14 @@ "{arguments}.0" // params ] }, - onQssLogoToggled: { this: "{that}.dom.logo", method: "toggle", args: ["{arguments}.0"] + }, + onQssWidgetToggled: { + funcName: "gpii.qss.onQssWidgetToggled", + args: ["{arguments}.0", "{arguments}.1", "{list}.events.onMorePanelClosed"] } }, @@ -490,6 +493,19 @@ } }); + + /** + * Closing the More Panel when a widget from the main QSS is opened. + * @param {Object} button - The button which has been activated. + * @param {Boolean} isShown - The state of the widget dialog. + * @param {fluid.event} event - The `onMorePanelClosed` event. + */ + gpii.qss.onQssWidgetToggled = function (button, isShown, event) { + if (!button.schema.morePanel && isShown) { + event.fire(); + } + }; + /** * Returns the index of the `setting` object in the `settings` array. Settings are identified * by their `path` property which is expected to be existent and unique. From 77e31f3701d103d9da8d0faf54506c4d416c9e89 Mon Sep 17 00:00:00 2001 From: ste Date: Thu, 26 Mar 2020 17:33:52 +0000 Subject: [PATCH 094/116] GPII-4289: Loading appBarQss from site config. --- siteconfig.json5 | 3 +-- src/main/app.js | 1 + src/main/dialogs/quickSetStrip/qssDialog.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index ed1949583..bf85eefd9 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -167,8 +167,7 @@ closeQssOnClickOutside: false, // Make the QSS dock to the bottom of the screen, so application windows are positioned above it. - // This is ignored if closeQssOnClickOutside is true - appBarQss: false, + appBarQss: true, // Whether to disable the displaying of notifications that suggest some // applications may need to be restarted in order for a changed setting to be diff --git a/src/main/app.js b/src/main/app.js index 3fef6a9d5..720a2e0ef 100644 --- a/src/main/app.js +++ b/src/main/app.js @@ -208,6 +208,7 @@ fluid.defaults("gpii.app", { keyedInUserToken: "{app}.model.keyedInUserToken", closeQssOnBlur: "{app}.model.preferences.closeQssOnBlur", + appBarQss: "{app}.model.preferences.appBarQss", disableRestartWarning: "{app}.model.preferences.disableRestartWarning" }, listeners: { diff --git a/src/main/dialogs/quickSetStrip/qssDialog.js b/src/main/dialogs/quickSetStrip/qssDialog.js index 4acd5f397..9a9040913 100644 --- a/src/main/dialogs/quickSetStrip/qssDialog.js +++ b/src/main/dialogs/quickSetStrip/qssDialog.js @@ -68,7 +68,7 @@ fluid.defaults("gpii.app.qss", { }, isShown: { funcName: "gpii.app.qss.appBarUpdate", - args: ["{that}", "{appBar}", "{that}.dialog", "{change}.value", "{that}.model.closeQssOnBlur"], + args: ["{that}", "{appBar}", "{that}.dialog", "{change}.value", "{that}.model.appBarQss"], namespace: "appBar", priority: "before:impl" //excludeSource: "init" @@ -460,10 +460,10 @@ gpii.app.qss.appBarInit = function (appBar) { * @param {Component} appBar The gpii.windows.appBar instance. * @param {BrowserWindow} dialog The BrowserWindow for the QSS. * @param {Boolean} shown `true` if the QSS is being shown, and the work area should be consumed. - * @param {Boolean} closeQssOnBlur `true` if the QSS will be closed when unfocused, disabling this feature. + * @param {Boolean} appBarQss `true` if this feature is enabled. */ -gpii.app.qss.appBarUpdate = function (qss, appBar, dialog, shown, closeQssOnBlur) { - if (shown && !closeQssOnBlur) { +gpii.app.qss.appBarUpdate = function (qss, appBar, dialog, shown, appBarQss) { + if (shown && appBarQss) { // Ignore changes to the work area while adjusting it, so the QSS doesn't flicker or move around needlessly. qss.ignoreWorkArea = true; setTimeout(function () { From ed1448f127d4685f0deaf99bafa248680006e7f9 Mon Sep 17 00:00:00 2001 From: ste Date: Fri, 27 Mar 2020 23:27:48 +0000 Subject: [PATCH 095/116] GPII-4289: Calculating QSS height, rather than using the window size. --- src/main/dialogs/quickSetStrip/qssDialog.js | 27 ++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/main/dialogs/quickSetStrip/qssDialog.js b/src/main/dialogs/quickSetStrip/qssDialog.js index 9a9040913..8488f5f80 100644 --- a/src/main/dialogs/quickSetStrip/qssDialog.js +++ b/src/main/dialogs/quickSetStrip/qssDialog.js @@ -214,7 +214,8 @@ fluid.defaults("gpii.app.qss", { this: "{qss}.dialog", method: "unhookWindowMessage", args: ["{arguments}.0", "{arguments}.1"] - } + }, + getBarHeight: "{qss}.getQssPixelHeight" }, listeners: { "onCreate.init": { @@ -258,6 +259,10 @@ fluid.defaults("gpii.app.qss", { fitToScreen: { funcName: "gpii.app.qss.fitToScreen", args: ["{that}"] + }, + getQssPixelHeight: { + funcName: "gpii.app.qss.getQssPixelHeight", + args: ["{that}"] } } }); @@ -286,6 +291,26 @@ gpii.app.qss.computeQssHeight = function (that, height) { that.setBounds(null, scaledQssHeight); }; +/** + * Calculates the height of the QSS strip + * @param {gpii.app.qssInWrapper} that - instance of the qssInWrapper + * @param {Integer} height - the desired height of the QSS + */ +gpii.app.qss.computeQssHeight = function (that, height) { + var scaledQssHeight = height * that.model.scaleFactor; + that.setBounds(null, scaledQssHeight); +}; + +/** + * Gets the actual height of the QSS, in physical pixels. + * @param {gpii.app.qssInWrapper} that - instance of the qssInWrapper + * @return {Number} The height of the QSS in physical pixels. + */ +gpii.app.qss.getQssPixelHeight = function (that) { + return Math.floor(Math.round(that.options.config.attrs.height * that.model.scaleFactor) + * electron.screen.getPrimaryDisplay().scaleFactor); +}; + /** * Represents a group of setting data from which we using only the buttonTypes array * @typedef {Object} ButtonDefinition From e385e464a9127ae69e051cc9b6a49e79a306516b Mon Sep 17 00:00:00 2001 From: ste Date: Sun, 29 Mar 2020 19:01:32 +0100 Subject: [PATCH 096/116] GPII-3730: Moving colour vision text to under the buttons --- src/renderer/qssWidget/css/qssMenuWidget.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/qssWidget/css/qssMenuWidget.css b/src/renderer/qssWidget/css/qssMenuWidget.css index 2bd933f26..aae7e77dc 100644 --- a/src/renderer/qssWidget/css/qssMenuWidget.css +++ b/src/renderer/qssWidget/css/qssMenuWidget.css @@ -147,5 +147,5 @@ /* CSS specific for the color wheel footertip */ .colorWheelTip { position: relative; - bottom: 50px; + bottom: 10px; } From d30a6cfb9f9068a834500db79217f93994fe257f Mon Sep 17 00:00:00 2001 From: ste Date: Sun, 29 Mar 2020 23:23:14 +0100 Subject: [PATCH 097/116] NOJIRA: Updating gpii-windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c499aa969..5886fc7b9 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "GPII/windows#cee3522e6828059f0e730762adf770a1c382ad0f" + "gpii-windows": "GPII/windows#0a25bea25d70ad4131e51c9c7f875a7cf112333b" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 6e8a33210482964f83c90f5bfd4ddd26afb7dd06 Mon Sep 17 00:00:00 2001 From: ste Date: Mon, 30 Mar 2020 13:31:20 +0100 Subject: [PATCH 098/116] NOJIRA: Updating version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5886fc7b9..6f0b02aee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.4", + "version": "1.3.4-r2", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "GPII/windows#0a25bea25d70ad4131e51c9c7f875a7cf112333b" + "gpii-windows": "GPII/windows#63214600696b59636b4dfc0aa2266f43ffbdfdb8" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From 14a3f11a20588d19049e419e8ddbe29c876e0079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 14 Apr 2020 16:42:39 +0200 Subject: [PATCH 099/116] GPII-4447: Updated gpii-windows reference This update brings windows/stegru#GPII-4428 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f0b02aee..9774fa885 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "GPII/windows#63214600696b59636b4dfc0aa2266f43ffbdfdb8" + "gpii-windows": "GPII/windows#2d5edfbb164d6352ef81c70fa6961f9f278eab74" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From e42b03d3bf6852199765f3a72af6a892094c1499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 14 Apr 2020 17:03:44 +0200 Subject: [PATCH 100/116] GPII-4447: Bumped to 1.3.4-r3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9774fa885..97b3979c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.4-r2", + "version": "1.3.4-r3", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { From c46e7ce3ed4ab26dfea7637761f7a2553c8652f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 26 May 2020 13:13:04 +0200 Subject: [PATCH 101/116] GPII-4490: Updated gpii-windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f5b710877..e8bf80e5b 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "0.3.0-dev.20200514T214925Z.26f1e42" + "gpii-windows": "javihernandez/windows#9ca8c6b1c15021651f50dbe738648a6aef9229a4" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From ee701bc740b958a090ad09f8a742cc92138a4fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Tue, 26 May 2020 13:15:25 +0200 Subject: [PATCH 102/116] GPII-4490: Pointing to Javi's dev cluster --- provisioning/service.json5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/provisioning/service.json5 b/provisioning/service.json5 index 48f8d71cd..672962050 100644 --- a/provisioning/service.json5 +++ b/provisioning/service.json5 @@ -12,7 +12,8 @@ "disabled": false, env: { NODE_ENV: "app.production", - GPII_CLOUD_URL: "https://flowmanager.stg.gcp.gpii.net" + GPII_CLOUD_URL: "https://flowmanager.jhernandez.dev.gcp.gpii.net", + NODE_TLS_REJECT_UNAUTHORIZED: 0 } } }, From 98e1b41767a4e347fe51d769c7aaafbfaaf27592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 29 May 2020 18:56:29 +0200 Subject: [PATCH 103/116] GPII-4490: Updated gpii-windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8bf80e5b..72538a298 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#9ca8c6b1c15021651f50dbe738648a6aef9229a4" + "gpii-windows": "javihernandez/windows#b33d5e2b831750aa2c4d513ed3b4a7594b0a6735" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From c8862e79efb9a6200b7701d707a329f9c002577b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 29 May 2020 18:56:50 +0200 Subject: [PATCH 104/116] GPII-4490: Bumped to 1.3.5-r1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72538a298..ccf81984d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.4-r3", + "version": "1.3.5-r1", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { From a49ce94dfb5a17b44c0046ed2becc8718dadf3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 10 Jun 2020 13:06:23 +0200 Subject: [PATCH 105/116] GPII-4490: Updated mapOff and default value for cursorSize setting Short-term fix for GPII-4384, see https://github.com/GPII/gpii-app/pull/206#issuecomment-638800962 --- src/main/gpiiConnector.js | 2 +- testData/qss/settings.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index ec20fa14f..d397ff53f 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -776,7 +776,7 @@ fluid.defaults("gpii.app.dev.gpiiConnector.qss", { "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.PointerSpeed": { value: 10 }, "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.SwapMouseButtons": { value: 0 }, "http://registry\\.gpii\\.net/applications/com\\.microsoft\\.windows\\.mouseSettings.DoubleClickTime": { value: 500 }, - "http://registry\\.gpii\\.net/common/cursorSize": { value: 0.5 } + "http://registry\\.gpii\\.net/common/cursorSize": { value: 0 } } }); diff --git a/testData/qss/settings.json b/testData/qss/settings.json index bfc4b9d0d..44d0c8f51 100644 --- a/testData/qss/settings.json +++ b/testData/qss/settings.json @@ -226,10 +226,10 @@ "schema": { "type": "boolean", "mapOn": 1, - "mapOff": 0.5, - "default": 0.5 + "mapOff": 0, + "default": 0 }, - "value": 0.5, + "value": 0, "messageKey": "windows-largerMousePointer" } }, From a2b1b8aa8ba5a892b4a8f8dc9232575d7173b81b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 10 Jun 2020 13:21:55 +0200 Subject: [PATCH 106/116] GPII-4490: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ccf81984d..bc95bdaf5 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#b33d5e2b831750aa2c4d513ed3b4a7594b0a6735" + "gpii-windows": "javihernandez/windows#af991dfc84448751f2e716be7ec2f326fa8b82c1" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From e08bb0bfb56dd012facfe80241fb67cb3bf928fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 10 Jun 2020 14:31:24 +0200 Subject: [PATCH 107/116] GPII-4490: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc95bdaf5..671085ae4 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#af991dfc84448751f2e716be7ec2f326fa8b82c1" + "gpii-windows": "javihernandez/windows#0c1b23bbf4290b17a934ff64029fd7db97624a37" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From bab06b8012b232e8c5c8c19c5faf62ebc484ac65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 12 Jun 2020 17:53:11 +0200 Subject: [PATCH 108/116] GPII-4490: Removed references to defaultSettingsData Some leftovers of the old defaultSettings logic that was in place before merging https://github.com/GPII/gpii-app/pull/196 into master. --- src/main/gpiiConnector.js | 3 +-- src/main/siteConfigurationHandler.js | 4 ---- tests/fixtures/siteconfigHandler.json5 | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/gpiiConnector.js b/src/main/gpiiConnector.js index 225732af5..bf9365a4d 100644 --- a/src/main/gpiiConnector.js +++ b/src/main/gpiiConnector.js @@ -41,8 +41,7 @@ fluid.defaults("gpii.app.gpiiConnector", { closeQssOnBlur: false, // The QSS will take up space from the desktop work area. Ignored if closeQssOnBlur is true. appBarQss: false, - disableRestartWarning: false, - defaultSettingsData: null + disableRestartWarning: false }, events: { diff --git a/src/main/siteConfigurationHandler.js b/src/main/siteConfigurationHandler.js index a38d1f365..9de8ff348 100644 --- a/src/main/siteConfigurationHandler.js +++ b/src/main/siteConfigurationHandler.js @@ -95,10 +95,6 @@ fluid.defaults("gpii.app.siteConfigurationHandler", { record: "{that}.options.siteConfig.qss.systemDefaultLanguage", target: "{app gpiiConnector}.options.defaultPreferences.systemDefaultLanguage" }, - distributeDefaultSettingsPath: { - record: "{that}.options.siteConfig.defaultSettingsData", - target: "{app gpiiConnector}.options.defaultPreferences.defaultSettingsData" - }, distributeSurveyTriggersUrl: { record: "{that}.options.siteConfig.surveyTriggersUrl", target: "{that surveyConnector}.options.config.surveyTriggersUrl" diff --git a/tests/fixtures/siteconfigHandler.json5 b/tests/fixtures/siteconfigHandler.json5 index a8a5d458b..8ca64481f 100644 --- a/tests/fixtures/siteconfigHandler.json5 +++ b/tests/fixtures/siteconfigHandler.json5 @@ -8,8 +8,5 @@ messages: { keyedOut: "To save your settings you need to setup a Morphic Account." } - }, - defaultSettingsData: { - fileLocation: "V:\\tests\\fixtures\\defaultSettings123.json5" } } From aa270f7e23d47f67499885a066bd2f295c731923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 12 Jun 2020 18:01:18 +0200 Subject: [PATCH 109/116] GPII-4490: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 671085ae4..c269367a1 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#0c1b23bbf4290b17a934ff64029fd7db97624a37" + "gpii-windows": "javihernandez/windows#c538930d4220cc91ab6a297143ab4667d226d299" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From dcc090a5a1bce335d4a19115f86bd3652044b532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 12 Jun 2020 18:06:24 +0200 Subject: [PATCH 110/116] GPII-4490: Removed screen-capture button ShareX is no longer bundled into Morphic --- siteconfig.json5 | 1 - 1 file changed, 1 deletion(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 2acad55c3..769bd8f2f 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -152,7 +152,6 @@ "popupText": "

Open Reddit in a web browser.

", "description": "The full description of the button..." }, - "screen-capture", "url-customize-qss", "url-google-drive", "url-one-drive", From 816ccfdabb1f2c230268f97b6ccdda088d058a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 12 Jun 2020 19:25:46 +0200 Subject: [PATCH 111/116] GPII-4490: Removed tests/fixtures/defaultSettings.json5 This is a leftover of https://github.com/GPII/gpii-app/pull/115 --- tests/fixtures/defaultSettings.json5 | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 tests/fixtures/defaultSettings.json5 diff --git a/tests/fixtures/defaultSettings.json5 b/tests/fixtures/defaultSettings.json5 deleted file mode 100644 index 9bb7e3dd8..000000000 --- a/tests/fixtures/defaultSettings.json5 +++ /dev/null @@ -1,16 +0,0 @@ -{ - "contexts": { - "gpii-default": { - "preferences": { - "http://registry.gpii.net/common/language": "en-US", - "http://registry.gpii.net/common/DPIScale": 0, - "http://registry.gpii.net/common/highContrast/enabled": false, - "http://registry.gpii.net/common/highContrastTheme": "regular-contrast", - "http://registry.gpii.net/common/selfVoicing/enabled": false, - "http://registry.gpii.net/applications/com.microsoft.office": { - "word-ribbon": "StandardSet" - } - } - } - } -} \ No newline at end of file From 0b10e6359469ec5351fdc4e9f761314cdef68888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Fri, 12 Jun 2020 19:28:01 +0200 Subject: [PATCH 112/116] GPII-4490: Made linter happy Also, removed duped function declaration from a previous merge --- src/main/dialogs/quickSetStrip/qssDialog.js | 30 --------------------- tests/configs/gpii.tests.all.config.json5 | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/main/dialogs/quickSetStrip/qssDialog.js b/src/main/dialogs/quickSetStrip/qssDialog.js index 46d237057..aa9160d8c 100644 --- a/src/main/dialogs/quickSetStrip/qssDialog.js +++ b/src/main/dialogs/quickSetStrip/qssDialog.js @@ -289,36 +289,6 @@ gpii.app.qss.computeQssHeight = function (that, height) { that.setBounds(null, scaledQssHeight); }; -/** - * Calculates the height of the QSS strip - * @param {gpii.app.qssInWrapper} that - instance of the qssInWrapper - * @param {Integer} height - the desired height of the QSS - */ -gpii.app.qss.computeQssHeight = function (that, height) { - var scaledQssHeight = height * that.model.scaleFactor; - that.setBounds(null, scaledQssHeight); -}; - -/** - * Gets the actual height of the QSS, in physical pixels. - * @param {gpii.app.qssInWrapper} that - instance of the qssInWrapper - * @return {Number} The height of the QSS in physical pixels. - */ -gpii.app.qss.getQssPixelHeight = function (that) { - return Math.floor(Math.round(that.options.config.attrs.height * that.model.scaleFactor) - * electron.screen.getPrimaryDisplay().scaleFactor); -}; - -/** - * Calculates the height of the QSS strip - * @param {gpii.app.qssInWrapper} that - instance of the qssInWrapper - * @param {Integer} height - the desired height of the QSS - */ -gpii.app.qss.computeQssHeight = function (that, height) { - var scaledQssHeight = height * that.model.scaleFactor; - that.setBounds(null, scaledQssHeight); -}; - /** * Gets the actual height of the QSS, in physical pixels. * @param {gpii.app.qssInWrapper} that - instance of the qssInWrapper diff --git a/tests/configs/gpii.tests.all.config.json5 b/tests/configs/gpii.tests.all.config.json5 index 8d531e55c..2da727195 100644 --- a/tests/configs/gpii.tests.all.config.json5 +++ b/tests/configs/gpii.tests.all.config.json5 @@ -71,7 +71,7 @@ // } // TODO: Use one of the new grades here once it's merged: // https://github.com/GPII/universal/pull/751 - } +// } }, "mergeConfigs": [ "%gpii-universal/gpii/configs/shared/gpii.config.untrusted.development.dynamicDR.local.json5", From 0fe9c629dafd9c1afa04879a5f9d347488b16d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 15 Jun 2020 12:50:38 +0200 Subject: [PATCH 113/116] GPII-4490: Updated windows reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c269367a1..b425a98c0 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "shelljs": "0.8.2" }, "optionalDependencies": { - "gpii-windows": "javihernandez/windows#c538930d4220cc91ab6a297143ab4667d226d299" + "gpii-windows": "javihernandez/windows#060f99dd9a408622708d2ff499db54ed4d680381" }, "scripts": { "start": "set GPII_TEST_COUCH_USE_EXTERNAL=TRUE && electron .", From cda5c3ed0be2387693c072212ef80f877d5dbfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Mon, 15 Jun 2020 12:53:57 +0200 Subject: [PATCH 114/116] GPII-4490: Bumped to 1.3.5-r2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b425a98c0..d2abb98ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.5-r1", + "version": "1.3.5-r2", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": { From f8387a452411c66a56f3b12dfaf8afc2375c778f Mon Sep 17 00:00:00 2001 From: Steven Githens Date: Tue, 23 Jun 2020 15:35:16 -0700 Subject: [PATCH 115/116] GPII-4489 Adding optional menu item generation to be able to selectively include Capture Tool --- siteconfig.json5 | 4 ++++ src/main/menu.js | 32 ++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/siteconfig.json5 b/siteconfig.json5 index 54c6b9000..3e5701b3c 100644 --- a/siteconfig.json5 +++ b/siteconfig.json5 @@ -6,6 +6,10 @@ // `true` if the button should be hidden and `false` otherwise. hideQssSaveButton: false, + // Whether to hide the Capture Tool buttons. + // These "buttons" are actually currently right click menu items on the task tray. + hideCaptureToolButton: false, + // Configuration options for the QSS window qss: { // Whether a user can open Settings pages and Control Panels of the operating system diff --git a/src/main/menu.js b/src/main/menu.js index 4b7fea8ce..45ac9538d 100644 --- a/src/main/menu.js +++ b/src/main/menu.js @@ -406,8 +406,8 @@ fluid.defaults("gpii.app.menu", { target: "showCaptureTool", singleTransform: { type: "fluid.transforms.free", - func: "gpii.app.menu.getSimpleMenuItem", - args: ["Capture Tool", "onCaptureTool"] + func: "gpii.app.menu.getOptionalMenuItem", + args: ["{siteConfigurationHandler}.options.siteConfig.hideCaptureToolButton", "Capture Tool", "onCaptureTool"] }, forward: { excludeSource: "init" @@ -417,8 +417,8 @@ fluid.defaults("gpii.app.menu", { target: "showCaptureDiagnostics", singleTransform: { type: "fluid.transforms.free", - func: "gpii.app.menu.getSimpleMenuItem", - args: ["Capture Tool Diagnostics", "onCaptureDiagnostics"] + func: "gpii.app.menu.getOptionalMenuItem", + args: ["{siteConfigurationHandler}.options.siteConfig.hideCaptureToolButton", "Capture Tool Diagnostics", "onCaptureDiagnostics"] }, forward: { excludeSource: "init" @@ -563,6 +563,30 @@ gpii.app.menu.getSimpleMenuItem = function (label, event, payload) { }; }; +/** + * Generates an object that represents a selectable menu item. Similar to getSimpleMenuItem, + * but respects an initial boolean which could be a setting from the siteConfig determining + * whether to display this item or not. + * @param {Boolean} hideItem - If true, this menu item will not be displayed. (ie. this function + * will not return the usual menu structure). + * @param {String} label - The label of the item. + * @param {String} event - The event to be triggered on click. + * @param {Object} [payload] - The payload that is to be supplied with the on click event. + * @return {ElectronMenuItem} A simple selectable Electron menu item. + */ +gpii.app.menu.getOptionalMenuItem = function (hideItem, label, event, payload) { + if (hideItem) { + return; + } + else { + return { + label: label, + click: event, + args: payload || {} + }; + } +}; + /** * Generates a simple Electron context menu separator item. * @return {Object} The separator menu item. From b860b4f79ba5ea86257a35604edb231db315ff3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Hern=C3=A1ndez?= Date: Wed, 24 Jun 2020 19:04:55 +0200 Subject: [PATCH 116/116] GPII-4490: Bumped to 1.3.5-r3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2abb98ea..ee860d64e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gpii-app", - "version": "1.3.5-r2", + "version": "1.3.5-r3", "description": "Electron application and libraries to run the GPII as a native user space application on the desktop", "main": "main.js", "repository": {