updated living space add list updagte

frontend/pages/living-space/tables/builds/columns.tsx

@@ -26,6 +26,10 @@ export function DraggableRow({ row, selectedID }: { row: Row<z.infer<typeof sche
 
 function getColumns(selectionHandler: (id: string, token: string) => void): ColumnDef<schemaType>[] {
     return [
+        {
+            accessorKey: "_id",
+            header: "ID",
+        },
         {
             accessorKey: "buildType.token",
             header: "Token",

frontend/pages/living-space/tables/builds/data-table.tsx

@@ -80,9 +80,8 @@ export function LivingSpaceBuildDataTable({
     refetchTable,
     buildId,
     setBuildId,
-    collectionToken,
-    setCollectionToken,
     setIsUserTypeEnabled,
+    additionButtons
 }: {
     data: schemaType[],
     totalCount: number,
@@ -93,9 +92,8 @@ export function LivingSpaceBuildDataTable({
     refetchTable: () => void,
     buildId: string,
     setBuildId: (id: string) => void,
-    collectionToken: string,
-    setCollectionToken: (collectionToken: string) => void,
     setIsUserTypeEnabled: (enabled: boolean) => void,
+    additionButtons: React.ReactNode
 }) {
 
     const router = useRouter();
@@ -107,7 +105,7 @@ export function LivingSpaceBuildDataTable({
     const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
     const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
 
-    const setSelection = (id: string, token: string) => { setBuildId(id); setCollectionToken(token); setIsUserTypeEnabled(true); }
+    const setSelection = (id: string) => { setBuildId(id); setIsUserTypeEnabled(true); }
     const columns = getColumns(setSelection);
     const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize }), [currentPage, pageSize])
     const totalPages = Math.ceil(totalCount / pageSize)
@@ -170,6 +168,7 @@ export function LivingSpaceBuildDataTable({
                                 )
                             })}
                         </DropdownMenuContent>
+                        {additionButtons && additionButtons}
                     </DropdownMenu>
                 </div>
             </div>

frontend/pages/living-space/tables/builds/page.tsx

@@ -4,12 +4,11 @@ import { useGraphQlBuildsList } from "./queries";
 import { LivingSpaceBuildDataTable } from "./data-table";
 
 const PageLivingSpaceBuildsTableSection = (
-    { buildID, setBuildID, collectionToken, setCollectionToken, setIsUserTypeEnabled }: {
+    { buildID, setBuildID, setIsUserTypeEnabled, additionButtons }: {
         buildID: string | null;
         setBuildID: (id: string | null) => void;
-        collectionToken: string | null;
-        setCollectionToken: (token: string | null) => void;
         setIsUserTypeEnabled: (enabled: boolean) => void;
+        additionButtons?: React.ReactNode | null;
     }
 ) => {
     const [page, setPage] = useState(1);
@@ -27,8 +26,8 @@ const PageLivingSpaceBuildsTableSection = (
     return <>
         <LivingSpaceBuildDataTable
             data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange}
-            refetchTable={refetch} buildId={buildID || ""} setBuildId={setBuildID} collectionToken={collectionToken || ""} setCollectionToken={setCollectionToken}
-            setIsUserTypeEnabled={setIsUserTypeEnabled} />
+            refetchTable={refetch} buildId={buildID || ""} setBuildId={setBuildID}
+            setIsUserTypeEnabled={setIsUserTypeEnabled} additionButtons={additionButtons} />
     </>;
 
 }

frontend/pages/living-space/tables/living-spaces/list/columns.tsx

@@ -0,0 +1,91 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { useSortable } from "@dnd-kit/sortable"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+export function DraggableRow({ row, selectedID }: { row: Row<z.infer<typeof schema>>; selectedID: string }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-dragging={isDragging} ref={setNodeRef}
+            className={`${row.original._id === selectedID ? "bg-blue-700/50 hover:bg-blue-700/50" : ""} relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80`}
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+        },
+        {
+            accessorKey: "build",
+            header: "Build",
+        },
+        {
+            accessorKey: "part",
+            header: "Part",
+        },
+        {
+            accessorKey: "userType",
+            header: "User Type",
+        },
+        {
+            accessorKey: "company",
+            header: "Company",
+        },
+        {
+            accessorKey: "person",
+            header: "Person",
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/living-spaces/update?uuid=${row.original.uuid}&buildID=${row.original.build}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/living-space/tables/living-spaces/list/data-table.tsx

@@ -0,0 +1,265 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+    IconPlus,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { useDeleteLivingSpacesMutation } from "./queries"
+
+export function LivingSpaceDataTable({
+    data,
+    totalCount,
+    currentPage = 1,
+    pageSize = 10,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable,
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage?: number,
+    pageSize?: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void,
+}) {
+
+    const router = useRouter()
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+    const deleteMutation = useDeleteLivingSpacesMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 400) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        getRowId: (row) => row._id.toString(),
+        enableRowSelection: true,
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => { const nextPagination = typeof updater === "function" ? updater(pagination) : updater; onPageChange(nextPagination.pageIndex + 1); onPageSizeChange(nextPagination.pageSize) },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs defaultValue="outline" className="w-full flex-col justify-start gap-6">
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className='w-56'>
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                </div>
+            </div>
+            <TabsContent value="outline" className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6">
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id} >
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </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 selectedID={""} key={row.id} row={row} />)}
+                                    </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs >
+    )
+}

frontend/pages/living-space/tables/living-spaces/list/queries.tsx

@@ -0,0 +1,21 @@
+'use client'
+import { useMutation } from '@tanstack/react-query'
+
+const fetchGraphQlDeleteLivingSpace = async (uuid: string): Promise<boolean> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/living-space/delete?uuid=${uuid}`, { method: 'GET', cache: 'no-store', credentials: "include" });
+        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
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useDeleteLivingSpacesMutation() {
+    return useMutation({
+        mutationFn: ({ uuid }: { uuid: string }) => fetchGraphQlDeleteLivingSpace(uuid),
+        onSuccess: () => { console.log("Living space deleted successfully") },
+        onError: (error) => { console.error("Delete living space failed:", error) },
+    })
+}
+

frontend/pages/living-space/tables/living-spaces/list/schema.tsx

@@ -0,0 +1,19 @@
+import { z } from "zod";
+
+export const schema = z.object({
+
+    _id: z.string(),
+    uuid: z.string(),
+    build: z.string(),
+    part: z.string(),
+    userType: z.string(),
+    company: z.string(),
+    person: z.string(),
+    createdAt: z.string(),
+    updatedAt: z.string(),
+    expiryEnds: z.string(),
+    expiryStarts: z.string(),
+
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/living-space/tables/userType/data-table.tsx

@@ -73,7 +73,6 @@ import {
 } from "@/components/ui/tabs"
 import { schemaType } from "./schema"
 import { getColumns, DraggableRow } from "./columns"
-import { useRouter } from "next/navigation"
 
 export function LivingSpaceUserTypesDataTable({
     data,
@@ -84,6 +83,7 @@ export function LivingSpaceUserTypesDataTable({
     onPageSizeChange,
     refetchTable,
     userTypeID,
+    setIsProperty,
     setUserTypeID,
     setIsPartsEnabled,
     setIsHandleCompanyAndPersonEnable,
@@ -96,6 +96,7 @@ export function LivingSpaceUserTypesDataTable({
     onPageSizeChange: (size: number) => void,
     refetchTable: () => void,
     userTypeID: string | null;
+    setIsProperty: (enabled: boolean | null) => void;
     setUserTypeID: (id: string | null) => void;
     setIsPartsEnabled: (enabled: boolean) => void;
     setIsHandleCompanyAndPersonEnable: (enabled: boolean) => void,
@@ -107,7 +108,7 @@ export function LivingSpaceUserTypesDataTable({
     const sortableId = React.useId()
     const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
     const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
-    const setSelection = (id: string, isProperty: boolean) => { setUserTypeID(id); isProperty ? setIsPartsEnabled(true) : setIsPartsEnabled(false); setIsHandleCompanyAndPersonEnable(true) }
+    const setSelection = (id: string, isProperty: boolean) => { setUserTypeID(id); isProperty ? setIsPartsEnabled(true) : setIsPartsEnabled(false); setIsHandleCompanyAndPersonEnable(true); setIsProperty(isProperty) }
     const columns = getColumns(setSelection);
     const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize }), [currentPage, pageSize])
     const totalPages = Math.ceil(totalCount / pageSize)

frontend/pages/living-space/tables/userType/page.tsx

@@ -4,8 +4,9 @@ import { useGraphQlUserTypesList } from "./queries";
 import { LivingSpaceUserTypesDataTable } from "./data-table";
 
 const PageLivingSpaceUserTypesTableSection = (
-    { userTypeID, setUserTypeID, setIsPartsEnabled, setIsHandleCompanyAndPersonEnable }: {
+    { userTypeID, setUserTypeID, setIsPartsEnabled, setIsHandleCompanyAndPersonEnable, setIsProperty }: {
         userTypeID: string | null;
+        setIsProperty: (enabled: boolean | null) => void;
         setUserTypeID: (id: string | null) => void;
         setIsPartsEnabled: (enabled: boolean) => void;
         setIsHandleCompanyAndPersonEnable: (enabled: boolean) => void,
@@ -24,7 +25,7 @@ const PageLivingSpaceUserTypesTableSection = (
     if (error) { return <div className="flex items-center justify-center p-8 text-red-500">Error loading users</div> }
     return <>
         <LivingSpaceUserTypesDataTable
-            data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange}
+            data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange} setIsProperty={setIsProperty}
             refetchTable={refetch} userTypeID={userTypeID || ""} setUserTypeID={setUserTypeID} setIsPartsEnabled={setIsPartsEnabled} setIsHandleCompanyAndPersonEnable={setIsHandleCompanyAndPersonEnable}
         />
     </>;