From 690f40f9ee4f214a1c481ce1695553c7147ad2f8 Mon Sep 17 00:00:00 2001
From: rishabh <rjain4@ischoolconnect.com>
Date: Sat, 11 Oct 2025 22:08:05 +0530
Subject: [PATCH 1/7] Refactor UserPrivilegeModal to use KModal and
 generateFormMixin

---
 .../pages/Users/UserActionsDropdown.vue       |   4 +-
 .../pages/Users/UserPrivilegeModal.vue        | 101 ++++++++++--------
 2 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserActionsDropdown.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserActionsDropdown.vue
index 31690d59ed..5933233aaa 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserActionsDropdown.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserActionsDropdown.vue
@@ -22,14 +22,14 @@
     />
     <UserPrivilegeModal
       v-model="addAdminPrivilegeDialog"
-      header="Add admin privileges"
+      title="Add admin privileges"
       :text="`Are you sure you want to add admin privileges to user '${user.name}'?`"
       confirmText="Add privileges"
       :confirmAction="addAdminHandler"
     />
     <UserPrivilegeModal
       v-model="removeAdminPrivilegeDialog"
-      header="Remove admin privileges"
+      title="Remove admin privileges"
       :text="`Are you sure you want to remove admin privileges from user '${user.name}'?`"
       confirmText="Remove privileges"
       :confirmAction="removeAdminHandler"
diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
index a1dbde3a3e..005fe72619 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
@@ -1,63 +1,57 @@
 <template>
 
-  <MessageDialog
-    v-model="dialog"
-    :header="header"
+  <KModal
+    v-if="dialog"
+    :title="title"
     :text="text"
+    :submitText="confirmText"
+    cancelText="Cancel"
+    @submit="confirm"
+    @cancel="close"
   >
-    <VForm
+    <form
       ref="form"
       lazy-validation
       @submit.prevent="confirm"
     >
       <p>Enter your email address to continue</p>
-      <VTextField
+      <KTextbox
         v-model="emailConfirm"
         box
-        maxlength="100"
+        :maxlength="100"
         counter
         required
-        :rules="emailRules"
-        label="Email address"
-        @input="resetValidation"
+        :invalid="errors.emailConfirm"
+        :invalidText="$tr('emailValidationMessage')"
+        :showInvalidText="true"
+        :label="$tr('emailLabel')"
       />
-    </VForm>
-    <template #buttons>
-      <VBtn
-        flat
-        data-test="cancel"
-        @click="close"
-      >
-        Cancel
-      </VBtn>
-      <VBtn
-        color="primary"
-        @click="confirm"
-      >
-        {{ confirmText }}
-      </VBtn>
-    </template>
-  </MessageDialog>
+    </form>
+  </KModal>
 
 </template>
 
 
 <script>
 
-  import { mapState } from 'vuex';
-  import MessageDialog from 'shared/views/MessageDialog';
+  import { generateFormMixin } from 'shared/mixins';
+
+  const formMixin = generateFormMixin({
+    emailConfirm: {
+      required: true,
+      validator: (value, vm) => value === vm.currentEmail,
+    },
+  });
 
   export default {
     name: 'UserPrivilegeModal',
-    components: {
-      MessageDialog,
-    },
+    mixins: [formMixin],
     props: {
       value: {
         type: Boolean,
         default: false,
       },
-      header: {
+      title: {
         type: String,
         required: true,
       },
@@ -80,9 +74,6 @@
       };
     },
     computed: {
-      ...mapState({
-        currentEmail: state => state.session.currentUser.email,
-      }),
       dialog: {
         get() {
           return this.value;
@@ -91,29 +82,47 @@
           this.$emit('input', value);
         },
       },
-      emailRules() {
-        return [
-          v => Boolean(v) || 'Field is required',
-          v => v === this.currentEmail || 'Email does not match your account email',
-        ];
+    },
+    watch: {
+      value(value) {
+        if (value) {
+          this.reset();
+        }
       },
     },
     methods: {
       close() {
         this.emailConfirm = '';
-        this.resetValidation();
+        // Clear errors manually if using generateFormMixin
+        if (this.errors) {
+          Object.keys(this.errors).forEach(key => {
+            this.errors[key] = false;
+          });
+        }
         this.dialog = false;
       },
-      resetValidation() {
-        this.$refs.form.resetValidation();
-      },
       confirm() {
-        if (this.$refs.form.validate()) {
-          return this.confirmAction();
+        if (this.onSubmit) {
+          return this.onSubmit();
         } else {
           return Promise.resolve();
         }
       },
+      // eslint-disable-next-line vue/no-unused-properties
+      onSubmit() {
+        return this.confirmAction()
+          .then(() => {
+            this.dialog = false;
+          })
+          .catch(() => {
+            this.showSnackbar({ text: this.$tr('ErrorMessage') });
+          });
+      },
+    },
+    $trs: {
+      emailLabel: 'Email address',
+      emailValidationMessage: 'Email must match your account email',
+      ErrorMessage: 'Error While updating privileges',
     },
   };
 

From 147ad0a11f8d23400b8f304e942c443e8b39ab85 Mon Sep 17 00:00:00 2001
From: rishabhjain1712 <rishabh201224@gmail.com>
Date: Sat, 18 Oct 2025 16:13:28 +0530
Subject: [PATCH 2/7] fixed test cases and removed snackbar

---
 .../pages/Users/UserPrivilegeModal.vue        | 105 ++++++++++++------
 1 file changed, 69 insertions(+), 36 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
index 005fe72619..c507ff633c 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
@@ -5,28 +5,49 @@
     :title="title"
     :text="text"
     :submitText="confirmText"
-    cancelText="Cancel"
-    @submit="confirm"
+    :cancelText="$tr('cancelAction')"
+    data-test="user-privilege-modal"
+    @submit="submit"
     @cancel="close"
   >
     <form
       ref="form"
-      lazy-validation
       @submit.prevent="confirm"
     >
-      <p>Enter your email address to continue</p>
+      <p>{{ $tr('confirmEmailPrompt') }}</p>
+
       <KTextbox
         v-model="emailConfirm"
         box
         :maxlength="100"
         counter
-        required
+        :label="$tr('emailLabel')"
         :invalid="errors.emailConfirm"
         :invalidText="$tr('emailValidationMessage')"
         :showInvalidText="true"
-        :label="$tr('emailLabel')"
+        data-test="email-input"
       />
     </form>
+
+    <template #actions>
+      <KButton
+        flat
+        data-test="cancel"
+        type="button"
+        @click="close"
+      >
+        {{ $tr('cancelAction') }}
+      </KButton>
+
+      <KButton
+        data-test="confirm"
+        primary
+        type="button"
+        @click="submit"
+      >
+        {{ confirmText }}
+      </KButton>
+    </template>
   </KModal>
 
 </template>
@@ -34,12 +55,15 @@
 
 <script>
 
+  import { mapState } from 'vuex';
   import { generateFormMixin } from 'shared/mixins';
 
   const formMixin = generateFormMixin({
     emailConfirm: {
       required: true,
-      validator: (value, vm) => value === vm.currentEmail,
+      validator: (value, vm) => {
+        return value === vm.currentEmail;
+      },
     },
   });
 
@@ -68,61 +92,70 @@
         required: true,
       },
     },
-    data() {
-      return {
-        emailConfirm: '',
-      };
-    },
     computed: {
+      ...mapState({
+        // eslint-disable-next-line kolibri/vue-no-unused-vuex-properties, vue/no-unused-properties
+        currentEmail: (state) => state.session.currentUser.email,
+      }),
       dialog: {
         get() {
           return this.value;
         },
-        set(value) {
-          this.$emit('input', value);
+        set(v) {
+          this.$emit('input', v);
         },
       },
     },
     watch: {
-      value(value) {
-        if (value) {
+      value(val) {
+        if (val) {
           this.reset();
         }
       },
     },
     methods: {
       close() {
-        this.emailConfirm = '';
-        // Clear errors manually if using generateFormMixin
-        if (this.errors) {
-          Object.keys(this.errors).forEach(key => {
-            this.errors[key] = false;
-          });
+        if (typeof this.reset === 'function') {
+          this.reset();
+        } else {
+          this.emailConfirm = '';
+          if (this.errors) {
+            Object.keys(this.errors).forEach(k => (this.errors[k] = false));
+          }
         }
-        this.dialog = false;
+        this.$emit('input', false);
       },
+
+      // eslint-disable-next-line vue/no-unused-properties
       confirm() {
-        if (this.onSubmit) {
-          return this.onSubmit();
-        } else {
-          return Promise.resolve();
+        if (typeof this.submit === 'function') {
+          return this.submit();
         }
+        return Promise.resolve();
       },
       // eslint-disable-next-line vue/no-unused-properties
-      onSubmit() {
-        return this.confirmAction()
-          .then(() => {
-            this.dialog = false;
-          })
-          .catch(() => {
-            this.showSnackbar({ text: this.$tr('ErrorMessage') });
-          });
+      onSubmit(formData) {
+        try {
+          const res = this.confirmAction(formData);
+          if (res && typeof res.then === 'function') {
+            return res.then((val) => {
+              this.dialog = false;
+              return val;
+            });
+          }
+          this.dialog = false;
+          return Promise.resolve(res);
+        } catch (err) {
+          return Promise.reject(err);
+        }
       },
     },
+
     $trs: {
       emailLabel: 'Email address',
       emailValidationMessage: 'Email must match your account email',
-      ErrorMessage: 'Error While updating privileges',
+      cancelAction: 'Cancel',
+      confirmEmailPrompt: 'Enter your email address to continue',
     },
   };
 

From ab01071d98018d857b0900267f825f3239f4fcf6 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 02:40:36 +0000
Subject: [PATCH 3/7] [pre-commit.ci lite] apply automatic fixes

---
 .../administration/pages/Users/UserPrivilegeModal.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
index c507ff633c..04ab2d8501 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
@@ -95,7 +95,7 @@
     computed: {
       ...mapState({
         // eslint-disable-next-line kolibri/vue-no-unused-vuex-properties, vue/no-unused-properties
-        currentEmail: (state) => state.session.currentUser.email,
+        currentEmail: state => state.session.currentUser.email,
       }),
       dialog: {
         get() {
@@ -138,7 +138,7 @@
         try {
           const res = this.confirmAction(formData);
           if (res && typeof res.then === 'function') {
-            return res.then((val) => {
+            return res.then(val => {
               this.dialog = false;
               return val;
             });

From 41cb0166e8ea9244b3ca80b8888b5a5cbedf60a9 Mon Sep 17 00:00:00 2001
From: rishabhjain1712 <rishabh201224@gmail.com>
Date: Fri, 7 Nov 2025 23:13:32 +0530
Subject: [PATCH 4/7] 'Fixed alignment, spacing and 'Are you sure' text,
 pr#5469 fixes issue#5441'

---
 .../administration/pages/Users/UserPrivilegeModal.vue         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
index c507ff633c..21c0f3ae47 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
@@ -3,13 +3,14 @@
   <KModal
     v-if="dialog"
     :title="title"
-    :text="text"
     :submitText="confirmText"
     :cancelText="$tr('cancelAction')"
     data-test="user-privilege-modal"
     @submit="submit"
     @cancel="close"
   >
+    <p>{{ text }}</p>
+    
     <form
       ref="form"
       @submit.prevent="confirm"
@@ -34,6 +35,7 @@
         flat
         data-test="cancel"
         type="button"
+        class="mr-2"
         @click="close"
       >
         {{ $tr('cancelAction') }}

From 3f4788fdabdf8a4c8de24f1c00eef6122a23dedf Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Fri, 7 Nov 2025 18:15:18 +0000
Subject: [PATCH 5/7] [pre-commit.ci lite] apply automatic fixes

---
 .../frontend/administration/pages/Users/UserPrivilegeModal.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
index 0e012b5fcc..9ba31bb72c 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
@@ -10,7 +10,7 @@
     @cancel="close"
   >
     <p>{{ text }}</p>
-    
+
     <form
       ref="form"
       @submit.prevent="confirm"

From ac8ab082d5868f565eb005675296a5f5712203d0 Mon Sep 17 00:00:00 2001
From: rishabhjain1712 <rishabh201224@gmail.com>
Date: Mon, 8 Dec 2025 20:23:31 +0530
Subject: [PATCH 6/7] fix review comments

---
 .../administration/pages/Users/UserPrivilegeModal.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
index 9ba31bb72c..fde136ebf4 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
@@ -103,8 +103,8 @@
         get() {
           return this.value;
         },
-        set(v) {
-          this.$emit('input', v);
+        set(value) { // CHANGED 'v' to 'value'
+          this.$emit('input', value);
         },
       },
     },
@@ -119,12 +119,7 @@
       close() {
         if (typeof this.reset === 'function') {
           this.reset();
-        } else {
-          this.emailConfirm = '';
-          if (this.errors) {
-            Object.keys(this.errors).forEach(k => (this.errors[k] = false));
-          }
-        }
+        } 
         this.$emit('input', false);
       },
 

From cde2bac10864dee5364dfa33853afd42dafca583 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 08:58:39 +0000
Subject: [PATCH 7/7] [pre-commit.ci lite] apply automatic fixes

---
 .../administration/pages/Users/UserPrivilegeModal.vue        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
index fde136ebf4..a3d285edd0 100644
--- a/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
+++ b/contentcuration/contentcuration/frontend/administration/pages/Users/UserPrivilegeModal.vue
@@ -103,7 +103,8 @@
         get() {
           return this.value;
         },
-        set(value) { // CHANGED 'v' to 'value'
+        set(value) {
+          // CHANGED 'v' to 'value'
           this.$emit('input', value);
         },
       },
@@ -119,7 +120,7 @@
       close() {
         if (typeof this.reset === 'function') {
           this.reset();
-        } 
+        }
         this.$emit('input', false);
       },