updated living space add list updagte

This commit is contained in:
2025-11-29 12:31:05 +03:00
parent eaca36573e
commit d22fc017df
35 changed files with 858 additions and 126 deletions

View File

@@ -26,19 +26,6 @@ const FormAddNewLivingSpace = ({ form, onSubmit, deleteAllSelections }: { form:
</FormItem>
)}
/>
<FormField
control={form.control}
name="collectionToken"
render={({ field }) => (
<FormItem className="mt-3">
<FormLabel>Collection Token</FormLabel>
<FormControl>
<Label {...field} >{field.value ? field.value : "Not Selected"}</Label>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="userTypeID"

View File

@@ -3,32 +3,31 @@ import { useState, useEffect } from "react";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { FormValues, createForm } from "./schema";
import { FormAddNewLivingSpace } from "./form";
import { useAddLivingSpaceMutation } from "./queries";
import { Button } from "@/components/ui/button";
import { IconArrowLeftToArc } from "@tabler/icons-react";
import { useRouter } from "next/navigation";
import PageLivingSpaceBuildsTableSection from "../tables/builds/page";
import PageLivingSpaceUserTypesTableSection from "../tables/userType/page";
import PageLivingSpacePartsTableSection from "../tables/part/page";
import PageLivingSpacePersonTableSection from "../tables/person/page";
import PageLivingSpaceCompanyTableSection from "../tables/company/page";
import { useAddLivingSpaceMutation } from "./queries";
const PageLivingSpaceAdd = () => {
const [collectionToken, setCollectionToken] = useState<string | null>(null);
const router = useRouter();
const [buildID, setBuildID] = useState<string | null>(null);
const [userTypeID, setUserTypeID] = useState<string | null>(null);
const [partID, setPartID] = useState<string | null>(null);
const [companyID, setCompanyID] = useState<string | null>(null);
const [personID, setPersonID] = useState<string | null>(null);
const form = createForm({ buildID, collectionToken, userTypeID, partID, companyID, personID });
const form = createForm({ buildID, userTypeID, partID, companyID, personID });
useEffect(() => {
form.setValue("buildID", buildID || "");
form.setValue("collectionToken", collectionToken || "");
form.setValue("userTypeID", userTypeID || "");
form.setValue("partID", partID || "");
form.setValue("companyID", companyID || "");
form.setValue("personID", personID || "");
}, [buildID, collectionToken, userTypeID, partID, companyID, personID, form]);
form.setValue("buildID", buildID || ""); form.setValue("userTypeID", userTypeID || ""); form.setValue("partID", partID || ""); form.setValue("companyID", companyID || ""); form.setValue("personID", personID || "");
}, [buildID, userTypeID, partID, companyID, personID, form]);
const mutation = useAddLivingSpaceMutation();
function onSubmit(values: FormValues) { mutation.mutate({ data: values }) }
@@ -40,13 +39,15 @@ const PageLivingSpaceAdd = () => {
const tabsClassName = "border border-gray-300 rounded-sm h-10"
const deleteAllSelections = () => {
setBuildID(null); setCollectionToken(null); setUserTypeID(null); setPartID(null); setCompanyID(null); setPersonID(null);
setIsUserTypeEnabled(false); setIsPartsEnabled(false); setIsHandleCompanyAndPersonEnable(false)
setBuildID(null); setUserTypeID(null); setPartID(null); setCompanyID(null); setPersonID(null); setIsUserTypeEnabled(false); setIsPartsEnabled(false); setIsHandleCompanyAndPersonEnable(false)
}
return <>
<div className="flex flex-col m-7">
<Tabs defaultValue="builds" className="w-full">
<Button className="my-3 h-10" variant="outline" size="sm" onClick={() => { router.push("/living-spaces") }}>
<IconArrowLeftToArc /><span className="hidden lg:inline">Back to Living Space List</span>
</Button>
<TabsList className="grid w-full grid-flow-col auto-cols-fr gap-1.5">
<TabsTrigger className={tabsClassName} value="builds">Builds</TabsTrigger>
{isUserTypeEnabled && <TabsTrigger className={tabsClassName} value="usertype">User Type</TabsTrigger>}
@@ -56,7 +57,7 @@ const PageLivingSpaceAdd = () => {
</TabsList>
<div className="mt-6">
<TabsContent value="builds">
<PageLivingSpaceBuildsTableSection buildID={buildID} setBuildID={setBuildID} collectionToken={collectionToken} setCollectionToken={setCollectionToken} setIsUserTypeEnabled={setIsUserTypeEnabled} />
<PageLivingSpaceBuildsTableSection buildID={buildID} setBuildID={setBuildID} setIsUserTypeEnabled={setIsUserTypeEnabled} />
</TabsContent>
{isUserTypeEnabled && <TabsContent value="usertype">
<PageLivingSpaceUserTypesTableSection userTypeID={userTypeID} setUserTypeID={setUserTypeID} setIsPartsEnabled={setIsPartsEnabled} setIsHandleCompanyAndPersonEnable={setIsHandleCompanyAndPersonEnable} />

View File

@@ -5,7 +5,6 @@ import { toISOIfNotZ } from '@/lib/utils'
export const formSchema = z.object({
buildID: z.string({ error: "Build ID is required" }),
collectionToken: z.string({ error: "Collection Token is required" }),
userTypeID: z.string({ error: "User Type ID is required" }),
partID: z.string({ error: "Part ID is required" }),
companyID: z.string({ error: "Company ID is required" }),
@@ -22,7 +21,7 @@ const fetchGraphQlLivingSpaceAdd = async (record: schemaType): Promise<{ data: s
record.expiryEnds = record.expiryEnds ? toISOIfNotZ(record.expiryEnds) : undefined;
console.dir({ record })
try {
const res = await fetch('/api/living-spaces/add', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
const res = await fetch('/api/living-space/add', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
const data = await res.json();
return { data: data.data, status: res.status }
@@ -34,7 +33,7 @@ const fetchGraphQlLivingSpaceUpdate = async (record: schemaType, uuid: string):
record.expiryStarts = record.expiryStarts ? toISOIfNotZ(record.expiryStarts) : undefined;
record.expiryEnds = record.expiryEnds ? toISOIfNotZ(record.expiryEnds) : undefined;
try {
const res = await fetch(`/api/living-spaces/update?uuid=${uuid || ''}`, { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
const res = await fetch(`/api/living-space/update?uuid=${uuid || ''}`, { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
const data = await res.json();
return { data: data.data, status: res.status }

View File

@@ -5,7 +5,6 @@ import { FormProps } from "./types";
export const formSchema = z.object({
buildID: z.string({ error: "Build ID is required" }),
collectionToken: z.string({ error: "Collection Token is required" }),
userTypeID: z.string({ error: "User Type ID is required" }),
partID: z.string({ error: "Part ID is required" }),
companyID: z.string({ error: "Company ID is required" }),
@@ -16,12 +15,11 @@ export const formSchema = z.object({
export type FormValues = z.infer<typeof formSchema>;
export function createForm({ buildID, collectionToken, userTypeID, partID, companyID, personID }: FormProps) {
export function createForm({ buildID, userTypeID, partID, companyID, personID }: FormProps) {
return useForm<FormValues>({
resolver: zodResolver(formSchema),
defaultValues: {
buildID: buildID || "",
collectionToken: collectionToken || "",
userTypeID: userTypeID || "",
partID: partID || "",
companyID: companyID || "",

View File

@@ -1,6 +1,5 @@
interface FormProps {
buildID: string | null;
collectionToken: string | null;
userTypeID: string | null;
partID: string | null;
companyID: string | null;