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

feat: Add LoadingWidget to Guardian Directory page #1188

Merged
merged 3 commits into from
Jan 3, 2024
Merged

feat: Add LoadingWidget to Guardian Directory page #1188

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1edd889
Remove full page loader
jcbcapps Jan 3, 2024
258d5d9
Add LoadingWidget to directory page
jcbcapps Jan 3, 2024
f997671
Merge branch 'main' into sc-2984/loading-guardian-directory
gidjin Jan 3, 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
53 changes: 27 additions & 26 deletions src/pages/guardian-directory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useEffect, useState } from 'react'
import { useFlags } from 'launchdarkly-react-client-sdk'
import { useRouter } from 'next/router'
import { Button, Search } from '@trussworks/react-uswds'
import LoadingWidget from 'components/LoadingWidget/LoadingWidget'
import { useUser } from 'hooks/useUser'
import { withDefaultLayout } from 'layout/DefaultLayout/DefaultLayout'
import styles from 'styles/pages/guardianDirectory.module.scss'
Expand All @@ -10,8 +11,6 @@ import { useGetGuardianDirectoryQuery } from 'operations/portal/queries/getGuard
import { useSearchGuardianDirectoryQuery } from 'operations/portal/queries/searchGuardianDirectory.g'
import { GuardianDirectory as GuardianDirectoryType } from 'types'

import Loader from 'components/Loader/Loader'

const GuardianDirectory = () => {
const flags = useFlags()
const router = useRouter()
Expand Down Expand Up @@ -61,9 +60,7 @@ const GuardianDirectory = () => {
router.replace('/404')
}

return loading ? (
<Loader />
) : (
return (
<>
<div className={styles.guardianDirectory}>
<div className={styles.guardianDirectoryHeader}>
Expand All @@ -86,27 +83,31 @@ const GuardianDirectory = () => {
</Button>
</div>

<GuardianDirectoryTable
headers={[
'Last Name',
'First Name',
'Rank',
'Title',
'Base',
'Field Commands',
'Email',
]}
keys={[
'LastName',
'FirstName',
'Rank',
'DutyTitle',
'BaseLoc',
'MajCom',
'Email',
]}
rows={directory}
/>
{!directory.length ? (
<LoadingWidget />
) : (
<GuardianDirectoryTable
headers={[
'Last Name',
'First Name',
'Rank',
'Title',
'Base',
'Field Commands',
'Email',
]}
keys={[
'LastName',
'FirstName',
'Rank',
'DutyTitle',
'BaseLoc',
'MajCom',
'Email',
]}
rows={directory}
/>
)}
</div>
</>
)
Expand Down
Loading