mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	chore: remove changeRequestConflictHandling flag (#6364)
What it says on the tin Signed-off-by: andreas-unleash <andreas@getunleash.ai>
This commit is contained in:
		
							parent
							
								
									96c86b221b
								
							
						
					
					
						commit
						74c760bf4c
					
				| @ -4,7 +4,6 @@ import { | ||||
|     IChangeRequestUpdateSegment, | ||||
|     IChangeRequestUpdateStrategy, | ||||
| } from 'component/changeRequest/changeRequest.types'; | ||||
| import { useUiFlag } from 'hooks/useUiFlag'; | ||||
| import { IFeatureVariant } from 'interfaces/featureToggle'; | ||||
| import { ISegment } from 'interfaces/segment'; | ||||
| import { IFeatureStrategy } from 'interfaces/strategy'; | ||||
| @ -36,11 +35,6 @@ export const ChangeOverwriteWarning: React.FC<{ | ||||
|     data: ChangeData; | ||||
|     changeRequestState: ChangeRequestState; | ||||
| }> = ({ data, changeRequestState }) => { | ||||
|     const checkForChanges = useUiFlag('changeRequestConflictHandling'); | ||||
|     if (!checkForChanges) { | ||||
|         return null; | ||||
|     } | ||||
| 
 | ||||
|     const getChangesThatWouldBeOverwritten = () => { | ||||
|         switch (data.changeType) { | ||||
|             case 'segment': | ||||
|  | ||||
| @ -15,8 +15,6 @@ import { formatUnknownError } from 'utils/formatUnknownError'; | ||||
| import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; | ||||
| import Paper from '@mui/material/Paper'; | ||||
| import { ReviewButton } from './ReviewButton/ReviewButton'; | ||||
| import PermissionButton from 'component/common/PermissionButton/PermissionButton'; | ||||
| import { APPLY_CHANGE_REQUEST } from 'component/providers/AccessProvider/permissions'; | ||||
| import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser'; | ||||
| import AccessContext from 'contexts/AccessContext'; | ||||
| import { ChangeRequestComment } from './ChangeRequestComments/ChangeRequestComment'; | ||||
|  | ||||
| @ -1,12 +1,5 @@ | ||||
| import { useMemo, useState, VFC } from 'react'; | ||||
| import { | ||||
|     Box, | ||||
|     styled, | ||||
|     Typography, | ||||
|     useMediaQuery, | ||||
|     useTheme, | ||||
| } from '@mui/material'; | ||||
| import { PageHeader } from 'component/common/PageHeader/PageHeader'; | ||||
| import { Box, styled, useMediaQuery, useTheme } from '@mui/material'; | ||||
| import { UsersChart } from './UsersChart/UsersChart'; | ||||
| import { FlagsChart } from './FlagsChart/FlagsChart'; | ||||
| import { useExecutiveDashboard } from 'hooks/api/getters/useExecutiveSummary/useExecutiveSummary'; | ||||
| @ -24,7 +17,6 @@ import { | ||||
|     ExecutiveSummarySchemaProjectFlagTrendsItem, | ||||
| } from 'openapi'; | ||||
| import { HealthStats } from './HealthStats/HealthStats'; | ||||
| import { Badge } from 'component/common/Badge/Badge'; | ||||
| import { DashboardHeader } from './DashboardHeader/DashboardHeader'; | ||||
| 
 | ||||
| const StyledGrid = styled(Box)(({ theme }) => ({ | ||||
|  | ||||
| @ -9,8 +9,6 @@ import { | ||||
| } from '@mui/material'; | ||||
| import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; | ||||
| import { HelpOutline } from '@mui/icons-material'; | ||||
| import { ReactComponent as ChangeRequestProcessImage } from 'assets/img/changeRequestProcess.svg'; | ||||
| import { useUiFlag } from 'hooks/useUiFlag'; | ||||
| import { ReactComponent as ChangeRequestProcessWithScheduleImage } from 'assets/img/changeRequestProcessWithSchedule.svg'; | ||||
| 
 | ||||
| type IChangeRequestProcessHelpProps = {}; | ||||
|  | ||||
| @ -73,7 +73,6 @@ export type UiFlags = { | ||||
|     extendedUsageMetricsUI?: boolean; | ||||
|     adminTokenKillSwitch?: boolean; | ||||
|     executiveDashboard?: boolean; | ||||
|     changeRequestConflictHandling?: boolean; | ||||
|     feedbackComments?: Variant; | ||||
|     displayUpgradeEdgeBanner?: boolean; | ||||
|     showInactiveUsers?: boolean; | ||||
|  | ||||
| @ -78,7 +78,6 @@ exports[`should create default config 1`] = ` | ||||
|       "automatedActions": false, | ||||
|       "caseInsensitiveInOperators": false, | ||||
|       "celebrateUnleash": false, | ||||
|       "changeRequestConflictHandling": false, | ||||
|       "collectTrafficDataUsage": false, | ||||
|       "createdByUserIdDataMigration": false, | ||||
|       "demo": false, | ||||
|  | ||||
| @ -39,7 +39,6 @@ export type IFlagKey = | ||||
|     | 'extendedUsageMetrics' | ||||
|     | 'extendedUsageMetricsUI' | ||||
|     | 'adminTokenKillSwitch' | ||||
|     | 'changeRequestConflictHandling' | ||||
|     | 'executiveDashboard' | ||||
|     | 'feedbackComments' | ||||
|     | 'createdByUserIdDataMigration' | ||||
| @ -192,10 +191,6 @@ const flags: IFlags = { | ||||
|         process.env.UNLEASH_EXPERIMENTAL_ADMIN_TOKEN_KILL_SWITCH, | ||||
|         false, | ||||
|     ), | ||||
|     changeRequestConflictHandling: parseEnvVarBoolean( | ||||
|         process.env.UNLEASH_EXPERIMENTAL_CHANGE_REQUEST_CONFLICT_HANDLING, | ||||
|         false, | ||||
|     ), | ||||
|     executiveDashboard: parseEnvVarBoolean( | ||||
|         process.env.UNLEASH_EXPERIMENTAL_EXECUTIVE_DASHBOARD, | ||||
|         false, | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user