-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add peer multiselect, optimize dropdown performance for peer selectio…
…n, remove 'all' group from some dropdowns, various ui / ux optimizations
- Loading branch information
Showing
6 changed files
with
82 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 26 additions & 131 deletions
157
src/modules/posture-checks/modal/PostureCheckBrowseModal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,138 +1,33 @@ | ||
| import Button from "@components/Button"; | ||
| import { Checkbox } from "@components/Checkbox"; | ||
| import { DataTable } from "@components/table/DataTable"; | ||
| import DataTableHeader from "@components/table/DataTableHeader"; | ||
| import DataTableRefreshButton from "@components/table/DataTableRefreshButton"; | ||
| import { useLocalStorage } from "@hooks/useLocalStorage"; | ||
| import { | ||
| ColumnDef, | ||
| RowSelectionState, | ||
| SortingState, | ||
| } from "@tanstack/react-table"; | ||
| import useFetchApi from "@utils/api"; | ||
| import { usePathname } from "next/navigation"; | ||
| import React, { useState } from "react"; | ||
| import { useSWRConfig } from "swr"; | ||
| import { Modal, ModalContent } from "@components/modal/Modal"; | ||
| import { cn } from "@utils/helpers"; | ||
| import * as React from "react"; | ||
| import { PostureCheck } from "@/interfaces/PostureCheck"; | ||
| import { PostureCheckChecksCell } from "@/modules/posture-checks/table/cells/PostureCheckChecksCell"; | ||
| import { PostureCheckNameCell } from "@/modules/posture-checks/table/cells/PostureCheckNameCell"; | ||
| import PostureCheckBrowseTable from "@/modules/posture-checks/table/PostureCheckBrowseTable"; | ||
|
|
||
| type Props = { | ||
| onAdd: (checks: PostureCheck[]) => void; | ||
| onSuccess: (checks: PostureCheck[]) => void; | ||
| open: boolean; | ||
| onOpenChange: (open: boolean) => void; | ||
| }; | ||
|
|
||
| export default function PostureCheckBrowseTable({ onAdd }: Readonly<Props>) { | ||
| const { data: postureChecks, isLoading } = | ||
| useFetchApi<PostureCheck[]>("/posture-checks"); | ||
| const { mutate } = useSWRConfig(); | ||
| const path = usePathname(); | ||
|
|
||
| // Default sorting state of the table | ||
| const [sorting, setSorting] = useLocalStorage<SortingState>( | ||
| "netbird-table-sort" + path, | ||
| [ | ||
| { | ||
| id: "name", | ||
| desc: true, | ||
| }, | ||
| ], | ||
| ); | ||
|
|
||
| const [selectedRows, setSelectedRows] = useState<RowSelectionState>({}); | ||
|
|
||
| export const PostureCheckBrowseModal = ({ | ||
| onSuccess, | ||
| open, | ||
| onOpenChange, | ||
| }: Props) => { | ||
| return ( | ||
| <div className={""}> | ||
| <DataTable | ||
| showResetFilterButton={false} | ||
| rowSelection={selectedRows} | ||
| setRowSelection={setSelectedRows} | ||
| isLoading={isLoading} | ||
| text={"Posture Check"} | ||
| sorting={sorting} | ||
| wrapperClassName={""} | ||
| setSorting={setSorting} | ||
| columns={PostureChecksColumns} | ||
| showHeader={true} | ||
| columnVisibility={{ | ||
| description: false, | ||
| }} | ||
| tableClassName={"mt-6 !border-0"} | ||
| rowClassName={"!border-b-0 px-10"} | ||
| data={postureChecks} | ||
| searchPlaceholder={"Search by name and description..."} | ||
| onRowClick={(row) => row.toggleSelected()} | ||
| rightSide={(table) => ( | ||
| <> | ||
| {postureChecks && postureChecks?.length > 0 && ( | ||
| <Button | ||
| variant={"primary"} | ||
| className={"ml-auto"} | ||
| onClick={() => | ||
| onAdd( | ||
| table.getSelectedRowModel().rows.map((row) => row.original), | ||
| ) | ||
| } | ||
| disabled={table.getSelectedRowModel().rows.length <= 0} | ||
| > | ||
| Add Posture Checks ({table.getSelectedRowModel().rows.length}) | ||
| </Button> | ||
| )} | ||
| </> | ||
| )} | ||
| <Modal open={open} onOpenChange={onOpenChange} key={open ? 1 : 0}> | ||
| <ModalContent | ||
| maxWidthClass={cn("relative", "max-w-2xl")} | ||
| className={"pb-0"} | ||
| showClose={false} | ||
| > | ||
| {() => { | ||
| return ( | ||
| <DataTableRefreshButton | ||
| isDisabled={postureChecks?.length == 0} | ||
| onClick={() => { | ||
| mutate("/posture-checks"); | ||
| }} | ||
| /> | ||
| ); | ||
| }} | ||
| </DataTable> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export const PostureChecksColumns: ColumnDef<PostureCheck>[] = [ | ||
| { | ||
| id: "select", | ||
| header: ({ table }) => ( | ||
| <div className={"min-w-[20px] max-w-[20px]"}> | ||
| <Checkbox | ||
| checked={table.getIsAllPageRowsSelected()} | ||
| onCheckedChange={(value) => table.toggleAllRowsSelected(!!value)} | ||
| aria-label="Select all" | ||
| /> | ||
| </div> | ||
| ), | ||
| cell: ({ row }) => ( | ||
| <div className={"min-w-[20px] max-w-[20px]"}> | ||
| <Checkbox | ||
| checked={row.getIsSelected()} | ||
| onCheckedChange={(value) => row.toggleSelected(!!value)} | ||
| aria-label="Select row" | ||
| <PostureCheckBrowseTable | ||
| onAdd={(checks) => { | ||
| onSuccess(checks); | ||
| onOpenChange(false); | ||
| }} | ||
| /> | ||
| </div> | ||
| ), | ||
| enableSorting: false, | ||
| enableHiding: false, | ||
| }, | ||
| { | ||
| accessorKey: "name", | ||
| header: ({ column }) => { | ||
| return <DataTableHeader column={column}>Name</DataTableHeader>; | ||
| }, | ||
| cell: ({ row }) => ( | ||
| <PostureCheckNameCell small={true} check={row.original} /> | ||
| ), | ||
| }, | ||
| { | ||
| accessorKey: "id", | ||
| header: ({ column }) => { | ||
| return <DataTableHeader column={column}>Checks</DataTableHeader>; | ||
| }, | ||
| cell: ({ row }) => <PostureCheckChecksCell check={row.original} />, | ||
| }, | ||
| ]; | ||
| </ModalContent> | ||
| </Modal> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters