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

Jump to bottom

[Publisher][Superagencies] Add dropdown for child agencies #1314

Merged
merged 14 commits into from Apr 29, 2024
Merged

[Publisher][Superagencies] Add dropdown for child agencies #1314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1e7edb4
Add child agencies persistence for superagencies
nasaownsky Apr 9, 2024
995e4b6
Fix lint
nasaownsky Apr 9, 2024
3868c9f
Add dropdown UI for child agencies to Set Up Metrics page
nasaownsky Apr 10, 2024
f6949f7
Merge branch 'main' of https://github.com/Recidiviz/justice-counts in…
nasaownsky Apr 19, 2024
efd2272
Keep dropdown visible for child agencies
nasaownsky Apr 19, 2024
059b152
Clean up
nasaownsky Apr 19, 2024
0b69d03
Add superagency to dropdown if viewing child agency
nasaownsky Apr 22, 2024
55ff5d0
Fix superagency id getting
nasaownsky Apr 25, 2024
144b67c
Create dropdown component
nasaownsky Apr 25, 2024
9e4f483
Add dropdown to Explore Data page
nasaownsky Apr 25, 2024
737b2ac
Clean up
nasaownsky Apr 25, 2024
1976eb3
Fixes
nasaownsky Apr 26, 2024
3c802cf
More fixes
nasaownsky Apr 26, 2024
0c73354
Minor fix
nasaownsky Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion publisher/src/components/DataViz/MetricsDataChart.tsx
View file
Open in desktop
Expand Up @@ -348,8 +348,8 @@ export const MetricsDataChart: React.FC = observer(() => {

{/* Data Visualization */}
<Styled.PanelContainerRight>
<ChildAgenciesDropdown view="data" />
<Styled.MobileDatapointsControls>
<ChildAgenciesDropdown view="data" />
<Styled.CurrentMetricsSystem isSuperagency={isSuperagency}>
{formatSystemName(currentSystem)}
</Styled.CurrentMetricsSystem>
Expand Down
7 changes: 6 additions & 1 deletion publisher/src/components/Menu/Menu.tsx
View file
Open in desktop
Expand Up @@ -199,7 +199,12 @@ const Menu: React.FC = () => {
const superagencyId = userStore.isAgencySuperagency(agencyId)
? agencyId
: currentAgency?.super_agency_id;
if (superagencyId) agencyStore.getChildAgencies(String(superagencyId));
const userHasAccessToSuperagency = userStore.userAgencies?.find(
(agency) => agency.id === Number(superagencyId)
);

if (superagencyId && userHasAccessToSuperagency)
agencyStore.getChildAgencies(String(superagencyId));
}, [agencyId, currentAgency, agencyStore, userStore]);
mxosman marked this conversation as resolved.
Show resolved Hide resolved

return (
Expand Down
2 changes: 1 addition & 1 deletion publisher/src/components/MetricsConfiguration/ChildAgenciesDropdown.styled.tsx
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ export const DropdownWrapper = styled.div`
padding-bottom: 10px;
& ${CustomDropdown} {
width: 100%;
max-width: 360px;
max-width: 420px;
border: 1px solid ${palette.highlight.grey2};
padding: 0 12px;

Expand Down
5 changes: 3 additions & 2 deletions publisher/src/components/MetricsConfiguration/ChildAgenciesDropdown.tsx
View file
Open in desktop
Expand Up @@ -38,8 +38,9 @@ export const ChildAgenciesDropdown: React.FC<{
const isSuperagency = userStore.isAgencySuperagency(agencyId);
const superagencyId = currentAgency?.super_agency_id ?? agencyId;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry - suggested change here to make this a bit more accurate:

  const superagencyId = isSuperagency
    ? agencyId
    : currentAgency?.super_agency_id;


const isChildAgency =
!currentAgency?.is_superagency && !!currentAgency?.super_agency_id;
const isChildAgency = superagencyChildAgencies?.some(
(childAgency) => childAgency.id === currentAgency?.id
);
mxosman marked this conversation as resolved.
Show resolved Hide resolved
mxosman marked this conversation as resolved.
Show resolved Hide resolved

const currentSuperagency = userStore.userAgencies?.find(
(agency) => agency.id === superagencyId
Expand Down