New: Added datetime parsing for visualization

Author: mixaaaa

lib/blockmacro/jiraIssuesBlockmacro.js

@@ -3,6 +3,7 @@
 */
 const Jira = require('../Jira')
 const _ = require('lodash')
+const moment = require('moment')
 const { createLinkToIssue } = require('../common/utils')
 
 function jiraIssuesBlockMacro (context) {
@@ -15,7 +16,9 @@ function jiraIssuesBlockMacro (context) {
       const jiraProject = parent.applySubstitutions(target, ['attributes'])
       const jql = attrs.jql || (jiraProject === undefined ? 'resolution="Unresolved" ORDER BY priority DESC, key ASC, duedate ASC' : `project = ${jiraProject} AND resolution="Unresolved" ORDER BY priority DESC, key ASC, duedate ASC`)
       const customFields = attrs.customFieldIds || 'priority,created,assignee,issuetype,summary'
+      doc.getLogger().info(`customFields: ${customFields}`)
       const customFieldIds = customFields.split(',').map(customField => customField.split('.')[0])
+      doc.getLogger().info(`customFieldIds: ${customFieldIds}`)
       const logger = context.logger
       const jiraConfig = require('../common/jiraConfig').createConfig('', doc, jiraProject, attrs, logger)
       const jiraClient = new Jira(doc, jiraConfig.auth, jiraConfig.baseUrl)
@@ -30,8 +33,8 @@ function jiraIssuesBlockMacro (context) {
       content.push('|====')
       content.push('|' + headers.join('|'))
 
-      for (let i = 0; i < issues.length; i++) {
-        const issue = issues[i]
+      for (const element of issues) {
+        const issue = element
         let idColumn = 'a|'
         if (issue.fields.issuetype && customFieldIds.includes('issuetype')) {
           const issueTypeName = issue.fields.issuetype.name
@@ -43,24 +46,31 @@ function jiraIssuesBlockMacro (context) {
         idColumn += `${createLinkToIssue(jiraConfig.baseUrl, issue.key)}[${issue.key}]`
         content.push(idColumn)
 
-        for (let j = 0; j < customFieldsArray.length; j++) {
+        for (const element of customFieldsArray) {
           let value
-          if (!_.has(issue.fields, customFieldsArray[j])) {
-            logger.warn(`Examining issue '${JSON.stringify(issue, null, 2)}' for custom field '${customFieldsArray[j]}', but was not found.`)
+          if (!_.has(issue.fields, element)) {
+            logger.warn(`Examining issue '${JSON.stringify(issue, null, 2)}' for custom field '${element}', but was not found.`)
             value = '-'
           } else {
-            value = _.get(issue.fields, customFieldsArray[j])
+            value = _.get(issue.fields, element)
             if (value !== null && (value.constructor === Array)) {
               value = value.toString()
             } else if ((typeof value === 'object') && value != null) {
-              value = value.name || value.displayName || doc.getAttribute(`jira-table-${customFieldsArray[j].replace(/\./g, '-')}-default`, '-')
+              value = value.name || value.displayName || doc.getAttribute(`jira-table-${element.replace(/\./g, '-')}-default`, '-')
             } else {
-              value = value || doc.getAttribute(`jira-table-${customFieldsArray[j].replace(/\./g, '-')}-default`, '-')
+              value = value || doc.getAttribute(`jira-table-${element.replace(/\./g, '-')}-default`, '-')
             }
           }
           if (typeof value === 'number') {
             content.push('|' + value)
           } else {
+            const inputFormatAttr = `jira-${element.replace(/\./g, '-')}-input-format`
+            const outputFormatAttr = `jira-${element.replace(/\./g, '-')}-output-format`
+            const inputFormat = doc.getAttribute(inputFormatAttr)
+            if (inputFormat) {
+              const outputFormat = doc.getAttribute(outputFormatAttr)
+              value = formatValue(doc, value, inputFormat, outputFormat)
+            }
             content.push('|' + value.replace(/\|/g, '\\|'))
           }
         }
@@ -74,6 +84,16 @@ function jiraIssuesBlockMacro (context) {
   }
 }
 
+function formatValue (doc, value, inputFormat, outputFormat) {
+  if (typeof value === 'string') {
+    const parsedValue = moment(value, inputFormat, true)
+    if (parsedValue.isValid()) {
+      return parsedValue.format(outputFormat)
+    }
+  }
+  return value
+}
+
 function createHeaders (doc, customFieldIds) {
   const headers = []
   const customFieldsArray = customFieldIds.split(',').filter(item => item !== 'issuetype')

test/antora/antora-playbook.yml

@@ -19,6 +19,8 @@ asciidoc:
     - ./../../lib/asciidoctor-jira.js
   attributes:
     jira-baseurl: https://uniqueck.atlassian.net
+    jira-created-input-format: yyyy-MM-ddTHH:mm:ss.SSSZ
+    jira-created-output-format: dd.MM.yyyy
 
 ui:
   bundle:

test/test.spec.js

@@ -98,6 +98,32 @@ describe('Conversion', () => {
 <th class="tableblock halign-left valign-top">labels</th>
 </tr>
 </thead>
+</table>`)
+    })
+    it('#206 - date adaption', () => {
+      const registry = asciidoctor.Extensions.create()
+      jiraExt.register(registry)
+
+      const html = asciidoctor.convert('jira::DOC[jql="issue=DOC-2",customFieldIds="created"]', { extension_registry: registry, attributes: { imagesoutdir: 'test/.images', 'jira-created-input-format': 'YYYY-MM-DDTHH:mm:ss.SSSZ', 'jira-created-output-format': 'DD.MM.YYYY' } })
+      expect(html).to.equal(`<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 66.6667%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">ID</th>
+<th class="tableblock halign-left valign-top">created</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
+<p><a href="https://uniqueck.atlassian.net/browse/DOC-2">DOC-2</a></p>
+</div></div></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">09.10.2021</p></td>
+</tr>
+</tbody>
 </table>`)
     })
   })