From 3b4cede399369adbc6f7d60ce7b9e7569a687a79 Mon Sep 17 00:00:00 2001 From: Nicolas Olmos Date: Tue, 3 Feb 2026 15:53:05 -0300 Subject: [PATCH 1/6] feat: replace hide archived for show archived in inventory list --- src/actions/inventory-item-actions.js | 48 +++++++++++-------- src/i18n/en.json | 2 +- .../inventory/inventory-list-page.js | 22 ++++----- .../inventory-item-list-reducer.js | 2 +- 4 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/actions/inventory-item-actions.js b/src/actions/inventory-item-actions.js index 86ab71f39..ca8845a37 100644 --- a/src/actions/inventory-item-actions.js +++ b/src/actions/inventory-item-actions.js @@ -101,7 +101,7 @@ export const getInventoryItems = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -114,7 +114,7 @@ export const getInventoryItems = filter.push(`name=@${escapedTerm},code=@${escapedTerm}`); } - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); const params = { page, @@ -140,31 +140,41 @@ export const getInventoryItems = createAction(RECEIVE_INVENTORY_ITEMS), `${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items`, authErrorHandler, - { order, orderDir, page, perPage, term, hideArchived } + { order, orderDir, page, perPage, term, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); }; -export const getInventoryItem = (inventoryItemId) => async (dispatch) => { - const accessToken = await getAccessTokenSafely(); +export const getInventoryItem = + (inventoryItemId, showArchived = false) => + async (dispatch) => { + const accessToken = await getAccessTokenSafely(); - dispatch(startLoading()); + dispatch(startLoading()); - const params = { - access_token: accessToken, - expand: "images,meta_fields,meta_fields.values" - }; + const filter = []; - return getRequest( - null, - createAction(RECEIVE_INVENTORY_ITEM), - `${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items/${inventoryItemId}`, - authErrorHandler - )(params)(dispatch).then(() => { - dispatch(stopLoading()); - }); -}; + filter.push(`is_archived==${showArchived ? 1 : 0}`); + + const params = { + access_token: accessToken, + expand: "images,meta_fields,meta_fields.values" + }; + + if (filter.length > 0) { + params["filter[]"] = filter; + } + + return getRequest( + null, + createAction(RECEIVE_INVENTORY_ITEM), + `${window.INVENTORY_API_BASE_URL}/api/v1/inventory-items/${inventoryItemId}`, + authErrorHandler + )(params)(dispatch).then(() => { + dispatch(stopLoading()); + }); + }; export const deleteInventoryItem = (inventoryItemId) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); diff --git a/src/i18n/en.json b/src/i18n/en.json index 6a83d8242..9bc06c7a7 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -3822,7 +3822,7 @@ "unarchive_button": "Unarchive", "delete_inventory_item_warning": "Are you sure you want to delete inventory item ", "add_inventory_item": "Create new Item", - "hide_archived": "Hide archived items", + "show_archived": "Show archived items", "placeholders": { "search_inventory_items": "Search" } diff --git a/src/pages/sponsors-global/inventory/inventory-list-page.js b/src/pages/sponsors-global/inventory/inventory-list-page.js index 5a0089870..1603e4860 100644 --- a/src/pages/sponsors-global/inventory/inventory-list-page.js +++ b/src/pages/sponsors-global/inventory/inventory-list-page.js @@ -165,7 +165,7 @@ const InventoryListPage = ({ term, order, orderDir, - hideArchived, + showArchived, totalInventoryItems, saveInventoryItem, deleteInventoryItemImage, @@ -192,12 +192,12 @@ const InventoryListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }, [getInventoryItems]); const handlePageChange = (page) => { - getInventoryItems(term, page, perPage, order, orderDir, hideArchived); + getInventoryItems(term, page, perPage, order, orderDir, showArchived); }; const handlePerPageChange = (newPerPage) => { @@ -207,12 +207,12 @@ const InventoryListPage = ({ newPerPage, order, orderDir, - hideArchived + showArchived ); }; const handleSort = (key, dir) => { - getInventoryItems(term, currentPage, perPage, key, dir, hideArchived); + getInventoryItems(term, currentPage, perPage, key, dir, showArchived); }; const handleSearch = (ev) => { @@ -223,12 +223,12 @@ const InventoryListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); } }; - const handleHideArchivedForms = (ev) => { + const handleShowArchivedForms = (ev) => { getInventoryItems( term, DEFAULT_CURRENT_PAGE, @@ -259,7 +259,7 @@ const InventoryListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ) ) .finally(() => setOpen(false)); @@ -345,15 +345,15 @@ const InventoryListPage = ({ } - label={T.translate("inventory_item_list.hide_archived")} + label={T.translate("inventory_item_list.show_archived")} /> { From e32c389a9972d843c0673a20dcedb1307bc4077a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Castillo?= Date: Wed, 11 Feb 2026 11:27:22 -0300 Subject: [PATCH 2/6] fix: fix: replace hideArchived param with showArchived, adjust actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomás Castillo --- .../__tests__/sponsor-forms-actions.test.js | 2 +- src/actions/form-template-actions.js | 6 ++-- src/actions/form-template-item-actions.js | 8 ++--- src/actions/page-template-actions.js | 6 ++-- src/actions/sponsor-forms-actions.js | 34 +++++++++---------- .../select-page-template-dialog.test.js | 7 ++-- .../select-page-template-dialog/index.js | 9 +++-- src/i18n/en.json | 16 ++++----- .../form-template-item-list-page.js | 21 ++++++------ .../form-templates/form-template-list-page.js | 25 +++++++------- .../inventory/inventory-list-page.js | 1 + .../page-templates/page-template-list-page.js | 23 ++++++++----- .../sponsors/show-pages-list-page/index.js | 16 ++++----- .../sponsor-form-item-list-page/index.js | 17 +++++----- .../select-templates-dialog.js | 9 +++-- .../sponsors/sponsor-forms-list-page/index.js | 19 ++++++----- .../sponsor-forms-manage-items.js | 24 ++++++------- .../tabs/sponsor-forms-tab/index.js | 24 ++++++------- .../sponsor-form-items-list-reducer.test.js | 10 +++--- ...nsor-customized-form-items-list-reducer.js | 6 ++-- .../sponsor-form-items-list-reducer.js | 6 ++-- .../sponsors/sponsor-forms-list-reducer.js | 6 ++-- .../sponsor-page-forms-list-reducer.js | 10 +++--- .../form-template-item-list-reducer.js | 2 +- .../form-template-list-reducer.js | 2 +- .../page-template-list-reducer.js | 2 +- 26 files changed, 159 insertions(+), 152 deletions(-) diff --git a/src/actions/__tests__/sponsor-forms-actions.test.js b/src/actions/__tests__/sponsor-forms-actions.test.js index e7b8567f3..d9bfe2727 100644 --- a/src/actions/__tests__/sponsor-forms-actions.test.js +++ b/src/actions/__tests__/sponsor-forms-actions.test.js @@ -80,7 +80,7 @@ describe("Sponsor Forms Actions", () => { expect.anything(), expect.anything(), { - hideArchived: false, + showArchived: false, order: "id", orderDir: 1, currentPage: 2, diff --git a/src/actions/form-template-actions.js b/src/actions/form-template-actions.js index 08ad83393..3a1bf67df 100644 --- a/src/actions/form-template-actions.js +++ b/src/actions/form-template-actions.js @@ -76,7 +76,7 @@ export const getFormTemplates = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -97,7 +97,7 @@ export const getFormTemplates = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (filter.length > 0) { params["filter[]"] = filter; @@ -114,7 +114,7 @@ export const getFormTemplates = createAction(RECEIVE_FORM_TEMPLATES), `${window.INVENTORY_API_BASE_URL}/api/v1/form-templates`, authErrorHandler, - { order, orderDir, page, perPage, term, hideArchived } + { order, orderDir, page, perPage, term, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); diff --git a/src/actions/form-template-item-actions.js b/src/actions/form-template-item-actions.js index 6d6fb664e..9d33a8f6b 100644 --- a/src/actions/form-template-item-actions.js +++ b/src/actions/form-template-item-actions.js @@ -76,7 +76,7 @@ export const getFormTemplateItems = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -97,12 +97,12 @@ export const getFormTemplateItems = access_token: accessToken }; + filter.push(`is_archived==${showArchived ? 1 : 0}`); + if (filter.length > 0) { params["filter[]"] = filter; } - if (hideArchived) filter.push("is_archived==0"); - // order if (order != null && orderDir != null) { const orderDirSign = orderDir === 1 ? "" : "-"; @@ -114,7 +114,7 @@ export const getFormTemplateItems = createAction(RECEIVE_FORM_TEMPLATE_ITEMS), `${window.INVENTORY_API_BASE_URL}/api/v1/form-templates/${formTemplateId}/items`, snackbarErrorHandler, - { order, orderDir, page, term, hideArchived } + { order, orderDir, page, term, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); diff --git a/src/actions/page-template-actions.js b/src/actions/page-template-actions.js index 3340525b2..5cf447875 100644 --- a/src/actions/page-template-actions.js +++ b/src/actions/page-template-actions.js @@ -55,7 +55,7 @@ export const getPageTemplates = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -78,7 +78,7 @@ export const getPageTemplates = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (filter.length > 0) { params["filter[]"] = filter; @@ -95,7 +95,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, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); diff --git a/src/actions/sponsor-forms-actions.js b/src/actions/sponsor-forms-actions.js index 4c6ad8d4d..8102dca20 100644 --- a/src/actions/sponsor-forms-actions.js +++ b/src/actions/sponsor-forms-actions.js @@ -113,7 +113,7 @@ export const getSponsorForms = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false, + showArchived = false, sponsorshipTypesId = [] ) => async (dispatch, getState) => { @@ -139,7 +139,7 @@ export const getSponsorForms = expand: "sponsorship_types" }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (sponsorshipTypesId?.length > 0) { const formattedSponsorships = sponsorshipTypesId.join("&&"); @@ -162,7 +162,7 @@ export const getSponsorForms = createAction(RECEIVE_SPONSOR_FORMS), `${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms`, authErrorHandler, - { order, orderDir, currentPage, perPage, term, hideArchived } + { order, orderDir, currentPage, perPage, term, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); @@ -263,7 +263,7 @@ export const getGlobalTemplates = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -284,7 +284,7 @@ export const getGlobalTemplates = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (filter.length > 0) { params["filter[]"] = filter; @@ -534,7 +534,7 @@ export const getSponsorManagedForms = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch, getState) => { const { currentSummitState, currentSponsorState } = getState(); @@ -562,7 +562,7 @@ export const getSponsorManagedForms = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (filter.length > 0) { params["filter[]"] = filter; @@ -579,7 +579,7 @@ export const getSponsorManagedForms = createAction(RECEIVE_SPONSOR_MANAGED_FORMS), `${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/sponsors/${sponsorId}/managed-forms`, authErrorHandler, - { order, orderDir, page, term, summitTZ, hideArchived } + { order, orderDir, page, term, summitTZ, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); @@ -640,7 +640,7 @@ export const getSponsorCustomizedForms = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch, getState) => { const { currentSummitState, currentSponsorState } = getState(); @@ -668,7 +668,7 @@ export const getSponsorCustomizedForms = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (filter.length > 0) { params["filter[]"] = filter; @@ -685,7 +685,7 @@ export const getSponsorCustomizedForms = createAction(RECEIVE_SPONSOR_CUSTOMIZED_FORMS), `${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/sponsors/${sponsorId}/sponsor-forms`, authErrorHandler, - { order, orderDir, page, term, summitTZ, hideArchived } + { order, orderDir, page, term, summitTZ, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); @@ -727,7 +727,7 @@ export const getSponsorCustomizedFormItems = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch, getState) => { const { currentSummitState, currentSponsorState } = getState(); @@ -751,7 +751,7 @@ export const getSponsorCustomizedFormItems = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (filter.length > 0) { params["filter[]"] = filter; @@ -768,7 +768,7 @@ export const getSponsorCustomizedFormItems = createAction(RECEIVE_SPONSOR_CUSTOMIZED_FORM_ITEMS), `${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/sponsors/${sponsorId}/sponsor-forms/${formId}/items`, authErrorHandler, - { term, order, orderDir, page, perPage, hideArchived } + { term, order, orderDir, page, perPage, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); @@ -1009,7 +1009,7 @@ export const getSponsorFormItems = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch, getState) => { const { currentSummitState } = getState(); @@ -1028,7 +1028,7 @@ export const getSponsorFormItems = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (filter.length > 0) { params["filter[]"] = filter; @@ -1045,7 +1045,7 @@ export const getSponsorFormItems = createAction(RECEIVE_SPONSOR_FORM_ITEMS), `${window.PURCHASES_API_URL}/api/v1/summits/${currentSummit.id}/show-forms/${formId}/items`, authErrorHandler, - { order, orderDir, page, hideArchived } + { order, orderDir, page, showArchived } )(params)(dispatch).then(() => { 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 7508192fa..a40dcb1c3 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 @@ -116,7 +116,7 @@ describe("SelectPageTemplateDialog", () => { renderWithStore(); - expect(getPageTemplates).toHaveBeenCalledWith("", 1, 10, "id", 1, true); + expect(getPageTemplates).toHaveBeenCalledWith("", 1, 10, "id", 1); }); test("displays initial selection count as 0", () => { @@ -305,8 +305,7 @@ describe("SelectPageTemplateDialog", () => { 1, 10, "id", - 1, - true + 1 ); }); }); @@ -363,7 +362,7 @@ describe("SelectPageTemplateDialog", () => { renderWithStore(); // Initial call on mount - expect(getPageTemplates).toHaveBeenCalledWith("", 1, 10, "id", 1, true); + expect(getPageTemplates).toHaveBeenCalledWith("", 1, 10, "id", 1); // The actual sort interaction would be handled by MuiInfiniteTable // This test verifies the component is initialized with correct sort params diff --git a/src/components/select-page-template-dialog/index.js b/src/components/select-page-template-dialog/index.js index 108ad0d96..1b3da99cd 100644 --- a/src/components/select-page-template-dialog/index.js +++ b/src/components/select-page-template-dialog/index.js @@ -37,11 +37,11 @@ const SelectPageTemplateDialog = ({ const [selectedRows, setSelectedRows] = useState([]); useEffect(() => { - getPageTemplates("", 1, DEFAULT_PER_PAGE, "id", 1, true); + getPageTemplates("", 1, DEFAULT_PER_PAGE, "id", 1); }, []); const handleSort = (key, dir) => { - getPageTemplates(term, 1, DEFAULT_PER_PAGE, key, dir, true); + getPageTemplates(term, 1, DEFAULT_PER_PAGE, key, dir); }; const handleLoadMore = () => { @@ -51,8 +51,7 @@ const SelectPageTemplateDialog = ({ currentPage + 1, DEFAULT_PER_PAGE, order, - orderDir, - true + orderDir ); } }; @@ -76,7 +75,7 @@ const SelectPageTemplateDialog = ({ }; const handleOnSearch = (searchTerm) => { - getPageTemplates(searchTerm, 1, DEFAULT_PER_PAGE, "id", 1, true); + getPageTemplates(searchTerm, 1, DEFAULT_PER_PAGE, "id", 1); }; const handleOnSave = () => { diff --git a/src/i18n/en.json b/src/i18n/en.json index 9bc06c7a7..9b031a6e3 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -2419,7 +2419,7 @@ }, "forms_tab": { "alert_info": "To add a Sponsor Specific Form for this show's sponsor, click Add Form Template or Create New Form button. Note: this form will be visible only to this sponsor for this show. The General Forms can only be managed on the Show's Forms page.", - "hide_archived": "Hide archived Forms", + "show_archived": "Show archived Forms", "using_template": "Using Template", "new_form": "New Form", "forms": "forms", @@ -2464,7 +2464,7 @@ "add_item": "Add Item", "add_item_inventory": "Add Item from Inventory", "alert_info": "You can add or archive items from the list. To edit an item click on the item's Edit button. You can also change only a rate by clicking on it.", - "hide_archived": "Hide archived items", + "show_archived": "Show archived items", "select_items": "Select items", "code": "Code", "name": "Name", @@ -2636,7 +2636,7 @@ "sponsor_forms": { "forms": "Forms", "alert_info": "To add an order form, select Add Form to start the process. To edit an existing form, click on the form name. To edit the line items within the form click manage items on the form line you wish to edit.", - "hide_archived": "Hide archived Forms", + "show_archived": "Show archived Forms", "using_global": "Using Global Template", "add_form": "New Form Template", "code_column_label": "Code", @@ -2706,7 +2706,7 @@ "standard_rate": "Standard rate", "onsite_rate": "On site rate", "default_quantity": "Default quantity", - "hide_archived": "Hide archived items", + "show_archived": "Show archived items", "add_item": "Add Item", "add_item_from_inventory": "Add Item from Inventory", "archive_button": "Archive", @@ -2759,7 +2759,7 @@ "info_mod_column_label": "Info Mod", "upload_mod_column_label": "Upload Mod", "download_mod_column_label": "Download Mod", - "hide_archived": "Hide archived Pages", + "show_archived": "Show archived Pages", "filter": "Filter", "sort_by": "Sort By", "all_tiers": "All Tiers", @@ -3878,7 +3878,7 @@ "name_column_label": "Name", "items_column_label": "Items", "manage_items": "Manage Items", - "hide_archived": "Hide archived forms", + "show_archived": "Show archived forms", "delete_form_template_warning": "Are you sure you want to delete form template ", "using_duplicate": "Using Duplicate", "add_form_template": "New Form", @@ -3930,7 +3930,7 @@ "alert_info": "You can clone, create or archive items from the list. To edit an item click on it.", "code_column_label": "Code", "name_column_label": "Name", - "hide_archived": "Hide archived items", + "show_archived": "Show archived items", "add_item": "Add Item", "archive_button": "Archive", "unarchive_button": "Unarchive", @@ -4060,7 +4060,7 @@ "info_mod": "Info Mod", "upload_mod": "Upload Mod", "download_mod": "Download Mod", - "hide_archived": "Hide archived pages", + "show_archived": "Show archived pages", "no_pages": "No pages found.", "add_new": "New Page", "add_template": "Using Template", diff --git a/src/pages/sponsors-global/form-templates/form-template-item-list-page.js b/src/pages/sponsors-global/form-templates/form-template-item-list-page.js index b4a070ead..b1d7e26ea 100644 --- a/src/pages/sponsors-global/form-templates/form-template-item-list-page.js +++ b/src/pages/sponsors-global/form-templates/form-template-item-list-page.js @@ -55,7 +55,7 @@ const FormTemplateItemListPage = ({ term, order, orderDir, - hideArchived, + showArchived, getInventoryItems, totalFormTemplateItems, cloneFromInventoryItem, @@ -84,7 +84,7 @@ const FormTemplateItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }); }, []); @@ -97,7 +97,7 @@ const FormTemplateItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }; @@ -109,7 +109,7 @@ const FormTemplateItemListPage = ({ perPage, key, dir, - hideArchived + showArchived ); }; @@ -137,7 +137,7 @@ const FormTemplateItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }) .catch((error) => { @@ -153,7 +153,7 @@ const FormTemplateItemListPage = ({ ? unarchiveFormTemplateItem(formTemplateId, item) : archiveFormTemplateItem(formTemplateId, item); - const handleHideArchivedForms = (ev) => { + const handleShowArchivedForms = (ev) => { getFormTemplateItems( formTemplateId, term, @@ -174,7 +174,7 @@ const FormTemplateItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ) ); setShowInventoryItemModal(false); @@ -260,15 +260,16 @@ const FormTemplateItemListPage = ({ } - label={T.translate("form_template_item_list.hide_archived")} + label={T.translate("form_template_item_list.show_archived")} /> diff --git a/src/pages/sponsors-global/form-templates/form-template-list-page.js b/src/pages/sponsors-global/form-templates/form-template-list-page.js index 46be7fb5a..048b14594 100644 --- a/src/pages/sponsors-global/form-templates/form-template-list-page.js +++ b/src/pages/sponsors-global/form-templates/form-template-list-page.js @@ -51,7 +51,7 @@ const FormTemplateListPage = ({ term, order, orderDir, - hideArchived, + showArchived, totalFormTemplates, currentFormTemplate, currentFormTemplateErrors, @@ -80,13 +80,13 @@ const FormTemplateListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); resetFormTemplateForm(); }, []); const handlePageChange = (page) => { - getFormTemplates(term, page, perPage, order, orderDir, hideArchived); + getFormTemplates(term, page, perPage, order, orderDir, showArchived); }; const handlePerPageChange = (newPerPage) => { @@ -96,12 +96,12 @@ const FormTemplateListPage = ({ newPerPage, order, orderDir, - hideArchived + showArchived ); }; const handleSort = (key, dir) => { - getFormTemplates(term, currentPage, perPage, key, dir, hideArchived); + getFormTemplates(term, currentPage, perPage, key, dir, showArchived); }; const handleSearch = (ev) => { @@ -112,12 +112,12 @@ const FormTemplateListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); } // search on duplicate popup if (typeof ev === "string") - getFormTemplates(ev, currentPage, perPage, order, orderDir, hideArchived); + getFormTemplates(ev, currentPage, perPage, order, orderDir, showArchived); }; const handleRowEdit = (row) => { @@ -153,7 +153,7 @@ const FormTemplateListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); setFormTemplateDuplicate(false); setFormTemplateFromDuplicatePopupOpen(false); @@ -162,7 +162,7 @@ const FormTemplateListPage = ({ const handleArchiveItem = (item) => item.is_archived ? unarchiveFormTemplate(item) : archiveFormTemplate(item); - const handleHideArchivedForms = (value) => { + const handleShowArchivedForms = (value) => { getFormTemplates( term, DEFAULT_CURRENT_PAGE, @@ -254,15 +254,16 @@ const FormTemplateListPage = ({ handleHideArchivedForms(ev.target.checked)} + onChange={(ev) => handleShowArchivedForms(ev.target.checked)} + checked={showArchived} inputProps={{ "aria-label": T.translate( - "form_template_list.hide_archived" + "form_template_list.show_archived" ) }} /> } - label={T.translate("form_template_list.hide_archived")} + label={T.translate("form_template_list.show_archived")} /> diff --git a/src/pages/sponsors-global/inventory/inventory-list-page.js b/src/pages/sponsors-global/inventory/inventory-list-page.js index 1603e4860..da8f248a1 100644 --- a/src/pages/sponsors-global/inventory/inventory-list-page.js +++ b/src/pages/sponsors-global/inventory/inventory-list-page.js @@ -346,6 +346,7 @@ const InventoryListPage = ({ control={ { - getPageTemplates(term, page, perPage, order, orderDir, hideArchived); + getPageTemplates(term, page, perPage, order, orderDir, showArchived); }; const handlePerPageChange = (newPerPage) => { @@ -75,12 +75,12 @@ const PageTemplateListPage = ({ newPerPage, order, orderDir, - hideArchived + showArchived ); }; const handleSort = (key, dir) => { - getPageTemplates(term, currentPage, perPage, key, dir, hideArchived); + getPageTemplates(term, currentPage, perPage, key, dir, showArchived); }; const handleSearch = (searchTerm) => { @@ -90,11 +90,11 @@ const PageTemplateListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }; - const handleHideArchived = (ev) => { + const handleShowArchived = (ev) => { getPageTemplates( term, currentPage, @@ -135,7 +135,7 @@ const PageTemplateListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ) ); }; @@ -217,8 +217,13 @@ const PageTemplateListPage = ({ > } - label={T.translate("page_template_list.hide_archived")} + control={ + + } + label={T.translate("page_template_list.show_archived")} /> diff --git a/src/pages/sponsors/show-pages-list-page/index.js b/src/pages/sponsors/show-pages-list-page/index.js index 2613906e4..1334e36f4 100644 --- a/src/pages/sponsors/show-pages-list-page/index.js +++ b/src/pages/sponsors/show-pages-list-page/index.js @@ -46,7 +46,7 @@ const ShowPagesListPage = ({ term, order, orderDir, - hideArchived, + showArchived, totalCount, currentShowPage, sponsorships, @@ -66,15 +66,15 @@ const ShowPagesListPage = ({ }, []); const handlePageChange = (page) => { - getShowPages(term, page, perPage, order, orderDir, hideArchived); + getShowPages(term, page, perPage, order, orderDir, showArchived); }; const handleSort = (key, dir) => { - getShowPages(term, currentPage, perPage, key, dir, hideArchived); + getShowPages(term, currentPage, perPage, key, dir, showArchived); }; const handlePerPageChange = (newPerPage) => { - getShowPages(term, currentPage, newPerPage, order, orderDir, hideArchived); + getShowPages(term, currentPage, newPerPage, order, orderDir, showArchived); }; const handleRowDelete = (itemId) => { @@ -85,7 +85,7 @@ const ShowPagesListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ) ); }; @@ -189,13 +189,13 @@ const ShowPagesListPage = ({ control={ } - label={T.translate("show_pages.hide_archived")} + label={T.translate("sponsor_pages.show_archived")} /> diff --git a/src/pages/sponsors/sponsor-form-item-list-page/index.js b/src/pages/sponsors/sponsor-form-item-list-page/index.js index e0849ecb3..e96fc6582 100644 --- a/src/pages/sponsors/sponsor-form-item-list-page/index.js +++ b/src/pages/sponsors/sponsor-form-item-list-page/index.js @@ -48,7 +48,7 @@ const SponsorFormItemListPage = ({ items, currentPage, perPage, - hideArchived, + showArchived, order, orderDir, totalCount, @@ -67,14 +67,14 @@ const SponsorFormItemListPage = ({ }, []); const handlePageChange = (page) => { - getSponsorFormItems(formId, page, perPage, order, orderDir, hideArchived); + getSponsorFormItems(formId, page, perPage, order, orderDir, showArchived); }; const handleSort = (key, dir) => { - getSponsorFormItems(formId, currentPage, perPage, key, dir, hideArchived); + getSponsorFormItems(formId, currentPage, perPage, key, dir, showArchived); }; - const handleHideArchivedForms = (ev) => { + const handleShowArchivedForms = (ev) => { getSponsorFormItems( formId, DEFAULT_CURRENT_PAGE, @@ -111,7 +111,7 @@ const SponsorFormItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }); }; @@ -244,15 +244,16 @@ const SponsorFormItemListPage = ({ } - label={T.translate("sponsor_form_item_list.hide_archived")} + label={T.translate("sponsor_form_item_list.show_archived")} />