Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated header (Nav Bar) for hiding reports page #2238

Merged
merged 11 commits into from
Sep 20, 2023
Merged

Updated header (Nav Bar) for hiding reports page #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ea51441
Updated header for hiding reports page
courtneyc1 Sep 13, 2023
d927fb0
Updated header
courtneyc1 Sep 13, 2023
01120da
updated 2237 ticket for hiding reports page
courtneyc1 Sep 13, 2023
a5c7dbd
updated header (prettier)
courtneyc1 Sep 13, 2023
53dbd65
Merge branch 'master' of github.com:cisagov/crossfeed into 2237-hide-…
Matthew-Grayson Sep 18, 2023
9d6d5cf
Fix linting errors.
Matthew-Grayson Sep 18, 2023
2c82f64
Update snapshot to address 'header matches snapshot' test failure.
Matthew-Grayson Sep 18, 2023
2eaca99
Mark pendingDomains as optional to address type error in testOrganiza…
Matthew-Grayson Sep 18, 2023
f4b933f
Add pendingDomains to testOrganization; revert pendingDomains to bein…
Matthew-Grayson Sep 18, 2023
d5d74bb
Update frontend/src/components/Header.tsx
courtneyc1 Sep 20, 2023
573bcfc
Merge branch 'master' into 2237-hide-reports-page-1
courtneyc1 Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion frontend/src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 0 additions & 11 deletions frontend/src/components/__tests__/__snapshots__/header.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/test-utils/organization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ export const testOrganization = {
granularScans: [],
tags: [],
parent: null,
children: []
children: [],
pendingDomains: []
};
Loading