Pārlūkot izejas kodu

HUE-9191 [tb] Use the key component for keys in column lists

Johan Ahlen 5 gadi atpakaļ
vecāks
revīzija
7ea17da197

+ 2 - 1
desktop/core/src/desktop/js/ko/components/assist/__snapshots__/ko.assistKey.test.js.snap

@@ -7,7 +7,8 @@ exports[`ko.assistKey.js should render component 1`] = `
             html: true,
             placement: 'bottom'
           },
-          click: foreignKeyClick
+          click: foreignKeyClick,
+          clickbubble: false
         \\" data-original-title=\\"\\"><i class=\\"fa fa-key\\"></i></a><i class=\\"fa fa-key\\" style=\\"padding: 0 2px;\\" data-bind=\\"
           tooltip: {
             title: 'Foreign Key',

+ 3 - 2
desktop/core/src/desktop/js/ko/components/assist/ko.assistKey.js

@@ -34,7 +34,8 @@ const TEMPLATE = `
             html: true,
             placement: 'bottom'
           },
-          click: foreignKeyClick
+          click: foreignKeyClick,
+          clickbubble: false
         "><i class="fa fa-key"></i></a>
     <!-- /ko -->
     <!-- ko ifnot: entry.definition.foreignKey.to -->
@@ -61,7 +62,7 @@ const TEMPLATE = `
 
 class AssistKey {
   constructor(params) {
-    this.entry = params.entry;
+    this.entry = ko.unwrap(params.entry);
     this.onForeignKeyClick = params.onForeignKeyClick;
 
     this.foreignKeyTooltipHtml = ko.pureComputed(

+ 4 - 1
desktop/core/src/desktop/js/ko/components/ko.catalogEntriesList.js

@@ -21,8 +21,11 @@ import componentUtils from './componentUtils';
 import huePubSub from 'utils/huePubSub';
 import I18n from 'utils/i18n';
 
+import { ASSIST_KEY_COMPONENT } from './assist/ko.assistKey';
+
 export const NAME = 'catalog-entries-list';
 
+// prettier-ignore
 const TEMPLATE = `
   <script type="text/html" id="entries-table-td-description">
     <td data-bind="attr: { 'title': comment }">
@@ -186,7 +189,7 @@ const TEMPLATE = `
           <a href="javascript: void(0);" data-bind="click: onClick">
             <span data-bind="text: catalogEntry().name"></span>
             <!-- ko if: isKey -->
-            &nbsp;<i class="fa fa-key" data-bind="tooltip: { title: keyText, html: true }"></i>
+              <!-- ko component: { name: '${ ASSIST_KEY_COMPONENT }', params: { entry: catalogEntry } } --><!-- /ko -->
             <!-- /ko -->
             <!-- ko if: popularity && popularity() >= 5 -->
             &nbsp;<i data-bind="tooltip: { title: '${I18n(