(atlas) branch master updated: ATLAS-5015: UI: when server response date fields as '0', UI shows as current time. (#332)

[ppawar]

This is an automated email from the ASF dual-hosted git repository.

ppawar 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 4b702b076 ATLAS-5015: UI: when server response date fields as '0', UI 
shows as current time. (#332)
4b702b076 is described below

commit 4b702b07650d0376b535275fa8b739c3c01237ac
Author: Brijesh Bhalala <32086209+brijesh...@users.noreply.github.com>
AuthorDate: Thu Apr 17 13:17:21 2025 +0530

    ATLAS-5015: UI: when server response date fields as '0', UI shows as 
current time. (#332)
---
 dashboardv2/public/js/utils/CommonViewFunction.js | 2 +-
 dashboardv2/public/js/utils/Utils.js              | 8 ++++++--
 dashboardv3/public/js/utils/CommonViewFunction.js | 2 +-
 dashboardv3/public/js/utils/Utils.js              | 7 +++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js 
b/dashboardv2/public/js/utils/CommonViewFunction.js
index e5a75674a..fbaaf2602 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -291,7 +291,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
             if (defEntity && defEntity.typeName) {
                 var defEntityType = defEntity.typeName.toLocaleLowerCase();
                 if (defEntityType === 'date') {
-                    keyValue = moment(keyValue)._isValid ? Utils.formatDate({ 
date: keyValue }) : null;
+                    keyValue = moment(keyValue).isValid() ? Utils.formatDate({ 
date: keyValue }) : null;
                 } else if (_.isObject(keyValue)) {
                     keyValue = extractObject({ "keyValue": keyValue, "key": 
key, 'defEntity': defEntity });
                 }
diff --git a/dashboardv2/public/js/utils/Utils.js 
b/dashboardv2/public/js/utils/Utils.js
index b4e02971e..04c31d9fc 100644
--- a/dashboardv2/public/js/utils/Utils.js
+++ b/dashboardv2/public/js/utils/Utils.js
@@ -953,7 +953,11 @@ define(['require', 'utils/Globals', 'pnotify', 
'utils/Messages', 'utils/Enums',
         var dateValue = null,
             dateFormat = Globals.dateTimeFormat,
             isValidDate = false;
-        if (options && options.date) {
+
+        if (options && !options.date) {
+            return null;
+        }
+        else  {
             dateValue = options.date;
             if (dateValue !== "-") {
                 dateValue = parseInt(dateValue);
@@ -961,7 +965,7 @@ define(['require', 'utils/Globals', 'pnotify', 
'utils/Messages', 'utils/Enums',
                     dateValue = options.date;
                 }
                 dateValue = moment(dateValue);
-                if (dateValue._isValid) {
+                if (dateValue.isValid) {
                     isValidDate = true;
                     dateValue = dateValue.format(dateFormat);
                 }
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js 
b/dashboardv3/public/js/utils/CommonViewFunction.js
index c0eb7d7e7..38b4ee98c 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -291,7 +291,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
             if (defEntity && defEntity.typeName) {
                 var defEntityType = defEntity.typeName.toLocaleLowerCase();
                 if (defEntityType === 'date') {
-                    keyValue = moment(keyValue)._isValid ? Utils.formatDate({ 
date: keyValue }) : null;
+                    keyValue = moment(keyValue).isValid() ? Utils.formatDate({ 
date: keyValue }) : null;
                 } else if (_.isObject(keyValue)) {
                     keyValue = extractObject({ "keyValue": keyValue, "key": 
key, 'defEntity': defEntity });
                 }
diff --git a/dashboardv3/public/js/utils/Utils.js 
b/dashboardv3/public/js/utils/Utils.js
index dcd737c01..71953da0b 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -971,7 +971,10 @@ define(['require', 'utils/Globals', 'pnotify', 
'utils/Messages', 'utils/Enums',
         var dateValue = null,
             dateFormat = Globals.dateTimeFormat,
             isValidDate = false;
-        if (options && options.date) {
+        if (options && !options.date) {
+            return null;
+        }
+        else  {
             dateValue = options.date;
             if (dateValue !== "-") {
                 dateValue = parseInt(dateValue);
@@ -979,7 +982,7 @@ define(['require', 'utils/Globals', 'pnotify', 
'utils/Messages', 'utils/Enums',
                     dateValue = options.date;
                 }
                 dateValue = moment(dateValue);
-                if (dateValue._isValid) {
+                if (dateValue.isValid) {
                     isValidDate = true;
                     dateValue = dateValue.format(dateFormat);
                 }