-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Transaction capture modal improvements (#5076)
* transaction capture modal improvements * change test name
- Loading branch information
Showing
6 changed files
with
163 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"saleor-dashboard": patch | ||
--- | ||
|
||
Transaction capture modal no longer shows "Error" text when API error occurs. This means that the modal closes when mutation finishes so that result is visible. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
import { fireEvent, render, screen } from "@testing-library/react"; | ||
import React from "react"; | ||
|
||
import { ButtonWithLoader } from "./ButtonWithLoader"; | ||
|
||
jest.mock("react-intl", () => ({ | ||
useIntl: jest.fn(() => ({ | ||
formatMessage: jest.fn(x => x.defaultMessage), | ||
})), | ||
defineMessages: jest.fn(x => x), | ||
FormattedMessage: ({ defaultMessage }: { defaultMessage: string }) => <>{defaultMessage}</>, | ||
})); | ||
|
||
describe("ButtonWithLoader", () => { | ||
it("should render a button with confirm label", () => { | ||
// Arrange & Act | ||
render(<ButtonWithLoader transitionState="default">Confirm</ButtonWithLoader>); | ||
// Assert | ||
expect(screen.getByRole("button")).toBeInTheDocument(); | ||
expect(screen.getByRole("button")).toHaveTextContent("Confirm"); | ||
}); | ||
|
||
it("should render a button with loading spinner", () => { | ||
// Arrange & Act | ||
render(<ButtonWithLoader transitionState="loading" />); | ||
// Assert | ||
expect(screen.getByRole("button")).toBeInTheDocument(); | ||
expect(screen.getByTestId("button-progress")).toBeInTheDocument(); | ||
}); | ||
|
||
it("should call onClick when clicked", () => { | ||
// Arrange | ||
const onClick = jest.fn(); | ||
|
||
// Act | ||
render(<ButtonWithLoader transitionState="default" onClick={onClick} />); | ||
fireEvent.click(screen.getByRole("button")); | ||
|
||
// Assert | ||
expect(onClick).toHaveBeenCalled(); | ||
}); | ||
|
||
it("should render original label after loading state", async () => { | ||
// Arrange & Act | ||
const { rerender } = render( | ||
<ButtonWithLoader transitionState="loading">Confirm</ButtonWithLoader>, | ||
); | ||
|
||
// Assert | ||
expect(screen.getByTestId("button-progress")).toBeInTheDocument(); | ||
|
||
// Act | ||
rerender(<ButtonWithLoader transitionState="default">Confirm</ButtonWithLoader>); | ||
|
||
// Assert | ||
expect(screen.queryByTestId("button-progress")).not.toBeInTheDocument(); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
import { buttonMessages } from "@dashboard/intl"; | ||
import { Box, Button, ButtonProps, Spinner, sprinkles } from "@saleor/macaw-ui-next"; | ||
import React from "react"; | ||
import { useIntl } from "react-intl"; | ||
|
||
import { ConfirmButtonTransitionState } from "../ConfirmButton"; | ||
|
||
interface ButtonWithLoaderProps extends ButtonProps { | ||
transitionState: ConfirmButtonTransitionState; | ||
} | ||
|
||
export const ButtonWithLoader = ({ | ||
transitionState, | ||
onClick, | ||
disabled, | ||
children, | ||
...props | ||
}: ButtonWithLoaderProps) => { | ||
const intl = useIntl(); | ||
const isLoading = transitionState === "loading"; | ||
|
||
const renderSpinner = () => { | ||
if (isLoading) { | ||
return ( | ||
<Box data-test-id="button-progress" display="flex" position="absolute"> | ||
<Spinner /> | ||
</Box> | ||
); | ||
} | ||
|
||
return null; | ||
}; | ||
|
||
const getByLabelText = () => { | ||
return children || intl.formatMessage(buttonMessages.save); | ||
}; | ||
|
||
return ( | ||
<Button | ||
{...props} | ||
disabled={isLoading && disabled} | ||
onClick={isLoading ? undefined : onClick} | ||
data-test-state={isLoading ? "loading" : "default"} | ||
> | ||
{renderSpinner()} | ||
<span | ||
className={sprinkles({ | ||
opacity: isLoading ? "0" : "1", | ||
transition: "ease", | ||
})} | ||
> | ||
{getByLabelText()} | ||
</span> | ||
</Button> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters