ATLAS-1760: UI update to render property value per attribute type in entity definition

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -88,13 +88,10 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
             }
         });
     }
-    CommonViewFunction.propertyTable = function(valueObject, scope, searchTable) {
+    CommonViewFunction.propertyTable = function(scope, valueObject, entityDef) {
         var table = "",
             fetchInputOutputValue = function(id) {
                 var that = this;
-                if (searchTable) {
-                    ++scope.fetchList
-                }
                 scope.entityModel.getEntity(id, {
                     success: function(serverData) {
                         var value = "",
@@ -118,19 +115,19 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                             scope.$('td div[data-id="' + id + '"]').append(deleteButton);
                         }
                     },
-                    complete: function() {
-                        if (searchTable) {
-                            --scope.fetchList;
-                            scope.checkTableFetch();
-                        }
-                    }
+                    complete: function() {}
                 });
             }
         _.sortBy(_.keys(valueObject)).map(function(key) {
             key = _.escape(key)
             var keyValue = valueObject[key],
                 valueOfArray = [];
-            if (_.isObject(keyValue)) {
+            var defEntity = _.find(entityDef, { name: key });
+            if (defEntity) {
+                var defEntityType = defEntity.typeName.toLocaleLowerCase();
+                if (defEntityType === 'date' || defEntityType === 'time') {
+                    table += '<tr><td>' + _.escape(key) + '</td><td>' + new Date(keyValue) + '</td></tr>';
+                } else if (_.isObject(keyValue)) {
                     if (!_.isArray(keyValue) && _.isObject(keyValue)) {
                         keyValue = [keyValue];
                     }
@@ -200,33 +197,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                     if (valueOfArray.length) {
                         subLink = valueOfArray.join(', ');
                     }
-                if (searchTable) {
-                    table = subLink;
-                } else {
                     table += '<tr><td>' + _.escape(key) + '</td><td>' + subLink + '</td></tr>';
-                }
-            } else {
-                var tempVarfor$check = key.toString();
-                if (tempVarfor$check.indexOf("$") == -1) {
-                    if (key.indexOf("Time") !== -1 || key == "retention") {
-                        if (searchTable) {
-                            table = new Date(valueObject[key]);
-                        } else {
-                            table += '<tr><td>' + _.escape(key) + '</td><td>' + new Date(valueObject[key]) + '</td></tr>';
-                        }
-                    } else {
-                        if (searchTable) {
-                            if (_.isBoolean(valueObject[key])) {
-                                table = valueObject[key].toString();
-                            } else {
-                                table = valueObject[key];
-                            }
+
                 } else {
                     table += '<tr><td>' + _.escape(key) + '</td><td>' + _.escape(valueObject[key]) + '</td></tr>';
                 }
             }
-                }
-            }
         });
         return table;
     }

dashboardv2/public/js/views/audit/AuditTableLayoutView.js

@@ -57,7 +57,7 @@ define(['require',
              * @constructs
              */
             initialize: function(options) {
-                _.extend(this, _.pick(options, 'guid', 'entity', 'entityName'));
+                _.extend(this, _.pick(options, 'guid', 'entity', 'entityName', 'entityDef'));
                 this.entityCollection = new VEntityList();
                 this.count = 26;
                 this.entityCollection.url = UrlLinks.entityCollectionaudit(this.guid);
@@ -227,9 +227,9 @@ define(['require',
                     'views/audit/CreateAuditTableLayoutView',
                 ], function(Modal, CreateAuditTableLayoutView) {
                     that.action = $(e.target).data("action");
-                    var eventModel = that.entityCollection.findWhere({ 'eventKey': $(e.currentTarget).data('modalid') }).toJSON(),
+                    var eventModel = that.entityCollection.fullCollection.findWhere({ 'eventKey': $(e.currentTarget).data('modalid') }).toJSON(),
                         collectionModel = new that.entityCollection.model(eventModel),
-                        view = new CreateAuditTableLayoutView({ guid: that.guid, entityModel: collectionModel, action: that.action, entity: that.entity, entityName: that.entityName });
+                        view = new CreateAuditTableLayoutView({ guid: that.guid, entityModel: collectionModel, action: that.action, entity: that.entity, entityName: that.entityName, entityDef: that.entityDef });
                     var modal = new Modal({
                         title: that.action,
                         content: view,

dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js

@@ -54,7 +54,7 @@ define(['require',
              * @constructs
              */
             initialize: function(options) {
-                _.extend(this, _.pick(options, 'guid', 'entityModel', 'action', 'entity', 'entityName'));
+                _.extend(this, _.pick(options, 'guid', 'entityModel', 'action', 'entity', 'entityName', 'entityDef'));
             },
             bindEvents: function() {},
             onRender: function() {
@@ -85,7 +85,7 @@ define(['require',
                     } else if (parseDetailsObject && parseDetailsObject.values) {
                         this.ui.auditHeaderValue.html('<th>Key</th><th>New Value</th>');
                         //CommonViewFunction.findAndmergeRefEntity(attributeObject, that.referredEntities);
-                        table = CommonViewFunction.propertyTable(values, this);
+                        table = CommonViewFunction.propertyTable(this, values, this.entityDef);
                         if (table.length) {
                             this.ui.noData.hide();
                             this.ui.tableAudit.show();

dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js

@@ -173,8 +173,7 @@ define(['require',
                         entityDefCollection: this.entityDefCollection,
                         fetchCollection: this.fetchCollection.bind(that)
                     }
-                    this.renderEntityDetailTableLayoutView(obj);
-                    this.renderAuditTableLayoutView(obj);
+                    this.getEntityDef(obj);
                     this.renderTagTableLayoutView(obj);
                     this.renderTermTableLayoutView(_.extend({}, obj, { term: true }));
                     // To render Schema check attribute "schemaElementsAttribute"
@@ -240,6 +239,17 @@ define(['require',
             fetchCollection: function() {
                 this.collection.fetch({ reset: true });
             },
+            getEntityDef: function(obj) {
+                var data = this.entityDefCollection.fullCollection.findWhere({ name: obj.entity.typeName }).toJSON();
+                var entityDef = Utils.getNestedSuperTypeObj({
+                    data: data,
+                    attrMerge: true,
+                    collection: this.entityDefCollection
+                });
+                obj['entityDef'] = entityDef;
+                this.renderEntityDetailTableLayoutView(obj);
+                this.renderAuditTableLayoutView(obj);
+            },
             onClickTagCross: function(e) {
                 var tagName = $(e.currentTarget).parent().text(),
                     tagOrTerm = $(e.target).data("type"),

dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js

@@ -48,7 +48,7 @@ define(['require',
              * @constructs
              */
             initialize: function(options) {
-                _.extend(this, _.pick(options, 'entity', 'referredEntities', 'typeHeaders'));
+                _.extend(this, _.pick(options, 'entity', 'referredEntities', 'typeHeaders', 'entityDef'));
                 this.entityModel = new VEntity({});
             },
             bindEvents: function() {},
@@ -65,7 +65,7 @@ define(['require',
                     });
                     attributeObject.columns = valueSorted;
                 }
-                var table = CommonViewFunction.propertyTable(attributeObject, this);
+                var table = CommonViewFunction.propertyTable(this, attributeObject, this.entityDef);
                 that.ui.detailValue.append(table);
             }
         });