[pull] master from canada-ca:master

frontend/src/domains/DomainCard.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react'
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
+import { t } from '@lingui/core/macro'
+import { Trans } from '@lingui/react/macro'
 import {
   Badge,
   Box,
@@ -19,7 +19,7 @@ import { Link as RouteLink, useLocation } from 'react-router-dom'
 import { array, bool, object, string } from 'prop-types'
 import { StatusBadge } from './StatusBadge'
 import { ScanDomainButton } from './ScanDomainButton'
-import { LinkIcon, StarIcon } from '@chakra-ui/icons'
+import { StarIcon } from '@chakra-ui/icons'
 import { FAVOURITE_DOMAIN, UNFAVOURITE_DOMAIN } from '../graphql/mutations'
 import { useMutation } from '@apollo/client'
 import { useUserVar } from '../utilities/userState'
@@ -39,7 +39,6 @@ function DomainCard({
   wildcardEntry,
   webScanPending,
   userHasPermission,
-  cveDetected,
   cvdEnrollment,
   ...rest
 }) {
@@ -181,21 +180,6 @@ function DomainCard({
                 )
               })}
 
-              {userHasPermission && cveDetected && (
-                <Tag
-                  my="1"
-                  bg="gray.50"
-                  borderWidth="1px"
-                  borderColor="gray.900"
-                  as={RouteLink}
-                  to={`/domains/${url}/additional-findings#vulnerabilities`}
-                >
-                  <TagLabel textColor="primary" fontWeight="bold" mx="auto">
-                    <Trans>SPIN Top 25</Trans> <LinkIcon />
-                  </TagLabel>
-                </Tag>
-              )}
-
               {userHasPermission && cvdEnrollment && cvdEnrollment.status !== 'NOT_ENROLLED' && (
                 <Tag my="1" bg="gray.50" borderWidth="1px" borderColor="gray.900">
                   <TagLabel textColor="primary" fontWeight="bold" mx="auto">
@@ -236,7 +220,10 @@ function DomainCard({
               variant="primary"
               as={RouteLink}
               to={isLoggedIn() ? `/domains/${url}` : '/sign-in'}
-              state={{ from: location.pathname, searchParams: `?${searchParams.toString()}` }}
+              state={{
+                from: location.pathname,
+                searchParams: `?${searchParams.toString()}`,
+              }}
               px="10"
             >
               <Text whiteSpace="noWrap">
@@ -303,7 +290,6 @@ DomainCard.propTypes = {
   webScanPending: bool,
   userHasPermission: bool,
   assetState: string,
-  cveDetected: bool,
   cvdEnrollment: object,
 }
 

frontend/src/domains/DomainsPage.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useState } from 'react'
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
+import { t } from '@lingui/core/macro'
+import { Trans } from '@lingui/react/macro'
 import {
   Box,
   Code,
@@ -249,7 +249,6 @@ export default function DomainsPage() {
             wildcardEntry,
             webScanPending,
             userHasPermission,
-            cveDetected,
             cvdEnrollment,
           },
           index,
@@ -268,7 +267,6 @@ export default function DomainsPage() {
               wildcardEntry={wildcardEntry}
               webScanPending={webScanPending}
               userHasPermission={userHasPermission}
-              cveDetected={cveDetected}
               cvdEnrollment={cvdEnrollment}
               mb="3"
             />

frontend/src/graphql/queries.js

@@ -334,7 +334,6 @@ export const DOMAIN_GUIDANCE_PAGE = gql`
       wildcardSibling
       wildcardEntry
       webScanPending
-      cveDetected
       status {
         ...RequiredDomainStatusFields
       }
@@ -865,7 +864,6 @@ export const PAGINATED_ORG_DOMAINS = gql`
             wildcardEntry
             webScanPending
             userHasPermission
-            cveDetected
             cvdEnrollment {
               status
             }
@@ -938,7 +936,6 @@ export const PAGINATED_DOMAINS = gql`
           archived
           hasDMARCReport
           userHasPermission
-          cveDetected
           cvdEnrollment {
             status
           }

frontend/src/guidance/GuidancePage.js

@@ -35,7 +35,6 @@ import { FAVOURITE_DOMAIN } from '../graphql/mutations'
 import { LoadingMessage } from '../components/LoadingMessage'
 import { ErrorFallbackMessage } from '../components/ErrorFallbackMessage'
 import { useUserVar } from '../utilities/userState'
-import { AdditionalFindings } from './AdditionalFindings'
 
 import { ListOf } from '../components/ListOf'
 import { RequestOrgInviteModal } from '../organizations/RequestOrgInviteModal'
@@ -49,7 +48,7 @@ function GuidancePage() {
   const { isOpen, onOpen, onClose } = useDisclosure()
   const { domainSlug: domain, activeTab } = useParams()
   const toast = useToast()
-  const tabNames = ['web-guidance', 'email-guidance', 'additional-findings']
+  const tabNames = ['web-guidance', 'email-guidance']
   const defaultActiveTab = tabNames[0]
 
   const { loading, error, data } = useQuery(DOMAIN_GUIDANCE_PAGE, {
@@ -61,7 +60,9 @@ function GuidancePage() {
   const navigate = useNavigate()
   const location = useLocation()
   const { isLoggedIn, isEmailValidated } = useUserVar()
-  const { from, searchParams } = location.state || { from: { pathname: '/domains', searchParams: '' } }
+  const { from, searchParams } = location.state || {
+    from: { pathname: '/domains', searchParams: '' },
+  }
   const [orgInfo, setOrgInfo] = useState({})
 
   const formatTimestamp = (ts) => {
@@ -92,13 +93,19 @@ function GuidancePage() {
   const changeActiveTab = (index) => {
     const tab = tabNames[index]
     if (activeTab !== tab) {
-      navigate(`/domains/${domain}/${tab}`, { replace: true, state: location.state })
+      navigate(`/domains/${domain}/${tab}`, {
+        replace: true,
+        state: location.state,
+      })
     }
   }
 
   useEffect(() => {
     if (!activeTab) {
-      navigate(`/domains/${domain}/${defaultActiveTab}`, { replace: true, state: location.state })
+      navigate(`/domains/${domain}/${defaultActiveTab}`, {
+        replace: true,
+        state: location.state,
+      })
     }
   }, [activeTab, navigate, defaultActiveTab])
 
@@ -291,9 +298,6 @@ function GuidancePage() {
           <Tab borderTopWidth="0.25">
             <Trans>Email Guidance</Trans>
           </Tab>
-          <Tab borderTopWidth="0.25">
-            <Trans>Additional Findings</Trans>
-          </Tab>
         </TabList>
         <TabPanels>
           <TabPanel>
@@ -314,9 +318,6 @@ function GuidancePage() {
               </EmailGuidance>
             )}
           </TabPanel>
-          <TabPanel>
-            <AdditionalFindings domain={domainName} />
-          </TabPanel>
         </TabPanels>
       </Tabs>
     )

frontend/src/organizationDetails/OrganizationDomains.js

@@ -1,6 +1,6 @@
 import React, { useState, useCallback } from 'react'
-import { t } from "@lingui/core/macro"
-import { Trans } from "@lingui/react/macro"
+import { t } from '@lingui/core/macro'
+import { Trans } from '@lingui/react/macro'
 import { Box, Flex, Text, useDisclosure } from '@chakra-ui/react'
 import { ErrorBoundary } from 'react-error-boundary'
 import { array, bool, string } from 'prop-types'
@@ -41,7 +41,13 @@ export function OrganizationDomains({
 
   const { searchValue: filters, setSearchParams: setFilters } = useSearchParam({
     name: 'domain-filters',
-    defaultValue: [{ filterCategory: 'HTTPS_STATUS', comparison: 'NOT_EQUAL', filterValue: 'INFO' }],
+    defaultValue: [
+      {
+        filterCategory: 'HTTPS_STATUS',
+        comparison: 'NOT_EQUAL',
+        filterValue: 'INFO',
+      },
+    ],
   })
 
   const memoizedSetDebouncedSearchTermCallback = useCallback(() => {
@@ -133,7 +139,7 @@ export function OrganizationDomains({
 
   const guidanceTagOptions = negativeFindings?.map(({ tagId, tagName }) => {
     const getTagCategoryFromId = (id) => {
-      return id.split(/[0-9]/)[0].toUpperCase();
+      return id.split(/[0-9]/)[0].toUpperCase()
     }
     return { value: tagId, text: `${getTagCategoryFromId(tagId)}: ${tagName}` }
   })
@@ -180,7 +186,6 @@ export function OrganizationDomains({
             wildcardEntry,
             webScanPending,
             userHasPermission,
-            cveDetected,
             cvdEnrollment,
           },
           index,
@@ -201,7 +206,6 @@ export function OrganizationDomains({
               wildcardEntry={wildcardEntry}
               webScanPending={webScanPending}
               userHasPermission={userHasPermission}
-              cveDetected={cveDetected}
               cvdEnrollment={cvdEnrollment}
               mb="3"
             />

k8s/apps/bases/frontend/deployment.yaml

@@ -24,7 +24,7 @@ spec:
         seccompProfile:
           type: RuntimeDefault
       containers:
-        - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend:master-120e388-1787074829 # {"$imagepolicy": "flux-system:frontend"}
+        - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend:master-7404a26-1787147884 # {"$imagepolicy": "flux-system:frontend"}
           name: frontend
           env:
             - name: FRENCH_HOSTS

k8s/apps/overlays/production/import-easm-additional-findings-suspend-patch.yaml

@@ -0,0 +1,7 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: import-easm-additional-findings
+  namespace: azure-defender-easm
+spec:
+  suspend: true

k8s/apps/overlays/production/kustomization.yaml

@@ -34,5 +34,6 @@ patchesStrategicMerge:
   - frontend-production-env-patch.yaml
   - update-selectors-enable-selector-removal-patch.yaml
   - api-production-env-patch.yaml
+  - import-easm-additional-findings-suspend-patch.yaml
 components:
 #  - ../../bases/frontend/maintenance-override-component