diff --git a/api/cloudbuild.yaml b/api/cloudbuild.yaml
index 4bc8cce3b8..479326a33f 100644
--- a/api/cloudbuild.yaml
+++ b/api/cloudbuild.yaml
@@ -5,7 +5,7 @@ steps:
args:
[
'-c',
- 'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
+ 'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
]
- name: mikewilliamson/wait-for
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 689855f9f6..df6014772e 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
@@ -430,7 +430,7 @@ export const loadDomainConnectionsByOrgId =
showArchivedDomains = aql``
}
let showHiddenDomains = aql`FILTER e.hidden != true`
- if (['super_admin'].includes(permission)) {
+ if (['super_admin', 'owner', 'admin', 'user'].includes(permission)) {
showHiddenDomains = aql``
}
diff --git a/frontend/src/admin/AdminDomainCard.js b/frontend/src/admin/AdminDomainCard.js
index c472c353b7..cad20ca49d 100644
--- a/frontend/src/admin/AdminDomainCard.js
+++ b/frontend/src/admin/AdminDomainCard.js
@@ -3,7 +3,6 @@ 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 { ExternalLinkIcon } from '@chakra-ui/icons'
-import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
import { sanitizeUrl } from '../utilities/sanitizeUrl'
@@ -36,24 +35,20 @@ export function AdminDomainCard({ url, tags, isHidden, isArchived, ...rest }) {
)
})}
-
-
- {isHidden && (
-
-
- Hidden
-
-
- )}
- {isArchived && (
-
-
- Archived
-
-
- )}
-
-
+ {isHidden && (
+
+
+ Hidden
+
+
+ )}
+ {isArchived && (
+
+
+ Archived
+
+
+ )}
diff --git a/frontend/src/admin/AdminDomainModal.js b/frontend/src/admin/AdminDomainModal.js
index ed16e8d7a9..8111b7795c 100644
--- a/frontend/src/admin/AdminDomainModal.js
+++ b/frontend/src/admin/AdminDomainModal.js
@@ -37,7 +37,6 @@ import { useMutation } from '@apollo/client'
import { DomainField } from '../components/fields/DomainField'
import { CREATE_DOMAIN, UPDATE_DOMAIN } from '../graphql/mutations'
-import { ABTestVariant, ABTestingWrapper } from '../app/ABTestWrapper'
export function AdminDomainModal({ isOpen, onClose, validationSchema, orgId, ...props }) {
const {
@@ -327,62 +326,58 @@ export function AdminDomainModal({ isOpen, onClose, validationSchema, orgId, ...
)}
/>
-
-
+
+
+
+
+
+
+ Hide domain
+
+
+ {permission === 'SUPER_ADMIN' && (
+
-
+
- Hide domain
+ Archive domain
- {permission === 'SUPER_ADMIN' && (
-
-
-
-
-
-
-
- Archive domain
-
-
-
- {orgCount > 0 ? (
- Note: This will affect results for {orgCount} organizations
- ) : (
- Note: This could affect results for multiple organizations
- )}
-
-
- )}
-
- Please allow up to 24 hours for summaries to reflect any changes.
+
+ {orgCount > 0 ? (
+ Note: This will affect results for {orgCount} organizations
+ ) : (
+ Note: This could affect results for multiple organizations
+ )}
-
-
+
+ )}
+
+ Please allow up to 24 hours for summaries to reflect any changes.
+
diff --git a/frontend/src/domains/DomainCard.js b/frontend/src/domains/DomainCard.js
index b4fd1639af..81f39971df 100644
--- a/frontend/src/domains/DomainCard.js
+++ b/frontend/src/domains/DomainCard.js
@@ -16,7 +16,6 @@ import {
} from '@chakra-ui/react'
import { Link as RouteLink, useLocation } from 'react-router-dom'
import { array, bool, object, string } from 'prop-types'
-import { ABTestingWrapper, ABTestVariant } from '../app/ABTestWrapper'
import { StatusBadge } from './StatusBadge'
import { ScanDomainButton } from './ScanDomainButton'
import { StarIcon } from '@chakra-ui/icons'
@@ -154,24 +153,20 @@ export function DomainCard({
)
})}
-
-
- {isHidden && (
-
-
- HIDDEN
-
-
- )}
- {isArchived && (
-
-
- ARCHIVED
-
-
- )}{' '}
-
-
+ {isHidden && (
+
+
+ HIDDEN
+
+
+ )}
+ {isArchived && (
+
+
+ ARCHIVED
+
+
+ )}
diff --git a/services/summaries/cloudbuild.yaml b/services/summaries/cloudbuild.yaml
index 38116c1f13..e28d878524 100644
--- a/services/summaries/cloudbuild.yaml
+++ b/services/summaries/cloudbuild.yaml
@@ -2,7 +2,7 @@ steps:
- name: 'gcr.io/cloud-builders/docker'
id: start_testdb
entrypoint: /bin/sh
- args: ["-c", "docker run --net cloudbuild --name testdb -e ARANGO_NO_AUTH=1 -d -p 127.0.0.1:8529:8529 arangodb"]
+ args: ["-c", "docker run --net cloudbuild --name testdb -e ARANGO_NO_AUTH=1 -d -p 127.0.0.1:8529:8529 arangodb/arangodb:3.10.4"]
- name: mikewilliamson/wait-for
id: wait_testdb
diff --git a/services/summaries/summaries.py b/services/summaries/summaries.py
index b5f18e5474..576b8cecfe 100644
--- a/services/summaries/summaries.py
+++ b/services/summaries/summaries.py
@@ -75,8 +75,7 @@ def update_chart_summaries(host=DB_URL, name=DB_NAME, user=DB_USER, password=DB_
for domain in db.collection("domains"):
archived = domain.get("archived")
- hidden = is_domain_hidden(domain, db)
- if archived != True and hidden != True:
+ if archived != True:
# Update chart summaries
for chart_type in chartSummaries:
chart = chartSummaries[chart_type]