Jkmarx/missing nav bar bug (#1834)

* Enable pinning of select and input group columns. * Add highlights and keep icon blue. * Show template and input file. * Add basic functionality for reindexing. * Add depthNames data and replace types. * Add library which was accidently deleted. (#1821) * Reindex node set collection. * Fix width of popover to prevent arrow jump. * Update selection obj. * Refactor collection to own methods. * Fix bug. * Fix pair checkbox. * Add comments * Remove unused method. * Add comments. * Remove comment. * Fix color issue associate on deselecting a node. * Fix bug with popover and missing nav. * Hide remove button for 1 depth tools. * Adjust text. * Fix unit test.
refinery-platform · Jun 26, 2017 · 5f3151d · 5f3151d
1 parent b927bc4
commit 5f3151d
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 26 deletions.
diff --git a/refinery/ui/source/js/file-browser/ctrls/node-selection-popover-ctrl.js b/refinery/ui/source/js/file-browser/ctrls/node-selection-popover-ctrl.js
@@ -66,6 +66,7 @@
         vm.inputFileTypes = fileService.inputFileTypes;
         vm.currentGroup = fileService.currentGroup;
         vm.currentTypes = fileService.currentTypes;
+        vm.depthNames = fileService.depthNames;
         vm.groupCollection = fileService.groupCollection;
         vm.nodeSelection = fileService.nodeSelectCollection;
         vm.inputFileTypeColor = fileService.inputFileTypeColor;

diff --git a/refinery/ui/source/js/file-browser/directives/node-selection-popover.js b/refinery/ui/source/js/file-browser/directives/node-selection-popover.js
@@ -34,7 +34,8 @@
           html: true,
           trigger: 'manual',
           container: '#assay-files-table',
-          id: 'node-selection-popover'
+          class: 'node-selection-popover'
+
         };
         angular.element(element).popover(options);
 

diff --git a/refinery/ui/source/js/file-browser/partials/node-selection-popover-detail.html b/refinery/ui/source/js/file-browser/partials/node-selection-popover-detail.html
@@ -45,6 +45,11 @@
         <!-- Select/Deselect nodes in the list -->
         <div class="refinery-subheader">
           <h4>
+            <i
+              class="{{NSPCtrl.currentTypes[NSPCtrl.currentTypes.length - 1]|groupTypeIcon}}"
+              aria-hidden="true"></i>
+            {{ NSPCtrl.depthNames[NSPCtrl.currentTypes.length - 1] }}:
+            <span ng-if="!NSPCtrl.groupCollection[NSPCtrl.currentGroup][NSPCtrl.inputFileTypes[0].uuid]">0</span>
             {{ NSPCtrl.groupCollection[NSPCtrl.currentGroup][NSPCtrl.inputFileTypes[0].uuid].length }}
             file<span ng-if="NSPCtrl.groupCollection[NSPCtrl.currentGroup][NSPCtrl.inputFileTypes[0].uuid].length != 1">s</span>
             in Group {{ NSPCtrl.currentGroup[NSPCtrl.currentGroup.length] }}
@@ -77,18 +82,13 @@ <h4>
   </ul>
 </div>
 <div>
-  <span ng-if="NSPCtrl.depthNames.length > 1">
+  <span ng-if="NSPCtrl.currentTypes.length > 1">
     <div class="refinery-subheader">
       <h4>
         <i
           class="{{NSPCtrl.currentTypes[NSPCtrl.currentTypes.length - 2]|groupTypeIcon}}"
           aria-hidden="true"></i>
-        {{ NSPCtrl.depthNames[NSPCtrl.depthNames.length - 2] }}:
-        <i
-          class="{{NSPCtrl.currentTypes[NSPCtrl.currentTypes.length - 1]|groupTypeIcon}}"
-          aria-hidden="true"></i>
-        {{ NSPCtrl.depthNames[NSPCtrl.currentTypes.length - 1] }},
-        Index {{ NSPCtrl.currentGroup[NSPCtrl.currentGroup.length - 1] + 1 }}
+        {{ NSPCtrl.depthNames[NSPCtrl.depthNames.length - 2] }}
       </h4>
     </div>
     <rp-input-control-inner-nav></rp-input-control-inner-nav>

diff --git a/refinery/ui/source/js/tool-launch/ctrls/tool-params-ctrl.js b/refinery/ui/source/js/tool-launch/ctrls/tool-params-ctrl.js
@@ -24,7 +24,7 @@
   ) {
     var paramsService = toolParamsService;
     var vm = this;
-    vm.isToolParamsCollapsed = false; // tracks the parameters panel
+    vm.isToolParamsCollapsed = true; // tracks the parameters panel
     vm.params = paramsService.toolParams;
     vm.paramsForm = paramsService.paramsForm;
 

diff --git a/refinery/ui/source/js/tool-launch/ctrls/tool-params-ctrl.spec.js b/refinery/ui/source/js/tool-launch/ctrls/tool-params-ctrl.spec.js
@@ -21,7 +21,7 @@
     });
 
     it('Data & UI displays variables should exist for views', function () {
-      expect(ctrl.isToolParamsCollapsed).toEqual(false);
+      expect(ctrl.isToolParamsCollapsed).toEqual(true);
       expect(ctrl.paramsForm).toEqual({});
     });
   });

diff --git a/refinery/ui/source/js/tool-launch/partials/input-control-inner-nav.html b/refinery/ui/source/js/tool-launch/partials/input-control-inner-nav.html
@@ -2,9 +2,12 @@
   <button
     class="btn btn-default btn-xs outline"
     ng-disabled="$ctrl.currentGroup[$ctrl.currentGroup.length - 1] == 0"
-    ng-click="$ctrl.navLeft($ctrl.currentGroup.length-1)">
+    ng-click="$ctrl.navLeft($ctrl.currentGroup.length - 1)">
     <i class="fa fa-backward"></i>
   </button>
+  <span class="badge">
+    {{ $ctrl.currentGroup[$ctrl.currentGroup.length - 1] + 1}}
+  </span>
    <!-- Checking the type containing the inner most, ['PAIR', 'LIST] -->
   <span ng-if="$ctrl.currentTypes[$ctrl.currentTypes.length - 2] == 'PAIR'">
     <button

diff --git a/refinery/ui/source/js/tool-launch/partials/input-control.html b/refinery/ui/source/js/tool-launch/partials/input-control.html
@@ -33,6 +33,14 @@ <h4 class="panel-title">
             ng-repeat="depthName in $ctrl.depthNames|orderBy:'$index':true track by $index"
             id="control-panel-list">
             <div ng-if="$index == 0" class="p-a-1-2">
+              <div class="refinery-subheader">
+                <h4>
+                  <i
+                    class="{{$ctrl.currentTypes[$ctrl.currentGroup.length-$index + 1] |groupTypeIcon}}"
+                    aria-hidden="true"></i>
+                  {{ $ctrl.depthNames[$ctrl.depthNames.length-1] }}
+                </h4>
+              </div>
               <rp-input-group></rp-input-group>
             </div>
 
@@ -43,13 +51,7 @@ <h4 class="panel-title">
               <div class="refinery-subheader">
                 <h4>
                   <i class="{{$ctrl.currentTypes[$ctrl.currentGroup.length-$index]|groupTypeIcon}}" aria-hidden="true"></i>
-                  {{ depthName }}:
-                  <i
-                    class="{{$ctrl.currentTypes[$ctrl.currentGroup.length-$index + 1] |groupTypeIcon}}"
-                    aria-hidden="true">
-                  </i>
-                  {{ $ctrl.depthNames[$ctrl.currentGroup.length-$index + 1] }},
-                  Index {{ $ctrl.currentGroup[$ctrl.currentGroup.length-$index] + 1 }}
+                  {{ depthName }}
                 </h4>
               </div>
             </div>
@@ -69,6 +71,9 @@ <h4>
                 ng-click="$ctrl.navLeft($ctrl.currentGroup.length-$index)">
                 <i class="fa fa-backward"></i>
               </button>
+              <span class="badge">
+                {{ $ctrl.currentGroup[$ctrl.currentGroup.length-$index] + 1 }}
+              </span>
               <span ng-if="$ctrl.currentTypes[$ctrl.currentGroup.length-$index] == 'PAIR'">
                 <button
                   class="btn btn-default btn-xs outline"

diff --git a/refinery/ui/source/js/tool-launch/partials/input-group.html b/refinery/ui/source/js/tool-launch/partials/input-group.html
@@ -87,12 +87,14 @@ <h4>
       <rp-input-group-details></rp-input-group-details>
   </div>
   <div>
-    <button
-    class="btn btn-default btn-xs outline"
-    ng-disabled="$ctrl.isObjEmpty($ctrl.groupCollection[$ctrl.currentGroup])"
-    ng-click="$ctrl.removeGroup()">
-    Remove
-  </button>
+    <span ng-if="$ctrl.currentTypes.length > 1">
+      <button
+        class="btn btn-default btn-xs outline"
+        ng-disabled="$ctrl.isObjEmpty($ctrl.groupCollection[$ctrl.currentGroup])"
+        ng-click="$ctrl.removeGroup()">
+        Remove
+      </button>
+    </span>
   <button
     class="btn btn-default btn-xs outline"
     ng-disabled="$ctrl.isObjEmpty($ctrl.groupCollection)"

diff --git a/refinery/ui/source/styles/file-browser.less b/refinery/ui/source/styles/file-browser.less
@@ -267,8 +267,10 @@
   }
 }
 
-#node-selection-popover {
-  width: 400px;
+#assay-files-table {
+  .popover {
+    width: 400px !important;
+  }
 }
 
 #param-help-popover {
@@ -347,3 +349,9 @@ ul.plain {
   list-style: none;
   padding-left: 0;
 }
+
+.refinery-subheader {
+  h4 {
+    text-transform: none !important;
+  }
+}