Skip to content

Commit 4b494d9

Browse files
committed
pass the user session so we do not have to add an additional call on every page
1 parent 8b32674 commit 4b494d9

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

pages/_app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const WebStore = ({ Component }) => {
3232
navLinks={NAVIGATION_LINKS}
3333
userSession={session}
3434
/>
35-
<Component />
35+
<Component session={session} />
3636
<Footer
3737
color={headerAndFooterLinkColors}
3838
companyName={FOOTER_NAME}

pages/browse/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useEffect, useState } from 'react'
22
import { useRouter } from 'next/router'
3-
import { useSession } from 'next-auth/react'
43
import {
54
Item,
65
ItemLoading,
@@ -14,9 +13,8 @@ import {
1413
useFilteredWares,
1514
} from '../../utils'
1615

17-
const Browse = () => {
16+
const Browse = ({ session }) => {
1817
const router = useRouter()
19-
const { data: session } = useSession()
2018
const [query, setQuery] = useState('')
2119
const existingQuery = router.query.q
2220

pages/requests/[uuid].js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { useState, useEffect } from 'react'
22
import { useRouter } from 'next/router'
3-
import { useSession } from 'next-auth/react'
43
import {
54
ActionsGroup,
65
CollapsibleSection,
@@ -28,9 +27,8 @@ import {
2827
useOneRequest,
2928
} from '../../utils'
3029

31-
const Request = () => {
30+
const Request = ({ session }) => {
3231
const router = useRouter()
33-
const { data: session } = useSession()
3432
/**
3533
* as a dynamically routed file, the router query will always consist of a "key: value" pair that's determined by the name of
3634
* the file (key) and path string (value). additional query properties may also exist if they were explicitly passed.
@@ -136,7 +134,7 @@ const Request = () => {
136134
<CollapsibleSection header='Additional Information' description={request.htmlDescription} />
137135
<Title addClass='mt-4' title='Documents' size='small' />
138136
{documents.length ? documents.map((document, index) => (
139-
<Document
137+
<Document
140138
addClass='mt-3'
141139
acceptSOW={acceptSOW(
142140
request,

pages/requests/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react'
2-
import { useSession } from 'next-auth/react'
32
import { useRouter } from 'next/router'
43
import {
54
LinkedButton,
@@ -15,9 +14,8 @@ import {
1514
useAllRequests
1615
} from '../../utils'
1716

18-
const Requests = () => {
17+
const Requests = ({ session }) => {
1918
const router = useRouter()
20-
const { data: session } = useSession()
2119
const { requests, isLoadingAllRequests, isAllRequestsError } = useAllRequests(session?.accessToken)
2220
const { defaultWareID, isLoadingDefaultWare, isDefaultWareError } = useDefaultWare(session?.accessToken)
2321
const isError = isAllRequestsError || isDefaultWareError

pages/requests/new/[ware].js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { default as BsForm } from 'react-bootstrap/Form'
33
import Form from '@rjsf/core'
44
import validator from '@rjsf/validator-ajv8'
55
import { useRouter } from 'next/router'
6-
import { useSession } from 'next-auth/react'
76
import {
87
AdditionalInfo,
98
BlankRequestForm,
@@ -23,9 +22,8 @@ import {
2322
useInitializeRequest,
2423
} from '../../../utils'
2524

26-
const NewRequest = () => {
25+
const NewRequest = ({ session }) => {
2726
const router = useRouter()
28-
const { data: session } = useSession()
2927
const accessToken = session?.accessToken
3028
const wareID = router.query.id
3129
const { dynamicForm, isLoadingInitialRequest, isInitialRequestError } = useInitializeRequest(wareID, accessToken)

pages/services/[ware].js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { useRouter } from 'next/router'
2-
import { useSession } from 'next-auth/react'
32
import { ItemPage, Notice, Loading } from '@scientist-softserv/webstore-component-library'
43
import { configureErrors, DEFAULT_WARE_IMAGE, useOneWare } from '../../utils'
54

6-
const Service = () => {
5+
const Service = ({ session }) => {
76
const router = useRouter()
8-
const { data: session } = useSession()
97
const { id } = router.query
108
const { ware, isLoading, isError } = useOneWare(id, session?.accessToken)
119

0 commit comments

Comments
 (0)