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

Fix some bugs #176

Merged
merged 5 commits into from
Jun 22, 2024
Merged

Fix some bugs #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3a5d88
Fix typo in JPNIC.tsx
symysak Apr 20, 2024
40ab78f
Merge pull request #174 from symysak/symysak-patch-2
x86taka May 16, 2024
e8c3685
Add filters to group table on the dashboard page
symysak Jun 7, 2024
e6462fd
Fix select items in connection component
symysak Jun 7, 2024
0a8309f
Merge pull request #175 from homenoc/fix-some-bugs
symysak Jun 15, 2024
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
2 changes: 1 addition & 1 deletion src/components/Dashboard/JPNIC/JPNIC.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export function JPNICDetail(props: {
labelPlacement="end"
checked={jpnicCopy.is_group}
onChange={() => {
setJPNICCopy({ ...jpnicCopy, hidden: !jpnicCopy.is_group })
setJPNICCopy({ ...jpnicCopy, is_group: !jpnicCopy.is_group })
}}
/>
<FormControlLabel
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Connection/ConnectionDetail/ConnectionDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export function ConnectionOpen(props: {
type="number"
>
<MenuItem value={0}>なし(初期値)</MenuItem>
{template.bgp_router?.map((row: BGPRouterDetailData) => (
{template.bgp_router?.filter((router) => router.enable === true).map((row: BGPRouterDetailData) => (
<MenuItem key={row.ID + row.hostname} value={row.ID}>
{row.hostname}
</MenuItem>
Expand Down Expand Up @@ -240,7 +240,7 @@ export function ConnectionOpen(props: {
type="number"
>
<MenuItem value={0}>なし(初期値)</MenuItem>
{template.tunnel_endpoint_router_ip?.map(
{template.tunnel_endpoint_router_ip?.filter((ip) => ip.enable === true).map(
(row: TunnelEndPointRouterIPTemplateData) => (
<MenuItem key={row.ID + row.ip} value={row.ID}>
{row.tunnel_endpoint_router.hostname}
Expand Down
56 changes: 54 additions & 2 deletions src/pages/Dashboard/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
ServiceDetailData,
TicketDetailData,
} from '../../interface'
import { Card, CardContent, Chip, Grid, Stack } from '@mui/material'
import { Button, Card, CardContent, Chip, Checkbox, FormControlLabel, Grid, Stack } from '@mui/material'
import Ticket from '../../components/Dashboard/Ticket/Ticket'
import Request from '../../components/Dashboard/Request/Request'
import Service from '../../components/Dashboard/Service/Service'
Expand All @@ -30,6 +30,11 @@ export default function Dashboard() {
const [group, setGroup] = useState<GroupDetailData[]>()
const [connection, setConnection] = useState<ConnectionDetailData[]>()
const template = useRecoilValue(TemplateState)
const [expired_status0IsChecked, setExpired_status0IsChecked] = useState(true);
const [expired_status1IsChecked, setExpired_status1IsChecked] = useState(false);
const [expired_status2IsChecked, setExpired_status2IsChecked] = useState(false);
const [expired_status3IsChecked, setExpired_status3IsChecked] = useState(false);
const [groupDialogIsOpen, setGroupDialogIsOpen] = useState(false);

useEffect(() => {
if (reload) {
Expand Down Expand Up @@ -176,7 +181,54 @@ export default function Dashboard() {
/>
</Grid>
<Grid item xs={12}>
<Group key={'group'} data={template?.group} setReload={setReload} />
<Group
key={'group'}
data={template?.group?.filter((item) => {
if (!expired_status0IsChecked && item.expired_status === 0) {return false}
if (!expired_status1IsChecked && item.expired_status === 1) {return false}
if (!expired_status2IsChecked && item.expired_status === 2) {return false}
if (!expired_status3IsChecked && item.expired_status === 3) {return false}
return true
})}
setReload={setReload}
/>
<FormControlLabel
control={<Checkbox checked={expired_status0IsChecked} onChange={() => setExpired_status0IsChecked(!expired_status0IsChecked)}/>}
label="通常"
/>
<FormControlLabel
control={<Checkbox checked={expired_status1IsChecked} onChange={() => setExpired_status1IsChecked(!expired_status1IsChecked)}/>}
label="審査落ち"
/>
<FormControlLabel
control={<Checkbox checked={expired_status2IsChecked} onChange={() => setExpired_status2IsChecked(!expired_status2IsChecked)}/>}
label="ユーザにより廃止"
/>
<FormControlLabel
control={<Checkbox checked={expired_status3IsChecked} onChange={() => setExpired_status3IsChecked(!expired_status3IsChecked)}/>}
label="運営委員により廃止"
/>
<Button onClick={() => setGroupDialogIsOpen(!groupDialogIsOpen)} >(メール送信用)メールアドレス一覧表示</Button>
{
groupDialogIsOpen
? (<p>
{template?.group?.filter((item) => {
if (!expired_status0IsChecked && item.expired_status === 0) { return false }
if (!expired_status1IsChecked && item.expired_status === 1) { return false }
if (!expired_status2IsChecked && item.expired_status === 2) { return false }
if (!expired_status3IsChecked && item.expired_status === 3) { return false }
return true
}).map(((group) =>
group.users?.filter((user) =>
user.level < 3
).map((user) =>
user.email + ","
)
))
}
</p>
) : (<></>)
}
</Grid>
<Grid item xs={12}>
<MemoGroup
Expand Down
Loading