Custom URL service

Author: estib-vega

apps/desktop/src/components/BranchHeaderContextMenu.svelte

@@ -24,7 +24,7 @@
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import {
 		ContextMenu,
@@ -57,6 +57,7 @@
 	const stackService = inject(STACK_SERVICE);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
 	const promptService = inject(PROMPT_SERVICE);
+	const urlService = inject(URL_SERVICE);
 	const [insertBlankCommitInBranch, commitInsertion] = stackService.insertBlankCommit;
 	const [updateBranchNameMutation] = stackService.updateBranchName;
 	const [createRef, refCreation] = stackService.createReference;
@@ -177,7 +178,7 @@
 					testId={TestId.BranchHeaderContextMenu_OpenInBrowser}
 					onclick={() => {
 						const url = forge.current.branch(branchName)?.url;
-						if (url) openExternalUrl(url);
+						if (url) urlService.openExternalUrl(url);
 						close();
 					}}
 				/>
@@ -295,7 +296,7 @@
 							label="Open PR in browser"
 							testId={TestId.BranchHeaderContextMenu_OpenPRInBrowser}
 							onclick={() => {
-								openExternalUrl(pr.htmlUrl);
+								urlService.openExternalUrl(pr.htmlUrl);
 								close();
 							}}
 						/>

apps/desktop/src/components/BranchList.svelte

@@ -18,7 +18,7 @@
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { combineResults } from '$lib/state/helpers';
 	import { UI_STATE } from '$lib/state/uiState.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { copyToClipboard } from '@gitbutler/shared/clipboard';
 	import { inject } from '@gitbutler/shared/context';
 
@@ -42,6 +42,7 @@
 	const uiState = inject(UI_STATE);
 	const modeService = inject(MODE_SERVICE);
 	const forge = inject(DEFAULT_FORGE_FACTORY);
+	const urlService = inject(URL_SERVICE);
 	const intelligentScrollingService = inject(INTELLIGENT_SCROLLING_SERVICE);
 
 	const [insertBlankCommitInBranch, commitInsertion] = stackService.insertBlankCommit;
@@ -261,7 +262,7 @@
 										disabled={!prUrl}
 										onclick={() => {
 											if (prUrl) {
-												openExternalUrl(prUrl);
+												urlService.openExternalUrl(prUrl);
 											}
 										}}
 										icon={forge.current.name === 'gitlab' ? 'view-mr-browser' : 'view-pr-browser'}

apps/desktop/src/components/CommitContextMenu.svelte

@@ -45,7 +45,7 @@
 	import { writeClipboard } from '$lib/backend/clipboard';
 	import { rewrapCommitMessage } from '$lib/config/uiFeatureFlags';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import {
 		ContextMenu,
@@ -66,6 +66,7 @@
 
 	let { flat, projectId, openId = $bindable(), rightClickTrigger, contextData }: Props = $props();
 
+	const urlService = inject(URL_SERVICE);
 	const stackService = inject(STACK_SERVICE);
 	const [insertBlankCommitInBranch, commitInsertion] = stackService.insertBlankCommit;
 	const [createRef, refCreation] = stackService.createReference;
@@ -164,7 +165,7 @@
 					<ContextMenuItem
 						label="Open in browser"
 						onclick={async () => {
-							await openExternalUrl(commitUrl);
+							await urlService.openExternalUrl(commitUrl);
 							close();
 						}}
 					/>

apps/desktop/src/components/DecorativeSplitView.svelte

@@ -2,7 +2,7 @@
 	import AccountLink from '$components/AccountLink.svelte';
 	import gbLogoSvg from '$lib/assets/gb-logo.svg?raw';
 	import { USER } from '$lib/user/user';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import { Icon } from '@gitbutler/ui';
 	import { type Snippet } from 'svelte';
@@ -17,6 +17,7 @@
 	const { hideDetails, img, children, testId }: Props = $props();
 
 	const user = inject(USER);
+	const urlService = inject(URL_SERVICE);
 </script>
 
 <div class="decorative-split-view" data-testid={testId}>
@@ -51,15 +52,17 @@
 							<button
 								type="button"
 								class="right-side__link"
-								onclick={async () => await openExternalUrl('https://docs.gitbutler.com/')}
+								onclick={async () =>
+									await urlService.openExternalUrl('https://docs.gitbutler.com/')}
 							>
 								<Icon name="docs" opacity={0.6} />
 								<span class="text-14 text-semibold">GitButler docs</span>
 							</button>
 							<button
 								type="button"
 								class="right-side__link"
-								onclick={async () => await openExternalUrl('https://discord.com/invite/MmFkmaJ42D')}
+								onclick={async () =>
+									await urlService.openExternalUrl('https://discord.com/invite/MmFkmaJ42D')}
 							>
 								<Icon name="discord" opacity={0.6} />
 								<span class="text-14 text-semibold">Join community</span>

apps/desktop/src/components/EditMode.svelte

@@ -16,7 +16,7 @@
 	import { SETTINGS } from '$lib/settings/userSettings';
 	import { USER_SERVICE } from '$lib/user/userService';
 	import { computeChangeStatus } from '$lib/utils/fileStatus';
-	import { getEditorUri, openExternalUrl } from '$lib/utils/url';
+	import { getEditorUri, URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 
 	import { Avatar, Badge, Button, FileListItem, InfoButton, Modal } from '@gitbutler/ui';
@@ -42,6 +42,7 @@
 	const modeService = inject(MODE_SERVICE);
 	const userSettings = inject(SETTINGS);
 	const fileService = inject(FILE_SERVICE);
+	const urlService = inject(URL_SERVICE);
 
 	const userService = inject(USER_SERVICE);
 	const user = userService.user;
@@ -208,7 +209,7 @@
 				schemeId: $userSettings.defaultCodeEditor.schemeIdentifer,
 				path: [vscodePath(projectPath), file.path]
 			});
-			openExternalUrl(path);
+			urlService.openExternalUrl(path);
 		}
 	}
 

apps/desktop/src/components/FileContextMenu.svelte

@@ -16,7 +16,7 @@
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { UI_STATE } from '$lib/state/uiState.svelte';
 	import { computeChangeStatus } from '$lib/utils/fileStatus';
-	import { getEditorUri, openExternalUrl } from '$lib/utils/url';
+	import { getEditorUri, URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 
 	import {
@@ -63,6 +63,7 @@
 	const aiService = inject(AI_SERVICE);
 	const actionService = inject(ACTION_SERVICE);
 	const fileService = inject(FILE_SERVICE);
+	const urlService = inject(URL_SERVICE);
 	const [autoCommit, autoCommitting] = actionService.autoCommit;
 	const [branchChanges, branchingChanges] = actionService.branchChanges;
 	const [absorbChanges, absorbingChanges] = actionService.absorb;
@@ -425,7 +426,7 @@
 										schemeId: $userSettings.defaultCodeEditor.schemeIdentifer,
 										path: [vscodePath(projectPath), change.path]
 									});
-									openExternalUrl(path);
+									urlService.openExternalUrl(path);
 								}
 							}
 							contextMenu.close();

apps/desktop/src/components/GithubIntegration.svelte

@@ -2,7 +2,7 @@
 	import { writeClipboard } from '$lib/backend/clipboard';
 	import { GITHUB_USER_SERVICE } from '$lib/forge/github/githubUserService.svelte';
 	import { USER_SERVICE } from '$lib/user/userService';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 
 	import { Button, Icon, Modal, SectionCard, chipToasts as toasts } from '@gitbutler/ui';
@@ -18,6 +18,7 @@
 	const githubUserService = inject(GITHUB_USER_SERVICE);
 	const userService = inject(USER_SERVICE);
 	const user = userService.user;
+	const urlService = inject(URL_SERVICE);
 
 	// step flags
 	let codeCopied = $state(false);
@@ -160,7 +161,7 @@
 						disabled={GhActivationLinkPressed}
 						icon="open-link"
 						onclick={() => {
-							openExternalUrl('https://github.com/login/device');
+							urlService.openExternalUrl('https://github.com/login/device');
 							GhActivationLinkPressed = true;
 
 							// add timeout to prevent show the check button before the page is opened

apps/desktop/src/components/HunkContextMenu.svelte

@@ -19,7 +19,7 @@
 	import { PROJECTS_SERVICE } from '$lib/project/projectsService';
 	import { SETTINGS } from '$lib/settings/userSettings';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { getEditorUri, openExternalUrl } from '$lib/utils/url';
+	import { getEditorUri, URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import { ContextMenu, ContextMenuItem, ContextMenuSection, TestId } from '@gitbutler/ui';
 	import type { TreeChange } from '$lib/hunks/change';
@@ -50,6 +50,7 @@
 	const stackService = inject(STACK_SERVICE);
 	const ircService = inject(IRC_SERVICE);
 	const projectService = inject(PROJECTS_SERVICE);
+	const urlService = inject(URL_SERVICE);
 
 	const userSettings = inject(SETTINGS);
 	const ircChats = $derived(ircService.getChats());
@@ -174,7 +175,7 @@
 									path: [vscodePath(project.path), filePath],
 									line: item.beforeLineNumber ?? item.afterLineNumber
 								});
-								openExternalUrl(path);
+								urlService.openExternalUrl(path);
 							}
 							contextMenu?.close();
 						}}

apps/desktop/src/components/IconLink.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { openExternalUrl } from '$lib/utils/url';
-
+	import { URL_SERVICE } from '$lib/utils/url';
+	import { inject } from '@gitbutler/shared/context';
 	import { Icon } from '@gitbutler/ui';
 	import type iconsJson from '@gitbutler/ui/data/icons.json';
 	import type { Snippet } from 'svelte';
@@ -12,9 +12,10 @@
 	}
 
 	const { href, icon, children }: Props = $props();
+	const urlService = inject(URL_SERVICE);
 </script>
 
-<button type="button" class="link" onclick={async () => await openExternalUrl(href)}>
+<button type="button" class="link" onclick={async () => await urlService.openExternalUrl(href)}>
 	<Icon name={icon} />
 	<span class="text-12">
 		{@render children()}

apps/desktop/src/components/IntegrateUpstreamModal.svelte

@@ -16,7 +16,7 @@
 		type StackStatusesWithBranchesV3
 	} from '$lib/upstream/types';
 	import { UPSTREAM_INTEGRATION_SERVICE } from '$lib/upstream/upstreamIntegrationService.svelte';
-	import { openExternalUrl } from '$lib/utils/url';
+	import { URL_SERVICE } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
 	import {
 		Badge,
@@ -51,6 +51,7 @@
 	const baseBranchService = inject(BASE_BRANCH_SERVICE);
 	const baseBranchResponse = $derived(baseBranchService.baseBranch(projectId));
 	const base = $derived(baseBranchResponse.current.data);
+	const urlService = inject(URL_SERVICE);
 
 	let modal = $state<Modal>();
 	let integratingUpstream = $state<OperationState>('inert');
@@ -321,7 +322,7 @@
 								date={commit.createdAt}
 								author={commit.author.name}
 								url={commitUrl}
-								onOpen={(url) => openExternalUrl(url)}
+								onOpen={(url) => urlService.openExternalUrl(url)}
 								onCopy={() => writeClipboard(commit.id)}
 							/>
 						{/each}