Skip to content

Commit dc8284d

Browse files
committed
fix filter issues resulting in salt combobox change
1 parent de1d264 commit dc8284d

34 files changed

Lines changed: 972 additions & 595 deletions

vuu-ui/packages/vuu-context-menu/src/useContextMenu.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ export const useContextMenu = (
6464
evt.stopPropagation?.();
6565
evt.preventDefault?.();
6666

67-
console.log(
68-
`showContextMenu at ${evt.clientX} ${evt.clientY} location ${location}`,
69-
);
70-
7167
const menuBuilders: MenuBuilder[] = [];
7268
if (menuBuilder) {
7369
menuBuilders.push(menuBuilder);

vuu-ui/packages/vuu-filters/src/__tests__/__component__/ColumnFilter.playwright.test.tsx

Lines changed: 3 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import { test, expect } from "@playwright/experimental-ct-react";
1+
import { test } from "@playwright/experimental-ct-react";
22
import { LocalDataSourceProvider } from "@vuu-ui/vuu-data-test";
3+
import { expect } from "../../../../../playwright/customAssertions";
4+
35
import {
46
ContainerManagedNumericColumnFilter,
57
ContainerManagedTextColumnFilter,
@@ -18,62 +20,6 @@ import {
1820
import { ColumnFilterProps } from "../../column-filter/ColumnFilter";
1921
import { FilterAppliedHandler } from "../../filter-container/useFilterContainer";
2022

21-
declare global {
22-
namespace PlaywrightTest {
23-
interface Matchers<R> {
24-
toHaveSelection(start: number, end: number): R;
25-
}
26-
}
27-
}
28-
// TODO figure out where we put this to make it shareable
29-
expect.extend({
30-
async toHaveSelection(locator, start, end) {
31-
let pass: boolean;
32-
let selection: [number, number] | undefined = undefined;
33-
let errorName: string | undefined;
34-
35-
try {
36-
await expect
37-
.poll(
38-
async () => {
39-
return await locator.evaluate((el: object) => {
40-
const { selectionStart, selectionEnd } = el as HTMLInputElement;
41-
return [selectionStart, selectionEnd];
42-
});
43-
},
44-
{ timeout: 1000 },
45-
)
46-
.toEqual([start, end]);
47-
pass = true;
48-
} catch (error) {
49-
errorName = (error as Error).message.replace(
50-
"toEqual",
51-
"toHaveSelection",
52-
);
53-
pass = false;
54-
}
55-
const message = () =>
56-
pass
57-
? (errorName ? `\x1b[31m${errorName} for \x1b[0m` : "") +
58-
this.utils.matcherHint("toHaveSelection", undefined, undefined, {
59-
isNot: this.isNot,
60-
}) +
61-
"\n\n" +
62-
`Locator: ${locator}\n` +
63-
`Expected: ${this.isNot ? "not" : ""} ${this.utils.printExpected([start, end])}\n` +
64-
(selection ? `Received: ${this.utils.printReceived(selection)}` : "")
65-
: "Failed!\n" + errorName!;
66-
67-
return {
68-
message,
69-
pass,
70-
name: "toHaveSelection",
71-
expected: [start, end],
72-
actual: selection,
73-
};
74-
},
75-
});
76-
7723
const BBG = { name: "bbg", serverDataType: "string" };
7824
const PRICE = { name: "price", serverDataType: "double" };
7925
const VUU_CREATED = {

vuu-ui/packages/vuu-filters/src/__tests__/__component__/FilterClause.cy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
FilterColumnAndOperatorWithDropdownOpenOnFocusDisabled,
77
FilterColumnWithDropdownOpenOnFocusDisabled,
88
NewFilterClauseWithDropdownOpenOnFocusDisabled,
9-
} from "../../../../../showcase/src/examples/Filters/FilterClause/FilterClause.examples";
9+
} from "../../../../../showcase/src/examples/Filters/FilterClause.examples";
1010

1111
describe("FilterClause", () => {
1212
describe("WHEN new filter clause is rendered", () => {

0 commit comments

Comments
 (0)