diff --git a/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.test.tsx b/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.test.tsx index 8523ae94c7..3e7b94ea31 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.test.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/ChangeRequest.test.tsx @@ -18,9 +18,6 @@ const uiConfigForEnterprise = () => versionInfo: { current: { oss: 'version', enterprise: 'version' }, }, - flags: { - scheduledConfigurationChanges: true, - }, }); const featureWithStrategyVariants = () => diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.test.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.test.tsx index e7f0de932d..91264801a8 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.test.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.test.tsx @@ -142,9 +142,6 @@ const uiConfig = () => { versionInfo: { current: { oss: 'version', enterprise: 'version' }, }, - flags: { - scheduledConfigurationChanges: true, - }, }); }; diff --git a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx index d0d87ab115..877eda35bc 100644 --- a/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx +++ b/frontend/src/component/changeRequest/ChangeRequestOverview/ChangeRequestOverview.tsx @@ -28,7 +28,6 @@ import { changesCount } from '../changesCount'; import { ChangeRequestReviewers } from './ChangeRequestReviewers/ChangeRequestReviewers'; import { ChangeRequestRejectDialogue } from './ChangeRequestRejectDialog/ChangeRequestRejectDialog'; import { ApplyButton } from './ApplyButton/ApplyButton'; -import { useUiFlag } from 'hooks/useUiFlag'; import { ChangeRequestApplyScheduledDialogue, ChangeRequestRejectScheduledDialogue, @@ -103,7 +102,6 @@ export const ChangeRequestOverview: FC = () => { const { setToastData, setToastApiError } = useToast(); const { isChangeRequestConfiguredForReview } = useChangeRequestsEnabled(projectId); - const scheduleChangeRequests = useUiFlag('scheduledConfigurationChanges'); const [disabled, setDisabled] = useState(false); if (!changeRequest) { @@ -383,51 +381,22 @@ export const ChangeRequestOverview: FC = () => { - setShowScheduleChangeDialog( - true, - ) - } - > - Apply or schedule changes - + - Apply changes - + onSchedule={() => + setShowScheduleChangeDialog(true) } - /> + > + Apply or schedule changes + } /> @@ -457,10 +426,7 @@ export const ChangeRequestOverview: FC = () => { } show={ { onClose={onCancelReject} disabled={disabled} /> - - - - - - } - /> + <> + + + + ); diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyDraggableItem.test.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyDraggableItem.test.tsx index 6b35012d50..e89df305ab 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyDraggableItem.test.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/EnvironmentAccordionBody/StrategyDraggableItem/StrategyDraggableItem.test.tsx @@ -100,9 +100,6 @@ const uiConfig = () => { versionInfo: { current: { oss: 'version', enterprise: 'version' }, }, - flags: { - scheduledConfigurationChanges: true, - }, }); }; diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsCard/EnvironmentVariantsCard.test.tsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsCard/EnvironmentVariantsCard.test.tsx index 2478703c6e..6feea11bca 100644 --- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsCard/EnvironmentVariantsCard.test.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsCard/EnvironmentVariantsCard.test.tsx @@ -93,9 +93,6 @@ const uiConfig = () => { versionInfo: { current: { oss: 'version', enterprise: 'version' }, }, - flags: { - scheduledConfigurationChanges: true, - }, }); }; diff --git a/frontend/src/component/project/Project/ProjectSettings/ChangeRequestConfiguration/ChangeRequestProcessHelp/ChangeRequestProcessHelp.tsx b/frontend/src/component/project/Project/ProjectSettings/ChangeRequestConfiguration/ChangeRequestProcessHelp/ChangeRequestProcessHelp.tsx index f973a754ed..3a58366429 100644 --- a/frontend/src/component/project/Project/ProjectSettings/ChangeRequestConfiguration/ChangeRequestProcessHelp/ChangeRequestProcessHelp.tsx +++ b/frontend/src/component/project/Project/ProjectSettings/ChangeRequestConfiguration/ChangeRequestProcessHelp/ChangeRequestProcessHelp.tsx @@ -21,9 +21,6 @@ export const ChangeRequestProcessHelp: VFC = const theme = useTheme(); const isSmallScreen = useMediaQuery(theme.breakpoints.down('md')); const [isOpen, setIsOpen] = useState(false); - const showScheduleInformation = useUiFlag( - 'scheduledConfigurationChanges', - ); const descriptionId = 'change-request-process-description'; @@ -96,129 +93,77 @@ export const ChangeRequestProcessHelp: VFC = - + <> +
  • + Once approved, a user with the{' '} + + “Apply/Reject change request” + {' '} + permission can apply, schedule, or + reject the changes. +
    • - Once approved, a user with the{' '} - - “Apply/Reject change - request” - {' '} - permission can apply, schedule, - or reject the changes. -
        -
      • - If applied, the changes - will take effect and the - change request will be - closed. -
        • -
      • - If scheduled, Unleash - will attempt to apply - the changes at the - scheduled date and time. -
        • -
      • - The user who created the - change request can - cancel the changes up - until they are applied - or scheduled. -
        • -
      + If applied, the changes will + take effect and the change + request will be closed.
    • - A user with the{' '} - - “Apply/Reject change - request” - {' '} - permission can reschedule, - reject, or immediately apply a - scheduled change request. -
        -
      • - If any of the flags or - strategies in the change - request are archived or - deleted (outside of the - change request), thus - creating a conflict, - Unleash will send an - email out to the change - request author and to - the user who (last) - scheduled the change - request. -
        • -
      • - If the scheduled changes - contain any conflicts, - Unleash will refuse to - apply them. -
        • -
      • - If the user who - scheduled the changes is - removed from this - Unleash instance, the - scheduled changes will - also not be applied. -
        • -
      + If scheduled, Unleash will + attempt to apply the changes at + the scheduled date and time.
      • - - } - elseShow={ -
    • - Once approved, a user with the{' '} - - “Apply/Reject change request” - {' '} - permission can apply or reject the - changes. -
        -
      • - Once applied, the changes - will take effect and the - change request will be - closed. -
        • -
      • - The user who created the - change request can cancel - the changes up until they - are applied. -
        • -
      -
      • - } - /> +
    • + The user who created the change + request can cancel the changes + up until they are applied or + scheduled. +
      • +
    +
    • +
  • + A user with the{' '} + + “Apply/Reject change request” + {' '} + permission can reschedule, reject, or + immediately apply a scheduled change + request. +
      +
    • + If any of the flags or + strategies in the change request + are archived or deleted (outside + of the change request), thus + creating a conflict, Unleash + will send an email out to the + change request author and to the + user who (last) scheduled the + change request. +
      • +
    • + If the scheduled changes contain + any conflicts, Unleash will + refuse to apply them. +
      • +
    • + If the user who scheduled the + changes is removed from this + Unleash instance, the scheduled + changes will also not be + applied. +
      • +
    +
    • + - - } - elseShow={ - - } + diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 0c1a6603eb..0938376b79 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -62,7 +62,6 @@ export type UiFlags = { strategyVariant?: boolean; doraMetrics?: boolean; dependentFeatures?: boolean; - scheduledConfigurationChanges?: boolean; newStrategyConfiguration?: boolean; incomingWebhooks?: boolean; automatedActions?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index f573a3a4a2..1037a9e542 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -133,7 +133,6 @@ exports[`should create default config 1`] = ` "personalAccessTokensKillSwitch": false, "proPlanAutoCharge": false, "responseTimeWithAppNameKillSwitch": false, - "scheduledConfigurationChanges": false, "scimApi": false, "sdkReporting": false, "showInactiveUsers": false, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index ff019e0920..1ed54f9df1 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -26,7 +26,6 @@ export type IFlagKey = | 'advancedPlayground' | 'filterInvalidClientMetrics' | 'disableMetrics' - | 'scheduledConfigurationChanges' | 'stripClientHeadersOn304' | 'stripHeadersOnAPI' | 'incomingWebhooks' @@ -130,10 +129,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_DISABLE_METRICS, false, ), - scheduledConfigurationChanges: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_SCHEDULED_CONFIGURATION_CHANGES, - false, - ), stripClientHeadersOn304: parseEnvVarBoolean( process.env .UNLEASH_EXPERIMENTAL_DETECT_SEGMENT_USAGE_IN_CHANGE_REQUESTS,