updated build add update delete

This commit is contained in:
2025-12-02 17:13:25 +03:00
parent 0394d42d02
commit 5bb6021102
87 changed files with 1470 additions and 1158 deletions

View File

@@ -29,7 +29,7 @@ const UserTypesForm = ({ refetchTable }: { refetchTable: () => void }) => {
const mutation = useAddUserTypesMutation();
function onSubmit(values: UserTypesAdd) { mutation.mutate({ data: values }); setTimeout(() => refetchTable(), 400) };
function onSubmit(values: UserTypesAdd) { mutation.mutate({ data: values, refetchTable }) };
return (
<Form {...form}>

View File

@@ -11,12 +11,12 @@ const PageAddUserTypes = () => {
const [sort, setSort] = useState({ createdAt: 'desc' });
const [filters, setFilters] = useState({});
const { data, isLoading, error, refetch } = useGraphQlUserTypesList({ limit, skip: (page - 1) * limit, sort, filters });
const { data, isLoading, isFetching, error, refetch } = useGraphQlUserTypesList({ limit, skip: (page - 1) * limit, sort, filters });
return (
<>
<UserTypesDataTableAdd
data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch} tableIsLoading={isLoading || isFetching}
/>
<UserTypesForm refetchTable={refetch} />
</>

View File

@@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'
import { toISOIfNotZ } from '@/lib/utils';
import { UserTypesAdd } from './schema';
const fetchGraphQlUserTypesAdd = async (record: UserTypesAdd): Promise<{ data: UserTypesAdd | null; status: number }> => {
const fetchGraphQlUserTypesAdd = async (record: UserTypesAdd, refetchTable: () => void): Promise<{ data: UserTypesAdd | null; status: number }> => {
console.log('Fetching test data from local API');
record.expiryStarts = record.expiryStarts ? toISOIfNotZ(record.expiryStarts) : undefined;
record.expiryEnds = record.expiryEnds ? toISOIfNotZ(record.expiryEnds) : undefined;
@@ -11,14 +11,14 @@ const fetchGraphQlUserTypesAdd = async (record: UserTypesAdd): Promise<{ data: U
try {
const res = await fetch('/api/user-types/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();
const data = await res.json(); refetchTable();
return { data: data.data, status: res.status }
} catch (error) { console.error('Error fetching test data:', error); throw error }
};
export function useAddUserTypesMutation() {
return useMutation({
mutationFn: ({ data }: { data: UserTypesAdd }) => fetchGraphQlUserTypesAdd(data),
mutationFn: ({ data, refetchTable }: { data: UserTypesAdd, refetchTable: () => void }) => fetchGraphQlUserTypesAdd(data, refetchTable),
onSuccess: () => { console.log("Build created successfully") },
onError: (error) => { console.error("Add build failed:", error) },
})

View File

@@ -9,6 +9,8 @@ export const UserTypesAddSchema = z.object({
isProperty: z.boolean(),
expiryStarts: z.string().optional(),
expiryEnds: z.string().optional(),
createdAt: z.string(),
updatedAt: z.string(),
});

View File

@@ -83,7 +83,7 @@ function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef
cell: ({ getValue }) => dateToLocaleString(getValue() as string),
},
{
accessorKey: "updateAt",
accessorKey: "updatedAt",
header: "Updated At",
cell: ({ getValue }) => dateToLocaleString(getValue() as string),
},

View File

@@ -46,6 +46,7 @@ import { getColumns, DraggableRow } from "./columns"
import { useRouter } from "next/navigation"
import { Home } from "lucide-react"
import { useDeleteBuildMutation } from "@/pages/builds/queries"
import { TableSkeleton } from "@/components/skeletons/tableSkeleton"
export function UserTypesDataTableAdd({
data,
@@ -55,6 +56,7 @@ export function UserTypesDataTableAdd({
onPageChange,
onPageSizeChange,
refetchTable,
tableIsLoading,
}: {
data: schemaType[],
totalCount: number,
@@ -62,7 +64,8 @@ export function UserTypesDataTableAdd({
pageSize: number,
onPageChange: (page: number) => void,
onPageSizeChange: (size: number) => void,
refetchTable: () => void
refetchTable: () => void,
tableIsLoading: boolean
}) {
const router = useRouter();
@@ -168,11 +171,9 @@ export function UserTypesDataTableAdd({
))}
</TableHeader>
<TableBody className="**:data-[slot=table-cell]:first:w-8">
{table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
{table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
</SortableContext>) : (
<TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
)}
{tableIsLoading ?
<TableSkeleton columnCount={table.getAllColumns().length} rowCount={pageSize} hasActions={true} /> :
<SortableContext items={dataIds} strategy={verticalListSortingStrategy}>{table.getRowModel().rows.map(row => <DraggableRow key={row.id} row={row} />)}</SortableContext>}
</TableBody>
</Table>
</DndContext>

View File

@@ -74,7 +74,7 @@ function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef
cell: ({ getValue }) => dateToLocaleString(getValue() as string),
},
{
accessorKey: "updateAt",
accessorKey: "updatedAt",
header: "Updated At",
cell: ({ getValue }) => dateToLocaleString(getValue() as string),
},

View File

@@ -75,6 +75,7 @@ import { schemaType } from "./schema"
import { getColumns, DraggableRow } from "./columns"
import { useRouter } from "next/navigation"
import { useDeleteUserTypeMutation } from "../queries"
import { TableSkeleton } from "@/components/skeletons/tableSkeleton"
export function UserTypesDataTable({
data,
@@ -83,6 +84,7 @@ export function UserTypesDataTable({
pageSize = 10,
onPageChange,
onPageSizeChange,
tableIsLoading,
refetchTable
}: {
data: schemaType[],
@@ -91,6 +93,7 @@ export function UserTypesDataTable({
pageSize?: number,
onPageChange: (page: number) => void,
onPageSizeChange: (size: number) => void,
tableIsLoading: boolean,
refetchTable: () => void
}) {
@@ -191,11 +194,9 @@ export function UserTypesDataTable({
))}
</TableHeader>
<TableBody className="**:data-[slot=table-cell]:first:w-8">
{table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
{table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
</SortableContext>) : (
<TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
)}
{tableIsLoading ?
<TableSkeleton columnCount={table.getAllColumns().length} rowCount={pageSize} hasActions={true} /> :
<SortableContext items={dataIds} strategy={verticalListSortingStrategy}>{table.getRowModel().rows.map(row => <DraggableRow key={row.id} row={row} />)}</SortableContext>}
</TableBody>
</Table>
</DndContext>

View File

@@ -10,13 +10,12 @@ const PageUserTypes = () => {
const [sort, setSort] = useState({ createdAt: 'desc' });
const [filters, setFilters] = useState({});
const { data, isLoading, error, refetch } = useGraphQlUserTypesList({ limit, skip: (page - 1) * limit, sort, filters });
const { data, isLoading, isFetching, error, refetch } = useGraphQlUserTypesList({ limit, skip: (page - 1) * limit, sort, filters });
const handlePageChange = (newPage: number) => { setPage(newPage) };
const handlePageSizeChange = (newSize: number) => { setLimit(newSize); setPage(1) };
if (isLoading) { return <div className="flex items-center justify-center p-8">Loading...</div> }
if (error) { return <div className="flex items-center justify-center p-8 text-red-500">Error loading users</div> }
return <UserTypesDataTable data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange} refetchTable={refetch} />;
return <UserTypesDataTable data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange} refetchTable={refetch} tableIsLoading={isLoading} />;
};

View File

@@ -18,7 +18,7 @@ const UserTypesUpdateForm = ({ refetchTable, initData, selectedUuid }: { refetch
const mutation = useUpdateUserTypesMutation();
function onSubmit(values: userTypeUpdate) { mutation.mutate({ data: values as any || initData, uuid: selectedUuid }); setTimeout(() => refetchTable(), 400) }
function onSubmit(values: userTypeUpdate) { mutation.mutate({ data: values as any || initData, uuid: selectedUuid, refetchTable }) }
return (
<Form {...form}>

View File

@@ -19,14 +19,14 @@ const PageUpdateUserTypes = () => {
const backToUserTypes = <><div>UUID not found in search params</div><Button onClick={() => router.push('/user-types')}>Back to Build</Button></>
if (!uuid) { return backToUserTypes }
const { data, isLoading, error, refetch } = useGraphQlUserTypesList({ limit, skip: (page - 1) * limit, sort, filters: { ...filters, uuid } });
const { data, isLoading, isFetching, error, refetch } = useGraphQlUserTypesList({ limit, skip: (page - 1) * limit, sort, filters: { ...filters, uuid } });
const initData = data?.data?.[0] || null;
if (!initData) { return backToUserTypes }
return (
<>
<UsersTypeDataTableUpdate
data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch} tableIsLoading={isLoading || isFetching}
/>
<UserTypesUpdateForm refetchTable={refetch} initData={initData} selectedUuid={uuid} />
</>

View File

@@ -3,22 +3,21 @@ import { useMutation } from '@tanstack/react-query'
import { userTypeUpdate } from './schema';
import { toISOIfNotZ } from '@/lib/utils';
const fetchGraphQlUserTypesUpdate = async (record: userTypeUpdate, uuid: string): Promise<{ data: userTypeUpdate | null; status: number }> => {
const fetchGraphQlUserTypesUpdate = async (record: userTypeUpdate, uuid: string, refetchTable: () => void): Promise<{ data: userTypeUpdate | null; status: number }> => {
console.log('Update test data from local API');
console.dir({ record })
record.expiryStarts = record.expiryStarts ? toISOIfNotZ(record.expiryStarts) : undefined;
record.expiryEnds = record.expiryEnds ? toISOIfNotZ(record.expiryEnds) : undefined;
try {
const res = await fetch(`/api/user-types/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();
const data = await res.json(); refetchTable();
return { data: data.data, status: res.status }
} catch (error) { console.error('Error fetching test data:', error); throw error }
};
export function useUpdateUserTypesMutation() {
return useMutation({
mutationFn: ({ data, uuid }: { data: userTypeUpdate, uuid: string }) => fetchGraphQlUserTypesUpdate(data, uuid),
mutationFn: ({ data, uuid, refetchTable }: { data: userTypeUpdate, uuid: string, refetchTable: () => void }) => fetchGraphQlUserTypesUpdate(data, uuid, refetchTable),
onSuccess: () => { console.log("User types updated successfully") },
onError: (error) => { console.error("Update user types failed:", error) },
})

View File

@@ -73,7 +73,7 @@ function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef
cell: ({ getValue }) => dateToLocaleString(getValue() as string),
},
{
accessorKey: "updateAt",
accessorKey: "updatedAt",
header: "Updated At",
cell: ({ getValue }) => dateToLocaleString(getValue() as string),
},

View File

@@ -71,6 +71,7 @@ import { getColumns, DraggableRow } from "./columns"
import { useRouter } from "next/navigation"
import { Home } from "lucide-react"
import { useDeleteBuildMutation } from "@/pages/builds/queries"
import { TableSkeleton } from "@/components/skeletons/tableSkeleton"
export function UsersTypeDataTableUpdate({
data,
@@ -80,6 +81,7 @@ export function UsersTypeDataTableUpdate({
onPageChange,
onPageSizeChange,
refetchTable,
tableIsLoading
}: {
data: schemaType[],
totalCount: number,
@@ -87,7 +89,8 @@ export function UsersTypeDataTableUpdate({
pageSize: number,
onPageChange: (page: number) => void,
onPageSizeChange: (size: number) => void,
refetchTable: () => void
refetchTable: () => void,
tableIsLoading: boolean
}) {
const router = useRouter();
@@ -193,11 +196,9 @@ export function UsersTypeDataTableUpdate({
))}
</TableHeader>
<TableBody className="**:data-[slot=table-cell]:first:w-8">
{table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
{table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
</SortableContext>) : (
<TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
)}
{tableIsLoading ?
<TableSkeleton columnCount={table.getAllColumns().length} rowCount={1} hasActions={true} /> :
<SortableContext items={dataIds} strategy={verticalListSortingStrategy}>{table.getRowModel().rows.map(row => <DraggableRow key={row.id} row={row} />)}</SortableContext>}
</TableBody>
</Table>
</DndContext>

View File

@@ -11,6 +11,8 @@ export const schema = z.object({
isProperty: z.boolean(),
expiryStarts: z.string(),
expiryEnds: z.string(),
createdAt: z.string(),
updatedAt: z.string(),
});