-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2dcaf85
commit 2e4eb5e
Showing
9 changed files
with
151 additions
and
8 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "cSpell.words": [ | ||
| "mergable", | ||
| "mergeable" | ||
| ] | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import React from "react"; | ||
| import { useOnScreen } from "../hooks/useOnScreen"; | ||
| import { ConfigContext } from "../App"; | ||
| import { Tooltip, Typography } from "@mui/material"; | ||
| import { Block, CallMerge } from "@mui/icons-material"; | ||
|
|
||
| export type PullRequestMergeCheckProps = { | ||
| owner: string; | ||
| repo: string; | ||
| prNumber: number; | ||
| }; | ||
|
|
||
| export const PullRequestMergeCheck: React.FC<PullRequestMergeCheckProps> = ({ | ||
| owner, | ||
| repo, | ||
| prNumber, | ||
| }) => { | ||
| const elementRef = React.useRef<HTMLDivElement>(null); | ||
| const isIntersecting = useOnScreen(elementRef, "100px", true); | ||
| const [canBeMerged, setCanBeMerged] = React.useState<{ | ||
| mergeable: boolean; | ||
| mergeableState: string; | ||
| }>({ mergeable: false, mergeableState: "" }); | ||
| const { octokit } = React.useContext(ConfigContext); | ||
|
|
||
| React.useEffect(() => { | ||
| if (octokit && isIntersecting) { | ||
| octokit?.hasMergeConflict(owner, repo, prNumber).then((response) => { | ||
| setCanBeMerged({ | ||
| mergeable: response.mergeable ?? false, | ||
| mergeableState: response.mergeable_state, | ||
| }); | ||
| }); | ||
| } | ||
| }, [isIntersecting, octokit, owner, repo, prNumber]); | ||
|
|
||
| return ( | ||
| <Typography | ||
| ref={elementRef} | ||
| color="text.secondary" | ||
| sx={{ display: "flex", gap: 1, alignItems: "center" }} | ||
| > | ||
| Mergeable: | ||
| <Tooltip | ||
| title={ | ||
| canBeMerged.mergeableState === "clean" | ||
| ? "Can be merged" | ||
| : "Merging blocked" | ||
| } | ||
| > | ||
| {canBeMerged.mergeableState === "" ? ( | ||
| <></> | ||
| ) : canBeMerged.mergeable && | ||
| canBeMerged.mergeableState === "clean" ? ( | ||
| <CallMerge color="success" /> | ||
| ) : ( | ||
| <Block color="error" /> | ||
| )} | ||
| </Tooltip> | ||
| </Typography> | ||
| ); | ||
| }; |
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 |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import { useEffect, useState, useRef, RefObject } from 'react'; | ||
|
|
||
| export const useOnScreen = (ref: RefObject<Element>, rootMargin = '0px', once: boolean = true) => { | ||
| const observer = useRef<IntersectionObserver | null>(null); | ||
| const [isIntersecting, setIntersecting] = useState(false); | ||
|
|
||
| useEffect(() => { | ||
| observer.current = new IntersectionObserver( | ||
| ([entry]) => { | ||
| setIntersecting(entry.isIntersecting); | ||
| if (once && entry.isIntersecting) { | ||
| observer.current?.unobserve(entry.target); | ||
| } | ||
| }, | ||
| { | ||
| rootMargin, | ||
| } | ||
| ); | ||
| }, [rootMargin, once]); | ||
|
|
||
| useEffect(() => { | ||
| if (ref.current) { | ||
| observer.current?.observe(ref.current); | ||
| } | ||
|
|
||
| return () => { | ||
| observer.current?.disconnect(); | ||
| }; | ||
| }, [ref]); | ||
|
|
||
| return isIntersecting; | ||
| } |
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