Skip to content

Commit e729ed3

Browse files
committed
Redesigns Home account footer into new header bar
- Adds popover for account information - Adds popover for integration connection and status
1 parent a3558a9 commit e729ed3

File tree

16 files changed

+1161
-586
lines changed

16 files changed

+1161
-586
lines changed

src/constants.integrations.ts

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,44 @@ export enum IssueIntegrationId {
1717

1818
export type IntegrationId = HostingIntegrationId | IssueIntegrationId | SelfHostedIntegrationId;
1919

20-
export const supportedCloudIntegrationIds = [IssueIntegrationId.Jira];
21-
export const supportedCloudIntegrationIdsExperimental = [
22-
IssueIntegrationId.Jira,
20+
export const supportedOrderedCloudIssueIntegrationIds = [IssueIntegrationId.Jira];
21+
export const supportedOrderedCloudIntegrationIds = [
2322
HostingIntegrationId.GitHub,
2423
HostingIntegrationId.GitLab,
24+
IssueIntegrationId.Jira,
2525
];
2626

27-
export type SupportedCloudIntegrationIds = (typeof supportedCloudIntegrationIdsExperimental)[number];
27+
export type SupportedCloudIntegrationIds = (typeof supportedOrderedCloudIntegrationIds)[number];
28+
29+
export function isSupportedCloudIntegrationId(id: IntegrationId): id is SupportedCloudIntegrationIds {
30+
return supportedOrderedCloudIntegrationIds.includes(id as SupportedCloudIntegrationIds);
31+
}
32+
33+
export type IntegrationFeatures = 'prs' | 'issues';
34+
35+
export interface IntegrationDescriptor {
36+
id: SupportedCloudIntegrationIds;
37+
name: string;
38+
icon: string;
39+
supports: IntegrationFeatures[];
40+
}
41+
export const supportedCloudIntegrationDescriptors: IntegrationDescriptor[] = [
42+
{
43+
id: HostingIntegrationId.GitHub,
44+
name: 'GitHub',
45+
icon: 'gl-provider-github',
46+
supports: ['prs', 'issues'],
47+
},
48+
{
49+
id: HostingIntegrationId.GitLab,
50+
name: 'GitLab',
51+
icon: 'gl-provider-gitlab',
52+
supports: ['prs', 'issues'],
53+
},
54+
{
55+
id: IssueIntegrationId.Jira,
56+
name: 'Jira',
57+
icon: 'gl-provider-jira',
58+
supports: ['issues'],
59+
},
60+
];

src/plus/gk/account/__debug__accountDebug.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class AccountDebug {
258258

259259
this.service.restoreFeaturePreviews();
260260
this.service.restoreSession();
261-
this.service.changeSubscription(this.service.getStoredSubscription(), { store: false });
261+
this.service.changeSubscription(this.service.getStoredSubscription(), undefined, { store: false });
262262
}
263263

264264
private async startSimulation(pick: SimulateQuickPickItem | undefined): Promise<boolean> {
@@ -287,6 +287,7 @@ class AccountDebug {
287287
state === SubscriptionState.Community
288288
? undefined
289289
: getPreviewSubscription(state === SubscriptionState.ProPreviewExpired ? 0 : 3),
290+
undefined,
290291
{ store: false },
291292
);
292293

@@ -341,7 +342,7 @@ class AccountDebug {
341342
activeOrganizationId,
342343
);
343344

344-
this.service.changeSubscription({ ...subscription, ...simulatedSubscription }, { store: false });
345+
this.service.changeSubscription({ ...subscription, ...simulatedSubscription }, undefined, { store: false });
345346

346347
return false;
347348
}

0 commit comments

Comments
 (0)