Merge branch 'master' into 2118-au-05-audit-process-migrate-logs-to-s…

…3-buckets
cisagov · Sep 25, 2023 · 21cb62d · 21cb62d
2 parents 3755f5b + ef2c654
commit 21cb62d
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 39 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -52,7 +52,7 @@
     "@types/aws-lambda": "^8.10.62",
     "@types/dockerode": "^3.3.19",
     "@types/jest": "^27",
-    "@types/node": "^18.11",
+    "@types/node": "^20.6",
     "@types/node-fetch": "^2.6.4",
     "@types/nodemailer": "^6.4.0",
     "@types/papaparse": "^5.3.0",

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -46,7 +46,7 @@
     "react-simple-maps": "^3.0.0",
     "react-table": "^7.8.0",
     "resolve-url-loader": "^5.0.0",
-    "universal-cookie": "^4.0.4",
+    "universal-cookie": "^6.1.1",
     "uswds": "^2.13.3",
     "web-vitals": "^2.1.4"
   },

diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
@@ -247,12 +247,16 @@ const HeaderNoCtx: React.FC<ContextType> = (props) => {
       exact: false
     },
     { title: 'Feeds', path: '/feeds', users: ALL_USERS, exact: false },
+
+    /* 
+    Hiding Reports page until finished 
     {
       title: 'Reports',
       path: '/reports',
       users: ALL_USERS,
       exact: true
-    },
+    },*/
+
     {
       title: 'Scans',
       path: '/scans',

diff --git a/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap b/frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap
@@ -60,17 +60,6 @@ exports[`Header component matches snapshot 1`] = `
                 Feeds
               </a>
             </div>
-            <div
-              class="css-g2ra7n"
-            >
-              <a
-                class="NavItem-link"
-                href="/reports"
-                style="outline: none;"
-              >
-                Reports
-              </a>
-            </div>
           </div>
           <div
             class="Header-spacing"

diff --git a/frontend/src/test-utils/organization.ts b/frontend/src/test-utils/organization.ts
@@ -9,5 +9,6 @@ export const testOrganization = {
   granularScans: [],
   tags: [],
   parent: null,
-  children: []
+  children: [],
+  pendingDomains: []
 };