Skip to content

Commit f6e786a

Browse files
thomasheartmanthomasheartman
authored
Remove caseInsensitiveInOperators flag (#9670)
The flag has never made it out of dev, and has not been turned on consistently since 2023. There was a project for it, but we have since abandoned it.
1 parent 6e947a8 commit f6e786a

File tree

5 files changed

+11
-65
lines changed

5 files changed

+11
-65
lines changed

‎frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
DATE_AFTER,
1010
IN,
1111
stringOperators,
12-
inOperators,
1312
} from 'constants/operators';
1413
import { resolveText } from './helpers';
1514
import { oneOf } from 'utils/oneOf';
@@ -25,7 +24,6 @@ import { InvertedOperatorButton } from '../StyledToggleButton/InvertedOperatorBu
2524
import { CaseSensitiveButton } from '../StyledToggleButton/CaseSensitiveButton/CaseSensitiveButton';
2625
import { ConstraintAccordionHeaderActions } from '../../ConstraintAccordionHeaderActions/ConstraintAccordionHeaderActions';
2726
import { styled } from '@mui/material';
28-
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
2927

3028
interface IConstraintAccordionViewHeader {
3129
localConstraint: IConstraint;
@@ -103,13 +101,8 @@ export const ConstraintAccordionEditHeader = ({
103101
const { contextName, operator } = localConstraint;
104102
const [showCaseSensitiveButton, setShowCaseSensitiveButton] =
105103
useState(false);
106-
const { uiConfig } = useUiConfig();
107104

108-
const caseInsensitiveInOperators = Boolean(
109-
uiConfig.flags.caseInsensitiveInOperators,
110-
);
111-
112-
/* We need a special case to handle the currenTime context field. Since
105+
/* We need a special case to handle the currentTime context field. Since
113106
this field will be the only one to allow DATE_BEFORE and DATE_AFTER operators
114107
this will check if the context field is the current time context field AND check
115108
if it is not already using one of the date operators (to not overwrite if there is existing
@@ -131,21 +124,12 @@ export const ConstraintAccordionEditHeader = ({
131124
setOperator(IN);
132125
}
133126

134-
if (
135-
oneOf(stringOperators, operator) ||
136-
(oneOf(inOperators, operator) && caseInsensitiveInOperators)
137-
) {
127+
if (oneOf(stringOperators, operator)) {
138128
setShowCaseSensitiveButton(true);
139129
} else {
140130
setShowCaseSensitiveButton(false);
141131
}
142-
}, [
143-
contextName,
144-
setOperator,
145-
operator,
146-
setLocalConstraint,
147-
caseInsensitiveInOperators,
148-
]);
132+
}, [contextName, setOperator, operator, setLocalConstraint]);
149133

150134
if (!context) {
151135
return null;
@@ -156,10 +140,7 @@ export const ConstraintAccordionEditHeader = ({
156140
});
157141

158142
const onOperatorChange = (operator: Operator) => {
159-
if (
160-
oneOf(stringOperators, operator) ||
161-
(oneOf(inOperators, operator) && caseInsensitiveInOperators)
162-
) {
143+
if (oneOf(stringOperators, operator)) {
163144
setShowCaseSensitiveButton(true);
164145
} else {
165146
setShowCaseSensitiveButton(false);

‎frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
DATE_AFTER,
1010
IN,
1111
stringOperators,
12-
inOperators,
1312
} from 'constants/operators';
1413
import { resolveText } from './helpers';
1514
import { oneOf } from 'utils/oneOf';
@@ -25,7 +24,6 @@ import { InvertedOperatorButton } from '../StyledToggleButton/InvertedOperatorBu
2524
import { CaseSensitiveButton } from '../StyledToggleButton/CaseSensitiveButton/CaseSensitiveButton';
2625
import { ConstraintAccordionHeaderActions } from '../../ConstraintAccordionHeaderActions/ConstraintAccordionHeaderActions';
2726
import { styled } from '@mui/material';
28-
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
2927

3028
interface IConstraintAccordionViewHeader {
3129
localConstraint: IConstraint;
@@ -107,13 +105,8 @@ export const ConstraintAccordionEditHeader = ({
107105
const { contextName, operator } = localConstraint;
108106
const [showCaseSensitiveButton, setShowCaseSensitiveButton] =
109107
useState(false);
110-
const { uiConfig } = useUiConfig();
111108

112-
const caseInsensitiveInOperators = Boolean(
113-
uiConfig.flags.caseInsensitiveInOperators,
114-
);
115-
116-
/* We need a special case to handle the currenTime context field. Since
109+
/* We need a special case to handle the currentTime context field. Since
117110
this field will be the only one to allow DATE_BEFORE and DATE_AFTER operators
118111
this will check if the context field is the current time context field AND check
119112
if it is not already using one of the date operators (to not overwrite if there is existing
@@ -135,21 +128,12 @@ export const ConstraintAccordionEditHeader = ({
135128
setOperator(IN);
136129
}
137130

138-
if (
139-
oneOf(stringOperators, operator) ||
140-
(oneOf(inOperators, operator) && caseInsensitiveInOperators)
141-
) {
131+
if (oneOf(stringOperators, operator)) {
142132
setShowCaseSensitiveButton(true);
143133
} else {
144134
setShowCaseSensitiveButton(false);
145135
}
146-
}, [
147-
contextName,
148-
setOperator,
149-
operator,
150-
setLocalConstraint,
151-
caseInsensitiveInOperators,
152-
]);
136+
}, [contextName, setOperator, operator, setLocalConstraint]);
153137

154138
if (!context) {
155139
return null;
@@ -160,10 +144,7 @@ export const ConstraintAccordionEditHeader = ({
160144
});
161145

162146
const onOperatorChange = (operator: Operator) => {
163-
if (
164-
oneOf(stringOperators, operator) ||
165-
(oneOf(inOperators, operator) && caseInsensitiveInOperators)
166-
) {
147+
if (oneOf(stringOperators, operator)) {
167148
setShowCaseSensitiveButton(true);
168149
} else {
169150
setShowCaseSensitiveButton(false);

‎frontend/src/component/project/Project/ProjectSettings/ProjectActions/ProjectActionsTable/ProjectActionsModal/ProjectActionsForm/ProjectActionsFormStep/ProjectActionsFormStepSource/ProjectActionsFilterItem.tsx

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
type Operator,
1515
allOperators,
1616
dateOperators,
17-
inOperators,
1817
stringOperators,
1918
} from 'constants/operators';
2019
import { useEffect, useState } from 'react';
@@ -24,7 +23,6 @@ import { CaseSensitiveButton } from 'component/common/NewConstraintAccordion/Con
2423
import { InvertedOperatorButton } from 'component/common/NewConstraintAccordion/ConstraintAccordionEdit/StyledToggleButton/InvertedOperatorButton/InvertedOperatorButton';
2524
import { ResolveInput } from 'component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ResolveInput/ResolveInput';
2625
import { useConstraintInput } from 'component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/useConstraintInput/useConstraintInput';
27-
import { useUiFlag } from 'hooks/useUiFlag';
2826

2927
const StyledDeleteButton = styled(IconButton)({
3028
marginRight: '-6px',
@@ -136,8 +134,6 @@ export const ProjectActionsFilterItem = ({
136134
const [showCaseSensitiveButton, setShowCaseSensitiveButton] =
137135
useState(false);
138136

139-
const caseInsensitiveInOperators = useUiFlag('caseInsensitiveInOperators');
140-
141137
const validOperators = allOperators.filter(
142138
(operator) => !oneOf(dateOperators, operator),
143139
);
@@ -167,21 +163,15 @@ export const ProjectActionsFilterItem = ({
167163
}, [value, error]);
168164

169165
useEffect(() => {
170-
if (
171-
oneOf(stringOperators, operator) ||
172-
(oneOf(inOperators, operator) && caseInsensitiveInOperators)
173-
) {
166+
if (oneOf(stringOperators, operator)) {
174167
setShowCaseSensitiveButton(true);
175168
} else {
176169
setShowCaseSensitiveButton(false);
177170
}
178-
}, [operator, caseInsensitiveInOperators]);
171+
}, [operator]);
179172

180173
const onOperatorChange = (operator: Operator) => {
181-
if (
182-
oneOf(stringOperators, operator) ||
183-
(oneOf(inOperators, operator) && caseInsensitiveInOperators)
184-
) {
174+
if (oneOf(stringOperators, operator)) {
185175
setShowCaseSensitiveButton(true);
186176
} else {
187177
setShowCaseSensitiveButton(false);

‎frontend/src/interfaces/uiConfig.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export type UiFlags = {
5555
maintenanceMode?: boolean;
5656
messageBanner?: Variant;
5757
banner?: Variant;
58-
caseInsensitiveInOperators?: boolean;
5958
notifications?: boolean;
6059
personalAccessTokensKillSwitch?: boolean;
6160
demo?: boolean;

‎src/lib/types/experimental.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export type IFlagKey =
1313
| 'responseTimeWithAppNameKillSwitch'
1414
| 'maintenanceMode'
1515
| 'messageBanner'
16-
| 'caseInsensitiveInOperators'
1716
| 'strictSchemaValidation'
1817
| 'personalAccessTokensKillSwitch'
1918
| 'migrationLock'
@@ -101,10 +100,6 @@ const flags: IFlags = {
101100
process.env.UNLEASH_EXPERIMENTAL_MESSAGE_BANNER_PAYLOAD ?? '',
102101
},
103102
},
104-
caseInsensitiveInOperators: parseEnvVarBoolean(
105-
process.env.UNLEASH_EXPERIMENTAL_CASE_INSENSITIVE_IN_OPERATORS,
106-
false,
107-
),
108103
strictSchemaValidation: parseEnvVarBoolean(
109104
process.env.UNLEASH_STRICT_SCHEMA_VALIDTION,
110105
false,

0 commit comments

Comments
 (0)