Skip to content

Commit

Permalink
feat: Remove reserved IP feature flag MAASENG-3757 (#5551)
Browse files Browse the repository at this point in the history
- Removed feature flag conditions for reserved IP features
- Removed flag from `.env`

Resolves [MAASENG-3757](https://warthogs.atlassian.net/browse/MAASENG-3757)
  • Loading branch information
ndv99 authored Oct 24, 2024
1 parent ec3e045 commit d8367ed
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 17 deletions.
5 changes: 1 addition & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ VITE_BASENAME="/r"
VITE_APP_BASENAME=${BASENAME}
VITE_APP_VITE_BASENAME=${VITE_BASENAME}
VITE_APP_WEBSOCKET_DEBUG=false
VITE_APP_USABILLA_ID=fd6cf482fbbb

# Feature flags
VITE_APP_STATIC_IPS_ENABLED=false
VITE_APP_USABILLA_ID=fd6cf482fbbb
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ export const IpAssignmentSelect = ({
return (
<FormikField
component={Select}
help={
import.meta.env.VITE_APP_STATIC_IPS_ENABLED === "true"
? "To manage static DHCP leases for a device, go to the address reservation tab of a subnet."
: null
}
help="To manage static DHCP leases for a device, go to the address reservation tab of a subnet."
label={label}
options={[
{ label: Labels.DefaultOption, value: "", disabled: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,7 @@ const NetworkFields = ({
{values.subnet ? (
<LinkModeSelect
defaultOption={null}
help={
import.meta.env.VITE_APP_STATIC_IPS_ENABLED === "true"
? "To manage static DHCP leases for a machine, go to the address reservation tab of a subnet."
: null
}
help="To manage static DHCP leases for a machine, go to the address reservation tab of a subnet."
interfaceType={interfaceType}
name="mode"
onChange={(evt: React.ChangeEvent<HTMLInputElement>) => {
Expand Down
4 changes: 1 addition & 3 deletions src/app/subnets/views/SubnetDetails/SubnetDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,7 @@ const SubnetDetails = (): JSX.Element => {
<Route
element={
<>
{import.meta.env.VITE_APP_STATIC_IPS_ENABLED === "true" && (
<StaticDHCPLease subnetId={id} />
)}
<StaticDHCPLease subnetId={id} />
<ReservedRanges subnetId={id} />
</>
}
Expand Down

0 comments on commit d8367ed

Please sign in to comment.