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/09/22 13:19:29 UTC
[1/3] atlas git commit: ATLAS-2039 : Unable to edit date value from
UI when entity definition is POSTed without value for date attribute.
Repository: atlas
Updated Branches:
refs/heads/branch-0.8 2d0bc3c62 -> 4149b55b1
ATLAS-2039 : Unable to edit date value from UI when entity definition is POSTed without value for date attribute.
Signed-off-by: kevalbhatt <kb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/23ae0d0c
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/23ae0d0c
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/23ae0d0c
Branch: refs/heads/branch-0.8
Commit: 23ae0d0cf391129ab26bd1289cb85727e9db7d73
Parents: 2d0bc3c
Author: pratik pandey <pr...@freestoneinfotech.com>
Authored: Fri Sep 22 17:35:48 2017 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Fri Sep 22 18:48:32 2017 +0530
----------------------------------------------------------------------
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/23ae0d0c/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index f89ea37..36fe827 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -462,8 +462,12 @@ define(['require',
if (dataValue) {
entityValue = dataValue;
}
- if (value.typeName === "date" && dataValue) {
- entityValue = moment(dataValue).format("MM/DD/YYYY");
+ if (value.typeName === "date") {
+ if (dataValue) {
+ entityValue = moment(dataValue).format("MM/DD/YYYY");
+ } else {
+ entityValue = moment().format("MM/DD/YYYY");
+ }
}
}
}
[3/3] atlas git commit: ATLAS-2162 : Add hyperlink for URI formatted
attribute value on property table
Posted by kb...@apache.org.
ATLAS-2162 : Add hyperlink for URI formatted attribute value on property table
Signed-off-by: kevalbhatt <kb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/4149b55b
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/4149b55b
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/4149b55b
Branch: refs/heads/branch-0.8
Commit: 4149b55b18083ac1e41214aea3614df7a6fdf0d8
Parents: 6d9a0e6
Author: pratik pandey <pr...@freestoneinfotech.com>
Authored: Fri Sep 22 12:53:13 2017 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Fri Sep 22 18:49:02 2017 +0530
----------------------------------------------------------------------
dashboardv2/public/css/scss/theme.scss | 7 ++++++-
dashboardv2/public/js/utils/CommonViewFunction.js | 12 ++++++++++--
dashboardv2/public/js/utils/Utils.js | 5 +++++
3 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/4149b55b/dashboardv2/public/css/scss/theme.scss
----------------------------------------------------------------------
diff --git a/dashboardv2/public/css/scss/theme.scss b/dashboardv2/public/css/scss/theme.scss
index dc56148..a691d17 100644
--- a/dashboardv2/public/css/scss/theme.scss
+++ b/dashboardv2/public/css/scss/theme.scss
@@ -130,7 +130,7 @@ a {
}
}
-a[href^="#!/"]:not(.btn, .not-blue-link) {
+.blue-link {
color: $color_havelock_blue_approx;
&:focus {
color: $color_havelock_blue_approx;
@@ -143,6 +143,11 @@ a[href^="#!/"]:not(.btn, .not-blue-link) {
}
}
+a[href^="#!/"]:not(.btn, .not-blue-link) {
+ @extend .blue-link;
+}
+
+
th {
text-transform: capitalize;
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/4149b55b/dashboardv2/public/js/utils/CommonViewFunction.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js
index 0fa8506..de5856c 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -216,10 +216,18 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
keyValue = extractObject(keyValue)
}
}
+ var val = "";
+ if (_.isObject(valueObject[key])) {
+ val = keyValue
+ } else if (Utils.isUrl(keyValue)) {
+ val = '<a target="_blank" class="blue-link" href="' + keyValue + '">' + keyValue + '</a>';
+ } else {
+ val = _.escape(keyValue);
+ }
if (isTable) {
- table += '<tr><td>' + _.escape(key) + '</td><td><div ' + (_.isObject(valueObject[key]) ? 'class="scroll-y"' : '') + '>' + (_.isObject(valueObject[key]) ? keyValue : _.escape(keyValue)) + '</div></td></tr>';
+ table += '<tr><td>' + _.escape(key) + '</td><td><div ' + (_.isObject(valueObject[key]) ? 'class="scroll-y"' : '') + '>' + val + '</div></td></tr>';
} else {
- table += '<div>' + (_.isObject(valueObject[key]) ? keyValue : _.escape(keyValue)) + '</div>';
+ table += '<div>' + val + '</div>';
}
});
http://git-wip-us.apache.org/repos/asf/atlas/blob/4149b55b/dashboardv2/public/js/utils/Utils.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/utils/Utils.js b/dashboardv2/public/js/utils/Utils.js
index 0e2b489..1de2106 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -41,6 +41,7 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
return options.el.popover(_.extend({
placement: 'auto bottom',
html: true,
+ animation: false,
template: '<div class="popover fixed-popover fade bottom"><div class="arrow"></div><h3 class="popover-title"></h3><div class="' + (options.contentClass ? options.contentClass : '') + ' popover-content"></div></div>'
}, options.popoverOptions));
}
@@ -642,6 +643,10 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
}
}
}
+ Utils.isUrl = function(url) {
+ var regexp = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
+ return regexp.test(url);
+ }
$.fn.toggleAttribute = function(attributeName, firstString, secondString) {
if (this.attr(attributeName) == firstString) {
this.attr(attributeName, secondString);
[2/3] atlas git commit: ATLAS-1905 : Search UI is confusing to user
Posted by kb...@apache.org.
ATLAS-1905 : Search UI is confusing to user
Signed-off-by: kevalbhatt <kb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6d9a0e64
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6d9a0e64
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6d9a0e64
Branch: refs/heads/branch-0.8
Commit: 6d9a0e648ef5b76d9d5bed7ca27e19989343d558
Parents: 23ae0d0
Author: pratik pandey <pr...@freestoneinfotech.com>
Authored: Fri Sep 22 13:05:50 2017 +0530
Committer: kevalbhatt <kb...@apache.org>
Committed: Fri Sep 22 18:48:53 2017 +0530
----------------------------------------------------------------------
.../public/js/templates/search/SearchLayoutView_tmpl.html | 4 ++--
dashboardv2/public/js/views/search/SearchLayoutView.js | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/6d9a0e64/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html b/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
index 9aa6e8d..db38533 100644
--- a/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
@@ -56,8 +56,8 @@
</div>
</div>
<div class="srchType">
- <span class="srchTitle">Search By Query</span>
- <input type="text" class="form-control" data-id="searchInput" placeholder="Search using a query string: e.g. sales_fact" style="margin: 5px 0px;">
+ <span class="srchTitle searchText">Search By Text</span>
+ <input type="text" class="form-control" data-id="searchInput" placeholder="Search by text" style="margin: 5px 0px;">
</div>
</div>
<button class="btn btn-action" data-id="clearSearch">Clear</button>
http://git-wip-us.apache.org/repos/asf/atlas/blob/6d9a0e64/dashboardv2/public/js/views/search/SearchLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js
index 6b839cd..4fbeaaf 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -541,6 +541,8 @@ define(['require',
this.$('.temFilter').removeClass('col-sm-10');
this.$('.basicSaveSearch').hide();
this.$('.advanceSaveSearch').show();
+ this.$('.searchText').text('Search By Query');
+ this.ui.searchInput.attr("placeholder", 'Search By Query eg. where name="sales_fact"');
} else {
this.$('.temFilter').addClass('col-sm-10');
this.$('.temFilter').removeClass('col-sm-12');
@@ -550,6 +552,8 @@ define(['require',
this.$('.advanceSaveSearch').hide();
this.dsl = false;
this.type = "basic";
+ this.$('.searchText').text('Search By Text');
+ this.ui.searchInput.attr("placeholder", "Search By Text");
}
if (paramObj && this.type == "basic") {
this.query[this.type].attributes = paramObj.attributes ? paramObj.attributes : null;