diff --git a/src/actions/sponsor-forms-actions.js b/src/actions/sponsor-forms-actions.js index 4fa43055c..659877e82 100644 --- a/src/actions/sponsor-forms-actions.js +++ b/src/actions/sponsor-forms-actions.js @@ -44,7 +44,6 @@ export const SPONSOR_FORM_UNARCHIVED = "SPONSOR_FORM_UNARCHIVED"; export const SPONSOR_FORM_DELETED = "SPONSOR_FORM_DELETED"; export const REQUEST_GLOBAL_TEMPLATES = "REQUEST_GLOBAL_TEMPLATES"; export const RECEIVE_GLOBAL_TEMPLATES = "RECEIVE_GLOBAL_TEMPLATES"; -export const RECEIVE_GLOBAL_SPONSORSHIPS = "RECEIVE_GLOBAL_SPONSORSHIPS"; export const GLOBAL_TEMPLATE_CLONED = "GLOBAL_TEMPLATE_CLONED"; export const TEMPLATE_FORM_CREATED = "TEMPLATE_FORM_CREATED"; export const RESET_TEMPLATE_FORM = "RESET_TEMPLATE_FORM"; @@ -310,35 +309,6 @@ export const getGlobalTemplates = }); }; -export const getSponsorships = - (page = 1, perPage = DEFAULT_PER_PAGE) => - async (dispatch, getState) => { - const { currentSummitState } = getState(); - const accessToken = await getAccessTokenSafely(); - const { currentSummit } = currentSummitState; - - dispatch(startLoading()); - - const params = { - page, - per_page: perPage, - access_token: accessToken, - sorting: "order", - expand: "type", - relations: "type", - fields: "id,type.id,type.name" - }; - - return getRequest( - null, - createAction(RECEIVE_GLOBAL_SPONSORSHIPS), - `${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/sponsorships-types`, - authErrorHandler - )(params)(dispatch).then(() => { - dispatch(stopLoading()); - }); - }; - export const cloneGlobalTemplate = (templateIds, sponsorIds, allSponsors) => async (dispatch, getState) => { const { currentSummitState } = getState(); diff --git a/src/actions/summit-actions.js b/src/actions/summit-actions.js index 15a178edd..10ec9a850 100644 --- a/src/actions/summit-actions.js +++ b/src/actions/summit-actions.js @@ -54,6 +54,8 @@ export const RECEIVE_LEAD_REPORT_SETTINGS_META = "RECEIVE_LEAD_REPORT_SETTINGS_META"; export const LEAD_REPORT_SETTINGS_UPDATED = "LEAD_REPORT_SETTINGS_UPDATED"; export const RECEIVE_LEAD_REPORT_SETTINGS = "RECEIVE_LEAD_REPORT_SETTINGS"; +export const RECEIVE_SUMMIT_SPONSORSHIP_TYPES = + "RECEIVE_SUMMIT_SPONSORSHIP_TYPES"; export const getSummitById = (summitId) => async (dispatch, getState) => { const accessToken = await getAccessTokenSafely(); @@ -536,3 +538,32 @@ const normalizeEntity = (entity) => { } return normalizedEntity; }; + +export const getSummitSponsorshipTypes = + (page = 1, perPage = DEFAULT_PER_PAGE) => + async (dispatch, getState) => { + const { currentSummitState } = getState(); + const accessToken = await getAccessTokenSafely(); + const { currentSummit } = currentSummitState; + + dispatch(startLoading()); + + const params = { + page, + per_page: perPage, + access_token: accessToken, + sorting: "order", + expand: "type", + relations: "type", + fields: "id,type.id,type.name" + }; + + return getRequest( + null, + createAction(RECEIVE_SUMMIT_SPONSORSHIP_TYPES), + `${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/sponsorships-types`, + authErrorHandler + )(params)(dispatch).then(() => { + dispatch(stopLoading()); + }); + }; diff --git a/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js b/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js index b93111757..b8323d2ce 100644 --- a/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js +++ b/src/pages/sponsors/show-pages-list-page/__tests__/show-pages-list-page.test.js @@ -13,8 +13,7 @@ import { archiveShowPage, unarchiveShowPage } from "../../../../actions/show-pages-actions"; -import { getSponsorships } from "../../../../actions/sponsor-forms-actions"; - +import { getSummitSponsorshipTypes } from "../../../../actions/summit-actions"; import { DEFAULT_CURRENT_PAGE, MAX_PER_PAGE @@ -61,8 +60,8 @@ jest.mock("../../../../actions/show-pages-actions", () => ({ resetShowPageForm: jest.fn(() => ({ type: "MOCK_ACTION" })) })); -jest.mock("../../../../actions/sponsor-forms-actions", () => ({ - getSponsorships: jest.fn(() => () => Promise.resolve({ items: [] })) +jest.mock("../../../../actions/summit-actions", () => ({ + getSummitSponsorshipTypes: jest.fn(() => () => Promise.resolve({ items: [] })) })); // Helper to create show page data @@ -134,7 +133,7 @@ describe("ShowPagesListPage", () => { await act(async () => { await userEvent.click(editButton); }); - expect(getSponsorships).toHaveBeenCalledWith( + expect(getSummitSponsorshipTypes).toHaveBeenCalledWith( DEFAULT_CURRENT_PAGE, MAX_PER_PAGE ); @@ -158,7 +157,7 @@ describe("ShowPagesListPage", () => { await act(async () => { await userEvent.click(editButton); }); - expect(getSponsorships).toHaveBeenCalledWith( + expect(getSummitSponsorshipTypes).toHaveBeenCalledWith( DEFAULT_CURRENT_PAGE, MAX_PER_PAGE ); diff --git a/src/pages/sponsors/show-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js index f9c64b527..b4cbe22d7 100644 --- a/src/pages/sponsors/show-pages-list-page/index.js +++ b/src/pages/sponsors/show-pages-list-page/index.js @@ -34,7 +34,7 @@ import { deleteShowPage, resetShowPageForm } from "../../../actions/show-pages-actions"; -import { getSponsorships } from "../../../actions/sponsor-forms-actions"; +import { getSummitSponsorshipTypes } from "../../../actions/summit-actions"; import CustomAlert from "../../../components/mui/custom-alert"; import GlobalPagePopup from "./components/global-page/global-page-popup"; import PageTemplatePopup from "../../sponsors-global/page-templates/page-template-popup"; @@ -58,7 +58,7 @@ const ShowPagesListPage = ({ saveShowPage, deleteShowPage, resetShowPageForm, - getSponsorships + getSummitSponsorshipTypes }) => { const [openPopup, setOpenPopup] = useState(null); @@ -125,7 +125,7 @@ const ShowPagesListPage = ({ const handleOpenPageTemplatePopup = async (row) => { await Promise.all([ - getSponsorships(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE), + getSummitSponsorshipTypes(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE), getShowPage(row.id) ]); setOpenPopup("pageTemplate"); @@ -137,7 +137,7 @@ const ShowPagesListPage = ({ }; const handleNewShowPage = async () => { - await getSponsorships(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE); + await getSummitSponsorshipTypes(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE); resetShowPageForm(); setOpenPopup("pageTemplate"); }; @@ -296,5 +296,5 @@ export default connect(mapStateToProps, { saveShowPage, deleteShowPage, resetShowPageForm, - getSponsorships + getSummitSponsorshipTypes })(ShowPagesListPage); diff --git a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/__tests__/form-template-popup.test.js b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/__tests__/form-template-popup.test.js index 062fd01eb..71c4e2aa5 100644 --- a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/__tests__/form-template-popup.test.js +++ b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/__tests__/form-template-popup.test.js @@ -8,10 +8,15 @@ import FormTemplatePopup from "../form-template-popup"; jest.mock("actions/sponsor-forms-actions", () => ({ saveFormTemplate: jest.fn(), updateFormTemplate: jest.fn(), - getSponsorships: jest.fn(() => ({ type: "GET_SPONSORSHIPS" })), resetFormTemplate: jest.fn(() => ({ type: "RESET_TEMPLATE_FORM" })) })); +jest.mock("actions/summit-actions", () => ({ + getSummitSponsorshipTypes: jest.fn(() => ({ + type: "GET_SUMMIT_SPONSORSHIP_TYPES" + })) +})); + jest.mock("../form-template-form", () => ({ __esModule: true, default: ({ onSubmit, isSaving }) => ( diff --git a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-popup.js b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-popup.js index 952002057..964104c19 100644 --- a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-popup.js +++ b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-popup.js @@ -11,11 +11,11 @@ import { } from "@mui/material"; import CloseIcon from "@mui/icons-material/Close"; import { - getSponsorships, resetFormTemplate, saveFormTemplate, updateFormTemplate } from "../../../../../actions/sponsor-forms-actions"; +import { getSummitSponsorshipTypes } from "../../../../../actions/summit-actions"; import { MAX_PER_PAGE } from "../../../../../utils/constants"; import FormTemplateForm from "./form-template-form"; @@ -25,7 +25,7 @@ const FormTemplatePopup = ({ formTemplate, open, onClose, - getSponsorships, + getSummitSponsorshipTypes, resetFormTemplate, saveFormTemplate, updateFormTemplate, @@ -34,7 +34,7 @@ const FormTemplatePopup = ({ const [isSaving, setIsSaving] = useState(false); useEffect(() => { - getSponsorships(1, MAX_PER_PAGE); + getSummitSponsorshipTypes(1, MAX_PER_PAGE); }, []); const closePopup = () => { @@ -126,5 +126,5 @@ export default connect(mapStateToProps, { resetFormTemplate, saveFormTemplate, updateFormTemplate, - getSponsorships + getSummitSponsorshipTypes })(FormTemplatePopup); diff --git a/src/pages/sponsors/sponsor-forms-list-page/components/global-template/select-sponsorships-dialog.js b/src/pages/sponsors/sponsor-forms-list-page/components/global-template/select-sponsorships-dialog.js index f24a9c2dc..cc4321e2d 100644 --- a/src/pages/sponsors/sponsor-forms-list-page/components/global-template/select-sponsorships-dialog.js +++ b/src/pages/sponsors/sponsor-forms-list-page/components/global-template/select-sponsorships-dialog.js @@ -12,7 +12,7 @@ import { Typography } from "@mui/material"; import CloseIcon from "@mui/icons-material/Close"; -import { getSponsorships } from "../../../../../actions/sponsor-forms-actions"; +import { getSummitSponsorshipTypes } from "../../../../../actions/summit-actions"; import { DEFAULT_PER_PAGE } from "../../../../../utils/constants"; import CheckBoxList from "../../../../../components/mui/checkbox-list"; @@ -21,18 +21,18 @@ const SelectSponsorshipsDialog = ({ onSave, onClose, isSaving = false, - getSponsorships + getSummitSponsorshipTypes }) => { const { items, currentPage, total } = sponsorships; const [selection, setSelection] = useState({ ids: [], all: false }); useEffect(() => { - getSponsorships(1, DEFAULT_PER_PAGE); + getSummitSponsorshipTypes(1, DEFAULT_PER_PAGE); }, []); const handleLoadMore = () => { if (total > items.length) { - getSponsorships(currentPage + 1, DEFAULT_PER_PAGE); + getSummitSponsorshipTypes(currentPage + 1, DEFAULT_PER_PAGE); } }; @@ -103,5 +103,5 @@ const mapStateToProps = ({ sponsorFormsListState }) => ({ }); export default connect(mapStateToProps, { - getSponsorships + getSummitSponsorshipTypes })(SelectSponsorshipsDialog); diff --git a/src/pages/sponsors/sponsor-forms-list-page/index.js b/src/pages/sponsors/sponsor-forms-list-page/index.js index 8296b1a49..ef6fa7471 100644 --- a/src/pages/sponsors/sponsor-forms-list-page/index.js +++ b/src/pages/sponsors/sponsor-forms-list-page/index.js @@ -32,11 +32,11 @@ import { archiveSponsorForm, getSponsorForm, getSponsorForms, - getSponsorships, unarchiveSponsorForm, deleteSponsorForm, updateFormTemplateTiers } from "../../../actions/sponsor-forms-actions"; +import { getSummitSponsorshipTypes } from "../../../actions/summit-actions"; import CustomAlert from "../../../components/mui/custom-alert"; import GlobalTemplatePopup from "./components/global-template/global-template-popup"; import FormTemplatePopup from "./components/form-template/form-template-popup"; @@ -54,7 +54,7 @@ const SponsorFormsListPage = ({ totalCount, getSponsorForms, getSponsorForm, - getSponsorships, + getSummitSponsorshipTypes, archiveSponsorForm, unarchiveSponsorForm, deleteSponsorForm, @@ -65,8 +65,8 @@ const SponsorFormsListPage = ({ useEffect(() => { getSponsorForms(); - getSponsorships(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE); - }, [getSponsorForms, getSponsorships]); + getSummitSponsorshipTypes(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE); + }, [getSponsorForms, getSummitSponsorshipTypes]); const handlePageChange = (page) => { getSponsorForms(term, page, perPage, order, orderDir, showArchived); @@ -449,7 +449,7 @@ const mapStateToProps = ({ sponsorFormsListState }) => ({ export default connect(mapStateToProps, { getSponsorForms, getSponsorForm, - getSponsorships, + getSummitSponsorshipTypes, archiveSponsorForm, unarchiveSponsorForm, deleteSponsorForm, diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js index 8390173b8..e327132cd 100644 --- a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js +++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js @@ -61,8 +61,12 @@ jest.mock("../../../../../../actions/sponsor-pages-actions", () => ({ })); jest.mock("../../../../../../actions/sponsor-forms-actions", () => ({ - ...jest.requireActual("../../../../../../actions/sponsor-forms-actions"), - getSponsorships: jest.fn(() => () => Promise.resolve()) + ...jest.requireActual("../../../../../../actions/sponsor-forms-actions") +})); + +jest.mock("../../../../../../actions/summit-actions", () => ({ + ...jest.requireActual("../../../../../../actions/summit-actions"), + getSummitSponsorshipTypes: jest.fn(() => () => Promise.resolve()) })); // Helpers diff --git a/src/reducers/sponsors/__tests__/show-pages-list-reducer.test.js b/src/reducers/sponsors/__tests__/show-pages-list-reducer.test.js index 32c0875f3..ceacc168e 100644 --- a/src/reducers/sponsors/__tests__/show-pages-list-reducer.test.js +++ b/src/reducers/sponsors/__tests__/show-pages-list-reducer.test.js @@ -2,7 +2,10 @@ import { LOGOUT_USER } from "openstack-uicore-foundation/lib/security/actions"; import showPagesListReducer, { DEFAULT_STATE } from "../show-pages-list-reducer"; -import { SET_CURRENT_SUMMIT } from "../../../actions/summit-actions"; +import { + SET_CURRENT_SUMMIT, + RECEIVE_SUMMIT_SPONSORSHIP_TYPES +} from "../../../actions/summit-actions"; import { REQUEST_SHOW_PAGES, RECEIVE_SHOW_PAGES, @@ -12,7 +15,6 @@ import { SHOW_PAGE_DELETED, RESET_SHOW_PAGE_FORM } from "../../../actions/show-pages-actions"; -import { RECEIVE_GLOBAL_SPONSORSHIPS } from "../../../actions/sponsor-forms-actions"; import { PAGE_MODULES_DOWNLOAD, PAGES_MODULE_KINDS @@ -409,7 +411,7 @@ describe("showPagesListReducer", () => { }); }); - describe("RECEIVE_GLOBAL_SPONSORSHIPS", () => { + describe("RECEIVE_SUMMIT_SPONSORSHIP_TYPES", () => { const makePayload = (currentPage, data) => ({ response: { current_page: currentPage, @@ -430,7 +432,7 @@ describe("showPagesListReducer", () => { }); const result = showPagesListReducer(state, { - type: RECEIVE_GLOBAL_SPONSORSHIPS, + type: RECEIVE_SUMMIT_SPONSORSHIP_TYPES, payload: makePayload(1, [{ id: 2, type: { name: "Gold" } }]) }); @@ -453,7 +455,7 @@ describe("showPagesListReducer", () => { }); const result = showPagesListReducer(state, { - type: RECEIVE_GLOBAL_SPONSORSHIPS, + type: RECEIVE_SUMMIT_SPONSORSHIP_TYPES, payload: makePayload(2, [{ id: 2, type: { name: "Silver" } }]) }); diff --git a/src/reducers/sponsors/show-pages-list-reducer.js b/src/reducers/sponsors/show-pages-list-reducer.js index 3df094fa9..9b69913f3 100644 --- a/src/reducers/sponsors/show-pages-list-reducer.js +++ b/src/reducers/sponsors/show-pages-list-reducer.js @@ -22,8 +22,10 @@ import { SHOW_PAGE_DELETED, RESET_SHOW_PAGE_FORM } from "../../actions/show-pages-actions"; -import { SET_CURRENT_SUMMIT } from "../../actions/summit-actions"; -import { RECEIVE_GLOBAL_SPONSORSHIPS } from "../../actions/sponsor-forms-actions"; +import { + SET_CURRENT_SUMMIT, + RECEIVE_SUMMIT_SPONSORSHIP_TYPES +} from "../../actions/summit-actions"; import { denormalizePageModules } from "../../utils/page-template"; const DEFAULT_SHOW_PAGE = { @@ -154,7 +156,7 @@ const showPagesListReducer = (state = DEFAULT_STATE, action) => { case RESET_SHOW_PAGE_FORM: { return { ...state, currentShowPage: DEFAULT_SHOW_PAGE }; } - case RECEIVE_GLOBAL_SPONSORSHIPS: { + case RECEIVE_SUMMIT_SPONSORSHIP_TYPES: { const { current_page: currentPage, last_page: lastPage, diff --git a/src/reducers/sponsors/sponsor-forms-list-reducer.js b/src/reducers/sponsors/sponsor-forms-list-reducer.js index ca057b3ae..09469477f 100644 --- a/src/reducers/sponsors/sponsor-forms-list-reducer.js +++ b/src/reducers/sponsors/sponsor-forms-list-reducer.js @@ -14,7 +14,6 @@ import { LOGOUT_USER } from "openstack-uicore-foundation/lib/security/actions"; import T from "i18n-react/dist/i18n-react"; import { - RECEIVE_GLOBAL_SPONSORSHIPS, RECEIVE_GLOBAL_TEMPLATES, RECEIVE_SPONSOR_FORM, RECEIVE_SPONSOR_FORMS, @@ -25,7 +24,10 @@ import { SPONSOR_FORM_DELETED, SPONSOR_FORM_UNARCHIVED } from "../../actions/sponsor-forms-actions"; -import { SET_CURRENT_SUMMIT } from "../../actions/summit-actions"; +import { + SET_CURRENT_SUMMIT, + RECEIVE_SUMMIT_SPONSORSHIP_TYPES +} from "../../actions/summit-actions"; const DEFAULT_STATE = { sponsorForms: [], @@ -217,7 +219,7 @@ const sponsorFormsListReducer = (state = DEFAULT_STATE, action) => { } }; } - case RECEIVE_GLOBAL_SPONSORSHIPS: { + case RECEIVE_SUMMIT_SPONSORSHIP_TYPES: { const { current_page: currentPage, last_page: lastPage, diff --git a/src/reducers/sponsors/sponsor-page-pages-list-reducer.js b/src/reducers/sponsors/sponsor-page-pages-list-reducer.js index edc6ae08e..1d79a6fe1 100644 --- a/src/reducers/sponsors/sponsor-page-pages-list-reducer.js +++ b/src/reducers/sponsors/sponsor-page-pages-list-reducer.js @@ -24,8 +24,10 @@ import { SPONSOR_CUSTOMIZED_PAGE_UNARCHIVED, RECEIVE_SPONSOR_MANAGED_PAGE } from "../../actions/sponsor-pages-actions"; -import { SET_CURRENT_SUMMIT } from "../../actions/summit-actions"; -import { RECEIVE_GLOBAL_SPONSORSHIPS } from "../../actions/sponsor-forms-actions"; +import { + SET_CURRENT_SUMMIT, + RECEIVE_SUMMIT_SPONSORSHIP_TYPES +} from "../../actions/summit-actions"; import { PAGE_MODULES_DOWNLOAD, PAGES_MODULE_KINDS @@ -260,7 +262,7 @@ const sponsorPagePagesListReducer = (state = DEFAULT_STATE, action) => { case RESET_EDIT_PAGE: { return { ...state, currentEditPage: DEFAULT_PAGE }; } - case RECEIVE_GLOBAL_SPONSORSHIPS: { + case RECEIVE_SUMMIT_SPONSORSHIP_TYPES: { const { current_page: currentPage, last_page: lastPage,