Skip to content

Commit 91ed8a6

Browse files
authored
feat: remove deploy and revert changes buttons (#493)
* feat: update edit workload function * feat: remove sidebar deploy&revert buttons * feat: update delete loading button & api endpoints * feat: update snack messages * fix: session snack message * fix: setDirty state on error
1 parent a144e9f commit 91ed8a6

File tree

11 files changed

+47
-378
lines changed

11 files changed

+47
-378
lines changed

src/components/DeleteButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function ({ loading, disabled, ...other }: DeleteButtonProps): Re
2626
}
2727
return (
2828
<>
29-
{dialogOpen && <DeleteDialog onCancel={onDialogCancel} {...other} />}
29+
{dialogOpen && <DeleteDialog onCancel={onDialogCancel} loading={loading} {...other} />}
3030
<LoadingButton
3131
disabled={disabled}
3232
startIcon={<DeleteIcon />}

src/components/DeleteDialog.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import DeleteIcon from '@mui/icons-material/Delete'
2-
import Button from '@mui/material/Button'
32
import Dialog from '@mui/material/Dialog'
43
import DialogActions from '@mui/material/DialogActions'
54
import DialogContent from '@mui/material/DialogContent'
@@ -8,13 +7,15 @@ import DialogTitle from '@mui/material/DialogTitle'
87
import TextField from '@mui/material/TextField'
98
import React, { useState } from 'react'
109
import { useTranslation } from 'react-i18next'
10+
import { LoadingButton } from '@mui/lab'
1111

1212
interface DeleteDialogProps {
1313
onCancel: () => void
1414
onDelete: () => void
1515
resourceName: string
1616
resourceType: string
1717
customContent?: string
18+
loading: boolean
1819
}
1920

2021
export default function ({
@@ -23,6 +24,7 @@ export default function ({
2324
resourceName,
2425
resourceType,
2526
customContent,
27+
loading,
2628
}: DeleteDialogProps): React.ReactElement {
2729
const [buttonDisabled, setButtonDisabled] = useState(true)
2830
const { t } = useTranslation()
@@ -49,12 +51,19 @@ export default function ({
4951
/>
5052
</DialogContent>
5153
<DialogActions>
52-
<Button onClick={onCancel} data-cy='button-cancel-delete'>
54+
<LoadingButton loading={loading} onClick={onCancel} data-cy='button-cancel-delete' variant='outlined'>
5355
Cancel
54-
</Button>
55-
<Button disabled={buttonDisabled} onClick={onDelete} startIcon={<DeleteIcon />} data-cy='button-confirm-delete'>
56+
</LoadingButton>
57+
<LoadingButton
58+
loading={loading}
59+
disabled={buttonDisabled}
60+
onClick={onDelete}
61+
startIcon={<DeleteIcon />}
62+
data-cy='button-confirm-delete'
63+
variant='outlined'
64+
>
5665
Delete
57-
</Button>
66+
</LoadingButton>
5867
</DialogActions>
5968
</Dialog>
6069
)

src/components/MessageDrone.tsx

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/components/NavConfig.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ export default function NavConfig() {
2020
}
2121
const anchor = ca ? generateDownloadLink(downloadOpts) : ''
2222
return [
23-
{
24-
subheader: 'actions',
25-
items: [
26-
{ title: 'Deploy Changes', path: '/deploychanges', icon: getIcon('deploy_icon.svg') },
27-
{ title: 'Revert Changes', path: '/revertchanges', icon: getIcon('revert_icon.svg') },
28-
],
29-
},
3023
{
3124
subheader: 'platform',
3225
items: [

src/components/SidebarDeployButton.tsx

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/components/SidebarItem.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,12 @@ import { NavItemProps } from './SidebarTypes'
99
//
1010
import Iconify from './Iconify'
1111
import { ListItemIconStyle, ListItemStyle, ListItemStyleProps, ListItemTextStyle } from './SidebarStyle'
12-
import SidebarDeployButton from './SidebarDeployButton'
13-
import SidebarRevertButton from './SidebarRevertButton'
1412
import SidebarShellButton from './SidebarShellButton'
1513

1614
// ----------------------------------------------------------------------
1715

1816
// HANDLE SHOW ITEM BY ROLE
1917
const ListItem = forwardRef<HTMLDivElement & HTMLAnchorElement, ListItemStyleProps>((props, ref) => (
20-
// <RoleBasedGuard roles={props.roles}>
21-
22-
// </RoleBasedGuard>
2318
<ListItemStyle {...props} ref={ref}>
2419
{props.children}
2520
</ListItemStyle>
@@ -66,8 +61,6 @@ export function SidebarItemRoot({ item, isCollapse, open = false, active, onOpen
6661
)
6762
}
6863

69-
if (title === 'Deploy Changes') return <SidebarDeployButton item={item}>{renderContent}</SidebarDeployButton>
70-
if (title === 'Revert Changes') return <SidebarRevertButton item={item}>{renderContent}</SidebarRevertButton>
7164
if (title === 'Shell') {
7265
return (
7366
<SidebarShellButton disabled={disabled} item={item}>

src/components/SidebarRevertButton.tsx

Lines changed: 0 additions & 89 deletions
This file was deleted.

src/pages/Catalog.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import {
99
useCreateWorkloadMutation,
1010
useDeleteWorkloadMutation,
1111
useEditWorkloadMutation,
12+
useEditWorkloadValuesMutation,
1213
useGetWorkloadQuery,
1314
useGetWorkloadValuesQuery,
14-
useUpdateWorkloadValuesMutation,
1515
useWorkloadCatalogMutation,
1616
} from 'redux/otomiApi'
1717

@@ -46,7 +46,7 @@ export default function ({
4646
isError: isErrorValues,
4747
refetch: refetchValues,
4848
} = useGetWorkloadValuesQuery({ teamId, workloadId }, { skip: !workloadId })
49-
const [updateValues] = useUpdateWorkloadValuesMutation()
49+
const [updateWorkloadValues] = useEditWorkloadValuesMutation()
5050

5151
const [getWorkloadCatalog, { isLoading: isLoadingCatalog }] = useWorkloadCatalogMutation()
5252
const [catalogItem, setCatalogItem] = useState<any>({})
@@ -102,7 +102,7 @@ export default function ({
102102
createWorkload={createWorkload}
103103
updateWorkload={updateWorkload}
104104
deleteWorkload={deleteWorkload}
105-
updateWorkloadValues={updateValues}
105+
updateWorkloadValues={updateWorkloadValues}
106106
mutating={mutating}
107107
readme={readme}
108108
/>

0 commit comments

Comments
 (0)