Refactoring of dataset group selector

src/main/app.js

@@ -30,7 +30,7 @@ angular.module('PEPFAR.approvals')
 function appController(periodService, $scope, currentUser, mechanismsService,
                        approvalLevelsService, toastr, AppManifest,
                        systemSettings, $translate, userApprovalLevels$,
-                       organisationunitsService, $log, rx, workflowService) {
+                       organisationunitsService, $log, rx, workflowService, dataSetGroupService) {
     var self = this;
     var vm = this;
     var organisationUnit$ = new rx.ReplaySubject(1);
@@ -458,26 +458,27 @@ function appController(periodService, $scope, currentUser, mechanismsService,
     }
 
     //When the dataset group is changed update the filter types and the datasets
-    $scope.$on('DATASETGROUP.changed', function (event, dataSets) {
-        // Grab the period types from the Workflow
-        workflowService.setCurrentWorkflow(dataSets.get()[0].workflow);
+    dataSetGroupService.currentDataSetGroup$
+        .subscribe(function (dataSets) {
+            // Grab the period types from the Workflow
+            workflowService.setCurrentWorkflow(dataSets.get()[0].workflow);
 
-        $scope.details.dataSets = dataSets.get();
-        mechanismsService.categories = dataSets.getCategoryIds();
-        mechanismsService.dataSetIds = dataSets.getIds();
-        mechanismsService.dataSets = dataSets.get();
+            $scope.details.dataSets = dataSets.get();
+            mechanismsService.categories = dataSets.getCategoryIds();
+            mechanismsService.dataSetIds = dataSets.getIds();
+            mechanismsService.dataSets = dataSets.get();
 
-        // Reset the selection
-        $scope.details.currentSelection = [];
+            // Reset the selection
+            $scope.details.currentSelection = [];
 
-        // When the details are available load the mechanisms for the table
-        if (self.hasTableDetails()) {
-            self.showData = false;
-            self.deSelect();
-        }
+            // When the details are available load the mechanisms for the table
+            if (self.hasTableDetails()) {
+                self.showData = false;
+                self.deSelect();
+            }
 
-        self.updateViewButton();
-    });
+            self.updateViewButton();
+        });
 
     function setOrganisationUnit() {
         if (organisationunitsService.currentOrganisationUnit.name === 'Global') {

src/main/datasets/datasetgroup-service.js

@@ -1,13 +1,38 @@
-function dataSetGroupService($q, periodService, Restangular, workflowService, errorHandler) {
-    var service = this;
+function dataSetGroupService($q, periodService, Restangular, workflowService, rx, errorHandler) {
     var dataSetGroups = {};
     var dataSetGroupNames = [];
+    var dataSetGroups$ = new rx.ReplaySubject(1);
+    var currentDataSetGroup$ = new rx.ReplaySubject(1);
 
-    this.getGroups = function () {
-        return dataSetGroups;
+    workflowService.workflows$
+        .flatMap(function (workflows) {
+            return rx.Observable.fromPromise(
+                loadDataSetsForWorkflows(workflows)
+                    .then(matchDataSetsToWorkflows)
+                    .then(setWorkflowsOntoService)
+            );
+        })
+        .subscribe(
+            function () {},
+            function (error) {
+                errorHandler.error(error.message);
+            }
+        );
+
+    return {
+        setCurrentDataSetGroup: setCurrentDataSetGroup,
+        dataSetGroups$: dataSetGroups$,
+        currentDataSetGroup$: currentDataSetGroup$,
+        getDataSetsForGroup: getDataSetsForGroup
     };
 
-    this.filterDataSetsForUser = function (workflows) {
+    function setCurrentDataSetGroup(selectedDataSetGroup) {
+        var dataSetGroup = dataSetGroupFactory(getDataSetsForGroup(selectedDataSetGroup));
+
+        currentDataSetGroup$.onNext(dataSetGroup);
+    }
+
+    function filterDataSetsForUser(workflows) {
         function onlyWorkflowsWithDataSets(workflow) {
             return Array.isArray(workflow.dataSets) && workflow.dataSets.length > 0;
         }
@@ -31,18 +56,16 @@ function dataSetGroupService($q, periodService, Restangular, workflowService, er
 
         if (!(dataSetGroups && dataSetGroupNames[0] && dataSetGroups[dataSetGroupNames[0]])) {
             errorHandler.warning('No dataset groups were found that your account can access. This could be the result of your account not having access to these datasets.', true);
+        } else {
+            dataSetGroups$.onNext(dataSetGroupNames);
         }
-    };
-
-    this.getDataSetGroupNames = function () {
-        return dataSetGroupNames;
-    };
+    }
 
-    this.getDataSetsForGroup = function (dataSetGroupName) {
+    function getDataSetsForGroup(dataSetGroupName) {
         if (dataSetGroups[dataSetGroupName]) {
             return dataSetGroups[dataSetGroupName].dataSets;
         }
-    };
+    }
 
     function pickId(value) {
         return value.id;
@@ -103,46 +126,32 @@ function dataSetGroupService($q, periodService, Restangular, workflowService, er
         if (!Array.isArray(workflows)) {
             return $q.reject('Could not properly load the Workflows from the api.');
         }
-        service.filterDataSetsForUser(workflows);
-    }
 
-    workflowService.workflows$
-        .subscribe(
-            function (workflows) {
-                loadDataSetsForWorkflows(workflows)
-                    .then(matchDataSetsToWorkflows)
-                    .then(setWorkflowsOntoService);
-            },
-            function (error) {
-                errorHandler.error(error.message);
-            }
-        );
+        filterDataSetsForUser(workflows);
+    }
 }
 
-function dataSetGroupFactory() {
-    return function (dataSets) {
-        return {
-            get: function () {
-                return dataSets;
-            },
-            getIds: function () {
-                return _.pluck(dataSets, 'id');
-            },
-            getPeriodTypes: function () {
-                return _.uniq(_.pluck(dataSets, 'periodType'));
-            },
-            getCategoryIds: function () {
-                var categoriesFromCategoryCombos;
-
-                categoriesFromCategoryCombos = _.pluck(_.pluck(dataSets, 'categoryCombo'), 'categories');
-                categoriesFromCategoryCombos = _.flatten(categoriesFromCategoryCombos);
-                categoriesFromCategoryCombos = _.pluck(categoriesFromCategoryCombos, 'id');
-
-                return _.uniq(categoriesFromCategoryCombos);
-            }
-        };
+function dataSetGroupFactory(dataSets) {
+    return {
+        get: function () {
+            return dataSets;
+        },
+        getIds: function () {
+            return _.pluck(dataSets, 'id');
+        },
+        getPeriodTypes: function () {
+            return _.uniq(_.pluck(dataSets, 'periodType'));
+        },
+        getCategoryIds: function () {
+            var categoriesFromCategoryCombos;
+
+            categoriesFromCategoryCombos = _.pluck(_.pluck(dataSets, 'categoryCombo'), 'categories');
+            categoriesFromCategoryCombos = _.flatten(categoriesFromCategoryCombos);
+            categoriesFromCategoryCombos = _.pluck(categoriesFromCategoryCombos, 'id');
+
+            return _.uniq(categoriesFromCategoryCombos);
+        }
     };
 }
 
-angular.module('PEPFAR.approvals').service('dataSetGroupService', dataSetGroupService);
-angular.module('PEPFAR.approvals').factory('dataSetGroupFactory', dataSetGroupFactory);
+angular.module('PEPFAR.approvals').factory('dataSetGroupService', dataSetGroupService);

src/main/datasets/datasetgroupselector-directive.js

@@ -1,4 +1,4 @@
-function dataSetGroupSelectorDirective(dataSetGroupService, dataSetGroupFactory) {
+function dataSetGroupSelectorDirective(dataSetGroupService) {
     return {
         restrict: 'E',
         replace: true,
@@ -10,35 +10,25 @@ function dataSetGroupSelectorDirective(dataSetGroupService, dataSetGroupFactory)
                 selectedDataSetGroup: undefined
             };
 
-            function updateDataSetGroups(datasetGroups) {
-                if (angular.isArray(datasetGroups)) {
-                    scope.dataset.groups = datasetGroups;
-                    scope.dataset.selectedDataSetGroup = scope.dataset.groups[0];
-                }
-            }
-
-            scope.$watch(function () {
-                return dataSetGroupService.getDataSetGroupNames();
-            }, function (newVal, oldVal) {
-                if (newVal !== oldVal) {
-                    updateDataSetGroups(newVal);
-                }
-            });
-
-            scope.$watch(function () {
-                return scope.dataset.selectedDataSetGroup;
-            }, function (newVal, oldVal) {
-                if (newVal !== oldVal) {
-                    scope.$emit(
-                        'DATASETGROUP.changed',
-                        dataSetGroupFactory(dataSetGroupService.getDataSetsForGroup(scope.dataset.selectedDataSetGroup))
-                    );
-                }
-            });
-
             scope.onChange = function ($item) {
+                // Set scope to keep dropdown in sync with dropdown
                 scope.dataset.selectedDataSetGroup = $item;
+                dataSetGroupService.setCurrentDataSetGroup($item);
             };
+
+            dataSetGroupService
+                .dataSetGroups$
+                .take(1)
+                .map(function (datasetGroups) {
+                    if (angular.isArray(datasetGroups)) {
+                        scope.dataset.groups = datasetGroups;
+
+                        // Fire onChange to set to the first group
+                        scope.onChange(scope.dataset.groups[0]);
+                    }
+                })
+                .safeApply(scope)
+                .subscribe();
         }
     };
 }

src/main/manifest.webapp

@@ -1,5 +1,5 @@
 {
-    "version": "1.3.1",
+    "version": "1.4.0",
     "name": "Data Approval",
     "description": "Approvals app for PEPFAR",
     "icons": {
@@ -11,7 +11,7 @@
         "company": "DHIS2 Core Team",
         "email": "[email protected]"
     },
-    "launch_path": "index.html?v=1.3.1",
+    "launch_path": "index.html?v=1.4.0",
     "default_locale": "en",
     "activities": {
         "dhis": {

src/test/mocks/datasetgroup-service_mock.js

@@ -1,11 +1,8 @@
-function dataSetGroupServiceMock() {
+function dataSetGroupServiceMock(rx) {
     return {
-        datasetGroups: [ 'MER', 'EA' ],
-        getDataSetGroupNames: function () {
-            return this.datasetGroups;
-        },
-        getDataSetsForGroup: function () {
-            return [];
-        }
-    }
+        setCurrentDataSetGroup: function () {},
+        dataSetGroups$: rx.Observable.just(['MER', 'EA'])
+        // currentDataSetGroup$: currentDataSetGroup$,
+        // getDataSetsForGroup: getDataSetsForGroup
+    };
 }