GPII-228 Combined gpii.flowManager getSolutions and getSolutionsPromise

Author: sgithens

gpii/node_modules/flowManager/src/Capture.js

@@ -29,15 +29,15 @@ fluid.defaults("gpii.flowManager.capture", {
             args: ["{flowManager}.deviceReporter"],
             priority: "first"
         },
-        "onSolutionsForCurrentDevice.getSolutionsPromise": {
-            funcName: "gpii.flowManager.getSolutionsPromise",
+        "onSolutionsForCurrentDevice.getSolutions": {
+            funcName: "gpii.flowManager.getSolutions",
             args: [ "{flowManager}.solutionsRegistryDataSource", "{arguments}.0"],
             priority: "after:getDeviceContextPromise"
         },
         "onSolutionsForCurrentDevice.solutionsRegistryEntriesToPromise": {
             funcName: "fluid.toPromise",
             args: ["{arguments}.0.solutionsRegistryEntries"],
-            priority: "after:getSolutionsPromise"
+            priority: "after:getSolutions"
         },
         // Begin declaration of Promise Chain for onCaptureSettingsForCurrentDevice
         "onCaptureSettingsForCurrentDevice.getInstalledSolutionsForCurrentDevice": {

gpii/node_modules/flowManager/src/MatchMaking.js

@@ -78,29 +78,23 @@
     };
 
     /*
-     * Asynchronous function which makes a get call to the solutions registry (1st parameter) to
+     * Asynchronous/Promise returning function which makes a get call to the solutions registry (1st parameter) to
      * retrieve the solutions registry matching what is passed in the `device` parameter.
      * This is appended to the matchmaker payload (mmpayload) parameter, which in turn is passed
      * as parameter in the event fired.
      *
+     * This function can be used with either (or both) asyncronously with an `event` and `onError` handlers
+     * passed in, or with the returned `fluid.promise`.
+     *
      * @solutionsRegistryDataSource (Object) - a solutions registry data source
      * @deviceContext (Object) - output from a device reporter. Used to filter solutions registry entries
-     * @event (Object) - Event to be fired when the solutionsRegistry entry has been retrieved
-     * @onError (Object) - Event to be fired when an error occurs
+     * @event (Object) - Optional: Event to be fired when the solutionsRegistry entry has been retrieved
+     * @onError (Object) - Optional: Event to be fired when an error occurs
      *
-     * @return (undefined) - function is asynchronous and doesn't return anything. Instead the event
-     *      is fired with the modified mmpayload.
+     * @return (fluid.promise) - Returns a promise resolving with the mmpayload . Optionally if provided, the events
+     *      are also fired with the modified mmpayload.
      */
     gpii.flowManager.getSolutions = function (solutionsRegistryDataSource, deviceContext, event, onError) {
-        gpii.flowManager.getSolutionsPromise(solutionsRegistryDataSource, deviceContext).then(
-            function (data) {
-                event.fire(data.solutionsRegistryEntries, data.solutions);
-            },
-            onError.fire
-        );
-    };
-
-    gpii.flowManager.getSolutionsPromise = function (solutionsRegistryDataSource, deviceContext) {
         var promiseTogo = fluid.promise();
 
         var os = fluid.get(deviceContext, "OS.id");
@@ -112,7 +106,15 @@
                 solutionsRegistryEntries: solutionsRegistryEntries,
                 solutions: solutions
             });
-        }, promiseTogo.reject);
+            if (event) {
+                event.fire(solutionsRegistryEntries, solutions);
+            }
+        }, function (error) {
+            promiseTogo.reject(error);
+            if (onError) {
+                onError.fire(error);
+            }
+        });
 
         return promiseTogo;
     };