You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sa...@apache.org on 2019/10/09 17:38:49 UTC
[atlas] branch branch-2.0 updated: ATLAS-3453: UI: show shell icon
in entity detail page if status is incomplete
This is an automated email from the ASF dual-hosted git repository.
sarath pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new f0c117f ATLAS-3453: UI: show shell icon in entity detail page if status is incomplete
f0c117f is described below
commit f0c117f460465be60da51fa28a19ab74bd2b1610
Author: kevalbhatt <kb...@apache.org>
AuthorDate: Wed Oct 9 22:39:28 2019 +0530
ATLAS-3453: UI: show shell icon in entity detail page if status is incomplete
Signed-off-by: Sarath Subramanian <sa...@apache.org>
(cherry picked from commit 4952a560ccb84278cc3b6b03cfd52deebfcdc304)
---
dashboardv2/public/css/scss/theme.scss | 25 ++++++++++++++++++++++
.../detail_page/DetailPageLayoutView_tmpl.html | 4 ++--
.../js/views/detail_page/DetailPageLayoutView.js | 5 ++++-
dashboardv3/public/css/scss/theme.scss | 25 ++++++++++++++++++++++
.../detail_page/DetailPageLayoutView_tmpl.html | 4 ++--
.../js/views/detail_page/DetailPageLayoutView.js | 5 ++++-
6 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/css/scss/theme.scss b/dashboardv2/public/css/scss/theme.scss
index d0cf053..c93d7d0 100644
--- a/dashboardv2/public/css/scss/theme.scss
+++ b/dashboardv2/public/css/scss/theme.scss
@@ -510,4 +510,29 @@ hr[size="10"] {
color: inherit !important;
}
}
+}
+
+.entityDetail {
+ .isIncomplete {
+ &.show {
+ img {
+ opacity: .2;
+ animation: blink 2.5s infinite;
+ }
+
+ i.fa.fa-refresh {
+ display: block;
+ }
+ }
+
+ i.fa.fa-refresh {
+ display: none;
+ text-align: center;
+ font-size: 20px;
+ top: 0;
+ position: absolute;
+ z-index: 999;
+ left: calc(50% - 8px);
+ }
+ }
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html b/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
index d35debc..c6f88c6 100644
--- a/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
@@ -19,8 +19,8 @@
<i class="fa fa-refresh fa-spin-custom"></i>
</div>
<div class="entityDetail form-horizontal col-sm-12">
- <h1 class="title row">
- <div data-id="entityIcon" class="entity-icon-box"></div>
+ <h1 class="title row isIncomplete">
+ <div data-id="entityIcon" class="entity-icon-box position-relative"></div>
<span data-id="title"></span>
</h1> {{#if entityUpdate}}
<div data-id="editButtonContainer" class="pull-right"></div>
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 4f48693..ffd36ac 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -193,7 +193,10 @@ define(['require',
} else {
this.ui.entityIcon.removeClass('disabled');
}
- this.ui.entityIcon.attr('title', _.escape(collectionJSON.typeName)).html('<img src="' + Utils.getEntityIconPath({ entityData: entityData }) + '"/>').find("img").on('error', function() {
+ if (collectionJSON.isIncomplete === true) {
+ this.$(".isIncomplete").addClass("show");
+ }
+ this.ui.entityIcon.attr('title', _.escape(collectionJSON.typeName)).html('<img src="' + Utils.getEntityIconPath({ entityData: entityData }) + '"/><i class="fa fa-refresh fa-spin-custom"></i>').find("img").on('error', function() {
this.src = Utils.getEntityIconPath({ entityData: entityData, errorUrl: this.src });
});
} else {
diff --git a/dashboardv3/public/css/scss/theme.scss b/dashboardv3/public/css/scss/theme.scss
index a555278..c4f84d0 100644
--- a/dashboardv3/public/css/scss/theme.scss
+++ b/dashboardv3/public/css/scss/theme.scss
@@ -690,4 +690,29 @@ hr[size="10"] {
.tooltip.bottom .tooltip-arrow {
border-bottom-color: #000;
+}
+
+.entityDetail {
+ .isIncomplete {
+ &.show {
+ img {
+ opacity: .2;
+ animation: blink 2.5s infinite;
+ }
+
+ i.fa.fa-refresh {
+ display: block;
+ }
+ }
+
+ i.fa.fa-refresh {
+ display: none;
+ text-align: center;
+ font-size: 20px;
+ top: 0;
+ position: absolute;
+ z-index: 1;
+ left: calc(50% - 8px);
+ }
+ }
}
\ No newline at end of file
diff --git a/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html b/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
index 9c7cb81..f2e6ca7 100644
--- a/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
@@ -22,8 +22,8 @@
<i class="fa fa-refresh fa-spin-custom"></i>
</div>
<div class="entityDetail form-horizontal col-sm-12">
- <h1 class="title">
- <div data-id="entityIcon" class="entity-icon-box"></div>
+ <h1 class="title isIncomplete">
+ <div data-id="entityIcon" class="entity-icon-box position-relative"></div>
<span data-id="title"></span>
</h1> {{#if entityUpdate}}
<div data-id="editButtonContainer" class="pull-right"></div>
diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
index e1ab970..31671ac 100644
--- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
@@ -198,7 +198,10 @@ define(['require',
} else {
this.ui.entityIcon.removeClass('disabled');
}
- this.ui.entityIcon.attr('title', _.escape(collectionJSON.typeName)).html('<img src="' + Utils.getEntityIconPath({ entityData: entityData }) + '"/>').find("img").on('error', function() {
+ if (collectionJSON.isIncomplete === true) {
+ this.$(".isIncomplete").addClass("show");
+ }
+ this.ui.entityIcon.attr('title', _.escape(collectionJSON.typeName)).html('<img src="' + Utils.getEntityIconPath({ entityData: entityData }) + '"/><i class="fa fa-refresh fa-spin-custom"></i>').find("img").on('error', function() {
this.src = Utils.getEntityIconPath({ entityData: entityData, errorUrl: this.src });
});
} else {