Global search filter

This commit is contained in:
Eden Kirin
2024-01-28 10:35:01 +01:00
parent 858f42c39b
commit b1f7d8196a
7 changed files with 120 additions and 43 deletions

View File

@ -1,18 +1,21 @@
import React from "react"; import React from "react";
import { ThemeProvider } from "@mui/material";
import { theme } from "./theme"; import { theme } from "./theme";
import { Routes, Route } from "react-router-dom"; import { Routes, Route } from "react-router-dom";
import AppHeader from "./components/AppHeader"; import AppHeader from "./components/AppHeader";
import Home from "./routes/Home"; import Home from "./routes/Home";
import ThemeProvider from "@mui/material/styles/ThemeProvider";
import { GlobalStateProvider } from "./GlobalStateProvider";
function App() { function App() {
return ( return (
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<AppHeader /> <GlobalStateProvider>
<Routes> <AppHeader />
<Route path="/" element={<Home />} /> <Routes>
{/* <Route path="*" element={<NotFound404 />} /> */} <Route path="/" element={<Home />} />
</Routes> {/* <Route path="*" element={<NotFound404 />} /> */}
</Routes>
</GlobalStateProvider>
</ThemeProvider> </ThemeProvider>
); );
} }

View File

@ -0,0 +1,36 @@
import React, { Dispatch, SetStateAction, createContext, useContext, useState } from "react";
// how to: Typesafe Global State with TypeScript, React & React Context
// https://jamiehaywood.medium.com/typesafe-global-state-with-typescript-react-react-context-c2df743f3ce
interface GlobalState {
searchFilter: string;
}
const defaultGlobalState: GlobalState = {
searchFilter: "",
};
export const GlobalStateContext = createContext({
state: {} as Partial<GlobalState>,
setState: {} as Dispatch<SetStateAction<Partial<GlobalState>>>,
});
export const GlobalStateProvider = ({
children,
value = {} as GlobalState,
}: {
children: React.ReactNode;
value?: Partial<GlobalState>;
}) => {
const [state, setState] = useState(value);
return <GlobalStateContext.Provider value={{ state, setState }}>{children}</GlobalStateContext.Provider>;
};
export const useGlobalState = () => {
const context = useContext(GlobalStateContext);
if (!context) {
throw new Error("useGlobalState must be used within a GlobalStateContext");
}
return context;
};

View File

@ -1,17 +1,57 @@
import React from "react"; import React from "react";
import { Container, Typography } from "@mui/material";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import RadarIcon from "@mui/icons-material/Radar"; import RadarIcon from "@mui/icons-material/Radar";
import Container from "@mui/material/Container";
import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import InputAdornment from "@mui/material/InputAdornment";
import IconButton from "@mui/material/IconButton";
import CancelIcon from "@mui/icons-material/Cancel";
import { useGlobalState } from "../GlobalStateProvider";
export default function AppHeader() { export default function AppHeader() {
const [searchValue, setSearchValue] = React.useState("");
const { setState: setGlobalState } = useGlobalState();
const handleSearchInputChange = (event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) => {
const searchFilter = event.currentTarget.value;
setGlobalState({
searchFilter,
});
setSearchValue(event.currentTarget.value);
};
const handleClearSearchInputClick = () => {
setSearchValue("");
setGlobalState({
searchFilter: "",
});
};
return ( return (
<> <Container maxWidth={false} className="app-header">
<Container maxWidth={false} className="app-header"> <Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2}>
<Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2}> <RadarIcon fontSize="large" className="icon" />
<RadarIcon fontSize="large" className="icon" /> <Typography component="h1">pingator</Typography>
<Typography component="h1">pingator</Typography>
</Stack> <TextField
</Container> className="search-input"
</> type="text"
sx={{ backgroundColor: "white", marginLeft: "auto" }}
label="Search"
variant="filled"
onChange={handleSearchInputChange}
value={searchValue}
InputProps={{
endAdornment: (
<InputAdornment position="end">
<IconButton size="small" onClick={handleClearSearchInputClick}>
<CancelIcon />
</IconButton>
</InputAdornment>
),
}}
/>
</Stack>
</Container>
); );
} }

View File

@ -5,7 +5,6 @@ import Card from "@mui/material/Card";
import CardContent from "@mui/material/CardContent"; import CardContent from "@mui/material/CardContent";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import Tooltip from "@mui/material/Tooltip"; import Tooltip from "@mui/material/Tooltip";
import Chip from "@mui/material/Chip";
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import Link from "@mui/material/Link"; import Link from "@mui/material/Link";
import Avatar from "@mui/material/Avatar"; import Avatar from "@mui/material/Avatar";
@ -22,24 +21,6 @@ function normalizeServiceName(name: string): string {
.replace(/\b\w/g, (s) => s.toUpperCase()); .replace(/\b\w/g, (s) => s.toUpperCase());
} }
interface TenantsStatusTooltipProps {
tenantsStatus: StatusPerTenant;
}
function TenantsStatusTooltip({ tenantsStatus }: TenantsStatusTooltipProps) {
const statusItems = Object.entries(tenantsStatus).map(([key, value]) => {
console.log(`key: ${key}, value: ${value}`);
return null;
});
return (
<Box className="tenants-status-tooltip">
<Typography color="inherit">Tooltip with HTML</Typography>
<em>{"And here's"}</em> <b>{"some"}</b> <u>{"amazing content"}</u>. {"It's very engaging. Right?"}
</Box>
);
}
function getNodeNameElement(node: Node): React.ReactElement { function getNodeNameElement(node: Node): React.ReactElement {
let statusMessage; let statusMessage;
const statusOk = node.health_check_status?.status_ok; const statusOk = node.health_check_status?.status_ok;
@ -69,7 +50,11 @@ function TenantsStatus({ statusPerTenant }: TenantsStatusProps) {
for (const [tenantId, statusOk] of Object.entries(statusPerTenant)) { for (const [tenantId, statusOk] of Object.entries(statusPerTenant)) {
statuses.push( statuses.push(
<Typography component="div" className={`tenant-status ${statusOk ? "status-ok" : "status-error"}`}> <Typography
key={tenantId}
component="div"
className={`tenant-status ${statusOk ? "status-ok" : "status-error"}`}
>
{tenantId} {tenantId}
</Typography> </Typography>
); );

View File

@ -2,19 +2,27 @@ import React from "react";
import { Service } from "../../types"; import { Service } from "../../types";
import Grid from "@mui/material/Unstable_Grid2"; import Grid from "@mui/material/Unstable_Grid2";
import ServiceCard from "./ServiceCard"; import ServiceCard from "./ServiceCard";
import { useGlobalState } from "../../GlobalStateProvider";
interface ServiceListProps { interface ServiceListProps {
services: Service[]; services: Service[];
} }
export default function ServiceList({ services }: ServiceListProps) { export default function ServiceList({ services }: ServiceListProps) {
const serviceItems = services.map((service) => { const { state } = useGlobalState();
return (
<Grid key={service.name} sx={{ display: "flex" }}> const serviceItems = services
<ServiceCard service={service} /> .filter(
</Grid> (service) =>
); !state.searchFilter || service.name.toLocaleLowerCase().includes(state.searchFilter.toLocaleLowerCase())
}); )
.map((service) => {
return (
<Grid key={service.name} sx={{ display: "flex" }}>
<ServiceCard service={service} />
</Grid>
);
});
return ( return (
<Grid container rowSpacing={2} columnSpacing={2} className="service-list" sx={{ marginBottom: "1rem" }}> <Grid container rowSpacing={2} columnSpacing={2} className="service-list" sx={{ marginBottom: "1rem" }}>

View File

@ -20,4 +20,9 @@
} }
} }
} }
.search-input {
background-color: whitesmoke;
margin-left: auto;
}
} }

View File

@ -1,4 +1,4 @@
import { createTheme } from "@mui/material"; import createTheme from "@mui/material/styles/createTheme";
const PRIMARY_COLOR = "#0d6efd"; const PRIMARY_COLOR = "#0d6efd";
const SECONDARY_COLOR = "#6c757d"; const SECONDARY_COLOR = "#6c757d";