diff --git a/vuu-ui/packages/vuu-filters/package.json b/vuu-ui/packages/vuu-filters/package.json index a4e5f7a9f..2651df5bd 100644 --- a/vuu-ui/packages/vuu-filters/package.json +++ b/vuu-ui/packages/vuu-filters/package.json @@ -25,6 +25,7 @@ "uuid": "9.0.0" }, "peerDependencies": { + "@internationalized/date": "^3.0.0", "react": ">=17.0.2", "react-dom": ">=17.0.2" } diff --git a/vuu-ui/packages/vuu-filters/src/__tests__/__component__/Filterbar.cy.tsx b/vuu-ui/packages/vuu-filters/src/__tests__/__component__/Filterbar.cy.tsx index a82855254..f0796e9da 100644 --- a/vuu-ui/packages/vuu-filters/src/__tests__/__component__/Filterbar.cy.tsx +++ b/vuu-ui/packages/vuu-filters/src/__tests__/__component__/Filterbar.cy.tsx @@ -1,5 +1,4 @@ // TODO try and get TS path alias working to avoid relative paths like this -import { defaultPatternsByType, formatDate } from "@finos/vuu-utils"; import { DefaultFilterBar, FilterBarMultipleFilters, @@ -9,6 +8,7 @@ import { const FILTER_CONTAINER = ".vuuFilterBar-filters"; const ADD_BUTTON = ".vuuFilterBar-add"; const FILTER_CLAUSE = ".vuuFilterClause"; +const VISIBLE_MONTH = ".saltCalendarCarousel-slide:not([aria-hidden])"; const findFilter = (className: string) => cy.get(FILTER_CONTAINER).find(className); @@ -438,9 +438,6 @@ const getDate = (t: "start-today" | "start-tomorrow" | "end-today") => { describe("WHEN a user applies a date filter", () => { const DATE_COLUMN = "lastUpdated"; - const todayDateFormatted = formatDate({ date: defaultPatternsByType.date })( - new Date() - ); const startOfToday = getDate("start-today").getTime(); const endOfToday = getDate("end-today").getTime(); const startOfTomorrow = getDate("start-tomorrow").getTime(); @@ -507,7 +504,7 @@ describe("WHEN a user applies a date filter", () => { cy.get(ADD_BUTTON).realClick(); clickListItems(DATE_COLUMN, op); cy.get(".vuuDatePopup .vuuIconButton").realClick(); - cy.get(".saltCalendarDay-today:not(.saltCalendarDay-hidden)").realClick(); + cy.get(`${VISIBLE_MONTH} .saltCalendarDay-today`).realClick(); cy.realPress("ArrowRight"); clickButton("Save"); waitUntilEditableLabelIsFocused(); diff --git a/vuu-ui/packages/vuu-ui-controls/package.json b/vuu-ui/packages/vuu-ui-controls/package.json index 8245ee246..971b7950d 100644 --- a/vuu-ui/packages/vuu-ui-controls/package.json +++ b/vuu-ui/packages/vuu-ui-controls/package.json @@ -20,6 +20,7 @@ "@finos/vuu-utils": "0.0.26" }, "peerDependencies": { + "@internationalized/date": "^3.0.0", "clsx": "^2.0.0", "react": ">=17.0.2", "react-dom": ">=17.0.2" diff --git a/vuu-ui/packages/vuu-utils/package.json b/vuu-ui/packages/vuu-utils/package.json index 6c16269d7..5d7f6b091 100644 --- a/vuu-ui/packages/vuu-utils/package.json +++ b/vuu-ui/packages/vuu-utils/package.json @@ -17,6 +17,7 @@ "@finos/vuu-protocol-types": "0.0.26" }, "peerDependencies": { + "@internationalized/date": "^3.0.0", "react": ">=17.0.2", "react-dom": ">=17.0.2" },