bjira 0.0.21 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bjira",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "A simple jira CLI tool",
   "main": "src/index.js",
   "author": {
@@ -29,7 +29,8 @@
     "fuzzy": "^0.1.3",
     "inquirer": "^8.2.0",
     "inquirer-autocomplete-prompt": "^1.4.0",
-    "jira-client": "^6.22.0",
+    "inquirer-checkbox-plus-prompt": "^1.0.1",
+    "jira-client": "^6.23.0",
     "ora": "^6.0.1",
     "temp": "^0.9.4"
   }

package/src/ask.js

@@ -4,9 +4,11 @@
 
 import inquirer from 'inquirer';
 import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt';
+import inquirerCheckboxPlusPrompt from 'inquirer-checkbox-plus-prompt';
 import fuzzy from 'fuzzy';
 
 inquirer.registerPrompt('autocomplete', inquirerAutocompletePrompt);
+inquirer.registerPrompt('checkbox-plus', inquirerCheckboxPlusPrompt);
 
 class Ask {
   static async askString(message, defaultValue = undefined) {
@@ -61,6 +63,35 @@ class Ask {
     }]);
     return answer.value;
   }
+
+  static async askCallback(message, callback) {
+    const answer = await inquirer.prompt([{
+      type: 'autocomplete',
+      name: 'value',
+      message,
+      source: (answers, input) => callback(input),
+    }]);
+    return answer.value;
+  }
+
+  static async askMultiList(message, list, defaultValue = null) {
+    const answer = await inquirer.prompt([{
+      type: 'checkbox-plus',
+      name: 'value',
+      message,
+      default: defaultValue,
+      searchable: true,
+      source: (answers, input) => {
+        return new Promise(resolve => {
+          resolve(fuzzy.filter(input || '', list, {
+            extract: el => el.name
+          }).map(element => element.original));
+        });
+      },
+    }]);
+    return answer.value;
+  }
+
 };
 
 export default Ask;

package/src/create.js

@@ -110,7 +110,7 @@ class Create extends Command {
           }
         }
 
-        if (await Ask.askBoolean('Do you want to add it to the current sprint?')) {
+        if (await Ask.askBoolean('Do you want to add it to a sprint?')) {
           await Sprint.add(jira, issue.key);
         }
       });

package/src/field.js

@@ -145,10 +145,14 @@ class Field extends Command {
         return field;
     }
 
+    if (Array.isArray(field)) {
+      return field.map(f => this.fieldValue(f, fieldData)).join(", ");
+    }
+
     return field.name;
   }
 
-  static async fetchAndAskFieldIfSupported(jira, field) {
+  static async fetchAndAskFieldIfSupported(jira, field, defaultValue = null) {
     const meta = await Project.metadata(jira, field.projectName, field.issueTypeName);
     const fields = meta.projects.find(p => p.key === field.projectName)
       .issuetypes.find(i => i.name === field.issueTypeName).fields;
@@ -156,14 +160,14 @@ class Field extends Command {
     for (const name in fields) {
       const fieldObj = fields[name];
       if (fieldObj.name === field.fieldName) {
-        return Field.askFieldIfSupported(fieldObj);
+        return Field.askFieldIfSupported(fieldObj, defaultValue);
       }
     }
 
     return null;
   }
 
-  static async askFieldIfSupported(fieldData) {
+  static async askFieldIfSupported(fieldData, defaultValue = null) {
     if (!Field.isSupported(fieldData)) {
       console.log("Unsupported field");
       return null;
@@ -179,9 +183,30 @@ class Field extends Command {
         return {
           value: await Ask.askString(`${fieldData.name}:`), key: fieldData.key
         };
+
+      case 'array':
+        if (Array.isArray(defaultValue)) {
+          defaultValue = defaultValue.map(a => ({
+            id: a.id
+          }));
+        }
+
+        const value = await Ask.askMultiList(`${fieldData.name}:`,
+          fieldData.allowedValues.map(value => ({
+            name: value.name,
+            value: {
+              id: value.id
+            }
+          })),
+          defaultValue);
+
+        return {
+          key: fieldData.key,
+            value: value,
+        };
     }
 
-    let value = await Ask.askList(`${fieldData.name}:`,
+    const value = await Ask.askList(`${fieldData.name}:`,
       fieldData.allowedValues.map(value => ({
         name: value.name,
         value: {
@@ -189,10 +214,6 @@ class Field extends Command {
         }
       })));
 
-    if (fieldData.schema.type === 'array') {
-      value = [value];
-    }
-
     return {
       key: fieldData.key,
       value,

package/src/index.js

@@ -15,6 +15,7 @@ import Create from './create.js';
 import Field from './field.js';
 import Init from './init.js';
 import Issue from './issue.js';
+import Label from './label.js';
 import Preset from './preset.js';
 import Project from './project.js';
 import Query from './query.js';
@@ -31,6 +32,7 @@ const commands = [
   new Field(),
   new Init(),
   new Issue(),
+  new Label(),
   new Preset(),
   new Project(),
   new Query(),

package/src/init.js

@@ -21,7 +21,7 @@ class Init extends Command {
             protocol: await Ask.askBoolean('Enable HTTPS Protocol?') ? 'https' : 'http',
             username: (await Ask.askString('Please provide your jira username:')).trim(),
             password: (await Ask.askPassword('API token:')).trim(),
-            apiVersion: '2',
+            apiVersion: '3',
             strictSSL: true,
           },
           presets: {},

package/src/jira.js

@@ -20,6 +20,11 @@ class Jira {
     }
 
     this._config = JSON.parse(fs.readFileSync(this.configFile));
+    if (this._config.jira.apiVersion !== 3) {
+      this._config.jira.apiVersion = 3;
+      this.syncConfig();
+    }
+
     this._jiraClient = new jiraClient(this._config.jira);
   }
 

package/src/label.js

@@ -0,0 +1,103 @@
+// SPDX-FileCopyrightText: 2021-2022 Andrea Marchesini <baku@bnode.dev>
+//
+// SPDX-License-Identifier: MIT
+
+import color from 'chalk';
+
+import Ask from './ask.js';
+import Command from './command.js';
+import Field from './field.js';
+import Issue from './issue.js';
+import Jira from './jira.js';
+import Project from './project.js';
+import Table from './table.js';
+import User from './user.js';
+
+class Label extends Command {
+  addOptions(program) {
+    const labelCmd = program.command('label')
+      .description('Play with labels');
+    labelCmd.command('add')
+      .description('Add a label to an issue')
+      .argument('<id>', 'The issue ID')
+      .action(async id => {
+        const jira = new Jira(program);
+        const resultFields = await Field.listFields(jira);
+        const result = await jira.spin('Running query...', jira.api.findIssue(id));
+        const issue = Issue.replaceFields(result, resultFields);
+
+        const meta = await Project.metadata(jira, issue.fields['Project'].key, issue.fields['Issue Type'].name);
+        const field = meta.projects.find(p => p.key === issue.fields['Project'].key)
+          .issuetypes.find(i => i.name === issue.fields['Issue Type'].name).fields['labels'];
+        if (!field) {
+          console.log("This type does not support labels");
+          return;
+        }
+
+        const label = await Ask.askCallback("Add label:", async input => {
+          if (!input) return [];
+          const data = await jira.api.doRequest({
+            url: field.autoCompleteUrl + input
+          })
+          return JSON.parse(data).suggestions.map(label => label.label);
+        });
+
+        const labels = issue.fields['Labels'] || [];
+        if (labels.includes(label)) {
+          console.log("Duplicate label");
+          return;
+        }
+
+        labels.push(label);
+
+        const data = {};
+        data[field.key] = labels;
+
+        await jira.spin(`Updating issue ${id}...`, jira.api.updateIssue(id, {
+          fields: {
+            ...data
+          }
+        }));
+      });
+
+    labelCmd.command('remove')
+      .description('Remove a label from an issue')
+      .argument('<id>', 'The issue ID')
+      .action(async id => {
+        const jira = new Jira(program);
+        const resultFields = await Field.listFields(jira);
+        const result = await jira.spin('Running query...', jira.api.findIssue(id));
+        const issue = Issue.replaceFields(result, resultFields);
+
+        const meta = await Project.metadata(jira, issue.fields['Project'].key, issue.fields['Issue Type'].name);
+        const field = meta.projects.find(p => p.key === issue.fields['Project'].key)
+          .issuetypes.find(i => i.name === issue.fields['Issue Type'].name).fields['labels'];
+        if (!field) {
+          console.log("This type does not support labels");
+          return;
+        }
+
+        let labels = issue.fields['Labels'] || [];
+        if (labels.length === 0) {
+          console.log("No labels");
+          return;
+        }
+
+        let label = await Ask.askList("Remove label:", labels.map(label => ({
+          name: label,
+          value: label
+        })));
+
+        const data = {};
+        data[field.key] = labels.filter(l => label != l)
+
+        await jira.spin(`Updating issue ${id}...`, jira.api.updateIssue(id, {
+          fields: {
+            ...data
+          }
+        }));
+      });
+  }
+};
+
+export default Label;

package/src/query.js

@@ -149,12 +149,18 @@ class Query extends Command {
 
   static async runQuery(jira, query, expectedResult) {
     let issues = [];
-    let total = 0;
+    let nextPageToken = null;
     while (issues.length < (expectedResult === undefined ? issues.length + 1 : expectedResult)) {
       const result = await jira.spin('Running query...',
-        jira.api.searchJira(query, {
-          startAt: issues.length,
-          maxResults: expectedResult - issues.length
+        jira.apiRequest('/search/jql', {
+          method: 'POST',
+          followAllRedirects: true,
+          body: {
+            jql: query,
+            nextPageToken,
+            fields: ['*all'],
+            maxResults: Math.min(5000, expectedResult - issues.length)
+          }
         }));
 
       if (result.warningMessages) {
@@ -162,14 +168,14 @@ class Query extends Command {
         return;
       }
 
-      total = result.total;
       issues = issues.concat(result.issues);
+      nextPageToken = result.nextPageToken;
 
-      if (issues.length >= total) break;
+      if (result.isLast) break;
     }
 
     return {
-      total,
+      total: issues.length,
       issues
     };
   }

package/src/run.js

@@ -17,7 +17,7 @@ class Run extends Command {
       .argument('<name>', 'The preset name')
       .option('-q, --query <query...>')
       .option('-l, --limit <limit>',
-        `Set the query limit. Default ${DEFAULT_QUERY_LIMIT}`,
+        `Set the query limit`,
         DEFAULT_QUERY_LIMIT)
       .option('-g, --grouped', 'Group the issues by parenting')
       .action(async name => {

package/src/set.js

@@ -66,7 +66,7 @@ class Set extends Command {
           return;
         }
 
-        await Set.setCustomField(jira, customField, id);
+        await Set.setCustomField(jira, customField, id, issue.fields[customField.fieldName]);
       });
   }
 
@@ -90,8 +90,8 @@ class Set extends Command {
     await jira.spin(`Updating issue ${id}...`, jira.api.updateIssue(id, issue));
   }
 
-  static async setCustomField(jira, customField, id) {
-    const field = await Field.fetchAndAskFieldIfSupported(jira, customField);
+  static async setCustomField(jira, customField, id, defaultValue = null) {
+    const field = await Field.fetchAndAskFieldIfSupported(jira, customField, defaultValue);
     if (field === null) {
       console.log("Unsupported field type");
       return;

package/src/sprint.js

@@ -156,10 +156,14 @@ class Sprint extends Command {
         value: board.id
       })));
 
-    const sprintList = await jira.spin('Retrieving sprints...',
-      jira.api.getAllSprints(boardId));
+    let sprintList = [];
+    while (true) {
+      const sprints = await jira.spin('Retrieving sprints...', jira.api.getAllSprints(boardId, sprintList.length));
+      sprintList = sprintList.concat(sprints.values);
+      if (sprintList.length >= sprints.total) break;
+    }
 
-    const sprints = sprintList.values.filter(sprint => sprint.state === 'active' || sprint.state === 'future');
+    const sprints = sprintList.filter(sprint => sprint.state === 'active' || sprint.state === 'future');
 
     if (sprints.length === 0) {
       return null;