Skip to content

Commit

Permalink
Merge pull request #868 from danskernesdigitalebibliotek/merge-develo…
Browse files Browse the repository at this point in the history
…p-into-release-2024-05-0

Merge develop into release 2024 05 0
  • Loading branch information
Adamik10 authored Jan 19, 2024
2 parents 39ab5b7 + a9b5079 commit f3d3ee3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useText } from "../../../../core/utils/text";
import { MaterialProps } from "../../../loan-list/materials/utils/material-fetch-hoc";
import { ReservationType } from "../../../../core/utils/types/reservation-type";
import LinkButton from "../../../../components/Buttons/LinkButton";
import { Button } from "../../../../components/Buttons/Button";

export interface ReservationDetailsRedirectProps {
reservation: ReservationType;
Expand All @@ -26,13 +27,17 @@ const ReservationDetailsRedirect: FC<

return (
<div className={`modal-details__buttons ${className}`}>
<button
type="button"
<Button
buttonType="none"
label={t("reservationDetailsRemoveDigitalReservationText")}
size="small"
variant="outline"
collapsible={false}
disabled={false}
onClick={() => openReservationDeleteModal(reservation)}
className={`link-tag cursor-pointer ${linkClassNames}`}
>
{t("reservationDetailsRemoveDigitalReservationText")}
</button>
classNames={linkClassNames}
dataCy="remove-digital-reservation-button"
/>
<LinkButton
dataCy="go-to-ereolen-button"
size="small"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ describe("Reservation details modal", () => {
.find(".text-small-caption")
.should("have.text", "16-08-2022 12:52");

cy.get(".modal")
.find("button.link-tag")
cy.getBySel("remove-digital-reservation-button")
.eq(0)
.should("have.text", "Remove your reservation")
.click();
Expand Down

0 comments on commit f3d3ee3

Please sign in to comment.