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

Jump to bottom

Add ability to filter by package and status. #100

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ability to filter by package and status. #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
144 changes: 117 additions & 27 deletions packages/web/src/layouts/AdrBrowserLayout/AdrBrowserLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import React from "react";
import {
AppBar,
// Divider,
Drawer,
List,
// ListItem,
// ListItemIcon,
// ListItemText,
Toolbar,
Link as MuiLink,
Typography,
Expand All @@ -16,20 +12,19 @@ import {
Grow,
Fade,
Hidden,
IconButton
IconButton,
} from "@material-ui/core";
import Select from '@material-ui/core/Select';
import InputLabel from '@material-ui/core/InputLabel';
import MenuItem from '@material-ui/core/MenuItem';
import { Menu as MenuIcon, Close as CloseIcon } from "@material-ui/icons";
import { createStyles, makeStyles } from "@material-ui/core/styles";
// import {
// ChevronRight as ChevronRightIcon,
// PlaylistAddCheck as PlaylistAddCheckIcon
// } from "@material-ui/icons";
import Link from "next/link";
import { useRouter } from "next/router";
import clsx from "clsx";
import { AdrMenu } from "./components/AdrMenu";
import { AdrMenu, ConnectedSearchBox } from "./components";
import { CustomTheme } from "../../mui";
import { ConnectedSearchBox } from "./components/ConnectedSearchBox/ConnectedSearchBox";

import { AdrLight } from "../../types";
import { AdrNav, AdrNavContext } from "../../contexts";
import { RoutingProgress } from "./components/RoutingProgress";
Expand Down Expand Up @@ -160,6 +155,23 @@ const useStyles = makeStyles((theme: CustomTheme) => {
},
paddingBottom: theme.spacing(0.5),
paddingRight: theme.spacing(3)
},
adlPackageSelect: {
display: "flex",
justifyContent: "left",
paddingLeft: theme.spacing(2),
[theme.breakpoints.up("sm")]: {
paddingLeft: theme.spacing(3)
},
paddingBottom: theme.spacing(0.5),
paddingRight: theme.spacing(3)
},
packageSelectLabel: {
paddingTop:"7px",
minWidth: "100px"
},
packageSelectSelect: {

},
adlTitle: {
fontWeight: theme.typography.fontWeightBold
Expand Down Expand Up @@ -229,7 +241,7 @@ function buildAdrNav(currentAdr: AdrLight, adrs: AdrLight[]): AdrNav {

export type AdrBrowserLayoutProps = {
projectName: string;
adrs?: AdrLight[]; // undefined -> loading, empty -> empty
adrs?: AdrLight[];
adrsReloading?: boolean;
currentAdr?: AdrLight;
children: React.ReactNode;
Expand All @@ -250,11 +262,60 @@ export function AdrBrowserLayout({
const router = useRouter();

const [mobileDrawerOpen, setMobileDrawerOpen] = React.useState(false);
const [searchOpen, setSearchOpenState] = React.useState(false);
const [searchReallyOpen, setSearchReallyOpenState] = React.useState(false);

const [packages, setPackages] = React.useState(["all"]);
const [currentPackage, setCurrentPackage] = React.useState('All');
const [currentPackageAdrs, setCurrentPackageAdrs] = React.useState(adrs);

const [statuses, setStatuses] = React.useState(["all"]);
const [currentStatus, setCurrentStatus] = React.useState('All');
const [currentStatusAdrs, setCurrentStatusAdrs] = React.useState(adrs);

const handleMobileDrawerToggle = () => {
setMobileDrawerOpen(!mobileDrawerOpen);
};

const handlePackageChange = (event: React.ChangeEvent<{ value: unknown }>) => {
setCurrentPackage(event.target.value as string);
setCurrentStatus('All');
};

const handleStatusChange = (event: React.ChangeEvent<{ value: unknown }>) => {
setCurrentStatus(event.target.value as string);
};

React.useEffect( () => {
setPackages([...new Set(adrs?.map(adr => {
return adr.package ? adr.package : "Global";
}))]);
}, [adrs]);

React.useEffect( () => {
setStatuses([...new Set(currentPackageAdrs?.map(adr => {
return adr.status ? adr.status : "Unknown";
}))]);
}, [currentPackageAdrs]);

React.useEffect( () => {
if (currentPackage === 'All'){
setCurrentPackageAdrs(adrs);
} else if (currentPackage === 'Global') {
setCurrentPackageAdrs(adrs?.filter(adr => adr.package === null))
} else {
setCurrentPackageAdrs(adrs?.filter(adr => adr.package === currentPackage))
}
}, [currentPackage, adrs]);

React.useEffect( () => {
if(currentStatus === 'All'){
setCurrentStatusAdrs(currentPackageAdrs);
} else {
setCurrentStatusAdrs(currentPackageAdrs?.filter(adr => adr.status === currentStatus))
}
}, [currentStatus, currentPackageAdrs]);

React.useEffect(() => {
const closeMobileDrawer = () => setMobileDrawerOpen(false);
router?.events.on("routeChangeStart", closeMobileDrawer);
Expand All @@ -263,9 +324,6 @@ export function AdrBrowserLayout({
};
}, [router]);

const [searchOpen, setSearchOpenState] = React.useState(false);
const [searchReallyOpen, setSearchReallyOpenState] = React.useState(false);

const drawer = (
<div className={classes.drawerContainer}>
<Toolbar className={classes.drawerToolbar}>
Expand Down Expand Up @@ -296,6 +354,38 @@ export function AdrBrowserLayout({
</IconButton>
</Toolbar>

<div className={classes.adlPackageSelect}>
<InputLabel className={classes.packageSelectLabel} id="package-select-label">Package</InputLabel>
<Select
className={classes.packageSelectSelect}
labelId="package-select-label"
id="package-select"
value={currentPackage}
onChange={handlePackageChange}
>
<MenuItem value='All'>All</MenuItem>
{packages.map(packageDetails => (
<MenuItem value={packageDetails} key={packageDetails}>{packageDetails}</MenuItem>
))}
</Select>
</div>

<div className={classes.adlPackageSelect}>
<InputLabel className={classes.packageSelectLabel} id="status-select-label">Status</InputLabel>
<Select
className={classes.packageSelectSelect}
labelId="status-select-label"
id="status-select"
value={currentStatus}
onChange={handleStatusChange}
>
<MenuItem value='All'>All</MenuItem>
{statuses.map(statusDetails => (
<MenuItem value={statusDetails} key={statusDetails}>{statusDetails}</MenuItem>
))}
</Select>

</div>
<div className={classes.adlTitleAndSpinner}>
<Typography variant="subtitle2" className={classes.adlTitle}>
Decision log
Expand All @@ -306,9 +396,9 @@ export function AdrBrowserLayout({
</Fade>
</div>

<Grow in={adrs !== undefined} style={{ transformOrigin: "center left" }}>
<Grow in={currentStatusAdrs !== undefined} style={{ transformOrigin: "center left" }}>
<AdrMenu
adrs={adrs}
adrs={currentStatusAdrs}
currentAdrSlug={currentAdr?.slug}
className={classes.adrMenu}
/>
Expand All @@ -320,16 +410,16 @@ export function AdrBrowserLayout({

<List className={classes.bottomMenuList}>
{/* <Divider />
<ListItem button>
<ListItemIcon>
<ChevronRightIcon />
</ListItemIcon>
<ListItemText>
<Badge badgeContent={0} color="primary">
<Typography>Filters</Typography>
</Badge>
</ListItemText>
</ListItem> */}
<ListItem button>
<ListItemIcon>
<ChevronRightIcon />
</ListItemIcon>
<ListItemText>
<Badge badgeContent={0} color="primary">
<Typography>Filters</Typography>
</Badge>
</ListItemText>
</ListItem> */}
{/* <Divider />
<Link href="/decision-backlog" passHref>
<ListItem button selected={backlog} component="a">
Expand Down