Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/commands/issues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@ export function createIssueCommands(): Command {

let filter: Record<string, unknown> = {};

let resolvedTeamId: string | undefined;
if (teamFilter) {
const teamId = await resolveTeamId(teamFilter);
filter.team = { id: { eq: teamId } };
resolvedTeamId = await resolveTeamId(teamFilter);
filter.team = { id: { eq: resolvedTeamId } };
}

if (options.state) {
const stateId = await resolveStateId(options.state);
const stateId = await resolveStateId(options.state, resolvedTeamId);
filter.state = { id: { eq: stateId } };
}

Expand Down Expand Up @@ -431,8 +432,16 @@ export function createIssueCommands(): Command {
if (options.priority) input.priority = parseInt(options.priority, 10);
if (options.estimate) input.estimate = parseInt(options.estimate, 10);

// Fetch issue's team for correct state/label resolution
let teamId: string | undefined;
if (options.state || options.labels) {
const currentIssue = await client.issue(issueId);
const currentTeam = await currentIssue.team;
teamId = currentTeam?.id;
}

if (options.state) {
input.stateId = await resolveStateId(options.state);
input.stateId = await resolveStateId(options.state, teamId);
}

if (options.assignee) {
Expand All @@ -445,7 +454,7 @@ export function createIssueCommands(): Command {

if (options.labels) {
const labelNames = options.labels.split(',').map(l => l.trim());
input.labelIds = await resolveLabelIds(labelNames);
input.labelIds = await resolveLabelIds(labelNames, teamId);
}
}

Expand Down