gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-27 05:27:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename function to better indicate functionality

Browse Source
This commit is contained in:
Caleb Owens 2024-05-22 10:48:59 +02:00
parent 0ab611fe7b
commit a0d7ae1445
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/lib/utils/url.test.ts
View File

@ -1,24 +1,28 @@
import { cleanUrl } from '$lib/utils/url';
import { convertRemoteToWebUrl } from '$lib/utils/url';
import { describe, expect, test } from 'vitest';
describe.concurrent('cleanUrl', () => {
test('it should handle url starts with http(s)?', () => {
expect(cleanUrl('https://github.com/user/repo.git')).toEqual('https://github.com/user/repo');
expect(convertRemoteToWebUrl('https://github.com/user/repo.git')).toEqual(
'https://github.com/user/repo'
);
});
test('it should handle complete ssh url with domain name', () => {
expect(cleanUrl('ssh://git@github.com:22/user/repo.git')).toEqual(
expect(convertRemoteToWebUrl('ssh://git@github.com:22/user/repo.git')).toEqual(
'https://github.com/user/repo'
);
});
test('it should handle complete ssh url with ip', () => {
expect(cleanUrl('ssh://git@192.168.1.1:22/user/repo.git')).toEqual(
expect(convertRemoteToWebUrl('ssh://git@192.168.1.1:22/user/repo.git')).toEqual(
'http://192.168.1.1/user/repo'
);
});
test('it should handle SCP-like url', () => {
expect(cleanUrl('git@github.com:user/repo.git')).toEqual('https://github.com/user/repo');
expect(convertRemoteToWebUrl('git@github.com:user/repo.git')).toEqual(
'https://github.com/user/repo'
);
});
});

2
app/src/lib/utils/url.ts
View File

@ -24,7 +24,7 @@ export function openExternalUrl(href: string) {
}
// turn a git remote url into a web url (github, gitlab, bitbucket, etc)
export function cleanUrl(url: string): string {
export function convertRemoteToWebUrl(url: string): string {
if (url.startsWith('http')) {
return url.replace('.git', '').trim();
} else if (url.startsWith('ssh')) {

6
app/src/lib/vbranches/types.ts
View File

@ -2,7 +2,7 @@ import 'reflect-metadata';
import { splitMessage } from '$lib/utils/commitMessage';
import { hashCode } from '$lib/utils/string';
import { isDefined, notNull } from '$lib/utils/typeguards';
import { cleanUrl } from '$lib/utils/url';
import { convertRemoteToWebUrl } from '$lib/utils/url';
import { Type, Transform } from 'class-transformer';
export type ChangeType =
@ -371,11 +371,11 @@ export class BaseBranch {
}
get pushRepoBaseUrl(): string {
return cleanUrl(this.pushRemoteUrl);
return convertRemoteToWebUrl(this.pushRemoteUrl);
}
get repoBaseUrl(): string {
return cleanUrl(this.remoteUrl);
return convertRemoteToWebUrl(this.remoteUrl);
}
commitUrl(commitId: string): string | undefined {