Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update findable-ui to latest v20.0.0 (#4321) #4322

Merged
merged 3 commits into from
Jan 6, 2025
Merged

chore: update findable-ui to latest v20.0.0 (#4321) #4322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2148ded
chore: update findable-ui to latest v20.0.0 (#4321)
Jan 6, 2025
0d97bb8
fix: anvil catalog test (#4321)
Jan 6, 2025
78619af
feat: aded additional locator to anvil cmg pagination test (#4321)
Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/components/common/Banner/components/Announcements/announcements.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Banner } from "@databiosphere/findable-ui/lib/components/common/Banner/banner";
import { useSessionTimeout } from "@databiosphere/findable-ui/lib/hooks/useSessionTimeout";
import { useSessionTimeout } from "@databiosphere/findable-ui/lib/hooks/authentication/session/useSessionTimeout";
import { useSystemStatus } from "@databiosphere/findable-ui/lib/hooks/useSystemStatus";
import { Fragment, ReactNode } from "react";

Expand Down
6 changes: 3 additions & 3 deletions e2e/anvil-catalog/anvilcatalog-select-tabs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ test("Expect the checkboxes in the 'Edit Columns' menu to add those columns to t
await testSelectableColumns(page, tab);
});

test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Consortia tab", async ({
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and enabled on the Consortia tab", async ({
page,
}) => {
const tab = ANVIL_CATALOG_TABS.CONSORTIA;
await testPreSelectedColumns(page, tab);
});

test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Studies tab", async ({
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and enabled on the Studies tab", async ({
page,
}) => {
const tab = ANVIL_CATALOG_TABS.STUDIES;
await testPreSelectedColumns(page, tab);
});

test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Workspaces tab", async ({
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and enabled on the Workspaces tab", async ({
page,
}) => {
const tab = ANVIL_CATALOG_TABS.WORKSPACES;
Expand Down
17 changes: 10 additions & 7 deletions e2e/testFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ export async function testSelectableColumns(

/**
* Checks that the preselected columns specified in the tab object appear
* in the "Edit Columns" menu and that their checkbox is checked and disabled
* in the "Edit Columns" menu and that their checkbox is checked and enabled.
* @param page - the Playwright page object
* @param tab - the tab object to test
*/
Expand All @@ -353,7 +353,7 @@ export async function testPreSelectedColumns(
.filter({ has: page.getByText(column.name, { exact: true }) }),
})
.getByRole("checkbox");
await expect(checkboxLocator).toBeDisabled();
await expect(checkboxLocator).toBeEnabled();
await expect(checkboxLocator).toBeChecked();
}
}
Expand Down Expand Up @@ -1304,16 +1304,19 @@ export async function filterAndTestLastPagePagination(
await expect(getFirstRowNthColumnCellLocator(page, 0)).toBeVisible();

// Should start on first page, and there should be multiple pages available
await expect(page.getByText(PAGE_COUNT_REGEX, { exact: true })).toHaveText(
/Page 1 of [0-9]+/
);
await expect(
page.getByText(PAGE_COUNT_REGEX, { exact: true })
page.locator(".MuiPaper-table").getByText(PAGE_COUNT_REGEX, { exact: true })
).toHaveText(/Page 1 of [0-9]+/);
await expect(
page.locator(".MuiPaper-table").getByText(PAGE_COUNT_REGEX, { exact: true })
).not.toHaveText("Page 1 of 1");

// Detect number of pages
const splitStartingPageText = (
await page.getByText(PAGE_COUNT_REGEX, { exact: true }).innerText()
await page
.locator(".MuiPaper-table")
.getByText(PAGE_COUNT_REGEX, { exact: true })
.innerText()
).split(" ");
const maxPages = parseInt(
splitStartingPageText[splitStartingPageText.length - 1]
Expand Down
Loading
Loading