Jkmarx/fix bug event refresh

refinery/ui/source/js/dashboard/controllers/dashboard-main-ctrl.js

@@ -26,6 +26,7 @@
     vm.getGroups = getGroups;
     vm.groups = [];
     vm.groupInvites = {};
+    vm.refreshEvents = false;
     activate();
 
     function activate () {

refinery/ui/source/js/dashboard/controllers/dashboard-main-ctrl.spec.js

@@ -44,6 +44,7 @@
     it('Variables should be initialized', function () {
       expect(ctrl.groups).toEqual([]);
       expect(ctrl.groupInvites).toEqual({});
+      expect(ctrl.refreshEvents).toEqual(false);
     });
 
     describe('getGroups', function () {

refinery/ui/source/js/dashboard/controllers/data-sets-card-ctrl.js

@@ -134,6 +134,7 @@
       modalInstance.result.then(function () {
         // user confirmed deletion
         getDataSets();
+        vm.dashboardParentCtrl.refreshEvents = true;
       });
     }
 
@@ -161,6 +162,7 @@
         function () {
           // when modal is closed
           getDataSets();
+          vm.dashboardParentCtrl.refreshEvents = true;
         });
     }
 

refinery/ui/source/js/dashboard/controllers/history-card-ctrl.js

@@ -11,9 +11,10 @@
     .module('refineryDashboard')
     .controller('HistoryCardCtrl', HistoryCardCtrl);
 
-  HistoryCardCtrl.$inject = ['eventsService'];
+  HistoryCardCtrl.$inject = ['$scope', 'eventsService'];
 
   function HistoryCardCtrl (
+    $scope,
     eventsService
   ) {
     var vm = this;
@@ -39,5 +40,24 @@
         vm.events = response;
       });
     }
+
+     /*
+   * ---------------------------------------------------------
+   * Watchers
+   * ---------------------------------------------------------
+   */
+    vm.$onInit = function () {
+      $scope.$watchCollection(
+        function () {
+          return vm.ParentCtrl.refreshEvents;
+        },
+        function () {
+          if (vm.ParentCtrl.refreshEvents) {
+            getUserEvents();
+            vm.ParentCtrl.refreshEvents = false;
+          }
+        }
+      );
+    };
   }
 })();

refinery/ui/source/js/dashboard/directives/history-card.js

@@ -10,6 +10,9 @@
     .module('refineryDashboard')
     .component('rpHistoryCard', {
       controller: 'HistoryCardCtrl',
+      require: {
+        ParentCtrl: '^rpDashboard'
+      },
       templateUrl: ['$window', function ($window) {
         return $window.getStaticUrl('partials/dashboard/partials/history-card.html');
       }]

refinery/ui/source/js/dashboard/directives/history-card.spec.js

@@ -14,9 +14,14 @@
       $templateCache,
       $window
     ) {
+      $templateCache.put(
+        $window.getStaticUrl('partials/dashboard/views/dashboard.html'),
+        '<div id="dashboard"><rp-history-card></rp-history-card></div>'
+      );
+
       $templateCache.put(
         $window.getStaticUrl('partials/dashboard/partials/history-card.html'),
-        '<div id="tools-list"></div>'
+        '<div id="events-list"></div>'
       );
       $httpBackend
         .whenGET(
@@ -25,14 +30,28 @@
           '/events/'
         ).respond(200, []);
 
+      $httpBackend
+        .whenGET(
+          settings.appRoot +
+          settings.refineryApi +
+          '/extended_groups/members/?format=json&id=id'
+        ).respond(200, []);
+
+      $httpBackend
+        .whenGET(
+          settings.appRoot +
+          settings.refineryApiV2 +
+          '/data_sets/?format=json'
+        ).respond(200, []);
+
       var scope = $rootScope.$new();
-      var template = '<rp-history-card></rp-history-card>';
+      var template = '<rp-dashboard></rp-dashboard>';
       directiveElement = $compile(template)(scope);
       scope.$digest();
     }));
 
     it('generates the appropriate HTML', function () {
-      expect(directiveElement.html()).toContain('tools-list');
+      expect(directiveElement.html()).toContain('events-list');
       expect(directiveElement.html()).toContain('</div>');
     });
   });