Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6235A200B34 for ; Sat, 18 Jun 2016 03:22:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 60BD8160A62; Sat, 18 Jun 2016 01:22:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8A945160A61 for ; Sat, 18 Jun 2016 03:22:34 +0200 (CEST) Received: (qmail 83805 invoked by uid 500); 18 Jun 2016 01:22:33 -0000 Mailing-List: contact commits-help@atlas.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@atlas.incubator.apache.org Delivered-To: mailing list commits@atlas.incubator.apache.org Received: (qmail 83796 invoked by uid 99); 18 Jun 2016 01:22:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Jun 2016 01:22:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 437CCC0890 for ; Sat, 18 Jun 2016 01:22:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 46WCeqPI112Y for ; Sat, 18 Jun 2016 01:22:30 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 00FC45F1E4 for ; Sat, 18 Jun 2016 01:22:29 +0000 (UTC) Received: (qmail 83788 invoked by uid 99); 18 Jun 2016 01:22:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Jun 2016 01:22:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 355BDE049D; Sat, 18 Jun 2016 01:22:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sumasai@apache.org To: commits@atlas.incubator.apache.org Date: Sat, 18 Jun 2016 01:22:29 -0000 Message-Id: <38e9d864996141bc8da154f2d2045e2d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-atlas git commit: ATLAS-886 : Improve association of terms with entity (Show tree view) archived-at: Sat, 18 Jun 2016 01:22:36 -0000 Repository: incubator-atlas Updated Branches: refs/heads/0.7-incubating 8c1c969fc -> f4846674a http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/f4846674/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js b/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js new file mode 100644 index 0000000..88f96cd --- /dev/null +++ b/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js @@ -0,0 +1,653 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +define(['require', + 'backbone', + 'hbs!tmpl/business_catalog/TreeLayoutView_tmpl', + 'utils/Utils', + 'collection/VCatalogList', + 'utils/CommonViewFunction', + 'utils/Messages' +], function(require, Backbone, TreeLayoutView_tmpl, Utils, VCatalogList, CommonViewFunction, Messages) { + 'use strict'; + + var TreeLayoutView = Backbone.Marionette.LayoutView.extend( + /** @lends TreeLayoutView */ + { + _viewName: 'TreeLayoutView', + + template: TreeLayoutView_tmpl, + + /** Layout sub regions */ + regions: {}, + /** ui selector cache */ + ui: { + Parent: '[data-id="Parent"]', + childList: '[data-id="childList"]', + liClick: 'li a[data-href]', + backTaxanomy: '[data-id="backTaxanomy"]', + expandArrow: '[data-id="expandArrow"]', + searchTermInput: '[data-id="searchTermInput"]', + refreshTaxanomy: '[data-id="refreshTaxanomy"]' + }, + /** ui events hash */ + events: function() { + var events = {}; + events['dblclick ' + this.ui.liClick] = function(e) { + this.changeArrowState(e); + }; + events['click ' + this.ui.liClick] = function(e) { + var that = this; + that.addActiveClass(e); + that.url = $(e.currentTarget).data('href'); + if (this.viewBased) { + Utils.setUrl({ + url: '#!/taxonomy/detailCatalog' + that.url, + mergeBrowserUrl: false, + updateTabState: function() { + return { taxonomyUrl: this.url, stateChanged: true }; + }, + trigger: true + }); + } + }; + events['click ' + this.ui.backTaxanomy] = 'backButtonTaxanomy'; + events['click ' + this.ui.refreshTaxanomy] = 'refreshButtonTaxanomy'; + events['click ' + this.ui.expandArrow] = 'changeArrowState'; + events["change " + this.ui.searchTermInput] = function() { + var termUrl = this.termCollection.url.split("/", 5).join("/") + "/" + this.ui.searchTermInput.val().split(".").join("/terms/"); + this.fetchCollection(termUrl, true); + if (this.viewBased) { + Utils.setUrl({ + url: "#!/taxonomy/detailCatalog" + termUrl, + mergeBrowserUrl: false, + trigger: true, + updateTabState: function() { + return { taxonomyUrl: this.url, stateChanged: true }; + } + }); + } + }; + return events; + }, + /** + * intialize a new TreeLayoutView Layout + * @constructs + */ + initialize: function(options) { + _.extend(this, _.pick(options, 'globalVent', 'url', 'viewBased')); + this.parentCollection = new VCatalogList(); + this.childCollection = new VCatalogList(); + this.taxanomy = new VCatalogList(); + this.termCollection = new VCatalogList(); + }, + bindEvents: function() { + var that = this; + this.listenTo(this.parentCollection, 'reset', function() { + if (this.parentCollection.fullCollection.models.length) { + this.generateTree(true); + } else { + if (Utils.getUrlState.isTaxonomyTab() || Utils.getUrlState.isInitial()) { + this.createDefaultTaxonomy(); + } + } + }, this); + this.listenTo(this.childCollection, 'reset', function() { + this.generateTree(); + }, this); + this.listenTo(this.taxanomy, 'reset', function() { + this.searchResult(); + }, this); + this.listenTo(this.termCollection, 'reset', function() { + this.termSearchData(); + }, this); + this.listenTo(this.childCollection, 'error', function(model, response) { + if (response && response.responseJSON && response.responseJSON.message) { + Utils.notifyError({ + content: response.responseJSON.message + }); + } + this.hideLoader(); + }, this); + this.listenTo(this.parentCollection, 'error', function(model, response) { + if (response && response.responseJSON && response.responseJSON.message) { + Utils.notifyError({ + content: response.responseJSON.message + }); + } + this.hideLoader(); + }, this); + }, + onRender: function() { + var that = this; + this.bindEvents(); + that.ui.backTaxanomy.hide(); + this.fetchCollection(this.url, true); + this.$el.on("click", '.termPopoverList li', function(e) { + that[$(this).find("a").data('fn')](e); + }); + $('body').click(function(e) { + if (that.$('.termPopoverList').length) { + if ($(e.target).hasClass('termPopover')) { + return; + } + that.$('.termPopover').popover('hide'); + } + }); + this.fetchTaxanomyCollections(); + }, + backButtonTaxanomy: function(e) { + var that = this; + this.backButton = true; + var dataURL = this.$('.taxonomyTree').find('li[data-id="Parent"]').find("a").data('href').split("/terms"); + var backUrl = dataURL.pop(); + if (dataURL.join("/terms").length) { + this.ui.backTaxanomy.show(); + var currentURL = "#!/taxonomy/detailCatalog" + dataURL.join("/terms"); + this.fetchCollection(dataURL.join("/terms"), true); + this.url = dataURL.join("/terms"); + if (this.viewBased) { + Utils.setUrl({ + url: currentURL, + mergeBrowserUrl: false, + trigger: true, + updateTabState: function() { + return { taxonomyUrl: this.url, stateChanged: true }; + } + }); + } + } + }, + manualRender: function(url) { + var splitUrl = this.url.split('/terms'); + if (url && this.url != url) { + if (splitUrl.length > 1 && splitUrl[splitUrl.length - 1] == "") { + var checkUrl = splitUrl; + checkUrl.pop(); + if (url != checkUrl) { + this.fetchCollection(url, true); + } + } else if (Utils.getUrlState.getQueryParams() && Utils.getUrlState.getQueryParams().load == "true") { + if (this.viewBased) { + Utils.setUrl({ + url: "#!/taxonomy/detailCatalog" + url, + mergeBrowserUrl: false, + trigger: false, + updateTabState: function() { + return { taxonomyUrl: this.url, stateChanged: true }; + } + }); + } + this.fetchCollection(url, true); + } else { + this.fetchCollection(url, true); + } + } + if (!url && Utils.getUrlState.isTaxonomyTab()) { + this.selectFirstElement(); + } + }, + changeArrowState: function(e) { + var scope = this.$('[data-id="expandArrow"]'); + if (e) { + scope = $(e.currentTarget); + } + if (scope.is('a')) { + var url = scope.data('href'); + scope = scope.parent().find("i.toggleArrow"); + } else if (scope.is('i')) { + var url = scope.parent().find("a").data('href'); + } + if (scope.hasClass('fa-angle-down')) { + scope.toggleClass('fa-angle-right fa-angle-down'); + this.ui.childList.hide(); + } else { + if (e && $(e.currentTarget).parents('li.parentChild').length) { + scope.parent('li').find('.tools .taxanomyloader').show(); + this.url = url; + this.fetchCollection(url, true); + if (this.viewBased) { + Utils.setUrl({ + url: "#!/taxonomy/detailCatalog" + url, + mergeBrowserUrl: false, + trigger: true, + updateTabState: function() { + return { taxonomyUrl: this.url, stateChanged: true }; + } + }); + } + } else { + scope.toggleClass('fa-angle-right fa-angle-down'); + this.ui.childList.show(); + } + } + }, + fetchCollection: function(url, isParent) { + if (url) { + this.url = url; + } else { + var parentURL = this.ui.Parent.find('a').data('href'); + if (parentURL) { + this.url = parentURL; + } else { + this.url = "api/atlas/v1/taxonomies"; + } + } + this.showLoader(); + if (isParent) { + this.parentCollection.url = this.url; + this.parentCollection.fullCollection.reset(undefined, { silent: true }); + this.parentCollection.fetch({ reset: true }); + } else { + this.childCollection.url = this.url + "?hierarchy/path:."; + this.childCollection.fullCollection.reset(undefined, { silent: true }); + this.childCollection.fetch({ reset: true }); + } + }, + showLoader: function() { + this.$('.taxonomyTree').find('li.active .tools .taxanomyloader').show(); + this.$('.contentLoading').show(); + }, + hideLoader: function() { + this.$('.taxanomyloader').hide(); + this.$('.contentLoading').hide(); + }, + addActiveClass: function(e) { + this.$('ul.taxonomyTree').find('li').removeClass('active'); + if (e.jquery) { + e.parent('li').addClass('active'); + } else { + if (e.currentTarget) { + $(e.currentTarget).parent('li').addClass('active'); + } else { + if ($(e).parent.length) { + $(e).parent('li').addClass('active'); + } else { + $(e).parents('li').addClass('active'); + } + } + } + }, + fetchTaxanomyCollections: function() { + this.taxanomy.fetch({ reset: true }); + }, + refreshButtonTaxanomy: function() { + this.fetchTaxanomyCollections(); + var url = ""; + if (this.$('.taxonomyTree').find('.active').parents('.parentChild').length) { + url = this.$('.taxonomyTree').find('.active a').data('href').split("/").slice(0, -2).join("/"); + this.refresh = this.$('.taxonomyTree').find('.active a').data('href'); + } else { + url = this.$('.taxonomyTree').find('.active a').data('href'); + this.refresh = this.$('.taxonomyTree').find('.active a').data('href'); + } + this.fetchCollection(url, true); + }, + searchResult: function() { + var that = this; + _.each(this.taxanomy.models, function(model, key) { + var name = model.get('name'); + that.termCollection.url = "/api/atlas/v1/taxonomies/" + name + "/terms"; + }); + this.termCollection.fetch({ reset: true }); + }, + termSearchData: function() { + var that = this; + var str = ''; + for (var j = 0; j < this.termCollection.models.length; j++) { + var terms = this.termCollection.models[j].attributes.name; + str += ''; + this.ui.searchTermInput.html(str); + } + // this.ui.searchTermInput.setAttribute('data-href' : that.termCollection.url); + this.ui.searchTermInput.select2({ + placeholder: "Search Term", + allowClear: true + }); + }, + onSearchTerm: function() { + Utils.setUrl({ + url: '#!/search/searchResult', + urlParams: { + query: this.$('.taxonomyTree').find('li.active').find("a").data('name'), + searchType: "dsl", + dslChecked: true + }, + updateTabState: function() { + return { searchUrl: this.url, stateChanged: true }; + }, + mergeBrowserUrl: false, + trigger: true + }); + }, + selectFirstElement: function() { + var dataURL = this.$('.taxonomyTree').find('li[data-id="Parent"]').find("a").data('href') + if (dataURL) { + this.url = dataURL; + if (this.viewBased) { + Utils.setUrl({ + url: "#!/taxonomy/detailCatalog" + dataURL, + mergeBrowserUrl: false, + trigger: true, + updateTabState: function() { + return { taxonomyUrl: this.url, stateChanged: true }; + } + }); + } + } + }, + generateTree: function(isParent) { + var parentLi = "", + childLi = "", + that = this; + + function createTaxonomy(url) { + var href = false; + _.each(that.parentCollection.fullCollection.models, function(model, key) { + + if (model.get('terms')) { + href = model.get('terms').href; + } else if (model.get('href')) { + href = model.get('href') + "/terms"; + } + var hrefUrl = "/api" + model.get('href').split("/api")[1]; + if (hrefUrl) { + var backUrlCheck = hrefUrl.split("taxonomies/"); + if (backUrlCheck.length > 1) { + if (backUrlCheck[1].split("/terms").length <= 1) { + that.ui.backTaxanomy.hide(); + } else { + that.ui.backTaxanomy.show(); + } + } + } + var name = Utils.checkTagOrTerm(model.get('name')); + if (that.viewBased) { + parentLi = '
' + name.name + ''; + } else { + parentLi = '
' + name.name + ''; + } + + }); + if (href) { + var hrefUrl = "/api" + href.split("/api")[1]; + that.fetchCollection(hrefUrl); + } + that.ui.childList.html(''); + that.ui.Parent.addClass('active'); + that.ui.Parent.html(parentLi); + } + + function createTerm() { + _.each(that.childCollection.fullCollection.models, function(model, key) { + var name = Utils.checkTagOrTerm(model.get('name')); + var hrefUrl = "/api" + model.get('href').split("/api")[1]; + if (that.viewBased) { + childLi += '
  • ' + name.name + '
    • '; + } else { + childLi += '
  • ' + name.name + '
    • '; + } + }); + that.ui.childList.html(childLi); + } + if (isParent) { + createTaxonomy(); + } else { + this.changeArrowState(); + createTerm(); + if (Utils.getUrlState.isInitial() || Utils.getUrlState.getQueryUrl().lastValue == "taxonomy") { + this.selectFirstElement(); + } + if (this.refresh) { + this.addActiveClass(this.$('.taxonomyTree').find('a[data-href="' + this.refresh + '"]')); + this.refresh = undefined; + } + } + this.hideLoader(); + if (this.viewBased) { + this.$('.termPopover').popover({ + placement: 'bottom', + html: true, + trigger: 'manual', + container: this.$el, + template: '

    ', + content: function() { + var li = "
  • Add Subterm
    • "; + /* "
  • Move Term
    • " + + "
  • Edit Term
    • " +*/ + var termDataURL = Utils.getUrlState.getQueryUrl().hash.split("terms"); + if (termDataURL.length > 1) { + li = "
  • Search Assets
    • " + li; + li += "
  • Delete Term
    • "; + } + return "
      " + li + "
    "; + } + }); + this.$('.termPopover').off('click').on('click', function(e) { + // if any other popovers are visible, hide them + e.preventDefault(); + that.$('.termPopover').not(this).popover('hide'); + $(this).popover('show'); + }); + } + }, + onAddTerm: function(e) { + var that = this; + require([ + 'views/business_catalog/AddTermLayoutView', + 'modules/Modal' + ], function(AddTermLayoutView, Modal) { + var view = new AddTermLayoutView({ + url: that.$('.taxonomyTree').find('li.active').find("a").data("href"), + model: new that.parentCollection.model() + }); + var modal = new Modal({ + title: 'Create a new subterm', + content: view, + okCloses: true, + showFooter: true, + allowCancel: true, + okText: 'Add', + }).open(); + modal.$el.find('button.ok').attr('disabled', true); + modal.on('ok', function() { + that.saveAddTerm(view); + }); + view.ui.termName.on('keyup', function() { + if (this.value.indexOf(' ') >= 0) { + modal.$el.find('button.ok').prop('disabled', true); + view.ui.termName.addClass("addTermDiable"); + view.$('.alertTerm').show(); + } else { + modal.$el.find('button.ok').prop('disabled', false); + view.ui.termName.removeClass("addTermDiable"); + view.$('.alertTerm').hide(); + } + }); + view.on('closeModal', function() { + modal.trigger('cancel'); + }); + + }); + }, + saveAddTerm: function(view) { + var that = this; + var url = view.url; + view.model.url = url + "/terms/" + view.ui.termName.val(); + this.showLoader(); + view.model.set({ description: view.ui.termDetail.val() }).save(null, { + success: function(model, response) { + that.create = true; + that.fetchTaxanomyCollections(); + that.fetchCollection(url, true); + //that.fetchCollection(that.url); + Utils.notifySuccess({ + content: "Term " + view.ui.termName.val() + Messages.addSuccessMessage + }); + }, + error: function(model, response) { + Utils.notifyError({ + content: "Term " + view.ui.termName.val() + Messages.addErrorMessage + }); + }, + complete: function() { + that.hideLoader(); + } + }); + }, + deleteTerm: function(e) { + var termName = this.$('.taxonomyTree').find('li.active a').data("name"), + that = this, + modal = CommonViewFunction.deleteTagModel(termName); + modal.on('ok', function() { + that.deleteTermData(e); + }); + modal.on('closeModal', function() { + modal.trigger('cancel'); + }); + }, + deleteTermData: function(e) { + var that = this; + this.showLoader(); + require(['models/VCatalog'], function(VCatalog) { + var termModel = new VCatalog(), + url = that.$('.taxonomyTree').find('li.active a').data('href'); + var termName = that.$('.taxonomyTree').find('li.active a').text(); + termModel.deleteTerm(url, { + beforeSend: function() {}, + success: function(data) { + Utils.notifySuccess({ + content: "Term " + termName + Messages.deleteSuccessMessage + }); + var termURL = url.split("/").slice(0, -2).join("/"); + if (that.viewBased) { + Utils.setUrl({ + url: "#!/taxonomy/detailCatalog" + termURL, + mergeBrowserUrl: false, + trigger: true, + updateTabState: function() { + return { taxonomyUrl: this.url, stateChanged: true }; + } + }); + } + that.fetchCollection(termURL, true); + }, + error: function(error, data, status) { + var message = "Term " + termName + Messages.deleteErrorMessage; + if (data.error) { + message = data.error; + } + Utils.notifyError({ + content: message + }); + }, + complete: function() { + that.hideLoader(); + } + }); + }); + }, + moveTerm: function() { + var that = this; + require([ + 'views/business_catalog/MoveTermLayoutView', + 'modules/Modal' + ], function(MoveTermLayoutView, Modal) { + var view = new MoveTermLayoutView({ + taxanomyCollection: that.collection + }); + var modal = new Modal({ + title: 'Move Term', + content: view, + okCloses: true, + showFooter: true, + allowCancel: true, + okText: 'Move', + }).open(); + // modal.on('ok', function() { + // that.saveAddTerm(view); + // }); + view.on('closeModal', function() { + modal.trigger('cancel'); + }); + }); + }, + createDefaultTaxonomy: function() { + var that = this; + require([ + 'views/business_catalog/AddTermLayoutView', + 'modules/Modal' + ], function(AddTermLayoutView, Modal) { + var view = new AddTermLayoutView({ + url: "/api/atlas/v1/taxonomies", + model: new that.parentCollection.model() + }); + var modal = new Modal({ + title: 'Taxonomy', + content: view, + okCloses: true, + showFooter: true, + allowCancel: true, + okText: 'Create', + }).open(); + modal.$el.find('button.ok').attr('disabled', true); + modal.on('ok', function() { + that.saveDefaultTaxonomy(view); + }); + view.ui.termName.attr("placeholder", "Enter Taxonomy Name"); + view.ui.termName.on('keyup', function() { + if (this.value.indexOf(' ') >= 0) { + modal.$el.find('button.ok').prop('disabled', true); + view.ui.termName.addClass("addTermDiable"); + view.$('.alertTerm').show(); + } else { + modal.$el.find('button.ok').prop('disabled', false); + view.ui.termName.removeClass("addTermDiable"); + view.$('.alertTerm').hide(); + } + }); + view.on('closeModal', function() { + modal.trigger('cancel'); + }); + }); + }, + saveDefaultTaxonomy: function(view) { + var that = this; + var url = view.url; + view.model.url = url + "/" + view.ui.termName.val(); + this.showLoader(); + view.model.set({ description: view.ui.termDetail.val() }).save(null, { + success: function(model, response) { + that.fetchCollection(view.model.url, true); + Utils.notifySuccess({ + content: "Default taxonomy " + view.ui.termName.val() + Messages.addSuccessMessage + }); + }, + error: function(error, data, status) { + Utils.notifyError({ + content: "Default taxonomy " + view.ui.termName.val() + Messages.addErrorMessage + }); + }, + complete: function() { + that.hideLoader(); + } + }); + } + }); + return TreeLayoutView; +}); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/f4846674/dashboardv2/public/js/views/schema/SchemaLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/schema/SchemaLayoutView.js b/dashboardv2/public/js/views/schema/SchemaLayoutView.js index 4cd8ccb..1a9e9be 100644 --- a/dashboardv2/public/js/views/schema/SchemaLayoutView.js +++ b/dashboardv2/public/js/views/schema/SchemaLayoutView.js @@ -40,8 +40,8 @@ define(['require', ui: { tagClick: '[data-id="tagClick"]', addTag: "[data-id='addTag']", - addTerm: '[data-id="addTerm"]' - + addTerm: '[data-id="addTerm"]', + showMoreLess: '[data-id="showMoreLess"]' }, /** ui events hash */ events: function() { @@ -61,6 +61,15 @@ define(['require', }); } }; + events["click " + this.ui.showMoreLess] = function(e) { + $(e.currentTarget).find('i').toggleClass('fa fa-angle-right fa fa-angle-up'); + $(e.currentTarget).parents('.searchTag').find('a').toggleClass('hide show'); + if ($(e.currentTarget).find('i').hasClass('fa-angle-right')) { + $(e.currentTarget).find('span').text('Show More'); + } else { + $(e.currentTarget).find('span').text('Show less'); + } + }; return events; }, /** @@ -85,6 +94,7 @@ define(['require', paginatorOpts: {} }; this.bindEvents(); + this.bradCrumbList = []; }, bindEvents: function() { this.listenTo(this.schemaCollection, "reset", function(value) { @@ -113,6 +123,14 @@ define(['require', globalVent: that.globalVent, columns: cols }))); + that.renderBreadcrumb(); + }); + }, + renderBreadcrumb: function() { + var that = this; + _.each(this.bradCrumbList, function(object) { + var scopeObject = that.$('[dataTerm-id="' + object.scopeId + '"]').find('.liContent'); + CommonViewFunction.breadcrumbMaker({ urlList: object.value, scope: scopeObject }); }); }, getSchemaTableColumns: function() { @@ -163,17 +181,10 @@ define(['require', cell: "Html", editable: false, sortable: false, + className: 'searchTag', formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function(rawValue, model) { - var traits = model.get('$traits$'); - var atags = ""; - _.keys(model.get('$traits$')).map(function(key) { - var tagName = Utils.checkTagOrTerm(traits[key].$typeName$); - if (!tagName.term) { - atags += '' + traits[key].$typeName$ + ''; - } - }); - return '
    ' + atags + '
    '; + return CommonViewFunction.tagForTable(model); } }) }; @@ -183,23 +194,18 @@ define(['require', editable: false, sortable: false, orderable: true, + className: 'searchTerm', formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function(rawValue, model) { - var traits = model.get('$traits$'); - var aterms = ""; - _.keys(model.get('$traits$')).map(function(key) { - var tagName = Utils.checkTagOrTerm(traits[key].$typeName$); - if (tagName.term) { - aterms += '' + traits[key].$typeName$ + ''; - } - }); - return '
    ' + aterms + '
    '; + var returnObject = CommonViewFunction.termTableBreadcrumbMaker(model); + if (returnObject.object) { + that.bradCrumbList.push(returnObject.object); + } + return returnObject.html; } }) }; } - - return this.schemaCollection.constructor.getTableCols(col, this.schemaCollection); }, addTagModalView: function(e) { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/f4846674/dashboardv2/public/js/views/search/SearchResultLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js index 45ffa53..953a539 100644 --- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js @@ -46,7 +46,8 @@ define(['require', ui: { tagClick: '[data-id="tagClick"]', addTag: '[data-id="addTag"]', - addTerm: '[data-id="addTerm"]' + addTerm: '[data-id="addTerm"]', + showMoreLess: '[data-id="showMoreLess"]' }, /** ui events hash */ @@ -77,7 +78,15 @@ define(['require', }; events["click " + this.ui.addTag] = 'addTagModalView'; events["click " + this.ui.addTerm] = 'addTermModalView'; - events["click " + this.ui.tagCrossIcon] = function(e) {}; + events["click " + this.ui.showMoreLess] = function(e) { + $(e.currentTarget).find('i').toggleClass('fa fa-angle-right fa fa-angle-up'); + $(e.currentTarget).parents('.searchTag').find('a').toggleClass('hide show'); + if ($(e.currentTarget).find('i').hasClass('fa-angle-right')) { + $(e.currentTarget).find('span').text('Show More'); + } else { + $(e.currentTarget).find('span').text('Show less'); + } + }; return events; }, /** @@ -104,7 +113,7 @@ define(['require', paginatorOpts: {} }; this.bindEvents(); - + this.bradCrumbList = []; }, bindEvents: function() { this.listenTo(this.vent, "show:searchResult", function(value) { @@ -179,9 +188,9 @@ define(['require', model.set("position", 3, { silent: true }); model.set("label", "Owner"); } - /*else { - model.set("position", ++count, { silent: true }); - }*/ + // } else { + // model.set("position", ++count, { silent: true }); + // } }); return this; } @@ -193,6 +202,14 @@ define(['require', columns: columns, includeOrderAbleColumns: true }))); + that.renderBreadcrumb(); + }); + }, + renderBreadcrumb: function() { + var that = this; + _.each(this.bradCrumbList, function(object) { + var scopeObject = that.$('[dataTerm-id="' + object.scopeId + '"]').find('.liContent'); + CommonViewFunction.breadcrumbMaker({ urlList: object.value, scope: scopeObject }); }); }, checkTableFetch: function() { @@ -253,24 +270,10 @@ define(['require', editable: false, sortable: false, orderable: true, + className: 'searchTag', formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function(rawValue, model) { - var traits = model.get('$traits$'); - var atags = "", - addTag = ""; - _.keys(model.get('$traits$')).map(function(key) { - var tagName = Utils.checkTagOrTerm(traits[key].$typeName$); - if (!tagName.term) { - atags += '' + traits[key].$typeName$ + ''; - } - }); - if (model.get('$id$')) { - addTag += ''; - } else { - addTag += ''; - - } - return '
    ' + atags + addTag + '
    '; + return CommonViewFunction.tagForTable(model); } }) }; @@ -280,23 +283,14 @@ define(['require', editable: false, sortable: false, orderable: true, + className: 'searchTerm', formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function(rawValue, model) { - var traits = model.get('$traits$'); - var aterm = "", - addTerm = ""; - _.keys(model.get('$traits$')).map(function(key) { - var tagName = Utils.checkTagOrTerm(traits[key].$typeName$); - if (tagName.term) { - aterm += '' + traits[key].$typeName$ + ''; - } - }); - if (model.get('$id$')) { - addTerm += ''; - } else { - addTerm += ''; + var returnObject = CommonViewFunction.termTableBreadcrumbMaker(model); + if (returnObject.object) { + that.bradCrumbList.push(returnObject.object); } - return '
    ' + aterm + addTerm + '
    '; + return returnObject.html; } }) };