From 5ef90bdd33254594c0bf4895c47ec5442eae2419 Mon Sep 17 00:00:00 2001
From: Edouard Vanbelle <opensource@edouard.vanbelle.fr>
Date: Wed, 29 Jan 2025 22:46:13 +0100
Subject: [PATCH 1/2] peers table: refactor filters

---
 src/modules/peers/PeersTable.tsx | 156 +++++++++++++++----------------
 1 file changed, 73 insertions(+), 83 deletions(-)

diff --git a/src/modules/peers/PeersTable.tsx b/src/modules/peers/PeersTable.tsx
index 06b78cfc..b91f7c97 100644
--- a/src/modules/peers/PeersTable.tsx
+++ b/src/modules/peers/PeersTable.tsx
@@ -12,8 +12,11 @@ import GetStartedTest from "@components/ui/GetStartedTest";
 import { NotificationCountBadge } from "@components/ui/NotificationCountBadge";
 import {
   ColumnDef,
+  ColumnFiltersState,
   RowSelectionState,
   SortingState,
+  Table,
+  VisibilityState,
 } from "@tanstack/react-table";
 import { uniqBy } from "lodash";
 import { ExternalLinkIcon } from "lucide-react";
@@ -65,6 +68,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
   {
     id: "name",
     accessorFn: (peer) => `${peer?.name}${peer?.dns_label}`,
+    enableHiding: false,
     header: ({ column }) => {
       return <DataTableHeader column={column}>Name</DataTableHeader>;
     },
@@ -83,6 +87,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     accessorFn: (peer) => peer.connected,
   },
   {
+    id: "ip",
     accessorKey: "ip",
     sortingFn: "text",
   },
@@ -96,6 +101,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
   },
   {
     id: "dns_label",
+    enableHiding: false,
     accessorKey: "dns_label",
     header: ({ column }) => {
       return <DataTableHeader column={column}>Address</DataTableHeader>;
@@ -103,11 +109,13 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     cell: ({ row }) => <PeerAddressCell peer={row.original} />,
   },
   {
+    id: "group_name_strings",
     accessorKey: "group_name_strings",
     accessorFn: (peer) => peer.groups?.map((g) => g?.name || "").join(", "),
     sortingFn: "text",
   },
   {
+    id: "group_names",
     accessorKey: "group_names",
     accessorFn: (peer) => peer.groups?.map((g) => g?.name || ""),
     sortingFn: "text",
@@ -126,6 +134,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     ),
   },
   {
+    id: "last_seen",
     accessorKey: "last_seen",
     header: ({ column }) => {
       return <DataTableHeader column={column}>Last seen</DataTableHeader>;
@@ -150,6 +159,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     sortingFn: "text",
   },
   {
+    id: "version",
     accessorKey: "version",
     header: ({ column }) => {
       return <DataTableHeader column={column}>Version</DataTableHeader>;
@@ -176,6 +186,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
   },
   {
     id: "actions",
+    enableHiding: false,
     accessorKey: "id",
     header: "",
     cell: ({ row }) => (
@@ -234,6 +245,52 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
     }
   };
 
+  const filteredColunms = [
+    "connected",
+    "approval_required",
+    "group_name_strings",
+    "group_names",
+  ];
+
+  /**
+   *  This function overrides the given column filters and reuses the previous filters
+   *
+   *  Table index and selection is also cleared
+   */
+  const overrideTableFilter = (table: Table<Peer>, change: ColumnFiltersState) => {
+    let filters = [] as ColumnFiltersState;
+
+    filteredColunms.forEach((columnId) => {
+      let columnFilter = change.find((entry) => entry.id == columnId);
+      if (columnFilter === undefined) {
+        columnFilter = {
+          id: columnId,
+          value: table.getColumn(columnId)?.getFilterValue()
+        }
+      }
+      filters.push(columnFilter);
+    })
+    table.setPageIndex(0);
+    table.setColumnFilters( filters);
+    resetSelectedRows();
+  };
+
+  const columnVisibility: VisibilityState = {
+    select: !isUser,
+    actions: !isUser,
+    groups: !isUser,
+    connected: false,
+    approval_required: false,
+
+    // hidden, but usefull for lookup
+    serial: false,
+    group_name_strings: false,
+    group_names: false,
+    ip: false,
+    user_name: false,
+    user_email: false,
+  };
+
   return (
     <>
       <PeerMultiSelect
@@ -251,19 +308,7 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
         columns={PeersTableColumns}
         data={peers}
         searchPlaceholder={"Search by name, IP, Serial, owner or group..."}
-        columnVisibility={{
-          select: !isUser,
-          connected: false,
-          approval_required: false,
-          group_name_strings: false,
-          group_names: false,
-          ip: false,
-          serial: false,
-          user_name: false,
-          user_email: false,
-          actions: !isUser,
-          groups: !isUser,
-        }}
+        columnVisibility={columnVisibility}
         isLoading={isLoading}
         getStartedCard={
           <GetStartedTest
@@ -302,29 +347,12 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
               <ButtonGroup.Button
                 disabled={peers?.length == 0}
                 onClick={() => {
-                  table.setPageIndex(0);
-                  let groupFilters = table
-                    .getColumn("group_names")
-                    ?.getFilterValue();
-                  table.setColumnFilters([
+                  overrideTableFilter( table, [
                     {
                       id: "connected",
                       value: undefined,
                     },
-                    {
-                      id: "approval_required",
-                      value: undefined,
-                    },
-                    {
-                      id: "group_names",
-                      value: groupFilters ?? [],
-                    },
-                    {
-                      id: "group_names",
-                      value: groupFilters ?? [],
-                    },
                   ]);
-                  resetSelectedRows();
                 }}
                 variant={
                   table.getColumn("connected")?.getFilterValue() == undefined
@@ -336,29 +364,12 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
               </ButtonGroup.Button>
               <ButtonGroup.Button
                 onClick={() => {
-                  table.setPageIndex(0);
-                  let groupFilters = table
-                    .getColumn("group_names")
-                    ?.getFilterValue();
-                  table.setColumnFilters([
+                  overrideTableFilter( table, [
                     {
                       id: "connected",
                       value: true,
                     },
-                    {
-                      id: "approval_required",
-                      value: undefined,
-                    },
-                    {
-                      id: "group_names",
-                      value: groupFilters ?? [],
-                    },
-                    {
-                      id: "group_names",
-                      value: groupFilters ?? [],
-                    },
                   ]);
-                  resetSelectedRows();
                 }}
                 disabled={peers?.length == 0}
                 variant={
@@ -371,25 +382,12 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
               </ButtonGroup.Button>
               <ButtonGroup.Button
                 onClick={() => {
-                  table.setPageIndex(0);
-                  let groupFilters = table
-                    .getColumn("group_names")
-                    ?.getFilterValue();
-                  table.setColumnFilters([
+                  overrideTableFilter( table, [
                     {
                       id: "connected",
                       value: false,
                     },
-                    {
-                      id: "approval_required",
-                      value: undefined,
-                    },
-                    {
-                      id: "group_names",
-                      value: groupFilters ?? [],
-                    },
                   ]);
-                  resetSelectedRows();
                 }}
                 disabled={peers?.length == 0}
                 variant={
@@ -406,29 +404,21 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
               <Button
                 disabled={peers?.length == 0}
                 onClick={() => {
-                  table.setPageIndex(0);
                   let current =
                     table.getColumn("approval_required")?.getFilterValue() ===
-                    undefined
+                      undefined
                       ? true
                       : undefined;
-
-                  table.setColumnFilters([
-                    {
-                      id: "connected",
-                      value: undefined,
-                    },
+                   overrideTableFilter( table, [
                     {
                       id: "approval_required",
                       value: current,
                     },
                   ]);
-
-                  resetSelectedRows();
                 }}
                 variant={
                   table.getColumn("approval_required")?.getFilterValue() ===
-                  true
+                    true
                     ? "tertiary"
                     : "secondary"
                 }
@@ -448,15 +438,15 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
                     .getColumn("group_names")
                     ?.getFilterValue() as string[]) || []
                 }
-                onChange={(groups) => {
-                  table.setPageIndex(0);
-                  if (groups.length == 0) {
-                    table.getColumn("group_names")?.setFilterValue(undefined);
-                    return;
-                  } else {
-                    table.getColumn("group_names")?.setFilterValue(groups);
-                  }
-                  resetSelectedRows();
+                onChange={(anyOfValues) => {
+                    const normalizedAnyOf = ( anyOfValues.length == 0 ) ? undefined : anyOfValues;
+                    overrideTableFilter( table, [
+                      {
+                        id: "group_names",
+                        value: normalizedAnyOf
+                      },
+                    ]
+                  );
                 }}
                 groups={tableGroups}
               />

From e5b697cb5fbe00ca6cb0eea4cc7768fd25b442ad Mon Sep 17 00:00:00 2001
From: Edouard Vanbelle <opensource@edouard.vanbelle.fr>
Date: Thu, 27 Feb 2025 00:30:44 +0100
Subject: [PATCH 2/2] add filtering on unassigned peers

---
 src/modules/groups/GroupSelector.tsx | 85 +++++++++++++++++++++++-----
 src/modules/peers/PeersTable.tsx     | 33 +++++++++--
 2 files changed, 101 insertions(+), 17 deletions(-)

diff --git a/src/modules/groups/GroupSelector.tsx b/src/modules/groups/GroupSelector.tsx
index d46a1909..51f3df1d 100644
--- a/src/modules/groups/GroupSelector.tsx
+++ b/src/modules/groups/GroupSelector.tsx
@@ -22,28 +22,45 @@ import { Group } from "@/interfaces/Group";
 
 interface MultiSelectProps {
   values: string[];
-  onChange: (items: string[]) => void;
+  exclusiveValue?: string;
+  onChange: (anyOfValues: string[], exclusiveValue?: string) => void;
   disabled?: boolean;
   popoverWidth?: "auto" | number;
   groups: Group[] | undefined;
+  unassignedCount?: number;
+  defaultGroupName?: string;
 }
 export function GroupSelector({
   onChange,
   values,
+  exclusiveValue,
   disabled = false,
   popoverWidth = 400,
   groups,
+  unassignedCount,
+  defaultGroupName = "All", //defined as a property, no clue if this value may change in the future
 }: MultiSelectProps) {
   const searchRef = React.useRef<HTMLInputElement>(null);
   const [inputRef, { width }] = useElementSize<HTMLButtonElement>();
   const [search, setSearch] = useState("");
 
-  const toggle = (code: string) => {
+  const toggleAnyOf = (code: string) => {
     const isSelected = values.find((c) => c == code) != undefined;
     if (isSelected) {
-      onChange && onChange(values.filter((c) => c != code));
+      onChange && onChange(values.filter((c) => c != code), undefined);
     } else {
-      onChange && onChange([...values, code]);
+      onChange && onChange([...values, code], undefined);
+      setSearch("");
+    }
+  };
+
+  const toggleExclusive = (code: string) => {
+    const isSelected = exclusiveValue == code;
+    if (isSelected) {
+      onChange && onChange([], undefined);
+      setSearch("");
+    } else {
+      onChange && onChange([], code);
       setSearch("");
     }
   };
@@ -63,14 +80,16 @@ export function GroupSelector({
       }}
     >
       <PopoverTrigger asChild={true}>
-        <Button variant={"secondary"} disabled={disabled} ref={inputRef}>
+        <Button variant={"secondary"} disabled={disabled} ref={inputRef} className="w-[200px] justify-between">
           <FolderGit2 size={16} className={"shrink-0"} />
           <div className={"w-full flex justify-between"}>
-            {values.length > 0 ? (
-              <div>{values.length} Group(s)</div>
-            ) : (
-              "All Groups"
-            )}
+            {
+              exclusiveValue != undefined
+                ? ("Unassigned peers")
+                : values.length > 0
+                  ? (`${values.length} Group(s)`)
+                  : ("All Groups")
+            }
             <div className={"pl-2"}>
               <ChevronsUpDown size={18} className={"shrink-0"} />
             </div>
@@ -133,7 +152,6 @@ export function GroupSelector({
                 </div>
               </div>
             </div>
-
             <ScrollArea
               className={
                 "max-h-[380px] overflow-y-auto flex flex-col gap-1 pl-2 py-2 pr-3"
@@ -142,7 +160,48 @@ export function GroupSelector({
               <CommandGroup>
                 <div className={""}>
                   <div className={"grid grid-cols-1 gap-1"}>
-                    {orderBy(groups, "name")?.map((item) => {
+                    <CommandItem
+                      className={"p-1"}
+                      onSelect={() => {
+                        toggleExclusive(defaultGroupName);
+                        searchRef.current?.focus();
+                      }}
+                      onClick={(e) => e.preventDefault()}
+                      >
+                      <div
+                        className={
+                          "text-neutral-500 dark:text-nb-gray-300 font-medium flex items-center gap-3 py-1 px-1 w-full"
+                        }
+                      >
+                        <Checkbox checked={exclusiveValue == defaultGroupName}/>
+                        <div
+                          className={
+                            "flex justify-between items-center w-full"
+                          }
+                        >
+                          <div
+                            className={
+                              "flex items-center gap-2 whitespace-nowrap text-sm"
+                            }
+                          >
+                            <FolderGit2 size={13} className={"shrink-0"} />
+                            <TextWithTooltip text={"Unassigned peers"} />
+                          </div>
+                          <div
+                                className={
+                                  "flex items-center gap-2 text-xs text-nb-gray-200/60"
+                                }
+                              >
+                                <MonitorSmartphoneIcon size={13} />
+                                {unassignedCount} Peer(s)
+                              </div>
+                        </div>
+                      </div>
+                    </CommandItem>
+                    <hr />
+                    {orderBy(groups, "name")
+                        ?.filter((group) => group.name != defaultGroupName) // Ignore default group
+                        ?.map((item) => {
                       const value = item?.name || "";
                       if (value === "") return null;
                       const isSelected =
@@ -154,7 +213,7 @@ export function GroupSelector({
                           value={value}
                           className={"p-1"}
                           onSelect={() => {
-                            toggle(value);
+                            toggleAnyOf(value);
                             searchRef.current?.focus();
                           }}
                           onClick={(e) => e.preventDefault()}
diff --git a/src/modules/peers/PeersTable.tsx b/src/modules/peers/PeersTable.tsx
index b91f7c97..5d6380ff 100644
--- a/src/modules/peers/PeersTable.tsx
+++ b/src/modules/peers/PeersTable.tsx
@@ -113,6 +113,7 @@ const PeersTableColumns: ColumnDef<Peer>[] = [
     accessorKey: "group_name_strings",
     accessorFn: (peer) => peer.groups?.map((g) => g?.name || "").join(", "),
     sortingFn: "text",
+    filterFn: "equals" // hack to filter on a uniq item value in groups
   },
   {
     id: "group_names",
@@ -226,9 +227,19 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
     ],
   );
 
+  // Caveat: no clue if this name may change in the future
+  // By default server assign every peers to `All` group
+  const DEFAULT_GROUP_NAME = "All";
+
   const pendingApprovalCount =
     peers?.filter((p) => p.approval_required).length || 0;
 
+  // Count peers that are not assigned to other group than the default group
+  const unassignedCount = peers?.reduce(
+    (acc, p) => acc + ((p.groups?.length == 1 && p.groups.at(0)?.name == DEFAULT_GROUP_NAME) ? 1: 0),
+    0
+  );
+
   const tableGroups =
     (uniqBy(
       peers?.map((p) => p.groups?.map((g) => g)).flatMap((g) => g),
@@ -428,9 +439,10 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
               </Button>
             )}
 
-            <DataTableRowsPerPage table={table} disabled={peers?.length == 0} />
-
-            {!isUser && (
+            {
+              !isUser
+              && tableGroups.length > 1 // if length == 1, it means only "All" group exists, case not relevant
+              && (
               <GroupSelector
                 disabled={peers?.length == 0}
                 values={
@@ -438,20 +450,33 @@ export default function PeersTable({ peers, isLoading, headingTarget }: Props) {
                     .getColumn("group_names")
                     ?.getFilterValue() as string[]) || []
                 }
-                onChange={(anyOfValues) => {
+                exclusiveValue={
+                  (table
+                    .getColumn("group_name_strings")
+                    ?.getFilterValue() as string) || undefined
+                }
+                onChange={(anyOfValues, exclusiveValue) => {
                     const normalizedAnyOf = ( anyOfValues.length == 0 ) ? undefined : anyOfValues;
                     overrideTableFilter( table, [
                       {
                         id: "group_names",
                         value: normalizedAnyOf
                       },
+                      {
+                        id: "group_name_strings",
+                        value: exclusiveValue
+                      }
                     ]
                   );
                 }}
                 groups={tableGroups}
+                unassignedCount={unassignedCount}
+                defaultGroupName={DEFAULT_GROUP_NAME}
               />
             )}
 
+            <DataTableRowsPerPage table={table} disabled={peers?.length == 0} />
+
             <DataTableRefreshButton
               isDisabled={peers?.length == 0}
               onClick={() => {