Skip to content

Commit b847864

Browse files
Tech Story: [M3-7360] - DC Get Well - Cleanup/Remove feature flag logic (linode#10146)
* Cleanup feature flag data * Added changeset: DC Get Well - Cleanup/Remove feature flag logic
1 parent 460012d commit b847864

File tree

6 files changed

+10
-18
lines changed

6 files changed

+10
-18
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@linode/manager": Tech Stories
3+
---
4+
5+
DC Get Well - Cleanup/Remove feature flag logic ([#10146](https://github.com/linode/manager/pull/10146))

packages/manager/src/components/RegionSelect/RegionMultiSelect.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useEffect, useMemo, useState } from 'react';
22

33
import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
44
import { StyledListItem } from 'src/components/Autocomplete/Autocomplete.styles';
5-
import { useFlags } from 'src/hooks/useFlags';
65
import { useAccountAvailabilitiesQueryUnpaginated } from 'src/queries/accountAvailability';
76

87
import { RegionOption } from './RegionOption';
@@ -36,11 +35,10 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
3635
width,
3736
} = props;
3837

39-
const flags = useFlags();
4038
const {
4139
data: accountAvailability,
4240
isLoading: accountAvailabilityLoading,
43-
} = useAccountAvailabilitiesQueryUnpaginated(flags.dcGetWell);
41+
} = useAccountAvailabilitiesQueryUnpaginated();
4442

4543
const [selectedRegions, setSelectedRegions] = useState<RegionSelectOption[]>(
4644
getSelectedRegionsByIds({
@@ -93,9 +91,6 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
9391
<>
9492
<StyledAutocompleteContainer sx={{ width }}>
9593
<Autocomplete
96-
getOptionDisabled={(option: RegionSelectOption) =>
97-
Boolean(flags.dcGetWell) && Boolean(option.unavailable)
98-
}
9994
groupBy={(option: RegionSelectOption) => {
10095
return option?.data?.region;
10196
}}
@@ -134,6 +129,7 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
134129
disableClearable={!isClearable}
135130
disabled={disabled}
136131
errorText={errorText}
132+
getOptionDisabled={(option: RegionSelectOption) => option.unavailable}
137133
label={label ?? 'Regions'}
138134
loading={accountAvailabilityLoading}
139135
multiple

packages/manager/src/components/RegionSelect/RegionOption.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Box } from 'src/components/Box';
55
import { Flag } from 'src/components/Flag';
66
import { Link } from 'src/components/Link';
77
import { Tooltip } from 'src/components/Tooltip';
8-
import { useFlags } from 'src/hooks/useFlags';
98

109
import {
1110
SelectedIcon,
@@ -23,9 +22,7 @@ type Props = {
2322
};
2423

2524
export const RegionOption = ({ option, props, selected }: Props) => {
26-
const flags = useFlags();
27-
const isDisabledMenuItem =
28-
Boolean(flags.dcGetWell) && Boolean(option.unavailable);
25+
const isDisabledMenuItem = option.unavailable;
2926

3027
return (
3128
<Tooltip

packages/manager/src/components/RegionSelect/RegionSelect.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as React from 'react';
22

33
import { Autocomplete } from 'src/components/Autocomplete/Autocomplete';
44
import { Flag } from 'src/components/Flag';
5-
import { useFlags } from 'src/hooks/useFlags';
65
import { useAccountAvailabilitiesQueryUnpaginated } from 'src/queries/accountAvailability';
76

87
import { RegionOption } from './RegionOption';
@@ -39,11 +38,10 @@ export const RegionSelect = React.memo((props: RegionSelectProps) => {
3938
width,
4039
} = props;
4140

42-
const flags = useFlags();
4341
const {
4442
data: accountAvailability,
4543
isLoading: accountAvailabilityLoading,
46-
} = useAccountAvailabilitiesQueryUnpaginated(flags.dcGetWell);
44+
} = useAccountAvailabilitiesQueryUnpaginated();
4745

4846
const regionFromSelectedId: RegionSelectOption | null =
4947
getSelectedRegionById({
@@ -84,9 +82,6 @@ export const RegionSelect = React.memo((props: RegionSelectProps) => {
8482
return (
8583
<StyledAutocompleteContainer sx={{ width }}>
8684
<Autocomplete
87-
getOptionDisabled={(option: RegionSelectOption) =>
88-
Boolean(flags.dcGetWell) && Boolean(option.unavailable)
89-
}
9085
isOptionEqualToValue={(
9186
option: RegionSelectOption,
9287
{ value }: RegionSelectOption
@@ -127,6 +122,7 @@ export const RegionSelect = React.memo((props: RegionSelectProps) => {
127122
disableClearable={!isClearable}
128123
disabled={disabled}
129124
errorText={errorText}
125+
getOptionDisabled={(option: RegionSelectOption) => option.unavailable}
130126
groupBy={(option: RegionSelectOption) => option.data.region}
131127
label={label ?? 'Region'}
132128
loading={accountAvailabilityLoading}

packages/manager/src/dev-tools/FeatureFlagTool.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const MOCK_FEATURE_FLAGS_STORAGE_KEY = 'devTools/mock-feature-flags';
1414
const options: { flag: keyof Flags; label: string }[] = [
1515
{ flag: 'aclb', label: 'ACLB' },
1616
{ flag: 'aclbFullCreateFlow', label: 'ACLB Full Create Flow' },
17-
{ flag: 'dcGetWell', label: 'DC Get Well' },
1817
{ flag: 'linodeCloneUIChanges', label: 'Linode Clone UI Changes' },
1918
{ flag: 'metadata', label: 'Metadata' },
2019
{ flag: 'parentChildAccountAccess', label: 'Parent/Child Account' },

packages/manager/src/featureFlags.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ export interface Flags {
4646
databaseBeta: boolean;
4747
databaseScaleUp: boolean;
4848
databases: boolean;
49-
dcGetWell: boolean;
5049
firewallNodebalancer: boolean;
5150
ipv6Sharing: boolean;
5251
linodeCloneUIChanges: boolean;

0 commit comments

Comments
 (0)