From c01b3df439154985a8cb63ee4a0c44e7ef127277 Mon Sep 17 00:00:00 2001
From: Nicolas Chambrier <naholyr@gmail.com>
Date: Thu, 28 Sep 2017 11:31:37 +0200
Subject: [PATCH] fix(logs): removes technic fields from 'data' diffs (refs
 #448)

---
 server/routes/editLog.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/routes/editLog.js b/server/routes/editLog.js
index 3d8650e9..002a7a37 100644
--- a/server/routes/editLog.js
+++ b/server/routes/editLog.js
@@ -46,10 +46,12 @@ const editLogsPathFilter = path =>
 	//        {'$$d.path.2':'organization'}
 	//        ]}}
 	// }
-	path[0] !== 'latestChangeBy'
+	!editLogsDataKeysBlacklist.includes(path[0])
 
 
+// Paths to ignore/remove
 const editLogsDataKeysBlacklist = ['_id', 'latestChangeBy']
+const editLogsDataKeysFilter = ['updatedAt', 'createdAt'].concat(editLogsDataKeysBlacklist)
 
 
 const routeParamToModel = param => ({
@@ -389,7 +391,7 @@ const formatEdits = (data, model, removeConfidential) => {
 		edit.who = {
 			id: d.whoID
 		}
-		if (d.creator.length){
+		if (d.creator.length) {
 			edit.who.name = (d.creator[0].firstName ? d.creator[0].firstName+' ': '')+ d.creator[0].name
 			edit.who.roles = d.creator[0].isariAuthorizedCenters ?
 							d.creator[0].isariAuthorizedCenters.map(iac =>({lab:iac.organization,role:iac.isariRole})):
@@ -397,19 +399,19 @@ const formatEdits = (data, model, removeConfidential) => {
 		}
 
 		edit.date = d.date
-		edit.item = { id:d.item}
+		edit.item = { id: d.item }
 		edit.item.name = formatItemName(d.itemObject[0], model)
 
 		edit.action = d.action
 
-		if (edit.action === 'update'){
+		if (edit.action === 'update') {
 			edit.diff = flattenDiff(d.diff)
 									.filter(dd => editLogsPathFilter(dd.path))
 									.map(dd => {
 										// remove index of element in array from path
 										const diff = {path: dd.path.filter(e => isNaN(parseInt(e)))}
 
-										if (dd.kind === 'A'){
+										if (dd.kind === 'A') {
 											//array case...
 											if (dd.item.lhs)
 												diff.valueBefore = dd.item.lhs
@@ -462,7 +464,9 @@ const formatEdits = (data, model, removeConfidential) => {
 
 
 const dataToDiff = (data, editType) => {
-	data = cleanupData(data)
+	data = cleanupData(data) // Handle binary ObjectIds & technic fields (keeps _id, which will be filtered just below)
+	// Remove fields we don't want in UI
+	editLogsDataKeysFilter.forEach(f => { delete data[f] })
 	const field = editType === 'create' ? 'valueAfter' : 'valueBefore'
 	return Object.keys(data).reduce(appendChange(data, editType, field), [])
 }