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:55 UTC
[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 <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 });