From 539dd667c7f03cc4cc1f5a6a74fc392b2a9a9701 Mon Sep 17 00:00:00 2001 From: Carter Date: Tue, 29 Apr 2025 10:45:24 -0600 Subject: [PATCH] fixed issue with adding devices to group --- src/common/SmartBreadcrumb.tsx | 12 ------------ src/group/GroupSettings.tsx | 5 +++-- src/pages/Groups.tsx | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/common/SmartBreadcrumb.tsx b/src/common/SmartBreadcrumb.tsx index 7a912cb..4d2c176 100644 --- a/src/common/SmartBreadcrumb.tsx +++ b/src/common/SmartBreadcrumb.tsx @@ -278,7 +278,6 @@ export default function SmartBreadcrumb(props: Props) { const breadcrumbLinks = (): ReactNode[] => { const breadcrumbMap = getBreadcrumbMap(); - //console.log(breadcrumbMap) let links: ReactNode[] = []; let pathnames = location.pathname.split("/").filter((x: any) => x); @@ -288,24 +287,15 @@ export default function SmartBreadcrumb(props: Props) { return [linkComponent("/", "Dashboard", true)]; } - // if (prependPaths) pathnames.unshift(...prependPaths) - // if (prependPaths) pathnames.push(...prependPaths) if (prependPaths) pathnames.splice(pathnames.length - 1, 0, ...prependPaths); - //console.log(pathnames) - pathnames.forEach((_value: any, index: any) => { const lastPath = index === pathnames.length - 1; - //console.log(lastPath) const to = `/${pathnames.slice(0, index + 1).join("/")}`; - //console.log("to: " + to) let label = breadcrumbMap[to]; - //console.log("label: "+label) let result = to.split("/").filter(str => str !== ""); - //console.log("result: " + result.toString()) if (!label) { - //console.log("no label") if (result.length > 1) { if (result[result.length - 1] !== "components") { label = breadcrumbMap["/" + result[result.length - 1]]; @@ -317,12 +307,10 @@ export default function SmartBreadcrumb(props: Props) { } if (!blacklist.includes(to) && label) { - //console.log("push link") links.push(linkComponent(to, label, lastPath)); } }); - //console.log(links) return links; }; diff --git a/src/group/GroupSettings.tsx b/src/group/GroupSettings.tsx index f40a07e..2f15ef5 100644 --- a/src/group/GroupSettings.tsx +++ b/src/group/GroupSettings.tsx @@ -151,7 +151,6 @@ export default function GroupSettings(props: Props) { .then((response: any) => { success(groupName + " was successfully created"); close(); - console.log(response) group.settings.groupId = parseInt(response.data.id) if (addGroupCallback) addGroupCallback(group.settings) else refreshCallback(); @@ -232,9 +231,11 @@ export default function GroupSettings(props: Props) { }; const changeDevices = (device: number) => { + console.log("change") let updatedGroup = Group.clone(group); const exists = updatedGroup.settings.devices.includes(device); if (exists) { + console.log("exists") updatedGroup.settings.devices = updatedGroup.settings.devices.filter( groupDevice => groupDevice !== device ); @@ -328,7 +329,7 @@ export default function GroupSettings(props: Props) { changeDevices(device.id())} - checked={groupDeviceNumbers.includes(device.id())} + checked={group.settings.devices.includes(device.id())} inputProps={{ "aria-labelledby": label }} disabled={!canEdit} /> diff --git a/src/pages/Groups.tsx b/src/pages/Groups.tsx index e03ee5c..0d06947 100644 --- a/src/pages/Groups.tsx +++ b/src/pages/Groups.tsx @@ -77,16 +77,16 @@ export default function GroupsPage() { const columns = (): Column[] => { return [ - { - title: "Size", - render: (group) => { - return ( - - {group.settings?.devices?.length ? group.settings.devices.length : 0} - - ) - } - }, + // { + // title: "Size", + // render: (group) => { + // return ( + // + // {group.settings?.devices?.length ? group.settings.devices.length : 0} + // + // ) + // } + // }, { title: "Group Name", render: (group) => {