diff --git a/apps/admin-ui/.env.example b/apps/admin-ui/.env.example index e302e69be..1fc58b374 100644 --- a/apps/admin-ui/.env.example +++ b/apps/admin-ui/.env.example @@ -1,4 +1,4 @@ NEXT_PUBLIC_BASE_URL=/kasittely TILAVARAUS_API_URL=http://localhost:8000 TUNNISTAMO_URL=https://tunnistamo.test.hel.ninja -RESERVATION_UNIT_PREVIEW_URL_PREFIX="/" +RESERVATION_UNIT_PREVIEW_URL_PREFIX="http://localhost:3000/reservation-unit" diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx index 57e038c59..2676038f1 100644 --- a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx +++ b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx @@ -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 ( @@ -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"); @@ -2288,6 +2289,8 @@ function EditorWrapper({ previewUrlPrefix }: { previewUrlPrefix: string }) { ]; const backLink = reservationUnitPk == null ? `/unit/${unitPk}` : undefined; + const cleanPreviewUrlPrefix = previewUrlPrefix.replace(/\/$/, ""); + return ( @@ -2296,7 +2299,7 @@ function EditorWrapper({ previewUrlPrefix }: { previewUrlPrefix: string }) { form={form} unitPk={unitPk} refetch={refetch} - previewUrlPrefix={previewUrlPrefix} + previewUrlPrefix={cleanPreviewUrlPrefix} /> );