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

UI Hydrator++ Bug fixes #5656

Merged
merged 3 commits into from Apr 25, 2016
Merged

UI Hydrator++ Bug fixes #5656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3b2e05
Sorts plugins in left panel in hydrator++ studio view
ajainarayanan Apr 25, 2016
ff6fd0f
Removes braces surrounding plugin count in the left panel
ajainarayanan Apr 25, 2016
5a74e7f
add pluginTemplate name
elfenheart Apr 25, 2016
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
4 changes: 2 additions & 2 deletions cdap-ui/app/directives/group-side-panel/group-side-panel.html
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@
ng-show="MySidePanel.openedGroup === null || MySidePanel.openedGroup === group.name">
<div class="item-body" ng-class="{'view-icon': MySidePanel.view === 'icon', 'view-list': MySidePanel.view === 'list'}">

<div ng-if="MySidePanel.view === 'icon'" ng-repeat="plugin in group.filtered = (group.plugins | filter: {name: MySidePanel.searchText}) track by $index"
<div ng-if="MySidePanel.view === 'icon'" ng-repeat="plugin in group.filtered = (group.plugins | filter: {name: MySidePanel.searchText} | orderBy: 'name') track by $index"
class="plugin-item {{plugin.nodeClass}}"
my-popover
data-placement="right"
Expand All @@ -65,7 +65,7 @@
<div class="no-item-message" ng-if="group.filtered.length === 0">
<h4>No {{MySidePanel.itemGenericName}} found.</h4>
</div>
<div ng-if="MySidePanel.view === 'list'" ng-repeat="plugin in group.filtered = (group.plugins | filter: {name: MySidePanel.searchText}) track by $index"
<div ng-if="MySidePanel.view === 'list'" ng-repeat="plugin in group.filtered = (group.plugins | filter: {name: MySidePanel.searchText} | orderBy: 'name') track by $index"
class="plugin-item {{plugin.nodeClass}}"
ng-click="MySidePanel.onItemClicked($event, plugin)">
<span ng-if="plugin.icon" class="text-center fa {{plugin.icon}}"></span>
Expand Down
6 changes: 0 additions & 6 deletions cdap-ui/app/features/hydratorplusplus/leftpanel.less
View file
Open in desktop
Expand Up @@ -497,12 +497,6 @@ body.theme-cdap.state-hydratorplusplus-create {
&:before, &:after {
padding: 2px;
}
&:before{
content: "(";
}
&:after {
content: ")";
}
}
}

Expand Down
1 change: 1 addition & 0 deletions cdap-ui/app/features/hydratorplusplus/services/create/stores/left-panel-store.js
View file
Open in desktop
Expand Up @@ -54,6 +54,7 @@ var mapPluginTemplatesWithMoreInfo = (type, DAGPlusPlusFactory, popoverTemplate)
plugin.type = type;
plugin.icon = DAGPlusPlusFactory.getIcon(plugin.pluginName);
plugin.template = popoverTemplate;
plugin.name = plugin.pluginTemplate;
if (plugin.pluginTemplate) {
plugin.nodeClass = 'plugin-templates';
}
Expand Down