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

adjustments to navigation to use its own boolean rather than piggyback off adaptive ag

Browse source
This commit is contained in:
csawatzky 2026-04-02 12:04:53 -06:00
parent 89a83d04dd
commit 605752ae02
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/navigation/BottomNavigator.tsx
View file

@ -13,7 +13,7 @@ import BinsIcon from "products/Bindapt/BinsIcon";
import { useGlobalState } from "providers"; import { useGlobalState } from "providers";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { useNavigate, useLocation } from "react-router-dom"; import { useNavigate, useLocation } from "react-router-dom";
import { IsAdaptiveAgriculture, isBXT, IsMiVent, IsAdCon, IsOmniAir, IsMiPCA } from "services/whiteLabel"; import { IsAdaptiveAgriculture, isBXT, IsMiVent, IsAdCon, IsOmniAir, IsMiPCA, IsIntellifarms } from "services/whiteLabel";
import FieldsIcon from "products/AgIcons/FieldsIcon"; import FieldsIcon from "products/AgIcons/FieldsIcon";
import NexusSTIcon from "products/Construction/NexusSTIcon"; import NexusSTIcon from "products/Construction/NexusSTIcon";
import OmniAirDeviceIcon from "products/AviationIcons/OmniAirDeviceIcon"; import OmniAirDeviceIcon from "products/AviationIcons/OmniAirDeviceIcon";
@ -36,7 +36,8 @@ export default function BottomNavigator(props: Props) {
const { isAuthenticated } = useAuth0(); const { isAuthenticated } = useAuth0();
const [{ user }] = useGlobalState(); const [{ user }] = useGlobalState();
const [route, setRoute] = useState(sideIsOpen ? "side" : ""); const [route, setRoute] = useState(sideIsOpen ? "side" : "");
const isAdaptive = IsAdaptiveAgriculture(); const isAg = IsAdaptiveAgriculture();
const isIntel = IsIntellifarms();
const isMiVent = IsMiVent(); const isMiVent = IsMiVent();
const isAdCon = IsAdCon(); const isAdCon = IsAdCon();
const isOmni = IsOmniAir(); const isOmni = IsOmniAir();
@ -45,7 +46,7 @@ export default function BottomNavigator(props: Props) {
const reRoute = useCallback( const reRoute = useCallback(
(path: string) => { (path: string) => {
if (path === "") { if (path === "") {
if (isAdaptive) { if (isAg || isIntel) {
return "bins"; return "bins";
} }
if (isMiVent) { if (isMiVent) {
@ -74,7 +75,7 @@ export default function BottomNavigator(props: Props) {
} }
return path; return path;
}, },
[isAdaptive, isMiVent] [isAg, isMiVent, isIntel]
); );
const autoDetectRoute = useCallback(() => { const autoDetectRoute = useCallback(() => {
@ -105,10 +106,10 @@ export default function BottomNavigator(props: Props) {
const authenticatedNavigation = () => { const authenticatedNavigation = () => {
return ( return (
<BottomNavigation value={route} onChange={(_, newValue) => handleRouteChange(newValue)}> <BottomNavigation value={route} onChange={(_, newValue) => handleRouteChange(newValue)}>
{isAdaptive && ( {isAg || isIntel && (
<BottomNavigationAction label="Farm" icon={<FieldsIcon type={getType()} />} value="visualFarm" /> <BottomNavigationAction label="Farm" icon={<FieldsIcon type={getType()} />} value="visualFarm" />
)} )}
{isAdaptive && ( {isAg || isIntel && (
<BottomNavigationAction label="Bins" icon={<BinsIcon type={getType()} />} value="bins" /> <BottomNavigationAction label="Bins" icon={<BinsIcon type={getType()} />} value="bins" />
)} )}
{isAdCon && ( {isAdCon && (
@ -136,7 +137,7 @@ export default function BottomNavigator(props: Props) {
<BottomNavigationAction <BottomNavigationAction
label="Devices" label="Devices"
icon={ icon={
isAdaptive ? ( (isAg || isIntel) ? (
<BindaptIcon type={getType()} /> <BindaptIcon type={getType()} />
) : isAdCon ? ( ) : isAdCon ? (
<NexusSTIcon type={getType()} /> <NexusSTIcon type={getType()} />

17
src/navigation/SideNavigator.tsx
View file

@ -166,14 +166,15 @@ export default function SideNavigator(props: Props) {
const authenticatedSideMenu = () => { const authenticatedSideMenu = () => {
const isMiVent = IsMiVent(); const isMiVent = IsMiVent();
const isAg = IsAdaptiveAgriculture() || IsIntellifarms() const isAg = IsAdaptiveAgriculture()
const isIntel = IsIntellifarms()
const isStreamline = IsStreamline() const isStreamline = IsStreamline()
const isOmni = IsOmniAir() const isOmni = IsOmniAir()
const isMiPCA = IsMiPCA() const isMiPCA = IsMiPCA()
const isAdCon = IsAdCon() const isAdCon = IsAdCon()
return ( return (
<List className={classes.list} component="nav"> <List className={classes.list} component="nav">
{(isAg || isStreamline || user.hasFeature("admin")) && ( {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && (
<Tooltip title="Visual Farm" placement="right"> <Tooltip title="Visual Farm" placement="right">
<ListItemButton <ListItemButton
id="tour-visual-farm" id="tour-visual-farm"
@ -215,7 +216,7 @@ export default function SideNavigator(props: Props) {
</ListItemButton> </ListItemButton>
</Tooltip> </Tooltip>
)} )}
{(isAg || isStreamline || user.hasFeature("admin")) && ( {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && (
<Tooltip title="Contracts" placement="right"> <Tooltip title="Contracts" placement="right">
<ListItemButton <ListItemButton
id="tour-contracts" id="tour-contracts"
@ -229,7 +230,7 @@ export default function SideNavigator(props: Props) {
</ListItemButton> </ListItemButton>
</Tooltip> </Tooltip>
)} )}
{(isAg || isStreamline || user.hasFeature("admin")) && ( {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && (
<Tooltip title="Bins" placement="right"> <Tooltip title="Bins" placement="right">
<ListItemButton <ListItemButton
id="tour-bins" id="tour-bins"
@ -271,7 +272,7 @@ export default function SideNavigator(props: Props) {
</ListItemButton> </ListItemButton>
</Tooltip> </Tooltip>
} }
{(isAg || isStreamline || user.hasFeature("admin")) && ( {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && (
<Tooltip title="Transactions" placement="right"> <Tooltip title="Transactions" placement="right">
<ListItemButton <ListItemButton
id="tour-transactions" id="tour-transactions"
@ -363,7 +364,7 @@ export default function SideNavigator(props: Props) {
{open && <ListItemText primary="Users" />} {open && <ListItemText primary="Users" />}
</ListItemButton> </ListItemButton>
</Tooltip> </Tooltip>
{(isAg || isStreamline || user.hasFeature("admin")) && ( {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && (
<Tooltip title="My Fields" placement="right"> <Tooltip title="My Fields" placement="right">
<ListItemButton <ListItemButton
id="tour-field-list" id="tour-field-list"
@ -377,7 +378,7 @@ export default function SideNavigator(props: Props) {
</ListItemButton> </ListItemButton>
</Tooltip> </Tooltip>
)} )}
{(isAg || isStreamline || user.hasFeature("admin")) && ( {(isAg || isIntel || isStreamline || user.hasFeature("admin")) && (
<Tooltip title="Grain Types" placement="right"> <Tooltip title="Grain Types" placement="right">
<ListItemButton <ListItemButton
id="tour-grain-types" id="tour-grain-types"
@ -461,7 +462,7 @@ export default function SideNavigator(props: Props) {
</ListItemButton> </ListItemButton>
</Tooltip> </Tooltip>
} }
{(isAg || isStreamline || user.hasFeature("admin")) && {(isAg || isIntel || isStreamline || user.hasFeature("admin")) &&
<Tooltip title="Marketplace" placement="right"> <Tooltip title="Marketplace" placement="right">
<ListItemButton <ListItemButton
id="tour-marketplace" id="tour-marketplace"