Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-05-17 01:17:29 +02:00
Code Issues Projects Releases Wiki Activity

fix: delete project segment with change request (#9315)

Browse Source
This commit is contained in:
Mateusz Kwasniewski 2025-02-17 10:41:56 +01:00 committed by GitHub
parent 3f730bb7f3
commit b207606800
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx
View File

@ -59,6 +59,10 @@ export const SegmentChangeDetails: FC<{
}> = ({ actions, change, changeRequestState }) => {
const { segment: currentSegment } = useSegment(change.payload.id);
const snapshotSegment = change.payload.snapshot;
const previousName =
changeRequestState === 'Applied'
? change.payload?.snapshot?.name
: currentSegment?.name;
const referenceSegment =
changeRequestState === 'Applied' ? snapshotSegment : currentSegment;
@ -74,10 +78,13 @@ export const SegmentChangeDetails: FC<{
>
- Deleting segment:
</Typography>
<SegmentTooltipLink change={change}>
<SegmentTooltipLink
name={change.payload.name}
previousName={previousName}
>
<SegmentDiff
change={change}
currentSegment={currentSegment}
currentSegment={referenceSegment}
/>
</SegmentTooltipLink>
</ChangeItemInfo>
@ -97,7 +104,7 @@ export const SegmentChangeDetails: FC<{
<ChangeItemCreateEditWrapper>
<ChangeItemInfo>
<Typography>Editing segment:</Typography>
<SegmentTooltipLink change={change}>
<SegmentTooltipLink name={change.payload.name}>
<SegmentDiff
change={change}
currentSegment={referenceSegment}

11
frontend/src/component/changeRequest/ChangeRequest/SegmentTooltipLink.tsx
View File

@ -42,8 +42,9 @@ export const SegmentDiff: FC<{
);
};
interface IStrategyTooltipLinkProps {
change: IChangeRequestUpdateSegment | IChangeRequestDeleteSegment;
children?: React.ReactNode;
name?: string;
previousName?: string;
}
const StyledContainer: FC<{ children?: React.ReactNode }> = styled('div')(
@ -68,15 +69,13 @@ const Truncated = styled('div')(() => ({
}));
export const SegmentTooltipLink: FC<IStrategyTooltipLinkProps> = ({
change,
name,
previousName,
children,
}) => (
<StyledContainer>
<Truncated>
<NameWithChangeInfo
previousName={change.name}
newName={change.payload.name}
/>
<NameWithChangeInfo previousName={previousName} newName={name} />
<TooltipLink
tooltip={children}
tooltipProps={{

22
frontend/src/component/segments/RemoveSegmentButton/RemoveSegmentButton.tsx
View File

@ -14,6 +14,8 @@ import { useSegmentsApi } from 'hooks/api/actions/useSegmentsApi/useSegmentsApi'
import { formatUnknownError } from 'utils/formatUnknownError';
import { useState } from 'react';
import { useOptionalPathParam } from 'hooks/useOptionalPathParam';
import { useHighestPermissionChangeRequestEnvironment } from 'hooks/useHighestPermissionChangeRequestEnvironment';
import { useChangeRequestApi } from 'hooks/api/actions/useChangeRequestApi/useChangeRequestApi';
interface IRemoveSegmentButtonProps {
segment: ISegment;
@ -25,14 +27,29 @@ export const RemoveSegmentButton = ({ segment }: IRemoveSegmentButtonProps) => {
const { deleteSegment } = useSegmentsApi();
const { setToastData, setToastApiError } = useToast();
const [showModal, toggleModal] = useState(false);
const highestPermissionChangeRequestEnv =
useHighestPermissionChangeRequestEnvironment(segment?.project);
const changeRequestEnv = highestPermissionChangeRequestEnv();
const { addChange } = useChangeRequestApi();
const onRemove = async () => {
try {
await deleteSegment(segment.id);
if (changeRequestEnv && segment.project) {
await addChange(segment.project, changeRequestEnv, {
action: 'deleteSegment',
feature: null,
payload: { id: segment.id },
});
} else {
await deleteSegment(segment.id);
}
await refetchSegments();
setToastData({
text: `Segment ${
changeRequestEnv ? 'change added to draft' : 'deleted'
}`,
type: 'success',
text: 'Segment deleted',
});
} catch (error: unknown) {
setToastApiError(formatUnknownError(error));
@ -60,6 +77,7 @@ export const RemoveSegmentButton = ({ segment }: IRemoveSegmentButtonProps) => {
open={showModal}
onClose={() => toggleModal(false)}
onRemove={onRemove}
title={changeRequestEnv ? 'Add to draft' : 'Save'}
/>
)}
/>

3
frontend/src/component/segments/SegmentDelete/SegmentDelete.tsx
View File

@ -9,6 +9,7 @@ interface ISegmentDeleteProps {
open: boolean;
onClose: () => void;
onRemove: () => void;
title: string;
}
export const SegmentDelete = ({
@ -16,6 +17,7 @@ export const SegmentDelete = ({
open,
onClose,
onRemove,
title,
}: ISegmentDeleteProps) => {
const { strategies, changeRequestStrategies, loading } =
useStrategiesBySegment(segment.id);
@ -34,6 +36,7 @@ export const SegmentDelete = ({
open={open}
onClose={onClose}
onRemove={onRemove}
title={title}
/>
}
elseShow={

4
frontend/src/component/segments/SegmentDelete/SegmentDeleteConfirm/SegmentDeleteConfirm.tsx
View File

@ -15,6 +15,7 @@ interface ISegmentDeleteConfirmProps {
open: boolean;
onClose: () => void;
onRemove: () => void;
title: string;
}
export const SegmentDeleteConfirm = ({
@ -22,6 +23,7 @@ export const SegmentDeleteConfirm = ({
open,
onClose,
onRemove,
title,
}: ISegmentDeleteConfirmProps) => {
const [confirmName, setConfirmName] = useState('');
@ -37,7 +39,7 @@ export const SegmentDeleteConfirm = ({
<Dialogue
title='Are you sure you want to delete this segment?'
open={open}
primaryButtonText='Delete segment'
primaryButtonText={title}
secondaryButtonText='Cancel'
onClick={() => {
onRemove();

1
frontend/src/hooks/api/actions/useChangeRequestApi/useChangeRequestApi.ts
View File

@ -16,6 +16,7 @@ export interface IChangeSchema {
| 'reorderStrategy'
| 'archiveFeature'
| 'updateSegment'
| 'deleteSegment'
| 'addDependency'
| 'deleteDependency'
| 'addReleasePlan'