Skip to content

[Remove Vuetify from Studio] Upload in progress and Save failed dialogs #5430

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 9 commits into
base: unstable
Choose a base branch
from
Open

[Remove Vuetify from Studio] Upload in progress and Save failed dialogs #5430

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef892cf
feat: Replace MessageDialog with KModal in EditModal
ANAS727189 Oct 3, 2025
d378592
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Oct 6, 2025
d0a7c06
Migrate editModal.kmodal.spec.js to @testing-library/vue and fix lint…
ANAS727189 Oct 6, 2025
c474e5d
Migrate editModal.kmodal.spec.js to @testing-library/vue and fix lint…
ANAS727189 Oct 6, 2025
2e3fcb1
fix: fixed KModal to use its own inbuilt buttons from docs
ANAS727189 Oct 8, 2025
9655a4a
fix: fixed the test to use actual kmodal for testing
ANAS727189 Oct 8, 2025
a37179c
fix: Test actual EditModal component instead of mock components and r…
ANAS727189 Oct 8, 2025
75f5822
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Oct 9, 2025
6d0234e
chore: remove editModal.kmodal.spec.js from PR as per review feedback
ANAS727189 Oct 9, 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
57 changes: 18 additions & 39 deletions contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,49 +193,28 @@
</MessageDialog>

<!-- Dialog for catching in-progress file uploads -->
<MessageDialog
v-model="promptUploading"
:header="$tr('uploadInProgressHeader')"
:text="$tr('uploadInProgressText')"
<KModal
v-if="promptUploading"
:title="$tr('uploadInProgressHeader')"
:cancelText="$tr('dismissDialogButton')"
:submitText="$tr('cancelUploadsButton')"
@cancel="promptUploading = false"
@submit="closeModal"
>
<template #buttons="{ close }">
<VBtn
flat
@click="close"
>
{{ $tr('dismissDialogButton') }}
</VBtn>
<VBtn
data-test="canceluploads"
color="primary"
@click="closeModal"
>
{{ $tr('cancelUploadsButton') }}
</VBtn>
</template>
</MessageDialog>
<p>{{ $tr('uploadInProgressText') }}</p>
</KModal>

<!-- Alert for failed save -->
<MessageDialog
v-model="promptFailed"
:header="$tr('saveFailedHeader')"
:text="$tr('saveFailedText')"
<KModal
v-if="promptFailed"
:title="$tr('saveFailedHeader')"
:cancelText="$tr('okButton')"
:submitText="$tr('closeWithoutSavingButton')"
@cancel="promptFailed = false"
@submit="closeModal"
>
<template #buttons="{ close }">
<VBtn
flat
@click="close"
>
{{ $tr('okButton') }}
</VBtn>
<VBtn
color="primary"
@click="closeModal"
>
{{ $tr('closeWithoutSavingButton') }}
</VBtn>
</template>
</MessageDialog>
<p>{{ $tr('saveFailedText') }}</p>
</KModal>
</div>

</template>
Expand Down