You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2017/11/01 14:13:49 UTC
[4/4] atlas git commit: ATLAS-2217 : Remove all taxonomy reference
from UI
ATLAS-2217 : Remove all taxonomy reference from UI
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/37be53bb
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/37be53bb
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/37be53bb
Branch: refs/heads/master
Commit: 37be53bbb7eec13f8ce57377c8653f482216553f
Parents: e9b9513
Author: kevalbhatt <kb...@apache.org>
Authored: Mon Oct 30 18:41:55 2017 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Wed Nov 1 19:43:33 2017 +0530
----------------------------------------------------------------------
dashboardv2/public/css/scss/breadcrumb.scss | 62 --
.../public/css/scss/business-catlog.scss | 127 ----
dashboardv2/public/css/scss/common.scss | 3 -
dashboardv2/public/css/scss/style.scss | 4 -
dashboardv2/public/css/scss/theme.scss | 8 -
dashboardv2/public/css/scss/tree.scss | 183 ------
.../public/js/collection/VCatalogList.js | 64 --
dashboardv2/public/js/main.js | 3 -
dashboardv2/public/js/models/VCatalog.js | 50 --
dashboardv2/public/js/modules/Modal.js | 2 +-
dashboardv2/public/js/router/Router.js | 87 +--
.../AddTermToEntityLayoutView_tmpl.html | 17 -
.../business_catalog/AddTermView_tmpl.html | 38 --
.../BusinessCatalogDetailLayoutView_tmpl.html | 42 --
.../business_catalog/BusinessCatalogHeader.html | 29 -
.../BusinessCatalogLayoutView_tmpl.html | 17 -
.../MoveTermLayoutView_tmpl.html | 19 -
.../SideNavLayoutView_tmpl.html | 39 --
.../business_catalog/TreeLayoutView_tmpl.html | 34 -
.../js/templates/common/AboutAtlas_tmpl.html | 26 +
.../public/js/templates/common/Modal.html | 44 ++
.../js/templates/common/aboutAtlas_tmpl.html | 26 -
.../public/js/templates/common/modal.html | 44 --
.../detail_page/DetailPageLayoutView_tmpl.html | 18 -
.../schema/SchemaTableLayoutView_tmpl.html | 1 -
.../search/SearchResultLayoutView_tmpl.html | 2 -
.../public/js/templates/site/Header.html | 29 +
.../templates/site/SideNavLayoutView_tmpl.html | 33 +
.../public/js/templates/site/header.html | 29 -
.../js/templates/tag/AddTagModalView_tmpl.html | 37 ++
.../templates/tag/CreateTagLayoutView_tmpl.html | 54 ++
.../tag/TagDetailTableLayoutView_tmpl.html | 2 +-
.../js/templates/tag/addTagModalView_tmpl.html | 37 --
.../templates/tag/createTagLayoutView_tmpl.html | 54 --
.../public/js/utils/CommonViewFunction.js | 167 +----
dashboardv2/public/js/utils/Globals.js | 1 -
dashboardv2/public/js/utils/Messages.js | 6 +-
dashboardv2/public/js/utils/UrlLinks.js | 6 -
dashboardv2/public/js/utils/Utils.js | 62 --
.../views/business_catalog/AddTermLayoutView.js | 64 --
.../AddTermToEntityLayoutView.js | 124 ----
.../BusinessCatalogDetailLayoutView.js | 167 -----
.../business_catalog/BusinessCatalogHeader.js | 65 --
.../BusinessCatalogLayoutView.js | 65 --
.../business_catalog/MoveTermLayoutView.js | 54 --
.../views/business_catalog/SideNavLayoutView.js | 150 -----
.../js/views/business_catalog/TreeLayoutView.js | 629 -------------------
.../public/js/views/common/AboutAtlas.js | 74 +++
.../public/js/views/common/aboutAtlas.js | 65 --
.../views/detail_page/DetailPageLayoutView.js | 105 +---
.../public/js/views/schema/SchemaLayoutView.js | 133 +---
.../public/js/views/search/SearchLayoutView.js | 5 +-
.../js/views/search/SearchResultLayoutView.js | 166 +----
dashboardv2/public/js/views/site/Header.js | 2 +-
.../public/js/views/site/SideNavLayoutView.js | 125 ++++
.../public/js/views/tag/AddTagModalView.js | 380 +++++++++++
.../public/js/views/tag/CreateTagLayoutView.js | 19 +-
.../js/views/tag/TagDetailTableLayoutView.js | 77 +--
.../public/js/views/tag/TagLayoutView.js | 15 +-
.../public/js/views/tag/addTagModalView.js | 383 -----------
60 files changed, 935 insertions(+), 3438 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/css/scss/breadcrumb.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/breadcrumb.scss b/dashboardv2/public/css/scss/breadcrumb.scss
deleted file mode 100644
index 4bb09db..0000000
--- a/dashboardv2/public/css/scss/breadcrumb.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-
-
-/* breadcrumb.scss */
-
-.breadcrumb {
- padding: 8px 25px;
- background-color: transparent;
- margin-bottom: 0;
- font-weight: 600;
- line-height: 44px;
- >li {
- display: inline-block;
- +li:before {
- padding: 0 10px;
- font-family: $font_2;
- color: $color_ironside_gray_approx;
- content: "\f105";
- }
- }
-}
-
-.breadcrumb-menu,
-.breadcrumb-dropdown+li:before,
-.breadcrumb-ellipsis+li:before {
- display: none;
-}
-
-.dropdown .fa-ellipsis-h {
- position: relative;
- top: 4px;
-}
-
-.breadcrumb-ellipsis {
- color: #359f89;
- cursor: pointer;
- display: none !important;
-}
-
-#new-header .breadcrumb-dropdown .popover.bottom {
- margin-top: 45px !important;
-}
-
-.breadcrumb>li:last-child a {
- color: #b4b7bc;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/css/scss/business-catlog.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/business-catlog.scss b/dashboardv2/public/css/scss/business-catlog.scss
deleted file mode 100644
index 7e43f64..0000000
--- a/dashboardv2/public/css/scss/business-catlog.scss
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.
- */
-
-
-/* business-catlog.scss */
-
-.main-search {
- .form-control {
- border: none;
- border-left: 1px $color_mystic_approx solid; //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
- border-radius: 0; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10)
- box-shadow: none;
- height: 60px;
- font-size: 18px;
- font-style: italic;
- }
- .input-group-addon {
- font-size: 20px;
- color: $color_bombay_approx;
- background: none;
- border: none;
- }
-}
-
-.arrowPosition {
- left: -75px;
-}
-
-.sidebar-item.active i {
- display: block !important;
-}
-
-.dropdown-menu>li>a {
- color: $color_jungle_green_approx;
- padding: 6px 20px;
- max-width: 276px;
- @include ellipsis();
-}
-
-.branchListParent {
- .parentActive {
- background: none;
- }
- .fa {
- line-height: 40px;
- }
-}
-
-ul[data-id=branchList] {
- .fa {
- line-height: 40px;
- }
- li {
- padding-left: 50px;
- }
-}
-
-.branchChildDiv {
- padding-left: 15px;
-}
-
-.branchListParentInput {
- padding-bottom: 18px;
- display: list-item;
- .form-control {
- border-right: none; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10)
- box-shadow: none; //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
- border-radius: 4px;
- }
- .input-group-addon {
- background-color: $white;
- }
-}
-
-.listTerm {
- padding-bottom: 5px;
-}
-
-.termNote {
- padding-top: 10px;
-}
-
-.termTableBreadcrumb {
- >div {
- @include clearfix();
- display: block;
- width: 100%;
- }
- .hide {
- opacity: 0;
- overflow: hidden;
- height: 0px;
- display: block !important;
- }
- .show {
- opacity: 1;
- overflow: visible;
- height: auto;
- }
- .liContent {
- float: left;
- line-height: 21px !important;
- padding: 0px 10px 0px 0px !important;
- }
- >div a {
- .fa-trash,
- .fa-ellipsis-h {
- color: $tag_color;
- cursor: pointer;
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/css/scss/common.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/common.scss b/dashboardv2/public/css/scss/common.scss
index fd6c0f0..3c2dff5 100644
--- a/dashboardv2/public/css/scss/common.scss
+++ b/dashboardv2/public/css/scss/common.scss
@@ -41,9 +41,6 @@
&[data-id="edit"] {
display: none;
}
- &.btn[data-id="addTerm"] {
- display: none;
- }
&.btn[data-id="tagClick"] {
span {
display: block;
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/css/scss/style.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/style.scss b/dashboardv2/public/css/scss/style.scss
index 422680e..531a727 100644
--- a/dashboardv2/public/css/scss/style.scss
+++ b/dashboardv2/public/css/scss/style.scss
@@ -25,12 +25,8 @@
@import "panel.scss";
@import "loader.scss";
@import "graph.scss";
-@import "breadcrumb.scss";
-//@import "login.scss";
-@import "business-catlog.scss";
@import "old-style.scss";
@import "theme.scss";
-@import "tree.scss";
@import "tag.scss";
@import "search.scss";
@import "profile-table.scss";
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/css/scss/theme.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/theme.scss b/dashboardv2/public/css/scss/theme.scss
index dae7827..4ce51b2 100644
--- a/dashboardv2/public/css/scss/theme.scss
+++ b/dashboardv2/public/css/scss/theme.scss
@@ -184,14 +184,6 @@ hr[size="10"] {
}
}
-
-.table-quickMenu>tbody>tr>td {
- &.searchTerm {
- overflow: visible;
- }
- &.searchTag {}
-}
-
.card {
background: $white none repeat scroll 0 0; //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10)
box-shadow: 0 1px 3px $black_30;
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/css/scss/tree.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/tree.scss b/dashboardv2/public/css/scss/tree.scss
deleted file mode 100644
index 4339dba..0000000
--- a/dashboardv2/public/css/scss/tree.scss
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.
- */
-
-
-/* tree.scss */
-
-.jstree-container-ul {
- padding-left: 0px;
- position: relative;
- list-style: none;
- .jstree-node {
- white-space: nowrap;
- position: relative;
- cursor: pointer;
- padding: 4px 0;
- margin: 0;
- margin-top: 5px;
- margin-bottom: 5px;
- }
- ul {
- list-style: none;
- padding: 0;
- text-indent: 30px;
- }
- li a {
- // color: $white;
- display: block;
- }
-}
-
-.taxonomyTree {
- padding: 0;
- position: relative;
- li {
- position: relative;
- border-radius: 4px;
- margin-top: 5px;
- &.parent {
- width: 100%;
- a {
- max-width: 93%;
- }
- }
- &.parentChild {
- >ul {
- padding-left: 9%;
- }
- li {
- &.children {
- width: 91%;
- }
- a {
- max-width: 90%;
- }
- }
- }
- &.children {
- &:hover {
- background-color: $color_star_dust_approx;
- }
- }
- &.listTerm {
- a {
- display: inline;
- }
- }
- &.active {
- background-color: $color_jungle_green_approx !important;
- border: none;
- .tools {
- display: block;
- .fa {
- cursor: pointer;
- padding: 0px 3px;
- }
- }
- }
- a {
- display: block;
- color: $concrete;
- white-space: nowrap;
- padding: 5px 25px;
- @include ellipsis();
- cursor: pointer;
- }
- .tools {
- background: $color_jungle_green_approx;
- display: none;
- position: absolute;
- right: 2px;
- padding: 5px;
- }
- }
-}
-
-.termMoveDiv {
- width: 550px;
- height: 200px;
- margin: 10px;
-}
-
-.toggleArrow {
- position: absolute;
- left: 0px;
- padding: 8px;
- cursor: pointer;
-}
-
-.addTermDisable {
- border-color: $red !important;
-}
-
-.alertTerm {
- color: $red !important;
-}
-
-
-
-/**Css changes**/
-
-.modal-body {
- .add-seperator {
- border: none;
- }
- .taxonomyTree li {
- .children {
- text-indent: 20px;
- }
- &.parentChild {
- ul {
- padding-left: 0px;
- }
- li {
- &.children {
- width: 100%;
- }
- a {
- max-width: 100%;
- }
- }
- }
- &.active {
- color: $concrete;
- a {
- color: $concrete;
- }
- }
- a {
- color: #6C6C6C;
- }
- &.children:hover {
- a {
- color: $concrete;
- }
- background-color: #ABABAB;
- color: $white;
- }
- .tools {
- text-indent: 0px;
- background: none;
- }
- }
-}
-
-.popoverTerm {
- text-align: center;
- margin-top: 25px !important;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/collection/VCatalogList.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/collection/VCatalogList.js b/dashboardv2/public/js/collection/VCatalogList.js
deleted file mode 100644
index 7899b3e..0000000
--- a/dashboardv2/public/js/collection/VCatalogList.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * 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',
- 'utils/Globals',
- 'collection/BaseCollection',
- 'models/VCatalog',
- 'utils/UrlLinks'
-], function(require, Globals, BaseCollection, VCatalog, UrlLinks) {
- 'use strict';
- var VCatalogList = BaseCollection.extend(
- //Prototypal attributes
- {
- url: UrlLinks.taxonomiesApiUrl(),
-
- model: VCatalog,
-
- initialize: function() {
- this.modelName = 'VCatalog';
- this.modelAttrName = '';
- },
- fetch: function(options) {
- //Call Backbone's fetch
- return Backbone.Collection.prototype.fetch.call(this, options);
- },
- parseRecords: function(resp, options) {
- try {
- /* var arr = [];
- arr.push({
- taxonomies: resp
- });*/
- return resp;
- } catch (e) {
- console.log(e);
- }
- },
- },
- //Static Class Members
- {
- /**
- * Table Cols to be passed to Backgrid
- * UI has to use this as base and extend this.
- *
- */
- tableCols: {}
- }
- );
- return VCatalogList;
-});
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/main.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index aae231c..8e4dce5 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -213,9 +213,6 @@ require(['App',
Globals.userLogedIn.status = true;
Globals.userLogedIn.response = response;
}
- if (response && response['atlas.feature.taxonomy.enable'] !== undefined) {
- Globals.taxonomy = response['atlas.feature.taxonomy.enable']
- }
if (response && response['atlas.entity.create.allowed'] !== undefined) {
Globals.entityCreate = response['atlas.entity.create.allowed'];
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/models/VCatalog.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/models/VCatalog.js b/dashboardv2/public/js/models/VCatalog.js
deleted file mode 100644
index ea5ae2c..0000000
--- a/dashboardv2/public/js/models/VCatalog.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 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',
- 'utils/Globals',
- 'models/BaseModel',
- 'utils/UrlLinks'
-], function(require, Globals, VBaseModel, UrlLinks) {
- 'use strict';
- var VCatalog = VBaseModel.extend({
- urlRoot: UrlLinks.taxonomiesApiUrl(),
-
- defaults: {},
-
- serverSchema: {},
-
- idAttribute: 'id',
-
- initialize: function() {
- this.modelName = 'VCatalog';
- },
- toString: function() {
- return this.get('name');
- },
- deleteTerm: function(termURL, options) {
- var url = termURL;
- options = _.extend({
- contentType: 'application/json',
- dataType: 'json'
- }, options);
- return this.constructor.nonCrudOperation.call(this, url, 'DELETE', options);
- }
- }, {});
- return VCatalog;
-});
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/modules/Modal.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/modules/Modal.js b/dashboardv2/public/js/modules/Modal.js
index 48f385e..b49f657 100644
--- a/dashboardv2/public/js/modules/Modal.js
+++ b/dashboardv2/public/js/modules/Modal.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-define(['require', 'backbone', 'hbs!tmpl/common/modal'], function(require, Backbone, template) {
+define(['require', 'backbone', 'hbs!tmpl/common/Modal'], function(require, Backbone, template) {
var Modal = Backbone.View.extend({
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/router/Router.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/router/Router.js b/dashboardv2/public/js/router/Router.js
index 7790aef..e9c9e5e 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -32,11 +32,9 @@ define([
'': 'defaultAction',
'!/': 'tagAttributePageLoad',
'!/tag/tagAttribute/(*name)': 'tagAttributePageLoad',
- '!/taxonomy/detailCatalog/(*url)': 'detailCatalog',
'!/search/searchResult': 'searchResult',
'!/detailPage/:id': 'detailPage',
'!/tag': 'commonAction',
- '!/taxonomy': 'commonAction',
'!/search': 'commonAction',
// Default
'*actions': 'defaultAction'
@@ -64,29 +62,11 @@ define([
bindCommonEvents: function() {
var that = this;
$('body').on('click', 'li.aboutAtlas', function() {
- that.aboutAtlas();
- });
- },
- aboutAtlas: function() {
- var that = this;
- require([
- 'hbs!tmpl/common/aboutAtlas_tmpl',
- 'modules/Modal',
- 'views/common/aboutAtlas',
- ], function(aboutAtlasTmpl, Modal, aboutAtlasView) {
- var view = new aboutAtlasView();
- var modal = new Modal({
- title: 'Apache Atlas',
- content: view,
- okCloses: true,
- showFooter: true,
- allowCancel: false,
- }).open();
-
- view.on('closeModal', function() {
- modal.trigger('cancel');
+ require([
+ 'views/common/AboutAtlas',
+ ], function(AboutAtlas) {
+ new AboutAtlas();
});
-
});
},
showRegions: function() {},
@@ -110,53 +90,13 @@ define([
// console.log("Post-Route Change Operations can be performed here !!");
// console.log("Route changed: ", name);
},
- detailCatalog: function(url) {
- var that = this;
- require([
- 'views/business_catalog/BusinessCatalogHeader',
- 'views/business_catalog/BusinessCatalogDetailLayoutView',
- 'views/business_catalog/SideNavLayoutView',
- 'collection/VCatalogList'
- ], function(BusinessCatalogHeader, BusinessCatalogDetailLayoutView, SideNavLayoutView, VCatalogList) {
- if (Globals.taxonomy) {
- var paramObj = Utils.getUrlState.getQueryParams();
- this.collection = new VCatalogList();
- this.collection.url = url;
- App.rNHeader.show(new BusinessCatalogHeader(
- _.extend({
- 'url': url,
- 'collection': this.collection
- }, that.preFetchedCollectionLists)
- ));
- if (!App.rSideNav.currentView) {
- App.rSideNav.show(new SideNavLayoutView(
- _.extend({
- 'url': url
- }, that.preFetchedCollectionLists, that.sharedObj)
- ));
- } else {
- App.rSideNav.currentView.RBusinessCatalogLayoutView.currentView.manualRender("/" + url);
- App.rSideNav.currentView.selectTab();
- }
- App.rNContent.show(new BusinessCatalogDetailLayoutView(
- _.extend({
- 'url': url,
- 'collection': this.collection
- }, that.preFetchedCollectionLists)
- ));
- this.collection.fetch({ reset: true });
- } else {
- that.defaultAction()
- }
- });
- },
detailPage: function(id) {
var that = this;
if (id) {
require([
'views/site/Header',
'views/detail_page/DetailPageLayoutView',
- 'views/business_catalog/SideNavLayoutView',
+ 'views/site/SideNavLayoutView',
'collection/VEntityList'
], function(Header, DetailPageLayoutView, SideNavLayoutView, VEntityList) {
this.entityCollection = new VEntityList([], {});
@@ -183,10 +123,9 @@ define([
var that = this;
require([
'views/site/Header',
- 'views/business_catalog/BusinessCatalogLayoutView',
- 'views/business_catalog/SideNavLayoutView',
+ 'views/site/SideNavLayoutView',
'views/tag/TagDetailLayoutView',
- ], function(Header, BusinessCatalogLayoutView, SideNavLayoutView, TagDetailLayoutView) {
+ ], function(Header, SideNavLayoutView, TagDetailLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(),
url = Utils.getUrlState.getQueryUrl().queyParams[0];
App.rNHeader.show(new Header());
@@ -233,10 +172,9 @@ define([
var that = this;
require([
'views/site/Header',
- 'views/business_catalog/BusinessCatalogLayoutView',
- 'views/business_catalog/SideNavLayoutView',
+ 'views/site/SideNavLayoutView',
'views/search/SearchDetailLayoutView',
- ], function(Header, BusinessCatalogLayoutView, SideNavLayoutView, SearchDetailLayoutView) {
+ ], function(Header, SideNavLayoutView, SearchDetailLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams();
App.rNHeader.show(new Header());
if (!App.rSideNav.currentView) {
@@ -249,8 +187,6 @@ define([
App.rSideNav.currentView.selectTab();
if (Utils.getUrlState.isTagTab()) {
App.rSideNav.currentView.RTagLayoutView.currentView.manualRender();
- } else if (Utils.getUrlState.isTaxonomyTab()) {
- App.rSideNav.currentView.RBusinessCatalogLayoutView.currentView.manualRender(undefined, true);
}
}
if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) {
@@ -271,10 +207,9 @@ define([
var that = this;
require([
'views/site/Header',
- 'views/business_catalog/BusinessCatalogLayoutView',
- 'views/business_catalog/SideNavLayoutView',
+ 'views/site/SideNavLayoutView',
'views/search/SearchDetailLayoutView'
- ], function(Header, BusinessCatalogLayoutView, SideNavLayoutView, SearchDetailLayoutView) {
+ ], function(Header, SideNavLayoutView, SearchDetailLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams();
var isinitialView = true,
isTypeTagNotExists = false,
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/AddTermToEntityLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/AddTermToEntityLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/AddTermToEntityLayoutView_tmpl.html
deleted file mode 100644
index 36cf43a..0000000
--- a/dashboardv2/public/js/templates/business_catalog/AddTermToEntityLayoutView_tmpl.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
- * 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.
--->
-<div id="r_treeLayoutView"></div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html
deleted file mode 100644
index 0b62098..0000000
--- a/dashboardv2/public/js/templates/business_catalog/AddTermView_tmpl.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- * 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.
--->
-<form name="tagDefinitionform" class="form-horizontal" onsubmit="return false;">
- <div class="form-group">
- <label class="control-label col-sm-2 required" for="name">Name</label>
- {{#if defaultTerm}}
- <div class="col-sm-10">
- <input class="form-control" data-id="termName" placeholder="Enter Taxonomy Name" autofocus>
- <p class='alertTerm' style='display:none'>Taxonomy name should not have spaces</p>
- </div>
- {{else}}
- <div class="col-sm-10">
- <input class="form-control" data-id="termName" placeholder="Name(Required)" autofocus>
- <p class='alertTerm' style='display:none'>Term name should not have spaces</p>
- </div>
- {{/if}}
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="description">Description</label>
- <div class="col-sm-10">
- <textarea class="form-control" data-id="termDetail" placeholder="Description"></textarea>
- </div>
- </div>
-</form>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html
deleted file mode 100644
index d3c9fe1..0000000
--- a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogDetailLayoutView_tmpl.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- * 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.
--->
-<div class="page-title clearfix">
- <div class="fontLoader">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
- <div class="catlogDetail">
- <h1 class="form-group"><span data-id="title"></span></h1>
- <button type="button" data-id="editButton" class="btn btn-sm btn-action pull-right"><i class="fa fa-pencil"></i></button>
- <p class="form-group" data-id="description">Description</p>
- </div>
-</div>
-<div class="container-fluid gray-bg">
- <div class="row">
- <div class="col-sm-custom">
- <div class="atlast-tabbable">
- <ul class="nav nav-tabs" role="tablist">
- <li role="presentation" class="tab active"><a href="#tab-details" aria-controls="tab-details" role="tab" data-toggle="tab">Properties</a></li>
- </ul>
- <div class="tab-content">
- <div id="tab-details" role="tabpanel" class="tab-pane active">
- <p data-id="createDate"></p>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html
deleted file mode 100644
index 3f8928e..0000000
--- a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- * 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.
--->
-<ol class="breadcrumb col-md-6">
-</ol>
-<header class="clearfix">
- <div class="btn-group pull-right header-menu">
- <a target="_blank" href="http://atlas.apache.org/"><i class="fa fa-question-circle"></i></a>
- <a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-user user-circle"></i><span class="userName"></span></a>
- <ul class="dropdown-menu">
- <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
- <li role="separator" class="divider"></li>
- <li><a href="logout.html"><i class="fa fa-sign-out"></i>Logout</a></li>
- </ul>
- </div>
-</header>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html
deleted file mode 100644
index 36cf43a..0000000
--- a/dashboardv2/public/js/templates/business_catalog/BusinessCatalogLayoutView_tmpl.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
- * 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.
--->
-<div id="r_treeLayoutView"></div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html
deleted file mode 100644
index 0f9a066..0000000
--- a/dashboardv2/public/js/templates/business_catalog/MoveTermLayoutView_tmpl.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- * 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.
--->
-<div class="form-control termMoveDiv">
- <div id="tree"></div>
-</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
deleted file mode 100644
index 44b722f..0000000
--- a/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
- * 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.
--->
-<ul class="sidebar-nav">
- <li class="sidebar-brand">
- <a href="{{apiBaseUrl}}/index.html"><i class="fa fa-globe"></i> Apache Atlas</a>
- </li>
- <ul class="tabs" style="width: 100%;" role="tablist">
- <li role="presentation" class="{{tabClass}}"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li>
- <li role="presentation" class="{{tabClass}}"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab"><i class="fa fa-tags"></i> Tags</a></li>
- {{#if taxonomy}}
- <li role="presentation" class="tab col-sm-4"><a href="#tab-taxonomy" aria-controls="tab-taxonomy" data-name="tab-taxonomy" role="tab" data-toggle="tab" class=""><i class="fa fa-sitemap"></i> Taxonomy</a></li>
- {{/if}}
- </ul>
-</ul>
-<div class="tab-content">
- <div role="tabpanel" class="tab-pane" id="tab-tag">
- <div id="r_tagLayoutView"></div>
- </div>
- <div role="tabpanel" class="tab-pane" id="tab-taxonomy">
- <div id="r_businessCatalogLayoutView"></div>
- </div>
- <div role="tabpanel" class="tab-pane" id="tab-search">
- <div id="r_searchLayoutView"></div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/business_catalog/TreeLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/business_catalog/TreeLayoutView_tmpl.html b/dashboardv2/public/js/templates/business_catalog/TreeLayoutView_tmpl.html
deleted file mode 100644
index ca2968e..0000000
--- a/dashboardv2/public/js/templates/business_catalog/TreeLayoutView_tmpl.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- * 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.
--->
-<div class="clearfix add-seperator">
- <p data-id="descriptionAssign" style="display:none">Assign a term to this asset</p>
- <button type="button" class="btn btn-action btn-md pull-left" data-id="backTaxanomy"><i class="fa fa-chevron-left"></i> Back</button>
- <button type="button" class="btn btn-action btn-md pull-right" onclick="this.blur();" title="Refresh" data-id="refreshTaxanomy"><i class="fa fa-refresh"></i></button>
-</div>
-<div>
- <select type="text" class="form-control" data-id="searchTermInput"></select>
-</div>
-<div class="">
- <ul class="taxonomyTree">
- <div class="contentLoading"></div>
- <li class="children parent" data-id="Parent"></li>
- <li class="childs parentChild">
- <ul data-id="childList">
- </ul>
- </li>
- </ul>
-</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/common/AboutAtlas_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/common/AboutAtlas_tmpl.html b/dashboardv2/public/js/templates/common/AboutAtlas_tmpl.html
new file mode 100644
index 0000000..a3cf90a
--- /dev/null
+++ b/dashboardv2/public/js/templates/common/AboutAtlas_tmpl.html
@@ -0,0 +1,26 @@
+<!--
+ * 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.
+-->
+<div class="row">
+ <div class="col-md-4">
+ <div class="col-md-8 subContent">
+ <p data-id="atlasVersion"></p>
+ <br>
+ <p class="text-info">Get involved!</p>
+ <p class="text-info"><a href="http://apache.org/licenses/LICENSE-2.0" target="_blank">Licensed under the Apache License Version 2.0</a></p>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/common/Modal.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/common/Modal.html b/dashboardv2/public/js/templates/common/Modal.html
new file mode 100644
index 0000000..e000fa8
--- /dev/null
+++ b/dashboardv2/public/js/templates/common/Modal.html
@@ -0,0 +1,44 @@
+<!--
+ * 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.
+-->
+<div class="modal-dialog {{mainClass}} " style="width:{{width}}" role="document">
+ <div class="modal-content">
+ {{#if title}}
+ <div class="modal-header">
+ <a class="close">×</a>
+ <h4 class="modal-title">
+ {{#if titleHtml}}
+ {{{tt title}}}
+ {{else}}
+ {{tt title}}
+ {{/if}}
+ </h4>
+ </div>
+ {{/if}} {{#if contentWithFooter}} {{else}}
+ <div class="modal-body">{{content}}</div>
+ {{#if showFooter}}
+ <div class="modal-footer">
+ {{#if buttons}} {{#each buttons}}
+ <button type="button" {{#if this.title}} title="{{this.title}}" {{/if}} class="btn {{this.btnClass}}">{{this.text}}</button>
+ {{/each}} {{else}} {{#if allowCancel}} {{#if cancelText}}
+ <button type="button" class="btn btn-action cancel">{{tt cancelText}}</button>
+ {{/if}} {{/if}}
+ <button type="button" class="btn btn-atlas ok">{{tt okText}}</button>
+ {{/if}}
+ </div>
+ {{/if}} {{/if}}
+ </div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html b/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
deleted file mode 100644
index a3cf90a..0000000
--- a/dashboardv2/public/js/templates/common/aboutAtlas_tmpl.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- * 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.
--->
-<div class="row">
- <div class="col-md-4">
- <div class="col-md-8 subContent">
- <p data-id="atlasVersion"></p>
- <br>
- <p class="text-info">Get involved!</p>
- <p class="text-info"><a href="http://apache.org/licenses/LICENSE-2.0" target="_blank">Licensed under the Apache License Version 2.0</a></p>
- </div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/common/modal.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/common/modal.html b/dashboardv2/public/js/templates/common/modal.html
deleted file mode 100644
index e000fa8..0000000
--- a/dashboardv2/public/js/templates/common/modal.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
- * 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.
--->
-<div class="modal-dialog {{mainClass}} " style="width:{{width}}" role="document">
- <div class="modal-content">
- {{#if title}}
- <div class="modal-header">
- <a class="close">×</a>
- <h4 class="modal-title">
- {{#if titleHtml}}
- {{{tt title}}}
- {{else}}
- {{tt title}}
- {{/if}}
- </h4>
- </div>
- {{/if}} {{#if contentWithFooter}} {{else}}
- <div class="modal-body">{{content}}</div>
- {{#if showFooter}}
- <div class="modal-footer">
- {{#if buttons}} {{#each buttons}}
- <button type="button" {{#if this.title}} title="{{this.title}}" {{/if}} class="btn {{this.btnClass}}">{{this.text}}</button>
- {{/each}} {{else}} {{#if allowCancel}} {{#if cancelText}}
- <button type="button" class="btn btn-action cancel">{{tt cancelText}}</button>
- {{/if}} {{/if}}
- <button type="button" class="btn btn-atlas ok">{{tt okText}}</button>
- {{/if}}
- </div>
- {{/if}} {{/if}}
- </div>
-</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html b/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
index 8acd8e4..a08d9ab 100644
--- a/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
@@ -33,14 +33,6 @@
</button>
</div>
</div>
- {{#if taxonomy}}
- <div class="form-group">
- <span class="control-label-sm-pr pull-left">Terms:</span>
- <div class="pull-left" data-id="termList">
- <button class="btn btn-action btn-sm" title="Add Term" data-id="addTerm"><i class="fa fa-plus"></i></button>
- </div>
- </div>
- {{/if}}
</div>
</div>
<div class="container-fluid gray-bg">
@@ -84,9 +76,6 @@
<ul class="nav nav-tabs ">
<li role="properties" class="tab active"><a href="#tab-details" aria-controls="tab-details" role="tab" data-toggle="tab">Properties</a></li>
<li role="tags"><a href="#tab-tagTable" aria-controls="tab-tagTable" role="tab" data-toggle="tab">Tags</a></li>
- {{#if taxonomy}}
- <li role="terms"><a href="#tab-termTable" aria-controls="tab-termTable" role="tab" data-toggle="tab">Terms</a></li>
- {{/if}}
<li role="audits" class="tab"><a href="#tab-audit" aria-controls="tab-audit" role="tab" data-toggle="tab">Audits</a></li>
<li role="schema" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li>
<li role="profile" class="tab profileTab" style="display:none"><a href="#tab-profile" aria-controls="tab-profile" role="tab" data-toggle="tab">Profile</a></li>
@@ -108,13 +97,6 @@
</div>
</div>
</div>
- <div id="tab-termTable" role="terms" class="tab-pane">
- <div id="r_termTableLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
- </div>
- </div>
<div id="tab-audit" role="audits" class="tab-pane">
<div id="r_auditTableLayoutView">
<div class="fontLoader-relative">
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html b/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
index 104c8de..31300b8 100644
--- a/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html
@@ -22,7 +22,6 @@
<input type="checkbox" class="input" name="queryType" value="text" name="check" value="1" />Show historical entities</label>
</div>
<div class="clearfix inline">
- <a href="javascript:void(0)" class="inputAssignTag multiSelectTerm btn btn-action btn-sm" style="display:none" data-id="addTerm"><i class="fa fa-plus"></i> Assign Term</a>
<a href="javascript:void(0)" class="inputAssignTag multiSelectTag assignTag btn btn-action btn-sm" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i> Assign Tag</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index 80960d4..87a89b3 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -36,8 +36,6 @@
<b>Show historical entities</b></label>
</div>
<div class="inline">
- {{#if taxonomy}}
- <a href="javascript:void(0)" class=" multiSelectTerm btn btn-action btn-sm inline" style="display:none" data-id="addTerm"><i class="fa fa-plus"></i> Assign Term</a> {{/if}}
<a href="javascript:void(0)" class=" multiSelectTag assignTag btn btn-action btn-sm" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i> Assign Tag</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/site/Header.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/site/Header.html b/dashboardv2/public/js/templates/site/Header.html
new file mode 100644
index 0000000..4673688
--- /dev/null
+++ b/dashboardv2/public/js/templates/site/Header.html
@@ -0,0 +1,29 @@
+<!--
+ * 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.
+-->
+<header class="clearfix">
+ <div class="btn-group pull-right header-menu ">
+ <a target="_blank" href="http://atlas.apache.org/"><i class="fa fa-question-circle"></i></a>
+ <a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="user-dropdown"><i class="fa fa-user user-circle "></i><span class="userName"></span></a>
+ <ul class="dropdown-menu">
+ <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
+ <li role="separator" class="divider"></li>
+ <li>
+ <a href="logout.html"><i class="fa fa-sign-out"></i>Logout</a>
+ </li>
+ </ul>
+ </div>
+</header>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html b/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html
new file mode 100644
index 0000000..b706609
--- /dev/null
+++ b/dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html
@@ -0,0 +1,33 @@
+<!--
+ * 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.
+-->
+<ul class="sidebar-nav">
+ <li class="sidebar-brand">
+ <a href="{{apiBaseUrl}}/index.html"><i class="fa fa-globe"></i> Apache Atlas</a>
+ </li>
+ <ul class="tabs" style="width: 100%;" role="tablist">
+ <li role="presentation" class="{{tabClass}}"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li>
+ <li role="presentation" class="{{tabClass}}"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab"><i class="fa fa-tags"></i> Tags</a></li>
+ </ul>
+</ul>
+<div class="tab-content">
+ <div role="tabpanel" class="tab-pane" id="tab-tag">
+ <div id="r_tagLayoutView"></div>
+ </div>
+ <div role="tabpanel" class="tab-pane" id="tab-search">
+ <div id="r_searchLayoutView"></div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/site/header.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/site/header.html b/dashboardv2/public/js/templates/site/header.html
deleted file mode 100644
index 4673688..0000000
--- a/dashboardv2/public/js/templates/site/header.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- * 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.
--->
-<header class="clearfix">
- <div class="btn-group pull-right header-menu ">
- <a target="_blank" href="http://atlas.apache.org/"><i class="fa fa-question-circle"></i></a>
- <a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="user-dropdown"><i class="fa fa-user user-circle "></i><span class="userName"></span></a>
- <ul class="dropdown-menu">
- <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
- <li role="separator" class="divider"></li>
- <li>
- <a href="logout.html"><i class="fa fa-sign-out"></i>Logout</a>
- </li>
- </ul>
- </div>
-</header>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/tag/AddTagModalView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/AddTagModalView_tmpl.html b/dashboardv2/public/js/templates/tag/AddTagModalView_tmpl.html
new file mode 100644
index 0000000..a477532
--- /dev/null
+++ b/dashboardv2/public/js/templates/tag/AddTagModalView_tmpl.html
@@ -0,0 +1,37 @@
+<!--
+ * 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.
+-->
+<div>
+ <div class="form-group hide">
+ {{#if tagModel}}
+ <h4>{{tagModel.typeName}}</h4> {{else}}
+ <select class="form-control row-margin-bottom" data-id="addTagOptions" required>
+ </select>
+ {{/if}}
+ </div>
+ <div class="row modalHeight">
+ <div class="col-sm-12">
+ <div class="attrLoader" style="margin-left:45%;display:none">
+ <i class="fa fa-refresh fa-spin-custom"></i>
+ </div>
+ </div>
+ <div class="col-sm-12" style="display:none">
+ <p>Tag Attributes(optional)</p>
+ <p class="text-gray">Add attribute values for this tag</p>
+ <div data-id="tagAttribute"></div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
new file mode 100644
index 0000000..d9c5907
--- /dev/null
+++ b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
@@ -0,0 +1,54 @@
+<!--
+ * 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.
+-->
+<div class="fontLoader">
+ <i class="fa fa-refresh fa-spin-custom"></i>
+</div>
+<form name="tagDefinitionform" class="hide form-horizontal" data-id="createTagForm">
+ <div class="form-group">
+ <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
+ {{#if create}}
+ <div class="col-sm-10">
+ <input class="form-control" data-id="tagName" placeholder="Name(required)" autofocus/>
+ </div>
+ {{else}}
+ <span class="ellipsis control-label text-left col-sm-10" data-id="title"></span> {{/if}}
+ </div>
+ <div class="form-group">
+ <label class="control-label col-sm-2" for="description">Description</label>
+ <div class="col-sm-10">
+ <input class="form-control" data-id="description" value="{{description}}" placeholder="Description" />
+ </div>
+ </div>
+ {{#if create}}
+ <div class="form-group">
+ <div class="col-md-12">
+ <label>Select tags to inherit attributes(optional)</label>
+ <p class="text-gray">Attributes define additional properties for the tag</p>
+ <select class="form-control" data-id="parentTagList" multiple="multiple"></select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-12">Attributes(optional)</label>
+ <div class="col-sm-12">
+ <button title="Add New Attribute" type="button" class="btn btn-action btn-sm" data-id="attributeData"><i class="fa fa-plus"></i> Add New Attributes</button>
+ </div>
+ </div>
+ {{/if}}
+ <div data-id="addAttributeDiv">
+ </div>
+ </div>
+</form>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html b/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
index 291f230..76f225a 100644
--- a/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
@@ -16,5 +16,5 @@
-->
<div>
<div class="tableOverlay"></div>
- <div id="r_tagTermTableLayoutView"></div>
+ <div id="r_tagTableLayoutView"></div>
</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/tag/addTagModalView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/addTagModalView_tmpl.html b/dashboardv2/public/js/templates/tag/addTagModalView_tmpl.html
deleted file mode 100644
index a477532..0000000
--- a/dashboardv2/public/js/templates/tag/addTagModalView_tmpl.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- * 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.
--->
-<div>
- <div class="form-group hide">
- {{#if tagModel}}
- <h4>{{tagModel.typeName}}</h4> {{else}}
- <select class="form-control row-margin-bottom" data-id="addTagOptions" required>
- </select>
- {{/if}}
- </div>
- <div class="row modalHeight">
- <div class="col-sm-12">
- <div class="attrLoader" style="margin-left:45%;display:none">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
- </div>
- <div class="col-sm-12" style="display:none">
- <p>Tag Attributes(optional)</p>
- <p class="text-gray">Add attribute values for this tag</p>
- <div data-id="tagAttribute"></div>
- </div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/templates/tag/createTagLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/tag/createTagLayoutView_tmpl.html b/dashboardv2/public/js/templates/tag/createTagLayoutView_tmpl.html
deleted file mode 100644
index d9c5907..0000000
--- a/dashboardv2/public/js/templates/tag/createTagLayoutView_tmpl.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
- * 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.
--->
-<div class="fontLoader">
- <i class="fa fa-refresh fa-spin-custom"></i>
-</div>
-<form name="tagDefinitionform" class="hide form-horizontal" data-id="createTagForm">
- <div class="form-group">
- <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
- {{#if create}}
- <div class="col-sm-10">
- <input class="form-control" data-id="tagName" placeholder="Name(required)" autofocus/>
- </div>
- {{else}}
- <span class="ellipsis control-label text-left col-sm-10" data-id="title"></span> {{/if}}
- </div>
- <div class="form-group">
- <label class="control-label col-sm-2" for="description">Description</label>
- <div class="col-sm-10">
- <input class="form-control" data-id="description" value="{{description}}" placeholder="Description" />
- </div>
- </div>
- {{#if create}}
- <div class="form-group">
- <div class="col-md-12">
- <label>Select tags to inherit attributes(optional)</label>
- <p class="text-gray">Attributes define additional properties for the tag</p>
- <select class="form-control" data-id="parentTagList" multiple="multiple"></select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-12">Attributes(optional)</label>
- <div class="col-sm-12">
- <button title="Add New Attribute" type="button" class="btn btn-action btn-sm" data-id="attributeData"><i class="fa fa-plus"></i> Add New Attributes</button>
- </div>
- </div>
- {{/if}}
- <div data-id="addAttributeDiv">
- </div>
- </div>
-</form>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/utils/CommonViewFunction.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js
index a3b6b91..d3153f5 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -42,14 +42,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
tagModel.deleteAssociation(options.guid, options.tagName, {
skipDefaultError: true,
success: function(data) {
- var msg = "Tag " + name.name + Messages.removeSuccessMessage;
- if (options.tagOrTerm === "term") {
- msg = "Term " + options.tagName + Messages.removeSuccessMessage;
- } else if (options.tagOrTerm === "tag") {
- msg = "Tag " + options.tagName + Messages.removeSuccessMessage;
- }
Utils.notifySuccess({
- content: msg
+ content: "Tag " + options.tagName + Messages.removeSuccessMessage
});
if (options.callback) {
options.callback();
@@ -233,122 +227,6 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
});
return table;
}
- CommonViewFunction.breadcrumbUrlMaker = function(url) {
- if (url) {
- var urlList = [];
- var splitURL = url.split("api/atlas/v1/taxonomies/");
- if (splitURL.length > 1) {
- var splitUrlWithoutTerm = splitURL[1].split("/terms/");
- if (splitUrlWithoutTerm.length == 1) {
- splitUrlWithoutTerm = splitUrlWithoutTerm[0].split("/");
- }
- } else {
- var splitUrlWithoutTerm = splitURL[0].split("/terms/");
- if (splitUrlWithoutTerm.length == 1) {
- splitUrlWithoutTerm = splitUrlWithoutTerm[0].split("/");
- }
- }
-
- var href = "";
- for (var i in splitUrlWithoutTerm) {
- if (i == 0) {
- href = splitUrlWithoutTerm[i];
- urlList.push({
- value: _.escape(splitUrlWithoutTerm[i]),
- href: href
- });
- } else {
- href += "/terms/" + splitUrlWithoutTerm[i];
- urlList.push({
- value: _.escape(splitUrlWithoutTerm[i]),
- href: href
- });
- };
- }
- return urlList;
- }
- }
- CommonViewFunction.breadcrumbMaker = function(options) {
- var li = "";
- if (options.urlList) {
- _.each(options.urlList, function(object) {
- li += '<li><a class="link" href="#!/taxonomy/detailCatalog/api/atlas/v1/taxonomies/' + object.href + '?load=true">' + _.escape(object.value) + '</a></li>';
- });
- }
- if (options.scope) {
- options.scope.html(li);
- options.scope.asBreadcrumbs("destroy");
- options.scope.asBreadcrumbs({
- namespace: 'breadcrumb',
- overflow: "left",
- responsive: false,
- toggleIconClass: 'fa fa-ellipsis-h',
- dropdown: function(classes) {
- var dropdownClass = 'dropdown';
- var dropdownMenuClass = 'dropdown-menu popover popoverTerm bottom arrowPosition';
- if (this.options.overflow === 'right') {
- dropdownMenuClass += ' dropdown-menu-right';
- }
-
- return '<li class="' + dropdownClass + ' ' + classes.dropdownClass + '">' +
- '<a href="javascript:void(0);" class="' + classes.toggleClass + '" data-toggle="dropdown">' +
- '<i class="' + classes.toggleIconClass + '"></i>' +
- '</a>' +
- '<ul class="' + dropdownMenuClass + ' ' + classes.dropdownMenuClass + '">' +
- '<div class="arrow"></div>' +
- '</ul>' +
- '</li>';
- }
- });
- }
- }
- CommonViewFunction.termTableBreadcrumbMaker = function(obj) {
- if (!obj) {
- return "";
- }
- var traits = obj.classificationNames || _.pluck(obj.classifications, 'typeName'),
- url = "",
- deleteHtml = "",
- html = "",
- id = obj.guid,
- terms = [],
- entityName = Utils.getName(obj);
- if (traits) {
- traits.map(function(term) {
- var checkTagOrTerm = Utils.checkTagOrTerm(term);
- if (checkTagOrTerm.term) {
- terms.push({
- deleteHtml: '<a href="javascript:void(0)" class="pull-left" title="Remove Term"><i class="fa fa-trash" data-id="tagClick" data-type="term" data-assetname="' + entityName + '" data-name="' + term + '" data-guid="' + obj.guid + '" ></i></a>',
- url: _.unescape(term).split(".").join("/"),
- name: term
- });
- }
- });
- }
- _.each(terms, function(obj, i) {
- var className = "";
- if (i >= 1) {
- className += "showHideDiv hide";
- }
- obj['valueUrl'] = CommonViewFunction.breadcrumbUrlMaker(obj.url);
- html += '<div class="' + className + '" dataterm-name="' + obj.name + '"><div class="liContent"></div>' + obj.deleteHtml + '</div>';
- })
- if (terms.length > 1) {
- html += '<div><a href="javascript:void(0)" data-id="showMoreLessTerm" class="btn btn-action btn-sm btn-icon-pd"><span>Show More </span><i class="fa fa-angle-right"></i></a></div>'
- }
- if (!Enums.entityStateReadOnly[obj.status]) {
- if (obj.guid) {
- html += '<div><a href="javascript:void(0)" class="btn btn-action btn-sm" data-id="addTerm" data-guid="' + (obj.guid) + '"><i class="fa fa-plus"></i></a></div>'
- } else {
- html += '<div><a href="javascript:void(0)" class="btn btn-action btn-sm" data-id="addTerm"><i class="fa fa-plus"></i></a></div>'
- }
- }
- return {
- html: '<div class="termTableBreadcrumb btn-inline" dataterm-id="' + id + '">' + html + '</div>',
- object: { scopeId: id, value: terms }
- }
-
- }
CommonViewFunction.tagForTable = function(obj) {
var traits = obj.classificationNames || _.pluck(obj.classifications, 'typeName'),
atags = "",
@@ -358,17 +236,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
entityName = Utils.getName(obj);
if (traits) {
traits.map(function(tag) {
- var checkTagOrTerm = Utils.checkTagOrTerm(tag);
- if (checkTagOrTerm.tag) {
- var className = "btn btn-action btn-sm btn-blue btn-icon",
- tagString = '<a class="' + className + '" data-id="tagClick"><span title="' + tag + '">' + tag + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + entityName + '"data-name="' + tag + '" data-type="tag" data-guid="' + obj.guid + '" ></i></a>';
- if (count >= 1) {
- popTag += tagString;
- } else {
- atags += tagString;
- }
- ++count;
+ var className = "btn btn-action btn-sm btn-blue btn-icon",
+ tagString = '<a class="' + className + '" data-id="tagClick"><span title="' + tag + '">' + tag + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + entityName + '"data-name="' + tag + '" data-type="tag" data-guid="' + obj.guid + '" ></i></a>';
+ if (count >= 1) {
+ popTag += tagString;
+ } else {
+ atags += tagString;
}
+ ++count;
});
}
if (!Enums.entityStateReadOnly[obj.status]) {
@@ -418,32 +293,6 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
- CommonViewFunction.saveTermToAsset = function(options, that) {
- require(['models/VCatalog'], function(Vcatalog) {
- var VCatalog = new Vcatalog();
- var name = options.termName;
- ++that.asyncFetchCounter;
- VCatalog.url = function() {
- return "api/atlas/v1/entities/" + options.guid + "/tags/" + name;
- };
- VCatalog.save(null, {
- success: function(data) {
- Utils.notifySuccess({
- content: "Term " + name + Messages.addTermToEntitySuccessMessage
- });
- if (options.collection) {
- options.collection.fetch({ reset: true });
- }
- },
- complete: function() {
- --that.asyncFetchCounter
- if (that.callback && that.asyncFetchCounter === 0) {
- that.callback(); // It will call to parent of parent Callback i.e callback of searchLayoutView
- }
- }
- });
- })
- }
CommonViewFunction.generateObjectForSaveSearchApi = function(options) {
var obj = {
name: options.name,
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/utils/Globals.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/Globals.js b/dashboardv2/public/js/utils/Globals.js
index 1b055ed..6225715 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -27,7 +27,6 @@ define(['require'], function(require) {
tabState: {
stateChanged: false,
tagUrl: "#!/tag",
- taxonomyUrl: "#!/taxonomy",
searchUrl: "#!/search"
},
detailPageState: {}
http://git-wip-us.apache.org/repos/asf/atlas/blob/37be53bb/dashboardv2/public/js/utils/Messages.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/Messages.js b/dashboardv2/public/js/utils/Messages.js
index 73d58a2..44604cf 100644
--- a/dashboardv2/public/js/utils/Messages.js
+++ b/dashboardv2/public/js/utils/Messages.js
@@ -23,10 +23,7 @@ define(['require'], function(require) {
defaultErrorMessage: "Something went wrong",
addSuccessMessage: " has been created successfully",
addErrorMessage: " could not be Created",
- addTermToEntitySuccessMessage: " has been added to entity",
- deleteTerm: "Delete Term",
removeTag: "Remove Tag Assignment",
- removeTerm: "Remove Term Assignment",
deleteSuccessMessage: " has been deleted successfully",
deleteErrorMessage: " could not be deleted",
removeSuccessMessage: " has been removed successfully",
@@ -48,8 +45,7 @@ define(['require'], function(require) {
},
tag: {
addAttributeSuccessMessage: "Tag attribute is added successfully",
- updateTagDescriptionMessage: "Tag description is updated successfully",
- updateTermDescriptionMessage: "Term description is updated successfully"
+ updateTagDescriptionMessage: "Tag description is updated successfully"
}
};
return Messages;