From 9060bfaee81b5567444db2e05828f7252b5108e9 Mon Sep 17 00:00:00 2001
From: Valentine Lejeune <valentine.lejeune1@gmail.com>
Date: Mon, 19 Apr 2021 17:28:34 +0200
Subject: [PATCH] fix: in jira table can search by issue type & fix columns
 sorting

---
 src/proxy-page/steps/addJira.ts | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/proxy-page/steps/addJira.ts b/src/proxy-page/steps/addJira.ts
index a92f88861..9c3713c7c 100644
--- a/src/proxy-page/steps/addJira.ts
+++ b/src/proxy-page/steps/addJira.ts
@@ -38,7 +38,10 @@ export default (): Step => {
           name: issue.key,
           link: `https://iadc.atlassian.net/browse/${issue.key}?src=confmacro`,
         },
-        t: issue.fields.issuetype?.iconUrl,
+        t: {
+          name: issue.fields.issuetype.name,
+          icon: issue.fields.issuetype?.iconUrl,
+        },
         summary: {
           name: issue.fields.summary,
           link: `https://iadc.atlassian.net/browse/${issue.key}?src=confmacro`,
@@ -53,7 +56,10 @@ export default (): Step => {
             })}`
           : '',
         assignee: issue.fields.assignee?.displayName,
-        pr: issue.fields.priority?.iconUrl,
+        pr: {
+          name: issue.fields.priority?.name,
+          icon: issue.fields.priority?.iconUrl,
+        },
         status: {
           name: issue.fields.status?.name,
           color: issue.fields.status?.statusCategory.colorName,
@@ -66,12 +72,18 @@ export default (): Step => {
     let gridjsColumns = `[{
                 name: 'Key',
                 width: '5%',
+                sort: {
+                  compare: (a, b) => (a.name > b.name ? 1 : -1),
+                },
                 formatter: (cell) => gridjs.html(${'`<a href="${cell.link}" target="_blank">${cell.name}</a>`'})
               },`;
     if (requestedFields.includes('summary')) {
       gridjsColumns += `{
                 name: 'Summary',
                 width: '30%',
+                sort: {
+                  compare: (a, b) => (a.name > b.name ? 1 : -1),
+                },
                 formatter: (cell) => gridjs.html(${'`<a href="${cell.link}" target="_blank">${cell.name}</a>`'})
               },`;
     }
@@ -80,13 +92,19 @@ export default (): Step => {
       gridjsColumns += `{
                 name: 'T',
                 width: '2%',
-                formatter: (cell) => gridjs.html(cell ? ${'`<img src="${cell}" style="height:2.5rem"/>`'} : ''),
+                sort: {
+                  compare: (a, b) => (a.name > b.name ? 1 : -1),
+                },
+                formatter: (cell) => gridjs.html(cell ? ${'`<img src="${cell.icon}" style="height:2.5rem"/>`'} : ''),
               },`;
     }
     if (requestedFields.includes('status')) {
       gridjsColumns += `{
                 name: 'Status',
                 width: '5%',
+                sort: {
+                  compare: (a, b) => (a.name > b.name ? 1 : -1),
+                },
                 formatter: (cell) => gridjs.html(${'`<div style="color:${cell.color}">${cell.name}</div>`'})
               },`;
     }
@@ -109,7 +127,10 @@ export default (): Step => {
       gridjsColumns += `{
                 name: 'Pr',
                 width: '3%',
-                formatter: (cell) => gridjs.html(cell ? ${'`<img src="${cell}" style="height:2.5rem"/>`'} : ''),
+                sort: {
+                  compare: (a, b) => (a.name > b.name ? 1 : -1),
+                },
+                formatter: (cell) => gridjs.html(cell ? ${'`<img src="${cell.icon}" style="height:2.5rem"/>`'} : ''),
               },`;
     }
     if (requestedFields.includes('resolution')) {