Skip to content

DEV-13665+13674: settings error functional components #2094

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

Merged
dpb-bah merged 3 commits into from
Apr 20, 2026
Merged

DEV-13665+13674: settings error functional components #2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d037d4
missed a defaultProps in submissionsTable
alburde1 Apr 8, 2026
e0d2701
Updating error page to functional component
alburde1 Apr 9, 2026
4b0d97a
Updating settings components to functional ones
alburde1 Apr 9, 2026
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
40 changes: 16 additions & 24 deletions src/js/components/error/ErrorPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import { Link } from 'react-router';
import PropTypes from 'prop-types';

Expand All @@ -9,33 +8,26 @@ const propTypes = {
helpOnly: PropTypes.bool
};

const defaultProps = {
type: '',
helpOnly: false
};

export default class ErrorPage extends React.Component {
render() {
return (
<div className="site_wrap usa-da-error-page">
<Navbar type={this.props.type} logoOnly={this.props.helpOnly} />
<div className="site_content pending-page">
<div className="usa-da-content-dark">
<div className="container">
<div className="row usa-da-content-add-data usa-da-page-title">
<div className="col-md-7 mt-50 mb-50">
<div className="display-2">Page Not Found</div>
<p>No page exists at this address.</p>
<p><Link to="/">Click here</Link> to return home.</p>
</div>
const ErrorPage = ({type = '', helpOnly = false}) => {
return (
<div className="site_wrap usa-da-error-page">
<Navbar type={type} logoOnly={helpOnly} />
<div className="site_content pending-page">
<div className="usa-da-content-dark">
<div className="container">
<div className="row usa-da-content-add-data usa-da-page-title">
<div className="col-md-7 mt-50 mb-50">
<div className="display-2">Page Not Found</div>
<p>No page exists at this address.</p>
<p><Link to="/">Click here</Link> to return home.</p>
</div>
</div>
</div>
</div>
</div>
);
}
}
</div>
);
};

ErrorPage.propTypes = propTypes;
ErrorPage.defaultProps = defaultProps;
export default ErrorPage;
202 changes: 90 additions & 112 deletions src/js/components/settings/SettingsModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Created by Alisa Burdeyny 04/10/20
*/

import React from 'react';
import PropTypes from 'prop-types';
import { useState } from 'react';
import Modal from 'react-aria-modal';
import { startCase } from 'lodash';
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
Expand All @@ -21,126 +21,104 @@ const propTypes = {
isOpen: PropTypes.bool
};

const defaultProps = {
isOpen: false
};

export default class SettingsModal extends React.Component {
constructor(props) {
super(props);

this.state = {
agency: {
code: '',
name: ''
},
selectedRule: {
value: 'A',
label: 'File A'
},
errorLevel: 'error'
};
const SettingsModal = ({isOpen = false, ...props}) => {
const [errorLevel, setErrorLevel] = useState('error');
const [agency, setAgency] = useState({
code: '',
name: ''
});
const [selectedRule, setSelectedRule] = useState({
value: 'A',
label: 'File A'
});

this.updateAgency = this.updateAgency.bind(this);
this.updateRule = this.updateRule.bind(this);
this.setErrorLevel = this.setErrorLevel.bind(this);
}
const updateErrorLevel = (newErrorLevel) => {
setErrorLevel(newErrorLevel);
};

setErrorLevel(errorLevel) {
this.setState({
errorLevel
});
}
const updateAgency = (newAgency) => {
setAgency(newAgency);
};

updateAgency(agency) {
this.setState({
agency
});
}
const updateRule = (newRule) => {
setSelectedRule(newRule);
};

updateRule(rule) {
this.setState({
selectedRule: rule
});
}

render() {
const ruleList = validationRules.map((rule) =>
({
value: rule.value,
name: rule.label,
onClick: () => this.updateRule(rule)
}));
return (
<Modal
mounted={this.props.isOpen}
onExit={this.props.closeModal}
verticallyCenter
underlayClickExits
initialFocus="#close-button"
titleId="settings-modal">
<div className="usa-da-modal-page">
<div id="settings-modal" className="settings-modal">
<button
id="close-button"
className="close-button"
onClick={this.props.closeModal}
aria-label="close-modal-button">
<FontAwesomeIcon icon="xmark" />
</button>
<div className="settings-modal__content">
<div className="settings-modal__sidebar">
<h1>Settings</h1>
<h2><FontAwesomeIcon icon="filter" /> Agency</h2>
<SettingsAgencySelectContainer
updateAgency={this.updateAgency}
selectedAgency={this.state.agency} />
</div>
<div className="settings-modal__main">
<h2>Rule Settings</h2>
<div className="rule-settings-top">
<div className="description">
Change the Significance and Impact settings to alter the weight of your
agency&apos;s respective rules in the Active Dashboard chart.
</div>
<div className="validation-rule-select">
<h2><FontAwesomeIcon icon="filter" /> Validation Rules</h2>
<NewPicker
enabled
classname="validation-rule-picker-dropdown"
id="validation-rules-picker"
options={ruleList}
selectedOption={this.state.selectedRule.label}
sortFn={() => 0} />
</div>
const ruleList = validationRules.map((rule) =>
({
value: rule.value,
name: rule.label,
onClick: () => updateRule(rule)
}));
return (
<Modal
mounted={isOpen}
onExit={props.closeModal}
verticallyCenter
underlayClickExits
initialFocus="#close-button"
titleId="settings-modal">
<div className="usa-da-modal-page">
<div id="settings-modal" className="settings-modal">
<button
id="close-button"
className="close-button"
onClick={props.closeModal}
aria-label="close-modal-button">
<FontAwesomeIcon icon="xmark" />
</button>
<div className="settings-modal__content">
<div className="settings-modal__sidebar">
<h1>Settings</h1>
<h2><FontAwesomeIcon icon="filter" /> Agency</h2>
<SettingsAgencySelectContainer
updateAgency={updateAgency}
selectedAgency={agency} />
</div>
<div className="settings-modal__main">
<h2>Rule Settings</h2>
<div className="rule-settings-top">
<div className="description">
Change the Significance and Impact settings to alter the weight of your
agency&apos;s respective rules in the Active Dashboard chart.
</div>
<div className="validation-rule-select">
<h2><FontAwesomeIcon icon="filter" /> Validation Rules</h2>
<NewPicker
enabled
classname="validation-rule-picker-dropdown"
id="validation-rules-picker"
options={ruleList}
selectedOption={selectedRule.label}
sortFn={() => 0} />
</div>
<div className="tabs">
<div className="tabs__content">
{errorLevels.map((level) => (
<TabItem
key={level}
id={level}
label={`${startCase(level)}s`}
onClick={this.setErrorLevel}
active={this.state.errorLevel === level} />
))}
</div>
</div>
<div className="tabs">
<div className="tabs__content">
{errorLevels.map((level) => (
<TabItem
key={level}
id={level}
label={`${startCase(level)}s`}
onClick={updateErrorLevel}
active={errorLevel === level} />
))}
</div>
<SettingsTableContainer
agencyCode={this.state.agency.code}
file={this.state.selectedRule.value}
errorLevel={this.state.errorLevel} />
<SaveSettingsButton
agencyCode={this.state.agency.code}
file={this.state.selectedRule.value} />
</div>
<SettingsTableContainer
agencyCode={agency.code}
file={selectedRule.value}
errorLevel={errorLevel} />
<SaveSettingsButton
agencyCode={agency.code}
file={selectedRule.value} />
</div>
</div>
</div>
</Modal>
);
}
}
</div>
</Modal>
);
};

SettingsModal.defaultProps = defaultProps;
SettingsModal.propTypes = propTypes;
export default SettingsModal;
14 changes: 4 additions & 10 deletions src/js/components/settings/table/SettingsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@ const propTypes = {
updateOrder: PropTypes.func
};

const defaultProps = {
results: []
};

const SettingsTable = (props) => {
const SettingsTable = ({results = [], ...props}) => {

const columns = ['significance', 'impact', 'description'];
const [sortedItems, setSortedItems] = useState(listLabels(props.results));
const [sortedItems, setSortedItems] = useState(listLabels(results));

function handleDragEnd({ active, over }) {
// dropped outside list or in its old location
Expand All @@ -34,7 +30,7 @@ const SettingsTable = (props) => {

const activeIndex = active.data.current.sortable.index;
const overIndex = over.data.current?.sortable.index || 0;
const items = reorder(props.results, activeIndex, overIndex);
const items = reorder(results, activeIndex, overIndex);
props.updateOrder(items);
setSortedItems(listLabels(items));
}
Expand All @@ -54,7 +50,7 @@ const SettingsTable = (props) => {
</tr>
</thead>
<tbody className="broker-table__body">
{props.results.map((row, index) => (
{results.map((row, index) => (
<SettingsRow
key={row.label}
row={row}
Expand All @@ -68,7 +64,5 @@ const SettingsTable = (props) => {
);
};

SettingsTable.defaultProps = defaultProps;
SettingsTable.propTypes = propTypes;

export default SettingsTable;
15 changes: 4 additions & 11 deletions src/js/components/submissionsTable/filters/FilterSubmit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,25 @@ const propTypes = {
resetFilters: PropTypes.func
};

const defaultProps = {
filtersChanged: false,
applyStagedFilters: null,
resetFilters: null
};

const FilterSubmit = (props) => (
const FilterSubmit = ({filtersChanged = false, applyStagedFilters = null, resetFilters = null}) => (
<div className="dashboard-filters__submit-content">
<button
className="dashboard-filters__reset"
aria-label="Reset search"
onClick={props.resetFilters}>
onClick={resetFilters}>
Reset Filters
</button>
<button
className="btn-primary dashboard-filters__submit"
title="Submit"
aria-label="Submit"
disabled={!props.filtersChanged}
onClick={props.applyStagedFilters}>
disabled={!filtersChanged}
onClick={applyStagedFilters}>
Submit
</button>
</div>
);

FilterSubmit.propTypes = propTypes;
FilterSubmit.defaultProps = defaultProps;

export default FilterSubmit;
Loading
Loading