Revert "Jkmarx/fix position of text (#3233)"

This reverts commit dda3bd6.
refinery-platform · Feb 27, 2019 · c5325ac · c5325ac
1 parent dda3bd6
commit c5325ac
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/refinery/ui/source/js/data-set-import/controllers/file-upload-s3.js b/refinery/ui/source/js/data-set-import/controllers/file-upload-s3.js
@@ -95,7 +95,6 @@
       file.managedUpload.promise().then(function () {
         $scope.$apply(function () {
           file.success = true;
-          fileUploadStatusService.setFileUploadStatus('none');
           if (vm.isNodeUpdate) {
             addFileToDataSetService.update({
               node_uuid: vm.nodeUuid,
@@ -109,16 +108,19 @@
           }
           if (vm.multifileUploadInProgress) {
             vm.uploadFiles();
+          } else {
+            fileUploadStatusService.setFileUploadStatus('none');
           }
         });
       }, function (error) {
         $scope.$apply(function () {
           file.progress = 100;
           file.$error = error;
           $log.error('Error uploading file ' + file.name + ': ' + file.$error);
-          fileUploadStatusService.setFileUploadStatus('none');
           if (vm.multifileUploadInProgress) {
             vm.uploadFiles();
+          } else {
+            fileUploadStatusService.setFileUploadStatus('none');
           }
         });
       });
@@ -147,10 +149,8 @@
         file.managedUpload.abort();
         $log.warn('Upload canceled: ' + file.name);
       }
-      if (vm.areUploadsEnabled()) {
+      if (vm.files.length) {
         fileUploadStatusService.setFileUploadStatus('queuing');
-      } else if (vm.areUploadsInProgress()) {
-        fileUploadStatusService.setFileUploadStatus('running');
       } else {
         fileUploadStatusService.setFileUploadStatus('none');
       }

diff --git a/refinery/ui/source/js/data-set-import/controllers/file-upload.js b/refinery/ui/source/js/data-set-import/controllers/file-upload.js
@@ -256,9 +256,9 @@ function RefineryFileUploadCtrl (
 
     // wait for digest to complete
     $timeout(function () {
-      if (totalNumFilesUploaded === totalNumFilesQueued) {
+      if (totalNumFilesQueued === 0) {
         vm.fileStatus = fileUploadStatusService.setFileUploadStatus('none');
-      } else {
+      } else if ($element.fileupload('active') === 0) {
         vm.fileStatus = fileUploadStatusService.setFileUploadStatus('queuing');
       }
     }, 110);

diff --git a/refinery/ui/source/js/data-set-import/directives/metadata-table.js b/refinery/ui/source/js/data-set-import/directives/metadata-table.js
@@ -23,7 +23,22 @@ function metadataTableDirective (
       scope.urlShortcutRegex = /^[a-zA-Z0-9_]*$/;
 
       scope.sampleMetadataUrl = $window.getStaticUrl('sample-files/refinery-sample-metadata.tsv');
-      ctrl.fileStatus = fileUploadStatusService.fileUploadStatus.status;
+
+      // Helper method to disable data file upload if files are uploading
+      ctrl.areFilesUploading = function () {
+        if (fileUploadStatusService.fileUploadStatus.status === 'running') {
+          return true;
+        }
+        return false;
+      };
+
+      // Helper method to show warning text when data files are queued
+      ctrl.areFilesInQueue = function () {
+        if (fileUploadStatusService.fileUploadStatus.status === 'queuing') {
+          return true;
+        }
+        return false;
+      };
 
       // Watches for tab navigation
       scope.$on('$stateChangeStart', function (event) {
@@ -47,15 +62,6 @@ function metadataTableDirective (
         }
       });
       /*eslint-enable */
-
-      scope.$watchCollection(
-        function () {
-          return fileUploadStatusService.fileUploadStatus;
-        },
-        function (statusObj) {
-          ctrl.fileStatus = statusObj.status;
-        }
-      );
     }
   };
 }

diff --git a/refinery/ui/source/js/data-set-import/partials/metadata-table.html b/refinery/ui/source/js/data-set-import/partials/metadata-table.html
@@ -525,13 +525,13 @@ <h1>Complete Submission</h1>
                 class="refinery-base btn btn-primary"
                 ng-click="metadataTable.confirmImport()"
                 ng-disabled="importMetadataTableForm.$invalid ||
-                metadataTable.fileStatus === 'queuing' ||
-                metadataTable.fileStatus === 'running'">
+                metadataTable.areFilesUploading() ||
+                metadataTable.areFilesInQueue()">
                 Submit
               </button>
               <span class="m-l-1">
                 <span class="text-warning"
-                  ng-if="metadataTable.fileStatus === 'queuing'">
+                  ng-if="metadataTable.areFilesInQueue()">
                   <i class="fa fa-warning" aria-hidden="true"></i>
                   All data files have not been uploaded.
                 </span>

diff --git a/refinery/ui/source/styles/home.less b/refinery/ui/source/styles/home.less
@@ -38,6 +38,8 @@
       color: @gray-light;
       font-weight: 700;
       padding-top: .2em;
+      position: absolute;
+      right: 150px;
     }
   }