Skip to content

Commit a6d27f5

Browse files
authored
Feat/branch made (#4104)
2 parents ec7ccd7 + 891a16b commit a6d27f5

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

sweep_chat/app/globals.css

+2
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,13 @@
9595
font-size: 2rem;
9696
/* margin-bottom: 1.5rem; */
9797
margin-top: 1rem;
98+
line-height: 1.5;
9899
}
99100

100101
h2 {
101102
font-size: 1.5rem;
102103
/* margin-bottom: 1.5rem; */
104+
line-height: 1.5;
103105
}
104106

105107
h2:not(:first-child) {

sweep_chat/components/App.tsx

+15-13
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
207207
}
208208
}, [messagesId, messages.length])
209209

210+
useEffect(() => {
211+
if (messagesId) {
212+
window.history.pushState({}, '', `/c/${messagesId}`)
213+
}
214+
}, [messagesId])
215+
210216
useEffect(() => {
211217
console.log('loading message', messagesId)
212218
if (messagesId) {
@@ -234,10 +240,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
234240
commit_to_pr,
235241
} = data.data
236242
console.log(
237-
repo_name,
238-
messages,
239-
snippets,
240-
user_mentioned_pull_requests
243+
`Loaded ${messages.length} messages from ${messagesId}`
241244
)
242245
setRepoName(repo_name)
243246
setRepoNameValid(true)
@@ -353,7 +356,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
353356
repoName: string,
354357
messages: Message[],
355358
snippets: Snippet[],
356-
currentMessagesId: string,
359+
messagesId: string,
357360
userMentionedPullRequest: PullRequest | null = null,
358361
userMentionedPullRequests: PullRequest[] | null = null,
359362
commitToPR: boolean = false,
@@ -368,7 +371,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
368371
repoName,
369372
messages,
370373
snippets,
371-
messagesId: currentMessagesId,
374+
messageId: messagesId,
372375
originalCodeSuggestions: originalSuggestedChanges,
373376
codeSuggestions: suggestedChanges,
374377
pullRequest,
@@ -379,12 +382,12 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
379382
commitToPRString,
380383
}))
381384
const saveData = await saveResponse.json()
385+
console.log(`Saving ${messages.length} messages to ${messagesId}`)
382386
if (saveData.status == 'success') {
383387
const { message_id } = saveData
384-
if (!currentMessagesId && message_id) {
388+
if (!messagesId && message_id) {
385389
setMessagesId(message_id)
386390
const updatedUrl = `/c/${message_id}`
387-
window.history.pushState({}, '', updatedUrl)
388391
}
389392
} else {
390393
console.warn('Failed to save message', saveData)
@@ -393,7 +396,6 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
393396

394397
const debouncedSave = useCallback(
395398
debounce((...args: Parameters<typeof save>) => {
396-
console.log('saving...')
397399
save(
398400
...args
399401
)
@@ -653,7 +655,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
653655
let streamedMessages: Message[] = []
654656
let respondedMessages: Message[] = [
655657
...newMessages,
656-
{ content: '...', role: 'assistant' } as Message,
658+
{ content: 'Loading...', role: 'assistant' } as Message,
657659
]
658660
setMessages(respondedMessages)
659661

@@ -851,7 +853,6 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
851853
}
852854

853855
const reset = () => {
854-
window.history.pushState({}, '', '/')
855856
setMessages([])
856857
setCurrentMessage('')
857858
setIsLoading(false)
@@ -1132,7 +1133,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
11321133
/>
11331134
<Input
11341135
placeholder="Branch"
1135-
className="ml-4 w-fit"
1136+
className="ml-4 w-[500px]"
11361137
value={baseBranch}
11371138
onChange={(e) => setBaseBranch(e.target.value)}
11381139
/>
@@ -1218,7 +1219,6 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
12181219
setMessages(newMessages)
12191220
setIsCreatingPullRequest(false)
12201221
if (index == 0) {
1221-
window.history.pushState({}, '', '/')
12221222
setMessagesId('')
12231223
setOriginalSuggestedChanges([])
12241224
setSuggestedChanges([])
@@ -1800,6 +1800,8 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
18001800
e.target.style!.height = 'auto'
18011801
// @ts-ignore
18021802
e.target.style!.height = `42px`
1803+
e.stopPropagation()
1804+
e.preventDefault()
18031805
}
18041806
}}
18051807
onChange={(e) => {

0 commit comments

Comments
 (0)