Skip to content

[Remove Vuetify from Studio] Permanently delete resource confirmation dialog #5481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
+13 −25
Open

[Remove Vuetify from Studio] Permanently delete resource confirmation dialog #5481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08cc3e1
Removed MessageDialogue in favour of KModal and updated required test…
z-ABYa Oct 15, 2025
8f27ec2
fixes linting error
z-ABYa Oct 23, 2025
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
32 changes: 9 additions & 23 deletions contentcuration/contentcuration/frontend/channelEdit/views/trash/TrashModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,28 +145,16 @@
{{ $tr('deleteButton') }}
</VBtn>
</template>
<MessageDialog
v-model="showConfirmationDialog"
:header="$tr('deleteConfirmationHeader', counts)"
:text="$tr('deleteConfirmationText')"
<KModal
v-if="showConfirmationDialog"
:title="$tr('deleteConfirmationHeader', counts)"
:cancelText="$tr('deleteConfirmationCancelButton')"
:submitText="$tr('deleteConfirmationDeleteButton')"
@cancel="showConfirmationDialog = false"
@submit="deleteNodes"
>
<template #buttons="{ close }">
<VBtn
flat
data-test="closeconfirm"
@click="close"
>
{{ $tr('deleteConfirmationCancelButton') }}
</VBtn>
<VBtn
color="primary"
data-test="deleteconfirm"
@click="deleteNodes"
>
{{ $tr('deleteConfirmationDeleteButton') }}
</VBtn>
</template>
</MessageDialog>
<p>{{ $tr('deleteConfirmationText') }}</p>
</KModal>
<MoveModal
v-if="moveModalOpen"
ref="moveModal"
Expand All @@ -190,7 +178,6 @@
import { RouteNames } from '../../constants';
import ContentNodeIcon from 'shared/views/ContentNodeIcon';
import Checkbox from 'shared/views/form/Checkbox';
import MessageDialog from 'shared/views/MessageDialog';
import LoadingText from 'shared/views/LoadingText';
import FullscreenModal from 'shared/views/FullscreenModal';
import { titleMixin, routerMixin } from 'shared/mixins';
Expand All @@ -204,7 +191,6 @@
ContentNodeIcon,
ResourceDrawer,
Checkbox,
MessageDialog,
LoadingText,
FullscreenModal,
MoveModal,
Expand Down
6 changes: 4 additions & 2 deletions ...entcuration/contentcuration/frontend/channelEdit/views/trash/__tests__/trashModal.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ describe('trashModal', () => {

it('clicking CLOSE on delete confirmation dialog should close the dialog', async () => {
await wrapper.setData({ showConfirmationDialog: true });
await wrapper.findComponent('[data-test="closeconfirm"]').trigger('click');
const modal = wrapper.findComponent({ name: 'KModal' });
await modal.vm.$emit('cancel');
expect(wrapper.vm.showConfirmationDialog).toBe(false);
});

Expand All @@ -143,7 +144,8 @@ describe('trashModal', () => {
const deleteContentNodes = jest.spyOn(wrapper.vm, 'deleteContentNodes');
deleteContentNodes.mockImplementation(() => Promise.resolve());
await wrapper.setData({ selected, showConfirmationDialog: true });
await wrapper.findComponent('[data-test="deleteconfirm"]').trigger('click');
const modal = wrapper.findComponent({ name: 'KModal' });
await modal.vm.$emit('submit');
expect(deleteContentNodes).toHaveBeenCalledWith(selected);
});
});
Expand Down