-
Notifications
You must be signed in to change notification settings - Fork 506
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/theme-customisation
* develop: add badge to UserMenu when update is available migrate all links to WIKI_LINKS add UpdateChecker default signInOptions to google if signInOptions doc is missing fix TableSettings multiSelects TextEditor: fix values not saving in react 17 (thanks @oliviertassinari ) mui/material-ui#25560 (comment) facebook/react#17925 expose dataset location option for BQ spark
- Loading branch information
Showing
16 changed files
with
221 additions
and
45 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| import { useState, useEffect } from "react"; | ||
| import createPersistedState from "use-persisted-state"; | ||
| import { differenceInDays } from "date-fns"; | ||
|
|
||
| import { | ||
| makeStyles, | ||
| createStyles,}from'@material-ui/styles' | ||
| import { | ||
| MenuItem, | ||
| ListItemText, | ||
| ListItemSecondaryAction, | ||
| Link, | ||
| } from "@material-ui/core"; | ||
| import OpenInNewIcon from "@material-ui/icons/OpenInNew"; | ||
|
|
||
| import meta from "../../../package.json"; | ||
| import WIKI_LINKS from "constants/wikiLinks"; | ||
|
|
||
| const useLastCheckedUpdateState = createPersistedState( | ||
| "_FT_LAST_CHECKED_UPDATE" | ||
| ); | ||
| export const useLatestUpdateState = createPersistedState("_FT_LATEST_UPDATE"); | ||
|
|
||
| const useStyles = makeStyles((theme) => | ||
| createStyles({ | ||
| secondaryAction: { pointerEvents: "none" }, | ||
| secondaryIcon: { | ||
| display: "block", | ||
| color: theme.palette.action.active, | ||
| }, | ||
|
|
||
| version: { | ||
| display: "block", | ||
| padding: theme.spacing(1, 2), | ||
| userSelect: "none", | ||
| color: theme.palette.text.disabled, | ||
| }, | ||
| }) | ||
| ); | ||
|
|
||
| export default function UpdateChecker() { | ||
| const classes = useStyles(); | ||
|
|
||
| const [ | ||
| lastCheckedUpdate, | ||
| setLastCheckedUpdate, | ||
| ] = useLastCheckedUpdateState<string>(); | ||
| const [latestUpdate, setLatestUpdate] = useLatestUpdateState<null | Record< | ||
| string, | ||
| any | ||
| >>(null); | ||
|
|
||
| const [checkState, setCheckState] = useState<null | "LOADING" | "NO_UPDATE">( | ||
| null | ||
| ); | ||
|
|
||
| const checkForUpdate = async () => { | ||
| setCheckState("LOADING"); | ||
|
|
||
| // https://docs.github.com/en/rest/reference/repos#get-the-latest-release | ||
| const endpoint = meta.repository.url | ||
| .replace("github.com", "api.github.com/repos") | ||
| .replace(/.git$/, "/releases/latest"); | ||
| try { | ||
| const res = await fetch(endpoint, { | ||
| headers: { | ||
| Accept: "application/vnd.github.v3+json", | ||
| }, | ||
| }); | ||
| const json = await res.json(); | ||
|
|
||
| if (json.tag_name > "v" + meta.version) { | ||
| setLatestUpdate(json); | ||
| setCheckState(null); | ||
| } else { | ||
| setCheckState("NO_UPDATE"); | ||
| } | ||
|
|
||
| setLastCheckedUpdate(new Date().toISOString()); | ||
| } catch (e) { | ||
| console.error(e); | ||
| setLatestUpdate(null); | ||
| setCheckState("NO_UPDATE"); | ||
| } | ||
| }; | ||
|
|
||
| // Check for new updates on page load, if last check was more than 7 days ago | ||
| useEffect(() => { | ||
| if (!lastCheckedUpdate) checkForUpdate(); | ||
| else if (differenceInDays(new Date(), new Date(lastCheckedUpdate)) > 7) | ||
| checkForUpdate(); | ||
| }, [lastCheckedUpdate]); | ||
|
|
||
| // Verify latest update is not installed yet | ||
| useEffect(() => { | ||
| if (latestUpdate?.tag_name <= "v" + meta.version) setLatestUpdate(null); | ||
| }, [latestUpdate, setLatestUpdate]); | ||
|
|
||
| return ( | ||
| <> | ||
| {checkState === "LOADING" ? ( | ||
| <MenuItem disabled>Checking for updates…</MenuItem> | ||
| ) : checkState === "NO_UPDATE" ? ( | ||
| <MenuItem disabled>No updates available</MenuItem> | ||
| ) : latestUpdate === null ? ( | ||
| <MenuItem onClick={checkForUpdate}>Check for updates</MenuItem> | ||
| ) : ( | ||
| <> | ||
| <MenuItem | ||
| component="a" | ||
| href={latestUpdate?.html_url} | ||
| target="_blank" | ||
| rel="noopener" | ||
| > | ||
| <ListItemText | ||
| primary="Update available" | ||
| secondary={latestUpdate?.tag_name} | ||
| /> | ||
| <ListItemSecondaryAction className={classes.secondaryAction}> | ||
| <OpenInNewIcon className={classes.secondaryIcon} /> | ||
| </ListItemSecondaryAction> | ||
| </MenuItem> | ||
|
|
||
| <MenuItem | ||
| component="a" | ||
| href={WIKI_LINKS.updatingFiretable} | ||
| target="_blank" | ||
| rel="noopener" | ||
| > | ||
| <ListItemText secondary="How to update Firetable" /> | ||
| <ListItemSecondaryAction className={classes.secondaryAction}> | ||
| <OpenInNewIcon | ||
| color="secondary" | ||
| fontSize="small" | ||
| className={classes.secondaryIcon} | ||
| /> | ||
| </ListItemSecondaryAction> | ||
| </MenuItem> | ||
| </> | ||
| )} | ||
|
|
||
| <Link | ||
| variant="caption" | ||
| component="a" | ||
| href={meta.repository.url.replace(".git", "") + "/releases"} | ||
| target="_blank" | ||
| rel="noopener" | ||
| className={classes.version} | ||
| > | ||
| {meta.name} v{meta.version} | ||
| </Link> | ||
| </> | ||
| ); | ||
| } |
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
Oops, something went wrong.