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

[Publisher][Agency Settings] Add new agency definition section for court and supervision sectors #1594

Merged
merged 8 commits into from
Dec 6, 2024
Merged

[Publisher][Agency Settings] Add new agency definition section for court and supervision sectors #1594

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81c8e2d
Add agency definition setting UI and logic
nasaownsky Nov 22, 2024
a418227
Handle combined agency scenarios
nasaownsky Dec 2, 2024
f40abce
Fix court setting appearing in supervision agencies
nasaownsky Dec 3, 2024
0d91a80
Fix populations UI bug
nasaownsky Dec 4, 2024
de7ffec
Fixes
nasaownsky Dec 4, 2024
90d11de
Add textbox functionality & fix checkbox select issue
nasaownsky Dec 6, 2024
36f5dc2
Fixes
nasaownsky Dec 6, 2024
93008cd
Fix typo
nasaownsky Dec 6, 2024
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
3 changes: 2 additions & 1 deletion common/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ export type AgencySettingType =
| "HOMEPAGE_URL"
| "ZIPCODE"
| "DATA_SHARING_TYPE"
| "BIOLOGICAL_SEX_RACE_ETHNICITY_DATA_SOURCE";
| "BIOLOGICAL_SEX_RACE_ETHNICITY_DATA_SOURCE"
| "SECTOR_INCLUDES_EXCLUDES";

export interface AgencySetting {
setting_type: AgencySettingType;
Expand Down
8 changes: 8 additions & 0 deletions publisher/src/components/AgencySettings/AgencySettings.styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,13 @@ export const SupervisionSystemRow = styled(AgencySettingsInfoRow)<{
border: none;
`;

// Agency Defifnition
Copy link
Contributor

Choose a reason for hiding this comment

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

tiniest nit: typo in Definition

export const DefinitionDescriptionInputWrapper = styled.div`
:not(:last-child) {
padding-bottom: 24px;
}
`;

// Data Source
export const DataSourceContainer = styled.div`
border-top: 1px solid ${palette.highlight.grey5};
Expand All @@ -453,6 +460,7 @@ export const DataSourceContainer = styled.div`
padding: 16px 40px;
`;
export const DataSourceTitle = styled.div`
text-transform: capitalize;
font-weight: 700;
padding-bottom: 8px;
`;
Expand Down
5 changes: 5 additions & 0 deletions publisher/src/components/AgencySettings/AgencySettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
} from "./AgencySettings.styles";
import { AgencySettingsBasicInfo } from "./AgencySettingsBasicInfo";
import AgencySettingsDataSource from "./AgencySettingsDataSource";
import AgencySettingsDefinition from "./AgencySettingsDefinition";
// TODO(#1537) Ungate zipcode and agency data sharing fields
// import AgencySettingsDataSharingType from "./AgencySettingsDataSharingType";
import AgencySettingsDescription from "./AgencySettingsDescription";
Expand All @@ -44,6 +45,7 @@ export enum ActiveSetting {
Supervisions = "SUPERVISIONS",
Jurisdictions = "JURISDICTIONS",
DataSource = "BIOLOGICAL_SEX_RACE_ETHNICITY_DATA_SOURCE",
Definition = "SECTOR_INCLUDES_EXCLUDES",
}

export type SettingProps = {
Expand Down Expand Up @@ -97,6 +99,9 @@ export const AgencySettings: React.FC = observer(() => {
<AgencySettingsUrl
settingProps={generateSettingProps(ActiveSetting.HomepageUrl)}
/>
<AgencySettingsDefinition
settingProps={generateSettingProps(ActiveSetting.Definition)}
/>
{/* TODO(#1537) Ungate zipcode and agency data sharing fields */}
{/* <AgencySettingsDataSharingType /> */}
<AgencySettingsEmailNotifications />
Expand Down
Loading
Loading