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

Use accordions for schema selection, hiding inactive schemas by default #1383

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Use accordions for schema selection, hiding inactive schemas by default #1383

Show file tree
Hide file tree
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
61 changes: 46 additions & 15 deletions frontend/pages/model/[modelId]/access-request/schema.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
import { Schema } from '@mui/icons-material'
import ArrowBack from '@mui/icons-material/ArrowBack'
import { Box, Button, Card, Container, Grid, Stack, Typography } from '@mui/material'
import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
import {
Accordion,
AccordionDetails,
AccordionSummary,
Box,
Button,
Card,
Container,
Grid,
Stack,
Typography,
} from '@mui/material'
import { useGetSchemas } from 'actions/schema'
import _ from 'lodash-es'
import { useRouter } from 'next/router'
Expand Down Expand Up @@ -31,6 +43,13 @@ export default function AccessRequestSchema() {
[modelId, router],
)

const accordionStyling = {
'&:before': {
display: 'none',
},
width: '100%',
} as const

const activeSchemaButtons = useMemo(
() =>
activeSchemas.length ? (
Expand Down Expand Up @@ -93,20 +112,32 @@ export default function AccessRequestSchema() {
</Typography>
</Stack>
<Stack sx={{ mt: 2 }} spacing={2} alignItems='center'>
<Typography color='primary' component='h2' variant='h6'>
Active Schemas
</Typography>
<Box sx={{ m: 2 }}>
<Grid container spacing={2} justifyContent='center'>
{modelId && activeSchemaButtons}
</Grid>
</Box>
<Typography color='primary' component='h2' variant='h6'>
Inactive Schemas
</Typography>
<Grid container spacing={2} justifyContent='center'>
{modelId && inactiveSchemaButtons}
</Grid>
<Accordion defaultExpanded sx={accordionStyling}>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography sx={{ width: '100%' }} align='center' color='primary' variant='h6' component='h2'>
Active Schemas
</Typography>
</AccordionSummary>
<AccordionDetails>
<Box sx={{ m: 2 }}>
<Grid container spacing={2} justifyContent='center'>
{modelId && activeSchemaButtons}
</Grid>
</Box>
</AccordionDetails>
</Accordion>
<Accordion sx={accordionStyling}>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography sx={{ width: '100%' }} align='center' color='primary' variant='h6' component='h2'>
Inactive Schemas
</Typography>
</AccordionSummary>
<AccordionDetails>
<Grid container spacing={2} justifyContent='center'>
{modelId && inactiveSchemaButtons}
</Grid>
</AccordionDetails>
</Accordion>
</Stack>
</Card>
</Container>
Expand Down
56 changes: 43 additions & 13 deletions frontend/src/schemas/SchemaSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
import { Schema } from '@mui/icons-material'
import ArrowBack from '@mui/icons-material/ArrowBack'
import { Button, Card, Container, Grid, Stack, Typography } from '@mui/material'
import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
import {
Accordion,
AccordionDetails,
AccordionSummary,
Button,
Card,
Container,
Grid,
Stack,
Typography,
} from '@mui/material'
import { useGetModel } from 'actions/model'
import { postFromSchema } from 'actions/modelCard'
import { useGetSchemas } from 'actions/schema'
Expand Down Expand Up @@ -56,6 +67,13 @@ export default function SchemaSelect({ entry }: SchemaSelectProps) {
[currentUser, entry, mutateEntry, router],
)

const accordionStyling = {
'&:before': {
display: 'none',
},
width: '100%',
} as const

const activeSchemaButtons = useMemo(
() =>
activeSchemas.length ? (
Expand Down Expand Up @@ -120,18 +138,30 @@ export default function SchemaSelect({ entry }: SchemaSelectProps) {
</Typography>
</Stack>
<Stack sx={{ mt: 2 }} spacing={2} alignItems='center'>
<Typography color='primary' variant='h6' component='h2'>
Active Schemas
</Typography>
<Grid container spacing={2} justifyContent='center'>
{activeSchemaButtons}
</Grid>
<Typography color='primary' variant='h6' component='h2'>
Inactive Schemas
</Typography>
<Grid container spacing={2} justifyContent='center'>
{inactiveSchemaButtons}
</Grid>
<Accordion defaultExpanded sx={accordionStyling}>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography sx={{ width: '100%' }} align='center' color='primary' variant='h6' component='h2'>
Active Schemas
</Typography>
</AccordionSummary>
<AccordionDetails>
<Grid container spacing={2} justifyContent='center'>
{activeSchemaButtons}
</Grid>
</AccordionDetails>
</Accordion>
<Accordion sx={accordionStyling}>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
<Typography sx={{ width: '100%' }} align='center' color='primary' variant='h6' component='h2'>
Inactive Schemas
</Typography>
</AccordionSummary>
<AccordionDetails>
<Grid container spacing={2} justifyContent='center'>
{inactiveSchemaButtons}
</Grid>
</AccordionDetails>
</Accordion>
<MessageAlert message={errorMessage} severity='error' />
</Stack>
</Card>
Expand Down
Loading