diff --git a/src/constants/workPeriods.js b/src/constants/workPeriods.js index f79f417..8c9663c 100644 --- a/src/constants/workPeriods.js +++ b/src/constants/workPeriods.js @@ -42,6 +42,7 @@ export const API_REQUIRED_FIELDS = [ "endDate", "memberRate", "status", + "billingAccountId", "workPeriods.id", "workPeriods.projectId", "workPeriods.userHandle", @@ -128,6 +129,7 @@ export const API_CHALLENGE_PAYMENT_STATUS_MAP = { export const URL_QUERY_PARAM_MAP = new Map([ ["startDate", "startDate"], ["paymentStatuses", "status"], + ["alertOptions", "alert"], ["onlyFailedPayments", "onlyFailed"], ["userHandle", "user"], ["criteria", "by"], diff --git a/src/constants/workPeriods/alerts.js b/src/constants/workPeriods/alerts.js index cda3a22..9b507ae 100644 --- a/src/constants/workPeriods/alerts.js +++ b/src/constants/workPeriods/alerts.js @@ -1,2 +1,3 @@ export const BA_NOT_ASSIGNED = "BA_NOT_ASSIGNED"; +export const ONBOARDING_WEEK = "ONBOARDING_WEEK"; export const LAST_BOOKING_WEEK = "LAST_BOOKING_WEEK"; diff --git a/src/routes/WorkPeriods/components/PeriodFilters/index.jsx b/src/routes/WorkPeriods/components/PeriodFilters/index.jsx index 606555b..36c82d2 100644 --- a/src/routes/WorkPeriods/components/PeriodFilters/index.jsx +++ b/src/routes/WorkPeriods/components/PeriodFilters/index.jsx @@ -8,11 +8,12 @@ import CheckboxList from "components/CheckboxList"; import SearchHandleField from "components/SearchHandleField"; import SidebarSection from "components/SidebarSection"; import Toggle from "components/Toggle"; -import { PAYMENT_STATUS } from "constants/workPeriods"; +import { PAYMENT_STATUS, ALERT } from "constants/workPeriods"; import { getWorkPeriodsFilters } from "store/selectors/workPeriods"; import { resetWorkPeriodsFilters, setWorkPeriodsPaymentStatuses, + setAlertOption, setWorkPeriodsUserHandle, toggleShowFailedPaymentsOnly, } from "store/actions/workPeriods"; @@ -35,7 +36,7 @@ import styles from "./styles.module.scss"; const PeriodFilters = ({ className }) => { const dispatch = useDispatch(); const filters = useSelector(getWorkPeriodsFilters); - const { onlyFailedPayments, paymentStatuses, userHandle } = filters; + const { onlyFailedPayments, paymentStatuses, alertOptions, userHandle } = filters; const onToggleFailedPayments = useCallback( (on) => { @@ -61,6 +62,14 @@ const PeriodFilters = ({ className }) => { [dispatch] ); + const onAlertOptionsChange = useCallback( + (option) => { + dispatch(setAlertOption(option)); + dispatch(updateQueryFromState()); + }, + [dispatch] + ); + const onClearFilter = useCallback(() => { dispatch(resetWorkPeriodsFilters()); dispatch(updateQueryFromState()); @@ -113,6 +122,14 @@ const PeriodFilters = ({ className }) => { onChange={onToggleFailedPayments} /> + + +