From 363b22bffe12c6eb1a275a4e019dd6f225ec8cd2 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Fri, 7 Jul 2017 12:19:18 +0200
Subject: [PATCH] feat(logs): display duration for each call (#2266)

---
 src/common/intl/index.js      | 4 ++++
 src/common/intl/locales/fr.js | 3 +++
 src/common/intl/messages.js   | 2 ++
 src/xo-app/logs/index.js      | 7 ++++---
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/common/intl/index.js b/src/common/intl/index.js
index 131b2d411..aa8354ab9 100644
--- a/src/common/intl/index.js
+++ b/src/common/intl/index.js
@@ -48,6 +48,10 @@ const getMessage = (props, messageId, values, render) => {
     {render}
   </FormattedMessage>
 }
+getMessage.keyValue = (key, value) => getMessage('keyValue', {
+  key: <strong>{key}</strong>,
+  value
+})
 
 export { getMessage as default }
 
diff --git a/src/common/intl/locales/fr.js b/src/common/intl/locales/fr.js
index 5fabbca67..e47d4f66c 100644
--- a/src/common/intl/locales/fr.js
+++ b/src/common/intl/locales/fr.js
@@ -8,6 +8,9 @@ addLocaleData(reactIntlData)
 // ===================================================================
 
 export default {
+  // Original text: "{key}: {value}"
+  keyValue: '{key} : {value}',
+
   // Original text: "Connecting"
   statusConnecting: 'Connexion…',
 
diff --git a/src/common/intl/messages.js b/src/common/intl/messages.js
index 05cbce6cb..c2e3c5cb7 100644
--- a/src/common/intl/messages.js
+++ b/src/common/intl/messages.js
@@ -5,6 +5,8 @@ var forEach = require('lodash/forEach')
 var isString = require('lodash/isString')
 
 var messages = {
+  keyValue: '{key}: {value}',
+
   statusConnecting: 'Connecting',
   statusDisconnected: 'Disconnected',
   statusLoading: 'Loading…',
diff --git a/src/xo-app/logs/index.js b/src/xo-app/logs/index.js
index 93ba2285b..3c5af3679 100644
--- a/src/xo-app/logs/index.js
+++ b/src/xo-app/logs/index.js
@@ -55,9 +55,9 @@ class JobParam extends Component {
       id
     } = this.props
 
-    return object
-    ? <span><strong>{object.type || paramKey}</strong>: {renderXoItem(object)} </span>
-    : <span><strong>{paramKey}:</strong> {String(id)} </span>
+    return object != null
+      ? _.keyValue(object.type || paramKey, renderXoItem(object))
+      : _.keyValue(paramKey, String(id))
   }
 }
 
@@ -111,6 +111,7 @@ const Log = props => <ul className='list-group'>
     return <li key={call.callKey} className='list-group-item'>
       <strong className='text-info'>{call.method}: </strong><JobCallStateInfos end={end} error={error} /><br />
       {map(call.params, (value, key) => [ <JobParam id={value} paramKey={key} key={key} />, <br /> ])}
+      {end !== undefined && _.keyValue(_('jobDuration'), <FormattedDuration duration={end - start} />)}
       {returnedValue != null && returnedValue.size !== undefined && <JobTransferredDataInfos start={start} end={end} size={returnedValue.size} />}
       {id !== undefined && <span>{' '}<JobReturn id={id} /></span>}
       {call.error &&