diff --git a/src/actions/sponsor-actions.js b/src/actions/sponsor-actions.js index a3a69e9dc..fd27476b5 100644 --- a/src/actions/sponsor-actions.js +++ b/src/actions/sponsor-actions.js @@ -1281,7 +1281,7 @@ const normalizeEntity = (entity) => { export const getBadgeScans = ( - sponsorId = null, + sponsor = null, page = 1, perPage = DEFAULT_PER_PAGE, order = "attendee_last_name", @@ -1296,8 +1296,8 @@ export const getBadgeScans = dispatch(startLoading()); - if (sponsorId) { - filter.push(`sponsor_id==${sponsorId}`); + if (sponsor) { + filter.push(`sponsor_id==${sponsor.id}`); } const params = { @@ -1327,7 +1327,7 @@ export const getBadgeScans = createAction(RECEIVE_BADGE_SCANS), `${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/badge-scans`, authErrorHandler, - { page, perPage, order, orderDir, sponsorId, summitTZ } + { page, perPage, order, orderDir, sponsor, summitTZ } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); diff --git a/src/pages/sponsors/badge-scans-list-page.js b/src/pages/sponsors/badge-scans-list-page.js index fa4e9c5cf..6e5f1420e 100644 --- a/src/pages/sponsors/badge-scans-list-page.js +++ b/src/pages/sponsors/badge-scans-list-page.js @@ -27,7 +27,7 @@ import Member from "../../models/member"; const BadgeScansListPage = ({ currentSummit, history, - sponsorId, + sponsor, allSponsors, badgeScans, order, @@ -40,27 +40,26 @@ const BadgeScansListPage = ({ ...props }) => { useEffect(() => { - if (sponsorId) { - props.getBadgeScans(sponsorId); + if (sponsor) { + props.getBadgeScans(sponsor); } }, []); const handlePageChange = (page) => { - props.getBadgeScans(sponsorId, page, perPage, order, orderDir); + props.getBadgeScans(sponsor, page, perPage, order, orderDir); }; const handleSort = (index, key, dir) => { - props.getBadgeScans(sponsorId, currentPage, perPage, key, dir); + props.getBadgeScans(sponsor, currentPage, perPage, key, dir); }; const handleSponsorChange = (ev) => { const { value } = ev.target; - props.getBadgeScans(value.id, currentPage, perPage, order, orderDir); + props.getBadgeScans(value, currentPage, perPage, order, orderDir); }; const handleExport = (ev) => { ev.preventDefault(); - const sponsor = allSponsors.find((s) => s.id === sponsorId); props.exportBadgeScans(sponsor, order, orderDir); }; @@ -135,14 +134,14 @@ const BadgeScansListPage = ({
- {!sponsorId ? ( + {!sponsor ? (
{T.translate("badge_scan_list.select_sponsor")}
) : ( <> diff --git a/src/reducers/sponsors/badge-scans-list-reducer.js b/src/reducers/sponsors/badge-scans-list-reducer.js index 8a4f31ac0..e2f4a6b1d 100644 --- a/src/reducers/sponsors/badge-scans-list-reducer.js +++ b/src/reducers/sponsors/badge-scans-list-reducer.js @@ -23,7 +23,7 @@ import { SET_CURRENT_SUMMIT } from "../../actions/summit-actions"; const DEFAULT_STATE = { badgeScans: [], - sponsorId: null, + sponsor: null, order: "attendee_last_name", orderDir: 1, currentPage: 1, @@ -42,8 +42,8 @@ const badgeScansListReducer = (state = DEFAULT_STATE, action = {}) => { return DEFAULT_STATE; } case REQUEST_BADGE_SCANS: { - const { order, orderDir, sponsorId, summitTZ } = payload; - return { ...state, order, orderDir, sponsorId, summitTZ }; + const { order, orderDir, sponsor, summitTZ } = payload; + return { ...state, order, orderDir, sponsor, summitTZ }; } case RECEIVE_BADGE_SCANS: { const {