From a5c2ee2b845355743271b92d9033394a1b0cc00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Fri, 20 Feb 2026 15:25:51 -0300
Subject: [PATCH 1/8] fix: add sponsorship types ddl on show page template
 popup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 src/actions/show-pages-actions.js             | 11 ++++-
 src/components/mui/dropdown-checkbox.js       |  2 +-
 .../mui-formik-file-size-field.js             |  5 ++-
 .../page-template-popup/index.js              | 38 +++++++++++++++---
 .../sponsors/show-pages-list-page/index.js    |  2 +
 .../sponsors/show-pages-list-reducer.js       | 40 ++++++++++++++++++-
 6 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/src/actions/show-pages-actions.js b/src/actions/show-pages-actions.js
index 05b90ee28..8d3d11e44 100644
--- a/src/actions/show-pages-actions.js
+++ b/src/actions/show-pages-actions.js
@@ -71,7 +71,8 @@ export const getShowPages =
       page,
       per_page: perPage,
       access_token: accessToken,
-      fields: "code,name,id,modules_count,sponsorship_types,is_archived",
+      fields:
+        "code,name,id,modules_count,sponsorship_types,is_archived,apply_to_all_types",
       expand: "sponsorship_types"
     };
 
@@ -129,6 +130,14 @@ export const getShowPage = (pageId) => async (dispatch, getState) => {
 const normalizeShowPage = (entity) => {
   const normalizedEntity = { ...entity };
 
+  normalizedEntity.apply_to_all_types = false;
+  normalizedEntity.sponsorship_types = entity.sponsorship_types;
+
+  if (entity.sponsorship_types.includes("all")) {
+    normalizedEntity.apply_to_all_types = true;
+    delete normalizedEntity.sponsorship_types;
+  }
+
   normalizedEntity.modules = entity.modules.map((module) => {
     const normalizedModule = { ...module };
 
diff --git a/src/components/mui/dropdown-checkbox.js b/src/components/mui/dropdown-checkbox.js
index 00b6ff461..2f7fdc1ae 100644
--- a/src/components/mui/dropdown-checkbox.js
+++ b/src/components/mui/dropdown-checkbox.js
@@ -38,7 +38,7 @@ const DropdownCheckbox = ({
   };
 
   return (
-    <FormControl fullWidth>
+    <FormControl fullWidth margin="normal">
       <InputLabel id={`${name}_label`}>{label}</InputLabel>
       <Select
         labelId={`${name}_label`}
diff --git a/src/components/mui/formik-inputs/mui-formik-file-size-field.js b/src/components/mui/formik-inputs/mui-formik-file-size-field.js
index e6025bb6c..0e39696f4 100644
--- a/src/components/mui/formik-inputs/mui-formik-file-size-field.js
+++ b/src/components/mui/formik-inputs/mui-formik-file-size-field.js
@@ -10,8 +10,9 @@ const BLOCKED_KEYS = ["e", "E", "+", "-", ".", ","];
 const MuiFormikFilesizeField = ({ name, label, ...props }) => {
   const [field, meta, helpers] = useField(name);
 
-  const displayValue =
-    field.value != null ? Math.floor(field.value / BYTES_PER_MB) : 0;
+  const displayValue = field.value
+    ? Math.floor(field.value / BYTES_PER_MB)
+    : "";
 
   const emptyValue = meta.initialValue === null ? null : 0;
 
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/index.js b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
index 506151bbc..120a2fc85 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/index.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import T from "i18n-react/dist/i18n-react";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
@@ -22,12 +22,15 @@ import { epochToMomentTimeZone } from "openstack-uicore-foundation/lib/utils/met
 import MuiFormikTextField from "../../../../components/mui/formik-inputs/mui-formik-textfield";
 import PageModules from "./page-template-modules-form";
 import { resetPageTemplateForm } from "../../../../actions/page-template-actions";
+import { getSponsorships } from "../../../../actions/sponsor-forms-actions";
 import {
   BYTES_PER_MB,
+  MAX_PER_PAGE,
   PAGES_MODULE_KINDS,
   PAGE_MODULES_MEDIA_TYPES,
   PAGE_MODULES_DOWNLOAD
 } from "../../../../utils/constants";
+import DropdownCheckbox from "../../../../components/mui/dropdown-checkbox";
 
 const normalizeModules = (modules = [], summitTZ = "UTC") =>
   modules.map((m) => {
@@ -56,8 +59,17 @@ const PageTemplatePopup = ({
   onClose,
   onSave,
   summitTZ,
-  resetPageTemplateForm
+  resetPageTemplateForm,
+  getSponsorships,
+  sponsorships
 }) => {
+  useEffect(() => {
+    if (sponsorships) getSponsorships(1, MAX_PER_PAGE);
+  }, []);
+
+  const COLUMN_4 = 4;
+  const COLUMN_8 = 4;
+
   const handleClose = () => {
     resetPageTemplateForm();
     onClose();
@@ -210,13 +222,27 @@ const PageTemplatePopup = ({
                   fullWidth
                 />
               </Grid2>
-              <Grid2 size={8}>
+              <Grid2 spacing={2} size={sponsorships ? COLUMN_4 : COLUMN_8}>
                 <MuiFormikTextField
                   name="name"
                   label={T.translate("page_template_list.name")}
                   fullWidth
                 />
               </Grid2>
+              {sponsorships && (
+                <Grid2 spacing={2} size={4}>
+                  <DropdownCheckbox
+                    name="sponsorship_types"
+                    allName="apply_to_all_types"
+                    label={T.translate("page_template_list.sponsorship")}
+                    allLabel={T.translate("page_template_list.all_tiers")}
+                    value={formik.values.sponsorship_types}
+                    allValue={formik.values.apply_to_all_types}
+                    options={sponsorships.items}
+                    onChange={formik.handleChange}
+                  />
+                </Grid2>
+              )}
             </Grid2>
             <Divider sx={{ mb: 2 }} />
             <Grid2 container spacing={2} size={12} sx={{ p: 2 }}>
@@ -272,7 +298,8 @@ PageTemplatePopup.propTypes = {
   open: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
   onSave: PropTypes.func.isRequired,
-  summitTZ: PropTypes.string.isRequired
+  summitTZ: PropTypes.string,
+  sponsorships: PropTypes.array
 };
 
 const mapStateToProps = ({ pageTemplateState }) => ({
@@ -280,5 +307,6 @@ const mapStateToProps = ({ pageTemplateState }) => ({
 });
 
 export default connect(mapStateToProps, {
-  resetPageTemplateForm
+  resetPageTemplateForm,
+  getSponsorships
 })(PageTemplatePopup);
diff --git a/src/pages/sponsors/show-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js
index 47b100a4c..011252ef8 100644
--- a/src/pages/sponsors/show-pages-list-page/index.js
+++ b/src/pages/sponsors/show-pages-list-page/index.js
@@ -49,6 +49,7 @@ const ShowPagesListPage = ({
   totalCount,
   summitTZ,
   currentShowPage,
+  sponsorships,
   getShowPages,
   archiveShowPage,
   unarchiveShowPage,
@@ -249,6 +250,7 @@ const ShowPagesListPage = ({
         onClose={handleTemplatePopupClose}
         onSave={handleSaveShowPage}
         summitTZ={summitTZ}
+        sponsorships={sponsorships}
       />
     </div>
   );
diff --git a/src/reducers/sponsors/show-pages-list-reducer.js b/src/reducers/sponsors/show-pages-list-reducer.js
index 8e244d437..5d93e3256 100644
--- a/src/reducers/sponsors/show-pages-list-reducer.js
+++ b/src/reducers/sponsors/show-pages-list-reducer.js
@@ -22,10 +22,12 @@ import {
   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";
 
 const DEFAULT_SHOW_PAGE = {
   code: "",
   name: "",
+  sponsorship_types: [],
   modules: []
 };
 
@@ -40,6 +42,12 @@ export const DEFAULT_STATE = {
   totalCount: 0,
   hideArchived: false,
   currentShowPage: DEFAULT_SHOW_PAGE,
+  sponsorships: {
+    items: [],
+    currentPage: 0,
+    lastPage: 0,
+    total: 0
+  },
   summitTZ: null
 };
 
@@ -78,7 +86,9 @@ const showPagesListReducer = (state = DEFAULT_STATE, action) => {
         id: a.id,
         code: a.code,
         name: a.name,
-        tier: a.sponsorship_types.map((s) => s.name).join(", "),
+        tier: a.apply_to_all_types
+          ? "All Tiers"
+          : a.sponsorship_types.map((s) => s.name).join(", "),
         info_mod: a.modules_count.info_modules_count,
         upload_mod: a.modules_count.media_request_modules_count,
         download_mod: a.modules_count.document_download_modules_count,
@@ -127,6 +137,34 @@ const showPagesListReducer = (state = DEFAULT_STATE, action) => {
     case RESET_SHOW_PAGE_FORM: {
       return { ...state, currentShowPage: DEFAULT_SHOW_PAGE };
     }
+    case RECEIVE_GLOBAL_SPONSORSHIPS: {
+      const {
+        current_page: currentPage,
+        last_page: lastPage,
+        total,
+        data
+      } = payload.response;
+
+      const newSponsorships = data.map((s) => ({
+        id: s.id,
+        name: s.type.name
+      }));
+
+      const items =
+        currentPage === 1
+          ? newSponsorships
+          : [...state.sponsorships.items, ...newSponsorships];
+
+      return {
+        ...state,
+        sponsorships: {
+          items,
+          currentPage,
+          lastPage,
+          total
+        }
+      };
+    }
     default:
       return state;
   }

From 882de3b0b37ca7f956a49bb423090dc56febeefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Fri, 20 Feb 2026 15:56:35 -0300
Subject: [PATCH 2/8] fix: adjust reducer values and styles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 .../page-templates/page-template-list-page.js   | 13 +++++++------
 .../page-templates/page-template-popup/index.js |  6 ++----
 .../sponsors/show-pages-list-page/index.js      | 17 +++++++++--------
 .../form-template/form-template-form.js         |  2 +-
 .../sponsors/show-pages-list-reducer.js         |  9 ++++++++-
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/pages/sponsors-global/page-templates/page-template-list-page.js b/src/pages/sponsors-global/page-templates/page-template-list-page.js
index 7e17f757d..899e9d18c 100644
--- a/src/pages/sponsors-global/page-templates/page-template-list-page.js
+++ b/src/pages/sponsors-global/page-templates/page-template-list-page.js
@@ -267,12 +267,13 @@ const PageTemplateListPage = ({
           </div>
         )}
       </Box>
-      <PageTemplatePopup
-        open={!!pageTemplateId}
-        onClose={() => setPageTemplateId(null)}
-        onSave={handleSavePageTemplate}
-        summitTZ={summitTZ}
-      />
+      {!!pageTemplateId && (
+        <PageTemplatePopup
+          onClose={() => setPageTemplateId(null)}
+          onSave={handleSavePageTemplate}
+          summitTZ={summitTZ}
+        />
+      )}
       <PageTemplateClonePopup
         open={openCloneDialog}
         onClose={() => setOpenCloneDialog(false)}
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/index.js b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
index 120a2fc85..623634c7c 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/index.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
@@ -55,7 +55,6 @@ const normalizeModules = (modules = [], summitTZ = "UTC") =>
 
 const PageTemplatePopup = ({
   pageTemplate,
-  open,
   onClose,
   onSave,
   summitTZ,
@@ -196,7 +195,7 @@ const PageTemplatePopup = ({
   });
 
   return (
-    <Dialog open={open} onClose={handleClose} maxWidth="md" fullWidth>
+    <Dialog open onClose={handleClose} maxWidth="md" fullWidth>
       <DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
         <Typography fontSize="1.5rem">
           {T.translate("page_template_list.page_crud.title")}
@@ -295,11 +294,10 @@ const PageTemplatePopup = ({
 };
 
 PageTemplatePopup.propTypes = {
-  open: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
   onSave: PropTypes.func.isRequired,
   summitTZ: PropTypes.string,
-  sponsorships: PropTypes.array
+  sponsorships: PropTypes.object
 };
 
 const mapStateToProps = ({ pageTemplateState }) => ({
diff --git a/src/pages/sponsors/show-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js
index 011252ef8..5021ccf58 100644
--- a/src/pages/sponsors/show-pages-list-page/index.js
+++ b/src/pages/sponsors/show-pages-list-page/index.js
@@ -244,14 +244,15 @@ const ShowPagesListPage = ({
         open={openPopup === "cloneTemplate"}
         onClose={() => setOpenPopup(null)}
       />
-      <PageTemplatePopup
-        open={openPopup === "pageTemplate"}
-        pageTemplate={currentShowPage}
-        onClose={handleTemplatePopupClose}
-        onSave={handleSaveShowPage}
-        summitTZ={summitTZ}
-        sponsorships={sponsorships}
-      />
+      {openPopup === "pageTemplate" && (
+        <PageTemplatePopup
+          pageTemplate={currentShowPage}
+          onClose={handleTemplatePopupClose}
+          onSave={handleSaveShowPage}
+          summitTZ={summitTZ}
+          sponsorships={sponsorships}
+        />
+      )}
     </div>
   );
 };
diff --git a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
index 91383ce34..7c1fca082 100644
--- a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
+++ b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
@@ -98,7 +98,7 @@ const FormTemplateForm = ({
                 fullWidth
               />
             </Grid2>
-            <Grid2 size={4} sx={{ pt: "16px" }}>
+            <Grid2 size={4}>
               <DropdownCheckbox
                 name="sponsorship_types"
                 allName="apply_to_all_types"
diff --git a/src/reducers/sponsors/show-pages-list-reducer.js b/src/reducers/sponsors/show-pages-list-reducer.js
index 5d93e3256..f70024951 100644
--- a/src/reducers/sponsors/show-pages-list-reducer.js
+++ b/src/reducers/sponsors/show-pages-list-reducer.js
@@ -126,7 +126,14 @@ const showPagesListReducer = (state = DEFAULT_STATE, action) => {
     case RECEIVE_SHOW_PAGE: {
       const showPage = payload.response;
 
-      return { ...state, currentShowPage: showPage };
+      const sponsorshipTypeIds = showPage.apply_to_all_types
+        ? ["all"]
+        : [...showPage.sponsorship_types];
+
+      return {
+        ...state,
+        currentShowPage: { ...showPage, sponsorship_types: sponsorshipTypeIds }
+      };
     }
     case SHOW_PAGE_DELETED: {
       const { pageId } = payload;

From 070c2ba718e6f53b4dd22b42b8c4efe94ecfa040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Fri, 20 Feb 2026 16:00:50 -0300
Subject: [PATCH 3/8] fix: adjust unused props on dropdown checkbox, adjust
 column size typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 .../page-templates/page-template-popup/index.js                | 3 +--
 .../components/form-template/form-template-form.js             | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/index.js b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
index 623634c7c..d382dc1f6 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/index.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
@@ -67,7 +67,7 @@ const PageTemplatePopup = ({
   }, []);
 
   const COLUMN_4 = 4;
-  const COLUMN_8 = 4;
+  const COLUMN_8 = 8;
 
   const handleClose = () => {
     resetPageTemplateForm();
@@ -236,7 +236,6 @@ const PageTemplatePopup = ({
                     label={T.translate("page_template_list.sponsorship")}
                     allLabel={T.translate("page_template_list.all_tiers")}
                     value={formik.values.sponsorship_types}
-                    allValue={formik.values.apply_to_all_types}
                     options={sponsorships.items}
                     onChange={formik.handleChange}
                   />
diff --git a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
index 7c1fca082..1ed138e97 100644
--- a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
+++ b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
@@ -109,7 +109,6 @@ const FormTemplateForm = ({
                   "sponsor_forms.form_template_popup.all_tiers"
                 )}
                 value={formik.values.sponsorship_types}
-                allValue={formik.values.apply_to_all_types}
                 options={sponsorships.items}
                 onChange={formik.handleChange}
               />

From 2c0477ff80d72296e3dedef94505163ec95e3768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Fri, 20 Feb 2026 16:16:59 -0300
Subject: [PATCH 4/8] fix: adjust mock test popup open parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 .../__tests__/show-pages-list-page.test.js                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 8351fea0d..47b4dcec0 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
@@ -32,14 +32,14 @@ jest.mock("../../../../components/mui/showConfirmDialog", () => jest.fn());
 jest.mock(
   "../../../sponsors-global/page-templates/page-template-popup",
   () =>
-    function MockPageTemplatePopup({ open, onClose, onSave, pageTemplate }) {
-      return open ? (
+    function MockPageTemplatePopup({ onClose, onSave, pageTemplate }) {
+      return (
         <div data-testid="page-template-popup">
           <span data-testid="popup-page-id">{pageTemplate?.id}</span>
           <button onClick={onClose}>Close</button>
           <button onClick={() => onSave({ id: 1, name: "Test" })}>Save</button>
         </div>
-      ) : null;
+      );
     }
 );
 

From 02271862cb7b2e857814d631468f787d4bd6707a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Mon, 23 Feb 2026 13:06:16 -0300
Subject: [PATCH 5/8] fix: adjust reducer and constants, pass sponsorship array
 to popup to simplify component logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 src/i18n/en.json                              |   1 +
 .../page-template-popup/index.js              | 105 ++++++++----------
 .../sponsors/show-pages-list-page/index.js    |  27 +++--
 .../sponsors/show-pages-list-reducer.js       |   3 +-
 src/utils/constants.js                        |   4 +
 5 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 2442a8e39..b50a63a5b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -2682,6 +2682,7 @@
     "hide_archived": "Hide archived Pages",
     "filter": "Filter",
     "sort_by": "Sort By",
+    "all_tiers": "All Tiers",
     "no_sponsors_pages": "No pages found for this search criteria.",
     "page_saved": "Page updated successfully.",
     "page_created": "Page created successfully.",
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/index.js b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
index d382dc1f6..5ad970c46 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/index.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
@@ -1,6 +1,5 @@
-import React, { useEffect } from "react";
+import React from "react";
 import T from "i18n-react/dist/i18n-react";
-import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import {
   Box,
@@ -22,10 +21,10 @@ import { epochToMomentTimeZone } from "openstack-uicore-foundation/lib/utils/met
 import MuiFormikTextField from "../../../../components/mui/formik-inputs/mui-formik-textfield";
 import PageModules from "./page-template-modules-form";
 import { resetPageTemplateForm } from "../../../../actions/page-template-actions";
-import { getSponsorships } from "../../../../actions/sponsor-forms-actions";
 import {
   BYTES_PER_MB,
-  MAX_PER_PAGE,
+  COLUMN_4,
+  COLUMN_8,
   PAGES_MODULE_KINDS,
   PAGE_MODULES_MEDIA_TYPES,
   PAGE_MODULES_DOWNLOAD
@@ -59,60 +58,16 @@ const PageTemplatePopup = ({
   onSave,
   summitTZ,
   resetPageTemplateForm,
-  getSponsorships,
   sponsorships
 }) => {
-  useEffect(() => {
-    if (sponsorships) getSponsorships(1, MAX_PER_PAGE);
-  }, []);
-
-  const COLUMN_4 = 4;
-  const COLUMN_8 = 8;
+  const showSponsorships =
+    Array.isArray(sponsorships) && sponsorships.length > 0;
 
   const handleClose = () => {
     resetPageTemplateForm();
     onClose();
   };
 
-  const addModule = (moduleData) => {
-    const modules = formik.values.modules || [];
-    const newModule = {
-      ...moduleData,
-      _tempId: `temp-${Date.now()}`,
-      custom_order: modules.length
-    };
-    formik.setFieldValue("modules", [...modules, newModule]);
-  };
-
-  const handleAddInfo = () => {
-    addModule({
-      kind: PAGES_MODULE_KINDS.INFO,
-      content: ""
-    });
-  };
-
-  const handleAddDocument = () => {
-    addModule({
-      kind: PAGES_MODULE_KINDS.DOCUMENT,
-      name: "",
-      description: "",
-      external_url: "",
-      file: []
-    });
-  };
-
-  const handleAddMedia = () => {
-    addModule({
-      kind: PAGES_MODULE_KINDS.MEDIA,
-      type: PAGE_MODULES_MEDIA_TYPES.FILE,
-      name: "",
-      description: "",
-      upload_deadline: null,
-      max_file_size: 0,
-      file_type_id: null
-    });
-  };
-
   const infoModuleSchema = yup.object().shape({
     kind: yup.string().equals([PAGES_MODULE_KINDS.INFO]),
     content: yup.string().required(T.translate("validation.required"))
@@ -194,6 +149,45 @@ const PageTemplatePopup = ({
     }
   });
 
+  const addModule = (moduleData) => {
+    const modules = formik.values.modules || [];
+    const newModule = {
+      ...moduleData,
+      _tempId: `temp-${Date.now()}`,
+      custom_order: modules.length
+    };
+    formik.setFieldValue("modules", [...modules, newModule]);
+  };
+
+  const handleAddInfo = () => {
+    addModule({
+      kind: PAGES_MODULE_KINDS.INFO,
+      content: ""
+    });
+  };
+
+  const handleAddDocument = () => {
+    addModule({
+      kind: PAGES_MODULE_KINDS.DOCUMENT,
+      name: "",
+      description: "",
+      external_url: "",
+      file: []
+    });
+  };
+
+  const handleAddMedia = () => {
+    addModule({
+      kind: PAGES_MODULE_KINDS.MEDIA,
+      type: PAGE_MODULES_MEDIA_TYPES.FILE,
+      name: "",
+      description: "",
+      upload_deadline: null,
+      max_file_size: 0,
+      file_type_id: null
+    });
+  };
+
   return (
     <Dialog open onClose={handleClose} maxWidth="md" fullWidth>
       <DialogTitle sx={{ display: "flex", justifyContent: "space-between" }}>
@@ -221,14 +215,14 @@ const PageTemplatePopup = ({
                   fullWidth
                 />
               </Grid2>
-              <Grid2 spacing={2} size={sponsorships ? COLUMN_4 : COLUMN_8}>
+              <Grid2 spacing={2} size={showSponsorships ? COLUMN_4 : COLUMN_8}>
                 <MuiFormikTextField
                   name="name"
                   label={T.translate("page_template_list.name")}
                   fullWidth
                 />
               </Grid2>
-              {sponsorships && (
+              {showSponsorships && (
                 <Grid2 spacing={2} size={4}>
                   <DropdownCheckbox
                     name="sponsorship_types"
@@ -236,7 +230,7 @@ const PageTemplatePopup = ({
                     label={T.translate("page_template_list.sponsorship")}
                     allLabel={T.translate("page_template_list.all_tiers")}
                     value={formik.values.sponsorship_types}
-                    options={sponsorships.items}
+                    options={sponsorships}
                     onChange={formik.handleChange}
                   />
                 </Grid2>
@@ -296,7 +290,7 @@ PageTemplatePopup.propTypes = {
   onClose: PropTypes.func.isRequired,
   onSave: PropTypes.func.isRequired,
   summitTZ: PropTypes.string,
-  sponsorships: PropTypes.object
+  sponsorships: PropTypes.array
 };
 
 const mapStateToProps = ({ pageTemplateState }) => ({
@@ -304,6 +298,5 @@ const mapStateToProps = ({ pageTemplateState }) => ({
 });
 
 export default connect(mapStateToProps, {
-  resetPageTemplateForm,
-  getSponsorships
+  resetPageTemplateForm
 })(PageTemplatePopup);
diff --git a/src/pages/sponsors/show-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js
index 5021ccf58..1fcd93f44 100644
--- a/src/pages/sponsors/show-pages-list-page/index.js
+++ b/src/pages/sponsors/show-pages-list-page/index.js
@@ -32,11 +32,12 @@ import {
   deleteShowPage,
   resetShowPageForm
 } from "../../../actions/show-pages-actions";
+import { getSponsorships } from "../../../actions/sponsor-forms-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";
-import { DEFAULT_CURRENT_PAGE } from "../../../utils/constants";
+import { DEFAULT_CURRENT_PAGE, MAX_PER_PAGE } from "../../../utils/constants";
 
 const ShowPagesListPage = ({
   showPages,
@@ -56,7 +57,8 @@ const ShowPagesListPage = ({
   getShowPage,
   saveShowPage,
   deleteShowPage,
-  resetShowPageForm
+  resetShowPageForm,
+  getSponsorships
 }) => {
   const [openPopup, setOpenPopup] = useState(null);
 
@@ -76,12 +78,6 @@ const ShowPagesListPage = ({
     getShowPages(term, currentPage, newPerPage, order, orderDir, hideArchived);
   };
 
-  const handleRowEdit = (row) => {
-    getShowPage(row.id).then(() => {
-      setOpenPopup("pageTemplate");
-    });
-  };
-
   const handleRowDelete = (itemId) => {
     deleteShowPage(itemId).then(() =>
       getShowPages(
@@ -116,6 +112,12 @@ const ShowPagesListPage = ({
     });
   };
 
+  const handleOpenPageTemplatePopup = async (row) => {
+    await getSponsorships(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE);
+    if (row?.id) await getShowPage(row.id);
+    setOpenPopup("pageTemplate");
+  };
+
   const handleTemplatePopupClose = () => {
     resetShowPageForm();
     setOpenPopup(null);
@@ -208,7 +210,7 @@ const ShowPagesListPage = ({
             variant="contained"
             size="medium"
             fullWidth
-            onClick={() => setOpenPopup("pageTemplate")}
+            onClick={handleOpenPageTemplatePopup}
             startIcon={<AddIcon />}
             sx={{ height: "36px" }}
           >
@@ -234,7 +236,7 @@ const ShowPagesListPage = ({
             onPageChange={handlePageChange}
             onPerPageChange={handlePerPageChange}
             onSort={handleSort}
-            onEdit={handleRowEdit}
+            onEdit={handleOpenPageTemplatePopup}
             onArchive={handleArchiveItem}
           />
         </div>
@@ -250,7 +252,7 @@ const ShowPagesListPage = ({
           onClose={handleTemplatePopupClose}
           onSave={handleSaveShowPage}
           summitTZ={summitTZ}
-          sponsorships={sponsorships}
+          sponsorships={sponsorships.items}
         />
       )}
     </div>
@@ -268,5 +270,6 @@ export default connect(mapStateToProps, {
   getShowPage,
   saveShowPage,
   deleteShowPage,
-  resetShowPageForm
+  resetShowPageForm,
+  getSponsorships
 })(ShowPagesListPage);
diff --git a/src/reducers/sponsors/show-pages-list-reducer.js b/src/reducers/sponsors/show-pages-list-reducer.js
index f70024951..e6642b342 100644
--- a/src/reducers/sponsors/show-pages-list-reducer.js
+++ b/src/reducers/sponsors/show-pages-list-reducer.js
@@ -10,6 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * */
+import T from "i18n-react/dist/i18n-react";
 
 import { LOGOUT_USER } from "openstack-uicore-foundation/lib/security/actions";
 import {
@@ -87,7 +88,7 @@ const showPagesListReducer = (state = DEFAULT_STATE, action) => {
         code: a.code,
         name: a.name,
         tier: a.apply_to_all_types
-          ? "All Tiers"
+          ? T.translate("show_pages.all_tiers")
           : a.sponsorship_types.map((s) => s.name).join(", "),
         info_mod: a.modules_count.info_modules_count,
         upload_mod: a.modules_count.media_request_modules_count,
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 2e432af48..48a45e357 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -143,6 +143,10 @@ export const TEN = 10;
 
 export const ONE_HUNDRED = 100;
 
+export const COLUMN_4 = 4;
+
+export const COLUMN_8 = 8;
+
 export const DEFAULT_Z_INDEX = 1;
 
 export const HIGH_Z_INDEX = 9999;

From 226afc2bdd8671a52efff4b992c1cb2f97860bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Mon, 23 Feb 2026 16:39:12 -0300
Subject: [PATCH 6/8] fix: adjust test to check get sponsorsghips action
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 .../__tests__/show-pages-list-page.test.js      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 47b4dcec0..e7ffeea14 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
@@ -12,6 +12,11 @@ import {
   archiveShowPage,
   unarchiveShowPage
 } from "../../../../actions/show-pages-actions";
+import { getSponsorships } from "../../../../actions/sponsor-forms-actions";
+import {
+  DEFAULT_CURRENT_PAGE,
+  MAX_PER_PAGE
+} from "../../../../utils/constants";
 
 // Mocks
 
@@ -56,6 +61,10 @@ jest.mock("../../../../actions/show-pages-actions", () => ({
   resetShowPageForm: jest.fn(() => ({ type: "MOCK_ACTION" }))
 }));
 
+jest.mock("../../../../actions/sponsor-forms-actions", () => ({
+  getSponsorships: jest.fn(() => () => Promise.resolve({ items: [] }))
+}));
+
 // Helper to create show page data
 const createShowPage = (id, overrides = {}) => ({
   id,
@@ -117,6 +126,10 @@ describe("ShowPagesListPage", () => {
       await act(async () => {
         await userEvent.click(editButton);
       });
+      expect(getSponsorships).toHaveBeenCalledWith(
+        DEFAULT_CURRENT_PAGE,
+        MAX_PER_PAGE
+      );
       expect(getShowPage).toHaveBeenCalledWith(1);
       await waitFor(() => {
         expect(screen.getByTestId("page-template-popup")).toBeInTheDocument();
@@ -137,6 +150,10 @@ describe("ShowPagesListPage", () => {
       await act(async () => {
         await userEvent.click(editButton);
       });
+      expect(getSponsorships).toHaveBeenCalledWith(
+        DEFAULT_CURRENT_PAGE,
+        MAX_PER_PAGE
+      );
       await waitFor(() => {
         expect(screen.getByTestId("page-template-popup")).toBeInTheDocument();
       });

From 6e3472afb09a33c408312119191041d877ae2c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Wed, 25 Feb 2026 11:54:38 -0300
Subject: [PATCH 7/8] fix: adjust open popup function, remove unused props on
 check ddl, clean normalize function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 src/actions/show-pages-actions.js                           | 1 -
 .../page-templates/page-template-popup/index.js             | 1 -
 src/pages/sponsors/show-pages-list-page/index.js            | 6 ++++--
 .../components/form-template/form-template-form.js          | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/actions/show-pages-actions.js b/src/actions/show-pages-actions.js
index 8d3d11e44..96ed658c3 100644
--- a/src/actions/show-pages-actions.js
+++ b/src/actions/show-pages-actions.js
@@ -131,7 +131,6 @@ const normalizeShowPage = (entity) => {
   const normalizedEntity = { ...entity };
 
   normalizedEntity.apply_to_all_types = false;
-  normalizedEntity.sponsorship_types = entity.sponsorship_types;
 
   if (entity.sponsorship_types.includes("all")) {
     normalizedEntity.apply_to_all_types = true;
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/index.js b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
index 5ad970c46..aa8ba70b1 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/index.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
@@ -226,7 +226,6 @@ const PageTemplatePopup = ({
                 <Grid2 spacing={2} size={4}>
                   <DropdownCheckbox
                     name="sponsorship_types"
-                    allName="apply_to_all_types"
                     label={T.translate("page_template_list.sponsorship")}
                     allLabel={T.translate("page_template_list.all_tiers")}
                     value={formik.values.sponsorship_types}
diff --git a/src/pages/sponsors/show-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js
index 1fcd93f44..daf11de2e 100644
--- a/src/pages/sponsors/show-pages-list-page/index.js
+++ b/src/pages/sponsors/show-pages-list-page/index.js
@@ -113,8 +113,10 @@ const ShowPagesListPage = ({
   };
 
   const handleOpenPageTemplatePopup = async (row) => {
-    await getSponsorships(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE);
-    if (row?.id) await getShowPage(row.id);
+    await Promise.all([
+      getSponsorships(DEFAULT_CURRENT_PAGE, MAX_PER_PAGE),
+      row?.id ? getShowPage(row.id) : Promise.resolve()
+    ]);
     setOpenPopup("pageTemplate");
   };
 
diff --git a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
index 1ed138e97..9f70f4ee4 100644
--- a/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
+++ b/src/pages/sponsors/sponsor-forms-list-page/components/form-template/form-template-form.js
@@ -101,7 +101,6 @@ const FormTemplateForm = ({
             <Grid2 size={4}>
               <DropdownCheckbox
                 name="sponsorship_types"
-                allName="apply_to_all_types"
                 label={T.translate(
                   "sponsor_forms.form_template_popup.sponsorship"
                 )}

From 0dbcd968867eef2bf0fe95c927c1d8e00be680b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= <tcastilloboireau@gmail.com>
Date: Wed, 4 Mar 2026 14:11:03 -0300
Subject: [PATCH 8/8] fix: adjust expand, conditional for missing sponsorship
 types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomás Castillo <tcastilloboireau@gmail.com>
---
 src/actions/show-pages-actions.js                             | 4 ++--
 .../page-templates/page-template-popup/index.js               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/actions/show-pages-actions.js b/src/actions/show-pages-actions.js
index 96ed658c3..576db12d4 100644
--- a/src/actions/show-pages-actions.js
+++ b/src/actions/show-pages-actions.js
@@ -114,7 +114,7 @@ export const getShowPage = (pageId) => async (dispatch, getState) => {
 
   const params = {
     access_token: accessToken,
-    expand: "modules,modules.file_type"
+    expand: "modules,modules.file_type,sponsorship_types"
   };
 
   return getRequest(
@@ -132,7 +132,7 @@ const normalizeShowPage = (entity) => {
 
   normalizedEntity.apply_to_all_types = false;
 
-  if (entity.sponsorship_types.includes("all")) {
+  if (entity.sponsorship_types?.includes("all")) {
     normalizedEntity.apply_to_all_types = true;
     delete normalizedEntity.sponsorship_types;
   }
diff --git a/src/pages/sponsors-global/page-templates/page-template-popup/index.js b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
index aa8ba70b1..b1e8f10c3 100644
--- a/src/pages/sponsors-global/page-templates/page-template-popup/index.js
+++ b/src/pages/sponsors-global/page-templates/page-template-popup/index.js
@@ -228,7 +228,9 @@ const PageTemplatePopup = ({
                     name="sponsorship_types"
                     label={T.translate("page_template_list.sponsorship")}
                     allLabel={T.translate("page_template_list.all_tiers")}
-                    value={formik.values.sponsorship_types}
+                    value={formik.values.sponsorship_types.map(
+                      (st) => st.id ?? st
+                    )}
                     options={sponsorships}
                     onChange={formik.handleChange}
                   />