Track apps registration changes in other components

Author: BoykoAlex

ui/app/scripts/app/controllers/apps.js

@@ -45,6 +45,8 @@ define(['model/pageable'], function (Pageable) {
                     function (result) {
                         if (!!result._embedded) {
                             $scope.pageable.items = result._embedded.appRegistrationResourceList;
+                        } else {
+                            $scope.pageable.items = [];
                         }
                         // Process received array of apps
                         if (Array.isArray($scope.pageable.items)) {

ui/app/scripts/app/services.js

@@ -21,11 +21,23 @@
  * @author Alex Boyko
  * @author Gunnar Hillert
  */
-define(['angular'], function (angular) {
+define(['angular', 'lodash'], function (angular, _) {
     'use strict';
 
     return angular.module('dataflowApps.services', [])
         .factory('AppService', function ($resource, $rootScope, $log, $http) {
+
+            var listeners = [];
+
+            // Debounce notifying listeners in case of multiple register/unregister single app calls
+            var notifyListeners = _.debounce(function() {
+                listeners.forEach(function (listener) {
+                    if (angular.isFunction(listener.changed)) {
+                        listener.changed();
+                    }
+                });
+            }, 100);
+
             return {
                 getDefinitions: function (pageable) {
                     var params = {};
@@ -47,14 +59,18 @@ define(['angular'], function (angular) {
                 },
                 createCompositeApp: function(appName,definition) {
                     $log.info('Creating composite app name=' + appName + ' def=' + definition);
-                    return $http({
+                    var request = $http({
                         method: 'POST',
                         url: $rootScope.dataflowServerUrl + '/apps',
                         params: {
                             name: appName,
                             definition: definition
                         }
                     });
+                    request.then(function() {
+                        notifyListeners();
+                    });
+                    return request;
                 },
                 getAppInfo: function(appType,appName) {
                     return $http({
@@ -63,7 +79,7 @@ define(['angular'], function (angular) {
                     });
                 },
                 registerApp: function(type, name, uri, force) {
-                    return $resource($rootScope.dataflowServerUrl + '/apps/' + type + '/' + name, {}, {
+                    var request = $resource($rootScope.dataflowServerUrl + '/apps/' + type + '/' + name, {}, {
                         registerApp: {
                             method: 'POST',
                             params: {
@@ -72,16 +88,24 @@ define(['angular'], function (angular) {
                             }
                         }
                     }).registerApp();
+                    request.$promise.then(function() {
+                        notifyListeners();
+                    });
+                    return request;
                 },
                 unregisterApp: function(type, name) {
-                    return $resource($rootScope.dataflowServerUrl + '/apps/' + type + '/' + name, {}, {
+                    var request = $resource($rootScope.dataflowServerUrl + '/apps/' + type + '/' + name, {}, {
                         unregisterApp: {
                             method: 'DELETE'
                         }
                     }).unregisterApp();
+                    request.$promise.then(function() {
+                        notifyListeners();
+                    });
+                    return request;
                 },
                 bulkImportApps: function(uri, appsProperties, force) {
-                    return $resource($rootScope.dataflowServerUrl + '/apps', {}, {
+                    var request = $resource($rootScope.dataflowServerUrl + '/apps', {}, {
                         bulkImportApps: {
                             method: 'POST',
                             params: {
@@ -91,6 +115,19 @@ define(['angular'], function (angular) {
                             }
                         }
                     }).bulkImportApps();
+                    request.$promise.then(function() {
+                        notifyListeners();
+                    });
+                    return request;
+                },
+                addListener: function(listener) {
+                    listeners.push(listener);
+                },
+                removeListener: function(listener) {
+                    var index = listeners.indexOf(listener);
+                    if (index >= 0) {
+                        listeners.splice(index);
+                    }
                 }
             };
         });

ui/app/scripts/stream/services/metamodel.js

@@ -758,6 +758,11 @@ define(function (require) {
                 });
             }
 
+            // Add listener to App service to keep track if list of registered apps changing
+            appService.addListener({
+                changed: refresh
+            });
+
             /**
              * Service object. See the comments for individual functions above.
              */