bjira 0.0.22 → 0.0.23

package/package.json

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

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/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/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/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;