Reveal 2.1615 features (#4589)

* reveal Request Invite button * show hidden score toggle btn * allow filtering by hidden tags * include org owners in invite request emails
canada-ca · Jun 16, 2023 · af5d359 · af5d359
1 parent 32db3e5
commit af5d359
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 59 deletions.
diff --git 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
@@ -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
@@ -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 && <CheckCircleIcon ml="1" color="blue.500" boxSize="icons.lg" />}
           </Flex>
         </Heading>
-        <ABTestingWrapper insiderVariantName="B">
-          <ABTestVariant name="B">
-            {isLoggedIn() && (
-              <>
-                <Button ml="auto" order={{ base: 2, md: 1 }} variant="primary" onClick={onOpen}>
-                  <Trans>Request Invite</Trans>
-                  <UserIcon ml="1" color="white" boxSize="icons.md" />
-                </Button>
-                <RequestOrgInviteModal
-                  onClose={onClose}
-                  isOpen={isOpen}
-                  orgId={data?.organization?.id}
-                  orgName={data?.organization?.name}
-                />
-              </>
-            )}
-          </ABTestVariant>
-        </ABTestingWrapper>
+        {isLoggedIn() && (
+          <>
+            <Button ml="auto" order={{ base: 2, md: 1 }} variant="primary" onClick={onOpen}>
+              <Trans>Request Invite</Trans>
+              <UserIcon ml="1" color="white" boxSize="icons.md" />
+            </Button>
+            <RequestOrgInviteModal
+              onClose={onClose}
+              isOpen={isOpen}
+              orgId={data?.organization?.id}
+              orgName={data?.organization?.name}
+            />
+          </>
+        )}
       </Flex>
       <Tabs
         isFitted

diff --git a/frontend/src/organizationDetails/OrganizationDomains.js b/frontend/src/organizationDetails/OrganizationDomains.js
@@ -28,7 +28,6 @@ import { SearchBox } from '../components/SearchBox'
 import { Formik } from 'formik'
 import { getRequirement, schemaToValidation } from '../utilities/fieldRequirements'
 import { CheckCircleIcon, InfoIcon, WarningIcon } from '@chakra-ui/icons'
-import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
 
 export function OrganizationDomains({ orgSlug }) {
   const [orderDirection, setOrderDirection] = useState('ASC')
@@ -202,17 +201,13 @@ export function OrganizationDomains({ orgSlug }) {
                                 </option>
                               )
                             })}
-                            <ABTestingWrapper insiderVariantName="B">
-                              <ABTestVariant name="B">
-                                {hiddenFilterOptions.map(({ value, text }, idx) => {
-                                  return (
-                                    <option key={idx} value={value}>
-                                      {text}
-                                    </option>
-                                  )
-                                })}
-                              </ABTestVariant>
-                            </ABTestingWrapper>
+                            {hiddenFilterOptions.map(({ value, text }, idx) => {
+                              return (
+                                <option key={idx} value={value}>
+                                  {text}
+                                </option>
+                              )
+                            })}
                           </>
                         ) : (
                           <>

diff --git 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%"
               />
-              <ABTestingWrapper insiderVariantName="B">
-                <ABTestVariant name="B">
-                  {isLoggedIn() && (
-                    <>
-                      <IconButton
-                        variant="primary"
-                        icon={<UserIcon color="white" boxSize="icons.md" />}
-                        onClick={() => {
-                          setOrgInfo({ id, name })
-                          onOpen()
-                        }}
-                      />
-                      <RequestOrgInviteModal
-                        isOpen={inviteRequestIsOpen}
-                        onClose={onClose}
-                        orgId={orgInfo.id}
-                        orgName={orgInfo.name}
-                      />
-                    </>
-                  )}
-                </ABTestVariant>
-              </ABTestingWrapper>
+              {isLoggedIn() && (
+                <>
+                  <IconButton
+                    variant="primary"
+                    icon={<UserIcon color="white" boxSize="icons.md" />}
+                    onClick={() => {
+                      setOrgInfo({ id, name })
+                      onOpen()
+                    }}
+                  />
+                  <RequestOrgInviteModal
+                    isOpen={inviteRequestIsOpen}
+                    onClose={onClose}
+                    orgId={orgInfo.id}
+                    orgName={orgInfo.name}
+                  />
+                </>
+              )}
             </Flex>
           </ErrorBoundary>
         )}

diff --git a/frontend/src/summaries/TieredSummaries.js b/frontend/src/summaries/TieredSummaries.js
@@ -34,10 +34,24 @@ export function TieredSummaries({ summaries }) {
     <Box>
       <ABTestingWrapper insiderVariantName="B">
         <ABTestVariant name="A">
-          <TierOneSummaries
-            https={show && hidden ? hidden.https : https}
-            dmarc={show && hidden ? hidden.dmarc : dmarc}
-          />
+          <Box>
+            <Flex align="center" justify="flex-end" mb="2">
+              {hidden && (
+                <Tooltip label={t`Include hidden domains in summaries.`}>
+                  <IconButton
+                    aria-label={t`Include hidden domains in summaries.`}
+                    variant="primaryOutline"
+                    onClick={() => setShow(!show)}
+                    icon={show ? <ViewOffIcon /> : <ViewIcon />}
+                  />
+                </Tooltip>
+              )}
+            </Flex>
+            <TierOneSummaries
+              https={show && hidden ? hidden.https : https}
+              dmarc={show && hidden ? hidden.dmarc : dmarc}
+            />
+          </Box>
         </ABTestVariant>
         <ABTestVariant name="B">
           <Accordion allowMultiple defaultIndex={[0, 1, 2]}>