PRfD - List Pull Requests UI #8171
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ import RepositoryCommitsPage from "./repositories/repository/commits"; | |
| import RepositoryCommitPage from "./repositories/repository/commits/commit"; | ||
| import RepositoryBranchesPage from "./repositories/repository/branches"; | ||
| import RepositoryTagsPage from "./repositories/repository/tags"; | ||
| import RepositoryPullsPage from "./repositories/repository/pulls/pulls"; | ||
| import RepositoryComparePage from "./repositories/repository/compare"; | ||
| import RepositoryActionsPage from "./repositories/repository/actions"; | ||
| import RepositoryGeneralSettingsPage from "./repositories/repository/settings/general"; | ||
|
|
@@ -62,6 +63,7 @@ export const IndexPage = () => { | |
| </Route> | ||
| <Route path="branches" element={<RepositoryBranchesPage/>}/> | ||
| <Route path="tags" element={<RepositoryTagsPage/>}/> | ||
| <Route path="pulls" element={<RepositoryPullsPage/>}/> | ||
| <Route path="compare/*" element={<RepositoryComparePage/>}/> | ||
| <Route path="actions"> | ||
| <Route index element={<RepositoryActionsPage/>}/> | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ const CommitWidget = ({ repo, commit }) => { | |
| return ( | ||
| <ListGroup.Item> | ||
| <div className="clearfix"> | ||
| <div className="float-start w-100"> | ||
| <h6> | ||
| <Link href={{ | ||
| pathname: '/repositories/:repoId/commits/:commitId', | ||
|
|
||
|
There was a problem hiding this comment. This is based on the |
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,159 @@ | ||||||
| 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 TimeAgo from "react-timeago"; | ||||||
|
|
||||||
| 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}) => { | ||||||
| const authorLink = | ||||||
| <Link href={{ | ||||||
| // TODO: to where this link should lead? | ||||||
|
There was a problem hiding this comment. Should lead to the user page in lakeFS IMO |
||||||
| pathname: '/repositories/:repoId/user/:userId', | ||||||
| params: {repoId: repo.id, userId: pull.author} | ||||||
| }}> | ||||||
| {pull.author} | ||||||
| </Link>; | ||||||
| return ( | ||||||
| <ListGroup.Item className="pull-row"> | ||||||
|
There was a problem hiding this comment. Look at the example of commits tab, it should look the same IMO. |
||||||
| <div className="clearfix"> | ||||||
| <div className="float-start pt-1 pb-2"> | ||||||
| <Link className="pull-title fs-4" | ||||||
| href={{ | ||||||
| pathname: '/repositories/:repoId/pulls/:pullId', | ||||||
| params: {repoId: repo.id, pullId: pull.id}, | ||||||
| }} | ||||||
| > | ||||||
| {pull.title} | ||||||
| </Link> | ||||||
| <div className="pull-info mt-1"> | ||||||
| Opened <TimeAgo date={new Date(pull.created_at * 1000)}/> ago by {authorLink} | ||||||
| </div> | ||||||
| </div> | ||||||
| <div className="pull-branches mt-3 float-end"> | ||||||
| <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> | ||||||
| </div> | ||||||
| </ListGroup.Item> | ||||||
| ); | ||||||
| }; | ||||||
|
|
||||||
| // TODO: is there a nicer place for this? | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,7 @@ const TagWidget = ({ repo, tag, onDelete }) => { | |
| return ( | ||
| <ListGroup.Item> | ||
| <div className="clearfix"> | ||
| <div className="float-start w-100"> | ||
| <h6> | ||
| <Link href={{ | ||
| pathname: '/repositories/:repoId/objects', | ||
|
|
||
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.
Helpful for UI dev.
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.
We have
npm run devwhich achieves the same result