brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed linking between groups and devices

Browse source
This commit is contained in:
Carter 2025-01-07 14:53:43 -06:00
parent 77fb5a6bcf
commit 8fc8745862
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/common/SmartBreadcrumb.tsx
View file

@ -84,7 +84,6 @@ export default function SmartBreadcrumb(props: Props) {
}
}
const regexMatch = or(location.pathname.match(/\/groups\/([^/]+)/), [])
// console.log(or(regexMatch[1], "0").toString())
return or(regexMatch[1], "0").toString();
};

14
src/pages/Devices.tsx
View file

@ -200,13 +200,21 @@ export default function Devices() {
setLimit(event.target.value);
};
const appendToUrl = (appendage: number | string) => {
// const appendToUrl = (appendage: number | string) => {
// const basePath = location.pathname.replace(/\/$/, "");
// return(`${basePath}/${appendage}`);
// };
const prependToUrl = (prependage: number | string) => {
console.log(location.pathname)
const basePath = location.pathname.replace(/\/$/, "");
return(`${basePath}/${appendage}`);
return(`/${prependage}/${basePath}`.replace(/\/{2,}/g, "/").replace(/(\/[^/]+)\/\1+/g, "$1"));
};
const toDevice = (device: Device) => {
navigate(appendToUrl(or(device.settings?.deviceId, "")), { state: {device: device} })
let url = prependToUrl(getGroup() ? "groups/" + getGroup().id() : "")
url = url + "/" + device.id()
navigate(url, { replace: true, state: {device: device} })
};
const handleTabChange = (_event: React.SyntheticEvent, newValue: string) => {

2
src/pages/Group.tsx
View file

@ -135,7 +135,7 @@ export default function GroupPage() {
}, [group, limit, page, order, orderBy, search])
const toDevice = (device: Device) => {
navigate(appendToUrl(or(device.settings?.deviceId, "")), { state: {device: device} })
navigate(appendToUrl(or("devices/"+device.settings?.deviceId, "")), { state: {device: device} })
};
const columns = (): Column<Device>[] => {