diff --git a/api/src/domain/loaders/load-domain-connections-by-organizations-id.js b/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
index 2e4d83311e..8c49af94c8 100644
--- a/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
+++ b/api/src/domain/loaders/load-domain-connections-by-organizations-id.js
@@ -415,7 +415,7 @@ export const loadDomainConnectionsByOrgId =
showArchivedDomains = aql``
}
let showHiddenDomains = aql`FILTER e.hidden != true`
- if (permission === 'super_admin') {
+ if (['super_admin'].includes(permission)) {
showHiddenDomains = aql``
}
diff --git a/frontend/src/admin/AdminDomainCard.js b/frontend/src/admin/AdminDomainCard.js
index 7fbd63533c..c472c353b7 100644
--- a/frontend/src/admin/AdminDomainCard.js
+++ b/frontend/src/admin/AdminDomainCard.js
@@ -1,29 +1,16 @@
import React from 'react'
import { Trans } from '@lingui/macro'
import { array, bool, string } from 'prop-types'
-import {
- Flex,
- Grid,
- Link,
- ListItem,
- Stack,
- Tag,
- TagLabel,
- Text,
-} from '@chakra-ui/react'
+import { Flex, Grid, Link, ListItem, Stack, Tag, TagLabel, Text } from '@chakra-ui/react'
import { ExternalLinkIcon } from '@chakra-ui/icons'
+import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
import { sanitizeUrl } from '../utilities/sanitizeUrl'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
export function AdminDomainCard({ url, tags, isHidden, isArchived, ...rest }) {
return (
-
+
Domain:
@@ -41,49 +28,33 @@ export function AdminDomainCard({ url, tags, isHidden, isArchived, ...rest }) {
-
-
-
- {tags?.map((tag, idx) => {
- return (
-
- {tag}
-
- )
- })}
+
+ {tags?.map((tag, idx) => {
+ return (
+
+ {tag}
+
+ )
+ })}
+
+
{isHidden && (
-
+
Hidden
)}
{isArchived && (
-
+
Archived
)}
-
-
-
+
+
+
)
diff --git a/frontend/src/admin/AdminDomainModal.js b/frontend/src/admin/AdminDomainModal.js
index 47ed65deb0..ed16e8d7a9 100644
--- a/frontend/src/admin/AdminDomainModal.js
+++ b/frontend/src/admin/AdminDomainModal.js
@@ -30,28 +30,16 @@ import {
Tooltip,
useToast,
} from '@chakra-ui/react'
-import {
- AddIcon,
- MinusIcon,
- QuestionOutlineIcon,
- SmallAddIcon,
-} from '@chakra-ui/icons'
+import { AddIcon, MinusIcon, QuestionOutlineIcon, SmallAddIcon } from '@chakra-ui/icons'
import { array, bool, func, number, object, string } from 'prop-types'
import { Field, FieldArray, Formik } from 'formik'
import { useMutation } from '@apollo/client'
import { DomainField } from '../components/fields/DomainField'
import { CREATE_DOMAIN, UPDATE_DOMAIN } from '../graphql/mutations'
-import { ABTestingWrapper } from '../app/ABTestWrapper'
-import { ABTestVariant } from '../app/ABTestVariant'
+import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
-export function AdminDomainModal({
- isOpen,
- onClose,
- validationSchema,
- orgId,
- ...props
-}) {
+export function AdminDomainModal({ isOpen, onClose, validationSchema, orgId, ...props }) {
const {
editingDomainId,
editingDomainUrl,
@@ -84,9 +72,7 @@ export function AdminDomainModal({
if (createDomain.result.__typename === 'Domain') {
toast({
title: i18n._(t`Domain added`),
- description: i18n._(
- t`${createDomain.result.domain} was added to ${orgSlug}`,
- ),
+ description: i18n._(t`${createDomain.result.domain} was added to ${orgSlug}`),
status: 'success',
duration: 9000,
isClosable: true,
@@ -178,9 +164,7 @@ export function AdminDomainModal({
const stringValues = values?.map((label) => {
return label[i18n.locale]
})
- const difference = tagOptions.filter(
- (label) => !stringValues?.includes(label[i18n.locale]),
- )
+ const difference = tagOptions.filter((label) => !stringValues?.includes(label[i18n.locale]))
return difference?.map((label, idx) => {
return (
+
- {({
- handleSubmit,
- handleChange,
- isSubmitting,
- values,
- errors,
- touched,
- }) => (
+ {({ handleSubmit, handleChange, isSubmitting, values, errors, touched }) => (
+ )
+ }}
+
+
+ )}
(
@@ -265,6 +276,7 @@ export function OrganizationDomains({ orgSlug }) {
+
@@ -302,58 +314,57 @@ export function OrganizationDomains({ orgSlug }) {
onToggle={onToggle}
/>
-
-
-
- {filters.map(({ filterCategory, comparison, filterValue }, idx) => {
- const statuses = {
- HTTPS_STATUS: `HTTPS`,
- HSTS_STATUS: `HSTS`,
- CIPHERS_STATUS: `Ciphers`,
- CURVES_STATUS: t`Curves`,
- PROTOCOLS_STATUS: t`Protocols`,
- SPF_STATUS: `SPF`,
- DKIM_STATUS: `DKIM`,
- DMARC_STATUS: `DMARC`,
- }
- return (
-
- {comparison === 'NOT_EQUAL' && !}
- {filterCategory === 'TAGS' ? (
- {filterValue}
- ) : (
- <>
- {statuses[filterCategory]}
-
- >
- )}
+ {orgSlug !== 'my-tracker' && (
+
+ {filters.map(({ filterCategory, comparison, filterValue }, idx) => {
+ const statuses = {
+ HTTPS_STATUS: `HTTPS`,
+ HSTS_STATUS: `HSTS`,
+ CERTIFICATES_STATUS: `Certificates`,
+ CIPHERS_STATUS: `Ciphers`,
+ CURVES_STATUS: t`Curves`,
+ PROTOCOLS_STATUS: t`Protocols`,
+ SPF_STATUS: `SPF`,
+ DKIM_STATUS: `DKIM`,
+ DMARC_STATUS: `DMARC`,
+ }
+ return (
+
+ {comparison === 'NOT_EQUAL' && !}
+ {filterCategory === 'TAGS' ? (
+ {filterValue}
+ ) : (
+ <>
+ {statuses[filterCategory]}
+
+ >
+ )}
- setFilters(filters.filter((_, i) => i !== idx))} />
-
- )
- })}
-
-
-
+ setFilters(filters.filter((_, i) => i !== idx))} />
+
+ )
+ })}
+
+ )}
{domainList}