artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 19:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix type bug on RepositoryRevPicker

Browse Source
This commit is contained in:
Jason Harris 2024-08-06 12:05:35 -05:00
parent 1cb58b8ada
commit addd98ba0d
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/web-sveltekit/src/lib/repo/RepositoryRevPicker.svelte
View File

@ -58,20 +58,23 @@
defaultBranch: string
display?: ComponentProps<ButtonGroup>['display']
placement?: Placement
isPerforceDepot?: boolean
onSelect?: (revision: string) => void
getRepositoryTags: (query: string) => PromiseLike<RepositoryTags>
getRepositoryCommits: (query: string) => PromiseLike<RepositoryCommits>
getRepositoryBranches: (query: string) => PromiseLike<RepositoryBranches>
getDepotChangelists: (query: string) => PromiseLike<DepotChangelists>
}
} & (
| {
getRepositoryTags: (query: string) => PromiseLike<RepositoryTags>
getRepositoryCommits: (query: string) => PromiseLike<RepositoryCommits>
getRepositoryBranches: (query: string) => PromiseLike<RepositoryBranches>
}
| {
getDepotChangelists: (query: string) => PromiseLike<DepotChangelists>
}
)
export let repoURL: $$Props['repoURL']
export let revision: $$Props['revision'] = undefined
export let commitID: $$Props['commitID'] = undefined
export let defaultBranch: $$Props['defaultBranch']
export let placement: $$Props['placement'] = 'right-start'
export let isPerforceDepot: $$Props['isPerforceDepot'] = false
export let display: $$Props['display'] = undefined
/**
* Optional handler for revision selection.
@ -80,10 +83,10 @@
export let onSelect = defaultHandleSelect
// Pickers data sources
export let getRepositoryTags: (query: string) => PromiseLike<RepositoryTags>
export let getRepositoryCommits: (query: string) => PromiseLike<RepositoryCommits>
export let getRepositoryBranches: (query: string) => PromiseLike<RepositoryBranches>
export let getDepotChangelists: (query: string) => PromiseLike<DepotChangelists>
export let getRepositoryTags: ((query: string) => PromiseLike<RepositoryTags>) | undefined = undefined
export let getRepositoryCommits: ((query: string) => PromiseLike<RepositoryCommits>) | undefined = undefined
export let getRepositoryBranches: ((query: string) => PromiseLike<RepositoryBranches>) | undefined = undefined
export let getDepotChangelists: ((query: string) => PromiseLike<DepotChangelists>) | undefined = undefined
function defaultHandleSelect(revision: string) {
goto(replaceRevisionInURL(location.pathname + location.search + location.hash, revision))
@ -130,7 +133,7 @@
<div slot="content" class="content" let:toggle>
<Tabs>
{#if !isPerforceDepot}
{#if getRepositoryCommits && getRepositoryTags && getRepositoryBranches}
<TabPanel title="Branches" shortcut={branchesHotkey}>
<Picker
name="branches"
@ -198,7 +201,7 @@
</RepositoryRevPickerItem>
</Picker>
</TabPanel>
{:else}
{:else if getDepotChangelists}
<TabPanel title="Changelists" shortcut={commitsHotkey}>
<Picker
name="changelists"

4
client/web-sveltekit/src/routes/[...repo=reporev]/(validrev)/-/changelists/[...path]/+page.svelte
View File

@ -70,10 +70,6 @@
commitID={data.resolvedRevision.commitID}
defaultBranch={data.defaultBranch}
placement="bottom-start"
isPerforceDepot={data.isPerforceDepot}
getRepositoryBranches={data.getRepoBranches}
getRepositoryCommits={data.getRepoCommits}
getRepositoryTags={data.getRepoTags}
getDepotChangelists={data.getDepotChangelists}
/>
</div>

5
client/web-sveltekit/src/routes/[...repo=reporev]/+layout.ts
View File

@ -124,10 +124,13 @@ export const load: LayoutLoad = async ({ params, url, depends }) => {
})
.then(
mapOrThrow(({ data, error }) => {
let nodes = data?.repository?.ancestorChangelists?.ancestors.nodes ?? []
if (error) {
throw new Error('Could not load depot changelists:', error)
}
return data?.repository?.ancestorChangelists
return { nodes }
})
)
}