Filter domains by rcode blocked pending status

api/src/domain/inputs/domain-filter.js

@@ -1,16 +1,8 @@
 import { GraphQLInputObjectType, GraphQLEnumType } from 'graphql'
-import {
-  ComparisonEnums,
-  DomainOrderField,
-  DomainTagLabel,
-  StatusEnum,
-} from '../../enums'
+import { ComparisonEnums, DomainOrderField, DomainTagLabel, StatusEnum } from '../../enums'
 
 const filterValueEnumsVals = {}
-const filterValueEnums = [
-  ...StatusEnum.getValues(),
-  ...DomainTagLabel.getValues(),
-]
+const filterValueEnums = [...StatusEnum.getValues(), ...DomainTagLabel.getValues()]
 filterValueEnums.forEach(
   ({ name, value, description }) =>
     (filterValueEnumsVals[name] = {
@@ -21,8 +13,7 @@ filterValueEnums.forEach(
 
 export const domainFilter = new GraphQLInputObjectType({
   name: 'DomainFilter',
-  description:
-    'This object is used to provide filtering options when querying org-claimed domains.',
+  description: 'This object is used to provide filtering options when querying org-claimed domains.',
   fields: () => ({
     filterCategory: {
       type: DomainOrderField,

api/src/domain/loaders/load-domain-connections-by-organizations-id.js

@@ -380,6 +380,21 @@ export const loadDomainConnectionsByOrgId =
             ${domainFilters}
             FILTER domain.archived ${comparison} true
           `
+          } else if (filterValue === 'nxdomain') {
+            domainFilters = aql`
+            ${domainFilters}
+            FILTER domain.rcode ${comparison} "NXDOMAIN"
+          `
+          } else if (filterValue === 'blocked') {
+            domainFilters = aql`
+            ${domainFilters}
+            FILTER domain.blocked ${comparison} true
+          `
+          } else if (filterValue === 'scan-pending') {
+            domainFilters = aql`
+            ${domainFilters}
+            FILTER domain.webScanPending ${comparison} true
+          `
           } else {
             domainFilters = aql`
             ${domainFilters}

api/src/enums/domain-tag-label.js

@@ -13,13 +13,11 @@ export const DomainTagLabel = new GraphQLEnumType({
     },
     PROD: {
       value: 'PROD',
-      description:
-        'Bilingual Label for tagging domains as a production environment.',
+      description: 'Bilingual Label for tagging domains as a production environment.',
     },
     STAGING: {
       value: 'STAGING',
-      description:
-        'English label for tagging domains as a staging environment.',
+      description: 'English label for tagging domains as a staging environment.',
     },
     DEV: {
       value: 'DÉV',
@@ -49,6 +47,18 @@ export const DomainTagLabel = new GraphQLEnumType({
       value: 'archived',
       description: 'English label for tagging domains that are archived.',
     },
+    NXDOMAIN: {
+      value: 'nxdomain',
+      description: 'Label for tagging domains that have an rcode status of NXDOMAIN.',
+    },
+    BLOCKED: {
+      value: 'blocked',
+      description: 'Label for tagging domains that are possibly blocked by a firewall.',
+    },
+    SCAN_PENDING: {
+      value: 'scan-pending',
+      description: 'Label for tagging domains that have a pending web scan.',
+    },
   },
   description: 'An enum used to assign and test user-generated domain tags',
 })

frontend/src/domains/DomainsPage.js

@@ -152,14 +152,17 @@ export default function DomainsPage() {
 
       <InfoPanel isOpen={isOpen} onToggle={onToggle}>
         <InfoBox title={t`Domain`} info={t`The domain address.`} />
-        <InfoBox title={t`Ciphers`} info={t`Shows if the domain uses only ciphers that are strong or acceptable.`} />
-        <InfoBox title={t`Curves`} info={t`Shows if the domain uses only curves that are strong or acceptable.`} />
-        <InfoBox title={t`HSTS`} info={t`Shows if the domain meets the HSTS requirements.`} />
+        {/* Web statuses */}
         <InfoBox
           title={t`HTTPS`}
           info={t`Shows if the domain meets the Hypertext Transfer Protocol Secure (HTTPS) requirements.`}
         />
+        <InfoBox title={t`HSTS`} info={t`Shows if the domain meets the HSTS requirements.`} />
+        <InfoBox title={t`Certificates`} info={t`Shows if the domain has a valid SSL certificate.`} />
         <InfoBox title={t`Protocols`} info={t`Shows if the domain uses acceptable protocols.`} />
+        <InfoBox title={t`Ciphers`} info={t`Shows if the domain uses only ciphers that are strong or acceptable.`} />
+        <InfoBox title={t`Curves`} info={t`Shows if the domain uses only curves that are strong or acceptable.`} />
+        {/* Email statuses */}
         <InfoBox title={t`SPF`} info={t`Shows if the domain meets the Sender Policy Framework (SPF) requirements.`} />
         <InfoBox
           title={t`DKIM`}
@@ -169,6 +172,10 @@ export default function DomainsPage() {
           title={t`DMARC`}
           info={t`Shows if the domain meets the Message Authentication, Reporting, and Conformance (DMARC) requirements.`}
         />
+        {/* Tags */}
+        <InfoBox title={t`NXDOMAIN`} info={t`Tag used to show domains that have an rcode status of NXDOMAIN`} />
+        <InfoBox title={t`BLOCKED`} info={t`Tag used to show domains that are possibly blocked by a firewall.`} />
+        <InfoBox title={t`SCAN PENDING`} info={t`Tag used to show domains that have a pending web scan.`} />
       </InfoPanel>
 
       <ErrorBoundary FallbackComponent={ErrorFallbackMessage}>

frontend/src/graphql/queries.js

@@ -546,6 +546,7 @@ export const PAGINATED_ORG_DOMAINS = gql`
             claimTags
             hidden
             archived
+            rcode
             blocked
             webScanPending
           }