Skip to content

Commit a16e934

Browse files
dlabrecqdlabrecq
committed
Remove unused Unleash flags for settings platform, cluster info, and tag mapping
1 parent c10a463 commit a16e934

File tree

9 files changed

+10
-88
lines changed

9 files changed

+10
-88
lines changed

‎src/components/featureToggle/featureToggle.tsx

-24
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { FeatureToggleActions } from 'store/featureToggle';
77
// eslint-disable-next-line no-shadow
88
export const enum FeatureToggle {
99
awsEc2Instances = 'cost-management.ui.aws-ec2-instances', // https://issues.redhat.com/browse/COST-4855
10-
clusterInfo = 'cost-management.ui.cluster.info', // https://issues.redhat.com/browse/COST-4559
1110
debug = 'cost-management.ui.debug',
1211
exports = 'cost-management.ui.exports', // Async exports https://issues.redhat.com/browse/COST-2223
1312
finsights = 'cost-management.ui.finsights', // RHEL support for FINsights https://issues.redhat.com/browse/COST-3306
@@ -16,8 +15,6 @@ export const enum FeatureToggle {
1615
ocpProjectStorage = 'cost-management.ui.ocp-project-storage', // https://issues.redhat.com/browse/COST-4856
1716
ros = 'cost-management.ui.ros', // ROS support https://issues.redhat.com/browse/COST-3477
1817
rosBeta = 'cost-management.ui.ros-beta', // ROS support https://issues.redhat.com/browse/COST-3477
19-
settingsPlatform = 'cost-management.ui.settings.platform', // Platform projects https://issues.redhat.com/browse/COST-3818
20-
tagMapping = 'cost-management.ui.tag.mapping', // https://issues.redhat.com/browse/COST-3824
2118
}
2219

2320
const useIsToggleEnabled = (toggle: FeatureToggle) => {
@@ -33,10 +30,6 @@ export const useIsDebugToggleEnabled = () => {
3330
return useIsToggleEnabled(FeatureToggle.debug);
3431
};
3532

36-
export const useIsClusterInfoToggleEnabled = () => {
37-
return useIsToggleEnabled(FeatureToggle.clusterInfo);
38-
};
39-
4033
export const useIsExportsToggleEnabled = () => {
4134
return useIsToggleEnabled(FeatureToggle.exports);
4235
};
@@ -64,30 +57,19 @@ export const useIsRosToggleEnabled = () => {
6457
return isRosToggleEnabled || isRosFeatureBetaEnabled;
6558
};
6659

67-
export const useIsSettingsPlatformToggleEnabled = () => {
68-
return useIsToggleEnabled(FeatureToggle.settingsPlatform);
69-
};
70-
71-
export const useIsTagMappingToggleEnabled = () => {
72-
return useIsToggleEnabled(FeatureToggle.tagMapping);
73-
};
74-
7560
// The FeatureToggle component saves feature toggles in store for places where Unleash hooks not available
7661
export const useFeatureToggle = () => {
7762
const dispatch = useDispatch();
7863
const { auth } = useChrome();
7964

8065
const isAwsEc2InstancesToggleEnabled = useIsAwsEc2InstancesToggleEnabled();
81-
const isClusterInfoToggleEnabled = useIsClusterInfoToggleEnabled();
8266
const isDebugToggleEnabled = useIsDebugToggleEnabled();
8367
const isExportsToggleEnabled = useIsExportsToggleEnabled();
8468
const isFinsightsToggleEnabled = useIsFinsightsToggleEnabled();
8569
const isIbmToggleEnabled = useIsIbmToggleEnabled();
8670
const isOcpCloudNetworkingToggleEnabled = useIsOcpCloudNetworkingToggleEnabled();
8771
const isOcpProjectStorageToggleEnabled = useIsOcpProjectStorageToggleEnabled();
8872
const isRosToggleEnabled = useIsRosToggleEnabled();
89-
const isSettingsPlatformToggleEnabled = useIsSettingsPlatformToggleEnabled();
90-
const isTagMappingToggleEnabled = useIsTagMappingToggleEnabled();
9173

9274
const fetchUser = callback => {
9375
auth.getUser().then(user => {
@@ -100,16 +82,13 @@ export const useFeatureToggle = () => {
10082
dispatch(
10183
FeatureToggleActions.setFeatureToggle({
10284
isAwsEc2InstancesToggleEnabled,
103-
isClusterInfoToggleEnabled,
10485
isDebugToggleEnabled,
10586
isExportsToggleEnabled,
10687
isFinsightsToggleEnabled,
10788
isIbmToggleEnabled,
10889
isOcpCloudNetworkingToggleEnabled,
10990
isOcpProjectStorageToggleEnabled,
11091
isRosToggleEnabled,
111-
isSettingsPlatformToggleEnabled,
112-
isTagMappingToggleEnabled,
11392
})
11493
);
11594
if (isDebugToggleEnabled) {
@@ -118,16 +97,13 @@ export const useFeatureToggle = () => {
11897
}
11998
}, [
12099
isAwsEc2InstancesToggleEnabled,
121-
isClusterInfoToggleEnabled,
122100
isDebugToggleEnabled,
123101
isExportsToggleEnabled,
124102
isFinsightsToggleEnabled,
125103
isIbmToggleEnabled,
126104
isOcpCloudNetworkingToggleEnabled,
127105
isOcpProjectStorageToggleEnabled,
128106
isRosToggleEnabled,
129-
isSettingsPlatformToggleEnabled,
130-
isTagMappingToggleEnabled,
131107
]);
132108
};
133109

‎src/routes/details/components/breakdown/breakdownHeader.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { Currency } from 'routes/components/currency';
1818
import { TagLink } from 'routes/details/components/tag';
1919
import { getGroupByCostCategory, getGroupByOrgValue, getGroupByTagKey } from 'routes/utils/groupBy';
2020
import { createMapStateToProps } from 'store/common';
21-
import { FeatureToggleSelectors } from 'store/featureToggle';
2221
import { getTotalCostDateRangeString } from 'utils/dates';
2322
import { formatCurrency } from 'utils/format';
2423
import { awsCategoryKey, orgUnitIdKey, tagKey } from 'utils/props';
@@ -51,7 +50,7 @@ interface BreakdownHeaderOwnProps extends RouterComponentProps {
5150
}
5251

5352
interface BreakdownHeaderStateProps {
54-
isClusterInfoToggleEnabled?: boolean;
53+
// TBD...
5554
}
5655

5756
interface BreakdownHeaderDispatchProps {
@@ -100,7 +99,6 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
10099
description,
101100
groupBy,
102101
intl,
103-
isClusterInfoToggleEnabled,
104102
onCostDistributionSelect,
105103
onCostTypeSelect,
106104
onCurrencySelect,
@@ -136,7 +134,7 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
136134
? orgUnitIdKey
137135
: groupBy;
138136

139-
const showClusterInfo = clusterInfoComponent && isClusterInfoToggleEnabled;
137+
const showClusterInfo = clusterInfoComponent;
140138

141139
return (
142140
<header style={styles.header}>
@@ -176,7 +174,7 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
176174
) : null}
177175
</FlexItem>
178176
)}
179-
{dataDetailsComponent && isClusterInfoToggleEnabled ? <FlexItem>{dataDetailsComponent}</FlexItem> : null}
177+
{dataDetailsComponent ? <FlexItem>{dataDetailsComponent}</FlexItem> : null}
180178
{showCostDistribution && (
181179
<FlexItem style={styles.costDistribution}>
182180
<CostDistribution costDistribution={costDistribution} onSelect={onCostDistributionSelect} />
@@ -213,9 +211,9 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
213211
}
214212
}
215213

216-
const mapStateToProps = createMapStateToProps<BreakdownHeaderOwnProps, BreakdownHeaderStateProps>(state => {
214+
const mapStateToProps = createMapStateToProps<BreakdownHeaderOwnProps, BreakdownHeaderStateProps>(() => {
217215
return {
218-
isClusterInfoToggleEnabled: FeatureToggleSelectors.selectIsClusterInfoToggleEnabled(state),
216+
// TBD...
219217
};
220218
});
221219

‎src/routes/settings/settings.tsx

+4-11
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { PlatformProjects } from 'routes/settings/platformProjects';
1919
import { TagLabels } from 'routes/settings/tagLabels';
2020
import type { RootState } from 'store';
2121
import { FetchStatus } from 'store/common';
22-
import { FeatureToggleSelectors } from 'store/featureToggle';
2322
import { userAccessQuery, userAccessSelectors } from 'store/userAccess';
2423
import type { ChromeComponentProps } from 'utils/chrome';
2524
import { withChrome } from 'utils/chrome';
@@ -67,7 +66,6 @@ export interface SettingsMapProps {
6766
}
6867

6968
export interface SettingsStateProps {
70-
isSettingsPlatformEnabled?: boolean;
7169
userAccess: UserAccess;
7270
userAccessError: AxiosError;
7371
userAccessFetchStatus: FetchStatus;
@@ -78,7 +76,7 @@ type SettingsProps = SettingsOwnProps;
7876

7977
const Settings: React.FC<SettingsProps> = () => {
8078
const [activeTabKey, setActiveTabKey] = useState(0);
81-
const { isSettingsPlatformEnabled, userAccess, userAccessFetchStatus } = useMapToProps();
79+
const { userAccess, userAccessFetchStatus } = useMapToProps();
8280
const intl = useIntl();
8381

8482
const canWrite = () => {
@@ -108,13 +106,11 @@ const Settings: React.FC<SettingsProps> = () => {
108106
contentRef: React.createRef(),
109107
tab: SettingsTab.costCategory,
110108
},
111-
];
112-
if (isSettingsPlatformEnabled) {
113-
availableTabs.push({
109+
{
114110
contentRef: React.createRef(),
115111
tab: SettingsTab.platformProjects,
116-
});
117-
}
112+
},
113+
];
118114
return availableTabs;
119115
};
120116

@@ -236,9 +232,6 @@ const useMapToProps = (): SettingsStateProps => {
236232
);
237233

238234
return {
239-
isSettingsPlatformEnabled: useSelector((state: RootState) =>
240-
FeatureToggleSelectors.selectIsSettingsPlatformToggleEnabled(state)
241-
),
242235
userAccess,
243236
userAccessError,
244237
userAccessFetchStatus,

‎src/routes/settings/tagLabels/tagLabels.tsx

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Accordion, AccordionContent, AccordionItem, AccordionToggle, PageSection } from '@patternfly/react-core';
2-
import { useIsTagMappingToggleEnabled } from 'components/featureToggle';
32
import messages from 'locales/messages';
43
import React, { useState } from 'react';
54
import { useIntl } from 'react-intl';
@@ -36,7 +35,6 @@ type TagLabelsProps = TagLabelsOwnProps;
3635

3736
const TagLabels: React.FC<TagLabelsProps> = ({ canWrite }) => {
3837
const [activeKey, setActiveKey] = useState(0);
39-
const isTagMappingToggleEnabled = useIsTagMappingToggleEnabled();
4038
const intl = useIntl();
4139

4240
const getAvailableItems = () => {
@@ -104,11 +102,7 @@ const TagLabels: React.FC<TagLabelsProps> = ({ canWrite }) => {
104102
return (
105103
<PageSection isFilled>
106104
<div style={styles.container}>
107-
{isTagMappingToggleEnabled ? (
108-
<Accordion asDefinitionList>{getAccordionItem(availableItems)}</Accordion>
109-
) : (
110-
<Tags canWrite={canWrite} />
111-
)}
105+
<Accordion asDefinitionList>{getAccordionItem(availableItems)}</Accordion>
112106
</div>
113107
</PageSection>
114108
);

‎src/store/featureToggle/__snapshots__/featureToggle.test.ts.snap

-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ exports[`default state 1`] = `
44
{
55
"hasFeatureToggle": false,
66
"isAwsEc2InstancesToggleEnabled": false,
7-
"isClusterInfoToggleEnabled": false,
87
"isDebugToggleEnabled": false,
98
"isExportsToggleEnabled": false,
109
"isFinsightsToggleEnabled": false,
1110
"isIbmToggleEnabled": false,
1211
"isOcpCloudNetworkingToggleEnabled": false,
1312
"isOcpProjectStorageToggleEnabled": false,
1413
"isRosToggleEnabled": false,
15-
"isSettingsPlatformToggleEnabled": false,
16-
"isTagMappingToggleEnabled": false,
1714
}
1815
`;

‎src/store/featureToggle/featureToggle.test.ts

-18
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ test('AWS EC2 instances feature is enabled', async () => {
2020
expect(FeatureToggleSelectors.selectIsAwsEc2InstancesToggleEnabled(store.getState())).toBe(true);
2121
});
2222

23-
test('Cloud info feature is enabled', async () => {
24-
const store = createUIStore();
25-
store.dispatch(actions.setFeatureToggle({ isClusterInfoToggleEnabled: true }));
26-
expect(FeatureToggleSelectors.selectIsClusterInfoToggleEnabled(store.getState())).toBe(true);
27-
});
28-
2923
test('Debug feature is enabled', async () => {
3024
const store = createUIStore();
3125
store.dispatch(actions.setFeatureToggle({ isDebugToggleEnabled: true }));
@@ -67,15 +61,3 @@ test('ROS feature is enabled', async () => {
6761
store.dispatch(actions.setFeatureToggle({ isRosToggleEnabled: true }));
6862
expect(FeatureToggleSelectors.selectIsRosToggleEnabled(store.getState())).toBe(true);
6963
});
70-
71-
test('Settings platform feature is enabled', async () => {
72-
const store = createUIStore();
73-
store.dispatch(actions.setFeatureToggle({ isSettingsPlatformToggleEnabled: true }));
74-
expect(FeatureToggleSelectors.selectIsSettingsPlatformToggleEnabled(store.getState())).toBe(true);
75-
});
76-
77-
test('Tag mapping feature is enabled', async () => {
78-
const store = createUIStore();
79-
store.dispatch(actions.setFeatureToggle({ isTagMappingToggleEnabled: true }));
80-
expect(FeatureToggleSelectors.selectIsTagMappingToggleEnabled(store.getState())).toBe(true);
81-
});

‎src/store/featureToggle/featureToggleActions.ts

-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ import { createAction } from 'typesafe-actions';
22

33
export interface FeatureToggleActionMeta {
44
isAwsEc2InstancesToggleEnabled?: boolean;
5-
isClusterInfoToggleEnabled?: boolean;
65
isDebugToggleEnabled?: boolean;
76
isExportsToggleEnabled?: boolean;
87
isFinsightsToggleEnabled?: boolean;
98
isIbmToggleEnabled?: boolean;
109
isOcpCloudNetworkingToggleEnabled?: boolean;
1110
isOcpProjectStorageToggleEnabled?: boolean;
1211
isRosToggleEnabled?: boolean;
13-
isSettingsPlatformToggleEnabled?: boolean;
14-
isTagMappingToggleEnabled?: boolean;
1512
}
1613

1714
export const setFeatureToggle = createAction('feature/init_feature_toggle')<FeatureToggleActionMeta>();

‎src/store/featureToggle/featureToggleReducer.ts

-9
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,25 @@ export type FeatureToggleAction = ActionType<typeof setFeatureToggle | typeof re
99
export type FeatureToggleState = Readonly<{
1010
hasFeatureToggle: boolean;
1111
isAwsEc2InstancesToggleEnabled;
12-
isClusterInfoToggleEnabled: boolean;
1312
isDebugToggleEnabled: boolean;
1413
isExportsToggleEnabled: boolean;
1514
isFinsightsToggleEnabled: boolean;
1615
isIbmToggleEnabled: boolean;
1716
isOcpCloudNetworkingToggleEnabled: boolean;
1817
isOcpProjectStorageToggleEnabled: boolean;
1918
isRosToggleEnabled: boolean;
20-
isSettingsPlatformToggleEnabled: boolean;
21-
isTagMappingToggleEnabled: boolean;
2219
}>;
2320

2421
export const defaultState: FeatureToggleState = {
2522
hasFeatureToggle: false,
2623
isAwsEc2InstancesToggleEnabled: false,
27-
isClusterInfoToggleEnabled: false,
2824
isDebugToggleEnabled: false,
2925
isExportsToggleEnabled: false,
3026
isFinsightsToggleEnabled: false,
3127
isIbmToggleEnabled: false,
3228
isOcpCloudNetworkingToggleEnabled: false,
3329
isOcpProjectStorageToggleEnabled: false,
3430
isRosToggleEnabled: false,
35-
isSettingsPlatformToggleEnabled: false,
36-
isTagMappingToggleEnabled: false,
3731
};
3832

3933
export const stateKey = 'FeatureToggle';
@@ -45,16 +39,13 @@ export function FeatureToggleReducer(state = defaultState, action: FeatureToggle
4539
...state,
4640
hasFeatureToggle: true,
4741
isAwsEc2InstancesToggleEnabled: action.payload.isAwsEc2InstancesToggleEnabled,
48-
isClusterInfoToggleEnabled: action.payload.isClusterInfoToggleEnabled,
4942
isDebugToggleEnabled: action.payload.isDebugToggleEnabled,
5043
isExportsToggleEnabled: action.payload.isExportsToggleEnabled,
5144
isFinsightsToggleEnabled: action.payload.isFinsightsToggleEnabled,
5245
isIbmToggleEnabled: action.payload.isIbmToggleEnabled,
5346
isOcpCloudNetworkingToggleEnabled: action.payload.isOcpCloudNetworkingToggleEnabled,
5447
isOcpProjectStorageToggleEnabled: action.payload.isOcpProjectStorageToggleEnabled,
5548
isRosToggleEnabled: action.payload.isRosToggleEnabled,
56-
isSettingsPlatformToggleEnabled: action.payload.isSettingsPlatformToggleEnabled,
57-
isTagMappingToggleEnabled: action.payload.isTagMappingToggleEnabled,
5849
};
5950

6051
default:

‎src/store/featureToggle/featureToggleSelectors.ts

-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ export const selectHasFeatureToggle = (state: RootState) => selectFeatureToggleS
88

99
export const selectIsAwsEc2InstancesToggleEnabled = (state: RootState) =>
1010
selectFeatureToggleState(state).isAwsEc2InstancesToggleEnabled;
11-
export const selectIsClusterInfoToggleEnabled = (state: RootState) =>
12-
selectFeatureToggleState(state).isClusterInfoToggleEnabled;
1311
export const selectIsDebugToggleEnabled = (state: RootState) => selectFeatureToggleState(state).isDebugToggleEnabled;
1412
export const selectIsExportsToggleEnabled = (state: RootState) =>
1513
selectFeatureToggleState(state).isExportsToggleEnabled;
@@ -21,7 +19,3 @@ export const selectIsOcpCloudNetworkingToggleEnabled = (state: RootState) =>
2119
export const selectIsOcpProjectStorageToggleEnabled = (state: RootState) =>
2220
selectFeatureToggleState(state).isOcpProjectStorageToggleEnabled;
2321
export const selectIsRosToggleEnabled = (state: RootState) => selectFeatureToggleState(state).isRosToggleEnabled;
24-
export const selectIsSettingsPlatformToggleEnabled = (state: RootState) =>
25-
selectFeatureToggleState(state).isSettingsPlatformToggleEnabled;
26-
export const selectIsTagMappingToggleEnabled = (state: RootState) =>
27-
selectFeatureToggleState(state).isTagMappingToggleEnabled;

0 commit comments

Comments
 (0)