Skip to content

Commit 8925ed1

Browse files
authored
chore: update findable-ui to latest v20.0.0 (#4321) (#4322)
1 parent a061e2f commit 8925ed1

39 files changed

+433
-134
lines changed

app/components/common/Banner/components/Announcements/announcements.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Banner } from "@databiosphere/findable-ui/lib/components/common/Banner/banner";
2-
import { useSessionTimeout } from "@databiosphere/findable-ui/lib/hooks/useSessionTimeout";
2+
import { useSessionTimeout } from "@databiosphere/findable-ui/lib/hooks/authentication/session/useSessionTimeout";
33
import { useSystemStatus } from "@databiosphere/findable-ui/lib/hooks/useSystemStatus";
44
import { Fragment, ReactNode } from "react";
55

e2e/anvil-catalog/anvilcatalog-select-tabs.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ test("Expect the checkboxes in the 'Edit Columns' menu to add those columns to t
1212
await testSelectableColumns(page, tab);
1313
});
1414

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

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

29-
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and disabled on the Workspaces tab", async ({
29+
test("Expect the checkboxes for preselected columns in the 'Edit Columns' menu to be checked and enabled on the Workspaces tab", async ({
3030
page,
3131
}) => {
3232
const tab = ANVIL_CATALOG_TABS.WORKSPACES;

e2e/testFunctions.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ export async function testSelectableColumns(
332332

333333
/**
334334
* Checks that the preselected columns specified in the tab object appear
335-
* in the "Edit Columns" menu and that their checkbox is checked and disabled
335+
* in the "Edit Columns" menu and that their checkbox is checked and enabled.
336336
* @param page - the Playwright page object
337337
* @param tab - the tab object to test
338338
*/
@@ -353,7 +353,7 @@ export async function testPreSelectedColumns(
353353
.filter({ has: page.getByText(column.name, { exact: true }) }),
354354
})
355355
.getByRole("checkbox");
356-
await expect(checkboxLocator).toBeDisabled();
356+
await expect(checkboxLocator).toBeEnabled();
357357
await expect(checkboxLocator).toBeChecked();
358358
}
359359
}
@@ -1304,16 +1304,19 @@ export async function filterAndTestLastPagePagination(
13041304
await expect(getFirstRowNthColumnCellLocator(page, 0)).toBeVisible();
13051305

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

13141314
// Detect number of pages
13151315
const splitStartingPageText = (
1316-
await page.getByText(PAGE_COUNT_REGEX, { exact: true }).innerText()
1316+
await page
1317+
.locator(".MuiPaper-table")
1318+
.getByText(PAGE_COUNT_REGEX, { exact: true })
1319+
.innerText()
13171320
).split(" ");
13181321
const maxPages = parseInt(
13191322
splitStartingPageText[splitStartingPageText.length - 1]

0 commit comments

Comments
 (0)