Skip to content

Fix issue #123 #124

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

Merged
ericwang401 merged 4 commits into from
Jan 1, 2025
Merged

Fix issue #123 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c01ca60
fix:unauth user access users
Adekabang Nov 27, 2024
8329e4e
fix:unauth user access nodes
Adekabang Nov 27, 2024
2181f63
fix:unauth user access IPAM
Adekabang Nov 27, 2024
8bdecd1
fix:unauth user access IPAM settings
Adekabang Nov 27, 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
39 changes: 24 additions & 15 deletions resources/scripts/routers/AdminIpamRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,15 @@ export const routes: Route[] = [
},
{
path: ':poolId',
loader: ({ params }) =>
query(getPoolKey(parseInt(params.poolId!)), () =>
getAddressPool(parseInt(params.poolId!))
),
loader: async ({ params }) => {
try {
const poolId = parseInt(params.poolId!);
const pool = await query(getPoolKey(poolId), () => getAddressPool(poolId));
return pool;
} catch (error) {
return null;
}
},
element: lazyLoad(lazy(() => import('./AdminIpamRouter'))),
handle: {
crumb: data => ({
Expand All @@ -49,17 +54,21 @@ export const routes: Route[] = [
},
{
path: 'addresses',
loader: ({ params }) => {
const id = parseInt(params.poolId!)
const page = params.page ? parseInt(params.page) : 1

return query(getAddressesKey(id, page, ''), () =>
getAddresses(id, {
page,
query: '',
include: ['server'],
})
)
loader: async ({ params }) => {
try {
const id = parseInt(params.poolId!)
const page = params.page ? parseInt(params.page) : 1
const addresses = await query(getAddressesKey(id, page, ''), () =>
getAddresses(id, {
page,
query: '',
include: ['server'],
})
)
return addresses
} catch (error) {
return null
}
},
element: lazyLoad(
lazy(
Expand Down
13 changes: 9 additions & 4 deletions resources/scripts/routers/AdminNodeRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,15 @@ export const routes: Route[] = [
},
{
path: ':nodeId',
loader: ({ params }) =>
query(getPoolKey(parseInt(params.nodeId!)), () =>
getNode(parseInt(params.nodeId!))
),
loader: async ({ params }) => {
try {
const nodeId = parseInt(params.nodeId!);
const node = await query(getPoolKey(nodeId), () => getNode(nodeId));
return node;
} catch (error) {
return null;
}
},
element: lazyLoad(
lazy(() => import('@/routers/AdminNodeRouter'))
),
Expand Down
13 changes: 9 additions & 4 deletions resources/scripts/routers/AdminUserRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ export const routes: Route[] = [
{
path: ':id',
element: lazyLoad(lazy(() => import('./AdminUserRouter'))),
loader: ({ params }) =>
query(getKey(parseInt(params.id!)), () =>
getUser(parseInt(params.id!))
),
loader: async ({ params }) => {
try {
const id = parseInt(params.id!);
const user = await query(getKey(id), () => getUser(id));
return user;
} catch (error) {
return null;
}
},
children: [
{
path: 'settings',
Expand Down