diff --git a/CHANGELOG.md b/CHANGELOG.md index f61c5153d6805..c916e5976f50e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] +### Added + +- Adds enhanced integration with Linear ([#4543](https://github.com/gitkraken/vscode-gitlens/issues/4543)) + ## [17.4.1] - 2025-08-26 ### Fixed diff --git a/docs/telemetry-events.md b/docs/telemetry-events.md index f267fd4528316..5eaeb1a95f388 100644 --- a/docs/telemetry-events.md +++ b/docs/telemetry-events.md @@ -668,7 +668,7 @@ void ```typescript { 'hostingProvider.key': string, - 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'trello' + 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'linear' | 'trello' } ``` @@ -679,7 +679,7 @@ void ```typescript { 'hostingProvider.key': string, - 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'trello' + 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'linear' | 'trello' } ``` @@ -690,7 +690,7 @@ void ```typescript { 'issueProvider.key': string, - 'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'trello' + 'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'linear' | 'trello' } ``` @@ -701,7 +701,7 @@ void ```typescript { 'issueProvider.key': string, - 'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'trello' + 'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'linear' | 'trello' } ``` @@ -735,7 +735,7 @@ or when connection refresh is skipped due to being a non-cloud session ```typescript { - 'integration.id': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'trello' + 'integration.id': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'linear' | 'trello' } ``` @@ -2892,7 +2892,7 @@ void ```typescript { 'hostingProvider.key': string, - 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'trello', + 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'linear' | 'trello', // @deprecated: true 'remoteProviders.key': string } @@ -2905,7 +2905,7 @@ void ```typescript { 'hostingProvider.key': string, - 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'trello', + 'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'bitbucket-server' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted' | 'cloud-gitlab-self-hosted' | 'azure-devops-server' | 'jira' | 'linear' | 'trello', // @deprecated: true 'remoteProviders.key': string } diff --git a/images/icons/provider-bitbucket.svg b/images/icons/provider-bitbucket.svg index 54ddd78d10b7f..6119ea4d5779f 100644 --- a/images/icons/provider-bitbucket.svg +++ b/images/icons/provider-bitbucket.svg @@ -1 +1 @@ - + diff --git a/images/icons/provider-linear.svg b/images/icons/provider-linear.svg new file mode 100644 index 0000000000000..79cff26e491b8 --- /dev/null +++ b/images/icons/provider-linear.svg @@ -0,0 +1 @@ + diff --git a/images/icons/template/mapping.json b/images/icons/template/mapping.json index e3997808159ea..3a6cc0eba8ee9 100644 --- a/images/icons/template/mapping.json +++ b/images/icons/template/mapping.json @@ -64,5 +64,6 @@ "repository": 61763, "worktree": 61764, "worktree-filled": 61765, - "repository-cloud": 61766 + "repository-cloud": 61766, + "provider-linear": 61767 } \ No newline at end of file diff --git a/package.json b/package.json index 738f06c263d77..e53d6b1b080b9 100644 --- a/package.json +++ b/package.json @@ -10992,6 +10992,13 @@ "fontPath": "dist/glicons.woff2", "fontCharacter": "\\f146" } + }, + "gitlens-provider-linear": { + "description": "provider-linear icon", + "default": { + "fontPath": "dist/glicons.woff2", + "fontCharacter": "\\f147" + } } }, "menus": { @@ -25043,7 +25050,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "13.0.0-vnext.8", - "@gitkraken/provider-apis": "0.29.6", + "@gitkraken/provider-apis": "0.29.7", "@gitkraken/shared-web-components": "0.1.1-rc.15", "@gk-nzaytsev/fast-string-truncated-width": "1.1.0", "@lit-labs/signals": "0.1.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 36d40308b3e1a..7c7caf2eef1eb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: 13.0.0-vnext.8 version: 13.0.0-vnext.8(@types/react@19.0.12)(react@19.0.0) '@gitkraken/provider-apis': - specifier: 0.29.6 - version: 0.29.6(encoding@0.1.13) + specifier: 0.29.7 + version: 0.29.7(encoding@0.1.13) '@gitkraken/shared-web-components': specifier: 0.1.1-rc.15 version: 0.1.1-rc.15 @@ -657,8 +657,8 @@ packages: peerDependencies: react: 19.0.0 - '@gitkraken/provider-apis@0.29.6': - resolution: {integrity: sha512-aRgR7lL6MxnCFtbbNB5AJuQVRGBy6nJlZE+Yn0FZ/G8QrqgxhBkexVtG0ji/wiq2HmQ4DxNk6eo3xMfYqoTq6w==} + '@gitkraken/provider-apis@0.29.7': + resolution: {integrity: sha512-i1StvQ0L5UPnVNnnud6vN+E80SAIXp/iX1UxlCIXXibYiw088x+cGBsfvzopx6rtkacuDd0rJTN75CMbEKsGwA==} engines: {node: '>= 14'} '@gitkraken/shared-web-components@0.1.1-rc.15': @@ -667,6 +667,11 @@ packages: '@gk-nzaytsev/fast-string-truncated-width@1.1.0': resolution: {integrity: sha512-NPKNmdjRFUNpMRzQU3m+AmKzbiQ3WGFXxacMyfmRgm1N+vRhuCzAD3t2dRD29aX1n6a+PNBK2a6hwPwFTfx1rw==} + '@graphql-typed-document-node/core@3.2.0': + resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==} + peerDependencies: + graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 + '@humanfs/core@0.19.1': resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} @@ -857,6 +862,10 @@ packages: resolution: {integrity: sha512-LBSu5K0qAaaQcXX/0WIB9PGDevyCxxpnc1uq13vV/CgObaVxuis5hKl3Eboq/8gcb6ebnkAStW9NB/Em2eYyFA==} engines: {node: '>= 20'} + '@linear/sdk@58.1.0': + resolution: {integrity: sha512-sqzo1j+uZsxeJlMTV2mrBH3yukB/liev7IySmkZil0ka7ic6b4RE9Jk3x+ohw8YgYB52IRR3SPWzhWu96E6W9g==} + engines: {node: '>=12.x', yarn: 1.x} + '@lit-labs/signals@0.1.3': resolution: {integrity: sha512-P0yWgH5blwVyEwBg+WFspLzeu1i0ypJP1QB0l1Omr9qZLIPsUu0p4Fy2jshOg7oQyha5n163K3GJGeUhQQ682Q==} @@ -3422,6 +3431,10 @@ packages: graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} + graphql@15.10.1: + resolution: {integrity: sha512-BL/Xd/T9baO6NFzoMpiMD7YUZ62R6viR5tp/MULVEnbYJXZA//kRNW7J0j1w/wXArgL0sCxhDfK5dczSKn3+cg==} + engines: {node: '>= 10.x'} + gunzip-maybe@1.4.2: resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==} hasBin: true @@ -3881,6 +3894,9 @@ packages: resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==} engines: {node: '>=0.10.0'} + isomorphic-unfetch@3.1.0: + resolution: {integrity: sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==} + istanbul-lib-coverage@3.2.2: resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==} engines: {node: '>=8'} @@ -5971,6 +5987,9 @@ packages: undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + unfetch@4.2.0: + resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==} + unicorn-magic@0.1.0: resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} engines: {node: '>=18'} @@ -6537,8 +6556,9 @@ snapshots: transitivePeerDependencies: - '@types/react' - '@gitkraken/provider-apis@0.29.6(encoding@0.1.13)': + '@gitkraken/provider-apis@0.29.7(encoding@0.1.13)': dependencies: + '@linear/sdk': 58.1.0(encoding@0.1.13) js-base64: 3.7.5 node-fetch: 2.7.0(encoding@0.1.13) transitivePeerDependencies: @@ -6551,6 +6571,10 @@ snapshots: '@gk-nzaytsev/fast-string-truncated-width@1.1.0': {} + '@graphql-typed-document-node/core@3.2.0(graphql@15.10.1)': + dependencies: + graphql: 15.10.1 + '@humanfs/core@0.19.1': {} '@humanfs/node@0.16.6': @@ -6712,6 +6736,14 @@ snapshots: transitivePeerDependencies: - supports-color + '@linear/sdk@58.1.0(encoding@0.1.13)': + dependencies: + '@graphql-typed-document-node/core': 3.2.0(graphql@15.10.1) + graphql: 15.10.1 + isomorphic-unfetch: 3.1.0(encoding@0.1.13) + transitivePeerDependencies: + - encoding + '@lit-labs/signals@0.1.3': dependencies: lit: 3.3.1 @@ -9540,6 +9572,8 @@ snapshots: graphemer@1.4.0: {} + graphql@15.10.1: {} + gunzip-maybe@1.4.2: dependencies: browserify-zlib: 0.1.4 @@ -10006,6 +10040,13 @@ snapshots: isobject@3.0.1: {} + isomorphic-unfetch@3.1.0(encoding@0.1.13): + dependencies: + node-fetch: 2.7.0(encoding@0.1.13) + unfetch: 4.2.0 + transitivePeerDependencies: + - encoding + istanbul-lib-coverage@3.2.2: {} istanbul-lib-report@3.0.1: @@ -12309,6 +12350,8 @@ snapshots: undici-types@5.26.5: {} + unfetch@4.2.0: {} + unicorn-magic@0.1.0: {} unicorn-magic@0.3.0: {} diff --git a/src/autolinks/autolinksProvider.ts b/src/autolinks/autolinksProvider.ts index 0e8f4a9527b1d..455cf1523482c 100644 --- a/src/autolinks/autolinksProvider.ts +++ b/src/autolinks/autolinksProvider.ts @@ -178,8 +178,11 @@ export class AutolinksProvider implements Disposable { } getAutolinkEnrichableId(autolink: Autolink): string { + // TODO: this should return linking key for all types of providers: such as TST-123 or #89 or PR 89 (or a pair: key+id). + // Each provider should form whatever ID they need in their specific getIssueOrPullRequest() method. switch (autolink.provider?.id) { case IssuesCloudHostIntegrationId.Jira: + case IssuesCloudHostIntegrationId.Linear: return `${autolink.prefix}${autolink.id}`; default: return autolink.id; diff --git a/src/autolinks/utils/-webview/autolinks.utils.ts b/src/autolinks/utils/-webview/autolinks.utils.ts index ff75d9e4bf4e6..9653da5c55f21 100644 --- a/src/autolinks/utils/-webview/autolinks.utils.ts +++ b/src/autolinks/utils/-webview/autolinks.utils.ts @@ -32,7 +32,7 @@ export function serializeAutolink(value: Autolink): Autolink { return serialized; } -export const supportedAutolinkIntegrations = [IssuesCloudHostIntegrationId.Jira]; +export const supportedAutolinkIntegrations = [IssuesCloudHostIntegrationId.Jira, IssuesCloudHostIntegrationId.Linear]; export function isDynamic(ref: AutolinkReference | DynamicAutolinkReference): ref is DynamicAutolinkReference { return !('prefix' in ref) && !('url' in ref); @@ -154,10 +154,10 @@ export function getBranchAutolinks(branchName: string, refsets: Readonly { - if (a[0]?.id === IssuesCloudHostIntegrationId.Jira || a[0]?.id === IssuesCloudHostIntegrationId.Trello) { + if (a[0]?.id && Object.values(IssuesCloudHostIntegrationId).includes(a[0].id)) { return -1; } - if (b[0]?.id === IssuesCloudHostIntegrationId.Jira || b[0]?.id === IssuesCloudHostIntegrationId.Trello) { + if (b[0]?.id && Object.values(IssuesCloudHostIntegrationId).includes(b[0].id)) { return 1; } return 0; diff --git a/src/constants.integrations.ts b/src/constants.integrations.ts index a8f828fb78fa2..22f989d2aeed3 100644 --- a/src/constants.integrations.ts +++ b/src/constants.integrations.ts @@ -16,6 +16,7 @@ export enum GitSelfManagedHostIntegrationId { export enum IssuesCloudHostIntegrationId { Jira = 'jira', + Linear = 'linear', Trello = 'trello', } @@ -30,7 +31,10 @@ export type IssuesHostIntegrationIds = IssuesCloudHostIntegrationId; export type IntegrationIds = GitHostIntegrationIds | IssuesHostIntegrationIds; -export const supportedOrderedCloudIssuesIntegrationIds = [IssuesCloudHostIntegrationId.Jira]; +export const supportedOrderedCloudIssuesIntegrationIds = [ + IssuesCloudHostIntegrationId.Jira, + IssuesCloudHostIntegrationId.Linear, +]; export const supportedOrderedCloudIntegrationIds = [ GitCloudHostIntegrationId.GitHub, GitSelfManagedHostIntegrationId.CloudGitHubEnterprise, @@ -41,6 +45,7 @@ export const supportedOrderedCloudIntegrationIds = [ GitCloudHostIntegrationId.Bitbucket, GitSelfManagedHostIntegrationId.BitbucketServer, IssuesCloudHostIntegrationId.Jira, + IssuesCloudHostIntegrationId.Linear, ]; export const integrationIds = [ @@ -55,6 +60,7 @@ export const integrationIds = [ GitSelfManagedHostIntegrationId.GitHubEnterprise, GitSelfManagedHostIntegrationId.GitLabSelfHosted, IssuesCloudHostIntegrationId.Jira, + IssuesCloudHostIntegrationId.Linear, IssuesCloudHostIntegrationId.Trello, ]; @@ -142,4 +148,11 @@ export const supportedCloudIntegrationDescriptors: IntegrationDescriptor[] = [ supports: ['issues'], requiresPro: true, }, + { + id: IssuesCloudHostIntegrationId.Linear, + name: 'Linear', + icon: 'gl-provider-linear', + supports: ['issues'], + requiresPro: true, + }, ]; diff --git a/src/git/models/commit.ts b/src/git/models/commit.ts index cb443dfaa0bf5..3603991134d16 100644 --- a/src/git/models/commit.ts +++ b/src/git/models/commit.ts @@ -551,7 +551,6 @@ export class GitCommit implements GitRevisionReference { if (this.isUncommitted) return undefined; remote ??= await this.container.git.getRepositoryService(this.repoPath).remotes.getBestRemoteWithIntegration(); - if (remote?.provider == null) return undefined; // TODO@eamodio should we cache these? Seems like we would use more memory than it's worth // async function getCore(this: GitCommit): Promise | undefined> { diff --git a/src/git/models/issue.ts b/src/git/models/issue.ts index c9a30db5e51e3..d13a5b61875a7 100644 --- a/src/git/models/issue.ts +++ b/src/git/models/issue.ts @@ -37,6 +37,7 @@ export class Issue implements IssueShape { public readonly thumbsUpCount?: number, public readonly body?: string, public readonly project?: IssueProject, + public readonly number?: string, ) {} } diff --git a/src/hovers/hovers.ts b/src/hovers/hovers.ts index 4e35c59d38667..cfcda04a35e71 100644 --- a/src/hovers/hovers.ts +++ b/src/hovers/hovers.ts @@ -215,7 +215,6 @@ export async function detailsMessage( const cfg = configuration.get('hovers'); const enhancedAutolinks = - remote?.provider != null && options?.autolinks !== false && (options?.autolinks || cfg.autolinks.enabled) && cfg.autolinks.enhanced && diff --git a/src/plus/integrations/authentication/integrationAuthenticationService.ts b/src/plus/integrations/authentication/integrationAuthenticationService.ts index 50fe93f97483b..0862245dffeed 100644 --- a/src/plus/integrations/authentication/integrationAuthenticationService.ts +++ b/src/plus/integrations/authentication/integrationAuthenticationService.ts @@ -148,6 +148,11 @@ export class IntegrationAuthenticationService implements Disposable { await import(/* webpackChunkName: "integrations" */ './jira') ).JiraAuthenticationProvider(this.container, this, this.configuredIntegrationService); break; + case IssuesCloudHostIntegrationId.Linear: + provider = new ( + await import(/* webpackChunkName: "integrations" */ './linear') + ).LinearAuthenticationProvider(this.container, this, this.configuredIntegrationService); + break; default: provider = new BuiltInAuthenticationProvider( this.container, diff --git a/src/plus/integrations/authentication/linear.ts b/src/plus/integrations/authentication/linear.ts new file mode 100644 index 0000000000000..11c78ebf510a8 --- /dev/null +++ b/src/plus/integrations/authentication/linear.ts @@ -0,0 +1,8 @@ +import { IssuesCloudHostIntegrationId } from '../../../constants.integrations'; +import { CloudIntegrationAuthenticationProvider } from './integrationAuthenticationProvider'; + +export class LinearAuthenticationProvider extends CloudIntegrationAuthenticationProvider { + protected override get authProviderId(): IssuesCloudHostIntegrationId.Linear { + return IssuesCloudHostIntegrationId.Linear; + } +} diff --git a/src/plus/integrations/authentication/models.ts b/src/plus/integrations/authentication/models.ts index d7f10b099d9de..10bbfe8ee68f8 100644 --- a/src/plus/integrations/authentication/models.ts +++ b/src/plus/integrations/authentication/models.ts @@ -44,6 +44,7 @@ export interface CloudIntegrationConnection { export type CloudIntegrationType = | 'jira' + | 'linear' | 'trello' | 'gitlab' | 'github' @@ -70,6 +71,7 @@ export function isSupportedCloudIntegrationId(id: string): id is SupportedCloudI export const toIntegrationId: { [key in CloudIntegrationType]: IntegrationIds } = { jira: IssuesCloudHostIntegrationId.Jira, + linear: IssuesCloudHostIntegrationId.Linear, trello: IssuesCloudHostIntegrationId.Trello, gitlab: GitCloudHostIntegrationId.GitLab, github: GitCloudHostIntegrationId.GitHub, @@ -83,6 +85,7 @@ export const toIntegrationId: { [key in CloudIntegrationType]: IntegrationIds } export const toCloudIntegrationType: { [key in IntegrationIds]: CloudIntegrationType | undefined } = { [IssuesCloudHostIntegrationId.Jira]: 'jira', + [IssuesCloudHostIntegrationId.Linear]: 'linear', [IssuesCloudHostIntegrationId.Trello]: 'trello', [GitCloudHostIntegrationId.GitLab]: 'gitlab', [GitCloudHostIntegrationId.GitHub]: 'github', diff --git a/src/plus/integrations/integrationService.ts b/src/plus/integrations/integrationService.ts index af66d72128ede..e6f5c1c79d7ca 100644 --- a/src/plus/integrations/integrationService.ts +++ b/src/plus/integrations/integrationService.ts @@ -540,6 +540,16 @@ export class IntegrationService implements Disposable { ) as IssuesIntegration as IntegrationById; break; + case IssuesCloudHostIntegrationId.Linear: + integration = new ( + await import(/* webpackChunkName: "integrations" */ './providers/linear') + ).LinearIntegration( + this.container, + this.authenticationService, + this.getProvidersApi.bind(this), + this._onDidChangeIntegrationConnection, + ) as IssuesIntegration as IntegrationById; + break; default: throw new Error(`Integration with '${id}' is not supported`); } diff --git a/src/plus/integrations/providers/linear.ts b/src/plus/integrations/providers/linear.ts new file mode 100644 index 0000000000000..65086da82b5e1 --- /dev/null +++ b/src/plus/integrations/providers/linear.ts @@ -0,0 +1,262 @@ +import type { AuthenticationSession, CancellationToken } from 'vscode'; +import type { AutolinkReference, DynamicAutolinkReference } from '../../../autolinks/models/autolinks'; +import { IssuesCloudHostIntegrationId } from '../../../constants.integrations'; +import type { Account } from '../../../git/models/author'; +import type { Issue, IssueShape } from '../../../git/models/issue'; +import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../../git/models/issueOrPullRequest'; +import type { IssueResourceDescriptor, ResourceDescriptor } from '../../../git/models/resourceDescriptor'; +import { isIssueResourceDescriptor } from '../../../git/utils/resourceDescriptor.utils'; +import { Logger } from '../../../system/logger'; +import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider'; +import type { ProviderAuthenticationSession } from '../authentication/models'; +import { IssuesIntegration } from '../models/issuesIntegration'; +import type { IssueFilter, ProviderIssue } from './models'; +import { fromProviderIssue, providersMetadata, toIssueShape } from './models'; + +const metadata = providersMetadata[IssuesCloudHostIntegrationId.Linear]; +const authProvider = Object.freeze({ id: metadata.id, scopes: metadata.scopes }); +const maxPagesPerRequest = 10; + +export interface LinearTeamDescriptor extends IssueResourceDescriptor { + avatarUrl: string | undefined; +} + +export interface LinearOrganizationDescriptor extends IssueResourceDescriptor { + url: string; +} + +export interface LinearProjectDescriptor extends IssueResourceDescriptor {} + +export class LinearIntegration extends IssuesIntegration { + private _autolinks: Map | undefined; + override async autolinks(): Promise<(AutolinkReference | DynamicAutolinkReference)[]> { + const connected = this.maybeConnected ?? (await this.isConnected()); + if (!connected || this._session == null) { + return []; + } + const cachedAutolinks = this._autolinks?.get(this._session.accessToken); + if (cachedAutolinks != null) return cachedAutolinks; + + const organization = await this.getOrganization(this._session); + if (organization == null) return []; + + const autolinks: (AutolinkReference | DynamicAutolinkReference)[] = []; + + const teams = await this.getTeams(this._session); + for (const team of teams ?? []) { + const dashedPrefix = `${team.key}-`; + const underscoredPrefix = `${team.key}_`; + + autolinks.push({ + prefix: dashedPrefix, + url: `${organization.url}/issue/${dashedPrefix}`, + alphanumeric: false, + ignoreCase: false, + title: `Open Issue ${dashedPrefix} on ${organization.name}`, + + type: 'issue', + description: `${organization.name} Issue ${dashedPrefix}`, + descriptor: { ...organization }, + }); + autolinks.push({ + prefix: underscoredPrefix, + url: `${organization.url}/issue/${dashedPrefix}`, + alphanumeric: false, + ignoreCase: false, + referenceType: 'branch', + title: `Open Issue ${dashedPrefix} on ${organization.name}`, + + type: 'issue', + description: `${organization.name} Issue ${dashedPrefix}`, + descriptor: { ...organization }, + }); + } + + this._autolinks ??= new Map(); + this._autolinks.set(this._session.accessToken, autolinks); + + return autolinks; + } + + private _organizations: Map | undefined; + private async getOrganization( + { accessToken }: AuthenticationSession, + force: boolean = false, + ): Promise { + this._organizations ??= new Map(); + + const cachedResources = this._organizations.get(accessToken); + + if (cachedResources == null || force) { + const api = await this.getProvidersApi(); + const organization = await api.getLinearOrganization({ accessToken: accessToken }); + const descriptor: LinearOrganizationDescriptor | undefined = organization && { + id: organization.id, + key: organization.key, + name: organization.name, + url: organization.url, + }; + if (descriptor) { + this._organizations.set(accessToken, descriptor); + } + } + + return this._organizations.get(accessToken); + } + + private _teams: Map | undefined; + private async getTeams( + { accessToken }: AuthenticationSession, + force: boolean = false, + ): Promise { + this._teams ??= new Map(); + + const cachedResources = this._teams.get(accessToken); + + if (cachedResources == null || force) { + const api = await this.getProvidersApi(); + const teams = await api.getLinearTeamsForCurrentUser({ accessToken: accessToken }); + const descriptors: LinearTeamDescriptor[] | undefined = teams?.map(t => ({ + id: t.id, + key: t.key, + name: t.name, + avatarUrl: t.iconUrl, + })); + if (descriptors) { + this._teams.set(accessToken, descriptors); + } + } + + return this._teams.get(accessToken); + } + + protected override getProviderResourcesForUser( + _session: ProviderAuthenticationSession, + ): Promise { + throw new Error('Method not implemented.'); + } + protected override getProviderProjectsForResources( + _session: ProviderAuthenticationSession, + _resources: ResourceDescriptor[], + ): Promise { + throw new Error('Method not implemented.'); + } + readonly authProvider: IntegrationAuthenticationProviderDescriptor = authProvider; + + protected override getProviderAccountForResource( + _session: ProviderAuthenticationSession, + _resource: ResourceDescriptor, + ): Promise { + throw new Error('Method not implemented.'); + } + + protected override getProviderIssuesForProject( + _session: ProviderAuthenticationSession, + _project: ResourceDescriptor, + _options?: { user?: string; filters?: IssueFilter[] }, + ): Promise { + throw new Error('Method not implemented.'); + } + + override get id(): IssuesCloudHostIntegrationId.Linear { + return IssuesCloudHostIntegrationId.Linear; + } + protected override get key(): 'linear' { + return 'linear'; + } + override get name(): string { + return metadata.name; + } + override get domain(): string { + return metadata.domain; + } + protected override async searchProviderMyIssues( + session: ProviderAuthenticationSession, + resources?: ResourceDescriptor[], + cancellation?: CancellationToken, + ): Promise { + if (resources != null) { + return undefined; + } + const api = await this.getProvidersApi(); + let cursor = undefined; + let hasMore = false; + let requestCount = 0; + const issues = []; + try { + do { + if (cancellation?.isCancellationRequested) { + break; + } + const result = await api.getIssuesForCurrentUser(this.id, { + accessToken: session.accessToken, + cursor: cursor, + }); + requestCount += 1; + hasMore = result.paging?.more ?? false; + cursor = result.paging?.cursor; + const formattedIssues = result.values + .map(issue => toIssueShape(issue, this)) + .filter((result): result is IssueShape => result != null); + if (formattedIssues.length > 0) { + issues.push(...formattedIssues); + } + } while (requestCount < maxPagesPerRequest && hasMore); + } catch (ex) { + if (issues.length === 0) { + throw ex; + } + Logger.error(ex, 'searchProviderMyIssues'); + } + return issues; + } + protected override async getProviderIssueOrPullRequest( + session: ProviderAuthenticationSession, + resource: ResourceDescriptor, + id: string, + _type: undefined | IssueOrPullRequestType, + ): Promise { + const issue = await this.getRawProviderIssue(session, resource, id); + return issue && toIssueShape(issue, this); + } + protected override async getProviderIssue( + session: ProviderAuthenticationSession, + resource: ResourceDescriptor, + id: string, + ): Promise { + const result = await this.getRawProviderIssue(session, resource, id); + return result && fromProviderIssue(result, this); + } + + private async getRawProviderIssue( + session: ProviderAuthenticationSession, + resource: ResourceDescriptor, + id: string, + ): Promise { + const api = await this.getProvidersApi(); + try { + if (!isIssueResourceDescriptor(resource)) { + Logger.error(undefined, 'getProviderIssue: resource is not an IssueResourceDescriptor'); + return undefined; + } + + const result = await api.getIssue( + this.id, + { + resourceId: resource.id, + number: id, + }, + { + accessToken: session.accessToken, + }, + ); + + if (result == null) return undefined; + + return result; + } catch (ex) { + Logger.error(ex, 'getProviderIssue'); + return undefined; + } + } +} diff --git a/src/plus/integrations/providers/models.ts b/src/plus/integrations/providers/models.ts index 973db318f6e78..2e04a9622e7f7 100644 --- a/src/plus/integrations/providers/models.ts +++ b/src/plus/integrations/providers/models.ts @@ -19,6 +19,9 @@ import type { Jira, JiraProject, JiraResource, + Linear, + LinearOrganization, + LinearTeam, NumberedPageInput, Issue as ProviderApiIssue, PullRequestWithUniqueID, @@ -74,6 +77,8 @@ export type ProviderIssue = ProviderApiIssue; export type ProviderEnterpriseOptions = EnterpriseOptions; export type ProviderJiraProject = JiraProject; export type ProviderJiraResource = JiraResource; +export type ProviderLinearTeam = LinearTeam; +export type ProviderLinearOrganization = LinearOrganization; export type ProviderAzureProject = AzureProject; export type ProviderAzureResource = AzureOrganization; export type ProviderBitbucketResource = BitbucketWorkspaceStub; @@ -280,6 +285,11 @@ export type GetIssuesForReposFn = ( options?: EnterpriseOptions, ) => Promise<{ data: ProviderIssue[]; pageInfo?: PageInfo }>; +export type GetIssuesForCurrentUserFn = ( + input: PagingInput, + options?: EnterpriseOptions, +) => Promise<{ data: ProviderIssue[]; pageInfo?: PageInfo }>; + export type GetIssuesForRepoFn = ( input: GetIssuesForRepoInput & PagingInput, options?: EnterpriseOptions, @@ -309,6 +319,8 @@ export type GetCurrentUserForResourceFn = ( ) => Promise<{ data: ProviderAccount }>; export type GetJiraResourcesForCurrentUserFn = (options?: EnterpriseOptions) => Promise<{ data: JiraResource[] }>; +export type GetLinearOrganizationFn = (options?: EnterpriseOptions) => Promise<{ data: LinearOrganization }>; +export type GetLinearTeamsForCurrentUserFn = (options?: EnterpriseOptions) => Promise<{ data: LinearTeam[] }>; export type GetJiraProjectsForResourcesFn = ( input: { resourceIds: string[] }, options?: EnterpriseOptions, @@ -355,7 +367,7 @@ export type GetIssuesForResourceForCurrentUserFn = ( ) => Promise<{ data: ProviderIssue[] }>; export interface ProviderInfo extends ProviderMetadata { - provider: GitHub | GitLab | Bitbucket | BitbucketServer | Jira | Trello | AzureDevOps; + provider: GitHub | GitLab | Bitbucket | BitbucketServer | Jira | Linear | Trello | AzureDevOps; getRepoFn?: GetRepoFn; getRepoOfProjectFn?: GetRepoOfProjectFn; getPullRequestsForReposFn?: GetPullRequestsForReposFn; @@ -364,12 +376,15 @@ export interface ProviderInfo extends ProviderMetadata { getPullRequestsForAzureProjectsFn?: GetPullRequestsForAzureProjectsFn; getIssueFn?: GetIssueFn; getIssuesForReposFn?: GetIssuesForReposFn; + getIssuesForCurrentUserFn?: GetIssuesForCurrentUserFn; getIssuesForRepoFn?: GetIssuesForRepoFn; getIssuesForAzureProjectFn?: GetIssuesForAzureProjectFn; getCurrentUserFn?: GetCurrentUserFn; getCurrentUserForInstanceFn?: GetCurrentUserForInstanceFn; getCurrentUserForResourceFn?: GetCurrentUserForResourceFn; getJiraResourcesForCurrentUserFn?: GetJiraResourcesForCurrentUserFn; + getLinearOrganizationFn?: GetLinearOrganizationFn; + getLinearTeamsForCurrentUserFn?: GetLinearTeamsForCurrentUserFn; getAzureResourcesForUserFn?: GetAzureResourcesForUserFn; getBitbucketResourcesForUserFn?: GetBitbucketResourcesForUserFn; getBitbucketPullRequestsAuthoredByUserForWorkspaceFn?: GetBitbucketPullRequestsAuthoredByUserForWorkspaceFn; @@ -602,6 +617,14 @@ export const providersMetadata: ProvidersMetadata = { ], supportedIssueFilters: [IssueFilter.Author, IssueFilter.Assignee, IssueFilter.Mention], }, + [IssuesCloudHostIntegrationId.Linear]: { + domain: 'linear.app', + id: IssuesCloudHostIntegrationId.Linear, + name: 'Linear', + type: 'issues', + iconKey: IssuesCloudHostIntegrationId.Linear, + scopes: [], + }, [IssuesCloudHostIntegrationId.Trello]: { domain: 'trello.com', id: IssuesCloudHostIntegrationId.Trello, @@ -1040,6 +1063,7 @@ export function fromProviderIssue( resourceName: issue.project.namespace, } : undefined, + issue.number, ); } diff --git a/src/plus/integrations/providers/providersApi.ts b/src/plus/integrations/providers/providersApi.ts index c8018510e4d78..95be946c5d3a4 100644 --- a/src/plus/integrations/providers/providersApi.ts +++ b/src/plus/integrations/providers/providersApi.ts @@ -44,6 +44,7 @@ import type { IssueFilter, MergePullRequestFn, PageInfo, + PagingInput, PagingMode, ProviderAccount, ProviderAzureProject, @@ -53,6 +54,8 @@ import type { ProviderIssue, ProviderJiraProject, ProviderJiraResource, + ProviderLinearOrganization, + ProviderLinearTeam, ProviderPullRequest, ProviderRepoInput, ProviderReposInput, @@ -322,6 +325,14 @@ export class ProvidersApi { providerApis.jira, ), }, + [IssuesCloudHostIntegrationId.Linear]: { + ...providersMetadata[IssuesCloudHostIntegrationId.Linear], + provider: providerApis.linear, + getIssueFn: providerApis.linear.getIssue.bind(providerApis.linear) as GetIssueFn, + getIssuesForCurrentUserFn: providerApis.linear.getIssuesForCurrentUser.bind(providerApis.linear), + getLinearOrganizationFn: providerApis.linear.getLinearOrganization.bind(providerApis.linear), + getLinearTeamsForCurrentUserFn: providerApis.linear.getTeamsForCurrentUser.bind(providerApis.linear), + }, [IssuesCloudHostIntegrationId.Trello]: { ...providersMetadata[IssuesCloudHostIntegrationId.Trello], provider: providerApis.trello, @@ -650,6 +661,44 @@ export class ProvidersApi { } } + async getLinearOrganization(options?: { accessToken?: string }): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + IssuesCloudHostIntegrationId.Linear, + 'getLinearOrganizationFn', + options?.accessToken, + ); + + try { + const x = await provider.getLinearOrganizationFn?.({ token: token }); + const y = x?.data; + return y; + } catch (e) { + return this.handleProviderError( + IssuesCloudHostIntegrationId.Linear, + token, + e, + ); + } + } + + async getLinearTeamsForCurrentUser(options?: { accessToken?: string }): Promise { + const { provider, token } = await this.ensureProviderTokenAndFunction( + IssuesCloudHostIntegrationId.Linear, + 'getLinearTeamsForCurrentUserFn', + options?.accessToken, + ); + + try { + return (await provider.getLinearTeamsForCurrentUserFn?.({ token: token }))?.data; + } catch (e) { + return this.handleProviderError( + IssuesCloudHostIntegrationId.Linear, + token, + e, + ); + } + } + async getAzureResourcesForUser( userId: string, integrationId: GitCloudHostIntegrationId.AzureDevOps | GitSelfManagedHostIntegrationId.AzureDevOpsServer, @@ -1031,6 +1080,26 @@ export class ProvidersApi { ); } + async getIssuesForCurrentUser( + providerId: IntegrationIds, + options?: PagingInput & { accessToken?: string; isPAT?: boolean; baseUrl?: string }, + ): Promise> { + const { provider, token } = await this.ensureProviderTokenAndFunction( + providerId, + 'getIssuesForCurrentUserFn', + options?.accessToken, + ); + return this.getPagedResult( + provider, + options, + provider.getIssuesForCurrentUserFn, + token, + options?.cursor ?? undefined, + options?.isPAT, + options?.baseUrl, + ); + } + async getIssuesForAzureProject( providerId: GitCloudHostIntegrationId.AzureDevOps | GitSelfManagedHostIntegrationId.AzureDevOpsServer, namespace: string, diff --git a/src/plus/integrations/providers/utils.ts b/src/plus/integrations/providers/utils.ts index b89ce5de01acc..dc50eb161e265 100644 --- a/src/plus/integrations/providers/utils.ts +++ b/src/plus/integrations/providers/utils.ts @@ -120,6 +120,8 @@ export function getProviderIdFromEntityIdentifier( : GitSelfManagedHostIntegrationId.GitLabSelfHosted; case EntityIdentifierProviderType.Jira: return IssuesCloudHostIntegrationId.Jira; + case EntityIdentifierProviderType.Linear: + return IssuesCloudHostIntegrationId.Linear; case EntityIdentifierProviderType.Azure: return GitCloudHostIntegrationId.AzureDevOps; case EntityIdentifierProviderType.AzureDevOpsServer: @@ -147,6 +149,8 @@ function fromStringToEntityIdentifierProviderType(str: string): EntityIdentifier return EntityIdentifierProviderType.Gitlab; case 'jira': return EntityIdentifierProviderType.Jira; + case 'linear': + return EntityIdentifierProviderType.Linear; case 'azure': case 'azureDevOps': case 'azure-devops': @@ -252,6 +256,7 @@ export async function getIssueFromGitConfigEntityIdentifier( // TODO: Centralize where we represent all supported providers for issues if ( identifier.provider !== EntityIdentifierProviderType.Jira && + identifier.provider !== EntityIdentifierProviderType.Linear && identifier.provider !== EntityIdentifierProviderType.Github && identifier.provider !== EntityIdentifierProviderType.Gitlab && identifier.provider !== EntityIdentifierProviderType.GithubEnterprise && @@ -288,7 +293,7 @@ export async function getIssueFromGitConfigEntityIdentifier( export function getIssueOwner( issue: IssueShape, ): RepositoryDescriptor | IssueResourceDescriptor | AzureProjectInputDescriptor | undefined { - const isAzure = issue.provider.id === 'azure' || GitCloudHostIntegrationId.AzureDevOps || 'azure-devops'; + const isAzure = ['azure', GitCloudHostIntegrationId.AzureDevOps, 'azure-devops'].includes(issue.provider.id); return issue.repository ? { key: `${issue.repository.owner}/${issue.repository.repo}`, diff --git a/src/plus/launchpad/enrichmentService.ts b/src/plus/launchpad/enrichmentService.ts index 56dc6ca44f1cf..677aa441df9eb 100644 --- a/src/plus/launchpad/enrichmentService.ts +++ b/src/plus/launchpad/enrichmentService.ts @@ -204,6 +204,7 @@ const supportedIntegrationIdsToEnrich: Record diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html index fe38169f1c1d4..ae2ca4cb107f4 100644 --- a/src/webviews/apps/home/home.html +++ b/src/webviews/apps/home/home.html @@ -11,7 +11,7 @@ @font-face { font-family: 'glicons'; font-display: block; - src: url('#{root}/dist/glicons.woff2?b264f1ed05b6fced8e7bfbe5c426587e') format('woff2'); + src: url('#{root}/dist/glicons.woff2?d3b316716ee1329763a193a20834cd0a') format('woff2'); } diff --git a/src/webviews/apps/plus/composer/composer.html b/src/webviews/apps/plus/composer/composer.html index df2d229eb8621..41bfa03e3a9e7 100644 --- a/src/webviews/apps/plus/composer/composer.html +++ b/src/webviews/apps/plus/composer/composer.html @@ -11,7 +11,7 @@ @font-face { font-family: 'glicons'; font-display: block; - src: url('#{root}/dist/glicons.woff2?3614d4fae1d1a9c07c67436aad657680') format('woff2'); + src: url('#{root}/dist/glicons.woff2?d3b316716ee1329763a193a20834cd0a') format('woff2'); }