Skip to content

Commit b0edff1

Browse files
committed
feat: add support for both Juju 3.6 and 4.0
1 parent cdb4369 commit b0edff1

File tree

95 files changed

+517
-239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+517
-239
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
]
5151
},
5252
"dependencies": {
53-
"@canonical/jujulib": "8.0.1",
53+
"@canonical/jujulib": "8.1.0",
5454
"@canonical/macaroon-bakery": "1.3.2",
5555
"@canonical/react-components": "3.8.0",
5656
"@canonical/rebac-admin": "0.0.1-alpha.12",

src/components/DestroyModelDialog/DestroyModelDialog.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
unitStatusFactory,
1010
machineStatusFactory,
1111
applicationOfferStatusFactory,
12-
} from "testing/factories/juju/ClientV7";
13-
import { modelInfoFactory } from "testing/factories/juju/ModelManagerV9";
12+
} from "testing/factories/juju/ClientV8";
13+
import { modelInfoFactory } from "testing/factories/juju/ModelManagerV10";
1414
import {
1515
jujuStateFactory,
1616
modelDataFactory,

src/components/DestroyModelDialog/DestroyModelDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { RemoteEndpoint } from "@canonical/jujulib/dist/api/facades/application/ApplicationV19";
1+
import type { RemoteEndpoint } from "@canonical/jujulib/dist/api/facades/application/ApplicationV22";
22
import {
33
ConfirmationModal,
44
Icon,

src/components/InfoPanel/InfoPanel.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { vi } from "vitest";
55

66
import type { RootState } from "store/store";
77
import { jujuStateFactory, rootStateFactory } from "testing/factories";
8-
import { applicationStatusFactory } from "testing/factories/juju/ClientV7";
8+
import { applicationStatusFactory } from "testing/factories/juju/ClientV8";
99
import {
1010
modelDataFactory,
1111
modelListInfoFactory,

src/components/JujuCLI/JujuCLI.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414
configFactory,
1515
authUserInfoFactory,
1616
} from "testing/factories/general";
17-
import { applicationStatusFactory } from "testing/factories/juju/ClientV7";
18-
import { modelInfoFactory } from "testing/factories/juju/ModelManagerV9";
17+
import { applicationStatusFactory } from "testing/factories/juju/ClientV8";
18+
import { modelInfoFactory } from "testing/factories/juju/ModelManagerV10";
1919
import {
2020
modelDataFactory,
2121
modelListInfoFactory,

src/components/ModelActions/ModelActions.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
import {
1111
modelInfoFactory,
1212
modelUserInfoFactory,
13-
} from "testing/factories/juju/ModelManagerV9";
13+
} from "testing/factories/juju/ModelManagerV10";
1414
import {
1515
jujuStateFactory,
1616
modelDataFactory,

src/components/ModelTableList/CloudCell/CloudCell.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { render, screen } from "@testing-library/react";
22

3-
import { modelInfoFactory } from "testing/factories/juju/ModelManagerV9";
3+
import { modelInfoFactory } from "testing/factories/juju/ModelManagerV10";
44
import { modelDataFactory } from "testing/factories/juju/juju";
55

66
import CloudCell from "./CloudCell";

src/components/ModelTableList/CloudGroup/CloudGroup.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import {
77
generalStateFactory,
88
authUserInfoFactory,
99
} from "testing/factories/general";
10-
import { modelStatusInfoFactory } from "testing/factories/juju/ClientV7";
10+
import { modelStatusInfoFactory } from "testing/factories/juju/ClientV8";
1111
import {
1212
modelInfoFactory,
1313
modelUserInfoFactory,
14-
} from "testing/factories/juju/ModelManagerV9";
14+
} from "testing/factories/juju/ModelManagerV10";
1515
import {
1616
jujuStateFactory,
1717
modelDataFactory,

src/components/ModelTableList/ModelSummary/ModelSummary.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
applicationStatusFactory,
55
unitStatusFactory,
66
machineStatusFactory,
7-
} from "testing/factories/juju/ClientV7";
7+
} from "testing/factories/juju/ClientV8";
88
import { modelDataFactory } from "testing/factories/juju/juju";
99
import { renderComponent } from "testing/utils";
1010

src/components/ModelTableList/ModelSummary/ModelSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Label } from "./types";
99

1010
type Props = {
1111
modelData: ModelData;
12-
qualifier?: string;
12+
qualifier?: null | string;
1313
};
1414

1515
const ModelSummary: FC<Props> = ({ modelData, qualifier }: Props) => {

0 commit comments

Comments
 (0)