Improves icon and text for launchpad status of branch card PR section

gitkraken · Dec 19, 2024 · b11b769 · b11b769
1 parent 2370c72
commit b11b769
Show file tree

Hide file tree

Showing 11 changed files with 167 additions and 155 deletions.
diff --git a/src/plus/launchpad/launchpad.ts b/src/plus/launchpad/launchpad.ts
@@ -54,23 +54,15 @@ import { executeCommand } from '../../system/vscode/command';
 import { configuration } from '../../system/vscode/configuration';
 import { openUrl } from '../../system/vscode/utils';
 import { ProviderBuildStatusState, ProviderPullRequestReviewState } from '../integrations/providers/models';
-import type {
-	LaunchpadAction,
-	LaunchpadActionCategory,
-	LaunchpadCategorizedResult,
-	LaunchpadGroup,
-	LaunchpadItem,
-	LaunchpadTargetAction,
-} from './launchpadProvider';
+import type { LaunchpadCategorizedResult, LaunchpadItem } from './launchpadProvider';
 import {
 	countLaunchpadItemGroups,
 	getLaunchpadItemIdHash,
 	groupAndSortLaunchpadItems,
-	launchpadGroupIconMap,
-	launchpadGroupLabelMap,
-	launchpadGroups,
 	supportedLaunchpadIntegrations,
 } from './launchpadProvider';
+import type { LaunchpadAction, LaunchpadActionCategory, LaunchpadGroup, LaunchpadTargetAction } from './models';
+import { launchpadGroupIconMap, launchpadGroupLabelMap, launchpadGroups } from './models';
 import { isMaybeSupportedLaunchpadPullRequestSearchUrl } from './utils';
 
 const actionGroupMap = new Map<LaunchpadActionCategory, string[]>([

diff --git a/src/plus/launchpad/launchpadIndicator.ts b/src/plus/launchpad/launchpadIndicator.ts
@@ -13,13 +13,10 @@ import { executeCommand, registerCommand } from '../../system/vscode/command';
 import { configuration } from '../../system/vscode/configuration';
 import type { ConnectionStateChangeEvent } from '../integrations/integrationService';
 import type { LaunchpadCommandArgs } from './launchpad';
-import type { LaunchpadGroup, LaunchpadItem, LaunchpadProvider, LaunchpadRefreshEvent } from './launchpadProvider';
-import {
-	groupAndSortLaunchpadItems,
-	launchpadGroupIconMap,
-	launchpadPriorityGroups,
-	supportedLaunchpadIntegrations,
-} from './launchpadProvider';
+import type { LaunchpadItem, LaunchpadProvider, LaunchpadRefreshEvent } from './launchpadProvider';
+import { groupAndSortLaunchpadItems, supportedLaunchpadIntegrations } from './launchpadProvider';
+import type { LaunchpadGroup } from './models';
+import { launchpadGroupIconMap, launchpadPriorityGroups } from './models';
 
 type LaunchpadIndicatorState = 'idle' | 'disconnected' | 'loading' | 'load' | 'failed';
 

diff --git a/src/plus/launchpad/launchpadProvider.ts b/src/plus/launchpad/launchpadProvider.ts
@@ -51,129 +51,16 @@ import {
 } from '../integrations/providers/models';
 import type { EnrichableItem, EnrichedItem } from './enrichmentService';
 import { convertRemoteProviderIdToEnrichProvider, isEnrichableRemoteProviderId } from './enrichmentService';
+import type { LaunchpadAction, LaunchpadActionCategory, LaunchpadGroup } from './models';
+import {
+	launchpadActionCategories,
+	launchpadCategoryToGroupMap,
+	launchpadGroups,
+	prActionsMap,
+	sharedCategoryToLaunchpadActionCategoryMap,
+} from './models';
 import { getPullRequestIdentityFromMaybeUrl } from './utils';
 
-export const launchpadActionCategories = [
-	'mergeable',
-	'unassigned-reviewers',
-	'failed-checks',
-	'conflicts',
-	'needs-my-review',
-	'code-suggestions',
-	'changes-requested',
-	'reviewer-commented',
-	'waiting-for-review',
-	'draft',
-	'other',
-] as const;
-export type LaunchpadActionCategory = (typeof launchpadActionCategories)[number];
-
-export const launchpadGroups = [
-	'current-branch',
-	'pinned',
-	'mergeable',
-	'blocked',
-	'follow-up',
-	'needs-review',
-	'waiting-for-review',
-	'draft',
-	'other',
-	'snoozed',
-] as const;
-export type LaunchpadGroup = (typeof launchpadGroups)[number];
-
-export const launchpadPriorityGroups = [
-	'mergeable',
-	'blocked',
-	'follow-up',
-	'needs-review',
-] satisfies readonly LaunchpadPriorityGroup[] as readonly LaunchpadGroup[];
-export type LaunchpadPriorityGroup = Extract<LaunchpadGroup, 'mergeable' | 'blocked' | 'follow-up' | 'needs-review'>;
-
-export const launchpadGroupIconMap = new Map<LaunchpadGroup, `$(${string})`>([
-	['current-branch', '$(git-branch)'],
-	['pinned', '$(pinned)'],
-	['mergeable', '$(rocket)'],
-	['blocked', '$(error)'], //bracket-error
-	['follow-up', '$(report)'],
-	['needs-review', '$(comment-unresolved)'], // feedback
-	['waiting-for-review', '$(gitlens-clock)'],
-	['draft', '$(git-pull-request-draft)'],
-	['other', '$(ellipsis)'],
-	['snoozed', '$(bell-slash)'],
-]);
-
-export const launchpadGroupLabelMap = new Map<LaunchpadGroup, string>([
-	['current-branch', 'Current Branch'],
-	['pinned', 'Pinned'],
-	['mergeable', 'Ready to Merge'],
-	['blocked', 'Blocked'],
-	['follow-up', 'Requires Follow-up'],
-	['needs-review', 'Needs Your Review'],
-	['waiting-for-review', 'Waiting for Review'],
-	['draft', 'Draft'],
-	['other', 'Other'],
-	['snoozed', 'Snoozed'],
-]);
-
-export const launchpadCategoryToGroupMap = new Map<LaunchpadActionCategory, LaunchpadGroup>([
-	['mergeable', 'mergeable'],
-	['conflicts', 'blocked'],
-	['failed-checks', 'blocked'],
-	['unassigned-reviewers', 'blocked'],
-	['needs-my-review', 'needs-review'],
-	['code-suggestions', 'follow-up'],
-	['changes-requested', 'follow-up'],
-	['reviewer-commented', 'follow-up'],
-	['waiting-for-review', 'waiting-for-review'],
-	['draft', 'draft'],
-	['other', 'other'],
-]);
-
-export const sharedCategoryToLaunchpadActionCategoryMap = new Map<string, LaunchpadActionCategory>([
-	['readyToMerge', 'mergeable'],
-	['unassignedReviewers', 'unassigned-reviewers'],
-	['failingCI', 'failed-checks'],
-	['conflicts', 'conflicts'],
-	['needsMyReview', 'needs-my-review'],
-	['changesRequested', 'changes-requested'],
-	['reviewerCommented', 'reviewer-commented'],
-	['waitingForReview', 'waiting-for-review'],
-	['draft', 'draft'],
-	['other', 'other'],
-]);
-
-export type LaunchpadAction =
-	| 'merge'
-	| 'open'
-	| 'soft-open'
-	| 'switch'
-	| 'switch-and-code-suggest'
-	| 'open-worktree'
-	| 'code-suggest'
-	| 'show-overview'
-	| 'open-changes'
-	| 'open-in-graph';
-
-export type LaunchpadTargetAction = {
-	action: 'open-suggestion';
-	target: string;
-};
-
-const prActionsMap = new Map<LaunchpadActionCategory, LaunchpadAction[]>([
-	['mergeable', ['merge']],
-	['unassigned-reviewers', ['open']],
-	['failed-checks', ['open']],
-	['conflicts', ['open']],
-	['needs-my-review', ['open']],
-	['code-suggestions', ['open']],
-	['changes-requested', ['open']],
-	['reviewer-commented', ['open']],
-	['waiting-for-review', ['open']],
-	['draft', ['open']],
-	['other', []],
-]);
-
 export function getSuggestedActions(category: LaunchpadActionCategory, isCurrentBranch: boolean): LaunchpadAction[] {
 	const actions = [...prActionsMap.get(category)!];
 	if (isCurrentBranch) {

diff --git a/src/plus/launchpad/models.ts b/src/plus/launchpad/models.ts
@@ -0,0 +1,120 @@
+export const launchpadActionCategories = [
+	'mergeable',
+	'unassigned-reviewers',
+	'failed-checks',
+	'conflicts',
+	'needs-my-review',
+	'code-suggestions',
+	'changes-requested',
+	'reviewer-commented',
+	'waiting-for-review',
+	'draft',
+	'other',
+] as const;
+export type LaunchpadActionCategory = (typeof launchpadActionCategories)[number];
+
+export const launchpadGroups = [
+	'current-branch',
+	'pinned',
+	'mergeable',
+	'blocked',
+	'follow-up',
+	'needs-review',
+	'waiting-for-review',
+	'draft',
+	'other',
+	'snoozed',
+] as const;
+export type LaunchpadGroup = (typeof launchpadGroups)[number];
+
+export const launchpadPriorityGroups = [
+	'mergeable',
+	'blocked',
+	'follow-up',
+	'needs-review',
+] satisfies readonly LaunchpadPriorityGroup[] as readonly LaunchpadGroup[];
+export type LaunchpadPriorityGroup = Extract<LaunchpadGroup, 'mergeable' | 'blocked' | 'follow-up' | 'needs-review'>;
+
+export const launchpadGroupIconMap = new Map<LaunchpadGroup, `$(${string})`>([
+	['current-branch', '$(git-branch)'],
+	['pinned', '$(pinned)'],
+	['mergeable', '$(rocket)'],
+	['blocked', '$(error)'], //bracket-error
+	['follow-up', '$(report)'],
+	['needs-review', '$(comment-unresolved)'], // feedback
+	['waiting-for-review', '$(gitlens-clock)'],
+	['draft', '$(git-pull-request-draft)'],
+	['other', '$(ellipsis)'],
+	['snoozed', '$(bell-slash)'],
+]);
+
+export const launchpadGroupLabelMap = new Map<LaunchpadGroup, string>([
+	['current-branch', 'Current Branch'],
+	['pinned', 'Pinned'],
+	['mergeable', 'Ready to Merge'],
+	['blocked', 'Blocked'],
+	['follow-up', 'Requires Follow-up'],
+	['needs-review', 'Needs Your Review'],
+	['waiting-for-review', 'Waiting for Review'],
+	['draft', 'Draft'],
+	['other', 'Other'],
+	['snoozed', 'Snoozed'],
+]);
+
+export const launchpadCategoryToGroupMap = new Map<LaunchpadActionCategory, LaunchpadGroup>([
+	['mergeable', 'mergeable'],
+	['conflicts', 'blocked'],
+	['failed-checks', 'blocked'],
+	['unassigned-reviewers', 'blocked'],
+	['needs-my-review', 'needs-review'],
+	['code-suggestions', 'follow-up'],
+	['changes-requested', 'follow-up'],
+	['reviewer-commented', 'follow-up'],
+	['waiting-for-review', 'waiting-for-review'],
+	['draft', 'draft'],
+	['other', 'other'],
+]);
+
+export const sharedCategoryToLaunchpadActionCategoryMap = new Map<string, LaunchpadActionCategory>([
+	['readyToMerge', 'mergeable'],
+	['unassignedReviewers', 'unassigned-reviewers'],
+	['failingCI', 'failed-checks'],
+	['conflicts', 'conflicts'],
+	['needsMyReview', 'needs-my-review'],
+	['changesRequested', 'changes-requested'],
+	['reviewerCommented', 'reviewer-commented'],
+	['waitingForReview', 'waiting-for-review'],
+	['draft', 'draft'],
+	['other', 'other'],
+]);
+
+export type LaunchpadAction =
+	| 'merge'
+	| 'open'
+	| 'soft-open'
+	| 'switch'
+	| 'switch-and-code-suggest'
+	| 'open-worktree'
+	| 'code-suggest'
+	| 'show-overview'
+	| 'open-changes'
+	| 'open-in-graph';
+
+export type LaunchpadTargetAction = {
+	action: 'open-suggestion';
+	target: string;
+};
+
+export const prActionsMap = new Map<LaunchpadActionCategory, LaunchpadAction[]>([
+	['mergeable', ['merge']],
+	['unassigned-reviewers', ['open']],
+	['failed-checks', ['open']],
+	['conflicts', ['open']],
+	['needs-my-review', ['open']],
+	['code-suggestions', ['open']],
+	['changes-requested', ['open']],
+	['reviewer-commented', ['open']],
+	['waiting-for-review', ['open']],
+	['draft', ['open']],
+	['other', []],
+]);
diff --git a/src/plus/launchpad/utils.ts b/src/plus/launchpad/utils.ts
@@ -11,7 +11,7 @@ import {
 } from '../integrations/providers/gitlab/models';
 import type { LaunchpadSummaryResult } from './launchpadIndicator';
 import { generateLaunchpadSummary } from './launchpadIndicator';
-import type { LaunchpadGroup } from './launchpadProvider';
+import type { LaunchpadGroup } from './models';
 
 export async function getLaunchpadSummary(container: Container): Promise<LaunchpadSummaryResult | { error: Error }> {
 	const result = await container.launchpad.getCategorizedItems();

diff --git a/src/views/launchpadView.ts b/src/views/launchpadView.ts
@@ -11,12 +11,10 @@ import { GitUri, unknownGitUri } from '../git/gitUri';
 import type { SubscriptionChangeEvent } from '../plus/gk/account/subscriptionService';
 import { ensurePlusFeaturesEnabled } from '../plus/gk/utils';
 import type { LaunchpadCommandArgs } from '../plus/launchpad/launchpad';
-import type { LaunchpadGroup, LaunchpadItem } from '../plus/launchpad/launchpadProvider';
-import {
-	groupAndSortLaunchpadItems,
-	launchpadGroupIconMap,
-	launchpadGroupLabelMap,
-} from '../plus/launchpad/launchpadProvider';
+import type { LaunchpadItem } from '../plus/launchpad/launchpadProvider';
+import { groupAndSortLaunchpadItems } from '../plus/launchpad/launchpadProvider';
+import type { LaunchpadGroup } from '../plus/launchpad/models';
+import { launchpadGroupIconMap, launchpadGroupLabelMap } from '../plus/launchpad/models';
 import { createCommand, executeCommand } from '../system/vscode/command';
 import { configuration } from '../system/vscode/configuration';
 import { CacheableChildrenViewNode } from './nodes/abstract/cacheableChildrenViewNode';

diff --git a/src/views/nodes/abstract/viewNode.ts b/src/views/nodes/abstract/viewNode.ts
@@ -12,11 +12,12 @@ import type { Repository } from '../../../git/models/repository';
 import type { GitTag } from '../../../git/models/tag';
 import type { GitWorktree } from '../../../git/models/worktree';
 import type { Draft } from '../../../gk/models/drafts';
-import type { LaunchpadGroup, LaunchpadItem } from '../../../plus/launchpad/launchpadProvider';
+import type { LaunchpadItem } from '../../../plus/launchpad/launchpadProvider';
+import type { LaunchpadGroup } from '../../../plus/launchpad/models';
 import {
 	launchpadCategoryToGroupMap,
 	sharedCategoryToLaunchpadActionCategoryMap,
-} from '../../../plus/launchpad/launchpadProvider';
+} from '../../../plus/launchpad/models';
 import type {
 	CloudWorkspace,
 	CloudWorkspaceRepositoryDescriptor,

diff --git a/src/views/nodes/launchpadViewGroupingNode.ts b/src/views/nodes/launchpadViewGroupingNode.ts
@@ -1,6 +1,6 @@
 import type { TreeItem } from 'vscode';
 import { Disposable, TreeItemCollapsibleState } from 'vscode';
-import type { LaunchpadGroup } from '../../plus/launchpad/launchpadProvider';
+import type { LaunchpadGroup } from '../../plus/launchpad/models';
 import type { TreeViewNodeCollapsibleStateChangeEvent, View } from '../viewBase';
 import type { ViewNode } from './abstract/viewNode';
 import { GroupingNode } from './groupingNode';