diff --git a/src/actions/page-template-actions.js b/src/actions/page-template-actions.js index 1fa0f7fab..9c6fe5443 100644 --- a/src/actions/page-template-actions.js +++ b/src/actions/page-template-actions.js @@ -55,7 +55,10 @@ export const getPageTemplates = orderDir = DEFAULT_ORDER_DIR, hideArchived = false ) => - async (dispatch) => { + async (dispatch, getState) => { + const { currentSummitState } = getState(); + const { currentSummit } = currentSummitState; + const summitTZ = currentSummit.time_zone.name; const accessToken = await getAccessTokenSafely(); const filter = []; @@ -93,7 +96,7 @@ export const getPageTemplates = createAction(RECEIVE_PAGE_TEMPLATES), `${window.SPONSOR_PAGES_API_URL}/api/v1/page-templates`, authErrorHandler, - { order, orderDir, page, perPage, term, hideArchived } + { order, orderDir, page, perPage, term, hideArchived, summitTZ } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); diff --git a/src/actions/show-pages-actions.js b/src/actions/show-pages-actions.js new file mode 100644 index 000000000..590ab74a7 --- /dev/null +++ b/src/actions/show-pages-actions.js @@ -0,0 +1,271 @@ +/** + * Copyright 2018 OpenStack Foundation + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * */ + +import { + authErrorHandler, + createAction, + getRequest, + postRequest, + putRequest, + deleteRequest, + startLoading, + stopLoading +} from "openstack-uicore-foundation/lib/utils/actions"; +import T from "i18n-react/dist/i18n-react"; +import moment from "moment-timezone"; +import { escapeFilterValue, getAccessTokenSafely } from "../utils/methods"; +import { + DEFAULT_CURRENT_PAGE, + DEFAULT_ORDER_DIR, + DEFAULT_PER_PAGE, + PAGES_MODULE_KINDS +} from "../utils/constants"; +import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions"; + +export const REQUEST_SHOW_PAGES = "REQUEST_SHOW_PAGES"; +export const RECEIVE_SHOW_PAGES = "RECEIVE_SHOW_PAGES"; + +export const RECEIVE_SHOW_PAGE = "RECEIVE_SHOW_PAGE"; +export const SHOW_PAGE_UPDATED = "SHOW_PAGE_UPDATED"; +export const SHOW_PAGE_ADDED = "SHOW_PAGE_ADDED"; +export const SHOW_PAGE_ARCHIVED = "SHOW_PAGE_ARCHIVED"; +export const SHOW_PAGE_UNARCHIVED = "SHOW_PAGE_UNARCHIVED"; +export const RESET_SHOW_PAGE_FORM = "RESET_SHOW_PAGE_FORM"; + +export const GLOBAL_PAGE_CLONED = "GLOBAL_PAGE_CLONED"; + +export const getShowPages = + ( + term = "", + page = DEFAULT_CURRENT_PAGE, + perPage = DEFAULT_PER_PAGE, + order = "id", + orderDir = DEFAULT_ORDER_DIR, + hideArchived = false, + sponsorshipTypesId = [] + ) => + async (dispatch, getState) => { + const { currentSummitState } = getState(); + const { currentSummit } = currentSummitState; + const accessToken = await getAccessTokenSafely(); + const filter = []; + + dispatch(startLoading()); + + if (term) { + const escapedTerm = escapeFilterValue(term); + filter.push(`name=@${escapedTerm},code=@${escapedTerm}`); + } + + const params = { + page, + per_page: perPage, + access_token: accessToken, + expand: "sponsorship_types" + }; + + if (hideArchived) filter.push("is_archived==0"); + + if (sponsorshipTypesId?.length > 0) { + const formattedSponsorships = sponsorshipTypesId.join("&&"); + filter.push("applies_to_all_tiers==0"); + filter.push(`sponsorship_type_id_not_in==${formattedSponsorships}`); + } + + if (filter.length > 0) { + params["filter[]"] = filter; + } + + // order + if (order != null && orderDir != null) { + const orderDirSign = orderDir === 1 ? "" : "-"; + params.order = `${orderDirSign}${order}`; + } + + return getRequest( + createAction(REQUEST_SHOW_PAGES), + createAction(RECEIVE_SHOW_PAGES), + `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages`, + authErrorHandler, + { order, orderDir, page, term, hideArchived } + )(params)(dispatch).then(() => { + dispatch(stopLoading()); + }); + }; + +export const getShowPage = (pageId) => async (dispatch, getState) => { + const { currentSummitState } = getState(); + const { currentSummit } = currentSummitState; + const accessToken = await getAccessTokenSafely(); + + dispatch(startLoading()); + + const params = { + access_token: accessToken, + expand: "modules,modules.file_type" + }; + + return getRequest( + null, + createAction(RECEIVE_SHOW_PAGE), + `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages/${pageId}`, + authErrorHandler + )(params)(dispatch).then(() => { + dispatch(stopLoading()); + }); +}; + +const normalizeShowPage = (entity) => { + const normalizedEntity = { ...entity }; + + normalizedEntity.modules = entity.modules.map((module) => { + const normalizedModule = { ...module }; + + if (module.kind === PAGES_MODULE_KINDS.MEDIA && module.upload_deadline) { + normalizedModule.upload_deadline = moment + .utc(module.upload_deadline) + .unix(); + } + + if (module.kind === PAGES_MODULE_KINDS.MEDIA && module.file_type_id) { + normalizedModule.file_type_id = + module.file_type_id?.value || module.file_type_id; + } + + if (module.kind === PAGES_MODULE_KINDS.DOCUMENT && module.file) { + normalizedModule.file = module.file[0] || null; + } + + delete normalizedModule._tempId; + + return normalizedModule; + }); + + return normalizedEntity; +}; + +export const saveShowPage = (entity) => async (dispatch, getState) => { + const { currentSummitState } = getState(); + const { currentSummit } = currentSummitState; + const accessToken = await getAccessTokenSafely(); + + dispatch(startLoading()); + + const params = { + access_token: accessToken + }; + + const normalizedShowPage = normalizeShowPage(entity); + + if (entity.id) { + return putRequest( + null, + createAction(SHOW_PAGE_UPDATED), + `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages/${entity.id}`, + normalizedShowPage, + snackbarErrorHandler, + entity + )(params)(dispatch) + .then(() => { + dispatch( + snackbarSuccessHandler({ + title: T.translate("general.success"), + html: T.translate("show_pages.page_saved") + }) + ); + }) + .finally(() => { + dispatch(stopLoading()); + }); + } + + return postRequest( + null, + createAction(SHOW_PAGE_ADDED), + `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages`, + normalizedShowPage, + snackbarErrorHandler, + entity + )(params)(dispatch) + .then(() => { + dispatch( + snackbarSuccessHandler({ + title: T.translate("general.success"), + html: T.translate("show_pages.page_created") + }) + ); + }) + .finally(() => { + dispatch(stopLoading()); + }); +}; + +export const resetShowPageForm = () => (dispatch) => { + dispatch(createAction(RESET_SHOW_PAGE_FORM)({})); +}; + +export const archiveShowPage = (pageId) => async (dispatch, getState) => { + const { currentSummitState } = getState(); + const { currentSummit } = currentSummitState; + const accessToken = await getAccessTokenSafely(); + const params = { access_token: accessToken }; + + dispatch(startLoading()); + + return putRequest( + null, + createAction(SHOW_PAGE_ARCHIVED)({ pageId }), + `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages/${pageId}/archive`, + null, + snackbarErrorHandler + )(params)(dispatch) + .then(() => { + dispatch( + snackbarSuccessHandler({ + title: T.translate("general.success"), + html: T.translate("show_pages.archived") + }) + ); + }) + .finally(() => { + dispatch(stopLoading()); + }); +}; + +export const unarchiveShowPage = (pageId) => async (dispatch, getState) => { + const { currentSummitState } = getState(); + const { currentSummit } = currentSummitState; + const accessToken = await getAccessTokenSafely(); + const params = { access_token: accessToken }; + + dispatch(startLoading()); + + return deleteRequest( + null, + createAction(SHOW_PAGE_UNARCHIVED)({ pageId }), + `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages/${pageId}/archive`, + null, + snackbarErrorHandler + )(params)(dispatch) + .then(() => { + dispatch( + snackbarSuccessHandler({ + title: T.translate("general.success"), + html: T.translate("show_pages.unarchived") + }) + ); + }) + .finally(() => { + dispatch(stopLoading()); + }); +}; diff --git a/src/actions/sponsor-pages-actions.js b/src/actions/sponsor-pages-actions.js index bc4fa17ba..02b20bde8 100644 --- a/src/actions/sponsor-pages-actions.js +++ b/src/actions/sponsor-pages-actions.js @@ -12,91 +12,18 @@ * */ import { - authErrorHandler, createAction, - getRequest, postRequest, - putRequest, - deleteRequest, startLoading, stopLoading } from "openstack-uicore-foundation/lib/utils/actions"; import T from "i18n-react/dist/i18n-react"; -import { escapeFilterValue, getAccessTokenSafely } from "../utils/methods"; -import { - DEFAULT_CURRENT_PAGE, - DEFAULT_ORDER_DIR, - DEFAULT_PER_PAGE -} from "../utils/constants"; +import { getAccessTokenSafely } from "../utils/methods"; import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions"; - -export const REQUEST_SPONSOR_PAGES = "REQUEST_SPONSOR_PAGES"; -export const RECEIVE_SPONSOR_PAGES = "RECEIVE_SPONSOR_PAGES"; - -export const SPONSOR_PAGE_ARCHIVED = "SPONSOR_PAGE_ARCHIVED"; -export const SPONSOR_PAGE_UNARCHIVED = "SPONSOR_PAGE_UNARCHIVED"; +import { getShowPages } from "./show-pages-actions"; export const GLOBAL_PAGE_CLONED = "GLOBAL_PAGE_CLONED"; -export const getSponsorPages = - ( - term = "", - page = DEFAULT_CURRENT_PAGE, - perPage = DEFAULT_PER_PAGE, - order = "id", - orderDir = DEFAULT_ORDER_DIR, - hideArchived = false, - sponsorshipTypesId = [] - ) => - async (dispatch, getState) => { - const { currentSummitState } = getState(); - const { currentSummit } = currentSummitState; - const accessToken = await getAccessTokenSafely(); - const filter = []; - - dispatch(startLoading()); - - if (term) { - const escapedTerm = escapeFilterValue(term); - filter.push(`name=@${escapedTerm},code=@${escapedTerm}`); - } - - const params = { - page, - per_page: perPage, - access_token: accessToken, - expand: "sponsorship_types" - }; - - if (hideArchived) filter.push("is_archived==0"); - - if (sponsorshipTypesId?.length > 0) { - const formattedSponsorships = sponsorshipTypesId.join("&&"); - filter.push("applies_to_all_tiers==0"); - filter.push(`sponsorship_type_id_not_in==${formattedSponsorships}`); - } - - if (filter.length > 0) { - params["filter[]"] = filter; - } - - // order - if (order != null && orderDir != null) { - const orderDirSign = orderDir === 1 ? "" : "-"; - params.order = `${orderDirSign}${order}`; - } - - return getRequest( - createAction(REQUEST_SPONSOR_PAGES), - createAction(RECEIVE_SPONSOR_PAGES), - `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages`, - authErrorHandler, - { order, orderDir, page, term, hideArchived } - )(params)(dispatch).then(() => { - dispatch(stopLoading()); - }); - }; - export const cloneGlobalPage = (pagesIds, sponsorIds, allSponsors) => async (dispatch, getState) => { const { currentSummitState } = getState(); @@ -127,69 +54,13 @@ export const cloneGlobalPage = snackbarErrorHandler )(params)(dispatch) .then(() => { - dispatch(getSponsorPages()); + dispatch(getShowPages()); dispatch( snackbarSuccessHandler({ title: T.translate("general.success"), - html: T.translate("sponsor_pages.global_page_popup.success") + html: T.translate("show_pages.global_page_popup.success") }) ); }) .finally(() => dispatch(stopLoading())); }; - -export const archiveSponsorPage = (pageId) => async (dispatch, getState) => { - const { currentSummitState } = getState(); - const { currentSummit } = currentSummitState; - const accessToken = await getAccessTokenSafely(); - const params = { access_token: accessToken }; - - dispatch(startLoading()); - - return putRequest( - null, - createAction(SPONSOR_PAGE_ARCHIVED)({ pageId }), - `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages/${pageId}/archive`, - null, - snackbarErrorHandler - )(params)(dispatch) - .then(() => { - dispatch( - snackbarSuccessHandler({ - title: T.translate("general.success"), - html: T.translate("sponsor_pages.archived") - }) - ); - }) - .finally(() => { - dispatch(stopLoading()); - }); -}; - -export const unarchiveSponsorPage = (pageId) => async (dispatch, getState) => { - const { currentSummitState } = getState(); - const { currentSummit } = currentSummitState; - const accessToken = await getAccessTokenSafely(); - const params = { access_token: accessToken }; - - dispatch(startLoading()); - - return deleteRequest( - null, - createAction(SPONSOR_PAGE_UNARCHIVED)({ pageId }), - `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages/${pageId}/archive`, - null, - snackbarErrorHandler - )(params)(dispatch) - .then(() => { - dispatch( - snackbarSuccessHandler({ - title: T.translate("general.success"), - html: T.translate("sponsor_pages.unarchived") - }) - ); - }) - .finally(() => { - dispatch(stopLoading()); - }); -}; diff --git a/src/components/select-page-template-dialog/__tests__/select-page-template-dialog.test.js b/src/components/select-page-template-dialog/__tests__/select-page-template-dialog.test.js index 6875e2811..7508192fa 100644 --- a/src/components/select-page-template-dialog/__tests__/select-page-template-dialog.test.js +++ b/src/components/select-page-template-dialog/__tests__/select-page-template-dialog.test.js @@ -105,7 +105,7 @@ describe("SelectPageTemplateDialog", () => { renderWithStore(); expect( - screen.getByText("sponsor_pages.global_page_popup.title") + screen.getByText("show_pages.global_page_popup.title") ).toBeInTheDocument(); }); @@ -136,7 +136,7 @@ describe("SelectPageTemplateDialog", () => { renderWithStore(); expect( - screen.getByPlaceholderText("sponsor_pages.placeholders.search") + screen.getByPlaceholderText("show_pages.placeholders.search") ).toBeInTheDocument(); }); @@ -144,7 +144,7 @@ describe("SelectPageTemplateDialog", () => { renderWithStore(); const saveButton = screen.getByRole("button", { - name: "sponsor_pages.global_page_popup.add_selected" + name: "show_pages.global_page_popup.add_selected" }); expect(saveButton).toBeDisabled(); }); @@ -199,7 +199,7 @@ describe("SelectPageTemplateDialog", () => { const checkboxes = screen.getAllByRole("checkbox"); const saveButton = screen.getByRole("button", { - name: "sponsor_pages.global_page_popup.add_selected" + name: "show_pages.global_page_popup.add_selected" }); expect(saveButton).toBeDisabled(); @@ -220,7 +220,7 @@ describe("SelectPageTemplateDialog", () => { await userEvent.click(checkboxes[2]); const saveButton = screen.getByRole("button", { - name: "sponsor_pages.global_page_popup.add_selected" + name: "show_pages.global_page_popup.add_selected" }); await userEvent.click(saveButton); @@ -258,7 +258,7 @@ describe("SelectPageTemplateDialog", () => { const radioButtons = screen.getAllByRole("radio"); const saveButton = screen.getByRole("button", { - name: "sponsor_pages.global_page_popup.add_selected" + name: "show_pages.global_page_popup.add_selected" }); expect(saveButton).toBeDisabled(); @@ -277,7 +277,7 @@ describe("SelectPageTemplateDialog", () => { await userEvent.click(radioButtons[1]); const saveButton = screen.getByRole("button", { - name: "sponsor_pages.global_page_popup.add_selected" + name: "show_pages.global_page_popup.add_selected" }); await userEvent.click(saveButton); @@ -293,7 +293,7 @@ describe("SelectPageTemplateDialog", () => { renderWithStore(); const searchInput = screen.getByPlaceholderText( - "sponsor_pages.placeholders.search" + "show_pages.placeholders.search" ); await userEvent.type(searchInput, "Template"); diff --git a/src/components/select-page-template-dialog/index.js b/src/components/select-page-template-dialog/index.js index f52f696bf..108ad0d96 100644 --- a/src/components/select-page-template-dialog/index.js +++ b/src/components/select-page-template-dialog/index.js @@ -114,27 +114,27 @@ const SelectPageTemplateDialog = ({ }, { columnKey: "code", - header: T.translate("sponsor_pages.global_page_popup.code"), + header: T.translate("show_pages.global_page_popup.code"), sortable: true }, { columnKey: "name", - header: T.translate("sponsor_pages.global_page_popup.name"), + header: T.translate("show_pages.global_page_popup.name"), sortable: true }, { columnKey: "info_mod", - header: T.translate("sponsor_pages.global_page_popup.info_mod"), + header: T.translate("show_pages.global_page_popup.info_mod"), sortable: false }, { columnKey: "download_mod", - header: T.translate("sponsor_pages.global_page_popup.download_mod"), + header: T.translate("show_pages.global_page_popup.download_mod"), sortable: false }, { columnKey: "upload_mod", - header: T.translate("sponsor_pages.global_page_popup.upload_mod"), + header: T.translate("show_pages.global_page_popup.upload_mod"), sortable: false } ]; @@ -146,7 +146,7 @@ const SelectPageTemplateDialog = ({ component="div" > - {T.translate("sponsor_pages.global_page_popup.title")} + {T.translate("show_pages.global_page_popup.title")} handleClose()}> @@ -162,7 +162,7 @@ const SelectPageTemplateDialog = ({ @@ -187,7 +187,7 @@ const SelectPageTemplateDialog = ({ fullWidth variant="contained" > - {T.translate("sponsor_pages.global_page_popup.add_selected")} + {T.translate("show_pages.global_page_popup.add_selected")} diff --git a/src/i18n/en.json b/src/i18n/en.json index e2a953b18..18117565f 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -2635,7 +2635,7 @@ "items_added": "Items added successfully." } }, - "sponsor_pages": { + "show_pages": { "pages": "Pages", "alert_info": "Note: These Pages will be visible to all sponsors of the selected level in this program.", "using_template": "Using Template", @@ -2650,6 +2650,8 @@ "filter": "Filter", "sort_by": "Sort By", "no_sponsors_pages": "No pages found for this search criteria.", + "page_saved": "Page updated successfully.", + "page_created": "Page created successfully.", "placeholders": { "search": "Search..." }, diff --git a/src/layouts/sponsor-layout.js b/src/layouts/sponsor-layout.js index f43964319..b36d21d87 100644 --- a/src/layouts/sponsor-layout.js +++ b/src/layouts/sponsor-layout.js @@ -25,7 +25,7 @@ import SponsorSettingsPage from "../pages/sponsor_settings/sponsor-settings-page import SponsorFormsListPage from "../pages/sponsors/sponsor-forms-list-page"; import SponsorFormItemListPage from "../pages/sponsors/sponsor-form-item-list-page"; import SponsorUsersListPage from "../pages/sponsors/sponsor-users-list-page"; -import SponsorPagesListPage from "../pages/sponsors/sponsor-pages-list-page"; +import ShowPagesListPage from "../pages/sponsors/show-pages-list-page"; const SponsorLayout = ({ match }) => (
@@ -70,7 +70,7 @@ const SponsorLayout = ({ match }) => (
@@ -78,7 +78,7 @@ const SponsorLayout = ({ match }) => ( )} strict exact - component={SponsorPagesListPage} + component={ShowPagesListPage} /> { const [pageTemplateId, setPageTemplateId] = useState(null); const [openCloneDialog, setOpenCloneDialog] = useState(false); @@ -268,6 +269,7 @@ const PageTemplateListPage = ({ open={!!pageTemplateId} onClose={() => setPageTemplateId(null)} onSave={handleSavePageTemplate} + summitTZ={summitTZ} /> { +const PageTemplatePopup = ({ + pageTemplate, + open, + onClose, + onSave, + summitTZ +}) => { const handleClose = () => { onClose(); }; @@ -108,10 +115,31 @@ const PageTemplatePopup = ({ pageTemplate, open, onClose, onSave }) => { } }); + const normalizeModules = (modules = [], summitTZ = "UTC") => + modules.map((m) => { + if (m.kind === PAGES_MODULE_KINDS.MEDIA) { + const normalizeModule = { ...m }; + if (m.upload_deadline) { + normalizeModule.upload_deadline = epochToMomentTimeZone( + m.upload_deadline, + summitTZ + ); + } + if (m.file_type) { + normalizeModule.file_type_id = { + value: m.file_type.id, + label: `${m.file_type.name} (${m.file_type.allowed_extensions})` + }; + } + return normalizeModule; + } + return m; + }); + const formik = useFormik({ initialValues: { ...pageTemplate, - modules: pageTemplate?.modules || [] + modules: normalizeModules(pageTemplate?.modules, summitTZ) || [] }, validationSchema: yup.object().shape({ code: yup.string().required(T.translate("validation.required")), diff --git a/src/pages/sponsors/sponsor-pages-list-page/components/global-page/global-page-popup.js b/src/pages/sponsors/show-pages-list-page/components/global-page/global-page-popup.js similarity index 85% rename from src/pages/sponsors/sponsor-pages-list-page/components/global-page/global-page-popup.js rename to src/pages/sponsors/show-pages-list-page/components/global-page/global-page-popup.js index f9cf8a790..df44f25ce 100644 --- a/src/pages/sponsors/sponsor-pages-list-page/components/global-page/global-page-popup.js +++ b/src/pages/sponsors/show-pages-list-page/components/global-page/global-page-popup.js @@ -4,17 +4,10 @@ import { connect } from "react-redux"; import { Dialog } from "@mui/material"; import SelectPageTemplateDialog from "../../../../../components/select-page-template-dialog"; import SelectSponsorshipsDialog from "../../../sponsor-forms-list-page/components/global-template/select-sponsorships-dialog"; -import { - cloneGlobalPage, - getSponsorPages -} from "../../../../../actions/sponsor-pages-actions"; +import { cloneGlobalPage } from "../../../../../actions/sponsor-pages-actions"; +import { getShowPages } from "../../../../../actions/show-pages-actions"; -const GlobalPagePopup = ({ - open, - onClose, - cloneGlobalPage, - getSponsorPages -}) => { +const GlobalPagePopup = ({ open, onClose, cloneGlobalPage, getShowPages }) => { const [stage, setStage] = useState("pages"); const [selectedTemplates, setSelectedTemplates] = useState([]); const dialogSize = stage === "pages" ? "md" : "sm"; @@ -32,7 +25,7 @@ const GlobalPagePopup = ({ const handleOnSave = (selectedTiers, allTiers) => { cloneGlobalPage(selectedTemplates, selectedTiers, allTiers).finally(() => { - getSponsorPages(); + getShowPages(); handleClose(); }); }; @@ -62,5 +55,5 @@ const mapStateToProps = () => ({}); export default connect(mapStateToProps, { cloneGlobalPage, - getSponsorPages + getShowPages })(GlobalPagePopup); diff --git a/src/pages/sponsors/sponsor-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js similarity index 64% rename from src/pages/sponsors/sponsor-pages-list-page/index.js rename to src/pages/sponsors/show-pages-list-page/index.js index 68d6fe1ff..11bd93eb9 100644 --- a/src/pages/sponsors/sponsor-pages-list-page/index.js +++ b/src/pages/sponsors/show-pages-list-page/index.js @@ -24,17 +24,20 @@ import { } from "@mui/material"; import AddIcon from "@mui/icons-material/Add"; import { - getSponsorPages, - archiveSponsorPage, - unarchiveSponsorPage -} from "../../../actions/sponsor-pages-actions"; -import { getSponsorForm } from "../../../actions/sponsor-forms-actions"; + getShowPages, + archiveShowPage, + unarchiveShowPage, + getShowPage, + saveShowPage, + resetShowPageForm +} from "../../../actions/show-pages-actions"; import CustomAlert from "../../../components/mui/custom-alert"; import MuiTable from "../../../components/mui/table/mui-table"; import GlobalPagePopup from "./components/global-page/global-page-popup"; +import PageTemplatePopup from "../../sponsors-global/page-templates/page-template-popup"; -const SponsorPagesListPage = ({ - sponsorPages, +const ShowPagesListPage = ({ + showPages, currentPage, perPage, term, @@ -42,38 +45,34 @@ const SponsorPagesListPage = ({ orderDir, hideArchived, totalCount, - getSponsorPages, - archiveSponsorPage, - unarchiveSponsorPage, - getSponsorForm + currentShowPage, + getShowPages, + archiveShowPage, + unarchiveShowPage, + getShowPage, + saveShowPage, + resetShowPageForm }) => { const [openPopup, setOpenPopup] = useState(null); useEffect(() => { - getSponsorPages(); + getShowPages(); }, []); const handlePageChange = (page) => { - getSponsorPages(term, page, perPage, order, orderDir, hideArchived); + getShowPages(term, page, perPage, order, orderDir, hideArchived); }; const handleSort = (key, dir) => { - getSponsorPages(term, currentPage, perPage, key, dir, hideArchived); + getShowPages(term, currentPage, perPage, key, dir, hideArchived); }; const handlePerPageChange = (newPerPage) => { - getSponsorPages( - term, - currentPage, - newPerPage, - order, - orderDir, - hideArchived - ); + getShowPages(term, currentPage, newPerPage, order, orderDir, hideArchived); }; const handleRowEdit = (row) => { - getSponsorForm(row.id).then(() => { + getShowPage(row.id).then(() => { setOpenPopup("new"); }); }; @@ -84,12 +83,10 @@ const SponsorPagesListPage = ({ }; const handleArchiveItem = (item) => - item.is_archived - ? unarchiveSponsorPage(item.id) - : archiveSponsorPage(item.id); + item.is_archived ? unarchiveShowPage(item.id) : archiveShowPage(item.id); const handleHideArchivedForms = (ev) => { - getSponsorPages( + getShowPages( term, currentPage, perPage, @@ -99,32 +96,44 @@ const SponsorPagesListPage = ({ ); }; + const handleSaveShowPage = (entity) => { + saveShowPage(entity).then(() => { + setOpenPopup(null); + getShowPages(); + }); + }; + + const handleTemplatePopupClose = () => { + resetShowPageForm(); + setOpenPopup(null); + }; + const columns = [ { columnKey: "code", - header: T.translate("sponsor_pages.code_column_label"), + header: T.translate("show_pages.code_column_label"), sortable: true }, { columnKey: "name", - header: T.translate("sponsor_pages.name_column_label"), + header: T.translate("show_pages.name_column_label"), sortable: true }, { columnKey: "tier", - header: T.translate("sponsor_pages.tier_column_label") + header: T.translate("show_pages.tier_column_label") }, { columnKey: "info_mod", - header: T.translate("sponsor_pages.info_mod_column_label") + header: T.translate("show_pages.info_mod_column_label") }, { columnKey: "upload_mod", - header: T.translate("sponsor_pages.upload_mod_column_label") + header: T.translate("show_pages.upload_mod_column_label") }, { columnKey: "download_mod", - header: T.translate("sponsor_pages.download_mod_column_label") + header: T.translate("show_pages.download_mod_column_label") } ]; @@ -136,8 +145,8 @@ const SponsorPagesListPage = ({ return (
-

{T.translate("sponsor_pages.pages")}

- +

{T.translate("show_pages.pages")}

+ - {totalCount} {T.translate("sponsor_pages.pages")} + {totalCount} {T.translate("show_pages.pages")} @@ -160,11 +169,11 @@ const SponsorPagesListPage = ({ onChange={handleHideArchivedForms} checked={hideArchived} inputProps={{ - "aria-label": T.translate("sponsor_pages.hide_archived") + "aria-label": T.translate("show_pages.hide_archived") }} /> } - label={T.translate("sponsor_pages.hide_archived")} + label={T.translate("show_pages.hide_archived")} /> @@ -178,7 +187,7 @@ const SponsorPagesListPage = ({ startIcon={} sx={{ height: "36px" }} > - {T.translate("sponsor_pages.using_template")} + {T.translate("show_pages.using_template")} @@ -190,20 +199,20 @@ const SponsorPagesListPage = ({ startIcon={} sx={{ height: "36px" }} > - {T.translate("sponsor_pages.new_page")} + {T.translate("show_pages.new_page")} - {sponsorPages.length === 0 && ( -
{T.translate("sponsor_pages.no_sponsors_pages")}
+ {showPages.length === 0 && ( +
{T.translate("show_pages.no_sponsors_pages")}
)} - {sponsorPages.length > 0 && ( + {showPages.length > 0 && (
setOpenPopup(null)} /> - {/* setOpenPopup(null)} - /> */} + pageTemplate={currentShowPage} + onClose={handleTemplatePopupClose} + onSave={handleSaveShowPage} + />
); }; -const mapStateToProps = ({ sponsorPagesListState }) => ({ - ...sponsorPagesListState +const mapStateToProps = ({ showPagesListState }) => ({ + ...showPagesListState }); export default connect(mapStateToProps, { - getSponsorPages, - archiveSponsorPage, - unarchiveSponsorPage, - getSponsorForm -})(SponsorPagesListPage); + getShowPages, + archiveShowPage, + unarchiveShowPage, + getShowPage, + saveShowPage, + resetShowPageForm +})(ShowPagesListPage); diff --git a/src/reducers/sponsors/sponsor-pages-list-reducer.js b/src/reducers/sponsors/show-pages-list-reducer.js similarity index 65% rename from src/reducers/sponsors/sponsor-pages-list-reducer.js rename to src/reducers/sponsors/show-pages-list-reducer.js index 2a57d10b1..86d8ce696 100644 --- a/src/reducers/sponsors/sponsor-pages-list-reducer.js +++ b/src/reducers/sponsors/show-pages-list-reducer.js @@ -13,16 +13,24 @@ import { LOGOUT_USER } from "openstack-uicore-foundation/lib/security/actions"; import { - RECEIVE_SPONSOR_PAGES, - REQUEST_SPONSOR_PAGES, - SPONSOR_PAGE_ARCHIVED, - SPONSOR_PAGE_UNARCHIVED -} from "../../actions/sponsor-pages-actions"; + RECEIVE_SHOW_PAGE, + RECEIVE_SHOW_PAGES, + REQUEST_SHOW_PAGES, + SHOW_PAGE_ARCHIVED, + SHOW_PAGE_UNARCHIVED, + RESET_SHOW_PAGE_FORM +} from "../../actions/show-pages-actions"; import { SET_CURRENT_SUMMIT } from "../../actions/summit-actions"; import { PAGES_MODULE_KINDS } from "../../utils/constants"; +const DEFAULT_SHOW_PAGE = { + code: "", + name: "", + modules: [] +}; + const DEFAULT_STATE = { - sponsorPages: [], + showPages: [], term: "", order: "name", orderDir: 1, @@ -30,10 +38,12 @@ const DEFAULT_STATE = { lastPage: 1, perPage: 10, totalCount: 0, - hideArchived: false + hideArchived: false, + currentShowPage: DEFAULT_SHOW_PAGE, + summitTZ: null }; -const sponsorPagesListReducer = (state = DEFAULT_STATE, action) => { +const showPagesListReducer = (state = DEFAULT_STATE, action) => { const { type, payload } = action; switch (type) { @@ -41,27 +51,28 @@ const sponsorPagesListReducer = (state = DEFAULT_STATE, action) => { case LOGOUT_USER: { return DEFAULT_STATE; } - case REQUEST_SPONSOR_PAGES: { - const { order, orderDir, page, term, hideArchived } = payload; + case REQUEST_SHOW_PAGES: { + const { order, orderDir, page, term, hideArchived, summitTZ } = payload; return { ...state, order, orderDir, - sponsorPages: [], + showPages: [], currentPage: page, term, - hideArchived + hideArchived, + summitTZ }; } - case RECEIVE_SPONSOR_PAGES: { + case RECEIVE_SHOW_PAGES: { const { current_page: currentPage, total, last_page: lastPage } = payload.response; - const sponsorPages = payload.response.data.map((a) => ({ + const showPages = payload.response.data.map((a) => ({ id: a.id, code: a.code, name: a.name, @@ -78,35 +89,43 @@ const sponsorPagesListReducer = (state = DEFAULT_STATE, action) => { return { ...state, - sponsorPages, + showPages, currentPage, totalCount: total, lastPage }; } - case SPONSOR_PAGE_ARCHIVED: { + case SHOW_PAGE_ARCHIVED: { const { pageId } = payload; - const pages = state.sponsorPages.map((page) => + const pages = state.showPages.map((page) => page.id === pageId ? { ...page, is_archived: true } : page ); return { ...state, - sponsorPages: [...pages] + showPages: [...pages] }; } - case SPONSOR_PAGE_UNARCHIVED: { + case SHOW_PAGE_UNARCHIVED: { const { pageId } = payload; - const pages = state.sponsorPages.map((page) => + const pages = state.showPages.map((page) => page.id === pageId ? { ...page, is_archived: false } : page ); return { ...state, - sponsorPages: [...pages] + showPages: [...pages] }; } + case RECEIVE_SHOW_PAGE: { + const showPage = payload.response; + + return { ...state, currentShowPage: showPage }; + } + case RESET_SHOW_PAGE_FORM: { + return { ...state, currentShowPage: DEFAULT_SHOW_PAGE }; + } default: return state; } }; -export default sponsorPagesListReducer; +export default showPagesListReducer; diff --git a/src/store.js b/src/store.js index 86973bf8a..e1f77bbd3 100644 --- a/src/store.js +++ b/src/store.js @@ -167,7 +167,7 @@ import sponsorPageFormsListReducer from "./reducers/sponsors/sponsor-page-forms- import sponsorCustomizedFormReducer from "./reducers/sponsors/sponsor-customized-form-reducer.js"; import sponsorPageCartListReducer from "./reducers/sponsors/sponsor-page-cart-list-reducer"; import sponsorCustomizedFormItemsListReducer from "./reducers/sponsors/sponsor-customized-form-items-list-reducer.js"; -import sponsorPagesListReducer from "./reducers/sponsors/sponsor-pages-list-reducer.js"; +import showPagesListReducer from "./reducers/sponsors/show-pages-list-reducer.js"; import sponsorPagePurchaseListReducer from "./reducers/sponsors/sponsor-page-purchase-list-reducer.js"; // default: localStorage if web, AsyncStorage if react-native @@ -252,7 +252,7 @@ const reducers = persistCombineReducers(config, { currentSponsorState: sponsorReducer, sponsorFormsListState: sponsorFormsListReducer, sponsorFormItemsListState: sponsorFormItemsListReducer, - sponsorPagesListState: sponsorPagesListReducer, + showPagesListState: showPagesListReducer, sponsorUsersListState: sponsorUsersListReducer, sponsorPageFormsListState: sponsorPageFormsListReducer, sponsorPageCartListState: sponsorPageCartListReducer,