jira-sprinter 1.1.0 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jira-sprinter",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Small CLI tool to manage sprints in JIRA Board",
   "main": "src/main.ts",
   "type": "commonjs",
@@ -16,7 +16,7 @@
     "update-snapshots": "vitest run --update",
     "all": "yarn && yarn run build && yarn run format && yarn test"
   },
-  "packageManager": "yarn@4.9.3",
+  "packageManager": "yarn@4.12.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/redhat-plumbers-in-action/sprinter.git"
@@ -34,22 +34,22 @@
     "scrum"
   ],
   "dependencies": {
-    "@inquirer/checkbox": "^4.3.0",
-    "@inquirer/select": "4.4.0",
+    "@inquirer/checkbox": "^5.1.2",
+    "@inquirer/select": "5.1.2",
     "@total-typescript/ts-reset": "0.6.1",
     "chalk": "5.6.2",
-    "commander": "14.0.1",
-    "dotenv": "17.2.3",
-    "jira.js": "5.2.2",
-    "zod": "4.1.12"
+    "commander": "14.0.3",
+    "dotenv": "17.3.1",
+    "jira.js": "5.3.1",
+    "zod": "4.3.6"
   },
   "devDependencies": {
-    "@types/node": "24.7.2",
-    "@vitest/coverage-v8": "3.2.4",
-    "esbuild": "0.25.11",
-    "prettier": "3.6.2",
+    "@types/node": "25.5.0",
+    "@vitest/coverage-v8": "4.1.0",
+    "esbuild": "0.27.4",
+    "prettier": "3.8.1",
     "ts-node": "10.9.2",
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "4.1.0"
   }
 }

package/src/cli.ts

@@ -5,7 +5,12 @@ import checkbox from '@inquirer/checkbox';
 
 import { Jira } from './jira';
 import { Logger } from './logger';
-import { getDefaultValue, getOptions, raise, tokenUnavailable } from './util';
+import {
+  getDefaultValue,
+  getOptions,
+  getUserFromLogin,
+  tokenUnavailable,
+} from './util';
 
 import { SearchResults } from 'jira.js/dist/esm/types/agile/models';
 import {
@@ -15,7 +20,7 @@ import {
   colorSizeSchema,
   Size,
 } from './schema/jira';
-import { Issue } from 'jira.js/dist/esm/types/version2/models';
+import { Issue } from 'jira.js/dist/esm/types/version3/models/issue';
 
 export function cli(): Command {
   const program = new Command();
@@ -23,7 +28,7 @@ export function cli(): Command {
   program
     .name('jira-sprinter')
     .description('🏃 Small CLI tool to manage sprints in JIRA Board')
-    .version('1.1.0');
+    .version('2.0.0');
 
   program
     .option('-b, --board [board]', 'Jira Board ID', getDefaultValue('BOARD'))
@@ -52,10 +57,11 @@ const runProgram = async () => {
 
   const token = process.env.JIRA_API_TOKEN ?? tokenUnavailable();
   const jira = new Jira(
-    'https://issues.redhat.com',
+    'https://redhat.atlassian.net',
     token,
     options.dry,
-    logger
+    logger,
+    getUserFromLogin()
   );
 
   const version = await jira.getVersion();
@@ -93,11 +99,6 @@ const runProgram = async () => {
     process.exit(0);
   }
 
-  // TODO:
-  // Show issue - allow to split it into tasks
-  // Allow to set story points and assignee
-  // add task into sprint
-
   for (const issue of issues) {
     logger.log(
       `\n${issueTypeSchema.parse(issue.fields?.issuetype.name)} ${issue.key} - ${chalk.bold(issueStatusSchema.parse(issue.fields?.status.name))} - ${chalk.italic(issue.fields?.assignee?.displayName ?? '')}`
@@ -110,12 +111,44 @@ const runProgram = async () => {
     );
 
     const availableTasks = [
-      { name: 'DEV Task', value: 39396, checked: true },
-      { name: 'QE Task', value: 39400, checked: true },
-      { name: 'Upstream', value: 39395 },
-      { name: 'Root Cause Analysis Task', value: 40950 },
-      { name: 'Preliminary Testing Task', value: 39398 },
-      { name: 'Integration Testing', value: 48270 },
+      {
+        name: 'DEV Task',
+        summary: '[DEV Task]:',
+        label: 'dev_task',
+        value: 14476,
+        checked: true,
+      },
+      {
+        name: 'QE Task',
+        summary: '[QE Task]:',
+        label: 'qe_task',
+        value: 14480,
+        checked: true,
+      },
+      {
+        name: 'Upstream',
+        summary: '[Upstream]:',
+        label: 'upstream_task',
+        value: 14475,
+      },
+      {
+        name: 'Root Cause Analysis Task',
+        summary: '[Root Cause Analysis Task]:',
+        label: 'root_cause_analysis_task',
+        value: 14483,
+      },
+      {
+        name: 'Preliminary Testing Task',
+        summary: '[Preliminary Testing Task]:',
+        label: 'preliminary_testing_task',
+        value: 14478,
+      },
+      {
+        name: 'Integration Testing',
+        summary: '[Integration Testing Task]:',
+        label: 'integration_testing_task',
+        value: 14481,
+      },
     ];
 
     let answer: number[] = [];
@@ -123,11 +156,21 @@ const runProgram = async () => {
       answer = await checkbox({
         message: `Split ${chalk.bold(issue.key)} into following tasks:\n`,
         choices: [
-          ...availableTasks.map(task => ({
-            name: colorTaskSchema(task.name),
-            value: task.value,
-            checked: task.checked ?? false,
-          })),
+          ...availableTasks.map(task => {
+            const isTaskOpen = issue.fields?.issuelinks?.some(
+              l =>
+                l.type?.outward === 'split to' &&
+                l.outwardIssue?.fields?.summary.startsWith(task.summary) &&
+                l.outwardIssue?.fields?.status.name !== 'Closed'
+            );
+
+            return {
+              name: colorTaskSchema(task.name),
+              value: task.value,
+              checked: task.checked && !isTaskOpen,
+              disabled: isTaskOpen,
+            };
+          }),
           new Separator(),
           { name: 'SKIP', value: -1 },
           { name: 'EXIT', value: -2 },
@@ -171,7 +214,6 @@ const runProgram = async () => {
       }
     }
 
-    // loop through tasks and and set sprint, assignee and story points
     for (const task of tasks) {
       // Skip QE Task
       if (task.fields.summary.includes('QE Task')) {
@@ -240,9 +282,8 @@ const runProgram = async () => {
         );
       }
 
-      // update task
       await jira.setValues(task.key, {
-        assignee: issue.fields?.assignee?.emailAddress,
+        assignee: issue.fields?.assignee?.accountId,
         size: storyPointsAnswer,
         sprint:
           addToSprintAnswer && sprintOrBacklog != -1

package/src/jira.ts

@@ -1,35 +1,38 @@
-import { AgileClient, Version2Client } from 'jira.js';
+import { AgileClient, Version3Client } from 'jira.js';
 import { SearchResults, Sprint } from 'jira.js/dist/esm/types/agile/models';
+import { Issue } from 'jira.js/dist/esm/types/version3/models/issue';
 
 import { raise } from './util';
 import { Size } from './schema/jira';
 import { Logger } from './logger';
 
 export class Jira {
-  readonly api: Version2Client;
+  readonly api: Version3Client;
   readonly agile: AgileClient;
   readonly fields = {
-    automation: 'customfield_12316240',
+    automation: 'customfield_10553',
     assignee: 'assignee',
     priority: 'priority',
-    severity: 'customfield_12316142',
-    sprint: 'customfield_12310940',
-    storyPoints: 'customfield_12310243',
+    severity: 'customfield_10840',
+    sprint: 'customfield_10020',
+    storyPoints: 'customfield_10028',
   };
 
-  readonly issuesWithoutTasksJQL = `issueFunction not in linkedIssuesOf("type = Task AND (summary ~ 'DEV Task' OR summary ~ 'QE Task')") AND type not in (Task, Epic) AND project = "RHEL"`;
+  readonly issuesWithoutTasksJQL = `(labels not in (upstream_task, dev_task, qe_task, root_cause_analysis_task, preliminary_testing_task, integration_testing_task) OR labels is EMPTY) AND type in (Bug, "Story", Vulnerability) AND Project = RHEL AND statusCategory != Done`;
 
   constructor(
     readonly instance: string,
     apiToken: string,
     readonly dry: boolean,
-    readonly logger: Logger
+    readonly logger: Logger,
+    email: string
   ) {
-    this.api = new Version2Client({
+    this.api = new Version3Client({
       host: instance,
       authentication: {
-        oauth2: {
-          accessToken: apiToken,
+        basic: {
+          email,
+          apiToken,
         },
       },
     });
@@ -37,8 +40,9 @@ export class Jira {
     this.agile = new AgileClient({
       host: instance,
       authentication: {
-        oauth2: {
-          accessToken: apiToken,
+        basic: {
+          email,
+          apiToken,
         },
       },
     });
@@ -78,11 +82,12 @@ export class Jira {
         'assignee',
         'priority',
         'components',
-        // sprint
         this.fields.storyPoints,
         this.fields.severity,
+        'issuelinks',
       ],
     });
+
     return response.issues;
   }
 
@@ -115,18 +120,43 @@ export class Jira {
   }
 
   async getlinkedTasks(issue: string, expectedTasks: string[]) {
-    const response = await this.api.issueSearch.searchForIssuesUsingJqlPost({
-      jql: `issue in linkedIssues("${issue}") AND type = Task AND status = New AND (${this.composeTaskSummaryJQL(expectedTasks)})`,
-      fields: [
-        'id',
-        'issuetype',
-        'status',
-        'components',
-        'summary',
-        'assignee',
-        this.fields.storyPoints,
-      ],
-    });
+    if (this.dry) {
+      this.logger.log(`Would get linked tasks for issue: ${issue}`);
+      return [
+        {
+          key: 'RHEL-1234',
+          fields: {
+            summary: '[DEV Task] Test Task',
+          },
+        },
+        {
+          key: 'RHEL-1235',
+          fields: {
+            summary: '[QE Task] Test Task',
+          },
+        },
+        {
+          key: 'RHEL-1236',
+          fields: {
+            summary: '[Upstream] Test Task',
+          },
+        },
+      ] as unknown as Issue[];
+    }
+
+    const response =
+      await this.api.issueSearch.searchForIssuesUsingJqlEnhancedSearchPost({
+        jql: `issue in linkedIssues("${issue}") AND type = Task AND status = New AND (${this.composeTaskSummaryJQL(expectedTasks)})`,
+        fields: [
+          'id',
+          'issuetype',
+          'status',
+          'components',
+          'summary',
+          'assignee',
+          this.fields.storyPoints,
+        ],
+      });
 
     return response.issues ?? [];
   }
@@ -158,7 +188,7 @@ export class Jira {
     }
   ) {
     const assigneeValue = values.assignee
-      ? { [this.fields.assignee]: { name: values.assignee } }
+      ? { [this.fields.assignee]: { accountId: values.assignee } }
       : {};
     const storyPointsValue =
       values.size !== undefined

package/vitest.config.ts

@@ -0,0 +1,13 @@
+import { configDefaults, defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    dir: './test',
+
+    exclude: [...configDefaults.exclude],
+
+    coverage: {
+      include: ['src/**/*.ts'],
+    },
+  },
+});