Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/DeleteButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function ({ loading, disabled, ...other }: DeleteButtonProps): Re
}
return (
<>
{dialogOpen && <DeleteDialog onCancel={onDialogCancel} {...other} />}
{dialogOpen && <DeleteDialog onCancel={onDialogCancel} loading={loading} {...other} />}
<LoadingButton
disabled={disabled}
startIcon={<DeleteIcon />}
Expand Down
19 changes: 14 additions & 5 deletions src/components/DeleteDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import DeleteIcon from '@mui/icons-material/Delete'
import Button from '@mui/material/Button'
import Dialog from '@mui/material/Dialog'
import DialogActions from '@mui/material/DialogActions'
import DialogContent from '@mui/material/DialogContent'
Expand All @@ -8,13 +7,15 @@ import DialogTitle from '@mui/material/DialogTitle'
import TextField from '@mui/material/TextField'
import React, { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { LoadingButton } from '@mui/lab'

interface DeleteDialogProps {
onCancel: () => void
onDelete: () => void
resourceName: string
resourceType: string
customContent?: string
loading: boolean
}

export default function ({
Expand All @@ -23,6 +24,7 @@ export default function ({
resourceName,
resourceType,
customContent,
loading,
}: DeleteDialogProps): React.ReactElement {
const [buttonDisabled, setButtonDisabled] = useState(true)
const { t } = useTranslation()
Expand All @@ -49,12 +51,19 @@ export default function ({
/>
</DialogContent>
<DialogActions>
<Button onClick={onCancel} data-cy='button-cancel-delete'>
<LoadingButton loading={loading} onClick={onCancel} data-cy='button-cancel-delete' variant='outlined'>
Cancel
</Button>
<Button disabled={buttonDisabled} onClick={onDelete} startIcon={<DeleteIcon />} data-cy='button-confirm-delete'>
</LoadingButton>
<LoadingButton
loading={loading}
disabled={buttonDisabled}
onClick={onDelete}
startIcon={<DeleteIcon />}
data-cy='button-confirm-delete'
variant='outlined'
>
Delete
</Button>
</LoadingButton>
</DialogActions>
</Dialog>
)
Expand Down
41 changes: 0 additions & 41 deletions src/components/MessageDrone.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions src/components/NavConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ export default function NavConfig() {
}
const anchor = ca ? generateDownloadLink(downloadOpts) : ''
return [
{
subheader: 'actions',
items: [
{ title: 'Deploy Changes', path: '/deploychanges', icon: getIcon('deploy_icon.svg') },
{ title: 'Revert Changes', path: '/revertchanges', icon: getIcon('revert_icon.svg') },
],
},
{
subheader: 'platform',
items: [
Expand Down
85 changes: 0 additions & 85 deletions src/components/SidebarDeployButton.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions src/components/SidebarItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,12 @@ import { NavItemProps } from './SidebarTypes'
//
import Iconify from './Iconify'
import { ListItemIconStyle, ListItemStyle, ListItemStyleProps, ListItemTextStyle } from './SidebarStyle'
import SidebarDeployButton from './SidebarDeployButton'
import SidebarRevertButton from './SidebarRevertButton'
import SidebarShellButton from './SidebarShellButton'

// ----------------------------------------------------------------------

// HANDLE SHOW ITEM BY ROLE
const ListItem = forwardRef<HTMLDivElement & HTMLAnchorElement, ListItemStyleProps>((props, ref) => (
// <RoleBasedGuard roles={props.roles}>

// </RoleBasedGuard>
<ListItemStyle {...props} ref={ref}>
{props.children}
</ListItemStyle>
Expand Down Expand Up @@ -66,8 +61,6 @@ export function SidebarItemRoot({ item, isCollapse, open = false, active, onOpen
)
}

if (title === 'Deploy Changes') return <SidebarDeployButton item={item}>{renderContent}</SidebarDeployButton>
if (title === 'Revert Changes') return <SidebarRevertButton item={item}>{renderContent}</SidebarRevertButton>
if (title === 'Shell') {
return (
<SidebarShellButton disabled={disabled} item={item}>
Expand Down
89 changes: 0 additions & 89 deletions src/components/SidebarRevertButton.tsx

This file was deleted.

6 changes: 3 additions & 3 deletions src/pages/Catalog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
useCreateWorkloadMutation,
useDeleteWorkloadMutation,
useEditWorkloadMutation,
useEditWorkloadValuesMutation,
useGetWorkloadQuery,
useGetWorkloadValuesQuery,
useUpdateWorkloadValuesMutation,
useWorkloadCatalogMutation,
} from 'redux/otomiApi'

Expand Down Expand Up @@ -46,7 +46,7 @@ export default function ({
isError: isErrorValues,
refetch: refetchValues,
} = useGetWorkloadValuesQuery({ teamId, workloadId }, { skip: !workloadId })
const [updateValues] = useUpdateWorkloadValuesMutation()
const [updateWorkloadValues] = useEditWorkloadValuesMutation()

const [getWorkloadCatalog, { isLoading: isLoadingCatalog }] = useWorkloadCatalogMutation()
const [catalogItem, setCatalogItem] = useState<any>({})
Expand Down Expand Up @@ -102,7 +102,7 @@ export default function ({
createWorkload={createWorkload}
updateWorkload={updateWorkload}
deleteWorkload={deleteWorkload}
updateWorkloadValues={updateValues}
updateWorkloadValues={updateWorkloadValues}
mutating={mutating}
readme={readme}
/>
Expand Down
Loading
Loading