You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2020/06/25 15:40:53 UTC

[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] 02/02: ATLAS-3859:- [UI] In edit entity window shows calender with 'Invalid date'

Posted by kb...@apache.org.
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 <kb...@apache.org>
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 = '<div class="back-button importBackBtn" title="Back to import file"><i class="fa fa-angle-left "></i> </div> <div class="modal-name">Error Details</div>';
                                 _.each(response.failedImportInfoList, function(err_obj) {
-                                    errorStr += '<li>' + err_obj.remarks + '</li>';
+                                    errorStr += '<li>' + _.escape(err_obj.remarks) + '</li>';
                                 });
                                 that.ui.errorDetails.append(errorStr);
                                 that.toggleErrorAndDropZoneView({ title: modalTitle, isErrorView: true });
diff --git a/dashboardv3/public/css/scss/business-metadata.scss b/dashboardv3/public/css/scss/business-metadata.scss
index 989dd79..369f6a2 100644
--- a/dashboardv3/public/css/scss/business-metadata.scss
+++ b/dashboardv3/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/dashboardv3/public/css/scss/override.scss b/dashboardv3/public/css/scss/override.scss
index 4d60217..9340570 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -421,7 +421,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 {
@@ -494,4 +495,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/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
index 7d6198c..b95bded 100644
--- a/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
+++ b/dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
@@ -439,9 +439,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);
                     }
@@ -601,7 +607,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/dashboardv3/public/js/views/import/ImportLayoutView.js b/dashboardv3/public/js/views/import/ImportLayoutView.js
index b1b7aab..159e779 100644
--- a/dashboardv3/public/js/views/import/ImportLayoutView.js
+++ b/dashboardv3/public/js/views/import/ImportLayoutView.js
@@ -123,7 +123,7 @@ define([
                             if (response.failedImportInfoList.length > 1) {
                                 var modalTitle = '<div class="back-button importBackBtn" title="Back to import file"><i class="fa fa-angle-left "></i> </div> <div class="modal-name">Error Details</div>';
                                 _.each(response.failedImportInfoList, function(err_obj) {
-                                    errorStr += '<li>' + err_obj.remarks + '</li>';
+                                    errorStr += '<li>' + _.escape(err_obj.remarks) + '</li>';
                                 });
                                 that.ui.errorDetails.append(errorStr);
                                 that.toggleErrorAndDropZoneView({ title: modalTitle, isErrorView: true });


[atlas] 01/02: ATLAS-3156:- UI:No loading animation while creating or deleting a Classification, Term, SaveSearch loading #4

Posted by kb...@apache.org.
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 <kb...@apache.org>
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 + "<b>" + _.escape(options.model.get('name')) + "</b>" + " ?",
-                    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) {}
                     }
                 var text = "Are you sure you want to delete the classification"
@@ -595,7 +598,6 @@ define(['require',
             onNotifyOk: function(data) {
                 var that = this,
                     deleteTagData = this.collection.fullCollection.findWhere({ name: this.tag });
-                that.changeLoaderState(true);
                 deleteTagData.deleteTag({
                     typeName: that.tag,
                     success: function() {
@@ -612,8 +614,10 @@ define(['require',
                         // to update tag list of search tab fetch typeHeaders.
                         that.typeHeaders.fetch({ reset: true });
                     },
-                    cust_error: function() {
-                        that.changeLoaderState(false);
+                    cust_error: function() {},
+                    complete: function() {
+                        that.notificationModal.hideButtonLoader();
+                        that.notificationModal.remove();
                     }
                 });
             }
diff --git a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
index 0b2227f..08c6538 100644
--- a/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
@@ -814,9 +814,12 @@ define([
             var that = this,
                 notifyObj = {
                     modal: true,
-                    ok: function(argument) {
+                    ok: function(obj) {
+                        that.notificationModal = obj;
+                        obj.showButtonLoader();
                         that.onNotifyOk();
                     },
+                    okCloses: false,
                     cancel: function(argument) {}
                 };
             var text = "Are you sure you want to delete the classification";
@@ -853,6 +856,10 @@ define([
                             delete urlObj.tag;
                             var url = urlObj.type || urlObj.term || urlObj.query ? "#!/search/searchResult" : "#!/search"
                             that.triggerSearch(urlObj, url);
+                        },
+                        complete: function() {
+                            that.notificationModal.hideButtonLoader();
+                            that.notificationModal.remove();
                         }
                     });
                 } else {
diff --git a/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
index 53e9da8..ac70024 100644
--- a/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/CustomFilterTreeLayoutView.js
@@ -430,9 +430,12 @@ define([
                     modal: true,
                     html: true,
                     text: Messages.conformation.deleteMessage + "<b>" + _.escape(options.model.get('name')) + "</b>" + " ?",
-                    ok: function(argument) {
+                    ok: function(obj) {
+                        that.notificationModal = obj;
+                        obj.showButtonLoader();
                         that.onDeleteNotifyOk(options);
                     },
+                    okCloses: false,
                     cancel: function(argument) {}
                 }
                 Utils.notifyConfirm(notifyObj);
@@ -451,6 +454,10 @@ define([
                         Utils.notifySuccess({
                             content: options.model.attributes.name + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
                         });
+                    },
+                    complete: function() {
+                        that.notificationModal.hideButtonLoader();
+                        that.notificationModal.remove();
                     }
                 });
             } else {
diff --git a/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js b/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
index 0f10607..c96b03b 100644
--- a/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
+++ b/dashboardv3/public/js/views/search/tree/GlossaryTreeLayoutView.js
@@ -525,7 +525,6 @@ define([
                                 return obj.termGuid == guid;
                             }), { silent: true });
                         }
-
                         Utils.notifySuccess({
                             content: messageType + Messages.getAbbreviationMsg(false, 'deleteSuccessMessage')
                         });
@@ -541,23 +540,27 @@ define([
                             searchParam = _.extend({}, that.options.value, params);
                             that.triggerSearch(searchParam);
                         }
+                    },
+                    complete: function() {
+                        that.notificationModal.hideButtonLoader();
+                        that.notificationModal.remove();
                     }
                 },
                 notifyObj = {
                     modal: true,
-                    ok: function(argument) {
+                    ok: function(obj) {
+                        that.notificationModal = obj;
+                        obj.showButtonLoader();
                         if (type == "Glossary" || type == "GLOSSARY") {
                             that.glossaryCollection.fullCollection.get(guid).destroy(options, { silent: true, reset: false });
-
                         } else if (type == "GlossaryCategory") {
                             new that.glossaryCollection.model().deleteCategory(guid, options);
 
                         } else if (type == "GlossaryTerm") {
                             new that.glossaryCollection.model().deleteTerm(guid, options);
-
                         }
-
                     },
+                    okCloses: false,
                     cancel: function(argument) {}
                 };
             if (type == "Glossary" || type == "GLOSSARY") {