Jkmarx/data set2 utility persist bug

refinery/templates/core/data_set2.html

@@ -189,10 +189,6 @@ <h1>Data Set <small>{{ data_set.name }}</small></h1>
   <script type="text/javascript" src="{% static "js/provvis/provvis-render.js" %}"></script>
   <script type="text/javascript" src="{% static "js/provvis/provvis.js" %}"></script>
 
-  <script type="text/ng-template" id='assayfilesutilmodal.html'>
-    <rp-assay-files-util-modal-detail></rp-assay-files-util-modal-detail>
-   </script>
-
   <script type="application/javascript">
     setTimeout(function() {
           sizing();

refinery/ui/source/js/file-browser/ctrls/assay-files-util-modal-ctrl.js

@@ -1,26 +1,24 @@
 'use strict';
 
 function AssayFilesUtilModalCtrl (
+  fileBrowserFactory,
+  $log,
+  $q,
   $scope,
   $uibModalInstance,
-  $window,
-  $q,
-  $log,
-  fileBrowserFactory,
-  resetGridService) {
+  $window
+) {
   var vm = this;
   vm.assayAttributeOrder = [];
 
   // modal close button
-  $scope.close = function () {
-    resetGridService.setResetGridFlag(true);
+  vm.close = function () {
     $uibModalInstance.close('close');
   };
 
   // Refresh attribute lists when modal opens
   vm.refreshAssayAttributes = function () {
     var assayUuid = $window.externalAssayUuid;
-
     fileBrowserFactory.getAssayAttributeOrder(assayUuid).then(function () {
       vm.assayAttributeOrder = fileBrowserFactory.assayAttributeOrder;
     }, function (error) {
@@ -57,13 +55,12 @@ angular
   .controller(
   'AssayFilesUtilModalCtrl',
   [
+    'fileBrowserFactory',
+    '$log',
+    '$q',
     '$scope',
     '$uibModalInstance',
     '$window',
-    '$q',
-    '$log',
-    'fileBrowserFactory',
-    'resetGridService',
     AssayFilesUtilModalCtrl
   ]
   );

refinery/ui/source/js/file-browser/ctrls/ctrl.js

@@ -445,6 +445,24 @@ function FileBrowserCtrl (
     }
   );
 
+  /**
+   *  Refresh grid flag if set to true, grid, but keep params, filters, & nodes
+   *  Require for utils modal as it lives in this parent ctrl scope.
+   */
+  $scope.$watch(
+    function () {
+      return resetGridService.refreshGridFlag;
+    },
+    function () {
+      if (resetGridService.refreshGridFlag) {
+        // reset assayFiles
+        angular.copy([], fileBrowserFactory.assayFiles);
+        initializeDataOnPageLoad();
+        resetGridService.setRefreshGridFlag(false);
+      }
+    }
+  );
+
   // Ensure data owner
   vm.checkDataSetOwnership();
   // initialize the dataset and updates ui-grid selection, filters, and url

refinery/ui/source/js/file-browser/directives/assay-files-util-modal.js

@@ -2,29 +2,25 @@
 
 function rpAssayFilesUtilModal (
   $compile,
+  resetGridService,
   $templateCache,
-  $uibModal,
-  resetGridService
+  $uibModal
 ) {
   return {
     restrict: 'AE',
     link: function (scope, element) {
       var modalInstance;
-
       element.bind('click', function () {
-        var template = $templateCache.get('assayfilesutilmodal.html');
-        var modalContent = $compile(template)(scope);
-
         modalInstance = $uibModal.open({
-          template: modalContent,
+          templateUrl: '/static/partials/file-browser/partials/assay-files-util-modal-detail.html',
           controller: 'AssayFilesUtilModalCtrl',
           controllerAs: 'AFUMCtrl'
         });
-
+        // default calls when modal closes or dismisses
         modalInstance.result.then(function () {
-          resetGridService.setResetGridFlag(true);
+          resetGridService.setRefreshGridFlag(true);
         }, function () {
-          resetGridService.setResetGridFlag(true);
+          resetGridService.setRefreshGridFlag(true);
         });
       });
     }
@@ -37,9 +33,9 @@ angular
   'rpAssayFilesUtilModal',
   [
     '$compile',
+    'resetGridService',
     '$templateCache',
     '$uibModal',
-    'resetGridService',
     rpAssayFilesUtilModal
   ]
   );

refinery/ui/source/js/file-browser/partials/assay-files-util-modal-detail.html

@@ -104,6 +104,6 @@ <h4>
 
 </div>
 <div class="modal-footer">
-  <button class="btn btn-default" ng-click="close()">Close</button>
+  <button class="btn btn-default" ng-click="AFUMCtrl.close()">Close</button>
 </div>
 

refinery/ui/source/js/file-browser/services/reset-grid-service.js

@@ -3,10 +3,16 @@
 function resetGridService () {
   var vm = this;
   vm.resetGridFlag = false;
+  // param keeps current filter params
+  vm.refreshGridFlag = false;
 
   vm.setResetGridFlag = function (state) {
     vm.resetGridFlag = state;
   };
+
+  vm.setRefreshGridFlag = function (state) {
+    vm.refreshGridFlag = state;
+  };
 }
 
 angular.module('refineryFileBrowser')

refinery/ui/source/js/file-browser/views/files-tab.html

@@ -5,7 +5,7 @@
       <rp-file-display></rp-file-display>
       <span ng-if="FBCtrl.isOwner">
         <i class="fa fa-wrench fa-border"
-          rp-assay-files-util-modal ng-click="open()">
+          rp-assay-files-util-modal>
         </i>
         <a
           id="help-view-selector"