Bugfix/affiliation filter active when no user (#5107)

* use isLoggedIn() to determine starting state for isAffiliated state * tests
canada-ca · Feb 9, 2024 · f30af73 · f30af73
1 parent 82f5b48
commit f30af73
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/frontend/src/domains/DomainsPage.js b/frontend/src/domains/DomainsPage.js
@@ -21,16 +21,18 @@ import { SearchBox } from '../components/SearchBox'
 import { useLazyQuery, useQuery } from '@apollo/client'
 import { ExportButton } from '../components/ExportButton'
 import { AffiliationFilterSwitch } from '../components/AffiliationFilterSwitch'
+import { useUserVar } from '../utilities/userState'
 
 export default function DomainsPage() {
+  const { isLoggedIn } = useUserVar()
   const { data } = useQuery(IS_USER_SUPER_ADMIN)
   const toast = useToast()
   const [orderDirection, setOrderDirection] = useState('ASC')
   const [orderField, setOrderField] = useState('DOMAIN')
   const [searchTerm, setSearchTerm] = useState('')
   const [debouncedSearchTerm, setDebouncedSearchTerm] = useState('')
   const [domainsPerPage, setDomainsPerPage] = useState(10)
-  const [isAffiliated, setIsAffiliated] = useState(true)
+  const [isAffiliated, setIsAffiliated] = useState(isLoggedIn())
 
   const [getAllOrgDomainStatuses, { loading: allOrgDomainStatusesLoading, _error, _data }] = useLazyQuery(
     GET_ALL_ORGANIZATION_DOMAINS_STATUSES_CSV,

diff --git a/frontend/src/domains/__tests__/DomainsPage.test.js b/frontend/src/domains/__tests__/DomainsPage.test.js
@@ -202,7 +202,7 @@ describe('<DomainsPage />', () => {
           first: 10,
           orderBy: { field: 'DOMAIN', direction: 'ASC' },
           search: '',
-          isAffiliated: true,
+          isAffiliated: false,
         },
       },
       result: {

diff --git a/frontend/src/organizations/Organizations.js b/frontend/src/organizations/Organizations.js
@@ -29,7 +29,7 @@ export default function Organizations() {
   const { isOpen: inviteRequestIsOpen, onOpen, onClose } = useDisclosure()
   const [orgInfo, setOrgInfo] = useState({})
   const [isVerified, setIsVerified] = useState(true)
-  const [isAffiliated, setIsAffiliated] = useState(true)
+  const [isAffiliated, setIsAffiliated] = useState(isLoggedIn())
 
   const memoizedSetDebouncedSearchTermCallback = useCallback(() => {
     setDebouncedSearchTerm(searchTerm)

diff --git a/frontend/src/organizations/__tests__/Organizations.test.js b/frontend/src/organizations/__tests__/Organizations.test.js
@@ -76,7 +76,7 @@ describe('<Organisations />', () => {
               search: '',
               includeSuperAdminOrg: false,
               isVerified: true,
-              isAffiliated: true,
+              isAffiliated: false,
             },
           },
           result: {
@@ -162,7 +162,7 @@ describe('<Organisations />', () => {
               search: '',
               includeSuperAdminOrg: false,
               isVerified: true,
-              isAffiliated: true,
+              isAffiliated: false,
             },
           },
           result: {
@@ -422,7 +422,7 @@ describe('<Organisations />', () => {
                 search: '',
                 includeSuperAdminOrg: false,
                 isVerified: true,
-                isAffiliated: true,
+                isAffiliated: false,
               },
             },
             result: {
@@ -468,7 +468,7 @@ describe('<Organisations />', () => {
                 search: '',
                 includeSuperAdminOrg: false,
                 isVerified: true,
-                isAffiliated: true,
+                isAffiliated: false,
               },
             },
             result: {
@@ -562,7 +562,7 @@ describe('<Organisations />', () => {
             search: '',
             includeSuperAdminOrg: false,
             isVerified: true,
-            isAffiliated: true,
+            isAffiliated: false,
           },
           data: {
             findMyOrganizations: {
@@ -606,7 +606,7 @@ describe('<Organisations />', () => {
                 search: '',
                 includeSuperAdminOrg: false,
                 isVerified: true,
-                isAffiliated: true,
+                isAffiliated: false,
               },
             },
             result: {
@@ -652,7 +652,7 @@ describe('<Organisations />', () => {
                 search: '',
                 includeSuperAdminOrg: false,
                 isVerified: true,
-                isAffiliated: true,
+                isAffiliated: false,
               },
             },
             result: {
@@ -698,7 +698,7 @@ describe('<Organisations />', () => {
                 search: '',
                 includeSuperAdminOrg: false,
                 isVerified: true,
-                isAffiliated: true,
+                isAffiliated: false,
               },
             },
             result: {