Skip to content

Commit 951feea

Browse files
renovate[bot]steverydz
renovate[bot]
and
steverydz
authored
chore(deps): update dependency @canonical/react-components to v3.12.1 (#5585)
* chore(deps): update dependency @canonical/react-components to v3.12.1 * Fix signing key table tests * Fix remodel table tests * Fix policies table tests * Fix models table tests --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Steve Rydz <steve.rydz@canonical.com>
1 parent 97c7a3d commit 951feea

6 files changed

Lines changed: 84 additions & 64 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@babel/preset-typescript": "7.28.5",
2828
"@canonical/cookie-policy": "3.8.4",
2929
"@canonical/global-nav": "3.8.0",
30-
"@canonical/react-components": "3.9.0",
30+
"@canonical/react-components": "3.12.1",
3131
"@canonical/store-components": "0.55.0",
3232
"@dnd-kit/core": "6.3.1",
3333
"@dnd-kit/sortable": "10.0.0",

‎static/js/publisher/pages/Model/__tests__/PoliciesTable.test.tsx‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,17 @@ describe("PoliciesTable", () => {
5959

6060
const user = userEvent.setup();
6161
const columnHeader = screen.getByRole("columnheader", { name: "Revision" });
62+
const columnHeaderBtn = screen.getByRole("button", { name: "Revision" });
6263

6364
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
6465

65-
await user.click(columnHeader);
66+
await user.click(columnHeaderBtn);
6667
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
6768

68-
await user.click(columnHeader);
69+
await user.click(columnHeaderBtn);
6970
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
7071

71-
await user.click(columnHeader);
72+
await user.click(columnHeaderBtn);
7273
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
7374
});
7475

@@ -79,16 +80,17 @@ describe("PoliciesTable", () => {
7980
const columnHeader = screen.getByRole("columnheader", {
8081
name: "Signing key",
8182
});
83+
const columnHeaderBtn = screen.getByRole("button", { name: "Signing key" });
8284

8385
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
8486

85-
await user.click(columnHeader);
87+
await user.click(columnHeaderBtn);
8688
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
8789

88-
await user.click(columnHeader);
90+
await user.click(columnHeaderBtn);
8991
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
9092

91-
await user.click(columnHeader);
93+
await user.click(columnHeaderBtn);
9294
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
9395
});
9496

@@ -99,16 +101,19 @@ describe("PoliciesTable", () => {
99101
const columnHeader = screen.getByRole("columnheader", {
100102
name: "Creation date",
101103
});
104+
const columnHeaderBtn = screen.getByRole("button", {
105+
name: "Creation date",
106+
});
102107

103108
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
104109

105-
await user.click(columnHeader);
110+
await user.click(columnHeaderBtn);
106111
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
107112

108-
await user.click(columnHeader);
113+
await user.click(columnHeaderBtn);
109114
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
110115

111-
await user.click(columnHeader);
116+
await user.click(columnHeaderBtn);
112117
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
113118
});
114119

@@ -119,16 +124,19 @@ describe("PoliciesTable", () => {
119124
const columnHeader = screen.getByRole("columnheader", {
120125
name: "Last updated",
121126
});
127+
const columnHeaderBtn = screen.getByRole("button", {
128+
name: "Last updated",
129+
});
122130

123131
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
124132

125-
await user.click(columnHeader);
133+
await user.click(columnHeaderBtn);
126134
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
127135

128-
await user.click(columnHeader);
136+
await user.click(columnHeaderBtn);
129137
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
130138

131-
await user.click(columnHeader);
139+
await user.click(columnHeaderBtn);
132140
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
133141
});
134142
});

‎static/js/publisher/pages/Models/__tests__/ModelsTable.test.tsx‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,17 @@ describe("ModelsTable", () => {
4848

4949
const user = userEvent.setup();
5050
const columnHeader = screen.getByRole("columnheader", { name: /Name/ });
51+
const columnHeaderBtn = screen.getByRole("button", { name: /Name/ });
5152

5253
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
5354

54-
await user.click(columnHeader);
55+
await user.click(columnHeaderBtn);
5556
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
5657

57-
await user.click(columnHeader);
58+
await user.click(columnHeaderBtn);
5859
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
5960

60-
await user.click(columnHeader);
61+
await user.click(columnHeaderBtn);
6162
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
6263
});
6364

@@ -68,16 +69,19 @@ describe("ModelsTable", () => {
6869
const columnHeader = screen.getByRole("columnheader", {
6970
name: "Last updated",
7071
});
72+
const columnHeaderBtn = screen.getByRole("button", {
73+
name: "Last updated",
74+
});
7175

7276
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
7377

74-
await user.click(columnHeader);
78+
await user.click(columnHeaderBtn);
7579
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
7680

77-
await user.click(columnHeader);
81+
await user.click(columnHeaderBtn);
7882
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
7983

80-
await user.click(columnHeader);
84+
await user.click(columnHeaderBtn);
8185
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
8286
});
8387

@@ -88,16 +92,19 @@ describe("ModelsTable", () => {
8892
const columnHeader = screen.getByRole("columnheader", {
8993
name: "Created date",
9094
});
95+
const columnHeaderBtn = screen.getByRole("button", {
96+
name: "Created date",
97+
});
9198

9299
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
93100

94-
await user.click(columnHeader);
101+
await user.click(columnHeaderBtn);
95102
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
96103

97-
await user.click(columnHeader);
104+
await user.click(columnHeaderBtn);
98105
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
99106

100-
await user.click(columnHeader);
107+
await user.click(columnHeaderBtn);
101108
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
102109
});
103110
});

‎static/js/publisher/pages/Remodel/__tests__/RemodelTable.test.tsx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,19 @@ describe("RemodelTable", () => {
6262
const columnHeader = screen.getByRole("columnheader", {
6363
name: "Target model",
6464
});
65+
const columnHeaderBtn = screen.getByRole("button", {
66+
name: "Target model",
67+
});
6568

6669
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
6770

68-
await user.click(columnHeader);
71+
await user.click(columnHeaderBtn);
6972
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
7073

71-
await user.click(columnHeader);
74+
await user.click(columnHeaderBtn);
7275
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
7376

74-
await user.click(columnHeader);
77+
await user.click(columnHeaderBtn);
7578
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
7679
});
7780

@@ -82,16 +85,19 @@ describe("RemodelTable", () => {
8285
const columnHeader = screen.getByRole("columnheader", {
8386
name: "Original model",
8487
});
88+
const columnHeaderBtn = screen.getByRole("button", {
89+
name: "Original model",
90+
});
8591

8692
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
8793

88-
await user.click(columnHeader);
94+
await user.click(columnHeaderBtn);
8995
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
9096

91-
await user.click(columnHeader);
97+
await user.click(columnHeaderBtn);
9298
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
9399

94-
await user.click(columnHeader);
100+
await user.click(columnHeaderBtn);
95101
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
96102
});
97103

@@ -102,16 +108,19 @@ describe("RemodelTable", () => {
102108
const columnHeader = screen.getByRole("columnheader", {
103109
name: "Created date",
104110
});
111+
const columnHeaderBtn = screen.getByRole("button", {
112+
name: "Created date",
113+
});
105114

106115
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
107116

108-
await user.click(columnHeader);
117+
await user.click(columnHeaderBtn);
109118
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
110119

111-
await user.click(columnHeader);
120+
await user.click(columnHeaderBtn);
112121
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
113122

114-
await user.click(columnHeader);
123+
await user.click(columnHeaderBtn);
115124
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
116125
});
117126
});

‎static/js/publisher/pages/SigningKeys/__tests__/SigningKeysTable.test.tsx‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ describe("SigningKeysTable", () => {
5151

5252
const user = userEvent.setup();
5353
const columnHeader = screen.getByRole("columnheader", { name: /Name/ });
54+
const columnHeaderBtn = screen.getByRole("button", { name: /Name/ });
5455

5556
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
5657

57-
await user.click(columnHeader);
58+
await user.click(columnHeaderBtn);
5859
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
5960

60-
await user.click(columnHeader);
61+
await user.click(columnHeaderBtn);
6162
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
6263

63-
await user.click(columnHeader);
64+
await user.click(columnHeaderBtn);
6465
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
6566
});
6667

@@ -71,36 +72,19 @@ describe("SigningKeysTable", () => {
7172
const columnHeader = screen.getByRole("columnheader", {
7273
name: "Created date",
7374
});
74-
75-
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
76-
77-
await user.click(columnHeader);
78-
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
79-
80-
await user.click(columnHeader);
81-
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
82-
83-
await user.click(columnHeader);
84-
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
85-
});
86-
87-
it("sorts the 'Created date' column when clicking the column header", async () => {
88-
renderComponent();
89-
90-
const user = userEvent.setup();
91-
const columnHeader = screen.getByRole("columnheader", {
75+
const columnHeaderBtn = screen.getByRole("button", {
9276
name: "Created date",
9377
});
9478

9579
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
9680

97-
await user.click(columnHeader);
81+
await user.click(columnHeaderBtn);
9882
expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
9983

100-
await user.click(columnHeader);
84+
await user.click(columnHeaderBtn);
10185
expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
10286

103-
await user.click(columnHeader);
87+
await user.click(columnHeaderBtn);
10488
expect(columnHeader.getAttribute("aria-sort")).toBe("none");
10589
});
10690
});

‎yarn.lock‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,13 +1081,13 @@
10811081
dependencies:
10821082
vanilla-framework "4.35.0"
10831083

1084-
"@canonical/react-components@3.6.0":
1085-
version "3.6.0"
1086-
resolved "https://registry.yarnpkg.com/@canonical/react-components/-/react-components-3.6.0.tgz#59a1c48ad6c0d4425e1a7a0f96b7d3e5d592b1bd"
1087-
integrity sha512-yEj3RIQJgMSJUF3Anxz3JmxGFCZ80hL1qCWL1BaBiIPwvltIEp55NvFd6k79Rbwts9dJJMP+7xSs7f40fbtj9w==
1084+
"@canonical/react-components@3.12.1":
1085+
version "3.12.1"
1086+
resolved "https://registry.yarnpkg.com/@canonical/react-components/-/react-components-3.12.1.tgz#b81219ec75c8907ee0005ab2d05d3a53556687f8"
1087+
integrity sha512-fZhOi2NHFHpOyG90oQ0wZBPJuW8cfXBdW3RCIPTZWyxXYxEQH4SSXJTgfOpz2q396Q+cRP1eps2YvEz4Crp3eQ==
10881088
dependencies:
10891089
"@types/jest" "29.5.14"
1090-
"@types/node" "20.17.19"
1090+
"@types/node" "20.19.30"
10911091
"@types/react" "19.0.10"
10921092
"@types/react-dom" "19.0.4"
10931093
"@types/react-table" "7.7.20"
@@ -1097,10 +1097,10 @@
10971097
prop-types "15.8.1"
10981098
react-table "7.8.0"
10991099

1100-
"@canonical/react-components@3.9.0":
1101-
version "3.9.0"
1102-
resolved "https://registry.yarnpkg.com/@canonical/react-components/-/react-components-3.9.0.tgz#90be4574d6f3a8e8240d90ac16a869fe4bb32e4b"
1103-
integrity sha512-F9Tk/hBhkIYwJ1ePbjX8mTigfeTtHPF+1reAnu6dOSPHOwN3ehIJZDzAtXFQbXB41D0fSwujJ+JZA/gKrPUJZQ==
1100+
"@canonical/react-components@3.6.0":
1101+
version "3.6.0"
1102+
resolved "https://registry.yarnpkg.com/@canonical/react-components/-/react-components-3.6.0.tgz#59a1c48ad6c0d4425e1a7a0f96b7d3e5d592b1bd"
1103+
integrity sha512-yEj3RIQJgMSJUF3Anxz3JmxGFCZ80hL1qCWL1BaBiIPwvltIEp55NvFd6k79Rbwts9dJJMP+7xSs7f40fbtj9w==
11041104
dependencies:
11051105
"@types/jest" "29.5.14"
11061106
"@types/node" "20.17.19"
@@ -2635,6 +2635,13 @@
26352635
dependencies:
26362636
undici-types "~6.19.2"
26372637

2638+
"@types/node@20.19.30":
2639+
version "20.19.30"
2640+
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.30.tgz#84fa87498ade5cd2b6ba8f8eec01d3b138ca60d0"
2641+
integrity sha512-WJtwWJu7UdlvzEAUm484QNg5eAoq5QR08KDNx7g45Usrs2NtOPiX8ugDqmKdXkyL03rBqU5dYNYVQetEpBHq2g==
2642+
dependencies:
2643+
undici-types "~6.21.0"
2644+
26382645
"@types/prop-types@*":
26392646
version "15.7.15"
26402647
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.15.tgz#e6e5a86d602beaca71ce5163fadf5f95d70931c7"
@@ -8388,6 +8395,11 @@ undici-types@~6.19.2:
83888395
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
83898396
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
83908397

8398+
undici-types@~6.21.0:
8399+
version "6.21.0"
8400+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
8401+
integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
8402+
83918403
undici-types@~7.8.0:
83928404
version "7.8.0"
83938405
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.8.0.tgz#de00b85b710c54122e44fbfd911f8d70174cd294"

0 commit comments

Comments
 (0)
⚡