You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2017/10/09 17:16:16 UTC
[2/2] atlas git commit: ATLAS-2171: Atlas UI fix when accessed via
Knox proxy without / at the end
ATLAS-2171: Atlas UI fix when accessed via Knox proxy without / at the end
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/2ed39cce
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/2ed39cce
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/2ed39cce
Branch: refs/heads/master
Commit: 2ed39cce31358876b1da8ceb9915c9c471c6f401
Parents: e406603
Author: kevalbhatt <kb...@apache.org>
Authored: Mon Oct 9 19:15:06 2017 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Oct 9 09:56:42 2017 -0700
----------------------------------------------------------------------
dashboardv2/public/css/scss/loader.scss | 16 +++++++++++-----
dashboardv2/public/index.html.tpl | 2 +-
.../business_catalog/SideNavLayoutView_tmpl.html | 2 +-
dashboardv2/public/js/utils/UrlLinks.js | 11 +++++++----
dashboardv2/public/js/utils/Utils.js | 3 +++
.../js/views/business_catalog/SideNavLayoutView.js | 6 ++++--
.../public/js/views/graph/LineageLayoutView.js | 14 +++++++-------
7 files changed, 34 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/2ed39cce/dashboardv2/public/css/scss/loader.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/loader.scss b/dashboardv2/public/css/scss/loader.scss
index d323212..0b83a3b 100644
--- a/dashboardv2/public/css/scss/loader.scss
+++ b/dashboardv2/public/css/scss/loader.scss
@@ -71,11 +71,17 @@
}
.initialLoading {
- display: block;
- position: absolute;
- margin-top: 30%;
- right: 50%;
- height: 60px;
+ position: fixed;
+ top: 0;
+ right: 0;
+ left: 0;
+ bottom: 0;
+ background: url("../img/ring.gif") no-repeat;
+ background-position: 50% 50%;
+ background-size: 60px;
+ @media (min-width: 768px) {
+ left: 350px;
+ }
}
.tableOverlay {
http://git-wip-us.apache.org/repos/asf/atlas/blob/2ed39cce/dashboardv2/public/index.html.tpl
----------------------------------------------------------------------
diff --git a/dashboardv2/public/index.html.tpl b/dashboardv2/public/index.html.tpl
index f13f34a..6b20014 100644
--- a/dashboardv2/public/index.html.tpl
+++ b/dashboardv2/public/index.html.tpl
@@ -66,7 +66,7 @@
<header id="new-header" class="clearfix"></header>
<div id="new-page-wrapper">
<div>
- <img class="initialLoading" src="img/ring.gif">
+ <div class="initialLoading"></div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/atlas/blob/2ed39cce/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
index 3f4c11a..44b722f 100644
--- a/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
@@ -16,7 +16,7 @@
-->
<ul class="sidebar-nav">
<li class="sidebar-brand">
- <a href="index.html"><i class="fa fa-globe"></i> Apache Atlas</a>
+ <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>
http://git-wip-us.apache.org/repos/asf/atlas/blob/2ed39cce/dashboardv2/public/js/utils/UrlLinks.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/UrlLinks.js b/dashboardv2/public/js/utils/UrlLinks.js
index 913df24..be00ac0 100644
--- a/dashboardv2/public/js/utils/UrlLinks.js
+++ b/dashboardv2/public/js/utils/UrlLinks.js
@@ -16,12 +16,15 @@
* limitations under the License.
*/
-define(['require', 'utils/Enums'], function(require, Enums) {
+define(['require', 'utils/Enums', 'utils/Utils'], function(require, Enums, Utils) {
'use strict';
var UrlLinks = {
- baseUrl: 'api/atlas',
- baseUrlV2: 'api/atlas/v2',
+ apiBaseUrl: Utils.getBaseUrl(window.location.pathname)
+ };
+ _.extend(UrlLinks, {
+ baseUrl: UrlLinks.apiBaseUrl + '/api/atlas',
+ baseUrlV2: UrlLinks.apiBaseUrl + '/api/atlas/v2',
typedefsUrl: function() {
return {
defs: this.baseUrlV2 + '/types/typedefs',
@@ -122,7 +125,7 @@ define(['require', 'utils/Enums'], function(require, Enums) {
return this.baseUrl + '/admin/session';
}
- };
+ });
return UrlLinks;
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/atlas/blob/2ed39cce/dashboardv2/public/js/utils/Utils.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/Utils.js b/dashboardv2/public/js/utils/Utils.js
index 1de2106..5b675f7 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -69,6 +69,9 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
});
return uuid;
};
+ Utils.getBaseUrl = function(url) {
+ return url.replace(/\/[\w-]+.(jsp|html)|\/+$/ig, '');
+ };
pnotify.prototype.options.styling = "bootstrap3";
var notify = function(options) {
return new pnotify(_.extend({
http://git-wip-us.apache.org/repos/asf/atlas/blob/2ed39cce/dashboardv2/public/js/views/business_catalog/SideNavLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/business_catalog/SideNavLayoutView.js b/dashboardv2/public/js/views/business_catalog/SideNavLayoutView.js
index 1a2590c..3dbaab4 100644
--- a/dashboardv2/public/js/views/business_catalog/SideNavLayoutView.js
+++ b/dashboardv2/public/js/views/business_catalog/SideNavLayoutView.js
@@ -20,7 +20,8 @@ define(['require',
'hbs!tmpl/business_catalog/SideNavLayoutView_tmpl',
'utils/Utils',
'utils/Globals',
-], function(require, tmpl, Utils, Globals) {
+ 'utils/UrlLinks'
+], function(require, tmpl, Utils, Globals, UrlLinks) {
'use strict';
var SideNavLayoutView = Marionette.LayoutView.extend({
@@ -37,7 +38,8 @@ define(['require',
templateHelpers: function() {
return {
taxonomy: Globals.taxonomy,
- tabClass: this.tabClass
+ tabClass: this.tabClass,
+ apiBaseUrl: UrlLinks.apiBaseUrl
};
},
events: function() {
http://git-wip-us.apache.org/repos/asf/atlas/blob/2ed39cce/dashboardv2/public/js/views/graph/LineageLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/graph/LineageLayoutView.js b/dashboardv2/public/js/views/graph/LineageLayoutView.js
index 46f7117..fcf0c39 100644
--- a/dashboardv2/public/js/views/graph/LineageLayoutView.js
+++ b/dashboardv2/public/js/views/graph/LineageLayoutView.js
@@ -254,19 +254,19 @@ define(['require',
if (node) {
if (node.isProcess) {
if (Enums.entityStateReadOnly[node.status]) {
- return 'img/icon-gear-delete.png';
+ return UrlLinks.apiBaseUrl + '/img/icon-gear-delete.png';
} else if (node.id == that.guid) {
- return 'img/icon-gear-active.png';
+ return UrlLinks.apiBaseUrl + '/img/icon-gear-active.png';
} else {
- return 'img/icon-gear.png';
+ return UrlLinks.apiBaseUrl + '/img/icon-gear.png';
}
} else {
if (Enums.entityStateReadOnly[node.status]) {
- return 'img/icon-table-delete.png';
+ return UrlLinks.apiBaseUrl + '/img/icon-table-delete.png';
} else if (node.id == that.guid) {
- return 'img/icon-table-active.png';
+ return UrlLinks.apiBaseUrl + '/img/icon-table-active.png';
} else {
- return 'img/icon-table.png';
+ return UrlLinks.apiBaseUrl + '/img/icon-table.png';
}
}
}
@@ -423,4 +423,4 @@ define(['require',
}
});
return LineageLayoutView;
-});
+});
\ No newline at end of file