-
Notifications
You must be signed in to change notification settings - Fork 773
feat/simplify-forge-form-messaging #12266
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+164
−182
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5c28581
feat(ui): simplify forge form account messaging and CTA
PavelLaptev 0259d68
feat(ui): consolidate forge options and extract account config
PavelLaptev ff76519
fix(ui): change ForgeForm account message to prompt connect
PavelLaptev 7c52d36
feat(forge): add Forge account config UI and simplify prompts
PavelLaptev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| <script lang="ts" generics="TAccount"> | ||
| import { useSettingsModal } from '$lib/settings/settingsModal.svelte'; | ||
| import { Button, CardGroup, Link, Select, SelectItem } from '@gitbutler/ui'; | ||
| import type { Component } from 'svelte'; | ||
|
|
||
| type Props = { | ||
| projectId: string; | ||
| displayName: string; | ||
| accounts: TAccount[]; | ||
| preferredAccount: TAccount | undefined; | ||
| accountToString: (account: TAccount) => string; | ||
| stringToAccount: (value: string) => TAccount | null; | ||
| getUsername: (account: TAccount) => string; | ||
| updatePreferredAccount: (projectId: string, account: TAccount) => void; | ||
| AccountBadge: Component<{ account: TAccount; class?: string }>; | ||
| docsUrl: string; | ||
| requestType: 'pull request' | 'merge request'; | ||
| }; | ||
|
|
||
| const { | ||
| projectId, | ||
| displayName, | ||
| accounts, | ||
| preferredAccount, | ||
| accountToString, | ||
| stringToAccount, | ||
| getUsername, | ||
| updatePreferredAccount, | ||
| AccountBadge, | ||
| docsUrl, | ||
| requestType | ||
| }: Props = $props(); | ||
|
|
||
| const { openGeneralSettings } = useSettingsModal(); | ||
| const hasAccounts = $derived(accounts.length > 0 && preferredAccount); | ||
|
|
||
| function handleAccountChange(value: string) { | ||
| const parsedAccount = stringToAccount(value); | ||
| if (!parsedAccount) return; | ||
| updatePreferredAccount(projectId, parsedAccount); | ||
| } | ||
| </script> | ||
|
|
||
| <CardGroup.Item> | ||
| {#snippet title()} | ||
| {#if hasAccounts} | ||
| Configure {displayName} integration | ||
| {:else} | ||
| Connect your {displayName} account | ||
| {/if} | ||
| {/snippet} | ||
|
|
||
| {#snippet caption()} | ||
| Enable {requestType} creation. Read more in the <Link href={docsUrl}>docs</Link> | ||
| {/snippet} | ||
|
|
||
| {#if !hasAccounts} | ||
| <div class="flex"> | ||
| <Button onclick={() => openGeneralSettings('integrations')} style="pop" icon="link" | ||
| >Set up in General Settings</Button | ||
| > | ||
| </div> | ||
| {:else} | ||
| {@const account = preferredAccount!} | ||
| {@const accountStr = accountToString(account)} | ||
| <Select | ||
| label="{displayName} account for this project" | ||
PavelLaptev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| value={accountStr} | ||
| options={accounts.map((acc) => ({ | ||
| label: getUsername(acc), | ||
| value: accountToString(acc) | ||
| }))} | ||
| onselect={handleAccountChange} | ||
| disabled={accounts.length <= 1} | ||
| wide | ||
| > | ||
| {#snippet itemSnippet({ item, highlighted })} | ||
| {@const itemAccount = item.value && stringToAccount(item.value)} | ||
| <SelectItem selected={item.value === accountStr} {highlighted}> | ||
| {item.label} | ||
|
|
||
| {#if itemAccount} | ||
| <AccountBadge account={itemAccount} class="m-l-4" /> | ||
| {/if} | ||
| </SelectItem> | ||
| {/snippet} | ||
| </Select> | ||
| {/if} | ||
| </CardGroup.Item> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hasAccountsis derived fromaccounts.length > 0 && preferredAccount, which makes its type/valueTAccount | false | undefinedrather than a boolean. This works in{#if}but is harder to reason about and can confuse TS narrowing; consider deriving a boolean explicitly (e.g.,accounts.length > 0 && preferredAccount !== undefined).