Skip to content

GPII-4173: Onboard Morphic #888

New issue

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

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

Already on GitHub? Sign in to your account

Draft
wants to merge 106 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
c48d1a4
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Feb 2, 2018
ca42538
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Mar 28, 2018
7a7efb7
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Apr 30, 2018
db15f62
GPII-2971: The beginning of IoD.
stegru May 2, 2018
6ad68cf
GPII-2971: Moved installation routing into installer component.
stegru May 2, 2018
281b874
GPII-2971: Data source for package info
stegru May 3, 2018
1bd0a52
GPII-2971: tests for installOnDemand
stegru May 4, 2018
e84463e
GPII-2971: packageInstaller tests
stegru May 4, 2018
e9b2ba2
GPII-2972: Client + IoD connectivity.
stegru May 8, 2018
46943c1
GPII-2972: Improved IoD server detection.
stegru May 8, 2018
681e71e
Merge remote-tracking branch 'upstream/master' into GPII-2971
stegru May 8, 2018
4839108
GPII-2972: Proper jsdoc.
stegru May 8, 2018
75e5e5b
GPII-2971: Documented packageInfo.
stegru May 8, 2018
b0fa227
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru May 10, 2018
db6ca28
GPII-2971: Made the package installer creation nicer.
stegru May 10, 2018
34fb819
GPII-2971: Documented multi-language packages
stegru May 10, 2018
e58bc39
GPII-2971: Can install/uninstall packages at key-in/out (very hacky)
stegru May 11, 2018
5646ed3
GPII-2971: Fixed incorrect context awareness
stegru May 14, 2018
e69b63f
GPII-2971: Persistent storage of installation info.
stegru May 14, 2018
ea898f9
GPII-2971: Uninstall when inactive, or after restart if failed.
stegru May 17, 2018
577428b
GPII-2971: Documentation
stegru May 17, 2018
3c077a2
Merge remote-tracking branch 'upstream/master' into GPII-2971
stegru May 17, 2018
a7f58cc
GPII-2971: Documentation fix
stegru May 17, 2018
ff6615a
GPII-2971: Missing comma
stegru May 17, 2018
0e4685e
GPII-2971: Removed chocolatey installation script
stegru May 22, 2018
3620aa2
GPII-2971: IoD settings handler
stegru Jun 6, 2018
c141655
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Jun 6, 2018
46e1638
Merge branch 'GPII-2338' into GPII-2971
stegru Jun 7, 2018
5b2f200
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Jun 25, 2018
1c2944f
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Jul 3, 2018
11165a2
Merge branch 'GPII-2338' into GPII-2971
stegru Jul 10, 2018
1ac70c7
Merge remote-tracking branch 'upstream/master' into GPII-2971
stegru Aug 20, 2018
1e82e14
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Aug 20, 2018
7a6f50c
Merge branch 'GPII-2338' into GPII-2971
stegru Aug 20, 2018
d6bd666
GPII-2971: Linting fixes.
stegru Aug 20, 2018
d810e09
GPII-2971: JSON5
stegru Aug 22, 2018
0588d60
Merge remote-tracking branch 'upstream/master' into GPII-2971
stegru Sep 11, 2018
1856a1f
Merge remote-tracking branch 'upstream/master' into GPII-2338
stegru Sep 11, 2018
cdb739f
Merge branch 'GPII-2338' into GPII-2971
stegru Sep 11, 2018
de3398d
GPII-2971: Renamed IoD module name to gpii-iod
stegru Sep 11, 2018
c985951
GPII-2971: Disable IoD server auto detection by default
stegru Sep 11, 2018
5d5e7d5
GPII-2971: Start detecting if a package is already installed
stegru Sep 13, 2018
2343f37
Merge branch 'GPII-2338' into GPII-2971
stegru Aug 13, 2019
d5f2d62
GPII-2971: IoD install/uninstall on key-in/out
stegru Sep 6, 2019
64baa0d
GPII-2971: Start/stop application
stegru Sep 11, 2019
0206f9e
GPII-2971: All tests working.
stegru Sep 12, 2019
ea354a4
GPII-2971: Changed tests to json5
stegru Sep 12, 2019
3b92b64
GPII-2971: Packages support transforms, resolvers, isInstalled
stegru Sep 19, 2019
eb8e9f2
GPII-2971: IoD server/client connectivity
stegru Oct 25, 2019
c29c3bb
GPII-2971: Serve & download package data + installer
stegru Nov 7, 2019
f84c213
GPII-2971: Authorised code signing keys
stegru Nov 11, 2019
825a304
GPII-2971: Removed endpoint modification
stegru Nov 11, 2019
08b7924
GPII-4173 Initial skeleton of Morphic QSS User Preferences
sgithens Nov 13, 2019
92f92a1
GPII-2971: Added IoD endpoint to siteconfig
stegru Nov 13, 2019
f8f68da
GPII-2971: Added support for windows installer (msi)
stegru Nov 13, 2019
4ac05d4
GPII-2971: added uninstallTime to package data
stegru Nov 14, 2019
bc868e1
GPII-2971: Auto-install, from siteconfig
stegru Nov 15, 2019
99f4435
GPII-2971: Added some preference sets for IoD
stegru Nov 19, 2019
ca83888
GPII-2971: Added some iod preference sets
stegru Nov 25, 2019
7f99ebb
GPII-2971: Not re-installing previously installed packages.
stegru Dec 27, 2019
a315c63
GPII-2971: Configurable auto-remove delay.
stegru Dec 27, 2019
378ec7d
GPII-2971: Updated tests to match new code.
stegru Dec 27, 2019
6640bb2
GPII-2971: Installers now using the same command execution method
stegru Dec 28, 2019
33d18bb
GPII-2971: Improved IoD tests, increased coverage
stegru Dec 28, 2019
a7b33cc
GPII-2971: IoD tests pass
stegru Dec 29, 2019
2eaa794
GPII-2971: Added installCommands to packageData.
stegru Dec 29, 2019
5b75e74
GPII-2971: Improved command execution
stegru Dec 30, 2019
684280d
GPII-2971: implemented multiDataSource
stegru Dec 30, 2019
9930895
GPII-2971: multiDataSource root sources can be removed.
stegru Jan 2, 2020
0743607
GPII-2971: Able to take packages from a local path.
stegru Jan 4, 2020
0a24db8
GPII-2971: Committing forgotten files.
stegru Jan 4, 2020
7fd09e4
GPII-2971: Multiple package sources specified in config work.
stegru Jan 26, 2020
8097043
GPII-2971: Corrected test expectation.
stegru Jan 26, 2020
9c0668b
GPII-2971: Detecting mounted drives for IoD
stegru Jan 27, 2020
479816a
GPII-2971: Using exit codes for installer commands
stegru Jan 29, 2020
5187e4f
GPII-4490: Merge branch 'javihernandez/GPII-4384' into morphic-1.3.5
javihernandez May 29, 2020
08df7cb
GPII-4500: Fixed the "preference" metric.
stegru Jun 8, 2020
2f6d444
GPII-4500: Updates tests for code changes.
stegru Jun 9, 2020
35f1ff8
Merge branch 'upstream/master' into morphic-1.3.5
javihernandez Jun 10, 2020
de6d206
GPII-4490: Merge branch 'stegru/GPII-4500' into morphic-1.3.5
javihernandez Jun 10, 2020
99a478a
Merge branch 'upstream/master' into morphic-1.3.5
javihernandez Jun 12, 2020
3f1831a
GPII-4490: Merge branch 'origin/GPII-4507' into morphic-1.3.5
javihernandez Jun 12, 2020
4b4f238
GPII-4490: Merge branch 'upstream/master' into morphic-1.3.5
javihernandez Jun 15, 2020
81dc426
NOJIRA: Removed language from defaultSettings
javihernandez Oct 28, 2020
5ac4d50
Merge branch 'upstream/master' into GPII-4173
javihernandez Nov 26, 2020
b6a4a16
GPII-4173: Updated net.gpii.morphic solution registry entry
javihernandez Nov 26, 2020
fc3fa67
GPII-4173: Updated settings in morphic solutions registry entry
javihernandez Nov 27, 2020
c06d1a1
GPII-4173: Added integration/acceptance tests for gpii.net.morphic
javihernandez Nov 27, 2020
11d0c3e
GPII-4173: Added a description for net.gpii.morphic
javihernandez Nov 30, 2020
e48e32c
GPII-4173: Moved morphic_application.json5 into the testData/preferences
javihernandez Nov 30, 2020
49b62bc
GPII-4173: Removed showQssOnStart as it doesn't make sense to onboard
javihernandez Dec 3, 2020
122c88a
GPII-4173: Removed showQssOnStart from integration/acceptance tests
javihernandez Dec 3, 2020
9d859e2
GPII-4173: Removed showQssOnStart from solutions registry
javihernandez Jan 8, 2021
68a1c14
Merge remote-tracking branch 'origin/smartwork' into GPII-2971+smartwork
javihernandez Feb 16, 2021
d8d812b
Merge branch 'GPII-2971+smartwork' into SW-24
javihernandez Feb 16, 2021
c36e540
Merge branch 'javihernandez/SW-24' into smartwork (#30)
javihernandez Feb 23, 2021
16890d0
Merge branch 'javihernandez/smartwork' into GPII-4173
javihernandez Apr 6, 2021
264f5d3
GPII-4173: Fixed up some linting warnings and errors
javihernandez Apr 6, 2021
dc34b0f
GPII-4173: Continued fixing linting warnings and errors
javihernandez Apr 6, 2021
d091346
GPII-4173: Finished fixing linting warnings and errors
javihernandez Apr 6, 2021
c52b38f
GPII-4173: Fixed remaining lint error in win32.json
javihernandez Apr 6, 2021
585d80e
GPII-4173: Replaced simple with double quotes in local-packages.json5
javihernandez Apr 6, 2021
2d8d963
GPII-4173: Disabled iod tests
javihernandez Apr 6, 2021
f2b3746
GPII-4173: Updated defaultSettings with default iod-pkgs for Smartwork
javihernandez Apr 8, 2021
3709706
GPII-4173: Fixed package name of Smartwork Focus Buddy
javihernandez Apr 8, 2021
4740ad1
GPII-4173: Added defaults for net.gpii.morphic into defaultSettings
javihernandez Apr 10, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .nycrc
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@
"!**/gpii/node_modules/userListeners/src/listeners.js",
"!**/gpii/node_modules/userListeners/src/pcsc.js",
"!**/gpii/node_modules/userListeners/src/usb.js",
"!**/gpii/node_modules/gpii-iod/src/installOnDemand.js",
"!**/gpii/node_modules/gpii-iod/src/iodSettingsHandler.js",
"!**/gpii/node_modules/gpii-iod/src/packageDataSource.js",
"!**/gpii/node_modules/gpii-iod/src/packageInstaller.js",
"!**/gpii/node_modules/gpii-iod/src/packages.js",
"testData",
"tests",
"reports",
Expand All @@ -125,7 +130,7 @@
"gpii.js",
"Gruntfile.js"
],
"reporter": "none",
"reporter": "lcov",
"report-dir": "reports",
"temp-directory": "coverage",
"clean": false
Expand Down
3 changes: 2 additions & 1 deletion gpii/configs/shared/gpii.config.development.base.local.json5
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"%flowManager/configs/gpii.flowManager.config.local.base.json5",
"%preferencesServer/configs/gpii.preferencesServer.config.base.json5",
"%flatMatchMaker/configs/gpii.flatMatchMaker.config.base.json5",
"%gpii-universal/gpii/configs/shared/gpii.config.couch.development.base.json5"
"%gpii-universal/gpii/configs/shared/gpii.config.couch.development.base.json5",
"%gpii-iod/configs/gpii.iod.config.development.json"
]
}
4 changes: 2 additions & 2 deletions gpii/node_modules/eventLog/src/metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ fluid.defaults("gpii.metrics.lifecycle", {
}
},
listeners: {
"{lifecycleManager}.events.onCreate": {
"onCreate": {
namespace: "trackPrefsSetChange",
listener: "gpii.metrics.trackPrefsSetChange",
args: ["{that}", "{lifecycleManager}"]
Expand Down Expand Up @@ -222,7 +222,7 @@ gpii.metrics.preferenceChanged = function (that, current, previous) {
fluid.each(changedPreferences, function (value, name) {
that.logMetric("preference", {
name: name,
newValue: value.toString()
setTo: fluid.isPrimitive(value) ? value.toString() : value
});
});
}
Expand Down
20 changes: 10 additions & 10 deletions gpii/node_modules/eventLog/test/metricsTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ gpii.tests.metrics.preferenceChangedTestData = fluid.freezeRecursive({
},
expect: {
name: "pref1",
newValue: "changed value1"
setTo: "changed value1"
}
},
"changed 2/2": {
Expand All @@ -83,10 +83,10 @@ gpii.tests.metrics.preferenceChangedTestData = fluid.freezeRecursive({
},
expect: [{
name: "pref1",
newValue: "changed value1"
setTo: "changed value1"
}, {
name: "pref2",
newValue: "changed value2"
setTo: "changed value2"
}]
},
"changed 2/3": {
Expand All @@ -102,10 +102,10 @@ gpii.tests.metrics.preferenceChangedTestData = fluid.freezeRecursive({
},
expect: [{
name: "pref1",
newValue: "changed value1"
setTo: "changed value1"
}, {
name: "pref2",
newValue: "changed value2"
setTo: "changed value2"
}]
},
"add 1+1": {
Expand All @@ -118,7 +118,7 @@ gpii.tests.metrics.preferenceChangedTestData = fluid.freezeRecursive({
},
expect: [{
name: "pref2",
newValue: "new value2"
setTo: "new value2"
}]
},
"add+change": {
Expand All @@ -131,10 +131,10 @@ gpii.tests.metrics.preferenceChangedTestData = fluid.freezeRecursive({
},
expect: [{
name: "pref1",
newValue: "changed value1"
setTo: "changed value1"
}, {
name: "pref2",
newValue: "new value2"
setTo: "new value2"
}]
},
"remove 1-1": {
Expand Down Expand Up @@ -168,10 +168,10 @@ gpii.tests.metrics.preferenceChangedTestData = fluid.freezeRecursive({
},
expect: [{
name: "pref2",
newValue: "changed value2"
setTo: "changed value2"
}, {
name: "pref4",
newValue: "new value4"
setTo: "new value4"
}]
}
});
Expand Down
6 changes: 6 additions & 0 deletions gpii/node_modules/flowManager/src/FlowManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ fluid.defaults("gpii.flowManager.local", {
},
userErrors: {
type: "gpii.userErrors"
},
installOnDemand: {
type: "gpii.iod",
options: {
gradeNames: ["gpii.iodLifeCycleManager"]
}
}
},
requestHandlers: {
Expand Down
2 changes: 2 additions & 0 deletions gpii/node_modules/gpii-iod/.gitignore

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

116 changes: 116 additions & 0 deletions gpii/node_modules/gpii-iod/README.md

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

3 changes: 3 additions & 0 deletions gpii/node_modules/gpii-iod/configs/gpii.iod.config.base.json

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

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

20 changes: 20 additions & 0 deletions gpii/node_modules/gpii-iod/configs/gpii.iod.config.local.base.json

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

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

29 changes: 29 additions & 0 deletions gpii/node_modules/gpii-iod/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Install on Demand.
*
* Copyright 2018 Raising the Floor - International
*
* Licensed under the New BSD license. You may not use this file except in
* compliance with this License.
*
* The R&D leading to these results received funding from the
* Department of Education - Grant H421A150005 (GPII-APCP). However,
* these results do not necessarily represent the policy of the
* Department of Education, and you should not assume endorsement by the
* Federal Government.
*
* You may obtain a copy of the License at
* https://github.com/GPII/universal/blob/master/LICENSE.txt
*/

"use strict";

var fluid = require("infusion");

fluid.module.register("gpii-iod", __dirname, require);

require("./src/iodSettingsHandler.js");
require("./src/installOnDemand.js");
require("./src/packageInstaller.js");
require("./src/packages.js");
require("./src/packageDataSource.js");
13 changes: 13 additions & 0 deletions gpii/node_modules/gpii-iod/package.json

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

Loading