From d5ca5452210458eed5aaa94ccd1c5317df78fdfe Mon Sep 17 00:00:00 2001 From: Aadarsh Mahesh K Date: Wed, 29 Oct 2025 12:56:59 +0530 Subject: [PATCH 1/2] feat(AssesmentTab): migrated question-type confirmation dialog to KModal --- .../AssessmentTab/AssessmentTab.vue | 46 +++++-------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue index 630b4fd332..c93a89023e 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue @@ -23,27 +23,16 @@ @deleteItem="onDeleteAssessmentItem" /> - - - + {{ dialog.message }} + @@ -54,13 +43,11 @@ import { mapGetters, mapActions } from 'vuex'; import AssessmentEditor from '../AssessmentEditor/AssessmentEditor'; - import MessageDialog from 'shared/views/MessageDialog'; export default { name: 'AssessmentTab', components: { AssessmentEditor, - MessageDialog, }, props: { nodeId: { @@ -74,8 +61,6 @@ open: false, title: '', message: '', - cancelLabel: '', - submitLabel: '', onCancel: () => {}, onSubmit: () => {}, }, @@ -134,20 +119,11 @@ async onDeleteAssessmentItem(item) { await this.deleteAssessmentItem(item); }, - openDialog({ - title = '', - message = '', - cancelLabel = '', - submitLabel = '', - onCancel = () => {}, - onSubmit = () => {}, - } = {}) { + openDialog({ title = '', message = '', onCancel = () => {}, onSubmit = () => {} } = {}) { this.dialog = { open: true, title, message, - cancelLabel, - submitLabel, onCancel: () => { if (typeof onCancel === 'function') { onCancel(); @@ -177,7 +153,7 @@ $trs: { incompleteItemsCountMessage: '{invalidItemsCount} incomplete {invalidItemsCount, plural, one {question} other {questions}}', - dialogSubmitBtnLabel: 'Submit', + dialogChangeBtnLabel: 'Change', dialogCancelBtnLabel: 'Cancel', }, }; From 4529aef91301385bedcc57a737c5ddfc06a3e103 Mon Sep 17 00:00:00 2001 From: Aadarsh Mahesh K Date: Fri, 31 Oct 2025 23:18:54 +0530 Subject: [PATCH 2/2] refactor(AssesmentTab): added previous submit/cancel labels --- .../AssessmentTab/AssessmentTab.vue | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue index c93a89023e..7074264d9c 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue @@ -26,8 +26,8 @@ @@ -61,6 +61,8 @@ open: false, title: '', message: '', + cancelLabel: '', + submitLabel: '', onCancel: () => {}, onSubmit: () => {}, }, @@ -119,11 +121,20 @@ async onDeleteAssessmentItem(item) { await this.deleteAssessmentItem(item); }, - openDialog({ title = '', message = '', onCancel = () => {}, onSubmit = () => {} } = {}) { + openDialog({ + title = '', + message = '', + cancelLabel = '', + submitLabel = '', + onCancel = () => {}, + onSubmit = () => {}, + } = {}) { this.dialog = { open: true, title, message, + cancelLabel, + submitLabel, onCancel: () => { if (typeof onCancel === 'function') { onCancel(); @@ -153,7 +164,7 @@ $trs: { incompleteItemsCountMessage: '{invalidItemsCount} incomplete {invalidItemsCount, plural, one {question} other {questions}}', - dialogChangeBtnLabel: 'Change', + dialogSubmitBtnLabel: 'Submit', dialogCancelBtnLabel: 'Cancel', }, };