Skip to content

Commit

Permalink
fix: preview reservation unit link disabled
Browse files Browse the repository at this point in the history
refs: TILA-3429
  • Loading branch information
joonatank committed Jun 12, 2024
1 parent 46a2b85 commit c331614
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@ function OpeningHoursSection({

const previewUrl = `${previewUrlPrefix}/${reservationUnit?.pk}?ru=${reservationUnit?.uuid}#calendar`;
const previewDisabled =
previewUrlPrefix !== "" || !reservationUnit?.pk || !reservationUnit?.uuid;
previewUrlPrefix === "" || !reservationUnit?.pk || !reservationUnit?.uuid;

// TODO refactor this to inner wrapper (so we don't have a ternary in the middle)
return (
Expand Down Expand Up @@ -2095,8 +2095,9 @@ function ReservationUnitEditor({
const previewDisabled =
isSaving ||
!reservationUnit?.pk ||
!reservationUnit?.uuid ||
previewUrlPrefix !== "";
!reservationUnit.uuid ||
previewUrlPrefix === "";

const draftEnabled = hasChanges || !watch("isDraft");
const publishEnabled = hasChanges || watch("isDraft");
const archiveEnabled = watch("pk") !== 0 && !watch("isArchived");
Expand Down Expand Up @@ -2288,6 +2289,8 @@ function EditorWrapper({ previewUrlPrefix }: { previewUrlPrefix: string }) {
];
const backLink = reservationUnitPk == null ? `/unit/${unitPk}` : undefined;

const cleanPreviewUrlPrefix = previewUrlPrefix.replace(/\/$/, "");

return (
<Wrapper>
<BreadcrumbWrapper route={route} backLink={backLink} />
Expand All @@ -2296,7 +2299,7 @@ function EditorWrapper({ previewUrlPrefix }: { previewUrlPrefix: string }) {
form={form}
unitPk={unitPk}
refetch={refetch}
previewUrlPrefix={previewUrlPrefix}
previewUrlPrefix={cleanPreviewUrlPrefix}
/>
</Wrapper>
);
Expand Down

0 comments on commit c331614

Please sign in to comment.