feat: add group support

diorcety · diorcety · commit 4061679c01dc · 2025-04-12T12:12:31.000+02:00
diff --git a/.yarn/patches/react-data-table-component-npm-7.7.0-ecb7088530.patch b/.yarn/patches/react-data-table-component-npm-7.7.0-ecb7088530.patch
diff --git a/backend/services/member.js b/backend/services/member.js
@@ -138,6 +138,9 @@ export async function updateMemberAdditionalData(nwid, mid, data) {
   if (data.hasOwnProperty("description")) {
     additionalData.description = data.description;
   }
+  if (data.hasOwnProperty("group")) {
+    additionalData.group = data.group;
+  }
 
   if (additionalData) {
     const member = db
@@ -152,14 +155,17 @@ export async function updateMemberAdditionalData(nwid, mid, data) {
         .map((additionalConfig) => _.assign(additionalConfig, additionalData))
         .write();
     } else {
-      additionalData = { name: "", description: "" };
+      additionalData = { name: "", description: "", group: "" };
 
       if (data.hasOwnProperty("name")) {
         additionalData.name = data.name;
       }
       if (data.hasOwnProperty("description")) {
         additionalData.description = data.description;
       }
+      if (data.hasOwnProperty("group")) {
+        additionalData.group = data.group;
+      }
       db.get("networks")
         .filter({ id: nwid })
         .map("members")
diff --git a/frontend/package.json b/frontend/package.json
@@ -17,7 +17,9 @@
     "ipaddr.js": "^2.0.1",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
-    "react-data-table-component": "^6.11.8",
+    "react-data-table-component": "patch:react-data-table-component@npm%3A7.7.0#~/.yarn/patches/react-data-table-component-npm-7.7.0-ecb7088530.patch",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^17.0.2",
     "react-i18next": "^13.3.0",
     "react-is": "^17.0.2",
diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json
@@ -23,6 +23,7 @@
   "member_one": "Member",
   "member_other": "Members",
   "addMemberManually": "Manually Add Member",
+  "addGroup": "Add group",
   "name": "Name",
   "description": "Description",
   "allowBridging": "Allow Ethernet Bridging",
diff --git a/frontend/src/components/NetworkMembers/NetworkMembers.jsx b/frontend/src/components/NetworkMembers/NetworkMembers.jsx
@@ -11,25 +11,86 @@ import ExpandMoreIcon from "@material-ui/icons/ExpandMore";
 import RefreshIcon from "@material-ui/icons/Refresh";
 import { useCallback, useEffect, useState } from "react";
 import DataTable from "react-data-table-component";
+import { DndProvider, useDrag, useDrop } from "react-dnd";
+import { HTML5Backend } from "react-dnd-html5-backend";
 import { useParams } from "react-router-dom";
 import API from "utils/API";
 import { parseValue, replaceValue, setValue } from "utils/ChangeHelper";
 import { formatDistance } from "date-fns";
 import AddMember from "./components/AddMember";
+import AddGroup from "./components/AddGroup";
 import DeleteMember from "./components/DeleteMember";
 import ManagedIP from "./components/ManagedIP";
 import MemberName from "./components/MemberName";
 import MemberSettings from "./components/MemberSettings";
 
 import { useTranslation } from "react-i18next";
 
+const MemberItemType = "MEMBER_ITEM";
+
+const DraggableRow = ({ zoneId, row, content, ...other }) => {
+  const [, drag] = useDrag({
+    type: MemberItemType,
+    item: { zoneId, row },
+  });
+
+  return (
+    <div style={{ userSelect: "text" }} ref={(node) => drag(node)} {...other}>
+      {content}
+    </div>
+  );
+};
+
+const DropZone = ({ zoneId, moveRow, children }) => {
+  const [, drop] = useDrop({
+    accept: MemberItemType,
+    canDrop: (item, monitor) => {
+      return item.zoneId !== zoneId;
+    },
+    drop: (item, monitor) => {
+      if (monitor.canDrop()) {
+        moveRow(item.zoneId, item.row, zoneId);
+      }
+    },
+    collect: (monitor) => ({
+      isOver: monitor.isOver(),
+      canDrop: monitor.canDrop(),
+    }),
+  });
+
+  return (
+    <div
+      style={{ all: "unset", display: "contents" }}
+      ref={(node) => drop(node)}
+    >
+      {children}
+    </div>
+  );
+};
+
 function NetworkMembers({ network }) {
   const { nwid } = useParams();
   const [members, setMembers] = useState([]);
+  const [groups, setGroups] = useState([]);
+  const [extraGroups, setExtraGroups] = useState([]);
+
+  const addGroup = useCallback(
+    async (name) => {
+      if (!groups.includes(name) && !groups.includes(name)) {
+        let mutableExtraGroups = [...extraGroups];
+        mutableExtraGroups.push(name);
+        setExtraGroups(mutableExtraGroups);
+      }
+    },
+    [groups, extraGroups]
+  );
 
   const fetchData = useCallback(async () => {
     try {
       const members = await API.get("network/" + nwid + "/member");
+      let groupSet = new Set();
+      members.data.forEach((x) => groupSet.add(x.group));
+      setGroups([...groupSet]);
       setMembers(members.data);
       console.log("Members:", members.data);
     } catch (err) {
@@ -62,7 +123,13 @@ function NetworkMembers({ network }) {
       });
       let mutableMembers = [...members];
       mutableMembers[index] = updatedMember;
+      const groups = new Set();
+      mutableMembers.forEach((x) => groups.add(x.group));
+      let mutableExtraGroups = extraGroups.filter((x) => !groups.has(x));
+
       setMembers(mutableMembers);
+      setGroups([...groups]);
+      setExtraGroups(mutableExtraGroups);
 
       const data = setValue({}, key1, key2, value);
       sendReq(member["config"]["id"], data);
@@ -163,44 +230,95 @@ function NetworkMembers({ network }) {
     },
   ];
 
+  const changeMemberGroup = (oldGroup, member, newGroup) => {
+    member.group = newGroup;
+
+    let mutableMembers = [...members];
+    const groups = new Set();
+    mutableMembers.forEach((x) => groups.add(x.group));
+
+    // Remove extra group
+    let mutableExtraGroups = extraGroups.filter((x) => !groups.has(x));
+
+    setGroups([...groups]);
+    setExtraGroups(mutableExtraGroups);
+    setMembers(mutableMembers);
+
+    const data = setValue({}, "group", null, newGroup);
+    sendReq(member["config"]["id"], data);
+  };
+
   return (
     <Accordion defaultExpanded={true}>
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <Typography>{t("member", { count: members.length })}</Typography>
       </AccordionSummary>
       <AccordionDetails>
-        <Grid container direction="column" spacing={3}>
-          <IconButton color="primary" onClick={fetchData}>
-            <RefreshIcon />
-          </IconButton>
-          <Grid container>
-            {members.length ? (
-              <DataTable
-                noHeader={true}
-                columns={columns}
-                data={[...members]}
-              />
-            ) : (
-              <Grid
-                container
-                spacing={0}
-                direction="column"
-                alignItems="center"
-                justifyContent="center"
-                style={{
-                  minHeight: "50vh",
-                }}
-              >
-                <Typography variant="h6" style={{ padding: "10%" }}>
-                  {t("noDevices")} <b>{nwid}</b>.
-                </Typography>
-              </Grid>
-            )}
-          </Grid>
-          <Grid item>
-            <AddMember nwid={nwid} callback={fetchData} />
+        <DndProvider backend={HTML5Backend}>
+          <Grid container direction="column" spacing={3}>
+            {groups
+              .concat(extraGroups)
+              .sort()
+              .map((group) => (
+                <Accordion defaultExpanded={group == ""} key={group}>
+                  <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+                    <Typography>{group || "Ungrouped"}</Typography>
+                  </AccordionSummary>
+                  <AccordionDetails>
+                    <Grid container direction="column" spacing={3}>
+                      <IconButton color="primary" onClick={fetchData}>
+                        <RefreshIcon />
+                      </IconButton>
+                      <Grid container>
+                        <DropZone zoneId={group} moveRow={changeMemberGroup}>
+                          {members.length ? (
+                            <DataTable
+                              noHeader={true}
+                              columns={columns}
+                              data={[
+                                ...members.filter((x) => x.group == group),
+                              ]}
+                              renderRow={(row, content) => (
+                                <DraggableRow
+                                  zoneId={group}
+                                  row={row}
+                                  content={content}
+                                  key={row.config.address}
+                                />
+                              )}
+                            />
+                          ) : (
+                            <Grid
+                              container
+                              spacing={0}
+                              direction="column"
+                              alignItems="center"
+                              justifyContent="center"
+                              style={{
+                                minHeight: "50vh",
+                              }}
+                            >
+                              <Typography
+                                variant="h6"
+                                style={{ padding: "10%" }}
+                              >
+                                {t("noDevices")} <b>{nwid}</b>.
+                              </Typography>
+                            </Grid>
+                          )}
+                        </DropZone>
+                      </Grid>
+                      <Grid item></Grid>
+                    </Grid>
+                  </AccordionDetails>
+                </Accordion>
+              ))}
+            <Grid item>
+              <AddMember nwid={nwid} callback={fetchData} />
+              <AddGroup callback={addGroup} />
+            </Grid>
           </Grid>
-        </Grid>
+        </DndProvider>
       </AccordionDetails>
     </Accordion>
   );
diff --git a/frontend/src/components/NetworkMembers/components/AddGroup/AddGroup.jsx b/frontend/src/components/NetworkMembers/components/AddGroup/AddGroup.jsx
@@ -0,0 +1,49 @@
+import { useState } from "react";
+
+import { List, Typography, IconButton, TextField } from "@material-ui/core";
+import AddIcon from "@material-ui/icons/Add";
+
+import { useTranslation } from "react-i18next";
+
+function AddGroup({ callback }) {
+  const [name, setName] = useState("");
+
+  const handleInput = (event) => {
+    setName(event.target.value);
+  };
+
+  const addMemberReq = async () => {
+    callback(name);
+  };
+
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <Typography>{t("addGroup")}</Typography>
+      <List
+        disablePadding={true}
+        style={{
+          display: "flex",
+          flexDirection: "row",
+        }}
+      >
+        <TextField
+          value={name}
+          onChange={handleInput}
+          placeholder={"##########"}
+        />
+
+        <IconButton size="small" color="primary" onClick={addMemberReq}>
+          <AddIcon
+            style={{
+              fontSize: 16,
+            }}
+          />
+        </IconButton>
+      </List>
+    </>
+  );
+}
+
+export default AddGroup;
diff --git a/frontend/src/components/NetworkMembers/components/AddGroup/index.jsx b/frontend/src/components/NetworkMembers/components/AddGroup/index.jsx
@@ -0,0 +1 @@
+export { default } from "./AddGroup";
diff --git a/yarn.lock b/yarn.lock
