Added a service for reloading the dataSet object. Changing the permis…

…sion, i.e. sharing or unsharing data sets, causes a hard reset / reload of the data set list to see changes immediately.

refinery/ui/src/js/dashboard/controllers/Dashboard.js

@@ -15,7 +15,8 @@ function DashboardCtrl (
   dashboardDataSetService,
   dashboardDataSetListService,
   dashboardDataSetSearchService,
-  dashboardDataSetSourceService) {
+  dashboardDataSetSourceService,
+  dashboardDataSetReloadService) {
   // Store the context.
   var that = this;
 
@@ -35,6 +36,7 @@ function DashboardCtrl (
   that.dashboardDataSetListService = dashboardDataSetListService;
   that.dashboardDataSetSearchService = dashboardDataSetSearchService;
   that.dashboardDataSetSourceService = dashboardDataSetSourceService;
+  that.dashboardDataSetReloadService = dashboardDataSetReloadService;
 
   // Construct class variables
   that.dataSetServiceLoading = false;
@@ -84,6 +86,20 @@ function DashboardCtrl (
   // Initilize data set source
   that.setDataSetSource();
 
+  // Set reloader
+  that.dashboardDataSetReloadService.setReload(function (hardReset) {
+    if (hardReset) {
+      that.dataSets.resetCache(undefined, hardReset);
+    }
+    // Reset current list and reload uiScroll
+    if (that.dataSetsAdapter) {
+      that.dataSetsAdapter.applyUpdates(function (item, scope) {
+        return [];
+      });
+      that.dataSetsAdapter.reload();
+    }
+  });
+
   $rootScope.$on('$stateChangeSuccess', function () {
     $timeout(window.sizing, 0);
   });
@@ -135,13 +151,7 @@ DashboardCtrl.prototype.setDataSetSource = function (searchQuery) {
     that.dataSets.resetCache();
   }
 
-  // Reset current list and reload uiScroll
-  if (that.dataSetsAdapter) {
-    that.dataSetsAdapter.applyUpdates(function (item, scope) {
-      return [];
-    });
-    that.dataSetsAdapter.reload();
-  }
+  that.dashboardDataSetReloadService.reload();
 };
 
 DashboardCtrl.prototype.getProjects = function (limit, offset) {
@@ -228,5 +238,6 @@ angular
     'dashboardDataSetListService',
     'dashboardDataSetSearchService',
     'dashboardDataSetSourceService',
+    'dashboardDataSetReloadService',
     DashboardCtrl
   ]);

refinery/ui/src/js/dashboard/controllers/PermissionEditor.js

@@ -1,10 +1,16 @@
-function PermissionEditorCtrl ($http, $modalInstance, _, sharingService, config) {
+function PermissionEditorCtrl (
+  $modalInstance,
+  _,
+  sharingService,
+  dashboardDataSetReloadService,
+  config) {
   var that = this;
 
   this._ = _;
   this.config = config;
   this.$modalInstance = $modalInstance;
   this.sharingService = sharingService;
+  this.dashboardDataSetReloadService = dashboardDataSetReloadService;
 
   this.getPermissions(
     this.config.model,
@@ -15,6 +21,7 @@ function PermissionEditorCtrl ($http, $modalInstance, _, sharingService, config)
     console.error(error);
   });
 
+  // Used as a shorthand to avoid complicated permission checking in `ngRepeat`
   this.permissionLevel = {
     none: {
       read: false,
@@ -118,6 +125,7 @@ PermissionEditorCtrl.prototype.save = function () {
     })
     .$promise
       .then(function () {
+        that.dashboardDataSetReloadService.reload(true);
         that.$modalInstance.dismiss('saved');
       })
       .catch(function (error) {
@@ -131,10 +139,10 @@ PermissionEditorCtrl.prototype.save = function () {
 angular
   .module('refineryDashboard')
   .controller('PermissionEditorCtrl', [
-    '$http',
     '$modalInstance',
     '_',
     'sharingService',
+    'dashboardDataSetReloadService',
     'config',
     PermissionEditorCtrl
   ]);

refinery/ui/src/js/dashboard/services/dataSets.js

@@ -151,11 +151,15 @@ angular
         /**
          * Reset the cache
          */
-        resetCache: function (id) {
+        resetCache: function (id, hardReset) {
           id = id || dataSets.cache.defaultId;
-          // Cache current cache store.
-          // (Yes we cache the cache!)
-          cacheStore.put(this.cache.id, this.cache.items);
+          if (hardReset) {
+            cacheStore.removeAll();
+          } else {
+            // Cache current cache store.
+            // (Yes we cache the cache!)
+            cacheStore.put(this.cache.id, this.cache.items);
+          }
           // Restore former cache or reset cache.
           this.cache.items = cacheStore.get(id) || {};
           // Set new id

refinery/ui/src/js/dashboard/services/dataSetsReload.js

@@ -0,0 +1,23 @@
+angular
+  .module('refineryDashboard')
+  .factory('dashboardDataSetReloadService', ['$q',
+    function ($q) {
+      return {
+        /**
+         * Interface for the getter
+         * @param  {number}   offset  First item returned by the API.
+         * @param  {number}   limit   Number of items returned by the API.
+         * @return {object}           Angular promise.
+         */
+        reload: function () {},
+        /**
+         * Switch getter with a custom function.
+         * @param {function} sourceFunction The actualy source function, e.g.
+         *
+         */
+        setReload: function (sourceFunction) {
+          this.reload = sourceFunction;
+        }
+      };
+    }
+  ]);