Skip to content
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.

Sign up for GitHub

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

#652 select the default branch as source #805

Merged
merged 3 commits into from
Oct 14, 2020
Merged

#652 select the default branch as source #805

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6cb14c
set source branch to default_branch
fumblehool Oct 12, 2020
aa03a06
Replaced masterBranch with defaultBranch to maintain terminology
fumblehool Oct 13, 2020
3668eb4
linter fix for BranchesPage
fumblehool Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions webui/src/components/BranchesPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@ const CreateBranchButton = connect(
({ createBranch, resetBranch })
)(({ repo, status, createBranch, resetBranch }) => {
const [show, setShow] = useState(false);
const [selectedBranch, setSelectedBranch] = useState(null);
const defaultBranch = { id: repo.default_branch, type: "branch"};
const [selectedBranch, setSelectedBranch] = useState(defaultBranch);
const textRef = useRef(null);

const disabled = (status.inProgress);

const onHide = () => {
if (disabled) return;
setShow(false);
setSelectedBranch(null);
setSelectedBranch(defaultBranch);
};

const onSubmit = () => {
Expand All @@ -45,7 +46,7 @@ const CreateBranchButton = connect(
useEffect(() => {
if (status.done) {
setShow(false);
setSelectedBranch(null);
setSelectedBranch(defaultBranch);
resetBranch();
}
}, [resetBranch, status.done]);
fumblehool marked this conversation as resolved.
Show resolved Hide resolved
Expand Down