chore(AI): changeRequestApproverEmails flag cleanup (#10572)

frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx

@@ -31,7 +31,6 @@ import { usePendingChangeRequests } from 'hooks/api/getters/usePendingChangeRequ
 import { useChangeRequestsEnabled } from 'hooks/useChangeRequestsEnabled';
 import { Dialogue } from 'component/common/Dialogue/Dialogue';
 import { changesCount } from '../changesCount.ts';
-import { ChangeRequestReviewers } from './ChangeRequestReviewers/ChangeRequestReviewers.tsx';
 import { ChangeRequestRejectDialogue } from './ChangeRequestRejectDialog/ChangeRequestRejectDialog.tsx';
 import { ApplyButton } from './ApplyButton/ApplyButton.tsx';
 import {
@@ -42,7 +41,6 @@ import { ScheduleChangeRequestDialog } from './ChangeRequestScheduledDialogs/Sch
 import type { PlausibleChangeRequestState } from '../changeRequest.types';
 import { useNavigate } from 'react-router-dom';
 import { useActionableChangeRequests } from 'hooks/api/getters/useActionableChangeRequests/useActionableChangeRequests';
-import { useUiFlag } from 'hooks/useUiFlag.ts';
 import { ChangeRequestRequestedApprovers } from './ChangeRequestRequestedApprovers/ChangeRequestRequestedApprovers.tsx';
 
 const breakpoint = 'md';
@@ -166,7 +164,6 @@ export const ChangeRequestOverview: FC = () => {
         useChangeRequestsEnabled(projectId);
     const [disabled, setDisabled] = useState(false);
     const navigate = useNavigate();
-    const approversEnabled = useUiFlag('changeRequestApproverEmails');
     const theme = useTheme();
 
     if (!changeRequest) {
@@ -353,18 +350,8 @@ export const ChangeRequestOverview: FC = () => {
                         {...timelineProps}
                         timestamps={changeRequest.stateTimestamps}
                     />
-                    <ConditionallyRender
+                    <ChangeRequestRequestedApprovers
-                        condition={approversEnabled}
+                        changeRequest={changeRequest}
-                        show={
-                            <ChangeRequestRequestedApprovers
-                                changeRequest={changeRequest}
-                            />
-                        }
-                        elseShow={
-                            <ChangeRequestReviewers
-                                changeRequest={changeRequest}
-                            />
-                        }
                     />
                 </StyledAsideBox>
                 <StyledDiv>
@@ -441,28 +428,6 @@ export const ChangeRequestOverview: FC = () => {
                                     }
                                 />
 
-                                <ConditionallyRender
-                                    condition={
-                                        changeRequest.state === 'Approved' &&
-                                        !approversEnabled
-                                    }
-                                    show={
-                                        <ApplyButton
-                                            onApply={onApplyChanges}
-                                            disabled={
-                                                !allowChangeRequestActions ||
-                                                disabled
-                                            }
-                                            onSchedule={() =>
-                                                setShowScheduleChangeDialog(
-                                                    true,
-                                                )
-                                            }
-                                        >
-                                            Apply or schedule changes
-                                        </ApplyButton>
-                                    }
-                                />
                                 <ConditionallyRender
                                     condition={
                                         changeRequest.state === 'Scheduled'
@@ -551,10 +516,7 @@ export const ChangeRequestOverview: FC = () => {
                         </StyledInnerContainer>
                     </StyledPaper>
                     <ConditionallyRender
-                        condition={
+                        condition={changeRequest.state === 'Approved'}
-                            changeRequest.state === 'Approved' &&
-                            approversEnabled
-                        }
                         show={
                             <StyledApplyPaper elevation={0}>
                                 <StyledApplyInnerContainer>

frontend/src/component/changeRequest/ChangeRequestSidebar/EnvironmentChangeRequest/EnvironmentChangeRequest.tsx

@@ -24,7 +24,6 @@ import Input from 'component/common/Input/Input';
 import { ChangeRequestTitle } from './ChangeRequestTitle.tsx';
 import { UpdateCount } from 'component/changeRequest/UpdateCount';
 import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi';
-import { useUiFlag } from 'hooks/useUiFlag';
 import { DraftChangeRequestActions } from '../DraftChangeRequestActions/DraftChangeRequestActions.tsx';
 import type { AvailableReviewerSchema } from 'hooks/api/getters/useAvailableChangeRequestReviewers/useAvailableChangeRequestReviewers.ts';
 
@@ -78,7 +77,6 @@ export const EnvironmentChangeRequest: FC<{
     const [reviewers, setReviewers] = useState<AvailableReviewerSchema[]>([]);
 
     const [disabled, setDisabled] = useState(false);
-    const approversEnabled = useUiFlag('changeRequestApproverEmails');
     const sendToReview = async (project: string) => {
         setDisabled(true);
         try {
@@ -167,49 +165,17 @@ export const EnvironmentChangeRequest: FC<{
                     <ConditionallyRender
                         condition={environmentChangeRequest?.state === 'Draft'}
                         show={
-                            <ConditionallyRender
+                            <DraftChangeRequestActions
-                                condition={approversEnabled}
+                                environmentChangeRequest={
-                                show={
+                                    environmentChangeRequest
-                                    <DraftChangeRequestActions
-                                        environmentChangeRequest={
-                                            environmentChangeRequest
-                                        }
-                                        reviewers={reviewers}
-                                        setReviewers={setReviewers}
-                                        onReview={onReview}
-                                        onDiscard={onDiscard}
-                                        sendToReview={sendToReview}
-                                        disabled={disabled}
-                                        setDisabled={setDisabled}
-                                    />
-                                }
-                                elseShow={
-                                    <>
-                                        <SubmitChangeRequestButton
-                                            onClick={() =>
-                                                onReview(sendToReview)
-                                            }
-                                            count={changesCount(
-                                                environmentChangeRequest,
-                                            )}
-                                            disabled={disabled}
-                                        />
-
-                                        <Button
-                                            sx={{ ml: 2 }}
-                                            variant='outlined'
-                                            disabled={disabled}
-                                            onClick={() => {
-                                                setDisabled(true);
-                                                onDiscard(
-                                                    environmentChangeRequest.id,
-                                                );
-                                            }}
-                                        >
-                                            Discard changes
-                                        </Button>
-                                    </>
                                 }
+                                reviewers={reviewers}
+                                setReviewers={setReviewers}
+                                onReview={onReview}
+                                onDiscard={onDiscard}
+                                sendToReview={sendToReview}
+                                disabled={disabled}
+                                setDisabled={setDisabled}
                             />
                         }
                     />

frontend/src/interfaces/uiConfig.ts

@@ -86,7 +86,6 @@ export type UiFlags = {
     edgeObservability?: boolean;
     customMetrics?: boolean;
     impactMetrics?: boolean;
-    changeRequestApproverEmails?: boolean;
     reportUnknownFlags?: boolean;
     lifecycleGraphs?: boolean;
     addConfiguration?: boolean;

src/lib/types/experimental.ts

@@ -55,7 +55,6 @@ export type IFlagKey =
     | 'reportUnknownFlags'
     | 'customMetrics'
     | 'impactMetrics'
-    | 'changeRequestApproverEmails'
     | 'lifecycleGraphs'
     | 'addConfiguration'
     | 'etagByEnv'
@@ -251,10 +250,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_REPORT_UNKNOWN_FLAGS,
         false,
     ),
-    changeRequestApproverEmails: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_CHANGE_REQUEST_APPROVER_EMAILS,
-        false,
-    ),
     impactMetrics: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_IMPACT_METRICS,
         false,