Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 0 additions & 30 deletions src/actions/sponsor-forms-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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();
Expand Down
31 changes: 31 additions & 0 deletions src/actions/summit-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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());
});
};
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
);
Expand All @@ -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
);
Expand Down
10 changes: 5 additions & 5 deletions src/pages/sponsors/show-pages-list-page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -58,7 +58,7 @@ const ShowPagesListPage = ({
saveShowPage,
deleteShowPage,
resetShowPageForm,
getSponsorships
getSummitSponsorshipTypes
}) => {
const [openPopup, setOpenPopup] = useState(null);

Expand Down Expand Up @@ -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");
Expand All @@ -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");
};
Expand Down Expand Up @@ -296,5 +296,5 @@ export default connect(mapStateToProps, {
saveShowPage,
deleteShowPage,
resetShowPageForm,
getSponsorships
getSummitSponsorshipTypes
})(ShowPagesListPage);
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -25,7 +25,7 @@ const FormTemplatePopup = ({
formTemplate,
open,
onClose,
getSponsorships,
getSummitSponsorshipTypes,
resetFormTemplate,
saveFormTemplate,
updateFormTemplate,
Expand All @@ -34,7 +34,7 @@ const FormTemplatePopup = ({
const [isSaving, setIsSaving] = useState(false);

useEffect(() => {
getSponsorships(1, MAX_PER_PAGE);
getSummitSponsorshipTypes(1, MAX_PER_PAGE);
}, []);

const closePopup = () => {
Expand Down Expand Up @@ -126,5 +126,5 @@ export default connect(mapStateToProps, {
resetFormTemplate,
saveFormTemplate,
updateFormTemplate,
getSponsorships
getSummitSponsorshipTypes
})(FormTemplatePopup);
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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);
}
};

Expand Down Expand Up @@ -103,5 +103,5 @@ const mapStateToProps = ({ sponsorFormsListState }) => ({
});

export default connect(mapStateToProps, {
getSponsorships
getSummitSponsorshipTypes
})(SelectSponsorshipsDialog);
10 changes: 5 additions & 5 deletions src/pages/sponsors/sponsor-forms-list-page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -54,7 +54,7 @@ const SponsorFormsListPage = ({
totalCount,
getSponsorForms,
getSponsorForm,
getSponsorships,
getSummitSponsorshipTypes,
archiveSponsorForm,
unarchiveSponsorForm,
deleteSponsorForm,
Expand All @@ -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);
Expand Down Expand Up @@ -449,7 +449,7 @@ const mapStateToProps = ({ sponsorFormsListState }) => ({
export default connect(mapStateToProps, {
getSponsorForms,
getSponsorForm,
getSponsorships,
getSummitSponsorshipTypes,
archiveSponsorForm,
unarchiveSponsorForm,
deleteSponsorForm,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions src/reducers/sponsors/__tests__/show-pages-list-reducer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -409,7 +411,7 @@ describe("showPagesListReducer", () => {
});
});

describe("RECEIVE_GLOBAL_SPONSORSHIPS", () => {
describe("RECEIVE_SUMMIT_SPONSORSHIP_TYPES", () => {
const makePayload = (currentPage, data) => ({
response: {
current_page: currentPage,
Expand All @@ -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" } }])
});

Expand All @@ -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" } }])
});

Expand Down
8 changes: 5 additions & 3 deletions src/reducers/sponsors/show-pages-list-reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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,
Expand Down
Loading
Loading