Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jkmarx/missing nav bar bug #1834

Merged
merged 26 commits into from
Jun 26, 2017
Merged

Jkmarx/missing nav bar bug #1834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1b2a6d4
Enable pinning of select and input group columns.
jkmarx Jun 20, 2017
45d62d5
Add highlights and keep icon blue.
jkmarx Jun 20, 2017
3ff1957
Show template and input file.
jkmarx Jun 20, 2017
93effc2
Merge branch 'develop' of https://github.com/refinery-platform/refine…
jkmarx Jun 20, 2017
bccd7dd
Add basic functionality for reindexing.
jkmarx Jun 21, 2017
56e51aa
Add depthNames data and replace types.
jkmarx Jun 21, 2017
6f5cede
Add library which was accidently deleted. (#1821)
jkmarx Jun 22, 2017
b714e52
Merge branch 'jkmarx/loop-names' of https://github.com/refinery-platf…
jkmarx Jun 22, 2017
9a9e1eb
Reindex node set collection.
jkmarx Jun 22, 2017
c6feb3d
Fix width of popover to prevent arrow jump.
jkmarx Jun 22, 2017
33ef8fc
Merge branch 'develop' of https://github.com/refinery-platform/refine…
jkmarx Jun 22, 2017
895317e
Update selection obj.
jkmarx Jun 22, 2017
a067408
Refactor collection to own methods.
jkmarx Jun 22, 2017
4131d85
Fix bug.
jkmarx Jun 23, 2017
d9e9ccb
Fix pair checkbox.
jkmarx Jun 23, 2017
679456a
Add comments
jkmarx Jun 23, 2017
b6fe7d1
Remove unused method.
jkmarx Jun 23, 2017
a735ff9
Add comments.
jkmarx Jun 23, 2017
16cb16c
Remove comment.
jkmarx Jun 23, 2017
8517a14
Fix color issue associate on deselecting a node.
jkmarx Jun 23, 2017
a5cbd99
Fix bug with popover and missing nav.
jkmarx Jun 23, 2017
1850f6a
Hide remove button for 1 depth tools.
jkmarx Jun 23, 2017
eccd5b0
Adjust text.
jkmarx Jun 26, 2017
ab1d499
Fix merge conflicts.
jkmarx Jun 26, 2017
07f5eb3
Fix unit test.
jkmarx Jun 26, 2017
82b1cde
Merge branch 'develop' of https://github.com/refinery-platform/refine…
jkmarx Jun 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions refinery/ui/source/js/file-browser/ctrls/node-selection-popover-ctrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion refinery/ui/source/js/file-browser/directives/node-selection-popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
14 changes: 7 additions & 7 deletions refinery/ui/source/js/file-browser/partials/node-selection-popover-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] }}
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion refinery/ui/source/js/tool-launch/ctrls/tool-params-ctrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion refinery/ui/source/js/tool-launch/ctrls/tool-params-ctrl.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({});
});
});
Expand Down
5 changes: 4 additions & 1 deletion refinery/ui/source/js/tool-launch/partials/input-control-inner-nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 12 additions & 7 deletions refinery/ui/source/js/tool-launch/partials/input-control.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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"
Expand Down
14 changes: 8 additions & 6 deletions refinery/ui/source/js/tool-launch/partials/input-group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
12 changes: 10 additions & 2 deletions refinery/ui/source/styles/file-browser.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,10 @@
}
}

#node-selection-popover {
width: 400px;
#assay-files-table {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can just do:

#assay-files-table.popover {
 width: 400px !important;
}

But thats just syntax preference, not sure what we prefer

.popover {
width: 400px !important;
}
}

#param-help-popover {
Expand Down Expand Up @@ -347,3 +349,9 @@ ul.plain {
list-style: none;
padding-left: 0;
}

.refinery-subheader {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same syntax here

h4 {
text-transform: none !important;
}
}