You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ni...@apache.org on 2021/06/10 05:43:53 UTC
[atlas] branch branch-2.0 updated (75ee653 -> 3bca8b8)
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git.
from 75ee653 ATLAS-4329: Update Kafka version to 2.5
new 5f81e28 ATLAS-4295: UI: The short/long description of term & category doesnt get updated immediately when made blank,fixed
new a2ca616 ATLAS-4283:UI: Description cannot be made blank for classification,fixed
new 3bca8b8 ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short description for Classifications, Gloassarys, Categorys & Terms, fixed #2.
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/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
dashboardv2/public/js/utils/CommonViewFunction.js | 3 +++
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
dashboardv2/public/js/views/tag/TagLayoutView.js | 6 ++++++
dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
dashboardv3/public/js/utils/CommonViewFunction.js | 3 +++
dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
.../public/js/views/search/tree/ClassificationTreeLayoutView.js | 6 ++++++
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
10 files changed, 32 insertions(+), 12 deletions(-)
[atlas] 02/03: ATLAS-4283:UI: Description cannot be made blank for
classification, fixed
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit a2ca616a9183b7931e12701306ca3ae49b742d11
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Fri May 21 19:00:56 2021 +0530
ATLAS-4283:UI: Description cannot be made blank for classification,fixed
Signed-off-by: nixonrodrigues <ni...@apache.org>
(cherry picked from commit f048f84e78840387822d5ab5a5678f17756aa0b1)
---
dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
dashboardv2/public/js/views/tag/TagLayoutView.js | 3 +++
dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html | 4 ++--
.../public/js/views/search/tree/ClassificationTreeLayoutView.js | 3 +++
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
index 0f2ba8a..27ea912 100644
--- a/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
@@ -28,9 +28,9 @@
<span class="ellipsis-with-margin control-label text-left col-sm-10" data-id="title"></span> {{/if}}
</div>
<div class="form-group">
- <label class="control-label col-sm-2" for="description">Description</label>
+ <label class="control-label col-sm-2 required" for="description">Description</label>
<div class="col-sm-10">
- <input class="form-control" data-id="description" value="{{description}}" placeholder="Description" />
+ <input class="form-control" data-id="description" value="{{description}}" placeholder="Description(required)" />
</div>
</div>
{{#if create}}
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 9b8b90f..8e7e6c3 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -276,7 +276,7 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
- if (this.model.get('description') === view.ui.description.val()) {
+ if (this.model.get('description') === view.ui.description.val() || view.ui.description.val().length == 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js b/dashboardv2/public/js/views/tag/TagLayoutView.js
index f408469..9dd15b4 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -402,6 +402,9 @@ define(['require',
allowCancel: true,
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
+ view.ui.tagName.on('keyup input', function(e) {
+ view.ui.description.val(this.value);
+ });
modal.on('shownModal', function() {
view.ui.parentTag.select2({
multiple: true,
diff --git a/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html b/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
index 0f2ba8a..27ea912 100644
--- a/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html
@@ -28,9 +28,9 @@
<span class="ellipsis-with-margin control-label text-left col-sm-10" data-id="title"></span> {{/if}}
</div>
<div class="form-group">
- <label class="control-label col-sm-2" for="description">Description</label>
+ <label class="control-label col-sm-2 required" for="description">Description</label>
<div class="col-sm-10">
- <input class="form-control" data-id="description" value="{{description}}" placeholder="Description" />
+ <input class="form-control" data-id="description" value="{{description}}" placeholder="Description(required)" />
</div>
</div>
{{#if create}}
diff --git a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index 75e53cd..18d3650 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -686,6 +686,9 @@ define([
allowCancel: true
}).open();
modal.$el.find("button.ok").attr("disabled", "true");
+ view.ui.tagName.on('keyup input', function(e) {
+ view.ui.description.val(this.value);
+ });
modal.on("shownModal", function() {
view.ui.parentTag.select2({
multiple: true,
diff --git a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
index 6e10155..cabf32b 100644
--- a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -280,7 +280,7 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
- if (this.model.get('description') === view.ui.description.val()) {
+ if (this.model.get('description') === view.ui.description.val() || view.ui.description.val().length == 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
[atlas] 01/03: ATLAS-4295: UI: The short/long description of term &
category doesnt get updated immediately when made blank, fixed
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 5f81e288ca11781cd3afba49e82a60565e53fe60
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Fri Jun 4 17:23:11 2021 +0530
ATLAS-4295: UI: The short/long description of term & category doesnt get updated immediately when made blank,fixed
Signed-off-by: nixonrodrigues <ni...@apache.org>
(cherry picked from commit 0a43c1980c75f37a58fbb69347ec7a0e8f508126)
---
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
index 24a8b06..e30034c 100644
--- a/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -297,8 +297,8 @@ define(['require',
Utils.hideTitleLoader(this.$('.fontLoader'), this.ui.details);
if (data) {
this.ui.title.text(data.name || data.displayText || data.qualifiedName);
- this.ui.shortDescription.text(data.shortDescription);
- this.ui.longDescription.text(data.longDescription);
+ this.ui.shortDescription.text(data.shortDescription ? data.shortDescription : "");
+ this.ui.longDescription.text(data.longDescription ? data.longDescription : "");
this.generateCategories(data.categories);
this.generateTerm(data.terms);
this.generateTag(data.classifications);
diff --git a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
index 24bfa2a..8b305e8 100644
--- a/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
+++ b/dashboardv3/public/js/views/glossary/GlossaryDetailLayoutView.js
@@ -312,8 +312,8 @@ define(['require',
Utils.hideTitleLoader(this.$('.fontLoader'), this.ui.details);
if (data) {
this.ui.title.text(data.name || data.displayText || data.qualifiedName);
- this.ui.shortDescription.text(data.shortDescription);
- this.ui.longDescription.text(data.longDescription);
+ this.ui.shortDescription.text(data.shortDescription ? data.shortDescription : "");
+ this.ui.longDescription.text(data.longDescription ? data.longDescription : "");
this.generateCategories(data.categories);
this.generateTerm(data.terms);
this.generateTag(data.classifications);
[atlas] 03/03: ATLAS-4326: Atlas UI: Multiple continuous space is
accepted on Short description for Classifications, Gloassarys,
Categorys & Terms, fixed #2.
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 3bca8b8482a615daf6a1c74cebc46b643e2753ae
Author: prasad pawar <pr...@freestoneinfotech.com>
AuthorDate: Tue Jun 8 17:01:34 2021 +0530
ATLAS-4326: Atlas UI: Multiple continuous space is accepted on Short description for Classifications, Gloassarys, Categorys & Terms, fixed #2.
Signed-off-by: nixonrodrigues <ni...@apache.org>
(cherry picked from commit e8832f0dbb203dc33475a49711463929b984a37b)
---
dashboardv2/public/js/utils/CommonViewFunction.js | 3 +++
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
dashboardv2/public/js/views/tag/TagLayoutView.js | 5 ++++-
dashboardv3/public/js/utils/CommonViewFunction.js | 3 +++
.../public/js/views/search/tree/ClassificationTreeLayoutView.js | 5 ++++-
dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js | 5 +++--
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js
index bb3fa3f..8c2df51 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -710,6 +710,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
"okText": model ? "Update" : "Create",
"allowCancel": true
}).open();
+ modal.$el.find('input[data-id=shortDescription]').on('input keydown', function(e) {
+ $(this).val($(this).val().replace(/\s+/g, ' '));
+ });
modal.$el.find('button.ok').attr("disabled", "true");
modal.on('ok', function() {
modal.$el.find('button.ok').showButtonLoader();
diff --git a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
index 8e7e6c3..be33e7c 100644
--- a/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -276,14 +276,14 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
- if (this.model.get('description') === view.ui.description.val() || view.ui.description.val().length == 0) {
+ if (this.model.get('description') === view.ui.description.val() || view.ui.description.val().length == 0 || view.ui.description.val().trim().length === 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
}
},
onPublishClick: function(view) {
- var saveObj = _.extend(this.model.toJSON(), { 'description': view.ui.description.val() });
+ var saveObj = _.extend(this.model.toJSON(), { 'description': view.ui.description.val().trim() });
this.onSaveButton(saveObj, Messages.tag.updateTagDescriptionMessage);
this.ui.description.show();
},
@@ -303,6 +303,7 @@ define(['require',
allowCancel: true,
}).open();
view.ui.description.on('keyup input', function(e) {
+ $(this).val($(this).val().replace(/\s+/g, ' '));
that.textAreaChangeEvent(view);
e.stopPropagation();
});
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js b/dashboardv2/public/js/views/tag/TagLayoutView.js
index 9dd15b4..38df187 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -403,7 +403,10 @@ define(['require',
}).open();
modal.$el.find('button.ok').attr("disabled", "true");
view.ui.tagName.on('keyup input', function(e) {
- view.ui.description.val(this.value);
+ view.ui.description.val($(this).val().replace(/\s+/g, ' '));
+ });
+ view.ui.description.on('input keydown', function(e) {
+ $(this).val($(this).val().replace(/\s+/g, ' '));
});
modal.on('shownModal', function() {
view.ui.parentTag.select2({
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js b/dashboardv3/public/js/utils/CommonViewFunction.js
index 34afa2d..e739544 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -730,6 +730,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
"okText": model ? "Update" : "Create",
"allowCancel": true
}).open();
+ modal.$el.find('input[data-id=shortDescription]').on('input keydown', function(e) {
+ $(this).val($(this).val().replace(/\s+/g, ' '));
+ });
modal.$el.find('button.ok').attr("disabled", "true");
modal.on('ok', function() {
modal.$el.find('button.ok').showButtonLoader();
diff --git a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index 18d3650..3bfc201 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -687,7 +687,10 @@ define([
}).open();
modal.$el.find("button.ok").attr("disabled", "true");
view.ui.tagName.on('keyup input', function(e) {
- view.ui.description.val(this.value);
+ view.ui.description.val($(this).val().replace(/\s+/g, ' '));
+ });
+ view.ui.description.on('input keydown', function(e) {
+ $(this).val($(this).val().replace(/\s+/g, ' '));
});
modal.on("shownModal", function() {
view.ui.parentTag.select2({
diff --git a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
index cabf32b..52ff043 100644
--- a/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
+++ b/dashboardv3/public/js/views/tag/TagAttributeDetailLayoutView.js
@@ -280,14 +280,14 @@ define(['require',
});
},
textAreaChangeEvent: function(view) {
- if (this.model.get('description') === view.ui.description.val() || view.ui.description.val().length == 0) {
+ if (this.model.get('description') === view.ui.description.val() || view.ui.description.val().length == 0 || view.ui.description.val().trim().length === 0) {
this.modal.$el.find('button.ok').prop('disabled', true);
} else {
this.modal.$el.find('button.ok').prop('disabled', false);
}
},
onPublishClick: function(view) {
- var saveObj = _.extend(this.model.toJSON(), { 'description': view.ui.description.val() });
+ var saveObj = _.extend(this.model.toJSON(), { 'description': view.ui.description.val().trim() });
this.onSaveButton(saveObj, Messages.tag.updateTagDescriptionMessage);
this.ui.description.show();
},
@@ -307,6 +307,7 @@ define(['require',
allowCancel: true,
}).open();
view.ui.description.on('keyup input', function(e) {
+ $(this).val($(this).val().replace(/\s+/g, ' '));
that.textAreaChangeEvent(view);
e.stopPropagation();
});