Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/delete-imodel-react",
"comment": "Updated imodel-delete to itwin-react V3",
"type": "minor"
}
],
"packageName": "@itwin/delete-imodel-react"
}
33 changes: 21 additions & 12 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/modules/delete-imodel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"@itwin/itwinui-icons-react": "^2.2.0",
"@itwin/itwinui-react": "^2.12.18"
"@itwin/itwinui-react": "^3.18.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "~17.1.0",
Expand Down Expand Up @@ -74,4 +74,4 @@
"react": "^17.0.2 || ^18.3.1",
"react-dom": "^17.0.2 || ^18.3.1"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ import React from "react";

import { DeleteIModel } from "./DeleteIModel";

jest.mock("@itwin/itwinui-react", () => ({
...jest.requireActual("@itwin/itwinui-react"),
useToaster: () => ({
positive: jest.fn(),
informational: jest.fn(),
negative: jest.fn(),
warning: jest.fn(),
}),
}));

describe("DeleteIModel", () => {
const fetchMock = jest.fn(() => Promise.resolve({ ok: true } as Response));
global.fetch = fetchMock;
Expand Down
15 changes: 12 additions & 3 deletions packages/modules/delete-imodel/src/components/DeleteIModel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
ModalContent,
ProgressRadial,
ThemeProvider,
toaster,
useToaster,
} from "@itwin/itwinui-react";
import React from "react";

Expand Down Expand Up @@ -47,6 +47,14 @@ export type DeleteIModelProps = {
};

export function DeleteIModel(props: DeleteIModelProps) {
return (
Comment thread
veekeys marked this conversation as resolved.
<ThemeProvider>
<DeleteIModelComponent {...props} />
</ThemeProvider>
);
}

function DeleteIModelComponent(props: DeleteIModelProps) {
const {
imodel: { id: imodelId, name: imodelName },
accessToken,
Expand All @@ -56,6 +64,7 @@ export function DeleteIModel(props: DeleteIModelProps) {
onSuccess,
stringsOverrides,
} = props;
const toaster = useToaster();
const [isOpen, setIsOpen] = React.useState(true);
const [isLoading, setIsLoading] = React.useState(false);

Expand Down Expand Up @@ -106,7 +115,7 @@ export function DeleteIModel(props: DeleteIModelProps) {
}, [onClose]);

return (
<ThemeProvider theme="inherit">
<>
<Modal
isOpen={isOpen}
style={{ maxWidth: 600 }}
Expand All @@ -133,7 +142,7 @@ export function DeleteIModel(props: DeleteIModelProps) {
</ModalButtonBar>
</Modal>
{isLoading && <OverlaySpinner />}
</ThemeProvider>
</>
);
}

Expand Down