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

Fixup previous commit

Browse Source
This commit is contained in:
Mattias Granlund 2024-04-11 12:00:10 +02:00
parent ffbd6e7a0c
commit ef270ceaa4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/lib/ai/service.test.ts
View File

@ -1,9 +1,9 @@
import { CloudClient } from '../backend/cloud';
import { AnthropicAIClient } from '$lib/ai/anthropicClient';
import { ButlerAIClient } from '$lib/ai/butlerClient';
import { OpenAIClient } from '$lib/ai/openAIClient';
import { AIService, GitAIConfigKey, KeyOption, buildDiff } from '$lib/ai/service';
import { AnthropicModelName, ModelKind, OpenAIModelName, type AIClient } from '$lib/ai/types';
import { HttpClient } from '$lib/backend/httpClient';
import * as toasts from '$lib/utils/toasts';
import { Hunk } from '$lib/vbranches/types';
import { plainToInstance } from 'class-transformer';
@ -37,7 +37,7 @@ class DummyGitConfigService implements GitConfigService {
}
const fetchMock = vi.fn();
const cloud = new CloudClient(fetchMock);
const cloud = new HttpClient(fetchMock);
class DummyAIClient implements AIClient {
constructor(private response = 'lorem ipsum') {}

11
app/src/routes/settings/profile/+page.svelte
View File

@ -1,5 +1,6 @@
<script lang="ts">
HttpClientt { deleteAllData } from '$lib/backend/data';
import { deleteAllData } from '$lib/backend/data';
import { HttpClient } from '$lib/backend/httpClient';
import Button from '$lib/components/Button.svelte';
import Login from '$lib/components/Login.svelte';
import Modal from '$lib/components/Modal.svelte';
@ -18,7 +19,7 @@ HttpClientt { deleteAllData } from '$lib/backend/data';
import { goto } from '$app/navigation';
const userService = getContext(UserService);
const cloud = getContext(CloudClient);
const httpClient = getContext(HttpClient);
const user = userService.user;
const userSettings = getContextStoreBySymbol<Settings, Writable<Settings>>(SETTINGS);
@ -36,9 +37,9 @@ HttpClientt { deleteAllData } from '$lib/backend/data';
$: if ($user && !loaded) {
loaded = true;
cloud.getUser($user?.access_token).then((cloudUser) => {
httpClient.getUser($user?.access_token).then((cloudUser) => {
cloudUser.github_access_token = $user?.github_access_token; // prevent overwriting with null
userService.setUser(HttpClient
userService.setUser(cloudUser);
});
newName = $user?.name || '';
}
@ -52,7 +53,7 @@ HttpClientt { deleteAllData } from '$lib/backend/data';
const picture = formData.get('picture') as File | undefined;
try {
const updatedUser = await cloud.updateUser($user.access_token, {
const updatedUser = await httpClient.updateUser($user.access_token, {
name: newName,
picture: picture
});