diff --git a/package.json b/package.json index b6afdcd12..6adc3ea38 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "moment-duration-format": "^2.3.2", "moment-timezone": "^0.5.33", "mui-color-input": "^9.0.0", - "openstack-uicore-foundation": "5.0.44", + "openstack-uicore-foundation": "5.0.49-beta.0", "p-limit": "^6.1.0", "path-browserify": "^1.0.1", "postcss-loader": "^6.2.1", diff --git a/src/actions/sponsor-forms-actions.js b/src/actions/sponsor-forms-actions.js index 5492628e7..bcfe40c6e 100644 --- a/src/actions/sponsor-forms-actions.js +++ b/src/actions/sponsor-forms-actions.js @@ -144,7 +144,9 @@ export const getSponsorForms = expand: "sponsorship_types" }; - filter.push(`is_archived==${showArchived ? 1 : 0}`); + if (!showArchived) { + filter.push("is_archived==0"); + } if (sponsorshipTypesId?.length > 0) { const formattedSponsorships = sponsorshipTypesId.join("&&"); diff --git a/src/pages/media_uploads/media-upload-list-page.js b/src/pages/media_uploads/media-upload-list-page.js index c061ef4cf..83be2cb9b 100644 --- a/src/pages/media_uploads/media-upload-list-page.js +++ b/src/pages/media_uploads/media-upload-list-page.js @@ -156,7 +156,6 @@ const MediaUploadListPage = ({ ( { const img = row.images?.[0]; diff --git a/src/pages/sponsors-global/form-templates/form-template-from-duplicate-popup.js b/src/pages/sponsors-global/form-templates/form-template-from-duplicate-popup.js index 17b79a843..d5a079d20 100644 --- a/src/pages/sponsors-global/form-templates/form-template-from-duplicate-popup.js +++ b/src/pages/sponsors-global/form-templates/form-template-from-duplicate-popup.js @@ -62,7 +62,6 @@ const FormTemplateFromDuplicateDialog = ({ { columnKey: "select", header: "", - width: 30, align: "center", render: (row) => ( { const img = row.images?.[0]; diff --git a/src/pages/sponsors-global/inventory/inventory-list-page.js b/src/pages/sponsors-global/inventory/inventory-list-page.js index a3ba172f5..ad8bec909 100644 --- a/src/pages/sponsors-global/inventory/inventory-list-page.js +++ b/src/pages/sponsors-global/inventory/inventory-list-page.js @@ -165,7 +165,6 @@ const InventoryListPage = ({ { columnKey: "hasImage", header: "", - width: 40, align: "center", render: (row) => { const img = row.images?.[0]; 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 4ada962ec..8f50169df 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 @@ -275,7 +275,7 @@ describe("ShowPagesListPage", () => { } } ); - const archiveButton = screen.getByText("general.archive"); + const archiveButton = screen.getByTestId("action-archive"); await act(async () => { await userEvent.click(archiveButton); }); @@ -295,7 +295,7 @@ describe("ShowPagesListPage", () => { } } ); - const unarchiveButton = screen.getByText("general.unarchive"); + const unarchiveButton = screen.getByTestId("action-archive"); await act(async () => { await userEvent.click(unarchiveButton); }); diff --git a/src/pages/sponsors/show-purchase-list-page/index.js b/src/pages/sponsors/show-purchase-list-page/index.js index c20075a68..cecde6fd5 100644 --- a/src/pages/sponsors/show-purchase-list-page/index.js +++ b/src/pages/sponsors/show-purchase-list-page/index.js @@ -116,7 +116,7 @@ const ShowPurchaseListPage = ({ { columnKey: "purchased", header: T.translate("sponsor_show_purchases.purchased"), - width: 200, + width: 180, sortable: true }, { @@ -171,7 +171,7 @@ const ShowPurchaseListPage = ({ { columnKey: "details", header: "", - width: 100, + width: 80, align: "center", render: (row) => ( - + diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/add-sponsor-form-template-popup/index.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/add-sponsor-form-template-popup/index.js index 33b40332e..3154614a2 100644 --- a/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/add-sponsor-form-template-popup/index.js +++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/add-sponsor-form-template-popup/index.js @@ -140,7 +140,6 @@ const AddSponsorFormTemplatePopup = ({ { columnKey: "select", header: "", - width: 30, align: "center", render: (row) => ( ( { const img = row.images?.[0]; diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/manage-items/sponsor-forms-manage-items.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/manage-items/sponsor-forms-manage-items.js index 86a48eae5..96f305216 100644 --- a/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/manage-items/sponsor-forms-manage-items.js +++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/components/manage-items/sponsor-forms-manage-items.js @@ -257,7 +257,6 @@ const SponsorFormsManageItems = ({ { columnKey: "images", header: "", - width: 40, align: "center", render: (row) => row.images?.length > 0 ? ( diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/index.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/index.js index 5e499a935..8fa808a86 100644 --- a/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/index.js +++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-forms-tab/index.js @@ -296,7 +296,6 @@ const SponsorFormsTab = ({ columnKey: "allowed_add_ons", header: T.translate("edit_sponsor.forms_tab.add_ons"), sortable: true, - width: 120, render: (row) => row.allowed_add_ons?.length > 0 ? row.allowed_add_ons.map((a) => `${a.type} ${a.name}`).join(", ") @@ -318,7 +317,6 @@ const SponsorFormsTab = ({ columnKey: "items_qty", header: T.translate("edit_sponsor.forms_tab.items"), sortable: true, - width: 90, render: (row) => `${row.items_count} ${ row.items_count === 1 @@ -478,7 +476,6 @@ const SponsorFormsTab = ({ sortDir: customizedForms.orderDir, disableProp: "is_archived" }} - tableSx={{ tableLayout: "auto", minWidth: 910 }} perPage={customizedForms.perPage} totalRows={customizedForms.totalCount} currentPage={customizedForms.currentPage} @@ -499,7 +496,6 @@ const SponsorFormsTab = ({ sortCol: managedForms.order, sortDir: managedForms.orderDir }} - tableSx={{ tableLayout: "auto", minWidth: 910 }} perPage={managedForms.perPage} totalRows={managedForms.totalCount} currentPage={managedForms.currentPage} diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js index 6821d609d..b3e2a6cf3 100644 --- a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js +++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/__tests__/sponsor-pages-tab.test.js @@ -396,7 +396,7 @@ describe("SponsorPagesTab", () => { } ); - const archiveButton = screen.getByText("general.archive"); + const archiveButton = screen.getByTestId("action-archive"); await act(async () => { await userEvent.click(archiveButton); }); @@ -422,7 +422,7 @@ describe("SponsorPagesTab", () => { } ); - const unarchiveButton = screen.getByText("general.unarchive"); + const unarchiveButton = screen.getByTestId("action-archive"); await act(async () => { await userEvent.click(unarchiveButton); }); diff --git a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/components/add-sponsor-page-template-popup/index.js b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/components/add-sponsor-page-template-popup/index.js index 90cf133cd..c423a096c 100644 --- a/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/components/add-sponsor-page-template-popup/index.js +++ b/src/pages/sponsors/sponsor-page/tabs/sponsor-pages-tab/components/add-sponsor-page-template-popup/index.js @@ -159,7 +159,6 @@ const AddSponsorPageTemplatePopup = ({ { columnKey: "select", header: "", - width: 30, align: "center", render: (row) => ( ( + <> +
{row.name}
+ {!!row.invite_only_registration && ( + + )} + + ) }, { columnKey: "sponsor_qty", @@ -143,15 +155,6 @@ const SummitDirectoryPage = ({ columnKey: "end_date", header: T.translate("directory.end_date"), render: (row) => formatEpoch(row.end_date, "MMMM Do YYYY") - }, - { - columnKey: "invite_only_registration", - header: "", - width: 120, - render: (row) => - row.invite_only_registration ? ( - - ) : null } ]; @@ -214,7 +217,6 @@ const SummitDirectoryPage = ({ deleteSummit(id) : undefined} onSelect={handleSelectSummit} - getName={(row) => row.name} - deleteDialogTitle={T.translate("general.are_you_sure")} deleteDialogBody={(name) => `${T.translate("directory.remove_warning")} ${name}` } - deleteDialogConfirmText={T.translate("general.yes_delete")} - confirmButtonColor="error" /> ); diff --git a/yarn.lock b/yarn.lock index 3065f215e..1f4d4cb8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9042,10 +9042,10 @@ open@^10.0.3: is-inside-container "^1.0.0" wsl-utils "^0.1.0" -openstack-uicore-foundation@5.0.44: - version "5.0.44" - resolved "https://registry.yarnpkg.com/openstack-uicore-foundation/-/openstack-uicore-foundation-5.0.44.tgz#d40d42d083de98bfb8d5e5baba7ff9b14267902c" - integrity sha512-wThO8s5IIZbpjlzhZKJ3KMNBYhTjt/q2TZyazfiDKOR2YMV51A8oudy6/uMe5UkQPMfuApLg4abPXZcNCdaNBA== +openstack-uicore-foundation@5.0.49-beta.0: + version "5.0.49-beta.0" + resolved "https://registry.yarnpkg.com/openstack-uicore-foundation/-/openstack-uicore-foundation-5.0.49-beta.0.tgz#89e985a21196551b19ad04cfce615c32c8058c92" + integrity sha512-ktXOuBAXld4QfxjnruqQFtVx7rOK57vuls0cMm3YItPkyox0pCxr6WwL6n6xo/FQKcevH0zKWUrZZJb/x0PS4A== dependencies: use-sync-external-store "^1.6.0"