Преглед изворни кода

HUE-4853 [metastore] Browse and open in editor are duplicates

Also fix the column filtering to search on type too.
Romain Rigaux пре 9 година
родитељ
комит
76cea3eca0

+ 1 - 0
apps/metastore/src/metastore/static/metastore/js/metastore.ko.js

@@ -368,6 +368,7 @@
       if (self.columnQuery() !== '') {
         returned = $.grep(self.columns(), function (column) {
           return column.name().toLowerCase().indexOf(self.columnQuery()) > -1
+            || (column.type() && column.type().toLowerCase().indexOf(self.columnQuery()) > -1)
             || (column.comment() && column.comment().toLowerCase().indexOf(self.columnQuery()) > -1);
         });
       }

+ 3 - 12
apps/metastore/src/metastore/templates/metastore.mako

@@ -115,7 +115,7 @@ ${ assist.assistPanel() }
       <tbody data-bind="hueach: {data: $data, itemHeight: 29, scrollable: '.right-panel', scrollableOffset: 200, disableHueEachRowCount: 5, scrollUp: true}">
         <tr>
           ## start at 1
-          <td data-bind="text: $index()+$indexOffset()+1"></td>
+          <td data-bind="text: $index() + $indexOffset() + 1"></td>
           ## no stats for partition key type
           <td>
            <span class="blue" data-bind="component: { name: 'table-stats', params: {
@@ -819,16 +819,6 @@ ${ assist.assistPanel() }
       <!-- /ko -->
     <!-- /ko -->
     <li><a href="#details" data-toggle="tab" data-bind="click: function(){ $root.currentTab('table-details'); }">${ _('Details') }</a></li>
-    <!-- ko with: samples -->
-      <!-- ko if: loaded() && rows().length && $root.currentTab() === 'table-sample' -->
-        <li class="pull-right"><a class="pointer" data-bind="click: function () { location.href = '/notebook/browse/' + $root.database().name + '/' + $root.database().table().name; }"><i class="fa fa-external-link"></i> ${ _('Open in editor') }</a>
-      <!-- /ko -->
-    <!-- /ko -->
-    <!-- ko if: $root.currentTab() == 'table-columns' -->
-    <li class="pull-right">
-      <input class="input-xlarge search-query margin-left-10" type="text" placeholder="${ _('Search for a column...') }" data-bind="clearable: columnQuery, value: columnQuery, valueUpdate: 'afterkeydown'"/>
-    </li>
-    <!-- /ko -->
   </ul>
 
   <div class="tab-content margin-top-10" style="border: none; overflow: hidden">
@@ -840,7 +830,8 @@ ${ assist.assistPanel() }
 
     <div class="tab-pane" id="columns">
       <!-- ko if: $root.currentTab() == 'table-columns' -->
-      <!-- ko template: 'metastore-columns-tab' --><!-- /ko -->
+        <input class="input-xlarge search-query margin-left-10" type="text" placeholder="${ _('Search for a column...') }" data-bind="clearable: columnQuery, value: columnQuery, valueUpdate: 'afterkeydown'"/>
+        <!-- ko template: 'metastore-columns-tab' --><!-- /ko -->
       <!-- /ko -->
     </div>