chore: Change request flags removed (#4601)

Unleash · Sep 4, 2023 · 5ae86ef · 5ae86ef
1 parent ad9d9d9
commit 5ae86ef
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 49 deletions.
diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ReviewButton/ReviewButton.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ReviewButton/ReviewButton.tsx
@@ -18,8 +18,6 @@ import { APPROVE_CHANGE_REQUEST } from 'component/providers/AccessProvider/permi
 import PermissionButton from 'component/common/PermissionButton/PermissionButton';
 import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser';
 import AccessContext from 'contexts/AccessContext';
-import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
-import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
 import CheckBox from '@mui/icons-material/Check';
 import Clear from '@mui/icons-material/Clear';
 
@@ -28,7 +26,6 @@ export const ReviewButton: FC<{
     onReject: () => void;
     onApprove: () => void;
 }> = ({ disabled, onReject, onApprove, children }) => {
-    const { uiConfig } = useUiConfig();
     const { isAdmin } = useContext(AccessContext);
     const projectId = useRequiredPathParam('projectId');
     const id = useRequiredPathParam('id');
@@ -111,21 +108,14 @@ export const ReviewButton: FC<{
                                             Approve changes
                                         </ListItemText>
                                     </MenuItem>
-                                    <ConditionallyRender
-                                        condition={Boolean(
-                                            uiConfig?.flags?.changeRequestReject
-                                        )}
-                                        show={
-                                            <MenuItem onClick={onReject}>
-                                                <ListItemIcon>
-                                                    <Clear fontSize="small" />
-                                                </ListItemIcon>
-                                                <ListItemText>
-                                                    Reject changes
-                                                </ListItemText>
-                                            </MenuItem>
-                                        }
-                                    />
+                                    <MenuItem onClick={onReject}>
+                                        <ListItemIcon>
+                                            <Clear fontSize="small" />
+                                        </ListItemIcon>
+                                        <ListItemText>
+                                            Reject changes
+                                        </ListItemText>
+                                    </MenuItem>
                                 </MenuList>
                             </ClickAwayListener>
                         </Paper>

diff --git a/frontend/src/component/segments/EditSegment/EditSegment.tsx b/frontend/src/component/segments/EditSegment/EditSegment.tsx
@@ -76,16 +76,14 @@ export const EditSegment = ({ modal }: IEditSegmentProps) => {
     const highestPermissionChangeRequestEnv =
         useHighestPermissionChangeRequestEnvironment(segment?.project);
     const changeRequestEnv = highestPermissionChangeRequestEnv();
-    const activateSegmentChangeRequests =
-        uiConfig?.flags?.segmentChangeRequests && changeRequestEnv;
     const { addChange } = useChangeRequestApi();
 
     const handleSubmit = async (e: React.FormEvent) => {
         if (segment) {
             e.preventDefault();
             clearErrors();
             try {
-                if (activateSegmentChangeRequests) {
+                if (changeRequestEnv) {
                     await addChange(segment.project || '', changeRequestEnv, {
                         action: 'updateSegment',
                         feature: null,
@@ -102,9 +100,7 @@ export const EditSegment = ({ modal }: IEditSegmentProps) => {
                 }
                 setToastData({
                     title: `Segment ${
-                        activateSegmentChangeRequests
-                            ? 'change added to draft'
-                            : 'updated'
+                        changeRequestEnv ? 'change added to draft' : 'updated'
                     }`,
                     type: 'success',
                 });
@@ -143,7 +139,7 @@ export const EditSegment = ({ modal }: IEditSegmentProps) => {
                     disabled={!hasValidConstraints || overSegmentValuesLimit}
                     data-testid={SEGMENT_SAVE_BTN_ID}
                 >
-                    {activateSegmentChangeRequests ? 'Add to draft' : 'Save'}
+                    {changeRequestEnv ? 'Add to draft' : 'Save'}
                 </UpdateButton>
             </SegmentForm>
         </FormTemplate>

diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
@@ -52,8 +52,6 @@ export interface IFlags {
     advancedPlayground?: boolean;
     customRootRolesKillSwitch?: boolean;
     strategyVariant?: boolean;
-    segmentChangeRequests?: boolean;
-    changeRequestReject?: boolean;
     lastSeenByEnvironment?: boolean;
     newApplicationList?: boolean;
     integrationsRework?: boolean;

diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -70,7 +70,6 @@ exports[`should create default config 1`] = `
     "flags": {
       "anonymiseEventLog": false,
       "caseInsensitiveInOperators": false,
-      "changeRequestReject": false,
       "customRootRolesKillSwitch": false,
       "demo": false,
       "disableBulkToggle": false,
@@ -97,7 +96,6 @@ exports[`should create default config 1`] = `
       "personalAccessTokensKillSwitch": false,
       "proPlanAutoCharge": false,
       "responseTimeWithAppNameKillSwitch": false,
-      "segmentChangeRequests": false,
       "slackAppAddon": false,
       "strategyVariant": false,
       "strictSchemaValidation": false,
@@ -107,7 +105,6 @@ exports[`should create default config 1`] = `
     "experiments": {
       "anonymiseEventLog": false,
       "caseInsensitiveInOperators": false,
-      "changeRequestReject": false,
       "customRootRolesKillSwitch": false,
       "demo": false,
       "disableBulkToggle": false,
@@ -134,7 +131,6 @@ exports[`should create default config 1`] = `
       "personalAccessTokensKillSwitch": false,
       "proPlanAutoCharge": false,
       "responseTimeWithAppNameKillSwitch": false,
-      "segmentChangeRequests": false,
       "slackAppAddon": false,
       "strategyVariant": false,
       "strictSchemaValidation": false,

diff --git a/src/lib/services/segment-service.ts b/src/lib/services/segment-service.ts
@@ -104,10 +104,8 @@ export class SegmentService implements ISegmentService {
     }
 
     async update(id: number, data: unknown, user: User): Promise<void> {
-        if (this.flagResolver.isEnabled('segmentChangeRequests')) {
-            const input = await segmentSchema.validateAsync(data);
-            await this.stopWhenChangeRequestsEnabled(input.project, user);
-        }
+        const input = await segmentSchema.validateAsync(data);
+        await this.stopWhenChangeRequestsEnabled(input.project, user);
         return this.unprotectedUpdate(id, data, user);
     }
 
@@ -138,9 +136,7 @@ export class SegmentService implements ISegmentService {
 
     async delete(id: number, user: User): Promise<void> {
         const segment = await this.segmentStore.get(id);
-        if (this.flagResolver.isEnabled('segmentChangeRequests')) {
-            await this.stopWhenChangeRequestsEnabled(segment.project, user);
-        }
+        await this.stopWhenChangeRequestsEnabled(segment.project, user);
         await this.segmentStore.delete(id);
         await this.eventStore.store({
             type: SEGMENT_DELETED,

diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
@@ -24,8 +24,6 @@ export type IFlagKey =
     | 'slackAppAddon'
     | 'filterInvalidClientMetrics'
     | 'lastSeenByEnvironment'
-    | 'segmentChangeRequests'
-    | 'changeRequestReject'
     | 'customRootRolesKillSwitch'
     | 'newApplicationList'
     | 'integrationsRework'
@@ -115,14 +113,6 @@ const flags: IFlags = {
         process.env.LAST_SEEN_BY_ENVIRONMENT,
         false,
     ),
-    segmentChangeRequests: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_SEGMENT_CHANGE_REQUESTS,
-        false,
-    ),
-    changeRequestReject: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_CHANGE_REQUEST_REJECT,
-        false,
-    ),
     customRootRolesKillSwitch: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_CUSTOM_ROOT_ROLES_KILL_SWITCH,
         false,

diff --git a/src/server-dev.ts b/src/server-dev.ts
@@ -40,7 +40,6 @@ process.nextTick(async () => {
                         strategyVariant: true,
                         slackAppAddon: true,
                         lastSeenByEnvironment: true,
-                        segmentChangeRequests: true,
                         newApplicationList: true,
                         doraMetrics: true,
                         instanceHealthDashboard: true,