Fix: HTTPS monitors show HTTP on the table #1626 #1630
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,29 @@ | ||
| import { Box } from "@mui/material"; | ||
| import PropTypes from "prop-types"; | ||
| import { useTheme } from "@emotion/react"; | ||
| const CircularCount = ({ count }) => { | ||
| const theme = useTheme(); | ||
| return ( | ||
| <Box | ||
| component="span" | ||
| color={theme.palette.tertiary.contrastText} | ||
| border={2} | ||
| borderColor={theme.palette.accent.main} | ||
| backgroundColor={theme.palette.tertiary.main} | ||
| sx={{ | ||
| padding: ".25em .75em", | ||
| borderRadius: "50%", | ||
| fontSize: "12px", | ||
| fontWeight: 500, | ||
| }} | ||
| > | ||
| {count} | ||
| </Box> | ||
| ); | ||
| }; | ||
|
|
||
| CircularCount.propTypes = { | ||
| count: PropTypes.number, | ||
| }; | ||
|
|
||
| export default CircularCount; | ||
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
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,46 @@ | ||
| import { CircularProgress, Box } from "@mui/material"; | ||
| import { useTheme } from "@emotion/react"; | ||
| import PropTypes from "prop-types"; | ||
| const LoadingSpinner = ({ shouldRender }) => { | ||
| const theme = useTheme(); | ||
| if (shouldRender === false) { | ||
| return; | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <Box | ||
| width="100%" | ||
| height="100%" | ||
| position="absolute" | ||
| sx={{ | ||
| backgroundColor: theme.palette.primary.main, | ||
| opacity: 0.8, | ||
| zIndex: 100, | ||
| }} | ||
| /> | ||
| <Box | ||
| height="100%" | ||
| position="absolute" | ||
| top="50%" | ||
| left="50%" | ||
| sx={{ | ||
| transform: "translateX(-50%)", | ||
| zIndex: 101, | ||
| }} | ||
| > | ||
| <CircularProgress | ||
| sx={{ | ||
| color: theme.palette.accent.main, | ||
| }} | ||
| /> | ||
| </Box> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| LoadingSpinner.propTypes = { | ||
| shouldRender: PropTypes.bool, | ||
| }; | ||
|
|
||
| export default LoadingSpinner; |
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,43 @@ | ||
| import { useState } from "react"; | ||
| import Search from "../../../../../Components/Inputs/Search"; | ||
| import { Box } from "@mui/material"; | ||
| import useDebounce from "../../Hooks/useDebounce"; | ||
| import { useEffect } from "react"; | ||
| import PropTypes from "prop-types"; | ||
|
|
||
| const SearchComponent = ({ monitors, onSearchChange, setIsSearching }) => { | ||
| const [localSearch, setLocalSearch] = useState(""); | ||
| const debouncedSearch = useDebounce(localSearch, 500); | ||
| useEffect(() => { | ||
| onSearchChange(debouncedSearch); | ||
| setIsSearching(false); | ||
| }, [debouncedSearch, onSearchChange, setIsSearching]); | ||
|
|
||
| const handleSearch = (value) => { | ||
| setLocalSearch(value); | ||
| setIsSearching(true); | ||
| }; | ||
|
|
||
| return ( | ||
| <Box | ||
| width="25%" | ||
| minWidth={150} | ||
| ml="auto" | ||
| > | ||
| <Search | ||
| options={monitors} | ||
| filteredBy="name" | ||
| inputValue={localSearch} | ||
| handleInputChange={handleSearch} | ||
| /> | ||
| </Box> | ||
| ); | ||
| }; | ||
|
|
||
| SearchComponent.propTypes = { | ||
| monitors: PropTypes.array, | ||
| onSearchChange: PropTypes.func, | ||
| setIsSearching: PropTypes.func, | ||
| }; | ||
|
|
||
| export default SearchComponent; |
File renamed without changes.
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,36 @@ | ||||||||||||||||||||||||
| import PropTypes from "prop-types"; | ||||||||||||||||||||||||
| import { Stack } from "@mui/material"; | ||||||||||||||||||||||||
| import StatusBox from "./statusBox"; | ||||||||||||||||||||||||
| import { useTheme } from "@emotion/react"; | ||||||||||||||||||||||||
| import SkeletonLayout from "./skeleton"; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| const StatusBoxes = ({ shouldRender, monitorsSummary }) => { | ||||||||||||||||||||||||
| const theme = useTheme(); | ||||||||||||||||||||||||
| if (!shouldRender) return <SkeletonLayout shouldRender={shouldRender} />; | ||||||||||||||||||||||||
| return ( | ||||||||||||||||||||||||
| <Stack | ||||||||||||||||||||||||
| gap={theme.spacing(8)} | ||||||||||||||||||||||||
| direction="row" | ||||||||||||||||||||||||
| justifyContent="space-between" | ||||||||||||||||||||||||
| > | ||||||||||||||||||||||||
| <StatusBox | ||||||||||||||||||||||||
| title="up" | ||||||||||||||||||||||||
| value={monitorsSummary?.upMonitors ?? 0} | ||||||||||||||||||||||||
| /> | ||||||||||||||||||||||||
| <StatusBox | ||||||||||||||||||||||||
| title="down" | ||||||||||||||||||||||||
| value={monitorsSummary?.downMonitors ?? 0} | ||||||||||||||||||||||||
| /> | ||||||||||||||||||||||||
| <StatusBox | ||||||||||||||||||||||||
| title="paused" | ||||||||||||||||||||||||
| value={monitorsSummary?.pausedMonitors ?? 0} | ||||||||||||||||||||||||
| /> | ||||||||||||||||||||||||
| </Stack> | ||||||||||||||||||||||||
| ); | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| StatusBoxes.propTypes = { | ||||||||||||||||||||||||
| monitorsSummary: PropTypes.object.isRequired, | ||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||
|
Comment on lines
+32
to
+34
There was a problem hiding this comment. Eh, the PropTypes are looking a bit thin there, bud! The component's missing PropTypes validation for the Here's how to beef it up: StatusBoxes.propTypes = {
+ shouldRender: PropTypes.bool.isRequired,
- monitorsSummary: PropTypes.object.isRequired,
+ monitorsSummary: PropTypes.shape({
+ upMonitors: PropTypes.number,
+ downMonitors: PropTypes.number,
+ pausedMonitors: PropTypes.number
+ }).isRequired,
};📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| export default StatusBoxes; | ||||||||||||||||||||||||
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,31 @@ | ||
| import { Skeleton, Stack } from "@mui/material"; | ||
| import { useTheme } from "@emotion/react"; | ||
|
|
||
| const SkeletonLayout = () => { | ||
| const theme = useTheme(); | ||
| return ( | ||
| <Stack | ||
| gap={theme.spacing(12)} | ||
| direction="row" | ||
| justifyContent="space-between" | ||
| > | ||
| <Skeleton | ||
| variant="rounded" | ||
| width="100%" | ||
| height={100} | ||
| /> | ||
| <Skeleton | ||
| variant="rounded" | ||
| width="100%" | ||
| height={100} | ||
| /> | ||
| <Skeleton | ||
| variant="rounded" | ||
| width="100%" | ||
| height={100} | ||
| /> | ||
| </Stack> | ||
| ); | ||
| }; | ||
|
|
||
| export default SkeletonLayout; |
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.
🛠️ Refactor suggestion
Yo, the PropTypes validation needs to be stronger, eh!
The
countprop should be marked as required since it's essential for the component to function properly.Here's how to fix it, buddy:
CircularCount.propTypes = { - count: PropTypes.number, + count: PropTypes.number.isRequired, };📝 Committable suggestion