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

Show tta overview widget to admins only #494

Merged
merged 9 commits into from
Jul 8, 2021
Merged

Show tta overview widget to admins only #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7fdf3d8
Added new topics
AdamAdHocTeam Jul 7, 2021
b5003d7
Added topics unit test.
AdamAdHocTeam Jul 7, 2021
81cf8e7
Show tta overview widgets to admins only
kryswisnaskas Jul 7, 2021
da6f6fa
Adjust mock user in tests
kryswisnaskas Jul 7, 2021
34384c3
Merge pull request #350 from adhocteam/kw-flag-overview-widget
kryswisnaskas Jul 8, 2021
b32a6f5
Merge branch 'main' into TTAHUB-182/Add-Three-New-Topics
AdamAdHocTeam Jul 8, 2021
bf53c41
Merge pull request #349 from adhocteam/TTAHUB-182/Add-Three-New-Topics
AdamAdHocTeam Jul 8, 2021
92bc7cd
Revert "Ttahub 182/add three new topics"
AdamAdHocTeam Jul 8, 2021
e0fa9c0
Merge pull request #351 from adhocteam/revert-349-TTAHUB-182/Add-Thre…
AdamAdHocTeam Jul 8, 2021
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
16 changes: 16 additions & 0 deletions frontend/src/pages/Landing/__tests__/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@ describe('Landing Page sorting', () => {
scopeId: 3,
regionId: 1,
},
{
scopeId: 2,
regionId: 1,
},
],
};

Expand Down Expand Up @@ -474,6 +478,10 @@ describe('Landing page table menus & selections', () => {
scopeId: 3,
regionId: 1,
},
{
scopeId: 2,
regionId: 1,
},
],
};

Expand Down Expand Up @@ -682,6 +690,10 @@ describe('Landing page table menus & selections', () => {
scopeId: 3,
regionId: 1,
},
{
scopeId: 2,
regionId: 1,
},
],
};

Expand Down Expand Up @@ -743,6 +755,10 @@ describe('My alerts sorting', () => {
scopeId: 3,
regionId: 1,
},
{
scopeId: 2,
regionId: 1,
},
],
};

Expand Down
6 changes: 4 additions & 2 deletions frontend/src/pages/Landing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import 'uswds/dist/css/uswds.css';
import '@trussworks/react-uswds/lib/index.css';
import './index.css';
import MyAlerts from './MyAlerts';
import { hasReadWrite, allRegionsUserHasPermissionTo } from '../../permissions';
import isAdmin, { hasReadWrite, allRegionsUserHasPermissionTo } from '../../permissions';
import { REPORTS_PER_PAGE, ALERTS_PER_PAGE } from '../../Constants';
import Filter, { filtersToQueryString } from './Filter';
import ReportMenu from './ReportMenu';
Expand Down Expand Up @@ -493,7 +493,7 @@ function Landing() {
<h1 className="landing">Activity Reports</h1>
</Grid>
<Grid col={2} className="flex-align-self-center">
{getUserRegions(user).length > 1
{isAdmin(user) && getUserRegions(user).length > 1
&& (
<RegionalSelect
regions={allRegionsUserHasPermissionTo(user)}
Expand All @@ -509,12 +509,14 @@ function Landing() {
</Grid>
<Grid row gap className="smart-hub--overview">
<Grid col={10}>
{isAdmin(user) && (
<Overview
filters={filters}
region={appliedRegion}
allRegions={getUserRegions(user)}
skipLoading
/>
)}
</Grid>
</Grid>
<Grid row>
Expand Down