Merge pull request #17 from dhis2/DHIS2-5853/remove-logger-truncation

fix(logger): remove logger truncation
dhis2 · Feb 1, 2019 · 2f2775d · 2f2775d
2 parents 7d497e7 + d46b354
commit 2f2775d
Show file tree

Hide file tree

Showing 8 changed files with 423 additions and 197 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,5 +1,3 @@
-/** @format */
-
 module.exports = {
     printWidth: 80,
     tabWidth: 4,
@@ -9,10 +7,12 @@ module.exports = {
     trailingComma: 'es5',
     bracketSpacing: true,
     jsxBracketSameLine: false,
+    jsxSingleQuote: false,
     arrowParens: 'avoid',
     rangeStart: 0,
     rangeEnd: Infinity,
     proseWrap: 'preserve',
     requirePragma: false,
     insertPragma: false,
+    endOfLine: 'lf',
 }
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2018-11-26T09:55:48.645Z\n"
-"PO-Revision-Date: 2018-11-26T09:55:48.645Z\n"
+"POT-Creation-Date: 2019-02-01T15:53:30.758Z\n"
+"PO-Revision-Date: 2019-02-01T15:53:30.758Z\n"
 
 msgid "user is not logged in"
 msgstr ""

diff --git a/package.json b/package.json
@@ -142,7 +142,7 @@
     ]
   },
   "devDependencies": {
-    "@dhis2/code-style": "^1.5.0",
+    "@dhis2/code-style": "^1.7.1",
     "babel-eslint": "^10.0.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "enzyme": "^3.3.0",

diff --git a/src/components/FormBase/index.js b/src/components/FormBase/index.js
@@ -19,13 +19,11 @@ export class FormBase extends React.Component {
 
     getFormState() {
         const values = {}
-        this.fields
-            .map(f => f.name)
-            .forEach(name => {
-                if (name) {
-                    values[name] = getFieldValue(this.state[name])
-                }
-            })
+        this.fields.map(f => f.name).forEach(name => {
+            if (name) {
+                values[name] = getFieldValue(this.state[name])
+            }
+        })
         return values
     }
 

diff --git a/src/components/Logger/index.js b/src/components/Logger/index.js
@@ -43,7 +43,7 @@ function ArrowDownIcon({ onClick }) {
 function Message({ date, type, text }) {
     return (
         <div className={s.message}>
-            <div className={s.date}>{date}</div>
+            <div className={s.date}>{date || '--:--'}</div>
             <div className={s.type}>{type}</div>
             <div className={s.contents}>
                 <div className={s.text}>{text}</div>
@@ -190,13 +190,27 @@ export class Logger extends React.Component {
         )
     }
 
-    getDate(p, prevDateHH, prevDate) {
-        let date = moment(p.d).format('YYYY-MM-DD HH:mm:ss')
+    /**
+     *
+     * @param {*} msg the log message
+     * @param {*} prevDateHH previous message moment-date formatted with hrs (used to truncate)
+     * @param {*} prevDate previous message moment-date
+     * @param {*} truncate whether to truncate the timestamp, so that the returned
+     * date is formatted without the parts of previous date (upto mm:ss)
+     */
+    getDate(msg, prevDateHH, prevDate, truncate = false) {
+        if (!msg.d) {
+            return null
+        }
+        let date = moment(msg.d).format('YYYY-MM-DD HH:mm:ss')
 
-        if (moment(p.d).format('YYYY-MM-DD HH') === prevDateHH) {
-            date = moment(p.d).format('mm:ss')
-        } else if (moment(p.d).format('YYYY-MM-DD') === prevDate) {
-            date = moment(p.d).format('HH:mm:ss')
+        if (truncate && moment(msg.d).format('YYYY-MM-DD HH') === prevDateHH) {
+            date = moment(msg.d).format('mm:ss')
+        } else if (
+            truncate &&
+            moment(msg.d).format('YYYY-MM-DD') === prevDate
+        ) {
+            date = moment(msg.d).format('HH:mm:ss')
         }
 
         return date
@@ -206,19 +220,19 @@ export class Logger extends React.Component {
         let prevType, prevDate, prevDateHH
         prevType = prevDate = prevDateHH = ''
 
-        return this.state.list.map(p => {
-            const type = p.type === prevType ? '' : p.type
-            const date = this.getDate(p, prevDateHH, prevDate)
+        return this.state.list.map(msg => {
+            const type = msg.type === prevType ? '' : msg.type
+            const date = this.getDate(msg, prevDateHH, prevDate)
 
-            prevType = p.type
-            prevDate = moment(p.d).format('YYYY-MM-DD')
-            prevDateHH = moment(p.d).format('YYYY-MM-DD HH')
+            prevType = msg.type
+            prevDate = moment(msg.d).format('YYYY-MM-DD')
+            prevDateHH = moment(msg.d).format('YYYY-MM-DD HH')
             return (
                 <Message
-                    key={`msg-${p.id}`}
+                    key={`msg-${msg.id}`}
                     date={date}
                     type={type}
-                    text={p.text}
+                    text={msg.text}
                 />
             )
         })

diff --git a/src/components/Tree/__tests__/Tree.test.js b/src/components/Tree/__tests__/Tree.test.js
@@ -21,7 +21,7 @@ describe('Tree', () => {
         wrapper.setProps({ list, selected })
         expect(
             wrapper.containsAllMatchingElements([
-                <div style={{ minWidth: 0 }} />,
+                <div style={{ minWidth: 7 }} />,
                 <div>+</div>,
                 <div>1</div>,
             ])
@@ -47,11 +47,11 @@ describe('Tree', () => {
         wrapper.setProps({ list, selected })
         expect(
             wrapper.containsAllMatchingElements([
-                <div style={{ minWidth: 0 }} />,
+                <div style={{ minWidth: 7 }} />,
                 <div>+</div>,
                 <div>1</div>,
 
-                <div style={{ minWidth: 0 }} />,
+                <div style={{ minWidth: 7 }} />,
                 <div>+</div>,
                 <div>2</div>,
             ])

diff --git a/src/pages/import/helpers.js b/src/pages/import/helpers.js
@@ -163,7 +163,7 @@ function logStats(stats, type) {
     const { created, updated, deleted, ignored, total } = stats
     eventEmitter.emit('log', {
         id: new Date().getTime(),
-        d: new Date(),
+        d: null,
         type: `INFO - ${CATEGORY_2_LABEL[type]}`,
         text: `Created: ${created}, Updated: ${updated}, Deleted: ${deleted}, Ignored: ${ignored}, Total: ${total}`,
     })