diff --git a/api/src/affiliation/mutations/request-org-affiliation.js b/api/src/affiliation/mutations/request-org-affiliation.js index b974191eb6..312681475e 100644 --- a/api/src/affiliation/mutations/request-org-affiliation.js +++ b/api/src/affiliation/mutations/request-org-affiliation.js @@ -126,7 +126,7 @@ export const requestOrgAffiliation = new mutationWithClientMutationId({ orgAdminsCursor = await query` WITH affiliations, organizations, users FOR v, e IN 1..1 OUTBOUND ${org._id} affiliations - FILTER e.permission == "admin" + FILTER e.permission == "admin" || e.permission == "super_admin" || e.permission == "owner" RETURN v._key ` } catch (err) { diff --git a/frontend/mocking/faked_schema.js b/frontend/mocking/faked_schema.js index f9a4c107c8..c2c0db0390 100644 --- a/frontend/mocking/faked_schema.js +++ b/frontend/mocking/faked_schema.js @@ -791,6 +791,8 @@ export const getTypeNames = () => gql` # CSV formatted output of all domains in the organization including their email and web scan statuses. toCsv: String + userHasPermission: Boolean + # The domains which are associated with this organization. domains( # Ordering options for domain connections. diff --git a/frontend/src/organizationDetails/OrganizationDetails.js b/frontend/src/organizationDetails/OrganizationDetails.js index d62ef00c85..92d0a02c90 100644 --- a/frontend/src/organizationDetails/OrganizationDetails.js +++ b/frontend/src/organizationDetails/OrganizationDetails.js @@ -32,7 +32,6 @@ import { RadialBarChart } from '../summaries/RadialBarChart' import { ExportButton } from '../components/ExportButton' import { RequestOrgInviteModal } from '../organizations/RequestOrgInviteModal' import { useUserVar } from '../utilities/userState' -import { ABTestingWrapper, ABTestVariant } from '../app/ABTestWrapper' export default function OrganizationDetails() { const { isLoggedIn } = useUserVar() @@ -107,24 +106,20 @@ export default function OrganizationDetails() { {data?.organization?.verified && } - - - {isLoggedIn() && ( - <> - - - - )} - - + {isLoggedIn() && ( + <> + + + + )} ) })} - - - {hiddenFilterOptions.map(({ value, text }, idx) => { - return ( - - ) - })} - - + {hiddenFilterOptions.map(({ value, text }, idx) => { + return ( + + ) + })} ) : ( <> diff --git a/frontend/src/organizations/Organizations.js b/frontend/src/organizations/Organizations.js index c03d8405f0..c889ffdb0a 100644 --- a/frontend/src/organizations/Organizations.js +++ b/frontend/src/organizations/Organizations.js @@ -17,7 +17,6 @@ import { SearchBox } from '../components/SearchBox' import { UserIcon } from '../theme/Icons' import { RequestOrgInviteModal } from './RequestOrgInviteModal' import { useUserVar } from '../utilities/userState' -import { ABTestingWrapper, ABTestVariant } from '../app/ABTestWrapper' export default function Organizations() { const { isLoggedIn } = useUserVar() @@ -97,28 +96,24 @@ export default function Organizations() { mr="2" w="100%" /> - - - {isLoggedIn() && ( - <> - } - onClick={() => { - setOrgInfo({ id, name }) - onOpen() - }} - /> - - - )} - - + {isLoggedIn() && ( + <> + } + onClick={() => { + setOrgInfo({ id, name }) + onOpen() + }} + /> + + + )} )} diff --git a/frontend/src/summaries/TieredSummaries.js b/frontend/src/summaries/TieredSummaries.js index afb2745451..b20781bd74 100644 --- a/frontend/src/summaries/TieredSummaries.js +++ b/frontend/src/summaries/TieredSummaries.js @@ -34,10 +34,24 @@ export function TieredSummaries({ summaries }) { -