-
Notifications
You must be signed in to change notification settings - Fork 351
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PRfD - List Pull Requests UI (#8171)
* Add UI for List Pull Requests * Add watch build command * Update toolbar UI * Fix PR comments * Hide feature
- Loading branch information
Showing
10 changed files
with
226 additions
and
12 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
149 changes: 149 additions & 0 deletions
149
webui/src/pages/repositories/repository/pulls/pulls.jsx
This file contains 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,149 @@ | ||
| import React, {useEffect, useState} from "react"; | ||
| import {useOutletContext} from "react-router-dom"; | ||
| import Card from "react-bootstrap/Card"; | ||
| import ListGroup from "react-bootstrap/ListGroup"; | ||
| import Alert from "react-bootstrap/Alert"; | ||
| import {Tab, Tabs} from "react-bootstrap"; | ||
| import Button from "react-bootstrap/Button"; | ||
| import dayjs from "dayjs"; | ||
|
|
||
| import {ActionGroup, AlertError, Loading, PrefixSearchWidget, RefreshButton} from "../../../../lib/components/controls"; | ||
| import {pulls} from "../../../../lib/api"; | ||
| import {useRefs} from "../../../../lib/hooks/repo"; | ||
| import {useAPIWithPagination} from "../../../../lib/hooks/api"; | ||
| import {Paginator} from "../../../../lib/components/pagination"; | ||
| import {useRouter} from "../../../../lib/hooks/router"; | ||
| import {RepoError} from "../error"; | ||
| import {Link} from "../../../../lib/components/nav"; | ||
|
|
||
|
|
||
| const PullWidget = ({repo, pull}) => { | ||
| return ( | ||
| <ListGroup.Item className="pull-row pt-3 pb-3 clearfix"> | ||
| <div className="float-start"> | ||
| <h6> | ||
| <Link href={{ | ||
| pathname: '/repositories/:repoId/pulls/:pullId', | ||
| params: {repoId: repo.id, pullId: pull.id} | ||
| }}> | ||
| <span>{pull.title}</span> | ||
| </Link> | ||
| </h6> | ||
| <small> | ||
| Opened {dayjs.unix(pull.created_at).fromNow()} by <strong>{pull.author}</strong> | ||
| </small> | ||
| </div> | ||
| <div className="float-end mt-2"> | ||
| <Button variant="secondary" size="sm" disabled={true}>{pull.source_branch}</Button> | ||
| <span className="m-2">⇨</span> | ||
| <Button variant="secondary" size="sm" disabled={true}>{pull.destination_branch}</Button> | ||
| </div> | ||
| </ListGroup.Item> | ||
| ); | ||
| }; | ||
|
|
||
| // TODO (gilo): is there a nicer place for this? | ||
| const PullStatus = { | ||
| open: "open", | ||
| closed: "closed", | ||
| merged: "merged", | ||
| } | ||
|
|
||
| const PullsList = ({repo, after, prefix, onPaginate}) => { | ||
| const router = useRouter() | ||
| const [refresh, setRefresh] = useState(true); | ||
| // TODO: pullState should be persistent in the url and saved as a url param? | ||
| const [pullsState, setPullsState] = useState(PullStatus.open); | ||
| const {results, error, loading, nextPage} = useAPIWithPagination(async () => { | ||
| return pulls.list(repo.id, pullsState, prefix, after); | ||
| }, [repo.id, pullsState, prefix, refresh, after]); | ||
|
|
||
| const doRefresh = () => setRefresh(true); | ||
|
|
||
| let content; | ||
|
|
||
| if (loading) content = <Loading/>; | ||
| else if (error) content = <AlertError error={error}/>; | ||
| else content = (results && !!results.length ? | ||
| <> | ||
| <Card> | ||
| <ListGroup variant="flush"> | ||
| {results.map(pull => ( | ||
| <PullWidget key={pull.id} repo={repo} pull={pull}/> | ||
| ))} | ||
| </ListGroup> | ||
| </Card> | ||
| <Paginator onPaginate={onPaginate} nextPage={nextPage} after={after}/> | ||
| </> : <Alert variant="info">There aren't any pull requests yet.</Alert> | ||
| ) | ||
|
|
||
| return ( | ||
| <div className="mb-5"> | ||
| <div className="position-relative clearfix"> | ||
| <div className=""> | ||
| <Tabs | ||
| defaultActiveKey={pullsState} | ||
| id="pulls-tabs" | ||
| onSelect={key => setPullsState(key)} | ||
| className="mb-3 pt-2" | ||
| > | ||
| <Tab eventKey={PullStatus.open} title="Open"/> | ||
| <Tab eventKey={PullStatus.closed} title="Closed"/> | ||
| </Tabs> | ||
| </div> | ||
| <ActionGroup orientation="right" className="position-absolute top-0 end-0 pb-2"> | ||
| <PrefixSearchWidget | ||
| defaultValue={router.query.prefix} | ||
| text="Find Pull Request" | ||
| onFilter={prefix => router.push({ | ||
| pathname: '/repositories/:repoId/pulls', | ||
| params: {repoId: repo.id}, | ||
| query: {prefix} | ||
| })}/> | ||
|
|
||
| <RefreshButton onClick={doRefresh}/> | ||
| <Button variant="success">Create Pull Request</Button> | ||
| </ActionGroup> | ||
| </div> | ||
| {content} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
|
|
||
| const PullsContainer = () => { | ||
| const router = useRouter() | ||
| const {repo, loading, error} = useRefs(); | ||
| const {after} = router.query; | ||
| const routerPfx = router.query.prefix || ""; | ||
|
|
||
| if (loading) return <Loading/>; | ||
| if (error) return <RepoError error={error}/>; | ||
|
|
||
| return ( | ||
| <PullsList | ||
| repo={repo} | ||
| after={after || ""} | ||
| prefix={routerPfx} | ||
| onPaginate={after => { | ||
| const query = {after}; | ||
| if (router.query.prefix) { | ||
| query.prefix = router.query.prefix; | ||
| } | ||
| router.push({ | ||
| pathname: '/repositories/:repoId/pulls', | ||
| params: {repoId: repo.id}, | ||
| query | ||
| }); | ||
| }}/> | ||
| ); | ||
| }; | ||
|
|
||
|
|
||
| const RepositoryPullsPage = () => { | ||
| const [setActivePage] = useOutletContext(); | ||
| useEffect(() => setActivePage("pulls"), [setActivePage]); | ||
| return <PullsContainer/>; | ||
| } | ||
|
|
||
| export default RepositoryPullsPage; |
This file contains 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
This file contains 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