Skip to content

Commit ef74f16

Browse files
authored
chore(deps): Upgrade maas-react-components to 2.0.0 (#5833)
1 parent f618d14 commit ef74f16

File tree

9 files changed

+50
-30
lines changed

9 files changed

+50
-30
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"build-storybook": "storybook build"
4747
},
4848
"dependencies": {
49-
"@canonical/maas-react-components": "1.35.0",
49+
"@canonical/maas-react-components": "2.0.0",
5050
"@canonical/macaroon-bakery": "1.3.2",
5151
"@canonical/react-components": "2.14.0",
5252
"@redux-devtools/extension": "3.3.0",
@@ -208,4 +208,4 @@
208208
"prefer-alphabetical-devDependencies": "error"
209209
}
210210
}
211-
}
211+
}

src/app/base/components/node/StorageTables/AvailableStorageTable/AvailableStorageTable.tsx

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,22 @@ const AvailableStorageTable = ({
113113
return (
114114
<>
115115
<GenericTable
116-
canSelect={isMachine ? (_) => !actionsDisabled : false}
117116
columns={columns}
118117
data={rows}
119-
disabledSelectionTooltip={"This machine's disks cannot be modified."}
120118
isLoading={false}
121119
noData="No available disks or partitions."
122-
rowSelection={rowSelection}
123-
setRowSelection={setRowSelection}
120+
selection={
121+
isMachine
122+
? {
123+
rowSelection,
124+
setRowSelection,
125+
filterSelectable: (_) => !actionsDisabled,
126+
disabledSelectionTooltip:
127+
"This machine's disks cannot be modified.",
128+
rowSelectionLabelKey: "name",
129+
}
130+
: undefined
131+
}
124132
variant="regular"
125133
/>
126134
{isMachine && canEditStorage && (

src/app/base/components/node/networking/NetworkTable/NetworkTable.test.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,10 @@ describe("NetworkTable", () => {
325325
/>,
326326
{ state }
327327
);
328-
const rows = screen.getAllByRole("row");
329-
const bondRow = rows[1];
330-
await userEvent.click(within(bondRow).getByRole("checkbox"));
328+
329+
await userEvent.click(
330+
screen.getByRole("checkbox", { name: "select bond0" })
331+
);
331332
expect(setSelected).toHaveBeenCalledWith([{ linkId: null, nicId: 100 }]);
332333
});
333334

src/app/base/components/node/networking/NetworkTable/NetworkTable.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,20 +266,23 @@ const NetworkTable = ({
266266

267267
return (
268268
<GenericTable
269-
canSelect={(_) => !isAllNetworkingDisabled}
270269
className={classNames("p-table-expanding--light", "network-table", {
271270
"network-table--has-actions": hasActions,
272271
})}
273272
columns={columns}
274273
data={data}
275-
disabledSelectionTooltip={"Network can't be modified for this machine."}
276274
filterCells={!!setExpanded ? filterCells : filterCellsAndAction}
277275
filterHeaders={!!setExpanded ? filterHeaders : filterHeadersAndAction}
278276
getSubRows={(originalRow) => originalRow.children}
279277
isLoading={!fabricsLoaded || !vlansLoaded}
280278
noData={"No interfaces available."}
281-
rowSelection={rowSelection}
282-
setRowSelection={setRowSelection}
279+
selection={{
280+
rowSelection,
281+
setRowSelection,
282+
filterSelectable: (_) => !isAllNetworkingDisabled,
283+
disabledSelectionTooltip: "Network can't be modified for this machine.",
284+
rowSelectionLabelKey: "name",
285+
}}
283286
sorting={[{ id: "name", desc: false }]}
284287
/>
285288
);

src/app/controllers/views/ControllerList/components/ControllersTable/ControllersTable.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,16 @@ const ControllersTable = ({
4646
return (
4747
<GenericTable
4848
aria-label="controllers list"
49-
canSelect
5049
className="controllers-table"
5150
columns={columns}
5251
data={controllers}
5352
isLoading={isPending}
5453
noData="No controllers available."
55-
rowSelection={rowSelection}
56-
setRowSelection={setRowSelection}
54+
selection={{
55+
rowSelection,
56+
setRowSelection,
57+
rowSelectionLabelKey: "fqdn",
58+
}}
5759
sorting={[{ id: "fqdn", desc: false }]}
5860
variant="regular"
5961
/>

src/app/devices/components/DevicesTable/DevicesTable.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,18 @@ const DevicesTable = ({
5151

5252
return (
5353
<GenericTable
54-
canSelect
5554
className="devices-table"
5655
columns={columns}
5756
data={devices.map(
5857
(device): DeviceRow => ({ ...device, zone: device.zone.name })
5958
)}
6059
isLoading={devicesLoading}
6160
noData="No devices available."
62-
rowSelection={rowSelection}
63-
setRowSelection={setRowSelection}
61+
selection={{
62+
rowSelection,
63+
setRowSelection,
64+
rowSelectionLabelKey: "fqdn",
65+
}}
6466
sorting={[{ id: "fqdn", desc: false }]}
6567
/>
6668
);

src/app/images/components/ImagesTable/ImagesTable.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ const ImagesTable = ({
6262

6363
return (
6464
<GenericTable
65-
canSelect
6665
columns={columns}
6766
data={images}
6867
filterCells={filterCells}
@@ -78,8 +77,11 @@ const ImagesTable = ({
7877
{ value: "Ubuntu", isTop: true },
7978
{ value: "Other", isTop: false },
8079
]}
81-
rowSelection={selectedRows}
82-
setRowSelection={setSelectedRows}
80+
selection={{
81+
rowSelection: selectedRows,
82+
setRowSelection: setSelectedRows,
83+
rowSelectionLabelKey: "release",
84+
}}
8385
showChevron
8486
sorting={[{ id: "release", desc: true }]}
8587
variant={variant}

src/app/racks/components/RemoveControllers/RemoveControllers.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,16 @@ const RemoveControllers = ({ id }: RemoveControllersProps) => {
7979
to re-register the controllers to revert this action.
8080
{fakeControllers && (
8181
<GenericTable
82-
canSelect
8382
className="u-border u-margin-top--medium"
8483
columns={column}
8584
data={fakeControllers}
8685
isLoading={rack.isPending}
87-
rowSelection={rowSelection}
88-
setRowSelection={setRowSelection}
89-
></GenericTable>
86+
selection={{
87+
rowSelection,
88+
setRowSelection,
89+
rowSelectionLabelKey: "fqdn",
90+
}}
91+
/>
9092
)}
9193
</FormikForm>
9294
);

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -949,10 +949,10 @@
949949
"@types/tough-cookie" "^4.0.5"
950950
tough-cookie "^4.1.4"
951951

952-
"@canonical/maas-react-components@1.35.0":
953-
version "1.35.0"
954-
resolved "https://registry.yarnpkg.com/@canonical/maas-react-components/-/maas-react-components-1.35.0.tgz#ddc4df191ae7421fcd196d45c98c47c4652ac781"
955-
integrity sha512-qrlk0ZfCYjyCKD5ulGVgb2h/a7M9aTvD6e4FYWXCsteQzHCsH7kcK4xI5z1f1Q4eBCLUH0LJOv5mROUNk2cZmQ==
952+
"@canonical/maas-react-components@2.0.0":
953+
version "2.0.0"
954+
resolved "https://registry.yarnpkg.com/@canonical/maas-react-components/-/maas-react-components-2.0.0.tgz#22d5a2c275f8911a3ea58d268a99447b18892040"
955+
integrity sha512-r2d77B8+HYhwcXj9fftKt8zUA3rTNA9FKxG23cA+Cp6HCeSs0c+gb4A8sEy17Z0wvPp67v7GTjnOAfdb5wOo3g==
956956

957957
"@canonical/macaroon-bakery@1.3.2":
958958
version "1.3.2"

0 commit comments

Comments
 (0)