Skip to content

Remove unnecessary toggle #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wojcik91 merged 2 commits into from
Mar 13, 2026
Merged

Remove unnecessary toggle #2339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a278c02
remove unnecessary toggle
wojcik91 Mar 13, 2026
7687cca
don't mark allowed IPs as required
wojcik91 Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions web/src/pages/AddLocationPage/steps/AddLocationInternalVpnStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { useQuery } from '@tanstack/react-query';
import { useMemo } from 'react';
import z from 'zod';
import { useShallow } from 'zustand/react/shallow';
import { m } from '../../../paraglide/messages';
Expand All @@ -8,16 +6,9 @@ import { DescriptionBlock } from '../../../shared/components/DescriptionBlock/De
import { WizardCard } from '../../../shared/components/wizard/WizardCard/WizardCard';
import { Button } from '../../../shared/defguard-ui/components/Button/Button';
import { SizedBox } from '../../../shared/defguard-ui/components/SizedBox/SizedBox';
import { Toggle } from '../../../shared/defguard-ui/components/Toggle/Toggle';
import { TooltipContent } from '../../../shared/defguard-ui/providers/tooltip/TooltipContent';
import { TooltipProvider } from '../../../shared/defguard-ui/providers/tooltip/TooltipContext';
import { TooltipTrigger } from '../../../shared/defguard-ui/providers/tooltip/TooltipTrigger';
import { ThemeSpacing } from '../../../shared/defguard-ui/types';
import { isPresent } from '../../../shared/defguard-ui/utils/isPresent';
import { useAppForm } from '../../../shared/form';
import { formChangeLogic } from '../../../shared/formLogic';
import { getLicenseInfoQueryOptions } from '../../../shared/query';
import { canUseBusinessFeature } from '../../../shared/utils/license';
import { Validate } from '../../../shared/validate';
import { AddLocationPageStep } from '../types';
import { useAddLocationStore } from '../useAddLocationStore';
Expand All @@ -38,13 +29,6 @@ const formSchema = z.object({
type FormFields = z.infer<typeof formSchema>;

export const AddLocationInternalVpnStep = () => {
const { data: licenseInfo } = useQuery(getLicenseInfoQueryOptions);
const canUseBusiness = useMemo(() => {
if (licenseInfo === undefined) return undefined;
return canUseBusinessFeature(licenseInfo).result;
}, [licenseInfo]);
const firewallRulesToggleLocked = isPresent(canUseBusiness) && !canUseBusiness;

const defaultValues = useAddLocationStore(
useShallow(
(s): FormFields => ({
Expand Down Expand Up @@ -98,23 +82,8 @@ export const AddLocationInternalVpnStep = () => {
</DescriptionBlock>
<SizedBox height={ThemeSpacing.Lg} />
<form.AppField name="allowed_ips">
{(field) => <field.FormInput required label={'Allowed IPs'} />}
{(field) => <field.FormInput label={'Allowed IPs'} />}
</form.AppField>
<SizedBox height={ThemeSpacing.Lg} />
<TooltipProvider disabled={!firewallRulesToggleLocked} placement="top-start">
<TooltipTrigger>
<div>
<Toggle // Does nothing now #TODO: implement generating allowed ips based on firewall rules
active={false}
disabled={firewallRulesToggleLocked}
label={m.add_location_internal_vpn_allowed_ips_from_firewall_rules()}
/>
</div>
</TooltipTrigger>
<TooltipContent>
<p>{m.license_upgrade_business_tooltip()}</p>
</TooltipContent>
</TooltipProvider>
<SizedBox height={ThemeSpacing.Xl} />
<form.AppField name="dns">
{(field) => <field.FormInput label={'DNS'} />}
Expand Down
19 changes: 0 additions & 19 deletions web/src/pages/EditLocationPage/EditLocationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ import { externalLink } from '../../shared/constants';

import { InfoBanner } from '../../shared/defguard-ui/components/InfoBanner/InfoBanner';
import { SizedBox } from '../../shared/defguard-ui/components/SizedBox/SizedBox';
import { Toggle } from '../../shared/defguard-ui/components/Toggle/Toggle';
import { Snackbar } from '../../shared/defguard-ui/providers/snackbar/snackbar';
import { TooltipContent } from '../../shared/defguard-ui/providers/tooltip/TooltipContent';
import { TooltipProvider } from '../../shared/defguard-ui/providers/tooltip/TooltipContext';
import { TooltipTrigger } from '../../shared/defguard-ui/providers/tooltip/TooltipTrigger';
import { ThemeSpacing } from '../../shared/defguard-ui/types';
import { isPresent } from '../../shared/defguard-ui/utils/isPresent';
import { useAppForm } from '../../shared/form';
Expand Down Expand Up @@ -274,21 +270,6 @@ const EditLocationForm = ({ location }: { location: NetworkLocation }) => {
<form.AppField name="allowed_ips">
{(field) => <field.FormInput label="Allowed IPs" />}
</form.AppField>
<SizedBox height={ThemeSpacing.Lg} />
<TooltipProvider disabled={!firewallLocked} placement="top-start">
<TooltipTrigger>
<div>
<Toggle // Does nothing now #TODO: implement generating allowed ips based on firewall rules
active={false}
disabled={firewallLocked}
label={m.add_location_internal_vpn_allowed_ips_from_firewall_rules()}
/>
</div>
</TooltipTrigger>
<TooltipContent>
<p>{m.license_upgrade_business_tooltip()}</p>
</TooltipContent>
</TooltipProvider>
<SizedBox height={ThemeSpacing.Xl2} />
<form.AppField name="dns">
{(field) => <field.FormInput label="DNS" />}
Expand Down
Loading