Repository: atlas Updated Branches: refs/heads/branch-0.8 198084870 -> 3b5f0cad2
ATLAS-2285 : UI fix in handling of date attributes during saved searche rename Signed-off-by: Madhan Neethiraj <mad...@apache.org> (cherry picked from commit a6fdfbb75c088d61d4044288e8a9b8f8b03bb94d) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/3b5f0cad Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/3b5f0cad Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/3b5f0cad Branch: refs/heads/branch-0.8 Commit: 3b5f0cad2fb4ff9cedd73867caed70b1ab18c84b Parents: 1980848 Author: pratik pandey <pratik.pan...@freestoneinfotech.com> Authored: Tue Dec 5 17:11:05 2017 +0530 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Tue Dec 5 12:46:55 2017 -0800 ---------------------------------------------------------------------- .../public/js/utils/CommonViewFunction.js | 38 ++++++++++---------- .../public/js/views/search/QueryBuilderView.js | 2 +- .../public/js/views/search/SearchLayoutView.js | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/3b5f0cad/dashboardv2/public/js/utils/CommonViewFunction.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js index ddc1ce8..a9e022f 100644 --- a/dashboardv2/public/js/utils/CommonViewFunction.js +++ b/dashboardv2/public/js/utils/CommonViewFunction.js @@ -384,8 +384,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum return '<div class="tagList btn-inline btn-fixed-width">' + atags + addTag + '</div>'; } CommonViewFunction.generateQueryOfFilter = function(value) { - var entityFilters = CommonViewFunction.attributeFilter.extractUrl(value.entityFilters), - tagFilters = CommonViewFunction.attributeFilter.extractUrl(value.tagFilters), + var entityFilters = CommonViewFunction.attributeFilter.extractUrl({ "value": value.entityFilters, "formatDate": true }), + tagFilters = CommonViewFunction.attributeFilter.extractUrl({ "value": value.tagFilters, "formatDate": true }), queryArray = [], objToString = function(filterObj) { var tempObj = []; @@ -499,14 +499,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum _.each(val.criterion, function(obj) { var attributeDef = _.findWhere(attributeDefs, { 'name': obj.attributeName }); if (attributeDef) { - if (attributeDef.typeName == "date") { - obj.attributeValue = moment(parseInt(obj.attributeValue)).format('MM/DD/YYYY h:mm A'); - } + obj.attributeValue = obj.attributeValue; obj['attributeType'] = attributeDef.typeName; } }); } - val = CommonViewFunction.attributeFilter.generateUrl(val.criterion); + val = CommonViewFunction.attributeFilter.generateUrl({ "value": val.criterion }); } else if (k == "entityFilters") { if (entityDefCollection) { var entityDef = entityDefCollection.fullCollection.findWhere({ 'name': value.typeName }), @@ -518,14 +516,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum _.each(val.criterion, function(obj) { var attributeDef = _.findWhere(attributeDefs, { 'name': obj.attributeName }); if (attributeDef) { - if (attributeDef.typeName == "date") { - obj.attributeValue = moment(parseInt(obj.attributeValue)).format('MM/DD/YYYY h:mm A'); - } + obj.attributeValue = obj.attributeValue; obj['attributeType'] = attributeDef.typeName; } }); } - val = CommonViewFunction.attributeFilter.generateUrl(val.criterion); + val = CommonViewFunction.attributeFilter.generateUrl({ "value": val.criterion }); } else if (k == "includeDE") { if (val) { val = false; @@ -540,12 +536,15 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum } } CommonViewFunction.attributeFilter = { - generateUrl: function(attrObj) { - var attrQuery = []; + generateUrl: function(options) { + var attrQuery = [], + attrObj = options.value, + formatedDateToLong = options.formatedDateToLong; if (attrObj) { _.each(attrObj, function(obj) { - var url = [(obj.id || obj.attributeName), mapApiOperatorToUI(obj.operator), _.trim(obj.value || obj.attributeValue)], - type = (obj.type || obj.attributeType); + var type = (obj.type || obj.attributeType), + value = _.trim(obj.value || obj.attributeValue), + url = [(obj.id || obj.attributeName), mapApiOperatorToUI(obj.operator), (type === 'date' && formatedDateToLong ? Date.parse(value) : value)]; if (type) { url.push(type); } @@ -587,8 +586,10 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum return oper; } }, - extractUrl: function(urlObj) { - var attrObj = []; + extractUrl: function(options) { + var attrObj = [], + urlObj = options.value, + formatDate = options.formatDate; if (urlObj && urlObj.length) { _.each(urlObj.split(":,:"), function(obj) { var temp = obj.split("::"); @@ -596,6 +597,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum if (temp[3]) { finalObj['type'] = temp[3]; } + finalObj.value = finalObj.type === 'date' && formatDate ? moment(parseInt(finalObj.value)).format('MM/DD/YYYY h:mm A') : finalObj.value; attrObj.push(finalObj); }); return attrObj; @@ -607,7 +609,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum if (url && url.length) { var parsObj = { "condition": 'AND', - "criterion": convertKeyAndExtractObj(this.extractUrl(url)) + "criterion": convertKeyAndExtractObj(this.extractUrl({ "value": url })) } return parsObj; } else { @@ -621,7 +623,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum tempObj = { "attributeName": rulObj.id, "operator": mapUiOperatorToAPI(rulObj.operator), - "attributeValue": _.trim(rulObj.type === "date" ? Date.parse(rulObj.value) : rulObj.value) + "attributeValue": _.trim(rulObj.value) } convertObj.push(tempObj); }); http://git-wip-us.apache.org/repos/asf/atlas/blob/3b5f0cad/dashboardv2/public/js/views/search/QueryBuilderView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/search/QueryBuilderView.js b/dashboardv2/public/js/views/search/QueryBuilderView.js index 7db4ea7..ef84c2f 100644 --- a/dashboardv2/public/js/views/search/QueryBuilderView.js +++ b/dashboardv2/public/js/views/search/QueryBuilderView.js @@ -137,7 +137,7 @@ define(['require', var that = this, filters = []; if (this.value) { - var rules_widgets = CommonViewFunction.attributeFilter.extractUrl(this.searchTableFilters[this.filterType][(this.tag ? this.value.tag : this.value.type)]); + var rules_widgets = CommonViewFunction.attributeFilter.extractUrl({ "value": this.searchTableFilters[this.filterType][(this.tag ? this.value.tag : this.value.type)], "formatDate": true }); } _.each(this.attrObj, function(obj) { var returnObj = that.getObjDef(obj, rules_widgets); http://git-wip-us.apache.org/repos/asf/atlas/blob/3b5f0cad/dashboardv2/public/js/views/search/SearchLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js index 5ece1c2..f7a1bf3 100644 --- a/dashboardv2/public/js/views/search/SearchLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchLayoutView.js @@ -396,7 +396,7 @@ define(['require', var rule = queryBuilderRef.queryBuilder('getRules'); } if (rule) { - var ruleUrl = CommonViewFunction.attributeFilter.generateUrl(rule.rules); + var ruleUrl = CommonViewFunction.attributeFilter.generateUrl({ "value": rule.rules, "formatedDateToLong": true }); this.searchTableFilters[filtertype][(isTag ? this.value.tag : this.value.type)] = ruleUrl; this.makeFilterButtonActive(filtertype); if (!isTag && this.value && this.value.type && this.searchTableColumns) {
