Merge pull request #5656 from caskdata/feature/ui-hydrator++-bugfix-6

UI Hydrator++ Bug fixes
cdapio · Apr 25, 2016 · ef2bd2a · ef2bd2a
2 parents 3d21f78 + 5a74e7f
commit ef2bd2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/cdap-ui/app/directives/group-side-panel/group-side-panel.html b/cdap-ui/app/directives/group-side-panel/group-side-panel.html
@@ -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"
@@ -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>

diff --git a/cdap-ui/app/features/hydratorplusplus/leftpanel.less b/cdap-ui/app/features/hydratorplusplus/leftpanel.less
@@ -497,12 +497,6 @@ body.theme-cdap.state-hydratorplusplus-create {
       &:before, &:after {
         padding: 2px;
       }
-      &:before{
-        content: "(";
-      }
-      &:after {
-        content: ")";
-      }
     }
   }
 

diff --git a/cdap-ui/app/features/hydratorplusplus/services/create/stores/left-panel-store.js b/cdap-ui/app/features/hydratorplusplus/services/create/stores/left-panel-store.js
@@ -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';
     }