[atlas] branch branch-2.0 updated: Atlas-4166: UI should not allow the user to create a glossary with blank(" ") name
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 045c849 Atlas-4166: UI should not allow the user to create a glossary
with blank(" ") name
045c849 is described below
commit 045c84917973506750c8d9976041e72841adf7b9
Author: prasad pawar
AuthorDate: Tue Feb 2 20:29:44 2021 +0530
Atlas-4166: UI should not allow the user to create a glossary with blank("
") name
Signed-off-by: kevalbhatt
(cherry picked from commit 7a3f512655bc450fc58a466301c6b3c511076c8c)
---
dashboardv2/public/js/utils/CommonViewFunction.js | 14 --
dashboardv2/public/js/utils/Helper.js | 14 ++
.../business_metadata/CreateBusinessMetadataLayoutView.js | 2 +-
.../public/js/views/entity/CreateEntityLayoutView.js | 3 ++-
.../public/js/views/entity/EntityLabelDefineView.js | 4 ++--
.../public/js/views/search/save/SaveModalLayoutView.js| 8
dashboardv2/public/js/views/tag/TagLayoutView.js | 8
dashboardv3/public/js/utils/CommonViewFunction.js | 14 --
dashboardv3/public/js/utils/Helper.js | 15 ++-
.../business_metadata/CreateBusinessMetadataLayoutView.js | 2 +-
.../public/js/views/entity/CreateEntityLayoutView.js | 3 ++-
.../public/js/views/entity/EntityLabelDefineView.js | 4 ++--
.../public/js/views/search/save/SaveModalLayoutView.js| 8
.../js/views/search/tree/ClassificationTreeLayoutView.js | 8
14 files changed, 38 insertions(+), 69 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index f766204..80db527 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -711,20 +711,6 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
"allowCancel": true
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
-if (model) {
-view.$('input,textarea').on('keyup', function(e) {
-modal.$el.find('button.ok').attr("disabled", false);
-});
-} else {
-view.ui.name.on('keyup', function(e) {
-modal.$el.find('button.ok').attr("disabled", false);
-});
-}
-view.ui.name.on('keyup', function(e) {
-if ((e.keyCode == 8 || e.keyCode == 32 || e.keyCode == 46) &&
e.currentTarget.value.trim() == "") {
-modal.$el.find('button.ok').attr("disabled", true);
-}
-});
modal.on('ok', function() {
modal.$el.find('button.ok').showButtonLoader();
CommonViewFunction.createEditGlossaryCategoryTermSubmit(_.extend({ "ref": view,
"modal": modal }, options));
diff --git a/dashboardv2/public/js/utils/Helper.js
b/dashboardv2/public/js/utils/Helper.js
index 8b9f4c5..050dfd5 100644
--- a/dashboardv2/public/js/utils/Helper.js
+++ b/dashboardv2/public/js/utils/Helper.js
@@ -127,6 +127,20 @@ define(['require',
$("body").on('click', '.btn', function() {
$(this).blur();
});
+$('body').on('keyup input', '.modal-body', function(e) {
+var $this = $(this),
+$footerButton = $this.parents(".modal").find('.modal-footer
button.ok'),
+requiredInputField = _.filter($this.find('input'), function($e) {
+if ($e.getAttribute('placeholder') &&
$e.getAttribute('placeholder').indexOf('require') >= 0) {
+return ($e.value.trim() == "");
+}
+});
+if (requiredInputField.length > 0) {
+$footerButton.attr("disabled", "true");
+} else {
+$footerButton.removeAttr("disabled");
+}
+});
if ($.fn.select2) {
$.fn.select2.amd.define("TagHideDeleteButtonAdapter", [
"select2/utils",
diff --git
a/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
b/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
index 6261585..4957002 100644
---
a/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
+++
b/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
@@ -180,7 +180,7 @@ define(['require',
}
validationFileds.each(function(elements) {
[atlas] branch master updated: Atlas-4166: UI should not allow the user to create a glossary with blank(" ") name
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 7a3f512 Atlas-4166: UI should not allow the user to create a glossary
with blank(" ") name
7a3f512 is described below
commit 7a3f512655bc450fc58a466301c6b3c511076c8c
Author: prasad pawar
AuthorDate: Tue Feb 2 20:29:44 2021 +0530
Atlas-4166: UI should not allow the user to create a glossary with blank("
") name
Signed-off-by: kevalbhatt
---
dashboardv2/public/js/utils/CommonViewFunction.js | 14 --
dashboardv2/public/js/utils/Helper.js | 14 ++
.../business_metadata/CreateBusinessMetadataLayoutView.js | 2 +-
.../public/js/views/entity/CreateEntityLayoutView.js | 3 ++-
.../public/js/views/entity/EntityLabelDefineView.js | 4 ++--
.../public/js/views/search/save/SaveModalLayoutView.js| 8
dashboardv2/public/js/views/tag/TagLayoutView.js | 8
dashboardv3/public/js/utils/CommonViewFunction.js | 14 --
dashboardv3/public/js/utils/Helper.js | 15 ++-
.../business_metadata/CreateBusinessMetadataLayoutView.js | 2 +-
.../public/js/views/entity/CreateEntityLayoutView.js | 3 ++-
.../public/js/views/entity/EntityLabelDefineView.js | 4 ++--
.../public/js/views/search/save/SaveModalLayoutView.js| 8
.../js/views/search/tree/ClassificationTreeLayoutView.js | 8
14 files changed, 38 insertions(+), 69 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index f766204..80db527 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -711,20 +711,6 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
"allowCancel": true
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
-if (model) {
-view.$('input,textarea').on('keyup', function(e) {
-modal.$el.find('button.ok').attr("disabled", false);
-});
-} else {
-view.ui.name.on('keyup', function(e) {
-modal.$el.find('button.ok').attr("disabled", false);
-});
-}
-view.ui.name.on('keyup', function(e) {
-if ((e.keyCode == 8 || e.keyCode == 32 || e.keyCode == 46) &&
e.currentTarget.value.trim() == "") {
-modal.$el.find('button.ok').attr("disabled", true);
-}
-});
modal.on('ok', function() {
modal.$el.find('button.ok').showButtonLoader();
CommonViewFunction.createEditGlossaryCategoryTermSubmit(_.extend({ "ref": view,
"modal": modal }, options));
diff --git a/dashboardv2/public/js/utils/Helper.js
b/dashboardv2/public/js/utils/Helper.js
index 8b9f4c5..050dfd5 100644
--- a/dashboardv2/public/js/utils/Helper.js
+++ b/dashboardv2/public/js/utils/Helper.js
@@ -127,6 +127,20 @@ define(['require',
$("body").on('click', '.btn', function() {
$(this).blur();
});
+$('body').on('keyup input', '.modal-body', function(e) {
+var $this = $(this),
+$footerButton = $this.parents(".modal").find('.modal-footer
button.ok'),
+requiredInputField = _.filter($this.find('input'), function($e) {
+if ($e.getAttribute('placeholder') &&
$e.getAttribute('placeholder').indexOf('require') >= 0) {
+return ($e.value.trim() == "");
+}
+});
+if (requiredInputField.length > 0) {
+$footerButton.attr("disabled", "true");
+} else {
+$footerButton.removeAttr("disabled");
+}
+});
if ($.fn.select2) {
$.fn.select2.amd.define("TagHideDeleteButtonAdapter", [
"select2/utils",
diff --git
a/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
b/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
index 6261585..4957002 100644
---
a/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
+++
b/dashboardv2/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
@@ -180,7 +180,7 @@ define(['require',
}
validationFileds.each(function(elements) {
$(this).removeClass('errorValidate');
-
[atlas] branch branch-2.0 updated: ATLAS-4044: Added isIncomplete parameter in the entity detail's property tab.
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 a434c0a ATLAS-4044: Added isIncomplete parameter in the entity
detail's property tab.
a434c0a is described below
commit a434c0a6b6da1a60c29e86356a8f1b11d4ab9a5c
Author: Deep Singh
AuthorDate: Tue Nov 24 01:43:02 2020 -0600
ATLAS-4044: Added isIncomplete parameter in the entity detail's property
tab.
Signed-off-by: kevalbhatt
(cherry picked from commit 389c25bcd05f05977750974db5cdc8dd44b581dc)
---
dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js | 2 +-
dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
index 0a7d51a..a5b5262 100644
--- a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -79,7 +79,7 @@ define(['require',
highlightString = $(".atlas-header
.global-search-container input.global-search").val(),
table = CommonViewFunction.propertyTable({
scope: this,
-valueObject: this.entity.attributes,
+valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
highlightString: highlightString
});
diff --git a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
index 0a7d51a..a5b5262 100644
--- a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -79,7 +79,7 @@ define(['require',
highlightString = $(".atlas-header
.global-search-container input.global-search").val(),
table = CommonViewFunction.propertyTable({
scope: this,
-valueObject: this.entity.attributes,
+valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
highlightString: highlightString
});
[atlas] branch master updated: ATLAS-4044: Added isIncomplete parameter in the entity detail's property tab.
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 389c25b ATLAS-4044: Added isIncomplete parameter in the entity
detail's property tab.
389c25b is described below
commit 389c25bcd05f05977750974db5cdc8dd44b581dc
Author: Deep Singh
AuthorDate: Tue Nov 24 01:43:02 2020 -0600
ATLAS-4044: Added isIncomplete parameter in the entity detail's property
tab.
Signed-off-by: kevalbhatt
---
dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js | 2 +-
dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
index 0a7d51a..a5b5262 100644
--- a/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -79,7 +79,7 @@ define(['require',
highlightString = $(".atlas-header
.global-search-container input.global-search").val(),
table = CommonViewFunction.propertyTable({
scope: this,
-valueObject: this.entity.attributes,
+valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
highlightString: highlightString
});
diff --git a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
index 0a7d51a..a5b5262 100644
--- a/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
+++ b/dashboardv3/public/js/views/entity/EntityDetailTableLayoutView.js
@@ -79,7 +79,7 @@ define(['require',
highlightString = $(".atlas-header
.global-search-container input.global-search").val(),
table = CommonViewFunction.propertyTable({
scope: this,
-valueObject: this.entity.attributes,
+valueObject: _.extend({ "isIncomplete":
this.entity.isIncomplete }, this.entity.attributes),
attributeDefs: this.attributeDefs,
highlightString: highlightString
});
[atlas] branch branch-2.0 updated: ATLAS-4042: 'Error while authentication' grammatical error in login page
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 b9f655e ATLAS-4042: 'Error while authentication' grammatical error in
login page
b9f655e is described below
commit b9f655ee8113971412a1ca93eaec01fa73bb93f2
Author: Sarath Subramanian
AuthorDate: Wed Nov 18 20:30:42 2020 -0800
ATLAS-4042: 'Error while authentication' grammatical error in login page
Signed-off-by: kevalbhatt
(cherry picked from commit 0eb01b0edc618b8672fe0dc10f29a16ac31f385d)
---
dashboardv2/public/js/modules/atlasLogin.js | 2 +-
dashboardv3/public/js/modules/atlasLogin.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/modules/atlasLogin.js
b/dashboardv2/public/js/modules/atlasLogin.js
index d5ad854..687645c 100644
--- a/dashboardv2/public/js/modules/atlasLogin.js
+++ b/dashboardv2/public/js/modules/atlasLogin.js
@@ -81,7 +81,7 @@ function doLogin() {
} else if (resp.msgDesc.startsWith("User role credentials
is not set properly")) {
$("#errorBox .errorMsg").text("User role or
credentials is not set properly");
} else {
-$("#errorBox .errorMsg").text("Error while
authentication");
+$("#errorBox .errorMsg").text("Error while
authenticating");
}
} catch (err) {
$("#errorBox .errorMsg").text("Something went wrong");
diff --git a/dashboardv3/public/js/modules/atlasLogin.js
b/dashboardv3/public/js/modules/atlasLogin.js
index d5ad854..687645c 100644
--- a/dashboardv3/public/js/modules/atlasLogin.js
+++ b/dashboardv3/public/js/modules/atlasLogin.js
@@ -81,7 +81,7 @@ function doLogin() {
} else if (resp.msgDesc.startsWith("User role credentials
is not set properly")) {
$("#errorBox .errorMsg").text("User role or
credentials is not set properly");
} else {
-$("#errorBox .errorMsg").text("Error while
authentication");
+$("#errorBox .errorMsg").text("Error while
authenticating");
}
} catch (err) {
$("#errorBox .errorMsg").text("Something went wrong");
[atlas] branch branch-2.0 updated: ATLAS-4022: profile tab Build fail fix #1
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 4cc9f1d ATLAS-4022: profile tab Build fail fix #1
4cc9f1d is described below
commit 4cc9f1de03d4946e0f11b2e75ab5693eb367c285
Author: kevalbhatt
AuthorDate: Thu Nov 19 09:50:36 2020 +0530
ATLAS-4022: profile tab Build fail fix #1
(cherry picked from commit cf232de6a1f71fdfbdc0b5d95309a1fe7ed4416c)
---
dashboardv2/public/js/views/graph/ProfileBarChart.js | 4 ++--
dashboardv3/public/js/views/graph/ProfileBarChart.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/graph/ProfileBarChart.js
b/dashboardv2/public/js/views/graph/ProfileBarChart.js
index d5a974d..d6ab7a8 100644
--- a/dashboardv2/public/js/views/graph/ProfileBarChart.js
+++ b/dashboardv2/public/js/views/graph/ProfileBarChart.js
@@ -19,7 +19,7 @@
define(["require", "d3", "d3-tip"], function(require, d3, d3Tip) {
"use strict";
var ProfileBarChart = {
-render(options) {
+render: function(options) {
var el = options.el,
type = options.data.key,
data = options.data.values,
@@ -117,7 +117,7 @@ define(["require", "d3", "d3-tip"], function(require, d3,
d3Tip) {
return x(d.value);
})
.attr("width", x.bandwidth())
-.attr("y", d => { return height; })
+.attr("y", function(d) { return height; })
.attr("height", 0)
.on("click", function(e) {
tooltip.hide();
diff --git a/dashboardv3/public/js/views/graph/ProfileBarChart.js
b/dashboardv3/public/js/views/graph/ProfileBarChart.js
index d5a974d..d6ab7a8 100644
--- a/dashboardv3/public/js/views/graph/ProfileBarChart.js
+++ b/dashboardv3/public/js/views/graph/ProfileBarChart.js
@@ -19,7 +19,7 @@
define(["require", "d3", "d3-tip"], function(require, d3, d3Tip) {
"use strict";
var ProfileBarChart = {
-render(options) {
+render: function(options) {
var el = options.el,
type = options.data.key,
data = options.data.values,
@@ -117,7 +117,7 @@ define(["require", "d3", "d3-tip"], function(require, d3,
d3Tip) {
return x(d.value);
})
.attr("width", x.bandwidth())
-.attr("y", d => { return height; })
+.attr("y", function(d) { return height; })
.attr("height", 0)
.on("click", function(e) {
tooltip.hide();
[atlas] branch master updated: ATLAS-4022: profile tab Build fail fix #1 wq
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 cf232de ATLAS-4022: profile tab Build fail fix #1 wq
cf232de is described below
commit cf232de6a1f71fdfbdc0b5d95309a1fe7ed4416c
Author: kevalbhatt
AuthorDate: Thu Nov 19 09:50:36 2020 +0530
ATLAS-4022: profile tab Build fail fix #1 wq
---
dashboardv2/public/js/views/graph/ProfileBarChart.js | 4 ++--
dashboardv3/public/js/views/graph/ProfileBarChart.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/graph/ProfileBarChart.js
b/dashboardv2/public/js/views/graph/ProfileBarChart.js
index d5a974d..d6ab7a8 100644
--- a/dashboardv2/public/js/views/graph/ProfileBarChart.js
+++ b/dashboardv2/public/js/views/graph/ProfileBarChart.js
@@ -19,7 +19,7 @@
define(["require", "d3", "d3-tip"], function(require, d3, d3Tip) {
"use strict";
var ProfileBarChart = {
-render(options) {
+render: function(options) {
var el = options.el,
type = options.data.key,
data = options.data.values,
@@ -117,7 +117,7 @@ define(["require", "d3", "d3-tip"], function(require, d3,
d3Tip) {
return x(d.value);
})
.attr("width", x.bandwidth())
-.attr("y", d => { return height; })
+.attr("y", function(d) { return height; })
.attr("height", 0)
.on("click", function(e) {
tooltip.hide();
diff --git a/dashboardv3/public/js/views/graph/ProfileBarChart.js
b/dashboardv3/public/js/views/graph/ProfileBarChart.js
index d5a974d..d6ab7a8 100644
--- a/dashboardv3/public/js/views/graph/ProfileBarChart.js
+++ b/dashboardv3/public/js/views/graph/ProfileBarChart.js
@@ -19,7 +19,7 @@
define(["require", "d3", "d3-tip"], function(require, d3, d3Tip) {
"use strict";
var ProfileBarChart = {
-render(options) {
+render: function(options) {
var el = options.el,
type = options.data.key,
data = options.data.values,
@@ -117,7 +117,7 @@ define(["require", "d3", "d3-tip"], function(require, d3,
d3Tip) {
return x(d.value);
})
.attr("width", x.bandwidth())
-.attr("y", d => { return height; })
+.attr("y", function(d) { return height; })
.attr("height", 0)
.on("click", function(e) {
tooltip.hide();
[atlas] branch branch-2.0 updated: ATLAS-4022: Atlas UI: After d3 verion upgrade profile tab not working
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 13c8823 ATLAS-4022: Atlas UI: After d3 verion upgrade profile tab not
working
13c8823 is described below
commit 13c88237311bdda46b341b5fec1e0ba551360740
Author: kevalbhatt
AuthorDate: Wed Nov 18 18:02:11 2020 +0530
ATLAS-4022: Atlas UI: After d3 verion upgrade profile tab not working
(cherry picked from commit fb996d55f81d8fb371405145bf56e693340d389b)
---
dashboardv2/gruntfile.js | 3 -
dashboardv2/package-lock.json | 274 -
dashboardv2/package.json | 7 +-
dashboardv2/public/css/scss/graph.scss | 38 +++
dashboardv2/public/index.html.tpl | 1 -
dashboardv2/public/js/main.js | 4 -
.../templates/profile/ProfileLayoutView_tmpl.html | 2 +-
.../public/js/views/graph/ProfileBarChart.js | 151
.../js/views/profile/ProfileColumnLayoutView.js| 172 ++---
.../js/views/profile/ProfileTableLayoutView.js | 117 +
dashboardv3/gruntfile.js | 3 -
dashboardv3/package-lock.json | 274 -
dashboardv3/package.json | 7 +-
dashboardv3/public/css/scss/graph.scss | 38 +++
dashboardv3/public/index.html.tpl | 1 -
dashboardv3/public/js/main.js | 4 -
.../templates/profile/ProfileLayoutView_tmpl.html | 2 +-
.../public/js/views/graph/ProfileBarChart.js | 151
.../js/views/profile/ProfileColumnLayoutView.js| 172 ++---
.../js/views/profile/ProfileTableLayoutView.js | 117 +
20 files changed, 1190 insertions(+), 348 deletions(-)
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index 1f21df2..fa79a15 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -105,7 +105,6 @@ module.exports = function(grunt) {
'platform.js': { 'platform': 'platform' },
'query-builder.standalone.min.js': {
'jQuery-QueryBuilder/dist/js': 'jQueryQueryBuilder/js' },
'daterangepicker.js': { 'bootstrap-daterangepicker':
'bootstrap-daterangepicker/js' },
-'nv.d3.min.js': { 'nvd3/build': 'nvd3' },
'jquery.sparkline.min.js': { 'jquery-sparkline':
'sparkline' },
'table-dragger.js': { 'table-dragger/dist':
'table-dragger' },
'jstree.min.js': { 'jstree/dist': 'jstree' },
@@ -148,7 +147,6 @@ module.exports = function(grunt) {
}],
'query-builder.default.min.css': {
'jQuery-QueryBuilder/dist/css': 'jQueryQueryBuilder/css' },
'daterangepicker.css': { 'bootstrap-daterangepicker':
'bootstrap-daterangepicker/css' },
-'nv.d3.min.css': { 'nvd3/build': 'nvd3/css' },
'pretty-checkbox.min.css': { 'pretty-checkbox/dist':
'pretty-checkbox/css' },
'dropzone.css': { 'dropzone/dist': "dropzone/css" }
}
@@ -179,7 +177,6 @@ module.exports = function(grunt) {
],
'LICENSE.md': [{ 'backbone.babysitter':
'backbone-babysitter' },
{ 'backbone.wreqr': 'backbone-wreqr' },
-{ 'nvd3': 'nvd3/' },
{ 'lossless-json': 'lossless-json' }
],
'license.txt': [{ 'backbone.marionette':
'backbone-marionette' }],
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index 6b8e15a..001de7d 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -792,11 +792,27 @@
"resolved":
"https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz;,
"integrity":
"sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
},
+"d3-queue": {
+ "version": "3.0.7",
+ "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-3.0.7.tgz;,
+ "integrity": "sha1-yTouVLQXwJWRKdfXP2z31Ckudhg="
+},
"d3-random": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz;,
"integrity":
"sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
},
+"d3-request": {
+ "version": "1.0.6",
+ "resolved":
"https://registry.npmjs.org/
[atlas] branch master updated: ATLAS-4022: Atlas UI: After d3 verion upgrade profile tab not working
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 fb996d5 ATLAS-4022: Atlas UI: After d3 verion upgrade profile tab not
working
fb996d5 is described below
commit fb996d55f81d8fb371405145bf56e693340d389b
Author: kevalbhatt
AuthorDate: Wed Nov 18 18:02:11 2020 +0530
ATLAS-4022: Atlas UI: After d3 verion upgrade profile tab not working
---
dashboardv2/gruntfile.js | 3 -
dashboardv2/package-lock.json | 274 -
dashboardv2/package.json | 7 +-
dashboardv2/public/css/scss/graph.scss | 38 +++
dashboardv2/public/index.html.tpl | 1 -
dashboardv2/public/js/main.js | 4 -
.../templates/profile/ProfileLayoutView_tmpl.html | 2 +-
.../public/js/views/graph/ProfileBarChart.js | 151
.../js/views/profile/ProfileColumnLayoutView.js| 172 ++---
.../js/views/profile/ProfileTableLayoutView.js | 117 +
dashboardv3/gruntfile.js | 3 -
dashboardv3/package-lock.json | 274 -
dashboardv3/package.json | 7 +-
dashboardv3/public/css/scss/graph.scss | 38 +++
dashboardv3/public/index.html.tpl | 1 -
dashboardv3/public/js/main.js | 4 -
.../templates/profile/ProfileLayoutView_tmpl.html | 2 +-
.../public/js/views/graph/ProfileBarChart.js | 151
.../js/views/profile/ProfileColumnLayoutView.js| 172 ++---
.../js/views/profile/ProfileTableLayoutView.js | 117 +
20 files changed, 1190 insertions(+), 348 deletions(-)
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index 1f21df2..fa79a15 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -105,7 +105,6 @@ module.exports = function(grunt) {
'platform.js': { 'platform': 'platform' },
'query-builder.standalone.min.js': {
'jQuery-QueryBuilder/dist/js': 'jQueryQueryBuilder/js' },
'daterangepicker.js': { 'bootstrap-daterangepicker':
'bootstrap-daterangepicker/js' },
-'nv.d3.min.js': { 'nvd3/build': 'nvd3' },
'jquery.sparkline.min.js': { 'jquery-sparkline':
'sparkline' },
'table-dragger.js': { 'table-dragger/dist':
'table-dragger' },
'jstree.min.js': { 'jstree/dist': 'jstree' },
@@ -148,7 +147,6 @@ module.exports = function(grunt) {
}],
'query-builder.default.min.css': {
'jQuery-QueryBuilder/dist/css': 'jQueryQueryBuilder/css' },
'daterangepicker.css': { 'bootstrap-daterangepicker':
'bootstrap-daterangepicker/css' },
-'nv.d3.min.css': { 'nvd3/build': 'nvd3/css' },
'pretty-checkbox.min.css': { 'pretty-checkbox/dist':
'pretty-checkbox/css' },
'dropzone.css': { 'dropzone/dist': "dropzone/css" }
}
@@ -179,7 +177,6 @@ module.exports = function(grunt) {
],
'LICENSE.md': [{ 'backbone.babysitter':
'backbone-babysitter' },
{ 'backbone.wreqr': 'backbone-wreqr' },
-{ 'nvd3': 'nvd3/' },
{ 'lossless-json': 'lossless-json' }
],
'license.txt': [{ 'backbone.marionette':
'backbone-marionette' }],
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index 6b8e15a..001de7d 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -792,11 +792,27 @@
"resolved":
"https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz;,
"integrity":
"sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
},
+"d3-queue": {
+ "version": "3.0.7",
+ "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-3.0.7.tgz;,
+ "integrity": "sha1-yTouVLQXwJWRKdfXP2z31Ckudhg="
+},
"d3-random": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz;,
"integrity":
"sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
},
+"d3-request": {
+ "version": "1.0.6",
+ "resolved":
"https://registry.npmjs.org/d3-request/-/d3-request-1.0.6.tgz;,
+ "integrity":
&qu
[atlas] branch branch-2.0 updated: ATLAS-3743: Date type value is shown as timestamp instead of date, in BM audit/technical properties.
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 70a2cd9 ATLAS-3743: Date type value is shown as timestamp instead of
date, in BM audit/technical properties.
70a2cd9 is described below
commit 70a2cd90def3ab5ab5508945dc305ac7631f3f05
Author: kevalbhatt
AuthorDate: Mon Nov 2 13:51:29 2020 +0530
ATLAS-3743: Date type value is shown as timestamp instead of date, in BM
audit/technical properties.
(cherry picked from commit 53ae712a095930ebf008e70ece4a7a351030acf3)
---
.../js/views/audit/CreateAuditTableLayoutView.js | 18 --
.../js/views/audit/CreateAuditTableLayoutView.js | 18 --
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
index e7d5d8b..41ad4ac 100644
--- a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -124,11 +124,25 @@ define(['require',
var name = ((name ? name : this.entityName));
that.updateName(name);
if (parseDetailsObject) {
-var attributesDetails =
parseDetailsObject.attributes,
+var attributesDetails = $.extend(true, {},
parseDetailsObject.attributes),
customAttr =
parseDetailsObject.customAttributes,
labelsDetails =
parseDetailsObject.labels,
-relationshipAttributes =
parseDetailsObject.relationshipAttributes;
+relationshipAttributes =
parseDetailsObject.relationshipAttributes,
+bmAttributesDeails =
that.entity.businessAttributes ?
that.entity.businessAttributes[parseDetailsObject.typeName] : null;
if (attributesDetails) {
+if (bmAttributesDeails) {
+
_.each(Object.keys(attributesDetails), function(key) {
+if
(bmAttributesDeails[key].typeName.toLowerCase().indexOf("date") > -1) {
+if
(attributesDetails[key].length) { // multiple date values
+attributesDetails[key]
= _.map(attributesDetails[key], function(dateValue) {
+return
Utils.formatDate({ date: dateValue })
+});
+} else {
+attributesDetails[key]
= Utils.formatDate({ date: attributesDetails[key] });
+}
+}
+})
+}
that.ui.attributeDetails.removeClass('hide');
that.action.indexOf("Classification")
=== -1 ? that.ui.panelAttrHeading.html("Technical properties ") :
that.ui.panelAttrHeading.html("Properties ");
var attrTable =
that.createTableWithValues(attributesDetails);
diff --git a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
index e7d5d8b..41ad4ac 100644
--- a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -124,11 +124,25 @@ define(['require',
var name = ((name ? name : this.entityName));
that.updateName(name);
if (parseDetailsObject) {
-var attributesDetails =
parseDetailsObject.attributes,
+var attributesDetails = $.extend(true, {},
parseDetailsObject.attributes),
customAttr =
parseDetailsObject.customAttributes,
labelsDetails =
parseDetailsObject.labels,
-relationshipAttributes =
parseDetailsObject.relationshipAttributes;
+relationshipAttributes =
parseDetailsObject.relationshipAttributes,
+
[atlas] branch master updated: ATLAS-3743: Date type value is shown as timestamp instead of date, in BM audit/technical properties.
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 53ae712 ATLAS-3743: Date type value is shown as timestamp instead of
date, in BM audit/technical properties.
53ae712 is described below
commit 53ae712a095930ebf008e70ece4a7a351030acf3
Author: kevalbhatt
AuthorDate: Mon Nov 2 13:51:29 2020 +0530
ATLAS-3743: Date type value is shown as timestamp instead of date, in BM
audit/technical properties.
---
.../js/views/audit/CreateAuditTableLayoutView.js | 18 --
.../js/views/audit/CreateAuditTableLayoutView.js | 18 --
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
index e7d5d8b..41ad4ac 100644
--- a/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -124,11 +124,25 @@ define(['require',
var name = ((name ? name : this.entityName));
that.updateName(name);
if (parseDetailsObject) {
-var attributesDetails =
parseDetailsObject.attributes,
+var attributesDetails = $.extend(true, {},
parseDetailsObject.attributes),
customAttr =
parseDetailsObject.customAttributes,
labelsDetails =
parseDetailsObject.labels,
-relationshipAttributes =
parseDetailsObject.relationshipAttributes;
+relationshipAttributes =
parseDetailsObject.relationshipAttributes,
+bmAttributesDeails =
that.entity.businessAttributes ?
that.entity.businessAttributes[parseDetailsObject.typeName] : null;
if (attributesDetails) {
+if (bmAttributesDeails) {
+
_.each(Object.keys(attributesDetails), function(key) {
+if
(bmAttributesDeails[key].typeName.toLowerCase().indexOf("date") > -1) {
+if
(attributesDetails[key].length) { // multiple date values
+attributesDetails[key]
= _.map(attributesDetails[key], function(dateValue) {
+return
Utils.formatDate({ date: dateValue })
+});
+} else {
+attributesDetails[key]
= Utils.formatDate({ date: attributesDetails[key] });
+}
+}
+})
+}
that.ui.attributeDetails.removeClass('hide');
that.action.indexOf("Classification")
=== -1 ? that.ui.panelAttrHeading.html("Technical properties ") :
that.ui.panelAttrHeading.html("Properties ");
var attrTable =
that.createTableWithValues(attributesDetails);
diff --git a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
index e7d5d8b..41ad4ac 100644
--- a/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/CreateAuditTableLayoutView.js
@@ -124,11 +124,25 @@ define(['require',
var name = ((name ? name : this.entityName));
that.updateName(name);
if (parseDetailsObject) {
-var attributesDetails =
parseDetailsObject.attributes,
+var attributesDetails = $.extend(true, {},
parseDetailsObject.attributes),
customAttr =
parseDetailsObject.customAttributes,
labelsDetails =
parseDetailsObject.labels,
-relationshipAttributes =
parseDetailsObject.relationshipAttributes;
+relationshipAttributes =
parseDetailsObject.relationshipAttributes,
+bmAttributesDeails =
that.entity.businessA
[atlas] branch branch-2.0 updated: ATLAS-3992: UI: Upgrade to JQuery 3.5.1 (Classic UI Jquery-UI issue) #1
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 30050da ATLAS-3992: UI: Upgrade to JQuery 3.5.1 (Classic UI Jquery-UI
issue) #1
30050da is described below
commit 30050da98a9dbb295af1bb7705fa32039d618b80
Author: kevalbhatt
AuthorDate: Mon Oct 26 19:56:04 2020 +0530
ATLAS-3992: UI: Upgrade to JQuery 3.5.1 (Classic UI Jquery-UI issue) #1
(cherry picked from commit 8f5ba447ff2880804c2a1d820dc5f245c66075a6)
---
dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css | 6 +++---
dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js | 10 ++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
index 00fc659..83e8d60 100644
--- a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
+++ b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
@@ -1,7 +1,7 @@
-/*! jQuery UI - v1.12.1 - 2019-05-22
+/*! jQuery UI - v1.12.1 - 2019-07-04
* http://jqueryui.com
-* Includes: core.css, resizable.css, autocomplete.css, menu.css, theme.css
+* Includes: draggable.css, core.css, resizable.css, autocomplete.css,
menu.css, theme.css
* To view and modify this theme, visit
http://jqueryui.com/themeroller/?scope==base=8px=0px=0px=5px=30=0=flat=66=30=0=flat=aa=cc=5f3f3f=f1a899=flat=fddfdf=777620=777620
[...]
* Copyright jQuery Foundation and other contributors; Licensed MIT */
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0
0 0
0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:abs
[...]
\ No newline at end of file
+.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0
0 0
0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui
[...]
\ No newline at end of file
diff --git a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
index 9492c34..e0f2255 100644
--- a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
+++ b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
@@ -1,7 +1,9 @@
-/*! jQuery UI - v1.12.1 - 2019-05-22
+/*! jQuery UI - v1.12.1 - 2019-07-04
* http://jqueryui.com
-* Includes: widget.js, position.js, disable-selection.js, keycode.js,
unique-id.js, widgets/resizable.js, widgets/autocomplete.js, widgets/menu.js,
widgets/mouse.js
+* Includes: widget.js, position.js, data.js, disable-selection.js, keycode.js,
labels.js, scroll-parent.js, unique-id.js, widgets/draggable.js,
widgets/resizable.js, widgets/autocomplete.js, widgets/menu.js,
widgets/mouse.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js,
effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js,
effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js,
effects/effect-puff.js, effects/effect-pulsate.js, e [...]
* Copyright jQuery Foundation and other contributors; Licensed MIT */
-(function(t){"function"==typeof
define&?define(["jquery"],t):t(jQuery)})(function(t){t.ui=t.ui||{},t.ui.version="1.12.1";var
e=0,i=Array.prototype.slice;t.cleanData=function(e){return function(i){var
s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var
n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return
s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply( [...]
-},stop:function(){var
e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position")
[atlas] branch master updated: ATLAS-3992: UI: Upgrade to JQuery 3.5.1 (Classic UI Jquery-UI issue) #1
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 8f5ba44 ATLAS-3992: UI: Upgrade to JQuery 3.5.1 (Classic UI Jquery-UI
issue) #1
8f5ba44 is described below
commit 8f5ba447ff2880804c2a1d820dc5f245c66075a6
Author: kevalbhatt
AuthorDate: Mon Oct 26 19:56:04 2020 +0530
ATLAS-3992: UI: Upgrade to JQuery 3.5.1 (Classic UI Jquery-UI issue) #1
---
dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css | 6 +++---
dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js | 10 ++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
index 00fc659..83e8d60 100644
--- a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
+++ b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.css
@@ -1,7 +1,7 @@
-/*! jQuery UI - v1.12.1 - 2019-05-22
+/*! jQuery UI - v1.12.1 - 2019-07-04
* http://jqueryui.com
-* Includes: core.css, resizable.css, autocomplete.css, menu.css, theme.css
+* Includes: draggable.css, core.css, resizable.css, autocomplete.css,
menu.css, theme.css
* To view and modify this theme, visit
http://jqueryui.com/themeroller/?scope==base=8px=0px=0px=5px=30=0=flat=66=30=0=flat=aa=cc=5f3f3f=f1a899=flat=fddfdf=777620=777620
[...]
* Copyright jQuery Foundation and other contributors; Licensed MIT */
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0
0 0
0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:abs
[...]
\ No newline at end of file
+.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0
0 0
0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui
[...]
\ No newline at end of file
diff --git a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
index 9492c34..e0f2255 100644
--- a/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
+++ b/dashboardv2/public/js/external_lib/jquery-ui/jquery-ui.min.js
@@ -1,7 +1,9 @@
-/*! jQuery UI - v1.12.1 - 2019-05-22
+/*! jQuery UI - v1.12.1 - 2019-07-04
* http://jqueryui.com
-* Includes: widget.js, position.js, disable-selection.js, keycode.js,
unique-id.js, widgets/resizable.js, widgets/autocomplete.js, widgets/menu.js,
widgets/mouse.js
+* Includes: widget.js, position.js, data.js, disable-selection.js, keycode.js,
labels.js, scroll-parent.js, unique-id.js, widgets/draggable.js,
widgets/resizable.js, widgets/autocomplete.js, widgets/menu.js,
widgets/mouse.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js,
effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js,
effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js,
effects/effect-puff.js, effects/effect-pulsate.js, e [...]
* Copyright jQuery Foundation and other contributors; Licensed MIT */
-(function(t){"function"==typeof
define&?define(["jquery"],t):t(jQuery)})(function(t){t.ui=t.ui||{},t.ui.version="1.12.1";var
e=0,i=Array.prototype.slice;t.cleanData=function(e){return function(i){var
s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var
n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return
s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply( [...]
-},stop:function(){var
e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position"))&(this).css({left:r.left-n.left-s.left,width:l,height:h})}}),t.ui.plugi
[atlas] branch branch-2.0 updated: ATLAS-3986: UI Allow user to update the date format from JAVA property file #1
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 35c773a ATLAS-3986: UI Allow user to update the date format from JAVA
property file #1
35c773a is described below
commit 35c773a935b6af30efe35f85d60337caa017862c
Author: kevalbhatt
AuthorDate: Mon Oct 26 11:44:31 2020 +0530
ATLAS-3986: UI Allow user to update the date format from JAVA property file
#1
(cherry picked from commit 91926971551767abd9d2d34fff202d9df3c72f9b)
---
dashboardv2/public/js/main.js | 4 ++--
dashboardv2/public/js/utils/Globals.js | 2 +-
dashboardv2/public/js/utils/Utils.js | 2 +-
dashboardv3/public/js/main.js | 4 ++--
dashboardv3/public/js/utils/Globals.js | 2 +-
dashboardv3/public/js/utils/Utils.js | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 282c407..10d62eb 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -279,8 +279,8 @@ require(['App',
Globals.dateFormat = dateFormatSeperated[0]; //date
}
}
-if (response['atlas.ui.date.timezone'] !== undefined) {
-Globals.isDateTimeZone =
response['atlas.ui.date.timezone'];
+if (response['atlas.ui.date.timezone.format.enabled'] !==
undefined) {
+Globals.isTimezoneFormatEnabled =
response['atlas.ui.date.timezone.format.enabled'];
}
}
--that.asyncFetchCounter;
diff --git a/dashboardv2/public/js/utils/Globals.js
b/dashboardv2/public/js/utils/Globals.js
index 0a4a050..56c155c 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -44,7 +44,7 @@ define(["require"], function(require) {
// Date Format
Globals.dateTimeFormat = "MM/DD/ hh:mm:ss A";
Globals.dateFormat = "MM/DD/";
-Globals.isDateTimeZone = true;
+Globals.isTimezoneFormatEnabled = true;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv2/public/js/utils/Utils.js
b/dashboardv2/public/js/utils/Utils.js
index 0fbe56a..bd80629 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -935,7 +935,7 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
if (isValidDate === false && options && options.defaultDate !==
false) {
dateValue = moment().format(dateFormat);
}
-if (Globals.isDateTimeZone) {
+if (Globals.isTimezoneFormatEnabled) {
if (!options || options && options.zone !== false) {
dateValue += " (" +
moment.tz(moment.tz.guess()).zoneAbbr() + ")";
}
diff --git a/dashboardv3/public/js/main.js b/dashboardv3/public/js/main.js
index a91cd97..a5f80dc 100644
--- a/dashboardv3/public/js/main.js
+++ b/dashboardv3/public/js/main.js
@@ -308,8 +308,8 @@ require(['App',
Globals.dateFormat = dateFormatSeperated[0]; //date
}
}
-if (response['atlas.ui.date.timezone'] !== undefined) {
-Globals.isDateTimeZone =
response['atlas.ui.date.timezone'];
+if (response['atlas.ui.date.timezone.format.enabled'] !==
undefined) {
+Globals.isTimezoneFormatEnabled =
response['atlas.ui.date.timezone.format.enabled'];
}
}
--that.asyncFetchCounter;
diff --git a/dashboardv3/public/js/utils/Globals.js
b/dashboardv3/public/js/utils/Globals.js
index 0a4a050..56c155c 100644
--- a/dashboardv3/public/js/utils/Globals.js
+++ b/dashboardv3/public/js/utils/Globals.js
@@ -44,7 +44,7 @@ define(["require"], function(require) {
// Date Format
Globals.dateTimeFormat = "MM/DD/ hh:mm:ss A";
Globals.dateFormat = "MM/DD/";
-Globals.isDateTimeZone = true;
+Globals.isTimezoneFormatEnabled = true;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv3/public/js/utils/Utils.js
b/dashboardv3/public/js/utils/Utils.js
index c8f7a0b..eca406b 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -940,7 +940,7 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
if (isValidDate === false && options && options.defaultDate !==
false) {
dateValue = moment().format(dateFormat);
}
-if (Globals.isDateTimeZone) {
+if (Globals.isTimezoneFormatEnabled) {
[atlas] branch master updated: ATLAS-3986: UI Allow user to update the date format from JAVA property file #1
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 9192697 ATLAS-3986: UI Allow user to update the date format from JAVA
property file #1
9192697 is described below
commit 91926971551767abd9d2d34fff202d9df3c72f9b
Author: kevalbhatt
AuthorDate: Mon Oct 26 11:44:31 2020 +0530
ATLAS-3986: UI Allow user to update the date format from JAVA property file
#1
---
dashboardv2/public/js/main.js | 4 ++--
dashboardv2/public/js/utils/Globals.js | 2 +-
dashboardv2/public/js/utils/Utils.js | 2 +-
dashboardv3/public/js/main.js | 4 ++--
dashboardv3/public/js/utils/Globals.js | 2 +-
dashboardv3/public/js/utils/Utils.js | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 282c407..10d62eb 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -279,8 +279,8 @@ require(['App',
Globals.dateFormat = dateFormatSeperated[0]; //date
}
}
-if (response['atlas.ui.date.timezone'] !== undefined) {
-Globals.isDateTimeZone =
response['atlas.ui.date.timezone'];
+if (response['atlas.ui.date.timezone.format.enabled'] !==
undefined) {
+Globals.isTimezoneFormatEnabled =
response['atlas.ui.date.timezone.format.enabled'];
}
}
--that.asyncFetchCounter;
diff --git a/dashboardv2/public/js/utils/Globals.js
b/dashboardv2/public/js/utils/Globals.js
index 0a4a050..56c155c 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -44,7 +44,7 @@ define(["require"], function(require) {
// Date Format
Globals.dateTimeFormat = "MM/DD/ hh:mm:ss A";
Globals.dateFormat = "MM/DD/";
-Globals.isDateTimeZone = true;
+Globals.isTimezoneFormatEnabled = true;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv2/public/js/utils/Utils.js
b/dashboardv2/public/js/utils/Utils.js
index 0fbe56a..bd80629 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -935,7 +935,7 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
if (isValidDate === false && options && options.defaultDate !==
false) {
dateValue = moment().format(dateFormat);
}
-if (Globals.isDateTimeZone) {
+if (Globals.isTimezoneFormatEnabled) {
if (!options || options && options.zone !== false) {
dateValue += " (" +
moment.tz(moment.tz.guess()).zoneAbbr() + ")";
}
diff --git a/dashboardv3/public/js/main.js b/dashboardv3/public/js/main.js
index a91cd97..a5f80dc 100644
--- a/dashboardv3/public/js/main.js
+++ b/dashboardv3/public/js/main.js
@@ -308,8 +308,8 @@ require(['App',
Globals.dateFormat = dateFormatSeperated[0]; //date
}
}
-if (response['atlas.ui.date.timezone'] !== undefined) {
-Globals.isDateTimeZone =
response['atlas.ui.date.timezone'];
+if (response['atlas.ui.date.timezone.format.enabled'] !==
undefined) {
+Globals.isTimezoneFormatEnabled =
response['atlas.ui.date.timezone.format.enabled'];
}
}
--that.asyncFetchCounter;
diff --git a/dashboardv3/public/js/utils/Globals.js
b/dashboardv3/public/js/utils/Globals.js
index 0a4a050..56c155c 100644
--- a/dashboardv3/public/js/utils/Globals.js
+++ b/dashboardv3/public/js/utils/Globals.js
@@ -44,7 +44,7 @@ define(["require"], function(require) {
// Date Format
Globals.dateTimeFormat = "MM/DD/ hh:mm:ss A";
Globals.dateFormat = "MM/DD/";
-Globals.isDateTimeZone = true;
+Globals.isTimezoneFormatEnabled = true;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv3/public/js/utils/Utils.js
b/dashboardv3/public/js/utils/Utils.js
index c8f7a0b..eca406b 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -940,7 +940,7 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
if (isValidDate === false && options && options.defaultDate !==
false) {
dateValue = moment().format(dateFormat);
}
-if (Globals.isDateTimeZone) {
+if (Globals.isTimezoneFormatEnabled) {
if (!options || options && options.zone !== false) {
dateValue += " (" +
moment.tz(moment.tz.guess()).zoneAbbr() + ")";
}
[atlas] branch branch-2.0 updated: ATLAS-3943: UI: Show Import/Export operations in administration audit.
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 fd5acab ATLAS-3943: UI: Show Import/Export operations in
administration audit.
fd5acab is described below
commit fd5acab03ec3c3cca549e96ffc91f8003e1fcdd6
Author: kevalbhatt
AuthorDate: Wed Oct 14 20:18:03 2020 +0530
ATLAS-3943: UI: Show Import/Export operations in administration audit.
(cherry picked from commit 2f766f5c78d8c0b01e2c6c4a3cc5798ad7e06d3a)
---
dashboardv2/public/css/scss/business-metadata.scss | 4 +
dashboardv2/public/css/scss/override.scss | 4 +
dashboardv2/public/js/utils/Enums.js | 16 +-
dashboardv2/public/js/utils/Overrides.js | 10 +-
.../js/views/audit/AdminAuditTableLayoutView.js| 199 -
.../public/js/views/audit/AuditTableLayoutView.js | 1 -
dashboardv3/public/css/scss/business-metadata.scss | 4 +
dashboardv3/public/css/scss/override.scss | 4 +
dashboardv3/public/js/utils/Enums.js | 16 +-
dashboardv3/public/js/utils/Overrides.js | 10 +-
.../js/views/audit/AdminAuditTableLayoutView.js| 199 -
.../public/js/views/audit/AuditTableLayoutView.js | 1 -
12 files changed, 374 insertions(+), 94 deletions(-)
diff --git a/dashboardv2/public/css/scss/business-metadata.scss
b/dashboardv2/public/css/scss/business-metadata.scss
index fc11f18..5bcbb5d 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -137,6 +137,10 @@
overflow: auto;
}
+.admin-details .attributeResultContainer {
+float: left;
+}
+
.tab-pane {
.business-metadata-attr-page {
position: absolute;
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index a2f83ca..d9bb429 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -481,6 +481,10 @@ div.columnmanager-dropdown-container {
font-size: large;
font-weight: bold;
}
+
+.noToggle {
+color: $gray;
+}
}
.backgrid-internal-table {
diff --git a/dashboardv2/public/js/utils/Enums.js
b/dashboardv2/public/js/utils/Enums.js
index 5db6396..ebfceba 100644
--- a/dashboardv2/public/js/utils/Enums.js
+++ b/dashboardv2/public/js/utils/Enums.js
@@ -44,7 +44,15 @@ define(["require", "backbone"], function(require) {
BUSINESS_ATTRIBUTE_DELETE: "Business Attribute(s) Deleted",
TYPE_DEF_UPDATE: "Type Updated",
TYPE_DEF_CREATE: "Type Created",
-TYPE_DEF_DELETE: "Type Deleted"
+TYPE_DEF_DELETE: "Type Deleted",
+IMPORT: "Import",
+EXPORT: "Export"
+}
+Enums.serverAudits = {
+SERVER_START: "Server Start",
+SERVER_STOP: "Server End",
+SERVER_STATE_ACTIVE: "Server State Active",
+SERVER_STATE_PASSIVE: "Server Statae Passive"
}
Enums.category = {
@@ -58,7 +66,9 @@ define(["require", "backbone"], function(require) {
MAP: "Map",
RELATIONSHIP: "Relationship",
BUSINESS_METADATA: "Business Metadata",
-PURGE: "Purge Entities"
+PURGE: "Purge Entities",
+IMPORT: "Import Entities",
+EXPORT: "Export Entities"
}
Enums.entityStateReadOnly = {
@@ -261,7 +271,7 @@ define(["require", "backbone"], function(require) {
"This Month": "THIS_MONTH",
"Last Month": "LAST_MONTH",
"This Quarter": "THIS_QUARTER",
-"Last Quarter":"LAST_QUARTER",
+"Last Quarter": "LAST_QUARTER",
"This Year": "THIS_YEAR",
"Last Year": "LAST_YEAR",
"Last 3 Months": "LAST_3_MONTHS",
diff --git a/dashboardv2/public/js/utils/Overrides.js
b/dashboardv2/public/js/utils/Overrides.js
index 9cff134..3318a72 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -211,8 +211,12 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
render: function() {
/* follow along with the original render really... */
this.$el.empty();
-
+var isExpand = true;
+if (this.column.get('isExpandVisible')) {
+isExpand = this.column.get('isExpandVisible')(this.$el,
this.model);
+}
this.$toggleEl =
$(this.toggle
[atlas] branch master updated: ATLAS-3943: UI: Show Import/Export operations in administration audit.
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 2f766f5 ATLAS-3943: UI: Show Import/Export operations in
administration audit.
2f766f5 is described below
commit 2f766f5c78d8c0b01e2c6c4a3cc5798ad7e06d3a
Author: kevalbhatt
AuthorDate: Wed Oct 14 20:18:03 2020 +0530
ATLAS-3943: UI: Show Import/Export operations in administration audit.
---
dashboardv2/public/css/scss/business-metadata.scss | 4 +
dashboardv2/public/css/scss/override.scss | 4 +
dashboardv2/public/js/utils/Enums.js | 16 +-
dashboardv2/public/js/utils/Overrides.js | 10 +-
.../js/views/audit/AdminAuditTableLayoutView.js| 199 -
.../public/js/views/audit/AuditTableLayoutView.js | 1 -
dashboardv3/public/css/scss/business-metadata.scss | 4 +
dashboardv3/public/css/scss/override.scss | 4 +
dashboardv3/public/js/utils/Enums.js | 16 +-
dashboardv3/public/js/utils/Overrides.js | 10 +-
.../js/views/audit/AdminAuditTableLayoutView.js| 199 -
.../public/js/views/audit/AuditTableLayoutView.js | 1 -
12 files changed, 374 insertions(+), 94 deletions(-)
diff --git a/dashboardv2/public/css/scss/business-metadata.scss
b/dashboardv2/public/css/scss/business-metadata.scss
index fc11f18..5bcbb5d 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -137,6 +137,10 @@
overflow: auto;
}
+.admin-details .attributeResultContainer {
+float: left;
+}
+
.tab-pane {
.business-metadata-attr-page {
position: absolute;
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index a2f83ca..d9bb429 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -481,6 +481,10 @@ div.columnmanager-dropdown-container {
font-size: large;
font-weight: bold;
}
+
+.noToggle {
+color: $gray;
+}
}
.backgrid-internal-table {
diff --git a/dashboardv2/public/js/utils/Enums.js
b/dashboardv2/public/js/utils/Enums.js
index 5db6396..ebfceba 100644
--- a/dashboardv2/public/js/utils/Enums.js
+++ b/dashboardv2/public/js/utils/Enums.js
@@ -44,7 +44,15 @@ define(["require", "backbone"], function(require) {
BUSINESS_ATTRIBUTE_DELETE: "Business Attribute(s) Deleted",
TYPE_DEF_UPDATE: "Type Updated",
TYPE_DEF_CREATE: "Type Created",
-TYPE_DEF_DELETE: "Type Deleted"
+TYPE_DEF_DELETE: "Type Deleted",
+IMPORT: "Import",
+EXPORT: "Export"
+}
+Enums.serverAudits = {
+SERVER_START: "Server Start",
+SERVER_STOP: "Server End",
+SERVER_STATE_ACTIVE: "Server State Active",
+SERVER_STATE_PASSIVE: "Server Statae Passive"
}
Enums.category = {
@@ -58,7 +66,9 @@ define(["require", "backbone"], function(require) {
MAP: "Map",
RELATIONSHIP: "Relationship",
BUSINESS_METADATA: "Business Metadata",
-PURGE: "Purge Entities"
+PURGE: "Purge Entities",
+IMPORT: "Import Entities",
+EXPORT: "Export Entities"
}
Enums.entityStateReadOnly = {
@@ -261,7 +271,7 @@ define(["require", "backbone"], function(require) {
"This Month": "THIS_MONTH",
"Last Month": "LAST_MONTH",
"This Quarter": "THIS_QUARTER",
-"Last Quarter":"LAST_QUARTER",
+"Last Quarter": "LAST_QUARTER",
"This Year": "THIS_YEAR",
"Last Year": "LAST_YEAR",
"Last 3 Months": "LAST_3_MONTHS",
diff --git a/dashboardv2/public/js/utils/Overrides.js
b/dashboardv2/public/js/utils/Overrides.js
index 9cff134..3318a72 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -211,8 +211,12 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
render: function() {
/* follow along with the original render really... */
this.$el.empty();
-
+var isExpand = true;
+if (this.column.get('isExpandVisible')) {
+isExpand = this.column.get('isExpandVisible')(this.$el,
this.model);
+}
this.$toggleEl =
$(this.toggle).addClass(this.toggleClass).addClass(this.toggleCollapsedClass);
+this.$
[atlas] branch branch-2.0 updated: ATLAS-3992: UI: Upgrade to JQuery 3.5.1
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 5097a76 ATLAS-3992: UI: Upgrade to JQuery 3.5.1
5097a76 is described below
commit 5097a76e0195e58ed311c1ce9ebbc68ba6d82ca2
Author: kevalbhatt
AuthorDate: Tue Oct 13 20:01:41 2020 +0530
ATLAS-3992: UI: Upgrade to JQuery 3.5.1
---
dashboardv2/package-lock.json | 6 +++---
dashboardv2/package.json | 2 +-
dashboardv3/package-lock.json | 6 +++---
dashboardv3/package.json | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index b14e4fe..6b8e15a 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -1938,9 +1938,9 @@
}
},
"jquery": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz;,
- "integrity":
"sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz;,
+ "integrity":
"sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"jquery-asBreadcrumbs": {
"version": "0.2.2",
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index 57c58c0..a6b26b5 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -36,7 +36,7 @@
"dropzone": "5.7.0",
"font-awesome": "4.7.0",
"jQuery-QueryBuilder": "2.4.3",
-"jquery": "3.3.1",
+"jquery": "3.5.1",
"jquery-asBreadcrumbs": "0.2.2",
"jquery-placeholder": "2.3.1",
"jquery-sparkline": "2.4.0",
diff --git a/dashboardv3/package-lock.json b/dashboardv3/package-lock.json
index c5f4059..732f20d 100644
--- a/dashboardv3/package-lock.json
+++ b/dashboardv3/package-lock.json
@@ -1938,9 +1938,9 @@
}
},
"jquery": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz;,
- "integrity":
"sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz;,
+ "integrity":
"sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"jquery-asBreadcrumbs": {
"version": "0.2.2",
diff --git a/dashboardv3/package.json b/dashboardv3/package.json
index 33754ad..803280a 100644
--- a/dashboardv3/package.json
+++ b/dashboardv3/package.json
@@ -36,7 +36,7 @@
"dropzone": "5.7.0",
"font-awesome": "4.7.0",
"jQuery-QueryBuilder": "2.4.3",
-"jquery": "3.3.1",
+"jquery": "3.5.1",
"jquery-asBreadcrumbs": "0.2.2",
"jquery-placeholder": "2.3.1",
"jquery-sparkline": "2.4.0",
[atlas] branch branch-2.0 updated: ATLAS-3986: UI Allow user to update the date format from JAVA property file
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 3768c9d ATLAS-3986: UI Allow user to update the date format from JAVA
property file
3768c9d is described below
commit 3768c9dcd33eb045c834a8e6cebe4703ab0d933d
Author: kevalbhatt
AuthorDate: Wed Oct 14 20:00:28 2020 +0530
ATLAS-3986: UI Allow user to update the date format from JAVA property file
(cherry picked from commit 39892854ffb696df70ecbc0f3e965c5a8261f621)
---
dashboardv2/public/js/main.js | 10
dashboardv2/public/js/utils/Globals.js | 8 +++---
dashboardv2/public/js/utils/Utils.js | 30 ++
.../js/views/audit/CreateAuditTableLayoutView.js | 7 +
.../public/js/views/search/QueryBuilderView.js | 4 +--
dashboardv2/public/js/views/site/Statistics.js | 2 +-
dashboardv3/public/js/main.js | 10
dashboardv3/public/js/utils/Globals.js | 9 ---
dashboardv3/public/js/utils/Utils.js | 30 ++
.../js/views/audit/CreateAuditTableLayoutView.js | 7 +
.../public/js/views/search/QueryBuilderView.js | 4 +--
dashboardv3/public/js/views/site/Statistics.js | 2 +-
12 files changed, 79 insertions(+), 44 deletions(-)
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 7cee837..282c407 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -272,6 +272,16 @@ require(['App',
if (response['atlas.ui.default.version'] !== undefined) {
Globals.DEFAULT_UI = response['atlas.ui.default.version'];
}
+if (response['atlas.ui.date.format'] !== undefined) {
+Globals.dateTimeFormat = response['atlas.ui.date.format'];
+var dateFormatSeperated = Globals.dateTimeFormat.split('
');
+if (dateFormatSeperated[0]) {
+Globals.dateFormat = dateFormatSeperated[0]; //date
+}
+}
+if (response['atlas.ui.date.timezone'] !== undefined) {
+Globals.isDateTimeZone =
response['atlas.ui.date.timezone'];
+}
}
--that.asyncFetchCounter;
startApp();
diff --git a/dashboardv2/public/js/utils/Globals.js
b/dashboardv2/public/js/utils/Globals.js
index c92c8e1..0a4a050 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -40,9 +40,11 @@ define(["require"], function(require) {
Globals.serviceTypeMap = {};
Globals.entityImgPath = "/img/entity-icon/";
Globals.DEFAULT_UI = "v2";
-Globals.dateFormat = "/MM/DD";
-Globals.dateTimeFormat = "/MM/DD HH:mm:ss";
-Globals.meridiemFormat = "MM/DD/ h:mm A z";
+
+// Date Format
+Globals.dateTimeFormat = "MM/DD/ hh:mm:ss A";
+Globals.dateFormat = "MM/DD/";
+Globals.isDateTimeZone = true;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv2/public/js/utils/Utils.js
b/dashboardv2/public/js/utils/Utils.js
index 2aab9c1..0fbe56a 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -917,19 +917,17 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
var dateValue = null,
dateFormat = Globals.dateTimeFormat,
isValidDate = false;
-if (options) {
-if (options.dateFormat) {
-dateFormat = options.dateFormat;
-}
-if (options.date) {
-if (options.date === "-") {
+if (options && options.date) {
+dateValue = options.date;
+if (dateValue !== "-") {
+dateValue = parseInt(dateValue);
+if (_.isNaN(dateValue)) {
dateValue = options.date;
-} else {
-dateValue = moment(options.date)
-if (dateValue._isValid) {
-isValidDate = true;
-dateValue = dateValue.format(dateFormat);
-}
+}
+dateValue = moment(dateValue);
+if (dateValue._isValid) {
+isValidDate = true;
+dateValue = dateValue.format(dateFormat);
}
}
}
@@ -937,12 +935,12 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
if (isValidDate === false && options && options.defaultDate !
[atlas] branch master updated: ATLAS-3986: UI Allow user to update the date format from JAVA property file
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 3989285 ATLAS-3986: UI Allow user to update the date format from JAVA
property file
3989285 is described below
commit 39892854ffb696df70ecbc0f3e965c5a8261f621
Author: kevalbhatt
AuthorDate: Wed Oct 14 20:00:28 2020 +0530
ATLAS-3986: UI Allow user to update the date format from JAVA property file
---
dashboardv2/public/js/main.js | 10
dashboardv2/public/js/utils/Globals.js | 8 +++---
dashboardv2/public/js/utils/Utils.js | 30 ++
.../js/views/audit/CreateAuditTableLayoutView.js | 7 +
.../public/js/views/search/QueryBuilderView.js | 4 +--
dashboardv2/public/js/views/site/Statistics.js | 2 +-
dashboardv3/public/js/main.js | 10
dashboardv3/public/js/utils/Globals.js | 9 ---
dashboardv3/public/js/utils/Utils.js | 30 ++
.../js/views/audit/CreateAuditTableLayoutView.js | 7 +
.../public/js/views/search/QueryBuilderView.js | 4 +--
dashboardv3/public/js/views/site/Statistics.js | 2 +-
12 files changed, 79 insertions(+), 44 deletions(-)
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 7cee837..282c407 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -272,6 +272,16 @@ require(['App',
if (response['atlas.ui.default.version'] !== undefined) {
Globals.DEFAULT_UI = response['atlas.ui.default.version'];
}
+if (response['atlas.ui.date.format'] !== undefined) {
+Globals.dateTimeFormat = response['atlas.ui.date.format'];
+var dateFormatSeperated = Globals.dateTimeFormat.split('
');
+if (dateFormatSeperated[0]) {
+Globals.dateFormat = dateFormatSeperated[0]; //date
+}
+}
+if (response['atlas.ui.date.timezone'] !== undefined) {
+Globals.isDateTimeZone =
response['atlas.ui.date.timezone'];
+}
}
--that.asyncFetchCounter;
startApp();
diff --git a/dashboardv2/public/js/utils/Globals.js
b/dashboardv2/public/js/utils/Globals.js
index c92c8e1..0a4a050 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -40,9 +40,11 @@ define(["require"], function(require) {
Globals.serviceTypeMap = {};
Globals.entityImgPath = "/img/entity-icon/";
Globals.DEFAULT_UI = "v2";
-Globals.dateFormat = "/MM/DD";
-Globals.dateTimeFormat = "/MM/DD HH:mm:ss";
-Globals.meridiemFormat = "MM/DD/ h:mm A z";
+
+// Date Format
+Globals.dateTimeFormat = "MM/DD/ hh:mm:ss A";
+Globals.dateFormat = "MM/DD/";
+Globals.isDateTimeZone = true;
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv2/public/js/utils/Utils.js
b/dashboardv2/public/js/utils/Utils.js
index 2aab9c1..0fbe56a 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -917,19 +917,17 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
var dateValue = null,
dateFormat = Globals.dateTimeFormat,
isValidDate = false;
-if (options) {
-if (options.dateFormat) {
-dateFormat = options.dateFormat;
-}
-if (options.date) {
-if (options.date === "-") {
+if (options && options.date) {
+dateValue = options.date;
+if (dateValue !== "-") {
+dateValue = parseInt(dateValue);
+if (_.isNaN(dateValue)) {
dateValue = options.date;
-} else {
-dateValue = moment(options.date)
-if (dateValue._isValid) {
-isValidDate = true;
-dateValue = dateValue.format(dateFormat);
-}
+}
+dateValue = moment(dateValue);
+if (dateValue._isValid) {
+isValidDate = true;
+dateValue = dateValue.format(dateFormat);
}
}
}
@@ -937,12 +935,12 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
if (isValidDate === false && options && options.defaultDate !==
false) {
dateValue = moment().format(dateFormat);
}
-
-
[atlas] branch branch-2.0 updated: ATLAS-3990: UI: When user clicks to view hive-table details, shown some wrong tabs
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 d5db1a6 ATLAS-3990: UI: When user clicks to view hive-table details,
shown some wrong tabs
d5db1a6 is described below
commit d5db1a67cd5bb8adc357c465dedcd043429fc771
Author: kevalbhatt
AuthorDate: Wed Oct 14 17:44:46 2020 +0530
ATLAS-3990: UI: When user clicks to view hive-table details, shown some
wrong tabs
---
.../js/views/detail_page/DetailPageLayoutView.js | 59 +++---
.../js/views/detail_page/DetailPageLayoutView.js | 59 +++---
2 files changed, 84 insertions(+), 34 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index b87d138..a6fcd8c 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -326,6 +326,9 @@ define(['require',
typeName: collectionJSON.typeName,
value: that.value
}));
+} else {
+this.$('.profileTab').hide();
+this.redirectToDefaultTab("profile");
}
if (this.activeEntityDef) {
@@ -333,6 +336,9 @@ define(['require',
if (collectionJSON && collectionJSON.typeName ===
"AtlasServer") {
this.$('.replicationTab').show();
this.renderReplicationAuditTableLayoutView(obj);
+} else {
+this.$('.replicationTab').hide();
+this.redirectToDefaultTab("raudits");
}
// To render Schema check attribute
"schemaElementsAttribute"
var schemaOptions =
this.activeEntityDef.get('options');
@@ -342,14 +348,9 @@ define(['require',
this.renderSchemaLayoutView(_.extend({}, obj, {
attribute:
collectionJSON.relationshipAttributes[schemaElementsAttribute] ||
collectionJSON.attributes[schemaElementsAttribute]
}));
-} else if (this.value && this.value.tabActive ==
"schema") {
-Utils.setUrl({
-url:
Utils.getUrlState.getQueryUrl().queyParams[0],
-urlParams: { tabActive: 'properties' },
-mergeBrowserUrl: false,
-trigger: true,
-updateTabState: true
-});
+} else {
+this.$('.schemaTable').hide();
+this.redirectToDefaultTab("schema");
}
if (isLineageRender) {
@@ -358,18 +359,12 @@ define(['require',
processCheck: isProcess,
fetchCollection:
this.fetchCollection.bind(this),
}));
-} else if (this.value && this.value.tabActive ==
"lineage") {
-Utils.setUrl({
-url:
Utils.getUrlState.getQueryUrl().queyParams[0],
-urlParams: { tabActive: 'properties' },
-mergeBrowserUrl: false,
-trigger: true,
-updateTabState: true
-});
+} else {
+this.$('.lineageGraph').hide();
+this.redirectToDefaultTab("lineage");
}
}
-
}, this);
this.listenTo(this.collection, 'error', function(model,
response) {
this.$('.fontLoader-relative').removeClass('show');
@@ -386,6 +381,36 @@ define(['require',
Utils.showTitleLoader(this.$('.page-title .fontLoader'),
this.$('.entityDetail'));
this.$('.fontLoader-relative').addClass('show'); // to show
tab loader
},
+redirectToDefaultTab: function(tabName) {
+var regionRef = null;
+switch (tabName) {
+case "schema":
+regionRef = this.RSchemaTableLayoutView;
+break;
+case "lineage":
+regionRef = this
[atlas] branch master updated: ATLAS-3990: UI: When user clicks to view hive-table details, shown some wrong tabs
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 94d43c6 ATLAS-3990: UI: When user clicks to view hive-table details,
shown some wrong tabs
94d43c6 is described below
commit 94d43c63c6021450845ff17c5bd952dbf5f8958a
Author: kevalbhatt
AuthorDate: Wed Oct 14 17:44:46 2020 +0530
ATLAS-3990: UI: When user clicks to view hive-table details, shown some
wrong tabs
---
.../js/views/detail_page/DetailPageLayoutView.js | 59 +++---
.../js/views/detail_page/DetailPageLayoutView.js | 59 +++---
2 files changed, 84 insertions(+), 34 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index b87d138..a6fcd8c 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -326,6 +326,9 @@ define(['require',
typeName: collectionJSON.typeName,
value: that.value
}));
+} else {
+this.$('.profileTab').hide();
+this.redirectToDefaultTab("profile");
}
if (this.activeEntityDef) {
@@ -333,6 +336,9 @@ define(['require',
if (collectionJSON && collectionJSON.typeName ===
"AtlasServer") {
this.$('.replicationTab').show();
this.renderReplicationAuditTableLayoutView(obj);
+} else {
+this.$('.replicationTab').hide();
+this.redirectToDefaultTab("raudits");
}
// To render Schema check attribute
"schemaElementsAttribute"
var schemaOptions =
this.activeEntityDef.get('options');
@@ -342,14 +348,9 @@ define(['require',
this.renderSchemaLayoutView(_.extend({}, obj, {
attribute:
collectionJSON.relationshipAttributes[schemaElementsAttribute] ||
collectionJSON.attributes[schemaElementsAttribute]
}));
-} else if (this.value && this.value.tabActive ==
"schema") {
-Utils.setUrl({
-url:
Utils.getUrlState.getQueryUrl().queyParams[0],
-urlParams: { tabActive: 'properties' },
-mergeBrowserUrl: false,
-trigger: true,
-updateTabState: true
-});
+} else {
+this.$('.schemaTable').hide();
+this.redirectToDefaultTab("schema");
}
if (isLineageRender) {
@@ -358,18 +359,12 @@ define(['require',
processCheck: isProcess,
fetchCollection:
this.fetchCollection.bind(this),
}));
-} else if (this.value && this.value.tabActive ==
"lineage") {
-Utils.setUrl({
-url:
Utils.getUrlState.getQueryUrl().queyParams[0],
-urlParams: { tabActive: 'properties' },
-mergeBrowserUrl: false,
-trigger: true,
-updateTabState: true
-});
+} else {
+this.$('.lineageGraph').hide();
+this.redirectToDefaultTab("lineage");
}
}
-
}, this);
this.listenTo(this.collection, 'error', function(model,
response) {
this.$('.fontLoader-relative').removeClass('show');
@@ -386,6 +381,36 @@ define(['require',
Utils.showTitleLoader(this.$('.page-title .fontLoader'),
this.$('.entityDetail'));
this.$('.fontLoader-relative').addClass('show'); // to show
tab loader
},
+redirectToDefaultTab: function(tabName) {
+var regionRef = null;
+switch (tabName) {
+case "schema":
+regionRef = this.RSchemaTableLayoutView;
+break;
+case "lineage":
+regionRef = this
[atlas] 01/02: ATLAS-3954: UI: Type system property table improvement
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit a9da759e5f342592179cc4cde574420d84d8529e
Author: kevalbhatt
AuthorDate: Mon Oct 12 15:49:09 2020 +0530
ATLAS-3954: UI: Type system property table improvement
(cherry picked from commit 3c0b2746d0065b1d95b4511c46a8655d4167096e)
---
dashboardv2/public/css/scss/common.scss| 10 +
dashboardv2/public/css/scss/graph.scss | 36 +++-
dashboardv2/public/css/scss/table.scss | 28 +++
.../js/external_lib/atlas-lineage/dist/index.js| 2 +-
.../atlas-lineage/src/Utils/LineageUtils.js| 8 +-
.../js/external_lib/atlas-lineage/src/index.js | 78 +--
.../AdministratorLayoutView_tmpl.html | 2 +-
.../detail_page/DetailPageLayoutView_tmpl.html | 2 +-
.../js/templates/graph/LineageLayoutView_tmpl.html | 24 +--
.../templates/graph/TypeSystemTreeView_tmpl.html | 67 +-
dashboardv2/public/js/utils/CommonViewFunction.js | 29 ++-
.../public/js/views/graph/LineageLayoutView.js | 35 +--
.../public/js/views/graph/TypeSystemTreeView.js| 234 -
dashboardv3/public/css/scss/common.scss| 10 +
dashboardv3/public/css/scss/graph.scss | 36 +++-
dashboardv3/public/css/scss/table.scss | 29 +++
.../js/external_lib/atlas-lineage/dist/index.js| 2 +-
.../atlas-lineage/src/Utils/LineageUtils.js| 8 +-
.../js/external_lib/atlas-lineage/src/index.js | 78 +--
.../AdministratorLayoutView_tmpl.html | 2 +-
.../detail_page/DetailPageLayoutView_tmpl.html | 2 +-
.../js/templates/graph/LineageLayoutView_tmpl.html | 24 +--
.../templates/graph/TypeSystemTreeView_tmpl.html | 67 +-
dashboardv3/public/js/utils/CommonViewFunction.js | 29 ++-
.../public/js/views/graph/LineageLayoutView.js | 35 +--
.../public/js/views/graph/TypeSystemTreeView.js| 234 -
26 files changed, 789 insertions(+), 322 deletions(-)
diff --git a/dashboardv2/public/css/scss/common.scss
b/dashboardv2/public/css/scss/common.scss
index b51a6f2..e93eef1 100644
--- a/dashboardv2/public/css/scss/common.scss
+++ b/dashboardv2/public/css/scss/common.scss
@@ -180,6 +180,11 @@ pre {
.json-string {
color: olive;
+
+&.cursor {
+cursor: pointer;
+text-decoration: underline;
+}
}
}
@@ -191,6 +196,11 @@ pre {
.panel-body .memory-details {
pre {
&.code-block {
+&.fixed-height {
+max-height: 112px;
+overflow: auto;
+}
+
&.shrink {
height: 144px;
diff --git a/dashboardv2/public/css/scss/graph.scss
b/dashboardv2/public/css/scss/graph.scss
index 971cf60..cd5e220 100644
--- a/dashboardv2/public/css/scss/graph.scss
+++ b/dashboardv2/public/css/scss/graph.scss
@@ -193,7 +193,7 @@ span#zoom_in {
width: 100%;
right: 0;
padding: 0 !important;
-z-index: ;
+z-index: 99;
overflow: hidden !important;
background: white;
@@ -266,4 +266,38 @@ span#zoom_in {
box-shadow: 0px 0px 3px 1px #80808080;
}
+}
+
+
+.box-panel.fix-box {
+position: fixed;
+top: 0;
+right: 0;
+bottom: 0;
+height: 100vh;
+max-height: 100vh;
+z-index: 999;
+bottom: 0;
+width: 400px;
+overflow: auto;
+border-radius: 0px;
+margin: 0 !important;
+
+&.slide-from-left.size-lg {
+left: -413px;
+
+&.show-box-panel {
+left: 0;
+margin: 0 !important;
+}
+}
+
+.body {
+tbody {
+overflow: auto;
+height: calc(100vh - 48px);
+position: absolute;
+padding-bottom: 15px;
+}
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/table.scss
b/dashboardv2/public/css/scss/table.scss
index 519d083..3db8a4c 100644
--- a/dashboardv2/public/css/scss/table.scss
+++ b/dashboardv2/public/css/scss/table.scss
@@ -41,6 +41,7 @@ tr.empty {
}
.entity-detail-table,
+.type-node-details,
.relationship-detail-table {
position: relative;
@@ -66,6 +67,26 @@ tr.empty {
}
}
+.type-node-details {
+.header {
+.pretty.p-switch .state:before {
+border: 1px solid white;
+}
+
+.pretty.p-switch .state label:after {
+background-color: white !important;
+}
+
+.pretty.p-switch.p-fill input:checked~.state label:after {
+background-color: #4a90e2 !important;
+}
+
+.pretty.p-switch.p-fill input:checked~.state.p-primary:before {
+background-color: white !important;
+}
+}
+}
+
.backgrid {
td {
white-space: normal;
@@ -
[atlas] branch branch-2.0 updated (757282f -> cd9bd02)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 757282f ATLAS-3989: Updated Export-Import Audits Writer to use metadata.namespace. new a9da759 ATLAS-3954: UI: Type system property table improvement new cd9bd02 ATLAS-3991: UI: Handlebar helper number format issue The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dashboardv2/public/css/scss/common.scss| 10 + dashboardv2/public/css/scss/graph.scss | 36 +++- dashboardv2/public/css/scss/table.scss | 28 +++ .../js/external_lib/atlas-lineage/dist/index.js| 2 +- .../atlas-lineage/src/Utils/LineageUtils.js| 8 +- .../js/external_lib/atlas-lineage/src/index.js | 78 +-- dashboardv2/public/js/modules/Helpers.js | 24 ++- .../AdministratorLayoutView_tmpl.html | 2 +- .../detail_page/DetailPageLayoutView_tmpl.html | 2 +- .../js/templates/graph/LineageLayoutView_tmpl.html | 24 +-- .../templates/graph/TypeSystemTreeView_tmpl.html | 67 +- dashboardv2/public/js/utils/CommonViewFunction.js | 31 ++- dashboardv2/public/js/utils/Helper.js | 4 +- .../public/js/views/graph/LineageLayoutView.js | 35 +-- .../public/js/views/graph/TypeSystemTreeView.js| 234 - .../public/js/views/search/SearchLayoutView.js | 4 +- dashboardv2/public/js/views/site/Statistics.js | 18 +- dashboardv3/public/css/scss/common.scss| 10 + dashboardv3/public/css/scss/graph.scss | 36 +++- dashboardv3/public/css/scss/table.scss | 29 +++ .../js/external_lib/atlas-lineage/dist/index.js| 2 +- .../atlas-lineage/src/Utils/LineageUtils.js| 8 +- .../js/external_lib/atlas-lineage/src/index.js | 78 +-- dashboardv3/public/js/modules/Helpers.js | 24 ++- .../AdministratorLayoutView_tmpl.html | 2 +- .../detail_page/DetailPageLayoutView_tmpl.html | 2 +- .../js/templates/graph/LineageLayoutView_tmpl.html | 24 +-- .../templates/graph/TypeSystemTreeView_tmpl.html | 67 +- dashboardv3/public/js/utils/CommonViewFunction.js | 31 ++- dashboardv3/public/js/utils/Helper.js | 4 +- .../public/js/views/graph/LineageLayoutView.js | 35 +-- .../public/js/views/graph/TypeSystemTreeView.js| 234 - .../public/js/views/search/SearchLayoutView.js | 4 +- .../search/tree/ClassificationTreeLayoutView.js| 4 +- .../js/views/search/tree/EntityTreeLayoutView.js | 4 +- dashboardv3/public/js/views/site/Favorite.js | 14 +- dashboardv3/public/js/views/site/Statistics.js | 18 +- 37 files changed, 858 insertions(+), 379 deletions(-)
[atlas] 02/02: ATLAS-3991: UI: Handlebar helper number format issue
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit cd9bd02befc6cb3c3cb8ddc1f807aa6a2e0a5250
Author: kevalbhatt
AuthorDate: Tue Oct 13 18:44:07 2020 +0530
ATLAS-3991: UI: Handlebar helper number format issue
(cherry picked from commit 74c9394148d175950615f82455dc1e302000c01b)
---
dashboardv2/public/js/modules/Helpers.js | 24 ++
dashboardv2/public/js/utils/CommonViewFunction.js | 2 +-
dashboardv2/public/js/utils/Helper.js | 4 ++--
.../public/js/views/search/SearchLayoutView.js | 4 ++--
dashboardv2/public/js/views/site/Statistics.js | 18
dashboardv3/public/js/modules/Helpers.js | 24 ++
dashboardv3/public/js/utils/CommonViewFunction.js | 2 +-
dashboardv3/public/js/utils/Helper.js | 4 ++--
.../public/js/views/search/SearchLayoutView.js | 4 ++--
.../search/tree/ClassificationTreeLayoutView.js| 4 ++--
.../js/views/search/tree/EntityTreeLayoutView.js | 4 ++--
dashboardv3/public/js/views/site/Favorite.js | 14 ++---
dashboardv3/public/js/views/site/Statistics.js | 18
13 files changed, 69 insertions(+), 57 deletions(-)
diff --git a/dashboardv2/public/js/modules/Helpers.js
b/dashboardv2/public/js/modules/Helpers.js
index 7ef5f25..cd1ccee 100644
--- a/dashboardv2/public/js/modules/Helpers.js
+++ b/dashboardv2/public/js/modules/Helpers.js
@@ -102,29 +102,35 @@ define(['require',
//return options.inverse(this);
});
-Handlebars.registerHelper('arithmetic', function(val1, operator, val2,
options) {
-var v1 = parseInt(val1) || 0,
-v2 = parseInt(val2) || 0;
+Handlebars.registerHelper('arithmetic', function(val1, operator, val2,
commaFormat, options) {
+var v1 = (val1 && parseInt(val1.toString().replace(/\,/g, ''))) || 0,
+v2 = (val2 && parseInt(val2.toString().replace(/\,/g, ''))) || 0,
+val = null;
switch (operator) {
case '+':
-return (v1 + v2);
+val = v1 + v2;
break;
case '-':
-return (v1 - v2);
+val = v1 - v2;
break;
case '/':
-return (v1 / v2);
+val = v1 / v2;
break;
case '*':
-return (v1 * v2);
+val = v1 * v2;
break;
case '%':
-return (v1 % v2);
+val = v1 % v2;
break;
default:
-return 0;
+val = 0;
break;
}
+if (commaFormat === false) {
+return val;
+}
+return _.numberFormatWithComma(val);;
+
});
Handlebars.registerHelper('lookup', function(obj, field, defaulValue) {
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 4fcb0fc..f766204 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -87,7 +87,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
showListCount = options.showListCount || true,
highlightString = options.highlightString,
formatStringVal = options.formatStringVal,
-numberFormat = options.numberFormat || _.numberFormatWithComa;
+numberFormat = options.numberFormat || _.numberFormatWithComma;
var table = "",
getHighlightedString = function(resultStr) {
diff --git a/dashboardv2/public/js/utils/Helper.js
b/dashboardv2/public/js/utils/Helper.js
index ead6e2f..8b9f4c5 100644
--- a/dashboardv2/public/js/utils/Helper.js
+++ b/dashboardv2/public/js/utils/Helper.js
@@ -23,7 +23,7 @@ define(['require',
], function(require, Utils, d3) {
'use strict';
_.mixin({
-numberFormatWithComa: function(number) {
+numberFormatWithComma: function(number) {
return d3.format(',')(number);
},
numberFormatWithBytes: function(number) {
@@ -33,7 +33,7 @@ define(['require',
}
var i = number == 0 ? 0 : Math.floor(Math.log(number) /
Math.log(1024));
if (i > 8) {
-return _.numberFormatWithComa(number);
+return _.numberFormatWithComma(number);
}
return Number((number / Math.pow(1024, i)).toFixed(2)) + " " +
["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"][i];
} else {
diff --git a/dashboardv2/public/js/views/search/SearchLayout
[atlas] 02/02: ATLAS-3991: UI: Handlebar helper number format issue
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
commit 74c9394148d175950615f82455dc1e302000c01b
Author: kevalbhatt
AuthorDate: Tue Oct 13 18:44:07 2020 +0530
ATLAS-3991: UI: Handlebar helper number format issue
---
dashboardv2/public/js/modules/Helpers.js | 24 ++
dashboardv2/public/js/utils/CommonViewFunction.js | 2 +-
dashboardv2/public/js/utils/Helper.js | 4 ++--
.../public/js/views/search/SearchLayoutView.js | 4 ++--
dashboardv2/public/js/views/site/Statistics.js | 18
dashboardv3/public/js/modules/Helpers.js | 24 ++
dashboardv3/public/js/utils/CommonViewFunction.js | 2 +-
dashboardv3/public/js/utils/Helper.js | 4 ++--
.../public/js/views/search/SearchLayoutView.js | 4 ++--
.../search/tree/ClassificationTreeLayoutView.js| 4 ++--
.../js/views/search/tree/EntityTreeLayoutView.js | 4 ++--
dashboardv3/public/js/views/site/Favorite.js | 14 ++---
dashboardv3/public/js/views/site/Statistics.js | 18
13 files changed, 69 insertions(+), 57 deletions(-)
diff --git a/dashboardv2/public/js/modules/Helpers.js
b/dashboardv2/public/js/modules/Helpers.js
index 7ef5f25..cd1ccee 100644
--- a/dashboardv2/public/js/modules/Helpers.js
+++ b/dashboardv2/public/js/modules/Helpers.js
@@ -102,29 +102,35 @@ define(['require',
//return options.inverse(this);
});
-Handlebars.registerHelper('arithmetic', function(val1, operator, val2,
options) {
-var v1 = parseInt(val1) || 0,
-v2 = parseInt(val2) || 0;
+Handlebars.registerHelper('arithmetic', function(val1, operator, val2,
commaFormat, options) {
+var v1 = (val1 && parseInt(val1.toString().replace(/\,/g, ''))) || 0,
+v2 = (val2 && parseInt(val2.toString().replace(/\,/g, ''))) || 0,
+val = null;
switch (operator) {
case '+':
-return (v1 + v2);
+val = v1 + v2;
break;
case '-':
-return (v1 - v2);
+val = v1 - v2;
break;
case '/':
-return (v1 / v2);
+val = v1 / v2;
break;
case '*':
-return (v1 * v2);
+val = v1 * v2;
break;
case '%':
-return (v1 % v2);
+val = v1 % v2;
break;
default:
-return 0;
+val = 0;
break;
}
+if (commaFormat === false) {
+return val;
+}
+return _.numberFormatWithComma(val);;
+
});
Handlebars.registerHelper('lookup', function(obj, field, defaulValue) {
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 4fcb0fc..f766204 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -87,7 +87,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
showListCount = options.showListCount || true,
highlightString = options.highlightString,
formatStringVal = options.formatStringVal,
-numberFormat = options.numberFormat || _.numberFormatWithComa;
+numberFormat = options.numberFormat || _.numberFormatWithComma;
var table = "",
getHighlightedString = function(resultStr) {
diff --git a/dashboardv2/public/js/utils/Helper.js
b/dashboardv2/public/js/utils/Helper.js
index ead6e2f..8b9f4c5 100644
--- a/dashboardv2/public/js/utils/Helper.js
+++ b/dashboardv2/public/js/utils/Helper.js
@@ -23,7 +23,7 @@ define(['require',
], function(require, Utils, d3) {
'use strict';
_.mixin({
-numberFormatWithComa: function(number) {
+numberFormatWithComma: function(number) {
return d3.format(',')(number);
},
numberFormatWithBytes: function(number) {
@@ -33,7 +33,7 @@ define(['require',
}
var i = number == 0 ? 0 : Math.floor(Math.log(number) /
Math.log(1024));
if (i > 8) {
-return _.numberFormatWithComa(number);
+return _.numberFormatWithComma(number);
}
return Number((number / Math.pow(1024, i)).toFixed(2)) + " " +
["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"][i];
} else {
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js
b/dashboardv2/public/js/views/search/SearchLayoutView.js
in
[atlas] branch master updated (39ff496 -> 74c9394)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git. from 39ff496 ATLAS-3989: Updated Export-Import Audits Writer to use metadata.namespace. new 3c0b274 ATLAS-3954: UI: Type system property table improvement new 74c9394 ATLAS-3991: UI: Handlebar helper number format issue The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dashboardv2/public/css/scss/common.scss| 10 + dashboardv2/public/css/scss/graph.scss | 36 +++- dashboardv2/public/css/scss/table.scss | 28 +++ .../js/external_lib/atlas-lineage/dist/index.js| 2 +- .../atlas-lineage/src/Utils/LineageUtils.js| 8 +- .../js/external_lib/atlas-lineage/src/index.js | 78 +-- dashboardv2/public/js/modules/Helpers.js | 24 ++- .../AdministratorLayoutView_tmpl.html | 2 +- .../detail_page/DetailPageLayoutView_tmpl.html | 2 +- .../js/templates/graph/LineageLayoutView_tmpl.html | 24 +-- .../templates/graph/TypeSystemTreeView_tmpl.html | 67 +- dashboardv2/public/js/utils/CommonViewFunction.js | 31 ++- dashboardv2/public/js/utils/Helper.js | 4 +- .../public/js/views/graph/LineageLayoutView.js | 35 +-- .../public/js/views/graph/TypeSystemTreeView.js| 234 - .../public/js/views/search/SearchLayoutView.js | 4 +- dashboardv2/public/js/views/site/Statistics.js | 18 +- dashboardv3/public/css/scss/common.scss| 10 + dashboardv3/public/css/scss/graph.scss | 36 +++- dashboardv3/public/css/scss/table.scss | 29 +++ .../js/external_lib/atlas-lineage/dist/index.js| 2 +- .../atlas-lineage/src/Utils/LineageUtils.js| 8 +- .../js/external_lib/atlas-lineage/src/index.js | 78 +-- dashboardv3/public/js/modules/Helpers.js | 24 ++- .../AdministratorLayoutView_tmpl.html | 2 +- .../detail_page/DetailPageLayoutView_tmpl.html | 2 +- .../js/templates/graph/LineageLayoutView_tmpl.html | 24 +-- .../templates/graph/TypeSystemTreeView_tmpl.html | 67 +- dashboardv3/public/js/utils/CommonViewFunction.js | 31 ++- dashboardv3/public/js/utils/Helper.js | 4 +- .../public/js/views/graph/LineageLayoutView.js | 35 +-- .../public/js/views/graph/TypeSystemTreeView.js| 234 - .../public/js/views/search/SearchLayoutView.js | 4 +- .../search/tree/ClassificationTreeLayoutView.js| 4 +- .../js/views/search/tree/EntityTreeLayoutView.js | 4 +- dashboardv3/public/js/views/site/Favorite.js | 14 +- dashboardv3/public/js/views/site/Statistics.js | 18 +- 37 files changed, 858 insertions(+), 379 deletions(-)
[atlas] 01/02: ATLAS-3954: UI: Type system property table improvement
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
commit 3c0b2746d0065b1d95b4511c46a8655d4167096e
Author: kevalbhatt
AuthorDate: Mon Oct 12 15:49:09 2020 +0530
ATLAS-3954: UI: Type system property table improvement
---
dashboardv2/public/css/scss/common.scss| 10 +
dashboardv2/public/css/scss/graph.scss | 36 +++-
dashboardv2/public/css/scss/table.scss | 28 +++
.../js/external_lib/atlas-lineage/dist/index.js| 2 +-
.../atlas-lineage/src/Utils/LineageUtils.js| 8 +-
.../js/external_lib/atlas-lineage/src/index.js | 78 +--
.../AdministratorLayoutView_tmpl.html | 2 +-
.../detail_page/DetailPageLayoutView_tmpl.html | 2 +-
.../js/templates/graph/LineageLayoutView_tmpl.html | 24 +--
.../templates/graph/TypeSystemTreeView_tmpl.html | 67 +-
dashboardv2/public/js/utils/CommonViewFunction.js | 29 ++-
.../public/js/views/graph/LineageLayoutView.js | 35 +--
.../public/js/views/graph/TypeSystemTreeView.js| 234 -
dashboardv3/public/css/scss/common.scss| 10 +
dashboardv3/public/css/scss/graph.scss | 36 +++-
dashboardv3/public/css/scss/table.scss | 29 +++
.../js/external_lib/atlas-lineage/dist/index.js| 2 +-
.../atlas-lineage/src/Utils/LineageUtils.js| 8 +-
.../js/external_lib/atlas-lineage/src/index.js | 78 +--
.../AdministratorLayoutView_tmpl.html | 2 +-
.../detail_page/DetailPageLayoutView_tmpl.html | 2 +-
.../js/templates/graph/LineageLayoutView_tmpl.html | 24 +--
.../templates/graph/TypeSystemTreeView_tmpl.html | 67 +-
dashboardv3/public/js/utils/CommonViewFunction.js | 29 ++-
.../public/js/views/graph/LineageLayoutView.js | 35 +--
.../public/js/views/graph/TypeSystemTreeView.js| 234 -
26 files changed, 789 insertions(+), 322 deletions(-)
diff --git a/dashboardv2/public/css/scss/common.scss
b/dashboardv2/public/css/scss/common.scss
index b51a6f2..e93eef1 100644
--- a/dashboardv2/public/css/scss/common.scss
+++ b/dashboardv2/public/css/scss/common.scss
@@ -180,6 +180,11 @@ pre {
.json-string {
color: olive;
+
+&.cursor {
+cursor: pointer;
+text-decoration: underline;
+}
}
}
@@ -191,6 +196,11 @@ pre {
.panel-body .memory-details {
pre {
&.code-block {
+&.fixed-height {
+max-height: 112px;
+overflow: auto;
+}
+
&.shrink {
height: 144px;
diff --git a/dashboardv2/public/css/scss/graph.scss
b/dashboardv2/public/css/scss/graph.scss
index 971cf60..cd5e220 100644
--- a/dashboardv2/public/css/scss/graph.scss
+++ b/dashboardv2/public/css/scss/graph.scss
@@ -193,7 +193,7 @@ span#zoom_in {
width: 100%;
right: 0;
padding: 0 !important;
-z-index: ;
+z-index: 99;
overflow: hidden !important;
background: white;
@@ -266,4 +266,38 @@ span#zoom_in {
box-shadow: 0px 0px 3px 1px #80808080;
}
+}
+
+
+.box-panel.fix-box {
+position: fixed;
+top: 0;
+right: 0;
+bottom: 0;
+height: 100vh;
+max-height: 100vh;
+z-index: 999;
+bottom: 0;
+width: 400px;
+overflow: auto;
+border-radius: 0px;
+margin: 0 !important;
+
+&.slide-from-left.size-lg {
+left: -413px;
+
+&.show-box-panel {
+left: 0;
+margin: 0 !important;
+}
+}
+
+.body {
+tbody {
+overflow: auto;
+height: calc(100vh - 48px);
+position: absolute;
+padding-bottom: 15px;
+}
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/table.scss
b/dashboardv2/public/css/scss/table.scss
index 519d083..3db8a4c 100644
--- a/dashboardv2/public/css/scss/table.scss
+++ b/dashboardv2/public/css/scss/table.scss
@@ -41,6 +41,7 @@ tr.empty {
}
.entity-detail-table,
+.type-node-details,
.relationship-detail-table {
position: relative;
@@ -66,6 +67,26 @@ tr.empty {
}
}
+.type-node-details {
+.header {
+.pretty.p-switch .state:before {
+border: 1px solid white;
+}
+
+.pretty.p-switch .state label:after {
+background-color: white !important;
+}
+
+.pretty.p-switch.p-fill input:checked~.state label:after {
+background-color: #4a90e2 !important;
+}
+
+.pretty.p-switch.p-fill input:checked~.state.p-primary:before {
+background-color: white !important;
+}
+}
+}
+
.backgrid {
td {
white-space: normal;
@@ -98,6 +119,13 @@ tr.empty {
}
}
}
+
+.debuggging-table-header {
+
[atlas] branch master updated: ATLAS-3978: In Administration, Audits filter for 'OR' condition does not work
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 4ab4962 ATLAS-3978: In Administration, Audits filter for 'OR'
condition does not work
4ab4962 is described below
commit 4ab4962314a80d9e0ac766f81018e22995c8e83d
Author: kevalbhatt
AuthorDate: Thu Oct 8 16:04:51 2020 +0530
ATLAS-3978: In Administration, Audits filter for 'OR' condition does not
work
---
dashboardv2/public/js/utils/TableLayout.js | 1 +
.../js/views/audit/AdminAuditTableLayoutView.js| 34 ++
dashboardv3/public/js/utils/TableLayout.js | 1 +
.../js/views/audit/AdminAuditTableLayoutView.js| 34 ++
4 files changed, 8 insertions(+), 62 deletions(-)
diff --git a/dashboardv2/public/js/utils/TableLayout.js
b/dashboardv2/public/js/utils/TableLayout.js
index 7edce4d..89216bd 100644
--- a/dashboardv2/public/js/utils/TableLayout.js
+++ b/dashboardv2/public/js/utils/TableLayout.js
@@ -459,6 +459,7 @@ define(['require',
this.activePage = Math.round(this.pageTo / this.limit);
this.ui.activePage.attr('title', "Page " + this.activePage);
this.ui.activePage.text(this.activePage);
+this.ui.showPage.val(this.limit).trigger('change', {
"skipViewChange": true });
},
/**
diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
index b50a5e8..4a3f689 100644
--- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -127,19 +127,6 @@ define(['require',
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
-getAttributes: function(options) {
-var adminAttributes = [];
-if (options.isFilter) {
-_.each(options.isFilter, function(adminFilter) {
-adminAttributes.push({
-"attributeName": adminFilter.id,
-"operator": adminFilter.operator,
-"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
-})
-})
-}
-return adminAttributes;
-},
onClickAttrFilter: function() {
var that = this;
this.ui.adminRegion.show();
@@ -154,6 +141,7 @@ define(['require',
if (queryBuilderRef.data("queryBuilder")) {
var queryBuilder =
queryBuilderRef.queryBuilder("getRules");
if (queryBuilder) {
+that.ruleUrl =
that.searchTableFilters["adminAttrFilters"] =
CommonViewFunction.attributeFilter.generateUrl({ value: queryBuilder,
formatedDateToLong: true });
that.isFilters = queryBuilder.rules.length ?
queryBuilder.rules : null;
} else {
isFilterValidate = false
@@ -167,24 +155,8 @@ define(['require',
},
getAdminCollection: function(option) {
var that = this,
-options = {
-isDateParsed: true,
-isFilter: this.isFilters
-},
-adminParam = {
-condition: "AND",
-criterion: that.getAttributes(options)
-};
-options.isDateParsed = false;
-if (this.isFilters) {
-var auditQueryParam = {
-condition: "AND",
-criterion: that.getAttributes(options)
-};
-that.searchTableFilters["adminAttrFilters"] =
CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam,
formatedDateToLong: true });
-}
-
-$.extend(that.entityCollection.queryParams, { auditFilters:
that.isFilters ? adminParam : null });
+auditFilters =
CommonViewFunction.attributeFilter.generateAPIObj(that.ruleUrl);
+$.extend(that.entityCollection.queryParams, { auditFilters:
that.isFilters ? auditFilters : null });
var apiObj = {
sort: false,
data: that.entityCollection.queryParams,
diff --git a/dashboardv3/public/js/ut
[atlas] branch branch-2.0 updated: ATLAS-3978: In Administration, Audits filter for 'OR' condition does not work
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 87cf906 ATLAS-3978: In Administration, Audits filter for 'OR'
condition does not work
87cf906 is described below
commit 87cf906b4a696a39130b4cd2310cbb096d7c1a83
Author: kevalbhatt
AuthorDate: Thu Oct 8 16:04:51 2020 +0530
ATLAS-3978: In Administration, Audits filter for 'OR' condition does not
work
(cherry picked from commit 4ab4962314a80d9e0ac766f81018e22995c8e83d)
---
dashboardv2/public/js/utils/TableLayout.js | 1 +
.../js/views/audit/AdminAuditTableLayoutView.js| 34 ++
dashboardv3/public/js/utils/TableLayout.js | 1 +
.../js/views/audit/AdminAuditTableLayoutView.js| 34 ++
4 files changed, 8 insertions(+), 62 deletions(-)
diff --git a/dashboardv2/public/js/utils/TableLayout.js
b/dashboardv2/public/js/utils/TableLayout.js
index 7edce4d..89216bd 100644
--- a/dashboardv2/public/js/utils/TableLayout.js
+++ b/dashboardv2/public/js/utils/TableLayout.js
@@ -459,6 +459,7 @@ define(['require',
this.activePage = Math.round(this.pageTo / this.limit);
this.ui.activePage.attr('title', "Page " + this.activePage);
this.ui.activePage.text(this.activePage);
+this.ui.showPage.val(this.limit).trigger('change', {
"skipViewChange": true });
},
/**
diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
index b50a5e8..4a3f689 100644
--- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -127,19 +127,6 @@ define(['require',
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
-getAttributes: function(options) {
-var adminAttributes = [];
-if (options.isFilter) {
-_.each(options.isFilter, function(adminFilter) {
-adminAttributes.push({
-"attributeName": adminFilter.id,
-"operator": adminFilter.operator,
-"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
-})
-})
-}
-return adminAttributes;
-},
onClickAttrFilter: function() {
var that = this;
this.ui.adminRegion.show();
@@ -154,6 +141,7 @@ define(['require',
if (queryBuilderRef.data("queryBuilder")) {
var queryBuilder =
queryBuilderRef.queryBuilder("getRules");
if (queryBuilder) {
+that.ruleUrl =
that.searchTableFilters["adminAttrFilters"] =
CommonViewFunction.attributeFilter.generateUrl({ value: queryBuilder,
formatedDateToLong: true });
that.isFilters = queryBuilder.rules.length ?
queryBuilder.rules : null;
} else {
isFilterValidate = false
@@ -167,24 +155,8 @@ define(['require',
},
getAdminCollection: function(option) {
var that = this,
-options = {
-isDateParsed: true,
-isFilter: this.isFilters
-},
-adminParam = {
-condition: "AND",
-criterion: that.getAttributes(options)
-};
-options.isDateParsed = false;
-if (this.isFilters) {
-var auditQueryParam = {
-condition: "AND",
-criterion: that.getAttributes(options)
-};
-that.searchTableFilters["adminAttrFilters"] =
CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam,
formatedDateToLong: true });
-}
-
-$.extend(that.entityCollection.queryParams, { auditFilters:
that.isFilters ? adminParam : null });
+auditFilters =
CommonViewFunction.attributeFilter.generateAPIObj(that.ruleUrl);
+$.extend(that.entityCollection.queryParams, { auditFilters:
that.isFilters ? auditFilters : null });
var apiObj = {
sort: false,
[atlas] 02/02: ATLAS-3979: Beta UI : Removing one of the filters with an attribute name removes all of the filters with that attribute name.
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 58d630bf19540710a36ec47ee9fdfd771aafa5b7
Author: kevalbhatt
AuthorDate: Tue Oct 6 20:20:11 2020 +0530
ATLAS-3979: Beta UI : Removing one of the filters with an attribute name
removes all of the filters with that attribute name.
(cherry picked from commit 70c1087a121feb3fe88cc67681b470109443ff81)
---
dashboardv3/public/js/utils/CommonViewFunction.js | 4 ++--
dashboardv3/public/js/views/search/SearchDefaultLayoutView.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 0eafa9e..40d489e 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -405,9 +405,9 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
obj.value = obj.value + " (" +
moment.tz(moment.tz.guess()).zoneAbbr() + ")";
}
}
-return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + "";
+return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + '';
}
-return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + "";
+return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + '';
}
});
return generatedQuery;
diff --git a/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
b/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
index bae01bf..468e83a 100644
--- a/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
@@ -152,7 +152,7 @@ define(["require", "backbone", "utils/Globals",
"hbs!tmpl/search/SearchDefaultLa
that = this;
filters.rules = _.filter(rules, function(obj, key) {
-return obj.id != $(e.currentTarget).data("id");
+return (obj.id + key) != $(e.currentTarget).data("id");
});
if (filters) {
that.updateFilterOptions(filters, filtertype, isTag);
[atlas] 01/02: ATLAS-3981: UI: Create Entity button is shown for a user without create entity permission in ranger
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit ba8b490cd192b497d3bc4996f68e016814a92fbb
Author: kevalbhatt
AuthorDate: Tue Oct 6 19:56:49 2020 +0530
ATLAS-3981: UI: Create Entity button is shown for a user without create
entity permission in ranger
(cherry picked from commit f5ffd06486f6ef3c28236c6c70e74561542d30c1)
---
dashboardv2/public/js/router/Router.js | 2 +-
.../public/js/templates/search/SearchResultLayoutView_tmpl.html| 7 ---
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 6 --
dashboardv2/public/js/views/search/SearchResultLayoutView.js | 4 ++--
.../public/js/templates/search/SearchDefaultLayoutView_tmpl.html | 4 ++--
.../public/js/templates/search/SearchResultLayoutView_tmpl.html| 2 ++
dashboardv3/public/js/views/search/SearchResultLayoutView.js | 4 ++--
7 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/dashboardv2/public/js/router/Router.js
b/dashboardv2/public/js/router/Router.js
index 8e3afa0..97635b9 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -384,7 +384,7 @@ define([
}
});
-if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) {
+if (Utils.getUrlState.isSearchTab()) {
App.rNContent.show(new SearchDetailLayoutView(_.extend({
'value': paramObj, 'initialView': true }, options)));
} else {
if (App.rNContent.currentView) {
diff --git
a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index fc780d8..9b71d28 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -69,13 +69,14 @@
{{#if isSearchTab}}{{searchType}}{{/if}}
-{{#if entityCreate}}
-Search Atlas for existing entities or
+Search Atlas for existing entities
+{{#if entityCreate}}
+or
create new entity
+{{/if}}
-{{/if}}
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index 1ed8d76..a5d0e70 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -221,8 +221,10 @@ define(['require',
$tree.jstree('activate_node', obj.guid);
}
} else {
-setDefaultSelector();
-$tree.jstree('activate_node',
that.glossary.selectedItem.guid);
+if (that.glossaryCollection.fullCollection.length) {
+setDefaultSelector();
+$tree.jstree('activate_node',
that.glossary.selectedItem.guid);
+}
}
this.query[this.viewType] = _.extend(obj,
_.pick(this.glossary.selectedItem, 'model', 'guid', 'gType', 'type'), {
"viewType": this.viewType, "isNodeNotFoundAtLoad":
this.query[this.viewType].isNodeNotFoundAtLoad });
var url = _.isEmpty(this.glossary.selectedItem) ?
'#!/glossary' : '#!/glossary/' + this.glossary.selectedItem.guid;
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 8fb100f..08d8781 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -668,7 +668,7 @@ define(['require',
var obj = model.toJSON(),
nameHtml = "",
name = Utils.getName(obj);
-if (obj.attributes.serviceType === undefined) {
+if (!obj.attributes || obj.attributes.serviceType
=== undefined) {
if (Globals.serviceTypeMap[obj.typeName] ===
undefined && that.entityDefCollection) {
var defObj =
that.entityDefCollection.fullCollection.find({ name: obj.typeName });
if (defObj) {
@@ -676,7 +676,7 @@ define(['require',
}
}
[atlas] branch branch-2.0 updated (92b7071 -> 58d630b)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 92b7071 ATLAS-3971 :- Move authorization check for Business Metadata before type exist check. new ba8b490 ATLAS-3981: UI: Create Entity button is shown for a user without create entity permission in ranger new 58d630b ATLAS-3979: Beta UI : Removing one of the filters with an attribute name removes all of the filters with that attribute name. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dashboardv2/public/js/router/Router.js | 2 +- .../public/js/templates/search/SearchResultLayoutView_tmpl.html| 7 --- dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 6 -- dashboardv2/public/js/views/search/SearchResultLayoutView.js | 4 ++-- .../public/js/templates/search/SearchDefaultLayoutView_tmpl.html | 4 ++-- .../public/js/templates/search/SearchResultLayoutView_tmpl.html| 2 ++ dashboardv3/public/js/utils/CommonViewFunction.js | 4 ++-- dashboardv3/public/js/views/search/SearchDefaultLayoutView.js | 2 +- dashboardv3/public/js/views/search/SearchResultLayoutView.js | 4 ++-- 9 files changed, 20 insertions(+), 15 deletions(-)
[atlas] 02/02: ATLAS-3979: Beta UI : Removing one of the filters with an attribute name removes all of the filters with that attribute name.
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
commit 70c1087a121feb3fe88cc67681b470109443ff81
Author: kevalbhatt
AuthorDate: Tue Oct 6 20:20:11 2020 +0530
ATLAS-3979: Beta UI : Removing one of the filters with an attribute name
removes all of the filters with that attribute name.
---
dashboardv3/public/js/utils/CommonViewFunction.js | 4 ++--
dashboardv3/public/js/views/search/SearchDefaultLayoutView.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 0eafa9e..40d489e 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -405,9 +405,9 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
obj.value = obj.value + " (" +
moment.tz(moment.tz.guess()).zoneAbbr() + ")";
}
}
-return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + "";
+return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + '';
}
-return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + "";
+return '' +
(Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] :
_.escape(obj.id)) + '' + _.escape(obj.operator) +
'' + (Enums[obj.id] ? Enums[obj.id][obj.value] :
_.escape(obj.value)) + '';
}
});
return generatedQuery;
diff --git a/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
b/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
index bae01bf..468e83a 100644
--- a/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
@@ -152,7 +152,7 @@ define(["require", "backbone", "utils/Globals",
"hbs!tmpl/search/SearchDefaultLa
that = this;
filters.rules = _.filter(rules, function(obj, key) {
-return obj.id != $(e.currentTarget).data("id");
+return (obj.id + key) != $(e.currentTarget).data("id");
});
if (filters) {
that.updateFilterOptions(filters, filtertype, isTag);
[atlas] 01/02: ATLAS-3981: UI: Create Entity button is shown for a user without create entity permission in ranger
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
commit f5ffd06486f6ef3c28236c6c70e74561542d30c1
Author: kevalbhatt
AuthorDate: Tue Oct 6 19:56:49 2020 +0530
ATLAS-3981: UI: Create Entity button is shown for a user without create
entity permission in ranger
---
dashboardv2/public/js/router/Router.js | 2 +-
.../public/js/templates/search/SearchResultLayoutView_tmpl.html| 7 ---
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 6 --
dashboardv2/public/js/views/search/SearchResultLayoutView.js | 4 ++--
.../public/js/templates/search/SearchDefaultLayoutView_tmpl.html | 4 ++--
.../public/js/templates/search/SearchResultLayoutView_tmpl.html| 2 ++
dashboardv3/public/js/views/search/SearchResultLayoutView.js | 4 ++--
7 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/dashboardv2/public/js/router/Router.js
b/dashboardv2/public/js/router/Router.js
index 8e3afa0..97635b9 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -384,7 +384,7 @@ define([
}
});
-if (Globals.entityCreate && Utils.getUrlState.isSearchTab()) {
+if (Utils.getUrlState.isSearchTab()) {
App.rNContent.show(new SearchDetailLayoutView(_.extend({
'value': paramObj, 'initialView': true }, options)));
} else {
if (App.rNContent.currentView) {
diff --git
a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index fc780d8..9b71d28 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -69,13 +69,14 @@
{{#if isSearchTab}}{{searchType}}{{/if}}
-{{#if entityCreate}}
-Search Atlas for existing entities or
+Search Atlas for existing entities
+{{#if entityCreate}}
+or
create new entity
+{{/if}}
-{{/if}}
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index 1ed8d76..a5d0e70 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -221,8 +221,10 @@ define(['require',
$tree.jstree('activate_node', obj.guid);
}
} else {
-setDefaultSelector();
-$tree.jstree('activate_node',
that.glossary.selectedItem.guid);
+if (that.glossaryCollection.fullCollection.length) {
+setDefaultSelector();
+$tree.jstree('activate_node',
that.glossary.selectedItem.guid);
+}
}
this.query[this.viewType] = _.extend(obj,
_.pick(this.glossary.selectedItem, 'model', 'guid', 'gType', 'type'), {
"viewType": this.viewType, "isNodeNotFoundAtLoad":
this.query[this.viewType].isNodeNotFoundAtLoad });
var url = _.isEmpty(this.glossary.selectedItem) ?
'#!/glossary' : '#!/glossary/' + this.glossary.selectedItem.guid;
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 8fb100f..08d8781 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -668,7 +668,7 @@ define(['require',
var obj = model.toJSON(),
nameHtml = "",
name = Utils.getName(obj);
-if (obj.attributes.serviceType === undefined) {
+if (!obj.attributes || obj.attributes.serviceType
=== undefined) {
if (Globals.serviceTypeMap[obj.typeName] ===
undefined && that.entityDefCollection) {
var defObj =
that.entityDefCollection.fullCollection.find({ name: obj.typeName });
if (defObj) {
@@ -676,7 +676,7 @@ define(['require',
}
}
} else if (Globals.serviceTypeMap[obj.typeName]
=== undefined) {
-
[atlas] branch master updated (8098bc5 -> 70c1087)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git. from 8098bc5 ATLAS-3971 :- Move authorization check for Business Metadata before type exist check. new f5ffd06 ATLAS-3981: UI: Create Entity button is shown for a user without create entity permission in ranger new 70c1087 ATLAS-3979: Beta UI : Removing one of the filters with an attribute name removes all of the filters with that attribute name. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dashboardv2/public/js/router/Router.js | 2 +- .../public/js/templates/search/SearchResultLayoutView_tmpl.html| 7 --- dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 6 -- dashboardv2/public/js/views/search/SearchResultLayoutView.js | 4 ++-- .../public/js/templates/search/SearchDefaultLayoutView_tmpl.html | 4 ++-- .../public/js/templates/search/SearchResultLayoutView_tmpl.html| 2 ++ dashboardv3/public/js/utils/CommonViewFunction.js | 4 ++-- dashboardv3/public/js/views/search/SearchDefaultLayoutView.js | 2 +- dashboardv3/public/js/views/search/SearchResultLayoutView.js | 4 ++-- 9 files changed, 20 insertions(+), 15 deletions(-)
[atlas] branch branch-2.0 updated: ATLAS-3964: Atlas UI displays large numbers incorrectly #1
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 28de23f ATLAS-3964: Atlas UI displays large numbers incorrectly #1
28de23f is described below
commit 28de23f6f17af54c3684404a8e8ff2581124dd3c
Author: Deep Singh
AuthorDate: Tue Oct 6 21:31:23 2020 +0530
ATLAS-3964: Atlas UI displays large numbers incorrectly #1
Signed-off-by: kevalbhatt
(cherry picked from commit 4f95ee8cc199d17ec954f81d8af9d0152af142f4)
---
dashboardv2/public/js/utils/Overrides.js | 2 +-
dashboardv3/public/js/utils/Overrides.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/Overrides.js
b/dashboardv2/public/js/utils/Overrides.js
index 63770b5..9cff134 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -46,7 +46,7 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
converters: _.extend($.ajaxSettings.converters, {
"text json": function(data) {
try {
-return LosslessJSON.parse(data, function(k, v) {
return (v.isLosslessNumber) ? v.value : v });
+return LosslessJSON.parse(data, function(k, v) {
try { return (v.isLosslessNumber) ? v.valueOf() : v } catch (err) { return
v.value } });
} catch (err) {
return $.parseJSON(data);
}
diff --git a/dashboardv3/public/js/utils/Overrides.js
b/dashboardv3/public/js/utils/Overrides.js
index 63770b5..9cff134 100644
--- a/dashboardv3/public/js/utils/Overrides.js
+++ b/dashboardv3/public/js/utils/Overrides.js
@@ -46,7 +46,7 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
converters: _.extend($.ajaxSettings.converters, {
"text json": function(data) {
try {
-return LosslessJSON.parse(data, function(k, v) {
return (v.isLosslessNumber) ? v.value : v });
+return LosslessJSON.parse(data, function(k, v) {
try { return (v.isLosslessNumber) ? v.valueOf() : v } catch (err) { return
v.value } });
} catch (err) {
return $.parseJSON(data);
}
[atlas] branch master updated: ATLAS-3964: Atlas UI displays large numbers incorrectly #1
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 4f95ee8 ATLAS-3964: Atlas UI displays large numbers incorrectly #1
4f95ee8 is described below
commit 4f95ee8cc199d17ec954f81d8af9d0152af142f4
Author: Deep Singh
AuthorDate: Tue Oct 6 21:31:23 2020 +0530
ATLAS-3964: Atlas UI displays large numbers incorrectly #1
Signed-off-by: kevalbhatt
---
dashboardv2/public/js/utils/Overrides.js | 2 +-
dashboardv3/public/js/utils/Overrides.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/Overrides.js
b/dashboardv2/public/js/utils/Overrides.js
index 63770b5..9cff134 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -46,7 +46,7 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
converters: _.extend($.ajaxSettings.converters, {
"text json": function(data) {
try {
-return LosslessJSON.parse(data, function(k, v) {
return (v.isLosslessNumber) ? v.value : v });
+return LosslessJSON.parse(data, function(k, v) {
try { return (v.isLosslessNumber) ? v.valueOf() : v } catch (err) { return
v.value } });
} catch (err) {
return $.parseJSON(data);
}
diff --git a/dashboardv3/public/js/utils/Overrides.js
b/dashboardv3/public/js/utils/Overrides.js
index 63770b5..9cff134 100644
--- a/dashboardv3/public/js/utils/Overrides.js
+++ b/dashboardv3/public/js/utils/Overrides.js
@@ -46,7 +46,7 @@ define(['require', 'utils/Utils', 'lossless-json',
'marionette', 'backgrid', 'as
converters: _.extend($.ajaxSettings.converters, {
"text json": function(data) {
try {
-return LosslessJSON.parse(data, function(k, v) {
return (v.isLosslessNumber) ? v.value : v });
+return LosslessJSON.parse(data, function(k, v) {
try { return (v.isLosslessNumber) ? v.valueOf() : v } catch (err) { return
v.value } });
} catch (err) {
return $.parseJSON(data);
}
[atlas] branch branch-2.0 updated: ATLAS-3964: Atlas UI displayes large numbers incorrectly
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 e497dcf ATLAS-3964: Atlas UI displayes large numbers incorrectly
e497dcf is described below
commit e497dcff7b72f00788c41bc60ca44794ebd16ce8
Author: Deep Singh
AuthorDate: Wed Sep 30 00:58:13 2020 -0700
ATLAS-3964: Atlas UI displayes large numbers incorrectly
Signed-off-by: kevalbhatt
(cherry picked from commit 545afb53d0eb4154162f3887cea2bf4a4d26e752)
---
dashboardv2/gruntfile.js | 6 --
dashboardv2/package-lock.json| 5 +
dashboardv2/package.json | 3 ++-
dashboardv2/public/js/main.js| 3 ++-
dashboardv2/public/js/utils/Overrides.js | 13 +++--
dashboardv3/gruntfile.js | 6 --
dashboardv3/package-lock.json| 5 +
dashboardv3/package.json | 3 ++-
dashboardv3/public/js/main.js| 3 ++-
dashboardv3/public/js/utils/Overrides.js | 13 +++--
10 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index 747de0b..1f21df2 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -110,7 +110,8 @@ module.exports = function(grunt) {
'table-dragger.js': { 'table-dragger/dist':
'table-dragger' },
'jstree.min.js': { 'jstree/dist': 'jstree' },
'jquery.steps.min.js': { 'jquery-steps/build':
'jquery-steps' },
-'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js"
}
+'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js"
},
+'lossless-json.js': { 'lossless-json/dist':
'lossless-json' }
}
},
@@ -178,7 +179,8 @@ module.exports = function(grunt) {
],
'LICENSE.md': [{ 'backbone.babysitter':
'backbone-babysitter' },
{ 'backbone.wreqr': 'backbone-wreqr' },
-{ 'nvd3': 'nvd3/' }
+{ 'nvd3': 'nvd3/' },
+{ 'lossless-json': 'lossless-json' }
],
'license.txt': [{ 'backbone.marionette':
'backbone-marionette' }],
'license': [{ 'table-dragger': 'table-dragger' }],
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index 5ae7a2d..b14e4fe 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -2104,6 +2104,11 @@
"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
"dev": true
},
+"lossless-json": {
+ "version": "1.0.4",
+ "resolved":
"https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.4.tgz;,
+ "integrity":
"sha512-zEkWwELMSQQISdtOF44vk0bRJhN/PJ93qcgJLcodizQjxrJKdFrq2H1+Xv5QDe7v3dTYYbBI5hOsh4a9l0B2Ow=="
+},
"loud-rejection": {
"version": "1.6.0",
"resolved":
"https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz;,
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index c2f7c0f..57c58c0 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -52,7 +52,8 @@
"requirejs-text": "2.0.15",
"select2": "4.0.3",
"table-dragger": "1.0.2",
-"underscore": "1.8.3"
+"underscore": "1.8.3",
+"lossless-json": "1.0.4"
},
"devDependencies": {
"grunt": "1.0.4",
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 8caa781..7cee837 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -181,7 +181,8 @@ require.config({
'table-dragger': 'libs/table-dragger/table-dragger',
'jstree': 'libs/jstree/jstree.min',
'jquery-steps': 'libs/jquery-steps/jquery.steps.min',
-'dropzone': 'libs/dropzone/js/dropzone-amd-module'
+'dropzone': 'libs/dropzone/js/dropzone-amd-module',
+'lossless-json': 'libs/lossless-json/lossless-json'
},
/**
diff --git a/dashboardv2/public/js/utils/Overrides.js
b/dashboardv2/public/js/utils/Overrides.js
index 33328f0..63770b5 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs',
'jquery-placeholder'], function(require, Utils) {
+define(['require', 'utils/Utils', 'lossles
[atlas] branch master updated: ATLAS-3964: Atlas UI displayes large numbers incorrectly
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 545afb5 ATLAS-3964: Atlas UI displayes large numbers incorrectly
545afb5 is described below
commit 545afb53d0eb4154162f3887cea2bf4a4d26e752
Author: Deep Singh
AuthorDate: Wed Sep 30 00:58:13 2020 -0700
ATLAS-3964: Atlas UI displayes large numbers incorrectly
Signed-off-by: kevalbhatt
---
dashboardv2/gruntfile.js | 6 --
dashboardv2/package-lock.json| 5 +
dashboardv2/package.json | 3 ++-
dashboardv2/public/js/main.js| 3 ++-
dashboardv2/public/js/utils/Overrides.js | 13 +++--
dashboardv3/gruntfile.js | 6 --
dashboardv3/package-lock.json| 5 +
dashboardv3/package.json | 3 ++-
dashboardv3/public/js/main.js| 3 ++-
dashboardv3/public/js/utils/Overrides.js | 13 +++--
10 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index 747de0b..1f21df2 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -110,7 +110,8 @@ module.exports = function(grunt) {
'table-dragger.js': { 'table-dragger/dist':
'table-dragger' },
'jstree.min.js': { 'jstree/dist': 'jstree' },
'jquery.steps.min.js': { 'jquery-steps/build':
'jquery-steps' },
-'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js"
}
+'dropzone-amd-module.js': { 'dropzone/dist': "dropzone/js"
},
+'lossless-json.js': { 'lossless-json/dist':
'lossless-json' }
}
},
@@ -178,7 +179,8 @@ module.exports = function(grunt) {
],
'LICENSE.md': [{ 'backbone.babysitter':
'backbone-babysitter' },
{ 'backbone.wreqr': 'backbone-wreqr' },
-{ 'nvd3': 'nvd3/' }
+{ 'nvd3': 'nvd3/' },
+{ 'lossless-json': 'lossless-json' }
],
'license.txt': [{ 'backbone.marionette':
'backbone-marionette' }],
'license': [{ 'table-dragger': 'table-dragger' }],
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index 5ae7a2d..b14e4fe 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -2104,6 +2104,11 @@
"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
"dev": true
},
+"lossless-json": {
+ "version": "1.0.4",
+ "resolved":
"https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.4.tgz;,
+ "integrity":
"sha512-zEkWwELMSQQISdtOF44vk0bRJhN/PJ93qcgJLcodizQjxrJKdFrq2H1+Xv5QDe7v3dTYYbBI5hOsh4a9l0B2Ow=="
+},
"loud-rejection": {
"version": "1.6.0",
"resolved":
"https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz;,
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index c2f7c0f..57c58c0 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -52,7 +52,8 @@
"requirejs-text": "2.0.15",
"select2": "4.0.3",
"table-dragger": "1.0.2",
-"underscore": "1.8.3"
+"underscore": "1.8.3",
+"lossless-json": "1.0.4"
},
"devDependencies": {
"grunt": "1.0.4",
diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js
index 8caa781..7cee837 100644
--- a/dashboardv2/public/js/main.js
+++ b/dashboardv2/public/js/main.js
@@ -181,7 +181,8 @@ require.config({
'table-dragger': 'libs/table-dragger/table-dragger',
'jstree': 'libs/jstree/jstree.min',
'jquery-steps': 'libs/jquery-steps/jquery.steps.min',
-'dropzone': 'libs/dropzone/js/dropzone-amd-module'
+'dropzone': 'libs/dropzone/js/dropzone-amd-module',
+'lossless-json': 'libs/lossless-json/lossless-json'
},
/**
diff --git a/dashboardv2/public/js/utils/Overrides.js
b/dashboardv2/public/js/utils/Overrides.js
index 33328f0..63770b5 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++ b/dashboardv2/public/js/utils/Overrides.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs',
'jquery-placeholder'], function(require, Utils) {
+define(['require', 'utils/Utils', 'lossless-json', 'marionette', 'backgrid',
'asBreadcrumbs', 'jquery-p
[atlas] branch branch-2.0 updated: ATLAS-3955: Read Type Auth, UI : detailsPage doesn't load for user who has read permission for entity but no read auth for entity's type
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 598a726 ATLAS-3955: Read Type Auth, UI : detailsPage doesn't load for
user who has read permission for entity but no read auth for entity's type
598a726 is described below
commit 598a726fab52caa886741c7153459975efa7068d
Author: kevalbhatt
AuthorDate: Thu Sep 24 13:46:24 2020 +0530
ATLAS-3955: Read Type Auth, UI : detailsPage doesn't load for user who has
read permission for entity but no read auth for entity's type
(cherry picked from commit 23c33d14d0d8e11977c38377668030ae2bbe257b)
---
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js | 8 +++-
dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js | 8 +++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 4df3562..b87d138 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -139,7 +139,13 @@ define(['require',
this.entityObject = this.collection.first().toJSON();
var collectionJSON = this.entityObject.entity;
this.activeEntityDef =
this.entityDefCollection.fullCollection.find({ name: collectionJSON.typeName });
-
+if (!this.activeEntityDef) {
+Utils.backButtonClick();
+Utils.notifyError({
+content: "Unknown Entity-Type"
+});
+return true;
+}
if (collectionJSON &&
_.startsWith(collectionJSON.typeName, "AtlasGlossary")) {
this.$(".termBox").hide();
}
diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
index 7e140b8..bc213d5 100644
--- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
@@ -143,7 +143,13 @@ define(['require',
this.entityObject = this.collection.first().toJSON();
var collectionJSON = this.entityObject.entity;
this.activeEntityDef =
this.entityDefCollection.fullCollection.find({ name: collectionJSON.typeName });
-
+if (!this.activeEntityDef) {
+Utils.backButtonClick();
+Utils.notifyError({
+content: "Unknown Entity-Type"
+});
+return true;
+}
if (collectionJSON &&
_.startsWith(collectionJSON.typeName, "AtlasGlossary")) {
this.$(".termBox").hide();
}
[atlas] branch master updated: ATLAS-3955: Read Type Auth, UI : detailsPage doesn't load for user who has read permission for entity but no read auth for entity's type
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 23c33d1 ATLAS-3955: Read Type Auth, UI : detailsPage doesn't load for
user who has read permission for entity but no read auth for entity's type
23c33d1 is described below
commit 23c33d14d0d8e11977c38377668030ae2bbe257b
Author: kevalbhatt
AuthorDate: Thu Sep 24 13:46:24 2020 +0530
ATLAS-3955: Read Type Auth, UI : detailsPage doesn't load for user who has
read permission for entity but no read auth for entity's type
---
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js | 8 +++-
dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js | 8 +++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 4df3562..b87d138 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -139,7 +139,13 @@ define(['require',
this.entityObject = this.collection.first().toJSON();
var collectionJSON = this.entityObject.entity;
this.activeEntityDef =
this.entityDefCollection.fullCollection.find({ name: collectionJSON.typeName });
-
+if (!this.activeEntityDef) {
+Utils.backButtonClick();
+Utils.notifyError({
+content: "Unknown Entity-Type"
+});
+return true;
+}
if (collectionJSON &&
_.startsWith(collectionJSON.typeName, "AtlasGlossary")) {
this.$(".termBox").hide();
}
diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
index 7e140b8..bc213d5 100644
--- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
@@ -143,7 +143,13 @@ define(['require',
this.entityObject = this.collection.first().toJSON();
var collectionJSON = this.entityObject.entity;
this.activeEntityDef =
this.entityDefCollection.fullCollection.find({ name: collectionJSON.typeName });
-
+if (!this.activeEntityDef) {
+Utils.backButtonClick();
+Utils.notifyError({
+content: "Unknown Entity-Type"
+});
+return true;
+}
if (collectionJSON &&
_.startsWith(collectionJSON.typeName, "AtlasGlossary")) {
this.$(".termBox").hide();
}
[atlas] branch branch-2.0 updated: ATLAS-3925: UI: (Regression) Properties with value Null not showing N/A #2
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 8b86c7a ATLAS-3925: UI: (Regression) Properties with value Null not
showing N/A #2
8b86c7a is described below
commit 8b86c7a10590ce94aa82f8a1fa304065853223a8
Author: kevalbhatt
AuthorDate: Thu Sep 3 18:35:13 2020 +0530
ATLAS-3925: UI: (Regression) Properties with value Null not showing N/A #2
(cherry picked from commit 61b7a077bc541aad27ceadb8c55b4d568b376e3c)
---
dashboardv2/public/js/utils/CommonViewFunction.js | 2 +-
dashboardv3/public/js/utils/CommonViewFunction.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 23a40df..041f1f6 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (!_.isUndefined(val)) {
+if (!_.isUndefined(val) && !_.isNull(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index c4e11a6..0621277 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (!_.isUndefined(val)) {
+if (!_.isUndefined(val) && !_.isNull(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
[atlas] branch master updated: ATLAS-3925: UI: (Regression) Properties with value Null not showing N/A #2
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 61b7a07 ATLAS-3925: UI: (Regression) Properties with value Null not
showing N/A #2
61b7a07 is described below
commit 61b7a077bc541aad27ceadb8c55b4d568b376e3c
Author: kevalbhatt
AuthorDate: Thu Sep 3 18:35:13 2020 +0530
ATLAS-3925: UI: (Regression) Properties with value Null not showing N/A #2
---
dashboardv2/public/js/utils/CommonViewFunction.js | 2 +-
dashboardv3/public/js/utils/CommonViewFunction.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 23a40df..041f1f6 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (!_.isUndefined(val)) {
+if (!_.isUndefined(val) && !_.isNull(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index c4e11a6..0621277 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (!_.isUndefined(val)) {
+if (!_.isUndefined(val) && !_.isNull(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
[atlas] branch branch-2.0 updated: ATLAS-3925: UI: Properties with value 0 or false are displayed as N/A for
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 dfec483 ATLAS-3925: UI: Properties with value 0 or false are
displayed as N/A for
dfec483 is described below
commit dfec4836b7f1fd316b7b0d6a91e29668a47ae0ae
Author: kevalbhatt
AuthorDate: Wed Aug 26 15:40:01 2020 +0530
ATLAS-3925: UI: Properties with value 0 or false are displayed as N/A for
(cherry picked from commit 250c2eaf249fd115f71b11019bfc4b153810bde8)
---
dashboardv2/public/js/utils/CommonViewFunction.js | 3 +--
dashboardv3/public/js/utils/CommonViewFunction.js | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 4d10fa6..23a40df 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (val) {
+if (!_.isUndefined(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
@@ -612,7 +612,6 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
rule = {};
if (apiObj) {
rule = { attributeName: temp[0], operator:
mapUiOperatorToAPI(temp[1]), attributeValue: _.trim(temp[2]) }
-
rule.attributeValue = rule.type === 'date' &&
formatDate && rule.attributeValue.length ?
moment(parseInt(rule.attributeValue)).format(Globals.dateTimeFormat) :
rule.attributeValue;
} else {
rule = { id: temp[0], operator: temp[1],
value: _.trim(temp[2]) }
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 670e509..c4e11a6 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (val) {
+if (!_.isUndefined(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
[atlas] branch master updated: ATLAS-3925: UI: Properties with value 0 or false are displayed as N/A for
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 250c2ea ATLAS-3925: UI: Properties with value 0 or false are
displayed as N/A for
250c2ea is described below
commit 250c2eaf249fd115f71b11019bfc4b153810bde8
Author: kevalbhatt
AuthorDate: Wed Aug 26 15:40:01 2020 +0530
ATLAS-3925: UI: Properties with value 0 or false are displayed as N/A for
---
dashboardv2/public/js/utils/CommonViewFunction.js | 3 +--
dashboardv3/public/js/utils/CommonViewFunction.js | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 4d10fa6..23a40df 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (val) {
+if (!_.isUndefined(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
@@ -612,7 +612,6 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
rule = {};
if (apiObj) {
rule = { attributeName: temp[0], operator:
mapUiOperatorToAPI(temp[1]), attributeValue: _.trim(temp[2]) }
-
rule.attributeValue = rule.type === 'date' &&
formatDate && rule.attributeValue.length ?
moment(parseInt(rule.attributeValue)).format(Globals.dateTimeFormat) :
rule.attributeValue;
} else {
rule = { id: temp[0], operator: temp[1],
value: _.trim(temp[2]) }
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 670e509..c4e11a6 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -102,7 +102,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
},
getValue = function(val) {
-if (val) {
+if (!_.isUndefined(val)) {
if ((_.isNumber(val) || !_.isNaN(parseInt(val))) &&
formatIntVal) {
return numberFormat(val);
} else {
[atlas] branch branch-2.0 updated (bc770b4 -> 52bc5d7)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from bc770b4 ATLAS-3898: authorization updates to require TYPE_READ permission for type-def read new 74cb930 ATLAS-3822:- UI changes: Audit entries for TypeDefs CREATE, UPDATE and DELETE new 52bc5d7 ATLAS-3583 Use Audit framework to generate audit entries for TypeDefs CREATE, UPDATE and DELETE The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: addons/models/-Area0/0010-base_model.json | 12 ++ ...-base_model_add_atlas_operation_attributes.json | 27 dashboardv2/public/css/scss/business-metadata.scss | 23 ++- dashboardv2/public/css/scss/common.scss| 10 ++ dashboardv2/public/css/scss/override.scss | 12 +- .../audit/AdminAuditTableLayoutView_tmpl.html | 3 - dashboardv2/public/js/utils/Enums.js | 19 ++- .../js/views/audit/AdminAuditTableLayoutView.js| 162 + dashboardv3/public/css/scss/business-metadata.scss | 23 ++- dashboardv3/public/css/scss/common.scss| 10 ++ dashboardv3/public/css/scss/override.scss | 12 +- .../audit/AdminAuditTableLayoutView_tmpl.html | 3 - dashboardv3/public/js/utils/Enums.js | 19 ++- .../js/views/audit/AdminAuditTableLayoutView.js| 162 + .../apache/atlas/model/audit/AtlasAuditEntry.java | 5 +- .../atlas/repository/audit/AtlasAuditService.java | 2 +- .../repository/audit/TypeDefAuditListener.java | 112 ++ .../bootstrap/AtlasTypeDefStoreInitializer.java| 49 ++- .../store/graph/v2/AtlasEntityChangeNotifier.java | 12 ++ .../resources/solr/core-template/solrconfig.xml| 2 +- 20 files changed, 536 insertions(+), 143 deletions(-) create mode 100644 addons/models/-Area0/patches/006-base_model_add_atlas_operation_attributes.json create mode 100644 repository/src/main/java/org/apache/atlas/repository/audit/TypeDefAuditListener.java
[atlas] 02/02: ATLAS-3583 Use Audit framework to generate audit entries for TypeDefs CREATE, UPDATE and DELETE
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 52bc5d7cf1bab8c6937e7c5d51e5c5bd1545cba8
Author: Mandar Ambawane
AuthorDate: Fri Aug 14 18:26:53 2020 +0530
ATLAS-3583 Use Audit framework to generate audit entries for TypeDefs
CREATE, UPDATE and DELETE
Signed-off-by: nixonrodrigues
(cherry picked from commit 892df24289d583028e74e78f7b86f6fde785e909)
---
addons/models/-Area0/0010-base_model.json | 12 +++
...-base_model_add_atlas_operation_attributes.json | 27 +
.../apache/atlas/model/audit/AtlasAuditEntry.java | 5 +-
.../atlas/repository/audit/AtlasAuditService.java | 2 +-
.../repository/audit/TypeDefAuditListener.java | 112 +
.../bootstrap/AtlasTypeDefStoreInitializer.java| 49 -
.../store/graph/v2/AtlasEntityChangeNotifier.java | 12 +++
.../resources/solr/core-template/solrconfig.xml| 2 +-
8 files changed, 216 insertions(+), 5 deletions(-)
diff --git a/addons/models/-Area0/0010-base_model.json
b/addons/models/-Area0/0010-base_model.json
index 9777b7a..1de9e57 100644
--- a/addons/models/-Area0/0010-base_model.json
+++ b/addons/models/-Area0/0010-base_model.json
@@ -25,6 +25,18 @@
{
"ordinal": 4,
"value": "IMPORT_DELETE_REPL"
+},
+{
+ "ordinal": 5,
+ "value": "TYPE_DEF_CREATE"
+},
+{
+ "ordinal": 6,
+ "value": "TYPE_DEF_UPDATE"
+},
+{
+ "ordinal": 7,
+ "value": "TYPE_DEF_DELETE"
}
]
}
diff --git
a/addons/models/-Area0/patches/006-base_model_add_atlas_operation_attributes.json
b/addons/models/-Area0/patches/006-base_model_add_atlas_operation_attributes.json
new file mode 100644
index 000..a27525e
--- /dev/null
+++
b/addons/models/-Area0/patches/006-base_model_add_atlas_operation_attributes.json
@@ -0,0 +1,27 @@
+{
+ "patches": [
+{
+ "id": "TYPEDEF_PATCH_0006_001",
+ "description": "Add additional operations in Atlas",
+ "action": "UPDATE_ENUMDEF",
+ "typeName": "atlas_operation",
+ "applyToVersion": "1.0",
+ "updateToVersion": "1.1",
+ "params": null,
+ "elementDefs": [
+{
+ "ordinal": 5,
+ "value": "TYPE_DEF_CREATE"
+},
+{
+ "ordinal": 6,
+ "value": "TYPE_DEF_UPDATE"
+},
+{
+ "ordinal": 7,
+ "value": "TYPE_DEF_DELETE"
+}
+ ]
+}
+ ]
+}
diff --git
a/intg/src/main/java/org/apache/atlas/model/audit/AtlasAuditEntry.java
b/intg/src/main/java/org/apache/atlas/model/audit/AtlasAuditEntry.java
index a95cf4e..9ed4168 100644
--- a/intg/src/main/java/org/apache/atlas/model/audit/AtlasAuditEntry.java
+++ b/intg/src/main/java/org/apache/atlas/model/audit/AtlasAuditEntry.java
@@ -40,7 +40,10 @@ public class AtlasAuditEntry extends AtlasBaseModelObject
implements Serializabl
PURGE("PURGE"),
EXPORT("EXPORT"),
IMPORT("IMPORT"),
-IMPORT_DELETE_REPL("IMPORT_DELETE_REPL");
+IMPORT_DELETE_REPL("IMPORT_DELETE_REPL"),
+TYPE_DEF_CREATE("TYPE_DEF_CREATE"),
+TYPE_DEF_UPDATE("TYPE_DEF_UPDATE"),
+TYPE_DEF_DELETE("TYPE_DEF_DELETE");
private final String type;
diff --git
a/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditService.java
b/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditService.java
index a0dc816..d843204 100644
---
a/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditService.java
+++
b/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditService.java
@@ -46,7 +46,7 @@ import java.util.Set;
@AtlasService
public class AtlasAuditService {
private static final Logger LOG =
LoggerFactory.getLogger(AtlasAuditService.class);
-private static final String ENTITY_TYPE_AUDIT_ENTRY = "__AtlasAuditEntry";
+public static final String ENTITY_TYPE_AUDIT_ENTRY = "__AtlasAuditEntry";
private final DataAccess dataAccess;
private final AtlasDiscoveryService discoveryService;
diff --git
a/repository/src/main/java/org/apache/atlas/repository/audit/TypeDefAuditListener.java
b/repository/src/main/java/org/apache/atlas/repository/audit/TypeDefAuditListener.java
new file mode 100644
index 000..bfc300e
--- /dev/null
+++
b/repository/sr
[atlas] 01/02: ATLAS-3822:- UI changes: Audit entries for TypeDefs CREATE, UPDATE and DELETE
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 74cb93041c4aecec676f42aabdee598a51b64d59
Author: kevalbhatt
AuthorDate: Tue Jun 16 16:58:40 2020 +0530
ATLAS-3822:- UI changes: Audit entries for TypeDefs CREATE, UPDATE and
DELETE
(cherry picked from commit 813bab6439d5e6be135cb178ac846056c446fd9b)
---
dashboardv2/public/css/scss/business-metadata.scss | 23 ++-
dashboardv2/public/css/scss/common.scss| 10 ++
dashboardv2/public/css/scss/override.scss | 12 +-
.../audit/AdminAuditTableLayoutView_tmpl.html | 3 -
dashboardv2/public/js/utils/Enums.js | 19 ++-
.../js/views/audit/AdminAuditTableLayoutView.js| 162 +
dashboardv3/public/css/scss/business-metadata.scss | 23 ++-
dashboardv3/public/css/scss/common.scss| 10 ++
dashboardv3/public/css/scss/override.scss | 12 +-
.../audit/AdminAuditTableLayoutView_tmpl.html | 3 -
dashboardv3/public/js/utils/Enums.js | 19 ++-
.../js/views/audit/AdminAuditTableLayoutView.js| 162 +
12 files changed, 320 insertions(+), 138 deletions(-)
diff --git a/dashboardv2/public/css/scss/business-metadata.scss
b/dashboardv2/public/css/scss/business-metadata.scss
index 148810a..1d4d737 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -90,6 +90,10 @@
.business-metadata-details,
.admin-details {
+.tableOverlay {
+background-color: transparent;
+}
+
.expandable .attr-details {
max-height: 300px;
overflow: auto;
@@ -97,8 +101,18 @@
width: calc(100% - 30px);
}
-.admin-type-dropdown {
-width: 100px;
+.expandable .admin-audit-details {
+display: flex;
+flex-wrap: wrap;
+margin-left: 20px;
+
+.attr-type-container {
+border: 1px solid #ddd;
+border-radius: 4px;
+padding: 5px 10px;
+margin: 5px;
+width: 32%;
+}
}
.expandable .admin-attr-details {
@@ -108,6 +122,11 @@
}
}
+.admin-details .expandable .admin-audit-details .attr-type-container {
+max-height: 200px;
+overflow: auto;
+}
+
.tab-pane {
.business-metadata-attr-page {
position: absolute;
diff --git a/dashboardv2/public/css/scss/common.scss
b/dashboardv2/public/css/scss/common.scss
index 9e3c904..b51a6f2 100644
--- a/dashboardv2/public/css/scss/common.scss
+++ b/dashboardv2/public/css/scss/common.scss
@@ -318,4 +318,14 @@ pre {
font-size: 11px;
animation: spin 1000ms infinite linear;
}
+}
+
+.attr-details {
+ul {
+list-style: disc;
+
+li {
+cursor: pointer;
+}
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index de5462c..a2f83ca 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -63,13 +63,22 @@
.modal-body {
position: relative;
padding: 15px;
-max-height: calc(100vh - 200px);
+max-height: calc(100vh - 215px);
min-height: 70px;
overflow: auto;
.btn+.btn {
margin-bottom: 2px;
}
+
+.admin-audit-details {
+border: 1px solid #ddd;
+border-radius: 4px;
+
+tr>td:nth-child(2) {
+text-align: right;
+}
+}
}
.modal-full-screen {
@@ -77,7 +86,6 @@
height: 80vh;
.modal-content {
-height: inherit;
width: 100%;
}
diff --git
a/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
b/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
index f1dc256..62bef23 100644
--- a/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
@@ -51,9 +51,6 @@
Close
-
-
-
diff --git a/dashboardv2/public/js/utils/Enums.js
b/dashboardv2/public/js/utils/Enums.js
index 131a08f..5db6396 100644
--- a/dashboardv2/public/js/utils/Enums.js
+++ b/dashboardv2/public/js/utils/Enums.js
@@ -41,7 +41,24 @@ define(["require", "backbone"], function(require) {
ENTITY_PURGE: "Entity Purged",
BUSINESS_ATTRIBUTE_ADD: "Business Attribute(s) Added",
BUSINESS_ATTRIBUTE_UPDATE: "Business Attribute(s) Updated",
-BUSINESS_ATTRIBUTE_DELETE: "Business Attribute(s) Deleted"
+BUSINESS_ATTRIBUTE_DELETE: "Business Attribute(s) Deleted&
[atlas] branch master updated: ATLAS-3822:- UI changes: Audit entries for TypeDefs CREATE, UPDATE and DELETE
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 813bab6 ATLAS-3822:- UI changes: Audit entries for TypeDefs CREATE,
UPDATE and DELETE
813bab6 is described below
commit 813bab6439d5e6be135cb178ac846056c446fd9b
Author: kevalbhatt
AuthorDate: Tue Jun 16 16:58:40 2020 +0530
ATLAS-3822:- UI changes: Audit entries for TypeDefs CREATE, UPDATE and
DELETE
---
dashboardv2/public/css/scss/business-metadata.scss | 23 ++-
dashboardv2/public/css/scss/common.scss| 10 ++
dashboardv2/public/css/scss/override.scss | 12 +-
.../audit/AdminAuditTableLayoutView_tmpl.html | 3 -
dashboardv2/public/js/utils/Enums.js | 19 ++-
.../js/views/audit/AdminAuditTableLayoutView.js| 162 +
dashboardv3/public/css/scss/business-metadata.scss | 23 ++-
dashboardv3/public/css/scss/common.scss| 10 ++
dashboardv3/public/css/scss/override.scss | 12 +-
.../audit/AdminAuditTableLayoutView_tmpl.html | 3 -
dashboardv3/public/js/utils/Enums.js | 19 ++-
.../js/views/audit/AdminAuditTableLayoutView.js| 162 +
12 files changed, 320 insertions(+), 138 deletions(-)
diff --git a/dashboardv2/public/css/scss/business-metadata.scss
b/dashboardv2/public/css/scss/business-metadata.scss
index 148810a..1d4d737 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -90,6 +90,10 @@
.business-metadata-details,
.admin-details {
+.tableOverlay {
+background-color: transparent;
+}
+
.expandable .attr-details {
max-height: 300px;
overflow: auto;
@@ -97,8 +101,18 @@
width: calc(100% - 30px);
}
-.admin-type-dropdown {
-width: 100px;
+.expandable .admin-audit-details {
+display: flex;
+flex-wrap: wrap;
+margin-left: 20px;
+
+.attr-type-container {
+border: 1px solid #ddd;
+border-radius: 4px;
+padding: 5px 10px;
+margin: 5px;
+width: 32%;
+}
}
.expandable .admin-attr-details {
@@ -108,6 +122,11 @@
}
}
+.admin-details .expandable .admin-audit-details .attr-type-container {
+max-height: 200px;
+overflow: auto;
+}
+
.tab-pane {
.business-metadata-attr-page {
position: absolute;
diff --git a/dashboardv2/public/css/scss/common.scss
b/dashboardv2/public/css/scss/common.scss
index 9e3c904..b51a6f2 100644
--- a/dashboardv2/public/css/scss/common.scss
+++ b/dashboardv2/public/css/scss/common.scss
@@ -318,4 +318,14 @@ pre {
font-size: 11px;
animation: spin 1000ms infinite linear;
}
+}
+
+.attr-details {
+ul {
+list-style: disc;
+
+li {
+cursor: pointer;
+}
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index de5462c..a2f83ca 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -63,13 +63,22 @@
.modal-body {
position: relative;
padding: 15px;
-max-height: calc(100vh - 200px);
+max-height: calc(100vh - 215px);
min-height: 70px;
overflow: auto;
.btn+.btn {
margin-bottom: 2px;
}
+
+.admin-audit-details {
+border: 1px solid #ddd;
+border-radius: 4px;
+
+tr>td:nth-child(2) {
+text-align: right;
+}
+}
}
.modal-full-screen {
@@ -77,7 +86,6 @@
height: 80vh;
.modal-content {
-height: inherit;
width: 100%;
}
diff --git
a/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
b/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
index f1dc256..62bef23 100644
--- a/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/audit/AdminAuditTableLayoutView_tmpl.html
@@ -51,9 +51,6 @@
Close
-
-
-
diff --git a/dashboardv2/public/js/utils/Enums.js
b/dashboardv2/public/js/utils/Enums.js
index 131a08f..5db6396 100644
--- a/dashboardv2/public/js/utils/Enums.js
+++ b/dashboardv2/public/js/utils/Enums.js
@@ -41,7 +41,24 @@ define(["require", "backbone"], function(require) {
ENTITY_PURGE: "Entity Purged",
BUSINESS_ATTRIBUTE_ADD: "Business Attribute(s) Added",
BUSINESS_ATTRIBUTE_UPDATE: "Business Attribute(s) Updated",
-BUSI
[atlas] branch branch-2.0 updated: ATLAS-3900: UI: Allow user to select the date range for date attribute in basic search
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 c27883c ATLAS-3900: UI: Allow user to select the date range for date
attribute in basic search
c27883c is described below
commit c27883ccc38d07ddc6aa273f38d20920b8035a38
Author: kevalbhatt
AuthorDate: Fri Aug 7 18:16:33 2020 +0530
ATLAS-3900: UI: Allow user to select the date range for date attribute in
basic search
(cherry picked from commit 41eebcf4cf435d37c5e67aea916513eac36e3ee5)
---
dashboardv2/package-lock.json | 6 +-
dashboardv2/package.json | 2 +-
dashboardv2/public/css/scss/override.scss | 24 ++-
dashboardv2/public/js/utils/CommonViewFunction.js | 89
dashboardv2/public/js/utils/Enums.js | 37 +++-
.../public/js/views/search/QueryBuilderView.js | 236 +++--
dashboardv3/package-lock.json | 6 +-
dashboardv3/package.json | 2 +-
dashboardv3/public/css/scss/override.scss | 22 +-
dashboardv3/public/js/main.js | 1 -
.../search/SearchDefaultLayoutView_tmpl.html | 6 +-
dashboardv3/public/js/utils/CommonViewFunction.js | 88
dashboardv3/public/js/utils/Enums.js | 37 +++-
.../public/js/views/search/QueryBuilderView.js | 236 +++--
.../js/views/search/tree/EntityTreeLayoutView.js | 3 +-
15 files changed, 536 insertions(+), 259 deletions(-)
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index afc9fb3..b0afc0b 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -357,9 +357,9 @@
"integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
},
"bootstrap-daterangepicker": {
- "version": "2.1.25",
- "resolved":
"https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-2.1.25.tgz;,
- "integrity": "sha1-/Ni6C3VaBU0zDXo7fE3Yu4Vc/7c=",
+ "version": "3.1.0",
+ "resolved":
"https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-3.1.0.tgz;,
+ "integrity":
"sha512-oaQZx6ZBDo/dZNyXGVi2rx5GmFXThyQLAxdtIqjtLlYVaQUfQALl5JZMJJZzyDIX7blfy4ppZPAJ10g8Ma4d/g==",
"requires": {
"jquery": ">=1.10",
"moment": "^2.9.0"
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index e0809d3..1c17c67 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -29,7 +29,7 @@
"backgrid-select-all": "0.3.5",
"backgrid-sizeable-columns": "0.1.1",
"bootstrap": "3.3.7",
-"bootstrap-daterangepicker": "2.1.25",
+"bootstrap-daterangepicker": "3.1.0",
"d3": "3.5.17",
"d3-tip": "0.6.8",
"dagre-d3": "0.6.4",
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index 2bcfde9..de5462c 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -300,7 +300,7 @@
}
.rule-operator-container {
-width: 105px;
+width: 150px;
.form-control {
width: 100% !important;
@@ -507,4 +507,26 @@ div.columnmanager-dropdown-container {
overflow: hidden;
text-overflow: ellipsis;
}
+}
+
+.daterangepicker {
+max-height: 400px;
+overflow-y: scroll;
+
+.ranges {
+max-height: 328px;
+overflow: auto;
+}
+
+.ranges li.active,
+td.active {
+background-color: $color_havelock_blue_approx;
+}
+
+.drp-buttons {
+.applyBtn {
+background-color: $color_havelock_blue_approx;
+border-color: $color_havelock_blue_approx;
+}
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index a1c5ad3..4d10fa6 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages',
'utils/Enums', 'moment', 'utils/Globals'], function(require, Utils, Modal,
Messages, Enums, moment, Globals) {
+define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages',
'utils/Enums', 'moment', 'utils/Globals', 'moment-timezone'], function(require,
Ut
[atlas] 02/02: ATLAS-3900: UI: Allow user to select the date range for date attribute in basic search
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
commit 41eebcf4cf435d37c5e67aea916513eac36e3ee5
Author: kevalbhatt
AuthorDate: Fri Aug 7 18:16:33 2020 +0530
ATLAS-3900: UI: Allow user to select the date range for date attribute in
basic search
---
dashboardv2/package-lock.json | 6 +-
dashboardv2/package.json | 2 +-
dashboardv2/public/css/scss/override.scss | 24 ++-
dashboardv2/public/js/utils/CommonViewFunction.js | 89
dashboardv2/public/js/utils/Enums.js | 37 +++-
.../public/js/views/search/QueryBuilderView.js | 236 +++--
dashboardv3/package-lock.json | 6 +-
dashboardv3/package.json | 2 +-
dashboardv3/public/css/scss/override.scss | 22 +-
dashboardv3/public/js/main.js | 1 -
.../search/SearchDefaultLayoutView_tmpl.html | 6 +-
dashboardv3/public/js/utils/CommonViewFunction.js | 88
dashboardv3/public/js/utils/Enums.js | 37 +++-
.../public/js/views/search/QueryBuilderView.js | 236 +++--
.../js/views/search/tree/EntityTreeLayoutView.js | 3 +-
15 files changed, 536 insertions(+), 259 deletions(-)
diff --git a/dashboardv2/package-lock.json b/dashboardv2/package-lock.json
index afc9fb3..b0afc0b 100644
--- a/dashboardv2/package-lock.json
+++ b/dashboardv2/package-lock.json
@@ -357,9 +357,9 @@
"integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
},
"bootstrap-daterangepicker": {
- "version": "2.1.25",
- "resolved":
"https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-2.1.25.tgz;,
- "integrity": "sha1-/Ni6C3VaBU0zDXo7fE3Yu4Vc/7c=",
+ "version": "3.1.0",
+ "resolved":
"https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-3.1.0.tgz;,
+ "integrity":
"sha512-oaQZx6ZBDo/dZNyXGVi2rx5GmFXThyQLAxdtIqjtLlYVaQUfQALl5JZMJJZzyDIX7blfy4ppZPAJ10g8Ma4d/g==",
"requires": {
"jquery": ">=1.10",
"moment": "^2.9.0"
diff --git a/dashboardv2/package.json b/dashboardv2/package.json
index e0809d3..1c17c67 100644
--- a/dashboardv2/package.json
+++ b/dashboardv2/package.json
@@ -29,7 +29,7 @@
"backgrid-select-all": "0.3.5",
"backgrid-sizeable-columns": "0.1.1",
"bootstrap": "3.3.7",
-"bootstrap-daterangepicker": "2.1.25",
+"bootstrap-daterangepicker": "3.1.0",
"d3": "3.5.17",
"d3-tip": "0.6.8",
"dagre-d3": "0.6.4",
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index 2bcfde9..de5462c 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -300,7 +300,7 @@
}
.rule-operator-container {
-width: 105px;
+width: 150px;
.form-control {
width: 100% !important;
@@ -507,4 +507,26 @@ div.columnmanager-dropdown-container {
overflow: hidden;
text-overflow: ellipsis;
}
+}
+
+.daterangepicker {
+max-height: 400px;
+overflow-y: scroll;
+
+.ranges {
+max-height: 328px;
+overflow: auto;
+}
+
+.ranges li.active,
+td.active {
+background-color: $color_havelock_blue_approx;
+}
+
+.drp-buttons {
+.applyBtn {
+background-color: $color_havelock_blue_approx;
+border-color: $color_havelock_blue_approx;
+}
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index a1c5ad3..4d10fa6 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages',
'utils/Enums', 'moment', 'utils/Globals'], function(require, Utils, Modal,
Messages, Enums, moment, Globals) {
+define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages',
'utils/Enums', 'moment', 'utils/Globals', 'moment-timezone'], function(require,
Utils, Modal, Messages, Enums, moment, Globals) {
'use strict';
var CommonViewFunction = {};
@@ -387,9 +387,13 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
function objToString(filterObj) {
var generatedQuery = _.map(fil
[atlas] branch master updated (83e9c21 -> 41eebcf)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git. from 83e9c21 ATLAS-3875: updated sample client to improve logging new 1b41b98 ATLAS-3892 : Basic search enhanced Feature - Search history new 41eebcf ATLAS-3900: UI: Allow user to select the date range for date attribute in basic search The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/atlas/repository/Constants.java | 1 + dashboardv2/package-lock.json | 6 +- dashboardv2/package.json | 2 +- dashboardv2/public/css/scss/override.scss | 24 ++- dashboardv2/public/js/utils/CommonViewFunction.js | 89 dashboardv2/public/js/utils/Enums.js | 37 +++- .../public/js/views/search/QueryBuilderView.js | 236 ++-- dashboardv3/package-lock.json | 6 +- dashboardv3/package.json | 2 +- dashboardv3/public/css/scss/override.scss | 22 +- dashboardv3/public/js/main.js | 1 - .../search/SearchDefaultLayoutView_tmpl.html | 6 +- dashboardv3/public/js/utils/CommonViewFunction.js | 88 dashboardv3/public/js/utils/Enums.js | 37 +++- .../public/js/views/search/QueryBuilderView.js | 236 ++-- .../js/views/search/tree/EntityTreeLayoutView.js | 3 +- .../atlas/model/discovery/SearchParameters.java| 5 + .../apache/atlas/discovery/SearchProcessor.java| 181 ++-- .../org/apache/atlas/util/SearchPredicateUtil.java | 58 - .../atlas/discovery/EntitySearchProcessorTest.java | 238 + 20 files changed, 1004 insertions(+), 274 deletions(-)
[atlas] 01/02: ATLAS-3892 : Basic search enhanced Feature - Search history
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
commit 1b41b980415961419bb4af8710bd82f34395779c
Author: chaitali borole
AuthorDate: Mon Aug 10 20:01:00 2020 +0530
ATLAS-3892 : Basic search enhanced Feature - Search history
Signed-off-by: kevalbhatt
---
.../org/apache/atlas/repository/Constants.java | 1 +
.../atlas/model/discovery/SearchParameters.java| 5 +
.../apache/atlas/discovery/SearchProcessor.java| 181 ++--
.../org/apache/atlas/util/SearchPredicateUtil.java | 58 -
.../atlas/discovery/EntitySearchProcessorTest.java | 238 +
5 files changed, 468 insertions(+), 15 deletions(-)
diff --git a/common/src/main/java/org/apache/atlas/repository/Constants.java
b/common/src/main/java/org/apache/atlas/repository/Constants.java
index a71787b..61abfca 100644
--- a/common/src/main/java/org/apache/atlas/repository/Constants.java
+++ b/common/src/main/java/org/apache/atlas/repository/Constants.java
@@ -188,6 +188,7 @@ public final class Constants {
public static final String TERM_ASSIGNMENT_LABEL
= "r:AtlasGlossarySemanticAssignment";
public static final String ATTRIBUTE_INDEX_PROPERTY_KEY
= encodePropertyKey(INTERNAL_PROPERTY_KEY_PREFIX + "index");
public static final String ATTRIBUTE_KEY_PROPERTY_KEY
= encodePropertyKey(INTERNAL_PROPERTY_KEY_PREFIX + "key");
+public static final String ATTRIBUTE_VALUE_DELIMITER
= ",";
public static final String VERTEX_ID_IN_IMPORT_KEY = "__vIdInImport";
public static final String EDGE_ID_IN_IMPORT_KEY = "__eIdInImport";
diff --git
a/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
b/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
index fcc4494..367c5b8 100644
--- a/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
+++ b/intg/src/main/java/org/apache/atlas/model/discovery/SearchParameters.java
@@ -443,6 +443,10 @@ public class SearchParameters implements Serializable {
* Logical comparision operators can only be used with numbers or dates
* IN, LIKE, startsWith, endsWith, CONTAINS can only be used with strings
or text
*/
+
+/**
+ * NOTE : The names added in the String array should always contain first
value in lower case
+ */
public enum Operator {
LT(new String[]{"<", "lt"}),
GT(new String[]{">", "gt"}),
@@ -460,6 +464,7 @@ public class SearchParameters implements Serializable {
CONTAINS_ALL(new String[]{"containsAll", "CONTAINSALL",
"contains_all", "CONTAINS_ALL"}),
IS_NULL(new String[]{"isNull", "ISNULL", "is_null", "IS_NULL"}),
NOT_NULL(new String[]{"notNull", "NOTNULL", "not_null", "NOT_NULL"}),
+TIME_RANGE(new String[]{"timerange",
"TIMERANGE","time_range","TIME_RANGE"})
;
static final Map operatorsMap = new HashMap<>();
diff --git
a/repository/src/main/java/org/apache/atlas/discovery/SearchProcessor.java
b/repository/src/main/java/org/apache/atlas/discovery/SearchProcessor.java
index c5e3d6f..da9dd66 100644
--- a/repository/src/main/java/org/apache/atlas/discovery/SearchProcessor.java
+++ b/repository/src/main/java/org/apache/atlas/discovery/SearchProcessor.java
@@ -17,6 +17,7 @@
*/
package org.apache.atlas.discovery;
+import com.google.common.annotations.VisibleForTesting;
import org.apache.atlas.ApplicationProperties;
import org.apache.atlas.AtlasException;
import org.apache.atlas.SortOrder;
@@ -46,6 +47,8 @@ import org.slf4j.LoggerFactory;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.regex.Pattern;
@@ -121,6 +124,9 @@ public abstract class SearchProcessor {
OPERATOR_MAP.put(SearchParameters.Operator.NOT_NULL,
INDEX_SEARCH_PREFIX + "\"%s\":[* TO *]");
OPERATOR_PREDICATE_MAP.put(SearchParameters.Operator.NOT_NULL,
getNotNullPredicateGenerator());
+
+OPERATOR_MAP.put(SearchParameters.Operator.TIME_RANGE,
INDEX_SEARCH_PREFIX + "\"%s\": [%s TO %s]");
+OPERATOR_PREDICATE_MAP.put(SearchParameters.Operator.TIME_RANGE,
getInRangePredicateGenerator());
}
protected final SearchContext context;
@@ -523,6 +529,9 @@ public abstract class SearchProcessor {
}
} else if (StringUtils.isNotEmpty(criteria.getAttributeName())) {
try {
+
[atlas] branch branch-2.0 updated: ATLAS-3909: UI: Improve readability for the table view in the entity detail page
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 c1513ba ATLAS-3909: UI: Improve readability for the table view in the
entity detail page
c1513ba is described below
commit c1513bacc9027e1e44d2ad61a04c6272b21d2e1b
Author: kevalbhatt
AuthorDate: Mon Aug 3 17:22:36 2020 +0530
ATLAS-3909: UI: Improve readability for the table view in the entity detail
page
(cherry picked from commit ba1b40f0426e5ff0e621eab5184d916a6f506f59)
---
dashboardv2/public/css/scss/table.scss| 4
.../js/templates/entity/EntityDetailTableLayoutView_tmpl.html | 2 +-
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 +-
dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html | 8 +---
.../public/js/templates/graph/RelationshipLayoutView_tmpl.html| 2 +-
dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js | 2 +-
dashboardv3/public/css/scss/table.scss| 4
dashboardv3/public/css/scss/theme.scss| 2 +-
.../js/templates/entity/EntityDetailTableLayoutView_tmpl.html | 2 +-
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 +-
dashboardv3/public/js/templates/graph/LineageLayoutView_tmpl.html | 8 +---
.../public/js/templates/graph/RelationshipLayoutView_tmpl.html| 2 +-
dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js | 2 +-
13 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/dashboardv2/public/css/scss/table.scss
b/dashboardv2/public/css/scss/table.scss
index 669bcfc..519d083 100644
--- a/dashboardv2/public/css/scss/table.scss
+++ b/dashboardv2/public/css/scss/table.scss
@@ -14,6 +14,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+.table.bold-key>tbody>tr>td:first-child {
+font-weight: 600;
+}
+
tr.empty {
td {
display: table-cell;
diff --git
a/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
index cdceb77..3fe0e95 100644
---
a/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
+++
b/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
@@ -38,7 +38,7 @@
-
+
diff --git
a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
index 074d39b..d1a9128 100644
--- a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
@@ -75,7 +75,7 @@
{{else}}
-
+
{{#each customAttibutes}}
diff --git a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
index 8679c3b..38697e3 100644
--- a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
@@ -123,13 +123,7 @@
-
-
-
-Key
-Value
-
-
+
diff --git
a/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
b/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
index 47aaad7..acf9bb3 100644
--- a/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
@@ -61,7 +61,7 @@
-
+
Key
diff --git a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
index 5e4643e..2b4ec8f 100644
--- a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -262,7 +262,7 @@ define([
' ' +
'' +
'' +
-'' + tableBody +
'' +
+'' +
tableBody + '' +
'';
},
onRender: function() {
diff --git a/dashboardv3/public/css/scss/table.scss
b/dashboardv3/public/css/scss/t
[atlas] branch master updated: ATLAS-3909: UI: Improve readability for the table view in the entity detail page
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 ba1b40f ATLAS-3909: UI: Improve readability for the table view in the
entity detail page
ba1b40f is described below
commit ba1b40f0426e5ff0e621eab5184d916a6f506f59
Author: kevalbhatt
AuthorDate: Mon Aug 3 17:22:36 2020 +0530
ATLAS-3909: UI: Improve readability for the table view in the entity detail
page
---
dashboardv2/public/css/scss/table.scss| 4
.../js/templates/entity/EntityDetailTableLayoutView_tmpl.html | 2 +-
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 +-
dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html | 8 +---
.../public/js/templates/graph/RelationshipLayoutView_tmpl.html| 2 +-
dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js | 2 +-
dashboardv3/public/css/scss/table.scss| 4
dashboardv3/public/css/scss/theme.scss| 2 +-
.../js/templates/entity/EntityDetailTableLayoutView_tmpl.html | 2 +-
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 +-
dashboardv3/public/js/templates/graph/LineageLayoutView_tmpl.html | 8 +---
.../public/js/templates/graph/RelationshipLayoutView_tmpl.html| 2 +-
dashboardv3/public/js/views/entity/EntityBusinessMetaDataView.js | 2 +-
13 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/dashboardv2/public/css/scss/table.scss
b/dashboardv2/public/css/scss/table.scss
index 669bcfc..519d083 100644
--- a/dashboardv2/public/css/scss/table.scss
+++ b/dashboardv2/public/css/scss/table.scss
@@ -14,6 +14,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+.table.bold-key>tbody>tr>td:first-child {
+font-weight: 600;
+}
+
tr.empty {
td {
display: table-cell;
diff --git
a/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
index cdceb77..3fe0e95 100644
---
a/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
+++
b/dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html
@@ -38,7 +38,7 @@
-
+
diff --git
a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
index 074d39b..d1a9128 100644
--- a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
@@ -75,7 +75,7 @@
{{else}}
-
+
{{#each customAttibutes}}
diff --git a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
index 8679c3b..38697e3 100644
--- a/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
@@ -123,13 +123,7 @@
-
-
-
-Key
-Value
-
-
+
diff --git
a/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
b/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
index 47aaad7..acf9bb3 100644
--- a/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/graph/RelationshipLayoutView_tmpl.html
@@ -61,7 +61,7 @@
-
+
Key
diff --git a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
index 5e4643e..2b4ec8f 100644
--- a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -262,7 +262,7 @@ define([
' ' +
'' +
'' +
-'' + tableBody +
'' +
+'' +
tableBody + '' +
'';
},
onRender: function() {
diff --git a/dashboardv3/public/css/scss/table.scss
b/dashboardv3/public/css/scss/table.scss
index 669bcfc..519d083 100644
--- a/dashboardv3/public/css/scss/table.s
[atlas] branch branch-2.0 updated: ATLAS-3904: Regression: Glossary term deatils page not able to render the classfication tab #2
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 65f1a2b ATLAS-3904: Regression: Glossary term deatils page not able
to render the classfication tab #2
65f1a2b is described below
commit 65f1a2bc82779d1371f1cdffb8399893a36c9e7d
Author: kevalbhatt
AuthorDate: Mon Aug 3 16:28:00 2020 +0530
ATLAS-3904: Regression: Glossary term deatils page not able to render the
classfication tab #2
(cherry picked from commit ce2ba123a2b9ce43503d5e101400b93fa5b6267e)
---
.../public/js/views/detail_page/DetailPageLayoutView.js | 15 +++
.../public/js/views/detail_page/DetailPageLayoutView.js | 15 +++
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 7f8d849..4df3562 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -381,19 +381,26 @@ define(['require',
this.$('.fontLoader-relative').addClass('show'); // to show
tab loader
},
manualRender: function(options) {
-if (this.id !== options.id) {
+if (options) {
+var oldId = this.id;
_.extend(this, _.pick(options, 'value', 'id'));
-this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
-this.fetchCollection();
+if (this.id !== oldId) {
+this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
+this.fetchCollection();
+}
+this.updateTab();
}
},
-onShow: function() {
+updateTab: function() {
if (this.value && this.value.tabActive) {
this.$('.nav.nav-tabs').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
this.$('.tab-content').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
$("html, body").animate({ scrollTop:
(this.$('.tab-content').offset().top + 1200) }, 1000);
}
},
+onShow: function() {
+this.updateTab();
+},
onDestroy: function() {
if (!Utils.getUrlState.isDetailPage()) {
$('body').removeClass("detail-page");
diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
index 2a95974..7e140b8 100644
--- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
@@ -385,19 +385,26 @@ define(['require',
this.$('.fontLoader-relative').addClass('show'); // to show
tab loader
},
manualRender: function(options) {
-if (this.id !== options.id) {
+if (options) {
+var oldId = this.id;
_.extend(this, _.pick(options, 'value', 'id'));
-this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
-this.fetchCollection();
+if (this.id !== oldId) {
+this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
+this.fetchCollection();
+}
+this.updateTab();
}
},
-onShow: function() {
+updateTab: function() {
if (this.value && this.value.tabActive) {
this.$('.nav.nav-tabs').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
this.$('.tab-content').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
$("html, body").animate({ scrollTop:
(this.$('.tab-content').offset().top + 1200) }, 1000);
}
},
+onShow: function() {
+this.updateTab();
+},
onDestroy: function() {
if (!Utils.getUrlState.isDetailPage()) {
$('body').removeClass("detail-page");
[atlas] branch master updated: ATLAS-3904: Regression: Glossary term deatils page not able to render the classfication tab #2
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 ce2ba12 ATLAS-3904: Regression: Glossary term deatils page not able
to render the classfication tab #2
ce2ba12 is described below
commit ce2ba123a2b9ce43503d5e101400b93fa5b6267e
Author: kevalbhatt
AuthorDate: Mon Aug 3 16:28:00 2020 +0530
ATLAS-3904: Regression: Glossary term deatils page not able to render the
classfication tab #2
---
.../public/js/views/detail_page/DetailPageLayoutView.js | 15 +++
.../public/js/views/detail_page/DetailPageLayoutView.js | 15 +++
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 7f8d849..4df3562 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -381,19 +381,26 @@ define(['require',
this.$('.fontLoader-relative').addClass('show'); // to show
tab loader
},
manualRender: function(options) {
-if (this.id !== options.id) {
+if (options) {
+var oldId = this.id;
_.extend(this, _.pick(options, 'value', 'id'));
-this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
-this.fetchCollection();
+if (this.id !== oldId) {
+this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
+this.fetchCollection();
+}
+this.updateTab();
}
},
-onShow: function() {
+updateTab: function() {
if (this.value && this.value.tabActive) {
this.$('.nav.nav-tabs').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
this.$('.tab-content').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
$("html, body").animate({ scrollTop:
(this.$('.tab-content').offset().top + 1200) }, 1000);
}
},
+onShow: function() {
+this.updateTab();
+},
onDestroy: function() {
if (!Utils.getUrlState.isDetailPage()) {
$('body').removeClass("detail-page");
diff --git a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
index 2a95974..7e140b8 100644
--- a/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
@@ -385,19 +385,26 @@ define(['require',
this.$('.fontLoader-relative').addClass('show'); // to show
tab loader
},
manualRender: function(options) {
-if (this.id !== options.id) {
+if (options) {
+var oldId = this.id;
_.extend(this, _.pick(options, 'value', 'id'));
-this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
-this.fetchCollection();
+if (this.id !== oldId) {
+this.collection.url = UrlLinks.entitiesApiUrl({ guid:
this.id, minExtInfo: true });
+this.fetchCollection();
+}
+this.updateTab();
}
},
-onShow: function() {
+updateTab: function() {
if (this.value && this.value.tabActive) {
this.$('.nav.nav-tabs').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
this.$('.tab-content').find('[role="' +
this.value.tabActive +
'"]').addClass('active').siblings().removeClass('active');
$("html, body").animate({ scrollTop:
(this.$('.tab-content').offset().top + 1200) }, 1000);
}
},
+onShow: function() {
+this.updateTab();
+},
onDestroy: function() {
if (!Utils.getUrlState.isDetailPage()) {
$('body').removeClass("detail-page");
[atlas] branch branch-2.0 updated: ATLAS-3904: Regression: Glossary term deatils page not able to render the classfication tab
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 9ce6fc3 ATLAS-3904: Regression: Glossary term deatils page not able
to render the classfication tab
9ce6fc3 is described below
commit 9ce6fc38f3ae26cd19aac6b0a229ea61339e716d
Author: kevalbhatt
AuthorDate: Wed Jul 29 18:55:18 2020 +0530
ATLAS-3904: Regression: Glossary term deatils page not able to render the
classfication tab
(cherry picked from commit 38d7b91e4aa205f89d71f85328a513cc61516266)
---
.../views/audit/ReplicationAuditTableLayoutView.js | 4 +--
.../js/views/glossary/GlossaryDetailLayoutView.js | 31 +-
.../views/audit/ReplicationAuditTableLayoutView.js | 4 +--
.../js/views/glossary/GlossaryDetailLayoutView.js | 31 +-
4 files changed, 64 insertions(+), 6 deletions(-)
diff --git
a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
index 0d7c95d..f48470b 100644
--- a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
@@ -29,7 +29,7 @@ define(['require',
'use strict';
var ReplicationAuditTableLayoutView =
Backbone.Marionette.LayoutView.extend(
-/** @lends TagDetailTableLayoutView */
+/** @lends ReplicationAuditTableLayoutView */
{
_viewName: 'ReplicationAuditTableLayoutView',
@@ -48,7 +48,7 @@ define(['require',
return events;
},
/**
- * intialize a new TagDetailTableLayoutView Layout
+ * intialize a new ReplicationAuditTableLayoutView Layout
* @constructs
*/
initialize: function(options) {
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 465c4ab..d9f1fb9 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -232,7 +232,36 @@ define(['require',
if (that.isDestroyed) {
return;
}
+that.data = data;
if (that.isTermView) {
+var tags = {
+'self': [],
+'propagated': [],
+'propagatedMap': {},
+'combineMap': {}
+};
+if (that.data) {
+var tagObject =
that.data.classifications;
+_.each(tagObject, function(val) {
+var typeName = val.typeName;
+if (val.entityGuid === that.guid) {
+tags['self'].push(val)
+} else {
+tags['propagated'].push(val);
+if
(tags.propagatedMap[typeName]) {
+
tags.propagatedMap[typeName]["count"] += tags.propagatedMap[typeName]["count"];
+} else {
+
tags.propagatedMap[typeName] = val;
+
tags.propagatedMap[typeName]["count"] = 1;
+}
+}
+if (tags.combineMap[typeName] ===
undefined) {
+tags.combineMap[typeName] =
val;
+}
+});
+tags.self = _.sortBy(tags.self,
"typeName");
+tags.propagated =
_.sortBy(tags.propagated, "typeName");
+}
var obj = {
"guid": that.guid,
"entityDefCollection":
that.entityDefCollection,
@@ -242,6 +271,7 @@ define(['require',
"classificationDefCollection":
that.classificationDefCollection,
[atlas] branch master updated: ATLAS-3904: Regression: Glossary term deatils page not able to render the classfication tab
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 38d7b91 ATLAS-3904: Regression: Glossary term deatils page not able
to render the classfication tab
38d7b91 is described below
commit 38d7b91e4aa205f89d71f85328a513cc61516266
Author: kevalbhatt
AuthorDate: Wed Jul 29 18:55:18 2020 +0530
ATLAS-3904: Regression: Glossary term deatils page not able to render the
classfication tab
---
.../views/audit/ReplicationAuditTableLayoutView.js | 4 +--
.../js/views/glossary/GlossaryDetailLayoutView.js | 31 +-
.../views/audit/ReplicationAuditTableLayoutView.js | 4 +--
.../js/views/glossary/GlossaryDetailLayoutView.js | 31 +-
4 files changed, 64 insertions(+), 6 deletions(-)
diff --git
a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
index 0d7c95d..f48470b 100644
--- a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
@@ -29,7 +29,7 @@ define(['require',
'use strict';
var ReplicationAuditTableLayoutView =
Backbone.Marionette.LayoutView.extend(
-/** @lends TagDetailTableLayoutView */
+/** @lends ReplicationAuditTableLayoutView */
{
_viewName: 'ReplicationAuditTableLayoutView',
@@ -48,7 +48,7 @@ define(['require',
return events;
},
/**
- * intialize a new TagDetailTableLayoutView Layout
+ * intialize a new ReplicationAuditTableLayoutView Layout
* @constructs
*/
initialize: function(options) {
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 465c4ab..d9f1fb9 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -232,7 +232,36 @@ define(['require',
if (that.isDestroyed) {
return;
}
+that.data = data;
if (that.isTermView) {
+var tags = {
+'self': [],
+'propagated': [],
+'propagatedMap': {},
+'combineMap': {}
+};
+if (that.data) {
+var tagObject =
that.data.classifications;
+_.each(tagObject, function(val) {
+var typeName = val.typeName;
+if (val.entityGuid === that.guid) {
+tags['self'].push(val)
+} else {
+tags['propagated'].push(val);
+if
(tags.propagatedMap[typeName]) {
+
tags.propagatedMap[typeName]["count"] += tags.propagatedMap[typeName]["count"];
+} else {
+
tags.propagatedMap[typeName] = val;
+
tags.propagatedMap[typeName]["count"] = 1;
+}
+}
+if (tags.combineMap[typeName] ===
undefined) {
+tags.combineMap[typeName] =
val;
+}
+});
+tags.self = _.sortBy(tags.self,
"typeName");
+tags.propagated =
_.sortBy(tags.propagated, "typeName");
+}
var obj = {
"guid": that.guid,
"entityDefCollection":
that.entityDefCollection,
@@ -242,6 +271,7 @@ define(['require',
"classificationDefCollection":
that.classificationDefCollection,
"glossaryCollection":
that.
[atlas] branch branch-2.0 updated: ATLAS-3897: UI: Normalize list of propagated classifications
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 6f3fc5a ATLAS-3897: UI: Normalize list of propagated classifications
6f3fc5a is described below
commit 6f3fc5ac3c9b14b6ecfea00c71effe2564504119
Author: kevalbhatt
AuthorDate: Tue Jul 21 16:22:05 2020 +0530
ATLAS-3897: UI: Normalize list of propagated classifications
(cherry picked from commit ec314fdeb871a479194af5b543a72df76472cb4c)
---
dashboardv2/public/css/scss/form.scss | 5 +
dashboardv2/public/js/router/Router.js | 34 ---
.../tag/TagDetailTableLayoutView_tmpl.html | 3 +-
dashboardv2/public/js/utils/Helper.js | 2 +-
.../js/views/detail_page/DetailPageLayoutView.js | 70 ++
.../js/views/tag/TagDetailTableLayoutView.js | 104 ++---
dashboardv3/public/css/scss/form.scss | 5 +
dashboardv3/public/js/main.js | 6 +-
dashboardv3/public/js/router/Router.js | 18 +++-
.../tag/TagDetailTableLayoutView_tmpl.html | 3 +-
dashboardv3/public/js/utils/Helper.js | 2 +-
.../js/views/detail_page/DetailPageLayoutView.js | 70 ++
.../js/views/tag/TagDetailTableLayoutView.js | 104 ++---
13 files changed, 348 insertions(+), 78 deletions(-)
diff --git a/dashboardv2/public/css/scss/form.scss
b/dashboardv2/public/css/scss/form.scss
index 853b103..68761e1 100644
--- a/dashboardv2/public/css/scss/form.scss
+++ b/dashboardv2/public/css/scss/form.scss
@@ -369,6 +369,11 @@ button {
>span {
padding: 5px;
+&.active {
+color: $white;
+background-color: $tag_color;
+}
+
&:hover {
@include btn-action-hover-effect('default');
}
diff --git a/dashboardv2/public/js/router/Router.js
b/dashboardv2/public/js/router/Router.js
index 5e94597..8e3afa0 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -106,11 +106,18 @@ define([
renderViewIfNotExists: function(options) {
var view = options.view,
render = options.render,
+viewName = options.viewName,
manualRender = options.manualRender;
if (!view.currentView) {
-if (render) view.show(options.render());
+if (render) view.show(options.render(options));
+} else if (manualRender && viewName) {
+if (viewName === view.currentView._viewName) {
+options.manualRender(options);
+} else {
+if (render) view.show(options.render(options));
+}
} else {
-if (manualRender) options.manualRender();
+if (manualRender) options.manualRender(options);
}
},
@@ -149,13 +156,7 @@ define([
detailPage: function(id) {
var that = this;
if (id) {
-require([
-'views/site/Header',
-'views/detail_page/DetailPageLayoutView',
-'views/site/SideNavLayoutView',
-'collection/VEntityList'
-], function(Header, DetailPageLayoutView, SideNavLayoutView,
VEntityList) {
-this.entityCollection = new VEntityList([], {});
+require(["views/site/Header",
"views/detail_page/DetailPageLayoutView", "views/site/SideNavLayoutView"],
function(Header, DetailPageLayoutView, SideNavLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(),
options = _.extend({}, that.preFetchedCollectionLists,
that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
@@ -168,9 +169,18 @@ define([
return new SideNavLayoutView(options);
}
});
-App.rNContent.show(new DetailPageLayoutView(_.extend({
'collection': this.entityCollection, 'id': id, 'value': paramObj }, options)));
-this.entityCollection.url = UrlLinks.entitiesApiUrl({
guid: id, minExtInfo: true });
-this.entityCollection.fetch({ reset: true });
+
+var dOptions = _.extend({ id: id, value: paramObj },
options);
+that.renderViewIfNotExists({
+view: App.rNContent,
+viewName: "DetailPageLayoutView",
+manualRender: function() {
+
[atlas] branch master updated: ATLAS-3897: UI: Normalize list of propagated classifications
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 ec314fd ATLAS-3897: UI: Normalize list of propagated classifications
ec314fd is described below
commit ec314fdeb871a479194af5b543a72df76472cb4c
Author: kevalbhatt
AuthorDate: Tue Jul 21 16:22:05 2020 +0530
ATLAS-3897: UI: Normalize list of propagated classifications
---
dashboardv2/public/css/scss/form.scss | 5 +
dashboardv2/public/js/router/Router.js | 34 ---
.../tag/TagDetailTableLayoutView_tmpl.html | 3 +-
dashboardv2/public/js/utils/Helper.js | 2 +-
.../js/views/detail_page/DetailPageLayoutView.js | 70 ++
.../js/views/tag/TagDetailTableLayoutView.js | 104 ++---
dashboardv3/public/css/scss/form.scss | 5 +
dashboardv3/public/js/main.js | 6 +-
dashboardv3/public/js/router/Router.js | 18 +++-
.../tag/TagDetailTableLayoutView_tmpl.html | 3 +-
dashboardv3/public/js/utils/Helper.js | 2 +-
.../js/views/detail_page/DetailPageLayoutView.js | 70 ++
.../js/views/tag/TagDetailTableLayoutView.js | 104 ++---
13 files changed, 348 insertions(+), 78 deletions(-)
diff --git a/dashboardv2/public/css/scss/form.scss
b/dashboardv2/public/css/scss/form.scss
index 853b103..68761e1 100644
--- a/dashboardv2/public/css/scss/form.scss
+++ b/dashboardv2/public/css/scss/form.scss
@@ -369,6 +369,11 @@ button {
>span {
padding: 5px;
+&.active {
+color: $white;
+background-color: $tag_color;
+}
+
&:hover {
@include btn-action-hover-effect('default');
}
diff --git a/dashboardv2/public/js/router/Router.js
b/dashboardv2/public/js/router/Router.js
index 5e94597..8e3afa0 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -106,11 +106,18 @@ define([
renderViewIfNotExists: function(options) {
var view = options.view,
render = options.render,
+viewName = options.viewName,
manualRender = options.manualRender;
if (!view.currentView) {
-if (render) view.show(options.render());
+if (render) view.show(options.render(options));
+} else if (manualRender && viewName) {
+if (viewName === view.currentView._viewName) {
+options.manualRender(options);
+} else {
+if (render) view.show(options.render(options));
+}
} else {
-if (manualRender) options.manualRender();
+if (manualRender) options.manualRender(options);
}
},
@@ -149,13 +156,7 @@ define([
detailPage: function(id) {
var that = this;
if (id) {
-require([
-'views/site/Header',
-'views/detail_page/DetailPageLayoutView',
-'views/site/SideNavLayoutView',
-'collection/VEntityList'
-], function(Header, DetailPageLayoutView, SideNavLayoutView,
VEntityList) {
-this.entityCollection = new VEntityList([], {});
+require(["views/site/Header",
"views/detail_page/DetailPageLayoutView", "views/site/SideNavLayoutView"],
function(Header, DetailPageLayoutView, SideNavLayoutView) {
var paramObj = Utils.getUrlState.getQueryParams(),
options = _.extend({}, that.preFetchedCollectionLists,
that.sharedObj, that.ventObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
@@ -168,9 +169,18 @@ define([
return new SideNavLayoutView(options);
}
});
-App.rNContent.show(new DetailPageLayoutView(_.extend({
'collection': this.entityCollection, 'id': id, 'value': paramObj }, options)));
-this.entityCollection.url = UrlLinks.entitiesApiUrl({
guid: id, minExtInfo: true });
-this.entityCollection.fetch({ reset: true });
+
+var dOptions = _.extend({ id: id, value: paramObj },
options);
+that.renderViewIfNotExists({
+view: App.rNContent,
+viewName: "DetailPageLayoutView",
+manualRender: function() {
+this.view.currentView.manualRender(dOptions);
+},
+render: function() {
+
[atlas] branch branch-2.0 updated: ATLAS-3894: UI: User is able to add and remove business metadata from deleted entities
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 63c1263 ATLAS-3894: UI: User is able to add and remove business
metadata from deleted entities
63c1263 is described below
commit 63c1263120e92c991723a1e6f7bf7ca8e45a95b4
Author: kevalbhatt
AuthorDate: Fri Jul 17 19:15:28 2020 +0530
ATLAS-3894: UI: User is able to add and remove business metadata from
deleted entities
(cherry picked from commit 7e06f55fc952f7fbbd18eb717f70ae211085068d)
---
.../js/templates/entity/EntityBusinessMetaDataView_tmpl.html | 2 ++
.../js/templates/entity/EntityLabelDefineView_tmpl.html | 2 ++
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 ++
.../public/js/views/entity/EntityBusinessMetaDataView.js | 11 +--
.../js/templates/entity/EntityBusinessMetaDataView_tmpl.html | 2 ++
.../js/templates/entity/EntityLabelDefineView_tmpl.html | 2 ++
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 ++
.../public/js/views/entity/EntityBusinessMetaDataView.js | 11 +--
8 files changed, 30 insertions(+), 4 deletions(-)
diff --git
a/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
index fd00abf..1d0ccb0 100644
---
a/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
+++
b/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
@@ -23,11 +23,13 @@
+{{#ifCond readOnlyEntity "===" false}}
Add
Save
Cancel
+{{/ifCond}}
diff --git
a/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
index d3ca9ad..a6fe8e0 100644
--- a/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
@@ -56,10 +56,12 @@
{{#ifCond swapItem "===" true}}
{{else}}
+{{#ifCond readOnlyEntity "===" false}}
No labels have been created yet. To add a labels,
click here
{{/ifCond}}
+{{/ifCond}}
diff --git
a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
index 4434300..074d39b 100644
--- a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
@@ -56,7 +56,9 @@
{{#ifCond swapItem "===" true}}
{{else}}
+{{#ifCond readOnlyEntity "===" false}}
No properties have been created yet. To add a
property, click here
+{{/ifCond}}
{{/ifCond}}
diff --git a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
index fe13f01..5e4643e 100644
--- a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -24,10 +24,11 @@ define([
"models/VEntity",
"utils/Utils",
"utils/Messages",
+"utils/Enums",
"utils/CommonViewFunction",
"moment",
"utils/Globals"
-], function(require, Backbone, EntityBusinessMetaDataView_tmpl,
EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction,
moment, Globals) {
+], function(require, Backbone, EntityBusinessMetaDataView_tmpl,
EntityBusinessMetaDataItemView, VEntity, Utils, Messages, Enums,
CommonViewFunction, moment, Globals) {
"use strict";
return Backbone.Marionette.CompositeView.extend({
@@ -43,6 +44,11 @@ define([
enumDefCollection: this.enumDefCollection
};
},
+templateHelpers: function() {
+return {
+readOnlyEntity: this.readOnlyEntity
+}
+},
/** ui selector cache */
ui: {
addItem: "[data-id='addItem']",
@@ -63,6 +69,7 @@ define([
var that = this;
_.extend(this, _.pick(options, "entity",
"businessMetadataCollection", "
[atlas] branch master updated: ATLAS-3894: UI: User is able to add and remove business metadata from deleted entities
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 7e06f55 ATLAS-3894: UI: User is able to add and remove business
metadata from deleted entities
7e06f55 is described below
commit 7e06f55fc952f7fbbd18eb717f70ae211085068d
Author: kevalbhatt
AuthorDate: Fri Jul 17 19:15:28 2020 +0530
ATLAS-3894: UI: User is able to add and remove business metadata from
deleted entities
---
.../js/templates/entity/EntityBusinessMetaDataView_tmpl.html | 2 ++
.../js/templates/entity/EntityLabelDefineView_tmpl.html | 2 ++
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 ++
.../public/js/views/entity/EntityBusinessMetaDataView.js | 11 +--
.../js/templates/entity/EntityBusinessMetaDataView_tmpl.html | 2 ++
.../js/templates/entity/EntityLabelDefineView_tmpl.html | 2 ++
.../public/js/templates/entity/EntityUserDefineView_tmpl.html | 2 ++
.../public/js/views/entity/EntityBusinessMetaDataView.js | 11 +--
8 files changed, 30 insertions(+), 4 deletions(-)
diff --git
a/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
index fd00abf..1d0ccb0 100644
---
a/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
+++
b/dashboardv2/public/js/templates/entity/EntityBusinessMetaDataView_tmpl.html
@@ -23,11 +23,13 @@
+{{#ifCond readOnlyEntity "===" false}}
Add
Save
Cancel
+{{/ifCond}}
diff --git
a/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
index d3ca9ad..a6fe8e0 100644
--- a/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityLabelDefineView_tmpl.html
@@ -56,10 +56,12 @@
{{#ifCond swapItem "===" true}}
{{else}}
+{{#ifCond readOnlyEntity "===" false}}
No labels have been created yet. To add a labels,
click here
{{/ifCond}}
+{{/ifCond}}
diff --git
a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
index 4434300..074d39b 100644
--- a/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
+++ b/dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html
@@ -56,7 +56,9 @@
{{#ifCond swapItem "===" true}}
{{else}}
+{{#ifCond readOnlyEntity "===" false}}
No properties have been created yet. To add a
property, click here
+{{/ifCond}}
{{/ifCond}}
diff --git a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
index fe13f01..5e4643e 100644
--- a/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
+++ b/dashboardv2/public/js/views/entity/EntityBusinessMetaDataView.js
@@ -24,10 +24,11 @@ define([
"models/VEntity",
"utils/Utils",
"utils/Messages",
+"utils/Enums",
"utils/CommonViewFunction",
"moment",
"utils/Globals"
-], function(require, Backbone, EntityBusinessMetaDataView_tmpl,
EntityBusinessMetaDataItemView, VEntity, Utils, Messages, CommonViewFunction,
moment, Globals) {
+], function(require, Backbone, EntityBusinessMetaDataView_tmpl,
EntityBusinessMetaDataItemView, VEntity, Utils, Messages, Enums,
CommonViewFunction, moment, Globals) {
"use strict";
return Backbone.Marionette.CompositeView.extend({
@@ -43,6 +44,11 @@ define([
enumDefCollection: this.enumDefCollection
};
},
+templateHelpers: function() {
+return {
+readOnlyEntity: this.readOnlyEntity
+}
+},
/** ui selector cache */
ui: {
addItem: "[data-id='addItem']",
@@ -63,6 +69,7 @@ define([
var that = this;
_.extend(this, _.pick(options, "entity",
"businessMetadataCollection", "enumDefCollection", "guid", "fetchCollection"));
[atlas] branch master updated: ATLAS-3882:- Classic UI: Loader not disappearing while assigning category to term
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 d604085 ATLAS-3882:- Classic UI: Loader not disappearing while
assigning category to term
d604085 is described below
commit d604085efe18963f39020e62cd03a5e4fcb20b2b
Author: kevalbhatt
AuthorDate: Wed Jul 8 14:35:38 2020 +0530
ATLAS-3882:- Classic UI: Loader not disappearing while assigning category
to term
(cherry picked from commit a43b49c33f93ef2819b747caed7a9baae91d09a4)
---
.../public/js/views/detail_page/DetailPageLayoutView.js| 9 +++--
.../public/js/views/entity/CreateEntityLayoutView.js | 6 --
.../public/js/views/glossary/GlossaryDetailLayoutView.js | 14 --
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 6 ++
dashboardv2/public/js/views/search/SearchLayoutView.js | 3 +++
.../public/js/views/search/SearchResultLayoutView.js | 10 --
dashboardv2/public/js/views/tag/TagDetailLayoutView.js | 3 ++-
.../public/js/views/glossary/GlossaryDetailLayoutView.js | 5 +
8 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index e23f57a..fe823fa 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -354,6 +354,9 @@ define(['require',
},
fetchCollection: function() {
this.collection.fetch({ reset: true });
+if (this.searchVent) {
+this.searchVent.trigger('entityList:refresh');
+}
},
getEntityDef: function(entityObj) {
if (this.activeEntityDef) {
@@ -382,9 +385,6 @@ define(['require',
hideLoader: that.hideLoader.bind(that),
tagName: tagName,
callback: function() {
-if (that.searchVent) {
-
that.searchVent.trigger("Classification:Count:Update");
-}
that.fetchCollection();
}
}));
@@ -466,9 +466,6 @@ define(['require',
guid: that.id,
tagList: tagList,
callback: function() {
-if (that.searchVent) {
-
that.searchVent.trigger("Classification:Count:Update");
-}
that.fetchCollection();
},
showLoader: that.showLoader.bind(that),
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index b348a0f..8239ab8 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -74,7 +74,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
-_.extend(this, _.pick(options, 'guid', 'callback',
'showLoader', 'entityDefCollection', 'typeHeaders'));
+_.extend(this, _.pick(options, 'guid', 'callback',
'showLoader', 'entityDefCollection', 'typeHeaders', 'searchVent'));
var that = this,
entityTitle, okLabel;
this.selectStoreCollection = new Backbone.Collection();
@@ -791,6 +791,9 @@ define(['require',
trigger: true
});
}
+if (that.searchVent) {
+
that.searchVent.trigger('entityList:refresh');
+}
}
}
},
@@ -801,7 +804,6 @@ define(['require',
that.modal.$el.find('button.ok').hideButtonLoader();
}
});
-
} catch (e) {
Utils.notifyError({
content: e.message
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 63c58e0..465c4ab 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -174,7 +174,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
-
[atlas] branch branch-2.0 updated: ATLAS-3882:- Classic UI: Loader not disappearing while assigning category to term
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 a43b49c ATLAS-3882:- Classic UI: Loader not disappearing while
assigning category to term
a43b49c is described below
commit a43b49c33f93ef2819b747caed7a9baae91d09a4
Author: kevalbhatt
AuthorDate: Wed Jul 8 14:35:38 2020 +0530
ATLAS-3882:- Classic UI: Loader not disappearing while assigning category
to term
---
.../public/js/views/detail_page/DetailPageLayoutView.js| 9 +++--
.../public/js/views/entity/CreateEntityLayoutView.js | 6 --
.../public/js/views/glossary/GlossaryDetailLayoutView.js | 14 --
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 6 ++
dashboardv2/public/js/views/search/SearchLayoutView.js | 3 +++
.../public/js/views/search/SearchResultLayoutView.js | 10 --
dashboardv2/public/js/views/tag/TagDetailLayoutView.js | 3 ++-
.../public/js/views/glossary/GlossaryDetailLayoutView.js | 5 +
8 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index e23f57a..fe823fa 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -354,6 +354,9 @@ define(['require',
},
fetchCollection: function() {
this.collection.fetch({ reset: true });
+if (this.searchVent) {
+this.searchVent.trigger('entityList:refresh');
+}
},
getEntityDef: function(entityObj) {
if (this.activeEntityDef) {
@@ -382,9 +385,6 @@ define(['require',
hideLoader: that.hideLoader.bind(that),
tagName: tagName,
callback: function() {
-if (that.searchVent) {
-
that.searchVent.trigger("Classification:Count:Update");
-}
that.fetchCollection();
}
}));
@@ -466,9 +466,6 @@ define(['require',
guid: that.id,
tagList: tagList,
callback: function() {
-if (that.searchVent) {
-
that.searchVent.trigger("Classification:Count:Update");
-}
that.fetchCollection();
},
showLoader: that.showLoader.bind(that),
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index b348a0f..8239ab8 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -74,7 +74,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
-_.extend(this, _.pick(options, 'guid', 'callback',
'showLoader', 'entityDefCollection', 'typeHeaders'));
+_.extend(this, _.pick(options, 'guid', 'callback',
'showLoader', 'entityDefCollection', 'typeHeaders', 'searchVent'));
var that = this,
entityTitle, okLabel;
this.selectStoreCollection = new Backbone.Collection();
@@ -791,6 +791,9 @@ define(['require',
trigger: true
});
}
+if (that.searchVent) {
+
that.searchVent.trigger('entityList:refresh');
+}
}
}
},
@@ -801,7 +804,6 @@ define(['require',
that.modal.$el.find('button.ok').hideButtonLoader();
}
});
-
} catch (e) {
Utils.notifyError({
content: e.message
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 63c58e0..465c4ab 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -174,7 +174,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
-_.extend(this, _.pick(options, 'guid', 'glossaryCollection',
'gl
[atlas] branch branch-2.0 updated: ATLAS-3840: Atlas website's html meta description is set to My awesome app using docz
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 2401aee ATLAS-3840: Atlas website's html meta description is set to
My awesome app using docz
2401aee is described below
commit 2401aeeae43e3a654e359020ceb020accb2e5436
Author: Umesh S Padashetty
AuthorDate: Fri Jun 12 21:44:41 2020 +0530
ATLAS-3840: Atlas website's html meta description is set to My awesome app
using docz
Signed-off-by: kevalbhatt
---
docs/doczrc.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/doczrc.js b/docs/doczrc.js
index e3af946..6c6247a 100644
--- a/docs/doczrc.js
+++ b/docs/doczrc.js
@@ -21,6 +21,7 @@ import versions from './docz-lib/config/versions';
module.exports = {
title: "Apache Atlas – Data Governance and Metadata framework for
Hadoop",
+ description: "Apache Atlas – Data Governance and Metadata framework for
Hadoop",
files: "**/*.{md,mdx}",
base: "/",
baseUrl:"./public",
[atlas] branch master updated: ATLAS-3840: Atlas website's html meta description is set to My awesome app using docz
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 3d559d0 ATLAS-3840: Atlas website's html meta description is set to
My awesome app using docz
3d559d0 is described below
commit 3d559d0195c3a93890a0b4c303b5ee99f71dd4de
Author: Umesh S Padashetty
AuthorDate: Fri Jun 12 21:44:41 2020 +0530
ATLAS-3840: Atlas website's html meta description is set to My awesome app
using docz
Signed-off-by: kevalbhatt
---
docs/doczrc.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/doczrc.js b/docs/doczrc.js
index e3af946..6c6247a 100644
--- a/docs/doczrc.js
+++ b/docs/doczrc.js
@@ -21,6 +21,7 @@ import versions from './docz-lib/config/versions';
module.exports = {
title: "Apache Atlas – Data Governance and Metadata framework for
Hadoop",
+ description: "Apache Atlas – Data Governance and Metadata framework for
Hadoop",
files: "**/*.{md,mdx}",
base: "/",
baseUrl:"./public",
[atlas] branch branch-2.0 updated: ATLAS-3858:- [UI] Misaligment happened in Glossaries when added term with large name
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 f9dcf61 ATLAS-3858:- [UI] Misaligment happened in Glossaries when
added term with large name
f9dcf61 is described below
commit f9dcf611b88cea278212306885bf03f3a83a32c0
Author: kevalbhatt
AuthorDate: Thu Jun 25 22:49:11 2020 +0530
ATLAS-3858:- [UI] Misaligment happened in Glossaries when added term with
large name
---
dashboardv2/public/css/scss/override.scss | 10 ++
.../public/js/views/entity/CreateEntityLayoutView.js | 15 +--
dashboardv3/public/css/scss/override.scss | 10 ++
.../public/js/views/entity/CreateEntityLayoutView.js | 15 +--
4 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index 26973bd..2bcfde9 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -497,4 +497,14 @@ div.columnmanager-dropdown-container {
.ui-pnotify-text {
word-break: break-word;
}
+}
+
+.jstree-wholerow-ul {
+width: 100%;
+
+.jstree-anchor {
+width: calc(100% - 50px);
+overflow: hidden;
+text-overflow: ellipsis;
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index 4714e46..92554f8 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -782,12 +782,15 @@ define(['require',
if (that.guid && that.callback) {
that.callback();
} else {
-if (model.mutatedEntities &&
model.mutatedEntities.CREATE && _.isArray(model.mutatedEntities.CREATE) &&
model.mutatedEntities.CREATE[0] && model.mutatedEntities.CREATE[0].guid) {
-Utils.setUrl({
-url: '#!/detailPage/' +
(model.mutatedEntities.CREATE[0].guid),
-mergeBrowserUrl: false,
-trigger: true
-});
+if (model.mutatedEntities) {
+var mutatedEntities =
model.mutatedEntities.CREATE || model.mutatedEntities.UPDATE;
+if (mutatedEntities &&
_.isArray(mutatedEntities) && mutatedEntities[0] && mutatedEntities[0].guid) {
+Utils.setUrl({
+url: '#!/detailPage/' +
(mutatedEntities[0].guid),
+mergeBrowserUrl: false,
+trigger: true
+});
+}
}
}
},
diff --git a/dashboardv3/public/css/scss/override.scss
b/dashboardv3/public/css/scss/override.scss
index 9340570..7499894 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -501,4 +501,14 @@ div.columnmanager-dropdown-container {
.ui-pnotify-text {
word-break: break-word;
}
+}
+
+.jstree-wholerow-ul {
+width: 100%;
+
+.jstree-anchor {
+width: calc(100% - 50px);
+overflow: hidden;
+text-overflow: ellipsis;
+}
}
\ No newline at end of file
diff --git a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
index b95bded..966b0be 100644
--- a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
@@ -788,12 +788,15 @@ define(['require',
if (that.searchVent) {
that.searchVent.trigger("Entity:Count:Update");
}
-if (model.mutatedEntities &&
model.mutatedEntities.CREATE && _.isArray(model.mutatedEntities.CREATE) &&
model.mutatedEntities.CREATE[0] && model.mutatedEntities.CREATE[0].guid) {
-Utils.setUrl({
-url: '#!/detailPage/' +
(model.mutatedEntities.CREATE[0].guid),
-mergeBrowserUrl: false,
-trigger
[atlas] branch master updated: ATLAS-3858:- [UI] Misaligment happened in Glossaries when added term with large name
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 ab9f973 ATLAS-3858:- [UI] Misaligment happened in Glossaries when
added term with large name
ab9f973 is described below
commit ab9f973123192e0711f67f707cb118525b19993f
Author: kevalbhatt
AuthorDate: Thu Jun 25 22:49:11 2020 +0530
ATLAS-3858:- [UI] Misaligment happened in Glossaries when added term with
large name
---
dashboardv2/public/css/scss/override.scss | 10 ++
.../public/js/views/entity/CreateEntityLayoutView.js | 15 +--
dashboardv3/public/css/scss/override.scss | 10 ++
.../public/js/views/entity/CreateEntityLayoutView.js | 15 +--
4 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index 26973bd..2bcfde9 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -497,4 +497,14 @@ div.columnmanager-dropdown-container {
.ui-pnotify-text {
word-break: break-word;
}
+}
+
+.jstree-wholerow-ul {
+width: 100%;
+
+.jstree-anchor {
+width: calc(100% - 50px);
+overflow: hidden;
+text-overflow: ellipsis;
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index 4714e46..92554f8 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -782,12 +782,15 @@ define(['require',
if (that.guid && that.callback) {
that.callback();
} else {
-if (model.mutatedEntities &&
model.mutatedEntities.CREATE && _.isArray(model.mutatedEntities.CREATE) &&
model.mutatedEntities.CREATE[0] && model.mutatedEntities.CREATE[0].guid) {
-Utils.setUrl({
-url: '#!/detailPage/' +
(model.mutatedEntities.CREATE[0].guid),
-mergeBrowserUrl: false,
-trigger: true
-});
+if (model.mutatedEntities) {
+var mutatedEntities =
model.mutatedEntities.CREATE || model.mutatedEntities.UPDATE;
+if (mutatedEntities &&
_.isArray(mutatedEntities) && mutatedEntities[0] && mutatedEntities[0].guid) {
+Utils.setUrl({
+url: '#!/detailPage/' +
(mutatedEntities[0].guid),
+mergeBrowserUrl: false,
+trigger: true
+});
+}
}
}
},
diff --git a/dashboardv3/public/css/scss/override.scss
b/dashboardv3/public/css/scss/override.scss
index 9340570..7499894 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -501,4 +501,14 @@ div.columnmanager-dropdown-container {
.ui-pnotify-text {
word-break: break-word;
}
+}
+
+.jstree-wholerow-ul {
+width: 100%;
+
+.jstree-anchor {
+width: calc(100% - 50px);
+overflow: hidden;
+text-overflow: ellipsis;
+}
}
\ No newline at end of file
diff --git a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
index b95bded..966b0be 100644
--- a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
@@ -788,12 +788,15 @@ define(['require',
if (that.searchVent) {
that.searchVent.trigger("Entity:Count:Update");
}
-if (model.mutatedEntities &&
model.mutatedEntities.CREATE && _.isArray(model.mutatedEntities.CREATE) &&
model.mutatedEntities.CREATE[0] && model.mutatedEntities.CREATE[0].guid) {
-Utils.setUrl({
-url: '#!/detailPage/' +
(model.mutatedEntities.CREATE[0].guid),
-mergeBrowserUrl: false,
-trigger
[atlas] 01/02: ATLAS-3156:- UI:No loading animation while creating or deleting a Classification, Term, SaveSearch loading #4
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
commit 177b01bc61828cd03e7ee6bcd76d336d7d7d3f54
Author: kevalbhatt
AuthorDate: Thu Jun 25 21:08:53 2020 +0530
ATLAS-3156:- UI:No loading animation while creating or deleting a
Classification, Term, SaveSearch loading #4
---
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 11 ---
dashboardv2/public/js/views/search/save/SaveSearchView.js | 7 ++-
dashboardv2/public/js/views/tag/TagLayoutView.js| 12
.../js/views/search/tree/ClassificationTreeLayoutView.js| 9 -
.../js/views/search/tree/CustomFilterTreeLayoutView.js | 9 -
.../public/js/views/search/tree/GlossaryTreeLayoutView.js | 13 -
6 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index ed01560..d0fcb31 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -707,12 +707,17 @@ define(['require',
}) : null,
updateTabState: true
});
+},
+complete: function() {
+that.notificationModal.hideButtonLoader();
+that.notificationModal.remove();
}
},
notifyObj = {
modal: true,
-ok: function(argument) {
-that.changeLoaderState(true);
+ok: function(obj) {
+that.notificationModal = obj;
+obj.showButtonLoader();
if (type == "Glossary") {
that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent:
true, reset: false });
} else if (type == "GlossaryCategory") {
@@ -720,8 +725,8 @@ define(['require',
} else if (type == "GlossaryTerm") {
new
that.glossaryCollection.model().deleteTerm(guid, options);
}
-that.changeLoaderState(false);
},
+okCloses: false,
cancel: function(argument) {}
};
if (type == "Glossary") {
diff --git a/dashboardv2/public/js/views/search/save/SaveSearchView.js
b/dashboardv2/public/js/views/search/save/SaveSearchView.js
index f4690da..436d83d 100644
--- a/dashboardv2/public/js/views/search/save/SaveSearchView.js
+++ b/dashboardv2/public/js/views/search/save/SaveSearchView.js
@@ -177,9 +177,12 @@ define(['require',
modal: true,
html: true,
text: Messages.conformation.deleteMessage + "" +
_.escape(options.model.get('name')) + "" + " ?",
-ok: function(argument) {
+ok: function(obj) {
+that.notificationModal = obj;
+obj.showButtonLoader();
that.onDeleteNotifyOk(options);
},
+okCloses: false,
cancel: function(argument) {}
}
Utils.notifyConfirm(notifyObj);
@@ -194,6 +197,8 @@ define(['require',
if (that.collection) {
that.collection.remove(model);
}
+that.notificationModal.hideButtonLoader();
+that.notificationModal.remove();
Utils.notifySuccess({
content: options.model.get('name') +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index a9af2e1..b23bd98 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -583,9 +583,12 @@ define(['require',
var that = this,
notifyObj = {
modal: true,
-ok: function(argument) {
+ok: function(obj) {
+that.notificationModal = obj;
+obj.showButtonLoader();
that.onNotifyOk();
},
+okCloses: false,
cancel: function(argument) {}
[atlas] branch master updated (aa86d62 -> b5c4a56)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git. from aa86d62 ATLAS-3848 : Quick Search : Fixed incorrect aggregation metrics new 177b01b ATLAS-3156:- UI:No loading animation while creating or deleting a Classification, Term, SaveSearch loading #4 new b5c4a56 ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date' The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dashboardv2/public/css/scss/business-metadata.scss | 6 -- dashboardv2/public/css/scss/override.scss | 9 - .../public/js/views/entity/CreateEntityLayoutView.js| 12 +--- dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 11 --- dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +- dashboardv2/public/js/views/search/save/SaveSearchView.js | 7 ++- dashboardv2/public/js/views/tag/TagLayoutView.js| 12 dashboardv3/public/css/scss/business-metadata.scss | 6 -- dashboardv3/public/css/scss/override.scss | 9 - .../public/js/views/entity/CreateEntityLayoutView.js| 12 +--- dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +- .../js/views/search/tree/ClassificationTreeLayoutView.js| 9 - .../js/views/search/tree/CustomFilterTreeLayoutView.js | 9 - .../public/js/views/search/tree/GlossaryTreeLayoutView.js | 13 - 14 files changed, 90 insertions(+), 29 deletions(-)
[atlas] 02/02: ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date'
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
commit b5c4a56f1ece7e10e7a2da15de466899021da254
Author: kevalbhatt
AuthorDate: Thu Jun 25 21:06:07 2020 +0530
ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date'
---
dashboardv2/public/css/scss/business-metadata.scss | 6 --
dashboardv2/public/css/scss/override.scss| 9 -
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js | 12 +---
dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +-
dashboardv3/public/css/scss/business-metadata.scss | 6 --
dashboardv3/public/css/scss/override.scss| 9 -
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js | 12 +---
dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +-
8 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/dashboardv2/public/css/scss/business-metadata.scss
b/dashboardv2/public/css/scss/business-metadata.scss
index 6ed774d..148810a 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -200,9 +200,11 @@
color: #686868 !important;
}
-.business-metadata-detail-attr-key {
-width: 30%;
+td {
word-break: break-word;
+}
+.business-metadata-detail-attr-key {
+width: 30%;
}
}
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index 8946fdd..26973bd 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -417,7 +417,8 @@ div.columnmanager-dropdown-container {
max-height: 400px;
min-height: 70px;
overflow: auto;
-border-top: 1px solid #DEDEDE
+border-top: 1px solid #DEDEDE;
+word-break: break-word;
}
.ui-pnotify-action-bar {
@@ -490,4 +491,10 @@ div.columnmanager-dropdown-container {
.form-control {
z-index: 1;
}
+}
+
+.ui-pnotify-container {
+.ui-pnotify-text {
+word-break: break-word;
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index cd5c825..4714e46 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -436,9 +436,15 @@ define(['require',
var that = this;
this.$('input[data-type="date"]').each(function() {
if (!$(this).data('daterangepicker')) {
-var dateObj = { "singleDatePicker": true,
"showDropdowns": true };
+var dateObj = {
+"singleDatePicker": true,
+"showDropdowns": true,
+locale: {
+format: Globals.dateFormat
+}
+};
if (that.guid) {
-dateObj["startDate"] = this.value
+dateObj["startDate"] = new
Date(Number(this.value));
}
$(this).daterangepicker(dateObj);
}
@@ -598,7 +604,7 @@ define(['require',
}
if (value.typeName === "date") {
if (dataValue) {
-entityValue =
moment(dataValue).format(Globals.dateFormat);
+entityValue = moment(dataValue);
} else {
entityValue =
moment().format(Globals.dateFormat);
}
diff --git a/dashboardv2/public/js/views/import/ImportLayoutView.js
b/dashboardv2/public/js/views/import/ImportLayoutView.js
index b1b7aab..159e779 100644
--- a/dashboardv2/public/js/views/import/ImportLayoutView.js
+++ b/dashboardv2/public/js/views/import/ImportLayoutView.js
@@ -123,7 +123,7 @@ define([
if (response.failedImportInfoList.length > 1) {
var modalTitle = '
Error Details';
_.each(response.failedImportInfoList,
function(err_obj) {
-errorStr += '' + err_obj.remarks +
'';
+errorStr += '' +
_.escape(err_obj.remarks) + '';
});
that.ui.errorDetails.append(errorStr);
that.toggleErrorAndDropZoneV
[atlas] 01/02: ATLAS-3156:- UI:No loading animation while creating or deleting a Classification, Term, SaveSearch loading #4
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit adff44e740cfc379f0e7e0a32c2f3e2c2ac42f6d
Author: kevalbhatt
AuthorDate: Thu Jun 25 21:08:53 2020 +0530
ATLAS-3156:- UI:No loading animation while creating or deleting a
Classification, Term, SaveSearch loading #4
---
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 11 ---
dashboardv2/public/js/views/search/save/SaveSearchView.js | 7 ++-
dashboardv2/public/js/views/tag/TagLayoutView.js| 12
.../js/views/search/tree/ClassificationTreeLayoutView.js| 9 -
.../js/views/search/tree/CustomFilterTreeLayoutView.js | 9 -
.../public/js/views/search/tree/GlossaryTreeLayoutView.js | 13 -
6 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
index ed01560..d0fcb31 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
@@ -707,12 +707,17 @@ define(['require',
}) : null,
updateTabState: true
});
+},
+complete: function() {
+that.notificationModal.hideButtonLoader();
+that.notificationModal.remove();
}
},
notifyObj = {
modal: true,
-ok: function(argument) {
-that.changeLoaderState(true);
+ok: function(obj) {
+that.notificationModal = obj;
+obj.showButtonLoader();
if (type == "Glossary") {
that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent:
true, reset: false });
} else if (type == "GlossaryCategory") {
@@ -720,8 +725,8 @@ define(['require',
} else if (type == "GlossaryTerm") {
new
that.glossaryCollection.model().deleteTerm(guid, options);
}
-that.changeLoaderState(false);
},
+okCloses: false,
cancel: function(argument) {}
};
if (type == "Glossary") {
diff --git a/dashboardv2/public/js/views/search/save/SaveSearchView.js
b/dashboardv2/public/js/views/search/save/SaveSearchView.js
index f4690da..436d83d 100644
--- a/dashboardv2/public/js/views/search/save/SaveSearchView.js
+++ b/dashboardv2/public/js/views/search/save/SaveSearchView.js
@@ -177,9 +177,12 @@ define(['require',
modal: true,
html: true,
text: Messages.conformation.deleteMessage + "" +
_.escape(options.model.get('name')) + "" + " ?",
-ok: function(argument) {
+ok: function(obj) {
+that.notificationModal = obj;
+obj.showButtonLoader();
that.onDeleteNotifyOk(options);
},
+okCloses: false,
cancel: function(argument) {}
}
Utils.notifyConfirm(notifyObj);
@@ -194,6 +197,8 @@ define(['require',
if (that.collection) {
that.collection.remove(model);
}
+that.notificationModal.hideButtonLoader();
+that.notificationModal.remove();
Utils.notifySuccess({
content: options.model.get('name') +
Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
});
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index a9af2e1..b23bd98 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -583,9 +583,12 @@ define(['require',
var that = this,
notifyObj = {
modal: true,
-ok: function(argument) {
+ok: function(obj) {
+that.notificationModal = obj;
+obj.showButtonLoader();
that.onNotifyOk();
},
+okCloses: false,
cancel: function(argument) {
[atlas] 02/02: ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date'
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit f005c32cd8cad78fcdf47835ad3d18d9e032752c
Author: kevalbhatt
AuthorDate: Thu Jun 25 21:06:07 2020 +0530
ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date'
---
dashboardv2/public/css/scss/business-metadata.scss | 6 --
dashboardv2/public/css/scss/override.scss| 9 -
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js | 12 +---
dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +-
dashboardv3/public/css/scss/business-metadata.scss | 6 --
dashboardv3/public/css/scss/override.scss| 9 -
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js | 12 +---
dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +-
8 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/dashboardv2/public/css/scss/business-metadata.scss
b/dashboardv2/public/css/scss/business-metadata.scss
index 6ed774d..148810a 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -200,9 +200,11 @@
color: #686868 !important;
}
-.business-metadata-detail-attr-key {
-width: 30%;
+td {
word-break: break-word;
+}
+.business-metadata-detail-attr-key {
+width: 30%;
}
}
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/override.scss
b/dashboardv2/public/css/scss/override.scss
index 8946fdd..26973bd 100644
--- a/dashboardv2/public/css/scss/override.scss
+++ b/dashboardv2/public/css/scss/override.scss
@@ -417,7 +417,8 @@ div.columnmanager-dropdown-container {
max-height: 400px;
min-height: 70px;
overflow: auto;
-border-top: 1px solid #DEDEDE
+border-top: 1px solid #DEDEDE;
+word-break: break-word;
}
.ui-pnotify-action-bar {
@@ -490,4 +491,10 @@ div.columnmanager-dropdown-container {
.form-control {
z-index: 1;
}
+}
+
+.ui-pnotify-container {
+.ui-pnotify-text {
+word-break: break-word;
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index cd5c825..4714e46 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -436,9 +436,15 @@ define(['require',
var that = this;
this.$('input[data-type="date"]').each(function() {
if (!$(this).data('daterangepicker')) {
-var dateObj = { "singleDatePicker": true,
"showDropdowns": true };
+var dateObj = {
+"singleDatePicker": true,
+"showDropdowns": true,
+locale: {
+format: Globals.dateFormat
+}
+};
if (that.guid) {
-dateObj["startDate"] = this.value
+dateObj["startDate"] = new
Date(Number(this.value));
}
$(this).daterangepicker(dateObj);
}
@@ -598,7 +604,7 @@ define(['require',
}
if (value.typeName === "date") {
if (dataValue) {
-entityValue =
moment(dataValue).format(Globals.dateFormat);
+entityValue = moment(dataValue);
} else {
entityValue =
moment().format(Globals.dateFormat);
}
diff --git a/dashboardv2/public/js/views/import/ImportLayoutView.js
b/dashboardv2/public/js/views/import/ImportLayoutView.js
index b1b7aab..159e779 100644
--- a/dashboardv2/public/js/views/import/ImportLayoutView.js
+++ b/dashboardv2/public/js/views/import/ImportLayoutView.js
@@ -123,7 +123,7 @@ define([
if (response.failedImportInfoList.length > 1) {
var modalTitle = '
Error Details';
_.each(response.failedImportInfoList,
function(err_obj) {
-errorStr += '' + err_obj.remarks +
'';
+errorStr += '' +
_.escape(err_obj.remarks) + '';
});
that.ui.errorDetails.append(errorStr);
that.toggleErrorAndDropZ
[atlas] branch branch-2.0 updated (9e328ed -> f005c32)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from 9e328ed ATLAS-3850: regression - search results don't include glossary-term associations new adff44e ATLAS-3156:- UI:No loading animation while creating or deleting a Classification, Term, SaveSearch loading #4 new f005c32 ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date' The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dashboardv2/public/css/scss/business-metadata.scss | 6 -- dashboardv2/public/css/scss/override.scss | 9 - .../public/js/views/entity/CreateEntityLayoutView.js| 12 +--- dashboardv2/public/js/views/glossary/GlossaryLayoutView.js | 11 --- dashboardv2/public/js/views/import/ImportLayoutView.js | 2 +- dashboardv2/public/js/views/search/save/SaveSearchView.js | 7 ++- dashboardv2/public/js/views/tag/TagLayoutView.js| 12 dashboardv3/public/css/scss/business-metadata.scss | 6 -- dashboardv3/public/css/scss/override.scss | 9 - .../public/js/views/entity/CreateEntityLayoutView.js| 12 +--- dashboardv3/public/js/views/import/ImportLayoutView.js | 2 +- .../js/views/search/tree/ClassificationTreeLayoutView.js| 9 - .../js/views/search/tree/CustomFilterTreeLayoutView.js | 9 - .../public/js/views/search/tree/GlossaryTreeLayoutView.js | 13 - 14 files changed, 90 insertions(+), 29 deletions(-)
[atlas] branch branch-2.0 updated: ATLAS-3851: UI: removed hourglass icon from lineage graph legend #2
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 d31f0d9 ATLAS-3851: UI: removed hourglass icon from lineage graph
legend #2
d31f0d9 is described below
commit d31f0d944111ac00f1c0feb3319a2c410d22a659
Author: kevalbhatt
AuthorDate: Mon Jun 22 18:20:24 2020 +0530
ATLAS-3851: UI: removed hourglass icon from lineage graph legend #2
(cherry picked from commit 79caa79ad72fca25cecaebdcfcdf5be095852933)
---
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 '' +
-'' + entityLabel + '' +
'(' + Utils.escapeHtml(value.typeName) + ')' + '' +
+'' + entityLabel + '' +
'(' + _.escape(value.typeName) + ')' + '' +
'' + (this.getElement(object)) +
'';
},
@@ -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">' +
'--Select true or
false--true' +
'false';
@@ -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 : "") + '';
}
},
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 '' + setValue + '';
},
getInput: function(object) {
var value = object.value,
+name = _.escape(value.name),
entityValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation;
return '';
},
getElement: function(object) {
diff --git a/dashboardv3/public/js/utils/Utils.j
[atlas] branch master updated: ATLAS-3851: UI: removed hourglass icon from lineage graph legend #2
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
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 '' +
-'' + entityLabel + '' +
'(' + Utils.escapeHtml(value.typeName) + ')' + '' +
+'' + entityLabel + '' +
'(' + _.escape(value.typeName) + ')' + '' +
'' + (this.getElement(object)) +
'';
},
@@ -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">' +
'--Select true or
false--true' +
'false';
@@ -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 : "") + '';
}
},
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 '' + setValue + '';
},
getInput: function(object) {
var value = object.value,
+name = _.escape(value.name),
entityValue = _.escape(object.entityValue),
isAttribute = object.isAttribute,
isRelation = object.isRelation;
return '';
},
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
[atlas] branch master updated: ATLAS-3851:- UI: Remove hourglass icon from in progress entity
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 5e8b7f3 ATLAS-3851:- UI: Remove hourglass icon from in progress entity
5e8b7f3 is described below
commit 5e8b7f34a75e7b433ff9404fbb973cea04d8f2d4
Author: kevalbhatt
AuthorDate: Thu Jun 18 00:01:30 2020 +0530
ATLAS-3851:- UI: Remove hourglass icon from in progress entity
---
dashboardv2/public/css/scss/business-metadata.scss | 29 +++
dashboardv2/public/css/scss/common.scss| 34 ++---
dashboardv2/public/css/scss/theme.scss | 88 --
.../detail_page/DetailPageLayoutView_tmpl.html | 2 +-
.../EntityBusinessMetaDataItemView_tmpl.html | 2 +-
.../js/templates/graph/LineageLayoutView_tmpl.html | 1 -
dashboardv2/public/js/utils/CommonViewFunction.js | 16 ++--
.../BusinessMetadataAttributeItemView.js | 4 +-
.../BusinessMetadataDetailLayoutView.js| 2 +-
.../BusinessMetadataTableLayoutView.js | 4 +-
.../CreateBusinessMetadataLayoutView.js| 2 +-
.../business_metadata/EnumCreateUpdateItemView.js | 6 +-
.../js/views/detail_page/DetailPageLayoutView.js | 17 ++---
.../js/views/entity/CreateEntityLayoutView.js | 6 +-
.../views/entity/EntityBusinessMetaDataItemView.js | 39 +-
.../js/views/entity/EntityBusinessMetaDataView.js | 10 +--
.../js/views/entity/EntityLabelDefineView.js | 6 +-
.../js/views/entity/EntityUserDefineItemView.js| 2 +-
.../js/views/glossary/GlossaryDetailLayoutView.js | 12 +--
.../public/js/views/glossary/GlossaryLayoutView.js | 2 +-
.../glossary/TermRelationAttributeLayoutView.js| 2 +-
dashboardv2/public/js/views/graph/LineageUtils.js | 12 ---
.../js/views/graph/PropagationPropertyModal.js | 2 +-
.../js/views/graph/RelationshipLayoutView.js | 16 ++--
.../public/js/views/schema/SchemaLayoutView.js | 4 +-
.../public/js/views/search/SearchLayoutView.js | 4 +-
.../js/views/search/SearchResultLayoutView.js | 18 ++---
dashboardv2/public/js/views/site/Header.js | 3 +-
dashboardv2/public/js/views/tag/AddTagModalView.js | 6 +-
.../js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
.../js/views/tag/TagDetailTableLayoutView.js | 2 +-
dashboardv2/public/js/views/tag/TagLayoutView.js | 2 +-
dashboardv3/public/css/scss/business-metadata.scss | 29 +++
dashboardv3/public/css/scss/common.scss| 29 ---
dashboardv3/public/css/scss/theme.scss | 84 -
.../detail_page/DetailPageLayoutView_tmpl.html | 2 +-
.../EntityBusinessMetaDataItemView_tmpl.html | 2 +-
.../js/templates/graph/LineageLayoutView_tmpl.html | 1 -
dashboardv3/public/js/utils/CommonViewFunction.js | 16 ++--
.../BusinessMetadataAttributeItemView.js | 4 +-
.../BusinessMetadataDetailLayoutView.js| 2 +-
.../BusinessMetadataTableLayoutView.js | 4 +-
.../CreateBusinessMetadataLayoutView.js| 2 +-
.../business_metadata/EnumCreateUpdateItemView.js | 6 +-
.../js/views/detail_page/DetailPageLayoutView.js | 17 ++---
.../js/views/entity/CreateEntityLayoutView.js | 6 +-
.../views/entity/EntityBusinessMetaDataItemView.js | 39 +-
.../js/views/entity/EntityBusinessMetaDataView.js | 8 +-
.../js/views/entity/EntityLabelDefineView.js | 6 +-
.../js/views/entity/EntityUserDefineItemView.js| 2 +-
.../js/views/glossary/GlossaryDetailLayoutView.js | 12 +--
.../glossary/TermRelationAttributeLayoutView.js| 2 +-
dashboardv3/public/js/views/graph/LineageUtils.js | 12 ---
.../js/views/graph/PropagationPropertyModal.js | 2 +-
.../js/views/graph/RelationshipLayoutView.js | 15 ++--
.../public/js/views/schema/SchemaLayoutView.js | 4 +-
.../js/views/search/GlobalSearchLayoutView.js | 4 +-
.../js/views/search/SearchDefaultLayoutView.js | 2 +-
.../views/search/SearchFilterBrowseLayoutView.js | 11 +--
.../js/views/search/SearchResultLayoutView.js | 18 ++---
.../search/tree/ClassificationTreeLayoutView.js| 2 +-
.../search/tree/CustomFilterTreeLayoutView.js | 2 +-
dashboardv3/public/js/views/tag/AddTagModalView.js | 6 +-
.../js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
.../js/views/tag/TagDetailTableLayoutView.js | 2 +-
65 files changed, 284 insertions(+), 428 deletions(-)
diff --git a/dashboardv2/public/css/scss/business-metadata.scss
b/dashboardv2/public/css/scss/business-metadata.scss
index 9507b83..6ed774d 100644
--- a/dashboardv2/public/css/scss/business-metadata.scss
+++ b/dashboardv2/public/css/scss/business-metadata.scss
@@ -21,6 +21,7 @@
>li:first-child {
font-weight: 600;
+word-break: break-all;
}
.business-metadata-tree-ch
[atlas] branch master updated: ATLAS-3830:- UI: Business Metadata tab misalignment issue
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 e590092 ATLAS-3830:- UI: Business Metadata tab misalignment issue
e590092 is described below
commit e590092c47ab18f904dd7974f834bf05045e5ee4
Author: kevalbhatt
AuthorDate: Wed Jun 10 20:10:06 2020 +0530
ATLAS-3830:- UI: Business Metadata tab misalignment issue
(cherry picked from commit ae92ed49de0fd2b8beff71d901a13e68443965c6)
---
dashboardv2/public/js/utils/CommonViewFunction.js | 10 +-
.../business_metadata/BusinessMetadataAttributeItemView.js | 6 +++---
dashboardv3/public/js/utils/CommonViewFunction.js | 10 +-
.../business_metadata/BusinessMetadataAttributeItemView.js | 6 +++---
.../public/js/views/search/SearchFilterBrowseLayoutView.js | 5 +++--
5 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 36837f1..d99dd2c 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -945,9 +945,14 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
pEl.innerText = "";
if (val === '') {
-classes = 'form-control errorClass';
validation = false;
pEl.innerText = 'Required!';
+} else if (val.includes(':')) {
+validation = false;
+var errorText =
$(".errorMsg[data-id='charSupportMsg']").text();
+if (errorText && errorText.length === 0) {
+pEl.innerText = "These special character '(:)' are not
supported.";
+}
} else {
if (input.tagName === 'INPUT') {
var duplicates = datalist.filter(function(c) {
@@ -962,6 +967,9 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
}
}
+if (validation === false) {
+classes = 'form-control errorClass';
+}
input.setAttribute('class', classes);
}
return {
diff --git
a/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
b/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
index 85c64d0..f22dd05 100644
---
a/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
+++
b/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
@@ -65,7 +65,7 @@ define(['require',
var obj = { options: this.model.get('options') || {} };
delete obj.enumValues;
delete obj.options.maxStrLength;
-if (e.target.value.trim() === 'enumeration' ||
e.target.value.trim() === 'Enumeration') {
+if (e.target.value.trim().toLowerCase() === 'enumeration')
{
this.ui.enumTypeSelectorContainer.show();
this.ui.enumTypeSelector.show();
this.emumTypeSelectDisplay();
@@ -73,13 +73,13 @@ define(['require',
this.ui.stringLengthValue.hide();
} else {
obj.typeName = e.target.value.trim();
-if (e.target.value.trim() === 'string' ||
e.target.value.trim() === 'String') {
+if (e.target.value.trim().toLowerCase() === 'string') {
this.ui.stringLengthContainer.show();
this.ui.stringLengthValue.show();
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
this.ui.enumValueSelectorContainer.hide();
-obj.options["maxStrLength"] =
e.target.value.trim();
+obj.options["maxStrLength"] =
this.ui.stringLengthValue.val()
} else {
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 77b5b10..bdf3bd0 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -965,9 +965,14 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
pEl.innerText = "";
if (val === '') {
-clas
[atlas] branch branch-2.0 updated: ATLAS-3830:- UI: Business Metadata tab misalignment issue
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 ae92ed4 ATLAS-3830:- UI: Business Metadata tab misalignment issue
ae92ed4 is described below
commit ae92ed49de0fd2b8beff71d901a13e68443965c6
Author: kevalbhatt
AuthorDate: Wed Jun 10 20:10:06 2020 +0530
ATLAS-3830:- UI: Business Metadata tab misalignment issue
---
dashboardv2/public/js/utils/CommonViewFunction.js | 10 +-
.../business_metadata/BusinessMetadataAttributeItemView.js | 6 +++---
dashboardv3/public/js/utils/CommonViewFunction.js | 10 +-
.../business_metadata/BusinessMetadataAttributeItemView.js | 6 +++---
.../public/js/views/search/SearchFilterBrowseLayoutView.js | 5 +++--
5 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 36837f1..d99dd2c 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -945,9 +945,14 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
pEl.innerText = "";
if (val === '') {
-classes = 'form-control errorClass';
validation = false;
pEl.innerText = 'Required!';
+} else if (val.includes(':')) {
+validation = false;
+var errorText =
$(".errorMsg[data-id='charSupportMsg']").text();
+if (errorText && errorText.length === 0) {
+pEl.innerText = "These special character '(:)' are not
supported.";
+}
} else {
if (input.tagName === 'INPUT') {
var duplicates = datalist.filter(function(c) {
@@ -962,6 +967,9 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
}
}
}
+if (validation === false) {
+classes = 'form-control errorClass';
+}
input.setAttribute('class', classes);
}
return {
diff --git
a/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
b/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
index 85c64d0..f22dd05 100644
---
a/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
+++
b/dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
@@ -65,7 +65,7 @@ define(['require',
var obj = { options: this.model.get('options') || {} };
delete obj.enumValues;
delete obj.options.maxStrLength;
-if (e.target.value.trim() === 'enumeration' ||
e.target.value.trim() === 'Enumeration') {
+if (e.target.value.trim().toLowerCase() === 'enumeration')
{
this.ui.enumTypeSelectorContainer.show();
this.ui.enumTypeSelector.show();
this.emumTypeSelectDisplay();
@@ -73,13 +73,13 @@ define(['require',
this.ui.stringLengthValue.hide();
} else {
obj.typeName = e.target.value.trim();
-if (e.target.value.trim() === 'string' ||
e.target.value.trim() === 'String') {
+if (e.target.value.trim().toLowerCase() === 'string') {
this.ui.stringLengthContainer.show();
this.ui.stringLengthValue.show();
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
this.ui.enumValueSelectorContainer.hide();
-obj.options["maxStrLength"] =
e.target.value.trim();
+obj.options["maxStrLength"] =
this.ui.stringLengthValue.val()
} else {
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js
b/dashboardv3/public/js/utils/CommonViewFunction.js
index 77b5b10..bdf3bd0 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -965,9 +965,14 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
pEl.innerText = "";
if (val === '') {
-classes = 'form-control errorClass';
validation = false;
[atlas] branch branch-2.0 updated (aebf7fd -> 5bd179c)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git. from aebf7fd ATLAS-3780 : Change 'Status' from Classification System Attributes to EntityStatus new 16d810a ATLAS-3831: UI: Add entity icon for spark new e5895dd ATLAS-3829:- UI: Clicking on meanings from relationship tab should redirect to terms details page. new 5bd179c ATLAS-3769:- UI: Changing page limit in Admin audits resets any filters applied on that page The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes .../img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes .../img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes dashboardv2/public/img/entity-icon/spark.png | Bin 0 -> 6685 bytes .../public/img/entity-icon/spark_process.png | Bin 0 -> 10072 bytes dashboardv2/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes dashboardv2/public/js/utils/CommonViewFunction.js | 23 ++--- .../js/views/audit/AdminAuditTableLayoutView.js| 6 +++--- .../js/views/graph/RelationshipLayoutView.js | 12 --- .../public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes .../img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes .../img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes dashboardv3/public/img/entity-icon/spark.png | Bin 0 -> 6685 bytes .../public/img/entity-icon/spark_process.png | Bin 0 -> 10072 bytes dashboardv3/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes dashboardv3/public/js/utils/CommonViewFunction.js | 23 ++--- dashboardv3/public/js/utils/Utils.js | 8 +++ .../js/views/audit/AdminAuditTableLayoutView.js| 6 +++--- .../js/views/graph/RelationshipLayoutView.js | 13 19 files changed, 58 insertions(+), 33 deletions(-) create mode 100644 dashboardv2/public/img/entity-icon/disabled/spark.png create mode 100644 dashboardv2/public/img/entity-icon/disabled/spark_process.png create mode 100644 dashboardv2/public/img/entity-icon/disabled/spark_table.png create mode 100644 dashboardv2/public/img/entity-icon/spark.png create mode 100644 dashboardv2/public/img/entity-icon/spark_process.png create mode 100644 dashboardv2/public/img/entity-icon/spark_table.png create mode 100644 dashboardv3/public/img/entity-icon/disabled/spark.png create mode 100644 dashboardv3/public/img/entity-icon/disabled/spark_process.png create mode 100644 dashboardv3/public/img/entity-icon/disabled/spark_table.png create mode 100644 dashboardv3/public/img/entity-icon/spark.png create mode 100644 dashboardv3/public/img/entity-icon/spark_process.png create mode 100644 dashboardv3/public/img/entity-icon/spark_table.png
[atlas] 03/03: ATLAS-3769:- UI: Changing page limit in Admin audits resets any filters applied on that page
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 5bd179ca074a7eef0b66b7e5640acab9efceb278
Author: kevalbhatt
AuthorDate: Wed Jun 10 16:20:03 2020 +0530
ATLAS-3769:- UI: Changing page limit in Admin audits resets any filters
applied on that page
(cherry picked from commit 8092d6b5fda19ba523742444123bdbbe9b428914)
---
dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js | 6 +++---
dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
index 00e0953..bc0990f 100644
--- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -56,7 +56,7 @@ define(['require',
events["click " + this.ui.adminEntityClick] =
"onClickAdminEntity";
events["change " + this.ui.adminType] = "onClickAdminType";
events["click " + this.ui.attrFilter] = function(e) {
-this.$('.fa-angle-right').toggleClass('fa-angle-down');
+
this.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
this.$('.attributeResultContainer').addClass("overlay");
this.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
this.onClickAttrFilter();
@@ -120,7 +120,7 @@ define(['require',
closeAttributeModel: function() {
var that = this;
that.$('.attributeResultContainer').removeClass("overlay");
-that.$('.fa-angle-right').toggleClass('fa-angle-down');
+
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
getAttributes: function(options) {
@@ -133,7 +133,6 @@ define(['require',
"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
})
})
-this.isFilters = null;
} else {
adminAttributes = [{
"attributeName": "userName",
@@ -301,6 +300,7 @@ define(['require',
},
onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged";
+this.isFilters = null;
this.defaultPagination();
this.getAdminCollection();
},
diff --git a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
index 00e0953..bc0990f 100644
--- a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -56,7 +56,7 @@ define(['require',
events["click " + this.ui.adminEntityClick] =
"onClickAdminEntity";
events["change " + this.ui.adminType] = "onClickAdminType";
events["click " + this.ui.attrFilter] = function(e) {
-this.$('.fa-angle-right').toggleClass('fa-angle-down');
+
this.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
this.$('.attributeResultContainer').addClass("overlay");
this.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
this.onClickAttrFilter();
@@ -120,7 +120,7 @@ define(['require',
closeAttributeModel: function() {
var that = this;
that.$('.attributeResultContainer').removeClass("overlay");
-that.$('.fa-angle-right').toggleClass('fa-angle-down');
+
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
getAttributes: function(options) {
@@ -133,7 +133,6 @@ define(['require',
"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
})
})
-this.isFilters = null;
} else {
[atlas] 02/03: ATLAS-3829:- UI: Clicking on meanings from relationship tab should redirect to terms details page.
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit e5895ddfab09060b6e4b603d8462faafae532bf1
Author: kevalbhatt
AuthorDate: Wed Jun 10 13:04:39 2020 +0530
ATLAS-3829:- UI: Clicking on meanings from relationship tab should redirect
to terms details page.
(cherry picked from commit f4e1e6b0ec58febac3d72d20d4a40a8f218d74e1)
---
dashboardv2/public/js/utils/CommonViewFunction.js | 23 ++
.../js/views/graph/RelationshipLayoutView.js | 12 ---
dashboardv3/public/js/utils/CommonViewFunction.js | 23 ++
.../js/views/graph/RelationshipLayoutView.js | 13
4 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index b4ee73f..36837f1 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -109,13 +109,13 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
var newVal = val;
if (formatStringVal) {
newVal = parseInt(val);
-if (newVal === NaN) {
+if (_.isNaN(newVal)) {
newVal = val;
} else {
newVal = numberFormat(newVal);
}
}
-return getHighlightedString(newVal);
+return getHighlightedString(_.escape(newVal));
}
} else {
return "N/A";
@@ -179,7 +179,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
if (_.isString(inputOutputField) ||
_.isBoolean(inputOutputField) || _.isNumber(inputOutputField)) {
var tempVarfor$check = inputOutputField.toString();
if (tempVarfor$check.indexOf("$") == -1) {
-valueOfArray.push('' +
getValue(_.escape(inputOutputField)) + '');
+valueOfArray.push('' +
getValue(inputOutputField) + '');
}
} else if (_.isObject(inputOutputField) && !id) {
var attributesList = inputOutputField;
@@ -220,7 +220,11 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
fetchInputOutputValue(fetchId, defEntity);
tempLink += '';
} else {
-tempLink += ''
+ getValue(name) + ''
+if (inputOutputField.typeName ==
"AtlasGlossaryTerm") {
+tempLink += '' + getValue(name)
+ ''
+} else {
+tempLink += '' + getValue(name) + ''
+}
}
}
if (readOnly) {
@@ -250,7 +254,6 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
valueObjectKeysList = _.sortBy(valueObjectKeysList);
}
valueObjectKeysList.map(function(key) {
-
key = _.escape(key);
if (key == "profileData") {
return;
@@ -274,11 +277,15 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
if (_.isObject(valueObject[key])) {
val = keyValue
} else if (Utils.isUrl(keyValue)) {
-val = '' + getValue(keyValue) + '';
+val = '' + getValue(keyValue) + '';
} else if (key === 'guid' || key === "__guid") {
-val = '' + getValue(keyValue) + '';
+if (options.fromAdminAudit) {
+val = getValue(keyValue);
+} else {
+val = '' + getValue(keyValue) + '';
+}
} else {
-val = getValue(_.escape(keyValue));
+val = getValue(keyValue);
}
if (isTable) {
var value = val,
diff --git a/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
b/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
index c378716..3379a66 100644
--- a/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
+++ b/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
@@ -156,9 +156,15 @@ define(['require',
name = obj.name,
typeName = o
[atlas] 01/03: ATLAS-3831: UI: Add entity icon for spark
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/atlas.git commit 16d810a887f52bd76a67ac6636664f60afef86fa Author: kevalbhatt AuthorDate: Wed Jun 10 13:00:03 2020 +0530 ATLAS-3831: UI: Add entity icon for spark (cherry picked from commit 0df34884deb73237cfb5ecb367a5e4510a080357) --- dashboardv2/public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes .../public/img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes .../public/img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes dashboardv2/public/img/entity-icon/spark.png| Bin 0 -> 6685 bytes dashboardv2/public/img/entity-icon/spark_process.png| Bin 0 -> 10072 bytes dashboardv2/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes dashboardv3/public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes .../public/img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes .../public/img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes dashboardv3/public/img/entity-icon/spark.png| Bin 0 -> 6685 bytes dashboardv3/public/img/entity-icon/spark_process.png| Bin 0 -> 10072 bytes dashboardv3/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes dashboardv3/public/js/utils/Utils.js| 8 13 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dashboardv2/public/img/entity-icon/disabled/spark.png b/dashboardv2/public/img/entity-icon/disabled/spark.png new file mode 100644 index 000..93f8a4d Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/spark.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/spark_process.png b/dashboardv2/public/img/entity-icon/disabled/spark_process.png new file mode 100644 index 000..bf19121 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/spark_process.png differ diff --git a/dashboardv2/public/img/entity-icon/disabled/spark_table.png b/dashboardv2/public/img/entity-icon/disabled/spark_table.png new file mode 100644 index 000..1404026 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/disabled/spark_table.png differ diff --git a/dashboardv2/public/img/entity-icon/spark.png b/dashboardv2/public/img/entity-icon/spark.png new file mode 100644 index 000..27bf2f7 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/spark.png differ diff --git a/dashboardv2/public/img/entity-icon/spark_process.png b/dashboardv2/public/img/entity-icon/spark_process.png new file mode 100644 index 000..077b035 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/spark_process.png differ diff --git a/dashboardv2/public/img/entity-icon/spark_table.png b/dashboardv2/public/img/entity-icon/spark_table.png new file mode 100644 index 000..af90c24 Binary files /dev/null and b/dashboardv2/public/img/entity-icon/spark_table.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/spark.png b/dashboardv3/public/img/entity-icon/disabled/spark.png new file mode 100644 index 000..93f8a4d Binary files /dev/null and b/dashboardv3/public/img/entity-icon/disabled/spark.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/spark_process.png b/dashboardv3/public/img/entity-icon/disabled/spark_process.png new file mode 100644 index 000..bf19121 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/disabled/spark_process.png differ diff --git a/dashboardv3/public/img/entity-icon/disabled/spark_table.png b/dashboardv3/public/img/entity-icon/disabled/spark_table.png new file mode 100644 index 000..1404026 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/disabled/spark_table.png differ diff --git a/dashboardv3/public/img/entity-icon/spark.png b/dashboardv3/public/img/entity-icon/spark.png new file mode 100644 index 000..27bf2f7 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/spark.png differ diff --git a/dashboardv3/public/img/entity-icon/spark_process.png b/dashboardv3/public/img/entity-icon/spark_process.png new file mode 100644 index 000..077b035 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/spark_process.png differ diff --git a/dashboardv3/public/img/entity-icon/spark_table.png b/dashboardv3/public/img/entity-icon/spark_table.png new file mode 100644 index 000..af90c24 Binary files /dev/null and b/dashboardv3/public/img/entity-icon/spark_table.png differ diff --git a/dashboardv3/public/js/utils/Utils.js b/dashboardv3/public/js/utils/Utils.js index 7b957da..40bb698 100644 --- a/dashboardv3/public/js/utils/Utils.js +++ b/dashboardv3/public/js/utils/Utils.js @@ -73,10 +73,10 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums', }); return uuid; };
[atlas] 01/03: ATLAS-3831: UI: Add entity icon for spark
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
commit 0df34884deb73237cfb5ecb367a5e4510a080357
Author: kevalbhatt
AuthorDate: Wed Jun 10 13:00:03 2020 +0530
ATLAS-3831: UI: Add entity icon for spark
---
dashboardv2/public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes
.../public/img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes
.../public/img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes
dashboardv2/public/img/entity-icon/spark.png| Bin 0 -> 6685 bytes
dashboardv2/public/img/entity-icon/spark_process.png| Bin 0 -> 10072 bytes
dashboardv2/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes
dashboardv3/public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes
.../public/img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes
.../public/img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes
dashboardv3/public/img/entity-icon/spark.png| Bin 0 -> 6685 bytes
dashboardv3/public/img/entity-icon/spark_process.png| Bin 0 -> 10072 bytes
dashboardv3/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes
dashboardv3/public/js/utils/Utils.js| 8
13 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/img/entity-icon/disabled/spark.png
b/dashboardv2/public/img/entity-icon/disabled/spark.png
new file mode 100644
index 000..93f8a4d
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/disabled/spark.png differ
diff --git a/dashboardv2/public/img/entity-icon/disabled/spark_process.png
b/dashboardv2/public/img/entity-icon/disabled/spark_process.png
new file mode 100644
index 000..bf19121
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/disabled/spark_process.png differ
diff --git a/dashboardv2/public/img/entity-icon/disabled/spark_table.png
b/dashboardv2/public/img/entity-icon/disabled/spark_table.png
new file mode 100644
index 000..1404026
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/disabled/spark_table.png differ
diff --git a/dashboardv2/public/img/entity-icon/spark.png
b/dashboardv2/public/img/entity-icon/spark.png
new file mode 100644
index 000..27bf2f7
Binary files /dev/null and b/dashboardv2/public/img/entity-icon/spark.png differ
diff --git a/dashboardv2/public/img/entity-icon/spark_process.png
b/dashboardv2/public/img/entity-icon/spark_process.png
new file mode 100644
index 000..077b035
Binary files /dev/null and
b/dashboardv2/public/img/entity-icon/spark_process.png differ
diff --git a/dashboardv2/public/img/entity-icon/spark_table.png
b/dashboardv2/public/img/entity-icon/spark_table.png
new file mode 100644
index 000..af90c24
Binary files /dev/null and b/dashboardv2/public/img/entity-icon/spark_table.png
differ
diff --git a/dashboardv3/public/img/entity-icon/disabled/spark.png
b/dashboardv3/public/img/entity-icon/disabled/spark.png
new file mode 100644
index 000..93f8a4d
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/disabled/spark.png differ
diff --git a/dashboardv3/public/img/entity-icon/disabled/spark_process.png
b/dashboardv3/public/img/entity-icon/disabled/spark_process.png
new file mode 100644
index 000..bf19121
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/disabled/spark_process.png differ
diff --git a/dashboardv3/public/img/entity-icon/disabled/spark_table.png
b/dashboardv3/public/img/entity-icon/disabled/spark_table.png
new file mode 100644
index 000..1404026
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/disabled/spark_table.png differ
diff --git a/dashboardv3/public/img/entity-icon/spark.png
b/dashboardv3/public/img/entity-icon/spark.png
new file mode 100644
index 000..27bf2f7
Binary files /dev/null and b/dashboardv3/public/img/entity-icon/spark.png differ
diff --git a/dashboardv3/public/img/entity-icon/spark_process.png
b/dashboardv3/public/img/entity-icon/spark_process.png
new file mode 100644
index 000..077b035
Binary files /dev/null and
b/dashboardv3/public/img/entity-icon/spark_process.png differ
diff --git a/dashboardv3/public/img/entity-icon/spark_table.png
b/dashboardv3/public/img/entity-icon/spark_table.png
new file mode 100644
index 000..af90c24
Binary files /dev/null and b/dashboardv3/public/img/entity-icon/spark_table.png
differ
diff --git a/dashboardv3/public/js/utils/Utils.js
b/dashboardv3/public/js/utils/Utils.js
index 7b957da..40bb698 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -73,10 +73,10 @@ define(['require', 'utils/Globals', 'pnotify',
'utils/Messages', 'utils/Enums',
});
return uuid;
};
-Utils.getBaseUrl = function(url) {
+Utils.getBaseUrl = function(url, noPop) {
[atlas] 02/03: ATLAS-3829:- UI: Clicking on meanings from relationship tab should redirect to terms details page.
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
commit f4e1e6b0ec58febac3d72d20d4a40a8f218d74e1
Author: kevalbhatt
AuthorDate: Wed Jun 10 13:04:39 2020 +0530
ATLAS-3829:- UI: Clicking on meanings from relationship tab should redirect
to terms details page.
---
dashboardv2/public/js/utils/CommonViewFunction.js | 23 ++
.../js/views/graph/RelationshipLayoutView.js | 12 ---
dashboardv3/public/js/utils/CommonViewFunction.js | 23 ++
.../js/views/graph/RelationshipLayoutView.js | 13
4 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index b4ee73f..36837f1 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -109,13 +109,13 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
var newVal = val;
if (formatStringVal) {
newVal = parseInt(val);
-if (newVal === NaN) {
+if (_.isNaN(newVal)) {
newVal = val;
} else {
newVal = numberFormat(newVal);
}
}
-return getHighlightedString(newVal);
+return getHighlightedString(_.escape(newVal));
}
} else {
return "N/A";
@@ -179,7 +179,7 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
if (_.isString(inputOutputField) ||
_.isBoolean(inputOutputField) || _.isNumber(inputOutputField)) {
var tempVarfor$check = inputOutputField.toString();
if (tempVarfor$check.indexOf("$") == -1) {
-valueOfArray.push('' +
getValue(_.escape(inputOutputField)) + '');
+valueOfArray.push('' +
getValue(inputOutputField) + '');
}
} else if (_.isObject(inputOutputField) && !id) {
var attributesList = inputOutputField;
@@ -220,7 +220,11 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
fetchInputOutputValue(fetchId, defEntity);
tempLink += '';
} else {
-tempLink += ''
+ getValue(name) + ''
+if (inputOutputField.typeName ==
"AtlasGlossaryTerm") {
+tempLink += '' + getValue(name)
+ ''
+} else {
+tempLink += '' + getValue(name) + ''
+}
}
}
if (readOnly) {
@@ -250,7 +254,6 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
valueObjectKeysList = _.sortBy(valueObjectKeysList);
}
valueObjectKeysList.map(function(key) {
-
key = _.escape(key);
if (key == "profileData") {
return;
@@ -274,11 +277,15 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
if (_.isObject(valueObject[key])) {
val = keyValue
} else if (Utils.isUrl(keyValue)) {
-val = '' + getValue(keyValue) + '';
+val = '' + getValue(keyValue) + '';
} else if (key === 'guid' || key === "__guid") {
-val = '' + getValue(keyValue) + '';
+if (options.fromAdminAudit) {
+val = getValue(keyValue);
+} else {
+val = '' + getValue(keyValue) + '';
+}
} else {
-val = getValue(_.escape(keyValue));
+val = getValue(keyValue);
}
if (isTable) {
var value = val,
diff --git a/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
b/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
index c378716..3379a66 100644
--- a/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
+++ b/dashboardv2/public/js/views/graph/RelationshipLayoutView.js
@@ -156,9 +156,15 @@ define(['require',
name = obj.name,
typeName = options.typeName;
-return ""
[atlas] branch master updated (985264e -> 8092d6b)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git. from 985264e ATLAS-3780 : Change 'Status' from Classification System Attributes to EntityStatus new 0df3488 ATLAS-3831: UI: Add entity icon for spark new f4e1e6b ATLAS-3829:- UI: Clicking on meanings from relationship tab should redirect to terms details page. new 8092d6b ATLAS-3769:- UI: Changing page limit in Admin audits resets any filters applied on that page The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes .../img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes .../img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes dashboardv2/public/img/entity-icon/spark.png | Bin 0 -> 6685 bytes .../public/img/entity-icon/spark_process.png | Bin 0 -> 10072 bytes dashboardv2/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes dashboardv2/public/js/utils/CommonViewFunction.js | 23 ++--- .../js/views/audit/AdminAuditTableLayoutView.js| 6 +++--- .../js/views/graph/RelationshipLayoutView.js | 12 --- .../public/img/entity-icon/disabled/spark.png | Bin 0 -> 5584 bytes .../img/entity-icon/disabled/spark_process.png | Bin 0 -> 7318 bytes .../img/entity-icon/disabled/spark_table.png | Bin 0 -> 5005 bytes dashboardv3/public/img/entity-icon/spark.png | Bin 0 -> 6685 bytes .../public/img/entity-icon/spark_process.png | Bin 0 -> 10072 bytes dashboardv3/public/img/entity-icon/spark_table.png | Bin 0 -> 5577 bytes dashboardv3/public/js/utils/CommonViewFunction.js | 23 ++--- dashboardv3/public/js/utils/Utils.js | 8 +++ .../js/views/audit/AdminAuditTableLayoutView.js| 6 +++--- .../js/views/graph/RelationshipLayoutView.js | 13 19 files changed, 58 insertions(+), 33 deletions(-) create mode 100644 dashboardv2/public/img/entity-icon/disabled/spark.png create mode 100644 dashboardv2/public/img/entity-icon/disabled/spark_process.png create mode 100644 dashboardv2/public/img/entity-icon/disabled/spark_table.png create mode 100644 dashboardv2/public/img/entity-icon/spark.png create mode 100644 dashboardv2/public/img/entity-icon/spark_process.png create mode 100644 dashboardv2/public/img/entity-icon/spark_table.png create mode 100644 dashboardv3/public/img/entity-icon/disabled/spark.png create mode 100644 dashboardv3/public/img/entity-icon/disabled/spark_process.png create mode 100644 dashboardv3/public/img/entity-icon/disabled/spark_table.png create mode 100644 dashboardv3/public/img/entity-icon/spark.png create mode 100644 dashboardv3/public/img/entity-icon/spark_process.png create mode 100644 dashboardv3/public/img/entity-icon/spark_table.png
[atlas] 03/03: ATLAS-3769:- UI: Changing page limit in Admin audits resets any filters applied on that page
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
commit 8092d6b5fda19ba523742444123bdbbe9b428914
Author: kevalbhatt
AuthorDate: Wed Jun 10 16:20:03 2020 +0530
ATLAS-3769:- UI: Changing page limit in Admin audits resets any filters
applied on that page
---
dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js | 6 +++---
dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
index 00e0953..bc0990f 100644
--- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -56,7 +56,7 @@ define(['require',
events["click " + this.ui.adminEntityClick] =
"onClickAdminEntity";
events["change " + this.ui.adminType] = "onClickAdminType";
events["click " + this.ui.attrFilter] = function(e) {
-this.$('.fa-angle-right').toggleClass('fa-angle-down');
+
this.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
this.$('.attributeResultContainer').addClass("overlay");
this.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
this.onClickAttrFilter();
@@ -120,7 +120,7 @@ define(['require',
closeAttributeModel: function() {
var that = this;
that.$('.attributeResultContainer').removeClass("overlay");
-that.$('.fa-angle-right').toggleClass('fa-angle-down');
+
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
getAttributes: function(options) {
@@ -133,7 +133,6 @@ define(['require',
"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
})
})
-this.isFilters = null;
} else {
adminAttributes = [{
"attributeName": "userName",
@@ -301,6 +300,7 @@ define(['require',
},
onClickAdminType: function(e, value) {
this.onlyPurged = e.currentTarget.value === "Purged";
+this.isFilters = null;
this.defaultPagination();
this.getAdminCollection();
},
diff --git a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
index 00e0953..bc0990f 100644
--- a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -56,7 +56,7 @@ define(['require',
events["click " + this.ui.adminEntityClick] =
"onClickAdminEntity";
events["change " + this.ui.adminType] = "onClickAdminType";
events["click " + this.ui.attrFilter] = function(e) {
-this.$('.fa-angle-right').toggleClass('fa-angle-down');
+
this.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
this.$('.attributeResultContainer').addClass("overlay");
this.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
this.onClickAttrFilter();
@@ -120,7 +120,7 @@ define(['require',
closeAttributeModel: function() {
var that = this;
that.$('.attributeResultContainer').removeClass("overlay");
-that.$('.fa-angle-right').toggleClass('fa-angle-down');
+
that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container,
.attr-filter-overlay').toggleClass('hide');
},
getAttributes: function(options) {
@@ -133,7 +133,6 @@ define(['require',
"attributeValue": (adminFilter.type == "date" &&
options.isDateParsed) ? Date.parse(adminFilter.value).toString() :
adminFilter.value
})
})
-this.isFilters = null;
} else {
adminAttributes = [{
"attributeName
[atlas] branch branch-2.0 updated: ATLAS-3770:- UI(Classic): Active and Deleted hyperlinks for certain entities throwing error on click
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 458d9b9 ATLAS-3770:- UI(Classic): Active and Deleted hyperlinks for
certain entities throwing error on click
458d9b9 is described below
commit 458d9b94f5b2897f19cc297f580106da263a1112
Author: kevalbhatt
AuthorDate: Fri Jun 5 19:45:49 2020 +0530
ATLAS-3770:- UI(Classic): Active and Deleted hyperlinks for certain
entities throwing error on click
---
dashboardv2/public/js/router/Router.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dashboardv2/public/js/router/Router.js
b/dashboardv2/public/js/router/Router.js
index 9172aea..5e94597 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -279,15 +279,15 @@ define([
}
var isinitialView = true,
isTypeTagNotExists = false,
-tempParam = _.extend({}, paramObj);
+tempParam = $.extend(true, {}, paramObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({
view: App.rSideNav,
manualRender: function() {
-
this.view.currentView.RSearchLayoutView.currentView.manualRender(paramObj);
+
this.view.currentView.RSearchLayoutView.currentView.manualRender(tempParam);
},
render: function() {
-return new SideNavLayoutView(_.extend({ 'value':
paramObj }, options));
+return new SideNavLayoutView(_.extend({ 'value':
tempParam }, options));
}
});
App.rSideNav.currentView.selectTab();
[atlas] branch master updated: ATLAS-3770:- UI(Classic): Active and Deleted hyperlinks for certain entities throwing error on click
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 21b1584 ATLAS-3770:- UI(Classic): Active and Deleted hyperlinks for
certain entities throwing error on click
21b1584 is described below
commit 21b15842fd74bc91910b2d8901dbea57769065d0
Author: kevalbhatt
AuthorDate: Fri Jun 5 19:45:49 2020 +0530
ATLAS-3770:- UI(Classic): Active and Deleted hyperlinks for certain
entities throwing error on click
---
dashboardv2/public/js/router/Router.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dashboardv2/public/js/router/Router.js
b/dashboardv2/public/js/router/Router.js
index 9172aea..5e94597 100644
--- a/dashboardv2/public/js/router/Router.js
+++ b/dashboardv2/public/js/router/Router.js
@@ -279,15 +279,15 @@ define([
}
var isinitialView = true,
isTypeTagNotExists = false,
-tempParam = _.extend({}, paramObj);
+tempParam = $.extend(true, {}, paramObj);
that.renderViewIfNotExists(that.getHeaderOptions(Header));
that.renderViewIfNotExists({
view: App.rSideNav,
manualRender: function() {
-
this.view.currentView.RSearchLayoutView.currentView.manualRender(paramObj);
+
this.view.currentView.RSearchLayoutView.currentView.manualRender(tempParam);
},
render: function() {
-return new SideNavLayoutView(_.extend({ 'value':
paramObj }, options));
+return new SideNavLayoutView(_.extend({ 'value':
tempParam }, options));
}
});
App.rSideNav.currentView.selectTab();
[atlas] branch branch-2.0 updated: ATLAS-3766:- Stats modal not close issue #2
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 01e4966 ATLAS-3766:- Stats modal not close issue #2
01e4966 is described below
commit 01e496604fe4491f796497ad239ff1553b67d792
Author: kevalbhatt
AuthorDate: Fri Jun 5 11:14:28 2020 +0530
ATLAS-3766:- Stats modal not close issue #2
---
dashboardv2/public/js/views/site/Statistics.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/site/Statistics.js
b/dashboardv2/public/js/views/site/Statistics.js
index 868bd62..db8c92f 100644
--- a/dashboardv2/public/js/views/site/Statistics.js
+++ b/dashboardv2/public/js/views/site/Statistics.js
@@ -101,13 +101,14 @@ define(['require',
that.fetchMetricData({ update: true });
}
}]
-}).open();
-
+});
modal.on('closeModal', function() {
modal.trigger('cancel');
});
this.modal = modal;
+modal.open();
}
+
},
bindEvents: function() {
var that = this;
[atlas] branch branch-2.0 updated: ATLAS-3156:- After tag error loader not hiding #3
This is an automated email from the ASF dual-hosted git repository.
kbhatt 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 0bf8af7 ATLAS-3156:- After tag error loader not hiding #3
0bf8af7 is described below
commit 0bf8af7f3db797b1cf1e9bba4fd6490d06015ae4
Author: kevalbhatt
AuthorDate: Wed Jun 3 19:49:46 2020 +0530
ATLAS-3156:- After tag error loader not hiding #3
---
dashboardv2/public/js/views/tag/TagLayoutView.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js
b/dashboardv2/public/js/views/tag/TagLayoutView.js
index 1095790..5e2b523 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -611,6 +611,9 @@ define(['require',
that.collection.fullCollection.remove(deleteTagData);
// to update tag list of search tab fetch typeHeaders.
that.typeHeaders.fetch({ reset: true });
+},
+cust_error: function() {
+that.changeLoaderState(false);
}
});
}
[atlas] branch branch-2.0 updated (98e3d12 -> 445c383)
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 98e3d12 Revert "ATLAS-3758: support sort params in
FreeTextSearchProcessor - #2"
new cc6cac3 ATLAS-3604: Data Migration status display.
new 66e0042 ATLAS-3705 : UI : Remove notification section from Server
Statistics: migration page
new 445c383 ATLAS-3761:- UI: Show progress bar for migration page
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dashboardv2/gruntfile.js | 4 +-
.../public/css/scss/migration-style.scss | 16 +--
dashboardv2/public/css/scss/stats.scss | 59
dashboardv2/public/js/migration.js | 159 +
.../MigrationView_tmpl.html} | 4 +-
.../public/js/templates/site/Statistics_tmpl.html | 15 +-
dashboardv2/public/js/utils/Helper.js | 137 +-
.../public/js/utils/MigrationEnums.js | 21 +--
.../public/js/views/migration/MigrationView.js | 68 +
dashboardv2/public/js/views/site/Statistics.js | 150 +++
dashboardv2/public/migration-status.html.tpl | 61
.../atlas/web/filters/ActiveServerFilter.java | 25
.../atlas/web/security/AtlasSecurityConfig.java| 1 +
13 files changed, 595 insertions(+), 125 deletions(-)
copy dashboardv3/public/css/scss/style.scss =>
dashboardv2/public/css/scss/migration-style.scss (77%)
create mode 100644 dashboardv2/public/js/migration.js
copy
dashboardv2/public/js/templates/{glossary/TermRelationAttributeLayoutView_tmpl.html
=> migration/MigrationView_tmpl.html} (93%)
copy
addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/model/KafkaDataTypes.java
=> dashboardv2/public/js/utils/MigrationEnums.js (77%)
create mode 100644 dashboardv2/public/js/views/migration/MigrationView.js
create mode 100644 dashboardv2/public/migration-status.html.tpl
[atlas] 02/03: ATLAS-3705 : UI : Remove notification section from Server Statistics: migration page
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 66e00427ad3d740243a84d8b905131a07fb74b0b
Author: kevalbhatt
AuthorDate: Mon Mar 30 14:34:30 2020 +0530
ATLAS-3705 : UI : Remove notification section from Server Statistics:
migration page
(cherry picked from commit e58e7d42b47326feb97779f4e4147c78cefc866c)
---
dashboardv2/gruntfile.js | 1 +
dashboardv2/public/css/scss/migration-style.scss | 28 ++
dashboardv2/public/css/scss/stats.scss | 15
.../public/js/templates/site/Statistics_tmpl.html | 7 --
.../public/js/views/migration/MigrationView.js | 2 +-
dashboardv2/public/js/views/site/Statistics.js | 22 +
dashboardv2/public/migration-status.html.tpl | 17 +
7 files changed, 69 insertions(+), 23 deletions(-)
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index efb1475..e4d4f5c 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -209,6 +209,7 @@ module.exports = function(grunt) {
build: {
files: {
[distPath + '/css/style.css']: modulesPath +
'css/scss/style.scss',
+[distPath + '/css/migration-style.css']: modulesPath +
'css/scss/migration-style.scss',
[distPath + '/css/login.css']: modulesPath +
'css/scss/login.scss'
}
}
diff --git a/dashboardv2/public/css/scss/migration-style.scss
b/dashboardv2/public/css/scss/migration-style.scss
new file mode 100644
index 000..a54bcef
--- /dev/null
+++ b/dashboardv2/public/css/scss/migration-style.scss
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+@import "__mixin.scss";
+@import "__variable.scss";
+@import "common.scss";
+@import "table.scss";
+@import "form.scss";
+@import "panel.scss";
+@import "loader.scss";
+@import "theme.scss";
+@import "stats.scss";
+@import "override.scss";
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/stats.scss
b/dashboardv2/public/css/scss/stats.scss
index 723b87d..2114117 100644
--- a/dashboardv2/public/css/scss/stats.scss
+++ b/dashboardv2/public/css/scss/stats.scss
@@ -111,4 +111,19 @@
}
}
+}
+
+.refresh-container {
+background: white;
+position: fixed;
+z-index: ;
+right: 23px;
+top: 7px;
+border-radius: 23px;
+
+.btn {
+margin: 0px;
+border-radius: 23px;
+padding: 10px 10px;
+}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/templates/site/Statistics_tmpl.html
b/dashboardv2/public/js/templates/site/Statistics_tmpl.html
index 5bf0a9c..ce4b9ee 100644
--- a/dashboardv2/public/js/templates/site/Statistics_tmpl.html
+++ b/dashboardv2/public/js/templates/site/Statistics_tmpl.html
@@ -14,7 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
+
+
+
+
@@ -89,7 +92,7 @@
-
+
Notification Details
diff --git a/dashboardv2/public/js/views/migration/MigrationView.js
b/dashboardv2/public/js/views/migration/MigrationView.js
index 8f4b0b0..e7000f3 100644
--- a/dashboardv2/public/js/views/migration/MigrationView.js
+++ b/dashboardv2/public/js/views/migration/MigrationView.js
@@ -60,7 +60,7 @@ define(['require',
that.metricCollection = new VTagList();
that.metricCollection.url = UrlLinks.metricsApiUrl();
that.metricCollection.modelAttrName = "data";
-that.RStatisticsView.show(new Statistics({ hideModal:
false, metricCollection: that.metricCollection }));
+that.RStatisticsView.show(new Statistics({
metricCollecti
[atlas] 03/03: ATLAS-3761:- UI: Show progress bar for migration page
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 445c38325b1d0a99dbcf48db107243916fa3985c
Author: kevalbhatt
AuthorDate: Tue Apr 28 22:30:24 2020 +0530
ATLAS-3761:- UI: Show progress bar for migration page
(cherry picked from commit b4246817251429ec986e9f4a37adca7cf334a2a4)
---
dashboardv2/public/css/scss/migration-style.scss | 6 +-
dashboardv2/public/css/scss/stats.scss | 62 --
dashboardv2/public/js/migration.js | 4 -
.../js/templates/migration/MigrationView_tmpl.html | 2 +-
.../public/js/templates/site/Statistics_tmpl.html | 12 +-
dashboardv2/public/js/utils/Helper.js | 137 +++--
.../utils/MigrationEnums.js} | 26 ++--
dashboardv2/public/js/views/site/Statistics.js | 94 --
dashboardv2/public/migration-status.html.tpl | 8 +-
9 files changed, 239 insertions(+), 112 deletions(-)
diff --git a/dashboardv2/public/css/scss/migration-style.scss
b/dashboardv2/public/css/scss/migration-style.scss
index a54bcef..60c9758 100644
--- a/dashboardv2/public/css/scss/migration-style.scss
+++ b/dashboardv2/public/css/scss/migration-style.scss
@@ -25,4 +25,8 @@
@import "loader.scss";
@import "theme.scss";
@import "stats.scss";
-@import "override.scss";
\ No newline at end of file
+@import "override.scss";
+
+.initialLoading {
+left: 0px !important;
+}
\ No newline at end of file
diff --git a/dashboardv2/public/css/scss/stats.scss
b/dashboardv2/public/css/scss/stats.scss
index 2114117..7bf7581 100644
--- a/dashboardv2/public/css/scss/stats.scss
+++ b/dashboardv2/public/css/scss/stats.scss
@@ -61,6 +61,7 @@
.panel {
&.panel-default {
padding: 5px;
+margin: 5px;
}
.panel-body {
@@ -80,6 +81,12 @@
.table {
&.stat-table {
+width: 100%;
+
+td {
+display: table-cell;
+}
+
&.notification-table {
&.table-striped>tbody>tr:nth-of-type(odd) {
background-color: $color_white_lilac_approx;
@@ -113,17 +120,54 @@
}
}
-.refresh-container {
-background: white;
+.statistics-header {
+height: 50px;
+width: 100%;
+display: flex;
+justify-content: center;
+align-items: center;
position: fixed;
-z-index: ;
-right: 23px;
-top: 7px;
-border-radius: 23px;
+z-index: 999;
+top: 0px;
+padding: 0px 15px;
+background: #fff;
+border-bottom: 1px #e8e9ee solid;
+box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .05);
+
+&>div {
+margin: 0px 5px;
+}
-.btn {
-margin: 0px;
+pre {
+width: 100%;
+padding: 5px 10px;
+margin: 0px 10px;
+color: $gray;
+
+.color {
+color: $color_jungle_green_approx;
+font-weight: bold;
+}
+}
+
+.progress {
+width: 100%;
+margin-top: 7px;
+margin-bottom: 0px;
+
+.progress-bar-success {
+background-color: $color_jungle_green_approx;
+}
+}
+
+.refresh-container {
+background: white;
border-radius: 23px;
-padding: 10px 10px;
+
+.btn {
+margin: 0px;
+border-radius: 23px;
+padding: 10px 10px;
+}
}
}
\ No newline at end of file
diff --git a/dashboardv2/public/js/migration.js
b/dashboardv2/public/js/migration.js
index e49a69f..fca59ce 100644
--- a/dashboardv2/public/js/migration.js
+++ b/dashboardv2/public/js/migration.js
@@ -77,9 +77,6 @@ require.config({
'pnotify': {
'exports': ['pnotify']
},
-'jstree': {
-'deps': ['jquery']
-},
'd3': {
'exports': ['d3']
}
@@ -106,7 +103,6 @@ require.config({
'moment': 'libs/moment/js/moment.min',
'moment-timezone':
'libs/moment-timezone/moment-timezone-with-data.min',
'jquery-ui': 'external_lib/jquery-ui/jquery-ui.min',
-'jstree': 'libs/jstree/jstree.min',
'd3': 'libs/d3/d3.min'
},
diff --git a/dashboardv2/public/js/templates/migration/MigrationView_tmpl.html
b/dashboardv2/public/js/templates/migration/MigrationView_tmpl.html
index 41a665f..67572fa 100644
--- a/dashboardv2/public/js/templates/migration/MigrationView_tmpl.html
+++ b/dashboardv2/public/js/templates/migration/MigrationView_tmpl.html
@@ -14,4 +14,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/dashboardv2/public/js/templates/site/Statistics_tmpl.html
b/dashboardv2/public/js/templates/site/Statistics_
[atlas] 01/03: ATLAS-3604: Data Migration status display.
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit cc6cac35686eb0c09c85f7c5d0f5e17c49516855
Author: Nikhil Bonte
AuthorDate: Thu Feb 13 15:34:11 2020 -0800
ATLAS-3604: Data Migration status display.
Signed-off-by: Ashutosh Mestry
---
dashboardv2/gruntfile.js | 3 +-
dashboardv2/public/js/migration.js | 163 +
.../js/templates/migration/MigrationView_tmpl.html | 17 +++
.../public/js/views/migration/MigrationView.js | 68 +
dashboardv2/public/js/views/site/Statistics.js | 50 ---
dashboardv2/public/migration-status.html.tpl | 80 ++
.../atlas/web/filters/ActiveServerFilter.java | 25
.../atlas/web/security/AtlasSecurityConfig.java| 1 +
8 files changed, 383 insertions(+), 24 deletions(-)
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index f9c9579..efb1475 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -287,7 +287,8 @@ module.exports = function(grunt) {
}
},
files: {
-[distPath + '/index.html']: [modulesPath +
'index.html.tpl']
+[distPath + '/index.html']: [modulesPath +
'index.html.tpl'],
+[distPath + '/migration-status.html']: [modulesPath +
'migration-status.html.tpl']
}
}
}
diff --git a/dashboardv2/public/js/migration.js
b/dashboardv2/public/js/migration.js
new file mode 100644
index 000..e49a69f
--- /dev/null
+++ b/dashboardv2/public/js/migration.js
@@ -0,0 +1,163 @@
+/**
+ * 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.
+ */
+
+require.config({
+/* starting point for application */
+'hbs': {
+'disableI18n': true, // This disables the i18n helper and doesn't
require the json i18n files (e.g. en_us.json)
+'helperPathCallback': // Callback to determine the path to look for
helpers
+function(name) { // ('/template/helpers/'+name by default)
+return 'modules/Helpers';
+},
+'templateExtension': 'html', // Set the extension automatically
appended to templates
+'compileOptions': {} // options object which is passed to Handlebars
compiler
+},
+'urlArgs': "bust=" + getBustValue(),
+/**
+ * Requested as soon as the loader has processed the configuration. It does
+ * not block any other require() calls from starting their requests for
+ * modules, it is just a way to specify some modules to load asynchronously
+ * as part of a config block.
+ * @type {Array} An array of dependencies to load.
+ */
+'deps': ['marionette'],
+
+/**
+ * The number of seconds to wait before giving up on loading a script.
+ * @default 7 seconds
+ * @type {Number}
+ */
+'waitSeconds': 30,
+
+'shim': {
+'backbone': {
+'deps': ['underscore', 'jquery'],
+'exports': 'Backbone'
+},
+'bootstrap': {
+'deps': ['jquery'],
+'exports': 'jquery'
+},
+'underscore': {
+'exports': '_'
+},
+'marionette': {
+'deps': ['backbone']
+},
+'hbs': {
+'deps': ['underscore', 'handlebars']
+},
+'jquery-placeholder': {
+'deps': ['jquery']
+},
+'jquery-ui': {
+'deps': ['jquery']
+},
+'moment-timezone': {
+'deps': ['moment']
+},
+'moment': {
+'exports': ['moment']
+},
+'pnotify': {
+'exports': ['pnotify']
+},
+'jstree': {
+'deps': ['jquery']
+},
+'d3': {
+'exports': ['d3']
+}
+},
+
+paths: {
+'jquery': 'libs/jquery/js/jquery.min',
+'underscore': 'libs/underscore/underscore-min',
+'bootstrap': 'libs/bootstrap/js/bootstrap.min',
+'backbone': 'libs/backbone/backbone-min',
+
[atlas] 02/02: ATLAS-3805:- UI:Basic Search: System Attribute 'typeName' in classification filter, should list classification Names in drop down
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
commit 1a971463d74320dcf093598cd456b1c369a5cb75
Author: kevalbhatt
AuthorDate: Wed May 27 15:22:33 2020 +0530
ATLAS-3805:- UI:Basic Search: System Attribute 'typeName' in classification
filter, should list classification Names in drop down
(cherry picked from commit d6d6f90fd0dd25dd76c8cfef3d0238e24364fd0e)
---
dashboardv2/public/js/views/search/QueryBuilderView.js | 5 +++--
dashboardv3/public/js/views/search/QueryBuilderView.js | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/search/QueryBuilderView.js
b/dashboardv2/public/js/views/search/QueryBuilderView.js
index e250119..83b8ac9 100644
--- a/dashboardv2/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv2/public/js/views/search/QueryBuilderView.js
@@ -23,9 +23,10 @@ define(['require',
'utils/Utils',
'utils/CommonViewFunction',
'utils/Enums',
+'utils/Globals',
'query-builder',
'daterangepicker'
-], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils,
CommonViewFunction, Enums) {
+], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils,
CommonViewFunction, Enums, Globals) {
var QueryBuilderView = Backbone.Marionette.LayoutView.extend(
/** @lends QueryBuilderView */
@@ -231,7 +232,7 @@ define(['require',
if (isSystemAttr && attrObj.name === "__typeName") {
var entityType = [];
that.typeHeaders.fullCollection.each(function(model) {
-if (model.get('category') == 'ENTITY') {
+if ((that.type == true && model.get('category') ==
'ENTITY') || (that.tag == true && model.get('category') == "CLASSIFICATION")) {
entityType.push({
"id": model.get("name"),
"text": model.get("name")
diff --git a/dashboardv3/public/js/views/search/QueryBuilderView.js
b/dashboardv3/public/js/views/search/QueryBuilderView.js
index e250119..83b8ac9 100644
--- a/dashboardv3/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv3/public/js/views/search/QueryBuilderView.js
@@ -23,9 +23,10 @@ define(['require',
'utils/Utils',
'utils/CommonViewFunction',
'utils/Enums',
+'utils/Globals',
'query-builder',
'daterangepicker'
-], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils,
CommonViewFunction, Enums) {
+], function(require, Backbone, QueryBuilderTmpl, UserDefineTmpl, Utils,
CommonViewFunction, Enums, Globals) {
var QueryBuilderView = Backbone.Marionette.LayoutView.extend(
/** @lends QueryBuilderView */
@@ -231,7 +232,7 @@ define(['require',
if (isSystemAttr && attrObj.name === "__typeName") {
var entityType = [];
that.typeHeaders.fullCollection.each(function(model) {
-if (model.get('category') == 'ENTITY') {
+if ((that.type == true && model.get('category') ==
'ENTITY') || (that.tag == true && model.get('category') == "CLASSIFICATION")) {
entityType.push({
"id": model.get("name"),
"text": model.get("name")
[atlas] 01/02: ATLAS-3789:- UI: Date format is not correct for classfication validity periods.
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
commit d6ba8569f11cd1803bb0d335122111d9153552ae
Author: kevalbhatt
AuthorDate: Wed May 27 17:22:57 2020 +0530
ATLAS-3789:- UI: Date format is not correct for classfication validity
periods.
(cherry picked from commit 0d10d6b91191af4db8f8de5aea1243898d38d25e)
---
dashboardv2/public/js/utils/CommonViewFunction.js | 4 ++--
dashboardv2/public/js/utils/Globals.js| 2 ++
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js | 4 ++--
.../public/js/views/entity/EntityBusinessMetaDataItemView.js | 11 ++-
.../public/js/views/entity/EntityBusinessMetaDataView.js | 7 ---
dashboardv2/public/js/views/search/QueryBuilderView.js| 2 +-
dashboardv2/public/js/views/tag/AddTagModalView.js| 5 +++--
dashboardv2/public/js/views/tag/AddTimezoneItemView.js| 6 +++---
dashboardv3/public/js/utils/CommonViewFunction.js | 4 ++--
dashboardv3/public/js/utils/Globals.js| 2 ++
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js | 4 ++--
.../public/js/views/entity/EntityBusinessMetaDataItemView.js | 11 ++-
.../public/js/views/entity/EntityBusinessMetaDataView.js | 9 +
dashboardv3/public/js/views/search/QueryBuilderView.js| 2 +-
dashboardv3/public/js/views/tag/AddTagModalView.js| 5 +++--
dashboardv3/public/js/views/tag/AddTimezoneItemView.js| 6 +++---
16 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js
b/dashboardv2/public/js/utils/CommonViewFunction.js
index b8c6e7f..b4ee73f 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -631,13 +631,13 @@ define(['require', 'utils/Utils', 'modules/Modal',
'utils/Messages', 'utils/Enum
rule = {};
if (apiObj) {
rule = { attributeName: temp[0], operator:
mapUiOperatorToAPI(temp[1]), attributeValue: _.trim(temp[2]) }
-rule.attributeValue = rule.type === 'date' &&
formatDate && rule.attributeValue.length ?
moment(parseInt(rule.attributeValue)).format('MM/DD/ h:mm A') :
rule.attributeValue;
+rule.attributeValue = rule.type === 'date' &&
formatDate && rule.attributeValue.length ?
moment(parseInt(rule.attributeValue)).format(Globals.dateTimeFormat) :
rule.attributeValue;
} else {
rule = { id: temp[0], operator: temp[1],
value: _.trim(temp[2]) }
if (temp[3]) {
rule['type'] = temp[3];
}
-rule.value = rule.type === 'date' &&
formatDate && rule.value.length ?
moment(parseInt(rule.value)).format('MM/DD/ h:mm A') : rule.value;
+rule.value = rule.type === 'date' &&
formatDate && rule.value.length ?
moment(parseInt(rule.value)).format(Globals.dateTimeFormat) : rule.value;
}
return rule;
}
diff --git a/dashboardv2/public/js/utils/Globals.js
b/dashboardv2/public/js/utils/Globals.js
index 6ed423d..3ab33a5 100644
--- a/dashboardv2/public/js/utils/Globals.js
+++ b/dashboardv2/public/js/utils/Globals.js
@@ -40,5 +40,7 @@ define(["require"], function(require) {
Globals.serviceTypeMap = {};
Globals.entityImgPath = "/img/entity-icon/";
Globals.DEFAULT_UI = "v2";
+Globals.dateFormat = "/MM/DD";
+Globals.dateTimeFormat = "/MM/DD HH:mm:ss";
return Globals;
});
\ No newline at end of file
diff --git a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
index d967728..2a70b36 100644
--- a/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
@@ -595,9 +595,9 @@ define(['require',
}
if (value.typeName === "date") {
if (dataValue) {
-entityValue =
moment(dataValue).format("MM/DD/");
+entityValue =
moment(dataValue).format(Globals.dateFormat);
} else {
-entityValue = moment().format("MM/DD/");
+entityValue =
moment().format(Global
[atlas] branch master updated (56ecce6 -> 1a97146)
This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git. from 56ecce6 ATLAS-1530: updated committer/ppmc members contact and employment info - #2 new d6ba856 ATLAS-3789:- UI: Date format is not correct for classfication validity periods. new 1a97146 ATLAS-3805:- UI:Basic Search: System Attribute 'typeName' in classification filter, should list classification Names in drop down The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dashboardv2/public/js/utils/CommonViewFunction.js | 4 ++-- dashboardv2/public/js/utils/Globals.js| 2 ++ dashboardv2/public/js/views/entity/CreateEntityLayoutView.js | 4 ++-- .../public/js/views/entity/EntityBusinessMetaDataItemView.js | 11 ++- .../public/js/views/entity/EntityBusinessMetaDataView.js | 7 --- dashboardv2/public/js/views/search/QueryBuilderView.js| 7 --- dashboardv2/public/js/views/tag/AddTagModalView.js| 5 +++-- dashboardv2/public/js/views/tag/AddTimezoneItemView.js| 6 +++--- dashboardv3/public/js/utils/CommonViewFunction.js | 4 ++-- dashboardv3/public/js/utils/Globals.js| 2 ++ dashboardv3/public/js/views/entity/CreateEntityLayoutView.js | 4 ++-- .../public/js/views/entity/EntityBusinessMetaDataItemView.js | 11 ++- .../public/js/views/entity/EntityBusinessMetaDataView.js | 9 + dashboardv3/public/js/views/search/QueryBuilderView.js| 7 --- dashboardv3/public/js/views/tag/AddTagModalView.js| 5 +++-- dashboardv3/public/js/views/tag/AddTimezoneItemView.js| 6 +++--- 16 files changed, 53 insertions(+), 41 deletions(-)
