[atlas] branch master updated: ATLAS-4039:UI:#1 Audit entry for export operation displays param information which is incorrect, fixed

[pinal]

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

pinal 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 25dc63d  ATLAS-4039:UI:#1 Audit entry for export operation displays 
param information which is incorrect,fixed
25dc63d is described below

commit 25dc63d69f37a13ddc3398dfbcacbf5bfd2b07a7
Author: prasad pawar <prasad.pa...@freestoneinfotech.com>
AuthorDate: Mon Aug 16 20:28:24 2021 +0530

    ATLAS-4039:UI:#1 Audit entry for export operation displays param 
information which is incorrect,fixed
    
    Signed-off-by: Pinal Shah <pinal.s...@freestoneinfotech.com>
---
 dashboardv2/public/js/utils/CommonViewFunction.js              | 7 +++++--
 dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js | 2 +-
 dashboardv3/public/js/utils/CommonViewFunction.js              | 7 +++++--
 dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js 
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 8c2df51..899acf1 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -269,7 +269,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
                 }
                 return subLink === "" ? getEmptyString(key) : subLink;
             }
-        var valueObjectKeysList = _.keys(valueObject);
+        var valueObjectKeysList = _.keys(_.omit(valueObject, ['paramsCount']));
         if (_.isUndefined(sortBy) || sortBy == true) {
             valueObjectKeysList = _.sortBy(valueObjectKeysList);
         }
@@ -278,7 +278,10 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
                 return;
             }
             var keyValue = valueObject[key],
-                listCount = showListCount && _.isArray(keyValue) && 
keyValue.length > 0 ? ' (' + numberFormat(keyValue.length) + ')' : "";
+                listCount = "";
+            if (showListCount && _.isArray(keyValue) && keyValue.length > 0) {
+                listCount = (valueObject && valueObject.paramsCount != 
undefined) ? (numberFormat(valueObject.paramsCount) != 0) ? ' (' + 
numberFormat(valueObject.paramsCount) + ')' : '' : ' (' + 
numberFormat(keyValue.length) + ')';
+            }
             var defEntity = _.find(attributeDefs, { name: key });
             if (defEntity && defEntity.typeName) {
                 var defEntityType = defEntity.typeName.toLocaleLowerCase();
diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js 
b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
index 0f27c4e..f7918e8 100644
--- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -377,7 +377,7 @@ define(['require',
                     adminValues += this.showImportExportTable(resultData, 
obj.operation);
                 }
                 if (paramsData) {
-                    adminValues += this.showImportExportTable(paramsData);
+                    adminValues += 
this.showImportExportTable(_.extend(paramsData, { "paramsCount": 
obj.model.get('paramsCount') }));
                 }
                 adminValues = adminValues ? adminValues : obj.adminText;
                 return '<div class="row"><div class="attr-details"><h4 
style="word-break: break-word;">' + adminTypDetails + '</h4>' + adminValues + 
'</div></div>';
diff --git a/dashboardv3/public/js/utils/CommonViewFunction.js 
b/dashboardv3/public/js/utils/CommonViewFunction.js
index e739544..8a95a47 100644
--- a/dashboardv3/public/js/utils/CommonViewFunction.js
+++ b/dashboardv3/public/js/utils/CommonViewFunction.js
@@ -269,7 +269,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
                 }
                 return subLink === "" ? getEmptyString(key) : subLink;
             }
-        var valueObjectKeysList = _.keys(valueObject);
+        var valueObjectKeysList = _.keys(_.omit(valueObject, ['paramsCount']));
         if (_.isUndefined(sortBy) || sortBy == true) {
             valueObjectKeysList = _.sortBy(valueObjectKeysList);
         }
@@ -278,7 +278,10 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
                 return;
             }
             var keyValue = valueObject[key],
-                listCount = showListCount && _.isArray(keyValue) && 
keyValue.length > 0 ? ' (' + numberFormat(keyValue.length) + ')' : "";
+                listCount = "";
+            if (showListCount && _.isArray(keyValue) && keyValue.length > 0) {
+                listCount = (valueObject && valueObject.paramsCount != 
undefined) ? (numberFormat(valueObject.paramsCount) != 0) ? ' (' + 
numberFormat(valueObject.paramsCount) + ')' : '' : ' (' + 
numberFormat(keyValue.length) + ')';
+            }
             var defEntity = _.find(attributeDefs, { name: key });
             if (defEntity && defEntity.typeName) {
                 var defEntityType = defEntity.typeName.toLocaleLowerCase();
diff --git a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js 
b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
index 0f27c4e..f7918e8 100644
--- a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -377,7 +377,7 @@ define(['require',
                     adminValues += this.showImportExportTable(resultData, 
obj.operation);
                 }
                 if (paramsData) {
-                    adminValues += this.showImportExportTable(paramsData);
+                    adminValues += 
this.showImportExportTable(_.extend(paramsData, { "paramsCount": 
obj.model.get('paramsCount') }));
                 }
                 adminValues = adminValues ? adminValues : obj.adminText;
                 return '<div class="row"><div class="attr-details"><h4 
style="word-break: break-word;">' + adminTypDetails + '</h4>' + adminValues + 
'</div></div>';