Ver código fonte

[assist] Rename AssistEntry and AssistSource to AssistDbEntry and AssistDbSource

Johan Ahlen 10 anos atrás
pai
commit
d3dd83d

+ 2 - 2
apps/beeswax/src/beeswax/templates/execute.mako

@@ -800,8 +800,8 @@ ${ commonshare() | n,unicode }
 <script src="${ static('desktop/js/hdfsAutocompleter.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/assist/tableStats.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/assist/assistHelper.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/assist/assistEntry.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/assist/assistSource.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/js/assist/assistDbEntry.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/js/assist/assistDbSource.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/autocompleter.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('notebook/js/notebook.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('beeswax/js/beeswax.vm.js') }"></script>

+ 26 - 26
desktop/core/src/desktop/static/desktop/js/assist/assistEntry.js → desktop/core/src/desktop/static/desktop/js/assist/assistDbEntry.js

@@ -18,7 +18,7 @@
   if(typeof define === "function" && define.amd) {
     define(['knockout'], factory);
   } else {
-    root.AssistEntry = factory(ko);
+    root.AssistDbEntry = factory(ko);
   }
 }(this, function (ko) {
 
@@ -32,8 +32,8 @@
    * @param {boolean} [definition.isDatabase]
    * @param {boolean} [definition.isMapValue]
    * @param {boolean} [definition.isArray]
-   * @param {AssistEntry} parent
-   * @param {AssistSource} assistSource
+   * @param {AssistDbEntry} parent
+   * @param {AssistDbSource} assistDbSource
    * @param {Object} filter
    * @param {function} filter.query (observable)
    * @param {function} filter.showViews (observable)
@@ -43,12 +43,12 @@
    * @param {Object} navigationSettings
    * @constructor
    */
-  function AssistEntry (definition, parent, assistSource, filter, i18n, navigationSettings) {
+  function AssistDbEntry (definition, parent, assistDbSource, filter, i18n, navigationSettings) {
     var self = this;
     self.i18n = i18n;
     self.definition = definition;
 
-    self.assistSource = assistSource;
+    self.assistDbSource = assistDbSource;
     self.parent = parent;
     self.filter = filter;
     self.isSearchVisible = ko.observable(false);
@@ -117,7 +117,7 @@
           break;
         }
         if (entry.definition.isArray || entry.definition.isMapValue) {
-          if (self.assistSource.type === 'hive') {
+          if (self.assistDbSource.type === 'hive') {
             parts.push("[]");
           }
         } else {
@@ -132,13 +132,13 @@
     });
   }
 
-  AssistEntry.prototype.toggleSearch = function() {
+  AssistDbEntry.prototype.toggleSearch = function() {
     var self = this;
     self.isSearchVisible(!self.isSearchVisible());
     self.editingSearch(self.isSearchVisible());
-  }
+  };
 
-  AssistEntry.prototype.loadEntries = function() {
+  AssistDbEntry.prototype.loadEntries = function() {
     var self = this;
     if (!self.expandable || self.loading()) {
       return;
@@ -233,12 +233,12 @@
     };
 
     var errorCallback = function () {
-      self.assistSource.hasErrors(true);
+      self.assistDbSource.hasErrors(true);
       self.loading(false);
     };
 
-    self.assistSource.assistHelper.fetchPanelData({
-      sourceType: self.assistSource.type,
+    self.assistDbSource.assistHelper.fetchPanelData({
+      sourceType: self.assistDbSource.type,
       hierarchy: self.getHierarchy(),
       successCallback: successCallback,
       errorCallback: errorCallback
@@ -256,12 +256,12 @@
    * @param {boolean} [definition.isMapValue]
    * @param {boolean} [definition.isArray]
    */
-  AssistEntry.prototype.createEntry = function (definition) {
+  AssistDbEntry.prototype.createEntry = function (definition) {
     var self = this;
-    return new AssistEntry(definition, self, self.assistSource, null, self.i18n, self.navigationSettings)
+    return new AssistDbEntry(definition, self, self.assistDbSource, null, self.i18n, self.navigationSettings)
   };
 
-  AssistEntry.prototype.getHierarchy = function () {
+  AssistDbEntry.prototype.getHierarchy = function () {
     var self = this;
     var parts = [];
     var entry = self;
@@ -273,17 +273,17 @@
     return parts;
   };
 
-  AssistEntry.prototype.dblClick = function () {
+  AssistDbEntry.prototype.dblClick = function () {
     var self = this;
     huePubSub.publish('assist.dblClickItem', self);
   };
 
-  AssistEntry.prototype.toggleOpen = function () {
+  AssistDbEntry.prototype.toggleOpen = function () {
     var self = this;
     self.open(!self.open());
   };
 
-  AssistEntry.prototype.openItem = function () {
+  AssistDbEntry.prototype.openItem = function () {
     var self = this;
     if (self.definition.isTable || self.definition.isView) {
       huePubSub.publish("assist.table.selected", {
@@ -297,7 +297,7 @@
     }
   };
 
-  AssistEntry.prototype.showPreview = function () {
+  AssistDbEntry.prototype.showPreview = function () {
     var self = this;
     var $assistQuickLook = $("#assistQuickLook");
 
@@ -307,12 +307,12 @@
 
     $assistQuickLook.find(".tableName").text(self.definition.name);
     $assistQuickLook.find(".tableLink").attr("href", "/metastore/table/" + databaseName + "/" + tableName);
-    self.assistSource.loadingSamples(true);
-    self.assistSource.samples({});
+    self.assistDbSource.loadingSamples(true);
+    self.assistDbSource.samples({});
     $assistQuickLook.attr("style", "width: " + ($(window).width() - 120) + "px;margin-left:-" + (($(window).width() - 80) / 2) + "px!important;");
 
-    self.assistSource.assistHelper.fetchTableSample({
-      sourceType: self.assistSource.type === "hive" ? "beeswax" : self.assistSource.type,
+    self.assistDbSource.assistHelper.fetchTableSample({
+      sourceType: self.assistDbSource.type === "hive" ? "beeswax" : self.assistDbSource.type,
       databaseName: databaseName,
       tableName: tableName,
       dataType: "html",
@@ -322,8 +322,8 @@
         } else if (! data.headers) {
           data.headers = [];
         }
-        self.assistSource.samples(data);
-        self.assistSource.loadingSamples(false);
+        self.assistDbSource.samples(data);
+        self.assistDbSource.loadingSamples(false);
       },
       errorCallback: function(e) {
         if (e.status == 500) {
@@ -336,5 +336,5 @@
     $assistQuickLook.modal("show");
   };
 
-  return AssistEntry;
+  return AssistDbEntry;
 }));

+ 7 - 7
desktop/core/src/desktop/static/desktop/js/assist/assistSource.js → desktop/core/src/desktop/static/desktop/js/assist/assistDbSource.js

@@ -16,11 +16,11 @@
 
 (function (root, factory) {
   if(typeof define === "function" && define.amd) {
-    define(['knockout', 'desktop/js/assist/assistEntry'], factory);
+    define(['knockout', 'desktop/js/assist/assistDbEntry'], factory);
   } else {
-    root.AssistSource = factory(ko, AssistEntry);
+    root.AssistDbSource = factory(ko, AssistDbEntry);
   }
-}(this, function (ko, AssistEntry) {
+}(this, function (ko, AssistDbEntry) {
 
   /**
    * @param {Object} options
@@ -31,7 +31,7 @@
    * @param {Object} options.navigationSettings
    * @constructor
    */
-  function AssistSource (options) {
+  function AssistDbSource (options) {
 
     var self = this;
     self.i18n = options.i18n;
@@ -95,11 +95,11 @@
       var lastSelectedDb = self.selectedDatabase() ? self.selectedDatabase().definition.name : null;
       dbIndex = {};
       self.databases($.map(names, function(name) {
-        var database = new AssistEntry({
+        var database = new AssistDbEntry({
           name: name,
           displayName: name,
           title: name,
-          isDatabase: true,
+          isDatabase: true
         }, null, self, self.filter, self.i18n, self.navigationSettings);
         dbIndex[name] = database;
         if (name === lastSelectedDb) {
@@ -160,5 +160,5 @@
     huePubSub.subscribe('assist.refresh', self.reload);
   }
 
-  return AssistSource;
+  return AssistDbSource;
 }));

+ 11 - 11
desktop/core/src/desktop/templates/assist.mako

@@ -141,13 +141,13 @@ from desktop.views import _ko
       <a class="inactive-action" href="javascript:void(0)" data-bind="visible: (definition.isTable || definition.isView) && navigationSettings.showPreview, click: showPreview"><i class="fa fa-list" title="${_('Preview Sample data')}"></i></a>
       <span data-bind="visible: navigationSettings.showStats, component: { name: 'table-stats', params: {
           statsVisible: statsVisible,
-          sourceType: assistSource.type,
-          snippet: assistSource.snippet,
+          sourceType: assistDbSource.type,
+          snippet: assistDbSource.snippet,
           databaseName: databaseName,
           tableName: tableName,
           columnName: columnName,
           fieldType: definition.type,
-          assistHelper: assistSource.assistHelper
+          assistHelper: assistDbSource.assistHelper
         } }"></span>
       <a class="inactive-action" href="javascript:void(0)" data-bind="visible: navigationSettings.openItem, click: openItem"><i class="fa fa-long-arrow-right" title="${_('Open')}"></i></a>
     </div>
@@ -159,7 +159,7 @@ from desktop.views import _ko
       <li class="assist-entry" style="font-style: italic;">${_('No results found')}</li>
     </ul>
     <!-- /ko -->
-    <ul data-bind="foreach: filteredEntries, css: { 'assist-tables': definition.isDatabase }, event: { 'scroll': assistSource.repositionActions }">
+    <ul data-bind="foreach: filteredEntries, css: { 'assist-tables': definition.isDatabase }, event: { 'scroll': assistDbSource.repositionActions }">
       <li data-bind="visibleOnHover: { override: statsVisible, selector: (definition.isTable || definition.isView) ? '.table-actions' : '.column-actions' }, css: { 'assist-table': (definition.isTable || definition.isView), 'assist-column': definition.isColumn }">
         <!-- ko template: { if: definition.isTable || definition.isView || definition.isColumn, name: 'assist-entry-actions' } --><!-- /ko -->
         <a class="assist-entry" data-bind="multiClick: { click: toggleOpen, dblClick: dblClick }, attr: {'title': definition.title }, css: { 'assist-field-link': ! (definition.isTable || definition.isView), 'assist-table-link': (definition.isTable || definition.isView) }" href="javascript:void(0)">
@@ -276,15 +276,15 @@ from desktop.views import _ko
         <h3>${_('Data sample for')} <span class="tableName"></span></h3>
       </div>
       <div class="modal-body" style="min-height: 100px">
-        <!-- ko if: assistSource.loadingSamples -->
+        <!-- ko if: assistDbSource.loadingSamples -->
         <div class="loader">
           <!--[if !IE]><!--><i class="fa fa-spinner fa-spin" style="font-size: 30px; color: #DDD"></i><!--<![endif]-->
           <!--[if IE]><img src="${ static('desktop/art/spinner.gif') }"/><![endif]-->
         </div>
         <!-- /ko -->
-        <!-- ko ifnot: assistSource.loadingSamples -->
+        <!-- ko ifnot: assistDbSource.loadingSamples -->
         <div style="overflow: auto">
-          <!-- ko with: assistSource.samples -->
+          <!-- ko with: assistDbSource.samples -->
           <!-- ko if: rows.length == 0 -->
           <div class="alert">${ _('The selected table has no data.') }</div>
           <!-- /ko -->
@@ -321,11 +321,11 @@ from desktop.views import _ko
   <script type="text/javascript" charset="utf-8">
     (function (factory) {
       if(typeof require === "function") {
-        define('assistPanel', ['knockout', 'desktop/js/assist/assistSource', 'desktop/js/assist/assistHelper', 'tableStats'], factory);
+        define('assistPanel', ['knockout', 'desktop/js/assist/assistDbSource', 'desktop/js/assist/assistHelper', 'tableStats'], factory);
       } else {
-        factory(ko, AssistSource, AssistHelper);
+        factory(ko, AssistDbSource, AssistHelper);
       }
-    }(function (ko, AssistSource, AssistHelper) {
+    }(function (ko, AssistDbSource, AssistHelper) {
 
       /**
        * @param {Object} params
@@ -351,7 +351,7 @@ from desktop.views import _ko
         self.sources = ko.observableArray();
         var sourceIndex = {};
         $.each(params.sourceTypes, function (idx, sourceType) {
-          sourceIndex[sourceType.type] = new AssistSource({
+          sourceIndex[sourceType.type] = new AssistDbSource({
             assistHelper: assistHelper,
             i18n: i18n,
             type: sourceType.type,