Enhances remote provider connection flow #4411

sergeibbb · 2025-06-18T13:47:14Z

Description

This is a follow-up on #4387

And there is another thing that I think is worth fixing: handling of the "connect" click should be different. I'm attaching the example how it's handled in Remotes View and in Home. I think on Home it should work the same way as on Remotes View.

How it should work (without a web page, using existing connection):

enable-remotes.mp4

How it works (it passes user through a web page) and what this pull request changes:

Verification steps

basic change: open "remotes", disconnect, open "Home", connect: it should not go through the browser.
right remote is selected
- switch to a branch, that has an upstream from origin
- on remotes: disconnect, if there is a default remote then "Unset as default"
- open "Home", connect.
- on "remotes" check that the origin is selected as default
- edit the branch, change its upstream to another remote
- disconnect and "Unset the default" again
- open "Home", connect
- on "remotes" check that the orther is set as default
prioritized remote is selected
- switch to a branch without an upstream
- Have a remote called as "upstream"
- disconnect and "Unset the default"
- open "Home", connect
- on "remotes" check that no "upstream" is set as default
- same steps but no "upstream" remote: "origin" is set as default

Checklist

I have followed the guidelines in the Contributing document
My changes follow the coding style of this project
My changes build without any errors or warnings
My changes have been formatted and linted
My changes include any required corresponding changes to the documentation (including CHANGELOG.md and README.md)
My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses

Updates the connect remote provider flow to directly use the remote name and repository path. This change simplifies the connection process and ensures accurate remote provider association. Adds remotePath and remoteName to the repository shape. (#4387, #4411)

sergeibbb · 2025-07-10T17:19:23Z

@axosoft-ramint What do we do with this? Reject, accept, transform to different requirements?

cc @eamodio

axosoft-ramint · 2025-07-10T17:30:19Z

src/git/models/repositoryShape.ts

+		remotePath?: string;
+		remoteName?: string;


I see remotePath being added here but I don't see where it is being used?

Maybe call it bestRemoteName since in the only two places we use this, it's the so-called "best remote" of the repo?

axosoft-ramint · 2025-07-10T17:38:55Z

src/webviews/apps/shared/components/repo-button-group.ts

-										{ integrationIds: [provider.integration!.id], source: this.source },
+									href=${createCommandLink<ConnectRemoteProviderCommandArgs>(
+										'gitlens.connectRemoteProvider',
+										{ remote: provider.remoteName!, repoPath: repo.path },


Is this guaranteed to be the remote that the current branch is located on since this is where the link is located?

@axosoft-ramint

This is a good question. For picking the right integration the remote is unnecessary, because the only thing that matters is the integration type.

The problem here is setting the default remote when the integration is connected.

The old flow, that goes through the web site (ConnectCloudIntegrationsCommand), does not set the default remote when the integration is connected.
In the new flow the default remote is set to the value of the parameter that might be wrong.

So, I suggest to make the remote field optional and if it's not set, then do not set the default remote on connecting an integration. By doing that we:

keep the old behavior (not setting the remote at all)

won't fail with setting a wrong remote as default.

What do you think?

Updates the connect remote provider flow to directly use the remote name and repository path. This change simplifies the connection process and ensures accurate remote provider association. Adds remotePath and remoteName to the repository shape. (#4387, #4411)

in order to avoid setting an invalid remote. (#4387, #4411)

sergeibbb · 2025-07-29T12:20:21Z

Hi @axosoft-ramint

I've removed passing the remote. Now it's defined by some logic that already exists.
Also I've added "Verification steps" that describes how it selects the default origin and how it can be tested.

axosoft-ramint · 2025-07-31T17:25:21Z

src/commands/remoteProviders.ts

@@ -13,7 +13,7 @@ import type { CommandContext } from './commandContext';
 import { isCommandContextViewNodeHasRemote } from './commandContext.utils';

 export interface ConnectRemoteProviderCommandArgs {
-	remote: string;
+	remote?: string;


It does feel a bit weird that we could call "ConnectRemoteProvider" as a command without a remote supplied, but that's probably just semantics at this point.

LGTM will verify once it's in, thanks for updating it!

@axosoft-ramint

It does feel a bit weird that we could call "ConnectRemoteProvider" as a command without a remote supplied

Yes. It's called "connect provider" but connects an integration. The question is what if I have 2 remotes: one for GitHub and another one for Azure and both are disconnected. But at some point on the previous version with ConnectCloudIntegrationsCommand it should have been defined somehow too.

In ConnectRemoteProviderCommand it can be called without a defined remote and there is a code substitute a value for remote:

With old ConnectCloudIntegrationsCommand we already had a provider and took an integration-id from it:

But how that provider has been picked? I'm going to check out the origin of the provider value there and maybe it will be possible to take a remote for it in that place. Or, maybe the ConnectRemoteProviderCommand could accept provider argument when remote is unknown, because having provider is enough for getting its integration.

sergeibbb force-pushed the bug/4387-fix-integration-status branch from 8eccc89 to 613c7fa Compare June 18, 2025 13:47

sergeibbb self-assigned this Jun 18, 2025

sergeibbb requested review from axosoft-ramint and d13 June 18, 2025 13:48

sergeibbb force-pushed the bug/4387-fix-integration-status branch from 613c7fa to b1c0c73 Compare June 25, 2025 12:04

sergeibbb requested a review from eamodio June 30, 2025 19:26

d13 added the area-integrations Issues or features related to integrations label Jul 9, 2025

axosoft-ramint reviewed Jul 10, 2025

View reviewed changes

justinrobots added this to the 17.4 milestone Jul 11, 2025

sergeibbb force-pushed the bug/4387-fix-integration-status branch from 0fc9dfc to 510dd0b Compare July 14, 2025 14:22

sergeibbb added a commit that referenced this pull request Jul 29, 2025

Stops passing remote attribute from "Home"

abd6f1b

in order to avoid setting an invalid remote. (#4387, #4411)

sergeibbb force-pushed the bug/4387-fix-integration-status branch from 510dd0b to abd6f1b Compare July 29, 2025 12:16

Stops passing remote attribute from "Home"

d9655ad

in order to avoid setting an invalid remote. (#4387, #4411)

sergeibbb force-pushed the bug/4387-fix-integration-status branch from abd6f1b to d9655ad Compare July 29, 2025 12:17

sergeibbb linked an issue Jul 29, 2025 that may be closed by this pull request

Clicking the repo icon to collapse the repo name on the current work item section of home doesn't work #4387

Closed

sergeibbb requested a review from axosoft-ramint July 29, 2025 12:21

axosoft-ramint approved these changes Jul 31, 2025

View reviewed changes

sergeibbb requested review from axosoft-ramint and removed request for d13, eamodio and axosoft-ramint August 5, 2025 14:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Enhances remote provider connection flow #4411

Enhances remote provider connection flow #4411

sergeibbb commented Jun 18, 2025 •

edited

Loading

Uh oh!

sergeibbb commented Jul 10, 2025

Uh oh!

axosoft-ramint Jul 10, 2025

Uh oh!

sergeibbb Jul 14, 2025

Uh oh!

axosoft-ramint Jul 10, 2025

Uh oh!

sergeibbb Jul 18, 2025

Uh oh!

sergeibbb commented Jul 29, 2025 •

edited

Loading

Uh oh!

axosoft-ramint Jul 31, 2025 •

edited

Loading

Uh oh!

sergeibbb Jul 31, 2025

Uh oh!

Uh oh!

Enhances remote provider connection flow #4411

Are you sure you want to change the base?

Enhances remote provider connection flow #4411

Conversation

sergeibbb commented Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Verification steps

Checklist

Uh oh!

sergeibbb commented Jul 10, 2025

Uh oh!

axosoft-ramint Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb Jul 14, 2025

Choose a reason for hiding this comment

Uh oh!

axosoft-ramint Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

sergeibbb commented Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

axosoft-ramint Jul 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sergeibbb Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sergeibbb commented Jun 18, 2025 •

edited

Loading

sergeibbb commented Jul 29, 2025 •

edited

Loading

axosoft-ramint Jul 31, 2025 •

edited

Loading