This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new 79caa79 ATLAS-3851: UI: removed hourglass icon from lineage graph
legend #2
79caa79 is described below
commit 79caa79ad72fca25cecaebdcfcdf5be095852933
Author: kevalbhatt <[email protected]>
AuthorDate: Mon Jun 22 18:20:24 2020 +0530
ATLAS-3851: UI: removed hourglass icon from lineage graph legend #2
---
dashboardv2/public/js/utils/Utils.js | 14 --------------
.../public/js/views/entity/CreateEntityLayoutView.js | 17 ++++++++++-------
dashboardv3/public/js/utils/Utils.js | 14 --------------
.../public/js/views/entity/CreateEntityLayoutView.js | 17 ++++++++++-------
4 files changed, 20 insertions(+), 42 deletions(-)
diff --git a/dashboardv2/public/js/utils/Utils.js
b/dashboardv2/public/js/utils/Utils.js
index 345fd88..7c6fbfc 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -22,20 +22,6 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
var Utils = {};
var prevNetworkErrorTime = 0;
- Utils.escapeHtml = function(string) {
- var entityMap = {
- "&": "&",
- "<": "<",
- ">": ">",
- '"': '"',
- "'": ''',
- "/": '/'
- };
- return String(string).replace(/[&<>"'\/]/g, function(s) {
- return entityMap[s];
- });
- }
-
Utils.generatePopover = function(options) {
if (options.el) {
var defaultObj = {
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index dec160f..cd5c825 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -499,7 +499,7 @@ define(['require',
entityLabel = this.capitalize(_.escape(value.name));
return '<div class=" row ' + value.isOptional + '"><span
class="col-sm-3">' +
- '<label><span class="' + (value.isOptional ? 'true' :
'false required') + '">' + entityLabel + '</span><span class="center-block
ellipsis-with-margin text-gray" title="Data Type : ' + value.typeName + '">' +
'(' + Utils.escapeHtml(value.typeName) + ')' + '</span></label></span>' +
+ '<label><span class="' + (value.isOptional ? 'true' :
'false required') + '">' + entityLabel + '</span><span class="center-block
ellipsis-with-margin text-gray" title="Data Type : ' + value.typeName + '">' +
'(' + _.escape(value.typeName) + ')' + '</span></label></span>' +
'<span class="col-sm-9">' + (this.getElement(object)) +
'</input></span></div>';
},
@@ -513,6 +513,7 @@ define(['require',
},
getSelect: function(object) {
var value = object.value,
+ name = _.escape(value.name),
entityValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation;
@@ -521,7 +522,7 @@ define(['require',
'" data-type="' + value.typeName +
'" data-attribute="' + isAttribute +
'" data-relation="' + isRelation +
- '" data-key="' + value.name +
+ '" data-key="' + name +
'" data-id="entityInput">' +
'<option value="">--Select true or
false--</option><option value="true">true</option>' +
'<option value="false">false</option></select>';
@@ -536,13 +537,14 @@ define(['require',
'" data-type="' + value.typeName +
'" data-attribute="' + isAttribute +
'" data-relation="' + isRelation +
- '" data-key="' + value.name +
+ '" data-key="' + name +
'" data-id="entitySelectData" data-queryData="' +
splitTypeName + '">' + (this.guid ? entityValue : "") + '</select>';
}
},
getTextArea: function(object) {
var value = object.value,
+ name = _.escape(value.name),
setValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation,
@@ -558,25 +560,26 @@ define(['require',
return '<textarea class="form-control entityInputBox ' +
(value.isOptional === true ? "false" : "true") + '"' +
' data-type="' + value.typeName + '"' +
- ' data-key="' + value.name + '"' +
+ ' data-key="' + name + '"' +
' data-attribute="' + isAttribute + '"' +
' data-relation="' + isRelation + '"' +
- ' placeholder="' + value.name + '"' +
+ ' placeholder="' + name + '"' +
' data-id="entityInput">' + setValue + '</textarea>';
},
getInput: function(object) {
var value = object.value,
+ name = _.escape(value.name),
entityValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation;
return '<input class="form-control entityInputBox ' +
(value.isOptional === true ? "false" : "true") + '"' +
' data-type="' + value.typeName + '"' +
' value="' + entityValue + '"' +
- ' data-key="' + value.name + '"' +
+ ' data-key="' + name + '"' +
' data-attribute="' + isAttribute + '"' +
' data-relation="' + isRelation + '"' +
- ' placeholder="' + value.name + '"' +
+ ' placeholder="' + name + '"' +
' data-id="entityInput">';
},
getElement: function(object) {
diff --git a/dashboardv3/public/js/utils/Utils.js
b/dashboardv3/public/js/utils/Utils.js
index 40bb698..70fd6af 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -22,20 +22,6 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
var Utils = {};
var prevNetworkErrorTime = 0;
- Utils.escapeHtml = function(string) {
- var entityMap = {
- "&": "&",
- "<": "<",
- ">": ">",
- '"': '"',
- "'": ''',
- "/": '/'
- };
- return String(string).replace(/[&<>"'\/]/g, function(s) {
- return entityMap[s];
- });
- }
-
Utils.generatePopover = function(options) {
if (options.el) {
var defaultObj = {
diff --git a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
index e84a9ed..7d6198c 100644
--- a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
@@ -502,7 +502,7 @@ define(['require',
entityLabel = this.capitalize(_.escape(value.name));
return '<div class=" row ' + value.isOptional + '"><span
class="col-sm-3">' +
- '<label><span class="' + (value.isOptional ? 'true' :
'false required') + '">' + entityLabel + '</span><span class="center-block
ellipsis-with-margin text-gray" title="Data Type : ' + value.typeName + '">' +
'(' + Utils.escapeHtml(value.typeName) + ')' + '</span></label></span>' +
+ '<label><span class="' + (value.isOptional ? 'true' :
'false required') + '">' + entityLabel + '</span><span class="center-block
ellipsis-with-margin text-gray" title="Data Type : ' + value.typeName + '">' +
'(' + _.escape(value.typeName) + ')' + '</span></label></span>' +
'<span class="col-sm-9">' + (this.getElement(object)) +
'</input></span></div>';
},
@@ -516,6 +516,7 @@ define(['require',
},
getSelect: function(object) {
var value = object.value,
+ name = _.escape(value.name),
entityValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation;
@@ -524,7 +525,7 @@ define(['require',
'" data-type="' + value.typeName +
'" data-attribute="' + isAttribute +
'" data-relation="' + isRelation +
- '" data-key="' + value.name +
+ '" data-key="' + name +
'" data-id="entityInput">' +
'<option value="">--Select true or
false--</option><option value="true">true</option>' +
'<option value="false">false</option></select>';
@@ -539,13 +540,14 @@ define(['require',
'" data-type="' + value.typeName +
'" data-attribute="' + isAttribute +
'" data-relation="' + isRelation +
- '" data-key="' + value.name +
+ '" data-key="' + name +
'" data-id="entitySelectData" data-queryData="' +
splitTypeName + '">' + (this.guid ? entityValue : "") + '</select>';
}
},
getTextArea: function(object) {
var value = object.value,
+ name = _.escape(value.name),
setValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation,
@@ -561,25 +563,26 @@ define(['require',
return '<textarea class="form-control entityInputBox ' +
(value.isOptional === true ? "false" : "true") + '"' +
' data-type="' + value.typeName + '"' +
- ' data-key="' + value.name + '"' +
+ ' data-key="' + name + '"' +
' data-attribute="' + isAttribute + '"' +
' data-relation="' + isRelation + '"' +
- ' placeholder="' + value.name + '"' +
+ ' placeholder="' + name + '"' +
' data-id="entityInput">' + setValue + '</textarea>';
},
getInput: function(object) {
var value = object.value,
+ name = _.escape(value.name),
entityValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation;
return '<input class="form-control entityInputBox ' +
(value.isOptional === true ? "false" : "true") + '"' +
' data-type="' + value.typeName + '"' +
' value="' + entityValue + '"' +
- ' data-key="' + value.name + '"' +
+ ' data-key="' + name + '"' +
' data-attribute="' + isAttribute + '"' +
' data-relation="' + isRelation + '"' +
- ' placeholder="' + value.name + '"' +
+ ' placeholder="' + name + '"' +
' data-id="entityInput">';
},
getElement: function(object) {
