<suspense> added to LocationEditPage

This commit is contained in:
2024-02-06 14:16:31 +01:00
parent 7f08349688
commit cf97b3d4b5
3 changed files with 84 additions and 53 deletions

View File

@@ -0,0 +1,16 @@
import { notFound } from 'next/navigation';
import { LocationEditForm } from '@/app/ui/LocationEditForm';
import { fetchLocationById } from '@/app/lib/actions/locationActions';
export default async function LocationEditPage({ locationId }: { locationId:string }) {
const location = await fetchLocationById(locationId);
if (!location) {
return(notFound());
}
const result = <LocationEditForm location={location} yearMonth={location.yearMonth} />;
return (result);
}

View File

@@ -1,13 +1,15 @@
import { notFound } from 'next/navigation'; import { Suspense } from 'react';
import { LocationEditForm } from '@/app/ui/LocationEditForm'; import LocationEditPage from './LocationEditPage';
import { fetchLocationById } from '@/app/lib/actions/locationActions'; import { Main } from '@/app/ui/Main';
import { LocationEditFormSkeleton } from '@/app/ui/LocationEditForm';
export default async function Page({ params:{ id } }: { params: { id:string } }) { export default async function Page({ params:{ id } }: { params: { id:string } }) {
const location = await fetchLocationById(id); return (
<Main>
if (!location) { <Suspense fallback={<LocationEditFormSkeleton />}>
return(notFound()); <LocationEditPage locationId={id} />
} </Suspense>
return (<LocationEditForm location={location} yearMonth={location.yearMonth} />); </Main>
);
} }

View File

@@ -5,7 +5,6 @@ import { FC } from "react";
import { BillingLocation, YearMonth } from "../lib/db-types"; import { BillingLocation, YearMonth } from "../lib/db-types";
import { updateOrAddLocation } from "../lib/actions/locationActions"; import { updateOrAddLocation } from "../lib/actions/locationActions";
import { useFormState } from "react-dom"; import { useFormState } from "react-dom";
import { Main } from "./Main";
import Link from "next/link"; import Link from "next/link";
import { gotoHome } from "../lib/actions/navigationActions"; import { gotoHome } from "../lib/actions/navigationActions";
@@ -32,7 +31,6 @@ export const LocationEditForm:FC<LocationEditFormProps> = ({ location, yearMonth
}; };
return( return(
<Main>
<div className="card card-compact card-bordered min-w-[20em] max-w-[90em] bg-base-100 shadow-s my-1"> <div className="card card-compact card-bordered min-w-[20em] max-w-[90em] bg-base-100 shadow-s my-1">
<div className="card-body"> <div className="card-body">
<form action={dispatch}> <form action={dispatch}>
@@ -78,6 +76,21 @@ export const LocationEditForm:FC<LocationEditFormProps> = ({ location, yearMonth
</form> </form>
</div> </div>
</div> </div>
</Main> )
}
export const LocationEditFormSkeleton:FC = () =>
{
return(
<div className="skeleton card card-compact card-bordered min-w-[20em] max-w-[90em] bg-base-100 shadow-s my-1">
<div className="card-body">
<input id="locationName" name="locationName" type="text" placeholder="Naziv lokacije" className="input input-bordered w-full" />
<textarea id="locationNotes" name="locationNotes" className="textarea textarea-bordered my-1 w-full block" placeholder="Opis"></textarea>
<div className="pt-4">
<button className="btn btn-primary">Save</button>
<button type="button" className="btn btn-neutral ml-3">Cancel</button>
</div>
</div>
</div>
) )
} }