diff --git a/src/actions/__tests__/sponsor-forms-actions.test.js b/src/actions/__tests__/sponsor-forms-actions.test.js index dbf2689e9..192642107 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 a7578fd2b..d2866eb4d 100644 --- a/src/actions/form-template-item-actions.js +++ b/src/actions/form-template-item-actions.js @@ -80,7 +80,7 @@ export const getFormTemplateItems = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -101,12 +101,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 ? "" : "-"; @@ -118,7 +118,7 @@ export const getFormTemplateItems = createAction(RECEIVE_FORM_TEMPLATE_ITEMS), `${window.INVENTORY_API_BASE_URL}/api/v1/form-templates/${formTemplateId}/items`, authErrorHandler, - { order, orderDir, page, term, hideArchived } + { order, orderDir, page, term, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); diff --git a/src/actions/inventory-item-actions.js b/src/actions/inventory-item-actions.js index d0d2422a1..1bf49fca5 100644 --- a/src/actions/inventory-item-actions.js +++ b/src/actions/inventory-item-actions.js @@ -102,7 +102,7 @@ export const getInventoryItems = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -115,7 +115,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, @@ -141,31 +141,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/actions/page-template-actions.js b/src/actions/page-template-actions.js index 1fa0f7fab..b2761b4ec 100644 --- a/src/actions/page-template-actions.js +++ b/src/actions/page-template-actions.js @@ -53,7 +53,7 @@ export const getPageTemplates = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -76,7 +76,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; @@ -93,7 +93,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 480619f4a..61679b567 100644 --- a/src/actions/sponsor-forms-actions.js +++ b/src/actions/sponsor-forms-actions.js @@ -110,7 +110,7 @@ export const getSponsorForms = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false, + showArchived = false, sponsorshipTypesId = [] ) => async (dispatch, getState) => { @@ -134,7 +134,7 @@ export const getSponsorForms = access_token: accessToken }; - if (hideArchived) filter.push("is_archived==0"); + filter.push(`is_archived==${showArchived ? 1 : 0}`); if (sponsorshipTypesId?.length > 0) { const formattedSponsorships = sponsorshipTypesId.join("&&"); @@ -157,7 +157,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()); }); @@ -257,7 +257,7 @@ export const getGlobalTemplates = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch) => { const accessToken = await getAccessTokenSafely(); @@ -278,7 +278,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; @@ -479,7 +479,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(); @@ -506,7 +506,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; @@ -523,7 +523,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 } + { order, orderDir, page, term, summitTZ, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); @@ -586,7 +586,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(); @@ -613,7 +613,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; @@ -630,7 +630,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 } + { order, orderDir, page, term, summitTZ, showArchived } )(params)(dispatch).then(() => { dispatch(stopLoading()); }); @@ -671,7 +671,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(); @@ -695,7 +695,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; @@ -712,7 +712,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()); }); @@ -951,7 +951,7 @@ export const getSponsorFormItems = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false + showArchived = false ) => async (dispatch, getState) => { const { currentSummitState } = getState(); @@ -970,7 +970,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; @@ -987,7 +987,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/actions/sponsor-pages-actions.js b/src/actions/sponsor-pages-actions.js index bc4fa17ba..05d5291bd 100644 --- a/src/actions/sponsor-pages-actions.js +++ b/src/actions/sponsor-pages-actions.js @@ -45,7 +45,7 @@ export const getSponsorPages = perPage = DEFAULT_PER_PAGE, order = "id", orderDir = DEFAULT_ORDER_DIR, - hideArchived = false, + showArchived = false, sponsorshipTypesId = [] ) => async (dispatch, getState) => { @@ -68,7 +68,7 @@ export const getSponsorPages = 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("&&"); @@ -91,7 +91,7 @@ export const getSponsorPages = createAction(RECEIVE_SPONSOR_PAGES), `${window.SPONSOR_PAGES_API_URL}/api/v1/summits/${currentSummit.id}/show-pages`, authErrorHandler, - { order, orderDir, page, term, hideArchived } + { order, orderDir, page, term, 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 6875e2811..8719ef2ae 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 f52f696bf..db1c889f1 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 0028046ad..00d292d2b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -2399,7 +2399,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", @@ -2442,7 +2442,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", @@ -2528,7 +2528,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", @@ -2593,7 +2593,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", @@ -2646,7 +2646,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", "no_sponsors_pages": "No pages found for this search criteria.", @@ -3702,7 +3702,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" } @@ -3758,7 +3758,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", @@ -3810,7 +3810,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", @@ -3940,7 +3940,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 16b6acf04..a7044a3d3 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 ); }; @@ -136,7 +136,7 @@ const FormTemplateItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }) .catch((error) => { @@ -152,7 +152,7 @@ const FormTemplateItemListPage = ({ ? unarchiveFormTemplateItem(formTemplateId, item) : archiveFormTemplateItem(formTemplateId, item); - const handleHideArchivedForms = (ev) => { + const handleShowArchivedForms = (ev) => { getFormTemplateItems( formTemplateId, term, @@ -173,7 +173,7 @@ const FormTemplateItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ) ); setShowInventoryItemModal(false); @@ -259,15 +259,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 515561cdc..a50ae2dfa 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 4d351229e..6696d3c48 100644 --- a/src/pages/sponsors-global/inventory/inventory-list-page.js +++ b/src/pages/sponsors-global/inventory/inventory-list-page.js @@ -53,7 +53,7 @@ const InventoryListPage = ({ term, order, orderDir, - hideArchived, + showArchived, totalInventoryItems, saveInventoryItem, deleteInventoryItemImage, @@ -74,11 +74,11 @@ const InventoryListPage = ({ }; useEffect(() => { - getInventoryItems(term, 1, perPage, order, orderDir, hideArchived); + getInventoryItems(term, 1, perPage, order, orderDir, showArchived); }, []); const handlePageChange = (page) => { - getInventoryItems(term, page, perPage, order, orderDir, hideArchived); + getInventoryItems(term, page, perPage, order, orderDir, showArchived); }; const handlePerPageChange = (newPerPage) => { @@ -88,12 +88,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) => { @@ -104,12 +104,12 @@ const InventoryListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); } }; - const handleHideArchivedForms = (ev) => { + const handleShowArchivedForms = (ev) => { getInventoryItems( term, DEFAULT_CURRENT_PAGE, @@ -139,7 +139,7 @@ const InventoryListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ) ) .finally(() => setOpen(false)); @@ -229,15 +229,16 @@ const InventoryListPage = ({ } - label={T.translate("inventory_item_list.hide_archived")} + label={T.translate("inventory_item_list.show_archived")} /> { - getPageTemplates(term, page, perPage, order, orderDir, hideArchived); + getPageTemplates(term, page, perPage, order, orderDir, showArchived); }; const handlePerPageChange = (newPerPage) => { @@ -70,12 +70,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) => { @@ -85,11 +85,11 @@ const PageTemplateListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }; - const handleHideArchived = (ev) => { + const handleShowArchived = (ev) => { getPageTemplates( term, currentPage, @@ -129,7 +129,7 @@ const PageTemplateListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ) ); }; @@ -206,8 +206,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/sponsor-form-item-list-page/index.js b/src/pages/sponsors/sponsor-form-item-list-page/index.js index caee57adb..5226407be 100644 --- a/src/pages/sponsors/sponsor-form-item-list-page/index.js +++ b/src/pages/sponsors/sponsor-form-item-list-page/index.js @@ -47,7 +47,7 @@ const SponsorFormItemListPage = ({ items, currentPage, perPage, - hideArchived, + showArchived, order, orderDir, totalCount, @@ -66,14 +66,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, @@ -109,7 +109,7 @@ const SponsorFormItemListPage = ({ perPage, order, orderDir, - hideArchived + showArchived ); }); }; @@ -238,15 +238,16 @@ const SponsorFormItemListPage = ({ } - label={T.translate("sponsor_form_item_list.hide_archived")} + label={T.translate("sponsor_form_item_list.show_archived")} />