github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-19 10:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI [CODE-1216] : Fix modal close and disable side menu on comment deletion (#913)

Browse Source
This commit is contained in:
Ritik Kapoor 2023-12-18 07:15:57 +00:00 committed by Harness
parent 9ea75dd327
commit b24729d608
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/components/CommentBox/CommentBox.tsx
View File

@ -380,12 +380,12 @@ const CommentsThread = <T = unknown,>({
{outlets[CommentBoxOutletPosition.LEFT_OF_OPTIONS_MENU]} {outlets[CommentBoxOutletPosition.LEFT_OF_OPTIONS_MENU]}
</Container> </Container>
</Render> </Render>
<Render when={!commentItem?.deleted}>
<OptionsMenuButton <OptionsMenuButton
isDark={true} isDark={true}
icon="Options" icon="Options"
iconProps={{ size: 14 }} iconProps={{ size: 14 }}
style={{ padding: '5px' }} style={{ padding: '5px' }}
disabled={!!commentItem?.deleted}
width="100px" width="100px"
items={[ items={[
{ {
@ -417,6 +417,7 @@ const CommentsThread = <T = unknown,>({
} }
]} ]}
/> />
</Render>
</Layout.Horizontal> </Layout.Horizontal>
</Layout.Horizontal> </Layout.Horizontal>
} }

3
web/src/hooks/useConfirmationDialog.tsx
View File

@ -83,8 +83,9 @@ export const useConfirmationDialog = (props: UseConfirmationDialogProps): UseCon
const onClose = React.useCallback( const onClose = React.useCallback(
(isConfirmed: boolean): void => { (isConfirmed: boolean): void => {
onCloseDialog?.(isConfirmed) onCloseDialog?.(isConfirmed)
hideModal()
if (persistDialog) showModal()
if (!isConfirmed) hideModal() if (!isConfirmed) hideModal()
else if (persistDialog) showModal()
}, },
[hideModal, onCloseDialog, persistDialog] [hideModal, onCloseDialog, persistDialog]
) )