Skip to content

Commit c251eb9

Browse files
fixing tests
1 parent 6406767 commit c251eb9

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/components/Dialogs/DeleteConfirmationDialog.cy.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('DeleteConfirmationDialog', () => {
5050
it('should keep Delete button disabled when incorrect name is typed', () => {
5151
mountDialog();
5252

53-
cy.get('ui5-input[id*="delete-confirm-input""]').find(' input[id*="inner"]').type('wrong-name', { force: true });
53+
cy.get('ui5-input[id*="delete-confirm-input"]').find(' input[id*="inner"]').type('wrong-name', { force: true });
5454

5555
cy.get('ui5-button').contains('Delete').should('have.attr', 'disabled');
5656
});
@@ -68,7 +68,7 @@ describe('DeleteConfirmationDialog', () => {
6868
it('should call onDeletionConfirmed and setIsOpen when Delete is confirmed', () => {
6969
mountDialog();
7070

71-
cy.get('ui5-input[id*="mcp-name-input"]').find(' input[id*="inner"]').type('test-resource');
71+
cy.get('ui5-input[id*="delete-confirm-input"]').find(' input[id*="inner"]').type('test-resource');
7272

7373
cy.get('ui5-button').contains('Delete').click();
7474

@@ -82,15 +82,15 @@ describe('DeleteConfirmationDialog', () => {
8282
mountDialog();
8383

8484
// Type something
85-
cy.get('ui5-input[id*="delete-confirm-input""]').find(' input[id*="inner"]').type('test-resource', { force: true });
85+
cy.get('ui5-input[id*="delete-confirm-input"]').find(' input[id*="inner"]').type('test-resource', { force: true });
8686

8787
// Close dialog
8888
cy.get('ui5-button').contains('Cancel').click();
8989

9090
// Reopen dialog
9191
mountDialog();
9292

93-
cy.get('ui5-input[id*="delete-confirm-input""]').find(' input[id*="inner"]').should('have.value', '');
93+
cy.get('ui5-input[id*="delete-confirm-input"]').find(' input[id*="inner"]').should('have.value', '');
9494
});
9595

9696
it('should display correct resource name in all labels', () => {

src/components/Dialogs/ManagedResourceDeleteDialog.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,14 @@ export const ManagedResourceDeleteDialog: FC<Props> = ({ kindMapping, open, onCl
5959

6060
const isConfirmed = confirmationText === resourceName;
6161

62-
const { trigger: deleteTrigger, isMutating: isMutatingDelete } = useApiResourceMutation<DeleteManagedResourceType>(
62+
const { trigger: deleteTrigger} = useApiResourceMutation<DeleteManagedResourceType>(
6363
DeleteMCPManagedResource(apiVersion, pluralKind, resourceName),
6464
);
6565

66-
const { trigger: patchTrigger, isMutating: isMutatingPatch } = useApiResourceMutation<undefined>(
66+
const { trigger: patchTrigger} = useApiResourceMutation<undefined>(
6767
PatchResourceForForceDeletion(apiVersion, pluralKind, resourceName),
6868
);
6969

70-
const isMutating = isMutatingDelete || isMutatingPatch;
71-
7270
const handleForceDeletionChange = () => {
7371
setForceDeletion(!forceDeletion);
7472
if (!forceDeletion) setAdvancedCollapsed(false);
@@ -127,10 +125,10 @@ export const ManagedResourceDeleteDialog: FC<Props> = ({ kindMapping, open, onCl
127125
</Panel>
128126

129127
<FlexBox justifyContent="End" className={styles.actions}>
130-
<Button design="Transparent" disabled={isMutating} onClick={onClose}>
128+
<Button design="Transparent" onClick={onClose}>
131129
{t('buttons.cancel')}
132130
</Button>
133-
<Button design={ButtonDesign.Negative} disabled={isMutating || !isConfirmed} onClick={handleDelete}>
131+
<Button design={ButtonDesign.Negative} disabled={!isConfirmed} onClick={handleDelete}>
134132
{t('DeleteConfirmationDialog.deleteButton')}
135133
</Button>
136134
</FlexBox>

0 commit comments

Comments
 (0)