From 75eb0912b284eaa95af996e156e7431927ff5b8e Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Sun, 16 Aug 2026 16:28:57 +0200
Subject: [PATCH 01/16] feat: make sure field value in settings is trimmed when
 necessary

---
 .../src/components/dashboard/Settings.vue     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/dashboard/Settings.vue b/frontend/src/components/dashboard/Settings.vue
index 48932b91d..e1a1b2be9 100644
--- a/frontend/src/components/dashboard/Settings.vue
+++ b/frontend/src/components/dashboard/Settings.vue
@@ -198,6 +198,11 @@ const SUBSECTION_ORDER = {
   system: ["Token expiry"],
 };
 
+/**
+ * If there is whitespace in the following types, the system will not trim the value.
+ */
+const PRESERVE_WHITESPACE_SETTING_TYPES = new Set(["edits", "text"]);
+
 export default {
   name: "DashboardSettings",
   subscribeTable: ["template"],
@@ -336,6 +341,21 @@ export default {
       }
       this.originalSettingsSnapshot = JSON.stringify(this.settings);
     },
+    shouldTrimSetting(setting) {
+      return !PRESERVE_WHITESPACE_SETTING_TYPES.has(setting?.type);
+    },
+    normalizeSettingValue(setting, value) {
+      if (typeof value === "string" && this.shouldTrimSetting(setting)) {
+        return value.trim();
+      }
+      return value;
+    },
+    normalizeSettings() {
+      if (!this.settings) return;
+      this.settings.forEach((setting) => {
+        setting.value = this.normalizeSettingValue(setting, setting.value);
+      });
+    },
     sendMailTest() {
       const to = (this.mailTestTo || "").trim();
       if (!to || !this.$socket) return;
@@ -354,6 +374,7 @@ export default {
       });
     },
     save() {
+      this.normalizeSettings();
       this.$socket.emit("settingSave", this.settings, (res) => {
         if (res.success) {
           this.settings.forEach((s) => {
@@ -469,7 +490,7 @@ export default {
         // Overwrite only existing keys
         this.settings = this.settings.map((setting) => {
           if (visibleKeys.has(setting.key) && Object.prototype.hasOwnProperty.call(flat, setting.key)) {
-            setting.value = flat[setting.key];
+            setting.value = this.normalizeSettingValue(setting, flat[setting.key]);
             updatedCount++;
           }
           return setting;

From 4bbba53e462e0ec8392994b9bff3756c4301522f Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Sun, 16 Aug 2026 16:54:47 +0200
Subject: [PATCH 02/16] feat: move space-trimming logic to backend

---
 backend/webserver/utils/settingSave.js        | 63 +++++++++++++++++--
 .../src/components/dashboard/Settings.vue     | 28 +--------
 2 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/backend/webserver/utils/settingSave.js b/backend/webserver/utils/settingSave.js
index 10526259f..9c83ffd93 100644
--- a/backend/webserver/utils/settingSave.js
+++ b/backend/webserver/utils/settingSave.js
@@ -3,6 +3,17 @@
 const { assertStableEmailTemplateContent } = require("../../utils/helper/templateResolver");
 
 const MAIL_SERVICE_KEY_PREFIX = "system.mailService.";
+const PRESERVE_WHITESPACE_SETTING_TYPES = new Set(["edits", "text"]);
+
+/**
+ * Returns whether a setting value should be trimmed before saving.
+ *
+ * @param {Object} setting setting entry
+ * @returns {boolean}
+ */
+function shouldTrimSetting(setting) {
+    return !PRESERVE_WHITESPACE_SETTING_TYPES.has(setting?.type);
+}
 
 /**
  * Reject email.template.* settings that point at a missing or incomplete template.
@@ -66,16 +77,49 @@ function payloadTouchesMailService(settings) {
  * Normalize setting values to string payload format expected by the settings model.
  *
  * @param {*} value setting value
+ * @param {Object} [setting] setting entry
  * @returns {string}
  */
-function normalizeSettingValue(value) {
+function normalizeSettingValue(value, setting = {}) {
+    let normalized;
     if (value === null || value === undefined) {
-        return "";
+        normalized = "";
+        // TODO: Should we allow value type as object?
+    } else if (typeof value === "object") {
+        normalized = JSON.stringify(value);
+    } else {
+        normalized = String(value);
     }
-    if (typeof value === "object") {
-        return JSON.stringify(value);
+    return shouldTrimSetting(setting) ? normalized.trim() : normalized;
+}
+
+/**
+ * Load persisted setting types for payload entries that do not include type metadata.
+ *
+ * @param {Object} Setting setting model
+ * @param {Object[]} settings setting entries
+ * @param {Object} [options] additional options
+ * @returns {Promise<Map<string, string>>}
+ */
+async function getSettingTypeByKey(Setting, settings, options = {}) {
+    if (typeof Setting.findAll !== "function") {
+        return new Map();
+    }
+
+    const keys = [...new Set(settings
+        .filter((setting) => setting && typeof setting.key === "string" && !setting.type)
+        .map((setting) => setting.key))];
+    if (!keys.length) {
+        return new Map();
     }
-    return String(value);
+
+    const rows = await Setting.findAll({
+        where: { key: keys },
+        attributes: ["key", "type"],
+        raw: true,
+        transaction: options.transaction,
+    });
+    return new Map(rows.map((row) => [row.key, row.type]));
 }
 
 /**
@@ -96,11 +140,16 @@ async function saveSettings(Setting, settings, options = {}) {
         await validateEmailTemplateSettings(options.models, list, options);
     }
     const touchesMailService = payloadTouchesMailService(list);
+    const settingTypeByKey = await getSettingTypeByKey(Setting, list, options);
     for (const setting of list) {
         if (!setting || typeof setting.key !== "string" || setting.key.trim() === "") {
             continue;
         }
-        await Setting.set(setting.key, normalizeSettingValue(setting.value), {
+        const settingWithType = setting.type ? setting : {
+            ...setting,
+            type: settingTypeByKey.get(setting.key),
+        };
+        await Setting.set(setting.key, normalizeSettingValue(setting.value, settingWithType), {
             transaction: options.transaction,
         });
     }
@@ -108,7 +157,9 @@ async function saveSettings(Setting, settings, options = {}) {
 }
 
 module.exports = {
+    getSettingTypeByKey,
     payloadTouchesMailService,
     normalizeSettingValue,
     saveSettings,
+    shouldTrimSetting,
 };
diff --git a/frontend/src/components/dashboard/Settings.vue b/frontend/src/components/dashboard/Settings.vue
index e1a1b2be9..3ca201afe 100644
--- a/frontend/src/components/dashboard/Settings.vue
+++ b/frontend/src/components/dashboard/Settings.vue
@@ -198,11 +198,6 @@ const SUBSECTION_ORDER = {
   system: ["Token expiry"],
 };
 
-/**
- * If there is whitespace in the following types, the system will not trim the value.
- */
-const PRESERVE_WHITESPACE_SETTING_TYPES = new Set(["edits", "text"]);
-
 export default {
   name: "DashboardSettings",
   subscribeTable: ["template"],
@@ -341,21 +336,6 @@ export default {
       }
       this.originalSettingsSnapshot = JSON.stringify(this.settings);
     },
-    shouldTrimSetting(setting) {
-      return !PRESERVE_WHITESPACE_SETTING_TYPES.has(setting?.type);
-    },
-    normalizeSettingValue(setting, value) {
-      if (typeof value === "string" && this.shouldTrimSetting(setting)) {
-        return value.trim();
-      }
-      return value;
-    },
-    normalizeSettings() {
-      if (!this.settings) return;
-      this.settings.forEach((setting) => {
-        setting.value = this.normalizeSettingValue(setting, setting.value);
-      });
-    },
     sendMailTest() {
       const to = (this.mailTestTo || "").trim();
       if (!to || !this.$socket) return;
@@ -374,18 +354,14 @@ export default {
       });
     },
     save() {
-      this.normalizeSettings();
       this.$socket.emit("settingSave", this.settings, (res) => {
         if (res.success) {
-          this.settings.forEach((s) => {
-            this.$store.commit("settings/set", { key: s.key, value: s.value });
-          });
           this.eventBus.emit("toast", {
             title: "Success",
             message: res.data,
             variant: "success",
           });
-          this.setSettingsSnapshot();
+          this.load(false);
         } else {
           this.eventBus.emit("toast", {
             title: "Error Saving Settings",
@@ -490,7 +466,7 @@ export default {
         // Overwrite only existing keys
         this.settings = this.settings.map((setting) => {
           if (visibleKeys.has(setting.key) && Object.prototype.hasOwnProperty.call(flat, setting.key)) {
-            setting.value = this.normalizeSettingValue(setting, flat[setting.key]);
+            setting.value = flat[setting.key];
             updatedCount++;
           }
           return setting;

From f3a6a0c34d2e5c367b46e5c0c094fa1a70e11dd4 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Sun, 16 Aug 2026 17:03:29 +0200
Subject: [PATCH 03/16] chore: remove TODO comment

---
 backend/webserver/utils/settingSave.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/webserver/utils/settingSave.js b/backend/webserver/utils/settingSave.js
index 9c83ffd93..521e0fd2a 100644
--- a/backend/webserver/utils/settingSave.js
+++ b/backend/webserver/utils/settingSave.js
@@ -84,8 +84,8 @@ function normalizeSettingValue(value, setting = {}) {
     let normalized;
     if (value === null || value === undefined) {
         normalized = "";
-        // TODO: Should we allow value type as object?
     } else if (typeof value === "object") {
+        // NOTE: Coerce object/array payloads to JSON; persisted settings are always strings.
         normalized = JSON.stringify(value);
     } else {
         normalized = String(value);

From 67388892c530c38a5bebd50b40887a9d2cb2a0e5 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Mon, 17 Aug 2026 14:50:14 +0200
Subject: [PATCH 04/16] feat: support user defined care-moodle role mapping

---
 .../dashboard/users/ImportModal.vue           | 119 ++++++++++++------
 .../dashboard/users/MoodleRoleMappingStep.vue |  91 ++++++++++++++
 .../dashboard/users/moodleRoleMapping.js      |  36 ++++++
 3 files changed, 207 insertions(+), 39 deletions(-)
 create mode 100644 frontend/src/components/dashboard/users/MoodleRoleMappingStep.vue
 create mode 100644 frontend/src/components/dashboard/users/moodleRoleMapping.js

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index 4d03cc82e..db71b2dbb 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -10,10 +10,9 @@
     <template #title>
       <span>Bulk Import Users</span>
     </template>
-    <!-- Step1: Upload -->
-    <template #step-1>
+    <template #step="{ step }">
       <div class="file-upload-container">
-        <template v-if="importType === 'csv'">
+        <template v-if="step.key === 'source' && importType === 'csv'">
           <div
             class="drag-drop-area"
             @dragover.prevent
@@ -78,17 +77,25 @@
             </div>
           </template>
         </template>
-        <template v-else>
+        <template v-else-if="step.key === 'source'">
           <MoodleOptions
             ref="moodleOptionsForm"
             v-model="moodleOptions"
           />
         </template>
       </div>
-    </template>
-    <!-- Step2: Preview -->
-    <template #step-2>
-      <div class="preview-table-container">
+
+      <MoodleRoleMappingStep
+        v-if="step.key === 'roleMapping'"
+        v-model="roleMappings"
+        :users="users"
+        :system-roles="systemRoles"
+      />
+
+      <div
+        v-if="step.key === 'preview'"
+        class="preview-table-container"
+      >
         <BasicTable
           v-model="selectedUsers"
           :columns="columns"
@@ -97,10 +104,11 @@
           :max-table-height="400"
         />
       </div>
-    </template>
-    <!-- Step3: Confirm -->
-    <template #step-3>
-      <div class="confirm-container">
+
+      <div
+        v-if="step.key === 'confirm'"
+        class="confirm-container"
+      >
         <BasicIcon
           icon-name="person-fill-up"
           size="64"
@@ -110,10 +118,11 @@
           and overwrite <strong>{{ userCount.duplicate }}</strong> users?
         </p>
       </div>
-    </template>
-    <!-- Step3: Result -->
-    <template #step-4>
-      <div class="result-container">
+
+      <div
+        v-if="step.key === 'result'"
+        class="result-container"
+      >
         <div v-if="updatedUserCount">
           Successfully created <strong>{{ updatedUserCount.new }}</strong> users and overwrote <strong>{{ updatedUserCount.updated }}</strong> users
           <div
@@ -161,6 +170,8 @@ import BasicTable from "@/basic/Table.vue";
 import Papa from "papaparse";
 import { downloadObjectsAs } from "@/assets/utils.js";
 import MoodleOptions from "@/basic/form/MoodleOptions.vue";
+import MoodleRoleMappingStep from "@/components/dashboard/users/MoodleRoleMappingStep.vue";
+import { buildInitialRoleMappings, getMoodleRoleRows } from "@/components/dashboard/users/moodleRoleMapping.js";
 
 /**
  * Modal for bulk creating users through csv file and Moodle API
@@ -168,7 +179,8 @@ import MoodleOptions from "@/basic/form/MoodleOptions.vue";
  */
 export default {
   name: "ImportModal",
-  components: { MoodleOptions, StepperModal, BasicButton, BasicIcon, BasicTable },
+  components: { MoodleRoleMappingStep, MoodleOptions, StepperModal, BasicButton, BasicIcon, BasicTable },
+  emits: ["updateUser"],
   data() {
     return {
       importType: "csv",
@@ -213,9 +225,21 @@ export default {
       updatedUserCount: null,
       createdUsers: [],
       createdErrors: [],
+      roleMappings: {},
     };
   },
   computed: {
+    systemRoles() {
+      return this.$store.getters["admin/getSystemRoles"] || [];
+    },
+    moodleRoleRows() {
+      return getMoodleRoleRows(this.users);
+    },
+    moodleCareRoleMap() {
+      return Object.fromEntries(
+        Object.entries(this.roleMappings).filter(([, careRole]) => careRole)
+      );
+    },
     userCount() {
       return {
         new: this.selectedUsers.filter((u) => !u.exists).length,
@@ -223,21 +247,31 @@ export default {
       };
     },
     steps() {
-      return [this.importType === "csv" ? { title: "Upload" } : { title: "Moodle" }, { title: "Preview" }, { title: "Confirm" }, { title: "Result" }];
+      const sourceStep = this.importType === "csv" ? { key: "source", title: "Upload" } : { key: "source", title: "Moodle" };
+      const commonSteps = [
+        { key: "preview", title: "Preview" },
+        { key: "confirm", title: "Confirm" },
+        { key: "result", title: "Result" },
+      ];
+      if (this.importType === "moodle") {
+        return [sourceStep, { key: "roleMapping", title: "Role Mapping" }, ...commonSteps];
+      }
+      return [sourceStep, ...commonSteps];
     },
     stepValid() {
-      let validStates = [];
       if (this.importType === "csv") {
-        validStates.push(this.file.name !== "" || this.file.errors.length < 1);
-      } else {
-        const { courseID, apiUrl, apiKey } = this.moodleOptions;
-        validStates.push(courseID && apiUrl && apiKey);
+        return [this.file.name !== "" && this.file.errors.length < 1, this.selectedUsers.length > 0, true, true];
       }
-      validStates = [...validStates, this.selectedUsers.length > 0, true, true];
-      return validStates;
+
+      const { courseID, apiUrl, apiKey } = this.moodleOptions;
+      const hasRoleMappings = this.moodleRoleRows.every((role) => Object.prototype.hasOwnProperty.call(this.roleMappings, role.raw));
+      return [courseID && apiUrl && apiKey, hasRoleMappings, this.selectedUsers.length > 0, true, true];
     },
   },
   methods: {
+    initializeRoleMappings() {
+      this.roleMappings = buildInitialRoleMappings(this.users, this.roleMappings);
+    },
     downloadFileAsCSV() {
       const filename = `users_${Date.now()}`;
       const users = this.createdUsers.map((user) => ({
@@ -259,7 +293,7 @@ export default {
           firstName: "Test",
           lastName: "User",
           email: "test.user@example.com",
-          roles: "Student*in",
+          roles: "student",
         },
       ];
       downloadObjectsAs(users, filename, "csv");
@@ -296,6 +330,7 @@ export default {
       };
       this.users = [];
       this.selectedUsers = [];
+      this.roleMappings = {};
       if (this.updatedUserCount) {
         this.updatedUserCount = null;
         this.createdUsers = [];
@@ -306,26 +341,37 @@ export default {
       }
     },
     handleStepChange(step) {
-      switch (step) {
-        case 1:
-          this.$refs.importStepper?.setWaiting(true);
+      const stepKey = this.steps[step]?.key;
+      switch (stepKey) {
+        case "roleMapping":
           this.prepareUserImport();
           break;
-        case 2:
+        case "preview":
+          if (this.importType === "csv") {
+            this.prepareUserImport();
+          } else {
+            this.$refs.importStepper?.setWaiting(false);
+          }
+          break;
+        case "confirm":
           this.$refs.importStepper?.setWaiting(false);
           break;
-        case 3:
+        case "result":
           this.executeUserImport();
           break;
       }
     },
     prepareUserImport() {
       if (this.importType === "moodle") {
-        if (!this.$refs.moodleOptionsForm?.validate()) return;
+        const { courseID, apiUrl, apiKey } = this.moodleOptions;
+        if (!courseID || !apiUrl || !apiKey || (this.$refs.moodleOptionsForm && !this.$refs.moodleOptionsForm.validate())) return;
+        this.$refs.importStepper?.setWaiting(true);
         this.$socket.emit("userMoodleUserGetAll", this.moodleOptions, (res) => {
           this.$refs.importStepper?.setWaiting(false);
           if (res.success) {
             this.users = res["data"];
+            this.selectedUsers = [];
+            this.initializeRoleMappings();
           } else {
             this.eventBus.emit("toast", {
               title: "Failed to get users from Moodle",
@@ -336,19 +382,14 @@ export default {
           }
         });
       } else {
+        this.$refs.importStepper?.setWaiting(true);
         this.checkDuplicateUsers();
       }
     },
     executeUserImport() {
       const userData = {
         users: this.selectedUsers,
-        // Moodle's role names are subject to change
-        moodleCareRoleMap: {
-          "Dozent*in": "teacher",
-          "Betreuer*in": "teacher",
-          "Tutor*in": "mentor",
-          "Student*in": "student",
-        },
+        moodleCareRoleMap: this.importType === "moodle" ? this.moodleCareRoleMap : null,
         progressId: this.$refs.importStepper.getProgressId(),
       };
       this.$refs.importStepper.startProgress();
diff --git a/frontend/src/components/dashboard/users/MoodleRoleMappingStep.vue b/frontend/src/components/dashboard/users/MoodleRoleMappingStep.vue
new file mode 100644
index 000000000..6b74c6563
--- /dev/null
+++ b/frontend/src/components/dashboard/users/MoodleRoleMappingStep.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="role-mapping-container">
+    <table class="table table-sm align-middle">
+      <thead>
+        <tr><th>Moodle Role</th><th>Users</th><th>CARE Role</th></tr>
+      </thead>
+      <tbody>
+        <tr v-for="role in roleRows" :key="role.raw">
+          <td>
+            {{ role.label }}
+          </td>
+          <td>{{ role.count }}</td>
+          <td>
+            <select
+              :value="mappedRoleValue(role.raw)"
+              class="form-select form-select-sm"
+              @change="updateRoleMapping(role.raw, $event.target.value)"
+            >
+              <option
+                value="__unmapped"
+                disabled
+              >
+                Select mapping
+              </option>
+              <option v-for="option in careRoleOptions" :key="option.value" :value="option.value">
+                {{ option.label }}
+              </option>
+            </select>
+          </td>
+        </tr>
+        <tr v-if="roleRows.length === 0">
+          <td colspan="3" class="text-center text-muted">
+            No Moodle roles were returned. Imported users will receive CARE's basic user role.
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script>
+import { getMoodleRoleRows } from "./moodleRoleMapping.js";
+
+/**
+ * Step for mapping Moodle role labels to CARE roles during Moodle user import.
+ * @author: Linyin Huang
+ */
+export default {
+  name: "MoodleRoleMappingStep",
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+    users: {
+      type: Array,
+      required: true,
+    },
+    systemRoles: {
+      type: Array,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  computed: {
+    careRoleOptions() {
+      return [
+        { value: "", label: "Do not assign additional role" },
+        ...this.systemRoles.filter((role) => !role.deleted && role.name !== "admin").map((role) => ({
+          value: role.name,
+          label: role.name.charAt(0).toUpperCase() + role.name.slice(1),
+        })),
+      ];
+    },
+    roleRows() {
+      return getMoodleRoleRows(this.users);
+    },
+  },
+  methods: {
+    mappedRoleValue(role) {
+      return Object.prototype.hasOwnProperty.call(this.modelValue, role) ? this.modelValue[role] : "__unmapped";
+    },
+    updateRoleMapping(role, careRole) {
+      this.$emit("update:modelValue", {
+        ...this.modelValue,
+        [role]: careRole,
+      });
+    },
+  },
+};
+</script>
diff --git a/frontend/src/components/dashboard/users/moodleRoleMapping.js b/frontend/src/components/dashboard/users/moodleRoleMapping.js
new file mode 100644
index 000000000..a865ccded
--- /dev/null
+++ b/frontend/src/components/dashboard/users/moodleRoleMapping.js
@@ -0,0 +1,36 @@
+export function splitMoodleRoles(roles) {
+  return roles ? roles.split(",").map((role) => role.trim()).filter(Boolean) : [];
+}
+
+export function formatMoodleRole(role) {
+  const matches = [...role.matchAll(/\{mlang\s+[^}]+}([^{}]*)\{mlang}/gi)]
+    .map((match) => match[1].trim())
+    .filter(Boolean);
+  if (matches.length > 0) {
+    return [...new Set(matches)].join(" / ");
+  }
+  return role.replace(/\{[^}]*}/g, "").replace(/\s+/g, " ").trim() || role;
+}
+
+export function getMoodleRoleRows(users) {
+  const roles = new Map();
+  users.forEach((user) => {
+    splitMoodleRoles(user.roles).forEach((role) => {
+      roles.set(role, (roles.get(role) || 0) + 1);
+    });
+  });
+  return Array.from(roles, ([raw, count]) => ({
+    raw,
+    count,
+    label: formatMoodleRole(raw),
+  })).sort((a, b) => a.label.localeCompare(b.label));
+}
+
+export function buildInitialRoleMappings(users, currentMappings = {}) {
+  return getMoodleRoleRows(users).reduce((mappings, role) => {
+    if (Object.prototype.hasOwnProperty.call(currentMappings, role.raw)) {
+      mappings[role.raw] = currentMappings[role.raw];
+    }
+    return mappings;
+  }, {});
+}

From 67c1f41dbc592898185de4eac8ba2068e5a5f556 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Mon, 17 Aug 2026 15:50:47 +0200
Subject: [PATCH 05/16] chore: update method names

---
 .../components/dashboard/users/moodleRoleMapping.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/dashboard/users/moodleRoleMapping.js b/frontend/src/components/dashboard/users/moodleRoleMapping.js
index a865ccded..de888e3c6 100644
--- a/frontend/src/components/dashboard/users/moodleRoleMapping.js
+++ b/frontend/src/components/dashboard/users/moodleRoleMapping.js
@@ -1,8 +1,8 @@
-export function splitMoodleRoles(roles) {
+export function splitExternalRoles(roles) {
   return roles ? roles.split(",").map((role) => role.trim()).filter(Boolean) : [];
 }
 
-export function formatMoodleRole(role) {
+export function formatExternalRole(role) {
   const matches = [...role.matchAll(/\{mlang\s+[^}]+}([^{}]*)\{mlang}/gi)]
     .map((match) => match[1].trim())
     .filter(Boolean);
@@ -12,22 +12,22 @@ export function formatMoodleRole(role) {
   return role.replace(/\{[^}]*}/g, "").replace(/\s+/g, " ").trim() || role;
 }
 
-export function getMoodleRoleRows(users) {
+export function getRoleRows(users) {
   const roles = new Map();
   users.forEach((user) => {
-    splitMoodleRoles(user.roles).forEach((role) => {
+    splitExternalRoles(user.roles).forEach((role) => {
       roles.set(role, (roles.get(role) || 0) + 1);
     });
   });
   return Array.from(roles, ([raw, count]) => ({
     raw,
     count,
-    label: formatMoodleRole(raw),
+    label: formatExternalRole(raw),
   })).sort((a, b) => a.label.localeCompare(b.label));
 }
 
 export function buildInitialRoleMappings(users, currentMappings = {}) {
-  return getMoodleRoleRows(users).reduce((mappings, role) => {
+  return getRoleRows(users).reduce((mappings, role) => {
     if (Object.prototype.hasOwnProperty.call(currentMappings, role.raw)) {
       mappings[role.raw] = currentMappings[role.raw];
     }

From f5b93448a886acd88093d725e302107104fca1e6 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Mon, 17 Aug 2026 15:54:33 +0200
Subject: [PATCH 06/16] chore: adjust role mapping phrasing

---
 ...leRoleMappingStep.vue => RoleMappingStep.vue} | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
 rename frontend/src/components/dashboard/users/{MoodleRoleMappingStep.vue => RoleMappingStep.vue} (82%)

diff --git a/frontend/src/components/dashboard/users/MoodleRoleMappingStep.vue b/frontend/src/components/dashboard/users/RoleMappingStep.vue
similarity index 82%
rename from frontend/src/components/dashboard/users/MoodleRoleMappingStep.vue
rename to frontend/src/components/dashboard/users/RoleMappingStep.vue
index 6b74c6563..cd3c63dc1 100644
--- a/frontend/src/components/dashboard/users/MoodleRoleMappingStep.vue
+++ b/frontend/src/components/dashboard/users/RoleMappingStep.vue
@@ -2,7 +2,7 @@
   <div class="role-mapping-container">
     <table class="table table-sm align-middle">
       <thead>
-        <tr><th>Moodle Role</th><th>Users</th><th>CARE Role</th></tr>
+        <tr><th>{{ sourceLabel }} Role</th><th>Users</th><th>CARE Role</th></tr>
       </thead>
       <tbody>
         <tr v-for="role in roleRows" :key="role.raw">
@@ -30,7 +30,7 @@
         </tr>
         <tr v-if="roleRows.length === 0">
           <td colspan="3" class="text-center text-muted">
-            No Moodle roles were returned. Imported users will receive CARE's basic user role.
+            No roles were found. Imported users will receive CARE's basic user role.
           </td>
         </tr>
       </tbody>
@@ -39,14 +39,14 @@
 </template>
 
 <script>
-import { getMoodleRoleRows } from "./moodleRoleMapping.js";
+import { getRoleRows } from "./moodleRoleMapping.js";
 
 /**
- * Step for mapping Moodle role labels to CARE roles during Moodle user import.
+ * Step for mapping external role labels to CARE roles during user import.
  * @author: Linyin Huang
  */
 export default {
-  name: "MoodleRoleMappingStep",
+  name: "RoleMappingStep",
   props: {
     modelValue: {
       type: Object,
@@ -60,6 +60,10 @@ export default {
       type: Array,
       required: true,
     },
+    sourceLabel: {
+      type: String,
+      required: true,
+    },
   },
   emits: ["update:modelValue"],
   computed: {
@@ -73,7 +77,7 @@ export default {
       ];
     },
     roleRows() {
-      return getMoodleRoleRows(this.users);
+      return getRoleRows(this.users);
     },
   },
   methods: {

From aac4439cba105f644afef5b04d6d9e889d25f6f6 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Mon, 17 Aug 2026 16:01:01 +0200
Subject: [PATCH 07/16] chore: delete comma check as we have role mapping now

---
 frontend/src/components/dashboard/users/ImportModal.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index db71b2dbb..9aac4d0cc 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -460,11 +460,6 @@ export default {
                 seenEmails.add(row.email);
               }
 
-              // Check if the values of the roles column are separated by comma
-              if (row.roles && !row.roles.includes(",") && row.roles.includes(" ")) {
-                errors.push(`Roles not comma-separated for id ${row.id} at index ${index + 1}`);
-              }
-
               // Check if the email is in a valid format
               if (!emailRegex.test(row.email)) {
                 errors.push(`Invalid email format for id ${row.id} at index ${index + 1}: ${row.email}`);

From 0a5bc731210fcc6de7b53458d3ed5d40dd1275cf Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Mon, 17 Aug 2026 16:02:15 +0200
Subject: [PATCH 08/16] refactor: align csv and moodle import flow

---
 .../dashboard/users/ImportModal.vue           | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index 9aac4d0cc..190b5d27d 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -85,11 +85,12 @@
         </template>
       </div>
 
-      <MoodleRoleMappingStep
+      <RoleMappingStep
         v-if="step.key === 'roleMapping'"
         v-model="roleMappings"
         :users="users"
         :system-roles="systemRoles"
+        :source-label="importSourceLabel"
       />
 
       <div
@@ -170,8 +171,8 @@ import BasicTable from "@/basic/Table.vue";
 import Papa from "papaparse";
 import { downloadObjectsAs } from "@/assets/utils.js";
 import MoodleOptions from "@/basic/form/MoodleOptions.vue";
-import MoodleRoleMappingStep from "@/components/dashboard/users/MoodleRoleMappingStep.vue";
-import { buildInitialRoleMappings, getMoodleRoleRows } from "@/components/dashboard/users/moodleRoleMapping.js";
+import RoleMappingStep from "@/components/dashboard/users/RoleMappingStep.vue";
+import { buildInitialRoleMappings, getRoleRows } from "@/components/dashboard/users/moodleRoleMapping.js";
 
 /**
  * Modal for bulk creating users through csv file and Moodle API
@@ -179,7 +180,7 @@ import { buildInitialRoleMappings, getMoodleRoleRows } from "@/components/dashbo
  */
 export default {
   name: "ImportModal",
-  components: { MoodleRoleMappingStep, MoodleOptions, StepperModal, BasicButton, BasicIcon, BasicTable },
+  components: { RoleMappingStep, MoodleOptions, StepperModal, BasicButton, BasicIcon, BasicTable },
   emits: ["updateUser"],
   data() {
     return {
@@ -232,10 +233,13 @@ export default {
     systemRoles() {
       return this.$store.getters["admin/getSystemRoles"] || [];
     },
-    moodleRoleRows() {
-      return getMoodleRoleRows(this.users);
+    importSourceLabel() {
+      return this.importType === "csv" ? "CSV" : "Moodle";
     },
-    moodleCareRoleMap() {
+    roleRows() {
+      return getRoleRows(this.users);
+    },
+    careRoleMap() {
       return Object.fromEntries(
         Object.entries(this.roleMappings).filter(([, careRole]) => careRole)
       );
@@ -253,19 +257,15 @@ export default {
         { key: "confirm", title: "Confirm" },
         { key: "result", title: "Result" },
       ];
-      if (this.importType === "moodle") {
-        return [sourceStep, { key: "roleMapping", title: "Role Mapping" }, ...commonSteps];
-      }
-      return [sourceStep, ...commonSteps];
+      return [sourceStep, { key: "roleMapping", title: "Role Mapping" }, ...commonSteps];
     },
     stepValid() {
-      if (this.importType === "csv") {
-        return [this.file.name !== "" && this.file.errors.length < 1, this.selectedUsers.length > 0, true, true];
-      }
-
       const { courseID, apiUrl, apiKey } = this.moodleOptions;
-      const hasRoleMappings = this.moodleRoleRows.every((role) => Object.prototype.hasOwnProperty.call(this.roleMappings, role.raw));
-      return [courseID && apiUrl && apiKey, hasRoleMappings, this.selectedUsers.length > 0, true, true];
+      const sourceIsValid = this.importType === "csv"
+        ? this.file.name !== "" && this.file.errors.length < 1
+        : courseID && apiUrl && apiKey;
+      const hasRoleMappings = this.roleRows.every((role) => Object.prototype.hasOwnProperty.call(this.roleMappings, role.raw));
+      return [sourceIsValid, hasRoleMappings, this.selectedUsers.length > 0, true, true];
     },
   },
   methods: {
@@ -344,7 +344,12 @@ export default {
       const stepKey = this.steps[step]?.key;
       switch (stepKey) {
         case "roleMapping":
-          this.prepareUserImport();
+          if (this.importType === "moodle") {
+            this.prepareUserImport();
+          } else {
+            this.initializeRoleMappings();
+            this.$refs.importStepper?.setWaiting(false);
+          }
           break;
         case "preview":
           if (this.importType === "csv") {
@@ -389,7 +394,7 @@ export default {
     executeUserImport() {
       const userData = {
         users: this.selectedUsers,
-        moodleCareRoleMap: this.importType === "moodle" ? this.moodleCareRoleMap : null,
+        roleMap: this.careRoleMap,
         progressId: this.$refs.importStepper.getProgressId(),
       };
       this.$refs.importStepper.startProgress();
@@ -483,6 +488,8 @@ export default {
         try {
           const parsingResults = await this.validateCSV(file);
           this.users = parsingResults;
+          this.selectedUsers = [];
+          this.roleMappings = buildInitialRoleMappings(parsingResults, this.roleMappings);
           this.file = {
             state: 1,
             name: file.name,
@@ -509,10 +516,15 @@ export default {
         state: 0,
         name: "",
         size: 0,
+        errors: [],
       };
+      this.users = [];
+      this.selectedUsers = [];
+      this.roleMappings = {};
       this.$refs.fileInput.value = "";
     },
     checkDuplicateUsers() {
+      this.selectedUsers = [];
       this.$socket.emit("userCheckExistsByMail", this.users, (res) => {
         this.$refs.importStepper?.setWaiting(false);
         if (res.success) {

From d9b68bf891531650abf7bdde8d7b4c0773024916 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Mon, 17 Aug 2026 16:24:57 +0200
Subject: [PATCH 09/16] fix: update existing user roles during import without
 role map

there may be old users and new users in the same import. If using roleMap as a guard, the roles of old users wouldn't be updated.
---
 backend/db/models/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/db/models/user.js b/backend/db/models/user.js
index b56cb3b83..0b528f627 100644
--- a/backend/db/models/user.js
+++ b/backend/db/models/user.js
@@ -641,7 +641,7 @@ module.exports = (sequelize, DataTypes) => {
                 afterUpdate: async (user, options) => {
                     const {context, transaction} = options;
                     const {userRoles, roleMap} = context || {};
-                    if (userRoles && roleMap) {
+                    if (userRoles) {
                         await assignUserRoles(user, userRoles, roleMap, true, transaction);
                     }
                 },

From f710d10407a73423abbecfc71b0fc963402a4e4d Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Mon, 17 Aug 2026 16:26:06 +0200
Subject: [PATCH 10/16] fix: align backend and frontend parameter

---
 backend/webserver/sockets/user.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/webserver/sockets/user.js b/backend/webserver/sockets/user.js
index 1fbb6aa2d..895926e6f 100644
--- a/backend/webserver/sockets/user.js
+++ b/backend/webserver/sockets/user.js
@@ -221,6 +221,7 @@ class UserSocket extends Socket {
      */
     async bulkCreateUsers(data) {
         const users = data["users"];
+        const roleMap = data["roleMap"];
 
         const createdUsers = [];
         const errors = [];
@@ -233,7 +234,7 @@ class UserSocket extends Socket {
                 if (!user.exists) {
                     createdUser = await this.models["user"].add(user, {
                         transaction, context: {
-                            userRoles: user.roles, roleMap: data["moodleCareRoleMap"],
+                            userRoles: user.roles, roleMap,
                         },
                     })
 
@@ -244,7 +245,7 @@ class UserSocket extends Socket {
                             firstName: user.firstName, lastName: user.lastName, extId: user.extId, emailVerified: true,
                         }, {
                             transaction, context: {
-                                userRoles: user.roles, roleMap: data["moodleCareRoleMap"],
+                                userRoles: user.roles, roleMap,
                             }
                         });
                     } else {
@@ -525,4 +526,4 @@ class UserSocket extends Socket {
     }
 };
 
-module.exports = UserSocket;
\ No newline at end of file
+module.exports = UserSocket;

From ac70956aea81e805821542226e751f660f17858f Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Fri, 21 Aug 2026 14:32:19 +0200
Subject: [PATCH 11/16] feat: add displayRoles column

---
 .../src/components/dashboard/users/ImportModal.vue    | 10 +++++-----
 .../components/dashboard/users/moodleRoleMapping.js   | 11 +++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index 190b5d27d..1786ef22e 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -172,7 +172,7 @@ import Papa from "papaparse";
 import { downloadObjectsAs } from "@/assets/utils.js";
 import MoodleOptions from "@/basic/form/MoodleOptions.vue";
 import RoleMappingStep from "@/components/dashboard/users/RoleMappingStep.vue";
-import { buildInitialRoleMappings, getRoleRows } from "@/components/dashboard/users/moodleRoleMapping.js";
+import { buildInitialRoleMappings, getRoleRows, normalizeImportUsers } from "@/components/dashboard/users/moodleRoleMapping.js";
 
 /**
  * Modal for bulk creating users through csv file and Moodle API
@@ -221,7 +221,7 @@ export default {
         { name: "First Name", key: "firstName" },
         { name: "Last Name", key: "lastName" },
         { name: "Email", key: "email" },
-        { name: "Roles", key: "roles" },
+        { name: "Roles", key: "displayRoles" },
       ],
       updatedUserCount: null,
       createdUsers: [],
@@ -374,7 +374,7 @@ export default {
         this.$socket.emit("userMoodleUserGetAll", this.moodleOptions, (res) => {
           this.$refs.importStepper?.setWaiting(false);
           if (res.success) {
-            this.users = res["data"];
+            this.users = normalizeImportUsers(res["data"]);
             this.selectedUsers = [];
             this.initializeRoleMappings();
           } else {
@@ -486,7 +486,7 @@ export default {
     async processFile(file) {
       if (file && file.name.endsWith(".csv")) {
         try {
-          const parsingResults = await this.validateCSV(file);
+          const parsingResults = normalizeImportUsers(await this.validateCSV(file));
           this.users = parsingResults;
           this.selectedUsers = [];
           this.roleMappings = buildInitialRoleMappings(parsingResults, this.roleMappings);
@@ -528,7 +528,7 @@ export default {
       this.$socket.emit("userCheckExistsByMail", this.users, (res) => {
         this.$refs.importStepper?.setWaiting(false);
         if (res.success) {
-          this.users = res.data;
+          this.users = normalizeImportUsers(res.data);
         } else {
           this.eventBus.emit("toast", {
             title: "Failed to check duplicate users",
diff --git a/frontend/src/components/dashboard/users/moodleRoleMapping.js b/frontend/src/components/dashboard/users/moodleRoleMapping.js
index de888e3c6..6cc7bdc29 100644
--- a/frontend/src/components/dashboard/users/moodleRoleMapping.js
+++ b/frontend/src/components/dashboard/users/moodleRoleMapping.js
@@ -26,6 +26,17 @@ export function getRoleRows(users) {
   })).sort((a, b) => a.label.localeCompare(b.label));
 }
 
+export function formatRoleList(roles) {
+  return splitExternalRoles(roles).map(formatExternalRole).join(", ");
+}
+
+export function normalizeImportUsers(users) {
+  return users.map((user) => ({
+    ...user,
+    displayRoles: formatRoleList(user.roles),
+  }));
+}
+
 export function buildInitialRoleMappings(users, currentMappings = {}) {
   return getRoleRows(users).reduce((mappings, role) => {
     if (Object.prototype.hasOwnProperty.call(currentMappings, role.raw)) {

From 2615919c6264a7514b302eb61f08943459081d40 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Fri, 21 Aug 2026 14:42:56 +0200
Subject: [PATCH 12/16] chore: rename the JS file and add method description

---
 .../dashboard/users/ImportModal.vue           |   2 +-
 .../dashboard/users/RoleMappingStep.vue       |   2 +-
 .../dashboard/users/moodleRoleMapping.js      |  47 --------
 .../components/dashboard/users/roleMapping.js | 100 ++++++++++++++++++
 4 files changed, 102 insertions(+), 49 deletions(-)
 delete mode 100644 frontend/src/components/dashboard/users/moodleRoleMapping.js
 create mode 100644 frontend/src/components/dashboard/users/roleMapping.js

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index 1786ef22e..8f6de2f17 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -172,7 +172,7 @@ import Papa from "papaparse";
 import { downloadObjectsAs } from "@/assets/utils.js";
 import MoodleOptions from "@/basic/form/MoodleOptions.vue";
 import RoleMappingStep from "@/components/dashboard/users/RoleMappingStep.vue";
-import { buildInitialRoleMappings, getRoleRows, normalizeImportUsers } from "@/components/dashboard/users/moodleRoleMapping.js";
+import { buildInitialRoleMappings, getRoleRows, normalizeImportUsers } from "@/components/dashboard/users/roleMapping.js";
 
 /**
  * Modal for bulk creating users through csv file and Moodle API
diff --git a/frontend/src/components/dashboard/users/RoleMappingStep.vue b/frontend/src/components/dashboard/users/RoleMappingStep.vue
index cd3c63dc1..ff2173ff8 100644
--- a/frontend/src/components/dashboard/users/RoleMappingStep.vue
+++ b/frontend/src/components/dashboard/users/RoleMappingStep.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { getRoleRows } from "./moodleRoleMapping.js";
+import { getRoleRows } from "./roleMapping.js";
 
 /**
  * Step for mapping external role labels to CARE roles during user import.
diff --git a/frontend/src/components/dashboard/users/moodleRoleMapping.js b/frontend/src/components/dashboard/users/moodleRoleMapping.js
deleted file mode 100644
index 6cc7bdc29..000000000
--- a/frontend/src/components/dashboard/users/moodleRoleMapping.js
+++ /dev/null
@@ -1,47 +0,0 @@
-export function splitExternalRoles(roles) {
-  return roles ? roles.split(",").map((role) => role.trim()).filter(Boolean) : [];
-}
-
-export function formatExternalRole(role) {
-  const matches = [...role.matchAll(/\{mlang\s+[^}]+}([^{}]*)\{mlang}/gi)]
-    .map((match) => match[1].trim())
-    .filter(Boolean);
-  if (matches.length > 0) {
-    return [...new Set(matches)].join(" / ");
-  }
-  return role.replace(/\{[^}]*}/g, "").replace(/\s+/g, " ").trim() || role;
-}
-
-export function getRoleRows(users) {
-  const roles = new Map();
-  users.forEach((user) => {
-    splitExternalRoles(user.roles).forEach((role) => {
-      roles.set(role, (roles.get(role) || 0) + 1);
-    });
-  });
-  return Array.from(roles, ([raw, count]) => ({
-    raw,
-    count,
-    label: formatExternalRole(raw),
-  })).sort((a, b) => a.label.localeCompare(b.label));
-}
-
-export function formatRoleList(roles) {
-  return splitExternalRoles(roles).map(formatExternalRole).join(", ");
-}
-
-export function normalizeImportUsers(users) {
-  return users.map((user) => ({
-    ...user,
-    displayRoles: formatRoleList(user.roles),
-  }));
-}
-
-export function buildInitialRoleMappings(users, currentMappings = {}) {
-  return getRoleRows(users).reduce((mappings, role) => {
-    if (Object.prototype.hasOwnProperty.call(currentMappings, role.raw)) {
-      mappings[role.raw] = currentMappings[role.raw];
-    }
-    return mappings;
-  }, {});
-}
diff --git a/frontend/src/components/dashboard/users/roleMapping.js b/frontend/src/components/dashboard/users/roleMapping.js
new file mode 100644
index 000000000..2887966c2
--- /dev/null
+++ b/frontend/src/components/dashboard/users/roleMapping.js
@@ -0,0 +1,100 @@
+/**
+ * Splits a comma-separated role list from an external import source.
+ *
+ * @param {string|undefined|null} roles Raw role list, with individual roles separated by commas.
+ * @returns {string[]} Trimmed role names, excluding empty entries.
+ */
+export function splitExternalRoles(roles) {
+  return roles ? roles.split(",").map((role) => role.trim()).filter(Boolean) : [];
+}
+
+/**
+ * Formats one external role string for display.
+ *
+ * Moodle role labels may contain multilingual markup such as
+ * "{mlang de}Lehrende{mlang}{mlang other}Lecturer{mlang}". The raw role string
+ * is kept elsewhere for exact mapping; this function only prepares a readable label.
+ *
+ * @param {string} role Raw external role string.
+ * @returns {string} Human-readable role label.
+ */
+export function formatExternalRole(role) {
+  const matches = [...role.matchAll(/\{mlang\s+[^}]+}([^{}]*)\{mlang}/gi)]
+    .map((match) => match[1].trim())
+    .filter(Boolean);
+  if (matches.length > 0) {
+    return [...new Set(matches)].join(" / ");
+  }
+  return role.replace(/\{[^}]*}/g, "").replace(/\s+/g, " ").trim() || role;
+}
+
+/**
+ * Builds the rows shown in the role mapping step.
+ *
+ * Rows are grouped by raw role string so different external roles are not merged
+ * just because their formatted display labels look the same.
+ *
+ * @param {Object[]} users Imported users.
+ * @param {string} users[].roles Raw comma-separated role list for one user.
+ * @returns {{raw: string, count: number, label: string}[]} Role rows sorted by display label.
+ */
+export function getRoleRows(users) {
+  const roles = new Map();
+  users.forEach((user) => {
+    splitExternalRoles(user.roles).forEach((role) => {
+      roles.set(role, (roles.get(role) || 0) + 1);
+    });
+  });
+  return Array.from(roles, ([raw, count]) => ({
+    raw,
+    count,
+    label: formatExternalRole(raw),
+  })).sort((a, b) => a.label.localeCompare(b.label));
+}
+
+/**
+ * Formats a comma-separated role list for display in the import preview.
+ *
+ * @param {string|undefined|null} roles Raw comma-separated role list.
+ * @returns {string} Readable comma-separated role list.
+ */
+export function formatRoleList(roles) {
+  return splitExternalRoles(roles).map(formatExternalRole).join(", ");
+}
+
+/**
+ * Adds display-only role labels to imported users.
+ *
+ * The original `roles` value is intentionally preserved because it is used as
+ * the key for role mapping and backend import. `displayRoles` is only for UI.
+ *
+ * @param {Object[]} users Imported users from CSV or Moodle.
+ * @param {string} users[].roles Raw comma-separated role list for one user.
+ * @returns {Object[]} New user objects with an added `displayRoles` field.
+ */
+export function normalizeImportUsers(users) {
+  return users.map((user) => ({
+    ...user,
+    displayRoles: formatRoleList(user.roles),
+  }));
+}
+
+/**
+ * Keeps explicit role mapping choices that still apply to the current import.
+ *
+ * Missing mappings are intentionally not guessed. The role mapping step should
+ * force users to choose a CARE role or explicitly choose no additional role.
+ *
+ * @param {Object[]} users Imported users.
+ * @param {string} users[].roles Raw comma-separated role list for one user.
+ * @param {Object<string, string>} [currentMappings={}] Existing raw-role to CARE-role selections.
+ * @returns {Object<string, string>} Mapping entries that still match roles in the current import.
+ */
+export function buildInitialRoleMappings(users, currentMappings = {}) {
+  return getRoleRows(users).reduce((mappings, role) => {
+    if (Object.prototype.hasOwnProperty.call(currentMappings, role.raw)) {
+      mappings[role.raw] = currentMappings[role.raw];
+    }
+    return mappings;
+  }, {});
+}

From 3e436016cf337dacb57137bcc5d9b0ce31bf684c Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Fri, 21 Aug 2026 14:56:04 +0200
Subject: [PATCH 13/16] fix: reorder the care role options and update CSV roles

---
 frontend/src/components/dashboard/users/ImportModal.vue     | 4 ++--
 frontend/src/components/dashboard/users/RoleMappingStep.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index 8f6de2f17..89166026a 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -172,7 +172,7 @@ import Papa from "papaparse";
 import { downloadObjectsAs } from "@/assets/utils.js";
 import MoodleOptions from "@/basic/form/MoodleOptions.vue";
 import RoleMappingStep from "@/components/dashboard/users/RoleMappingStep.vue";
-import { buildInitialRoleMappings, getRoleRows, normalizeImportUsers } from "@/components/dashboard/users/roleMapping.js";
+import { buildInitialRoleMappings, formatRoleList, getRoleRows, normalizeImportUsers } from "@/components/dashboard/users/roleMapping.js";
 
 /**
  * Modal for bulk creating users through csv file and Moodle API
@@ -280,7 +280,7 @@ export default {
         lastName: user.lastName,
         userName: user.userName,
         email: user.email,
-        roles: user.roles,
+        roles: formatRoleList(user.roles),
         password: user.initialPassword || "",
       }));
       downloadObjectsAs(users, filename, "csv");
diff --git a/frontend/src/components/dashboard/users/RoleMappingStep.vue b/frontend/src/components/dashboard/users/RoleMappingStep.vue
index ff2173ff8..ff1bc1831 100644
--- a/frontend/src/components/dashboard/users/RoleMappingStep.vue
+++ b/frontend/src/components/dashboard/users/RoleMappingStep.vue
@@ -69,11 +69,11 @@ export default {
   computed: {
     careRoleOptions() {
       return [
-        { value: "", label: "Do not assign additional role" },
         ...this.systemRoles.filter((role) => !role.deleted && role.name !== "admin").map((role) => ({
           value: role.name,
           label: role.name.charAt(0).toUpperCase() + role.name.slice(1),
         })),
+        { value: "", label: "Do not assign additional role" }
       ];
     },
     roleRows() {

From 467c2ce56eb3749f633742af9d1c57829d815b49 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Fri, 21 Aug 2026 17:01:29 +0200
Subject: [PATCH 14/16] style: improve result step information display

---
 .../dashboard/users/ImportModal.vue           | 57 +++++++++++++++++--
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index 89166026a..da6267874 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -124,8 +124,13 @@
         v-if="step.key === 'result'"
         class="result-container"
       >
-        <div v-if="updatedUserCount">
-          Successfully created <strong>{{ updatedUserCount.new }}</strong> users and overwrote <strong>{{ updatedUserCount.updated }}</strong> users
+        <div
+          v-if="updatedUserCount"
+          class="result-status"
+        >
+          <p class="result-summary">
+            Successfully created <strong>{{ updatedUserCount.new }}</strong> users and overwrote <strong>{{ updatedUserCount.updated }}</strong> users
+          </p>
           <div
             v-if="createdErrors.length > 0"
             class="error-container"
@@ -139,6 +144,17 @@
             </ul>
           </div>
         </div>
+        <div
+          v-if="importType === 'moodle'"
+          class="moodle-publish-intro"
+        >
+          <h3>Send login credentials to Moodle</h3>
+          <p>
+            CARE generated usernames and initial passwords for the imported users.
+            Select the Moodle assignment where these credentials should be posted as feedback,
+            or download them as a CSV file.
+          </p>
+        </div>
         <MoodleOptions
           v-if="importType === 'moodle'"
           ref="moodleOptionsForm"
@@ -149,12 +165,12 @@
           <BasicButton
             v-if="importType === 'moodle'"
             class="btn btn-outline-info"
-            title="Upload to Moodle"
+            title="Send to Moodle"
             @click="uploadToMoodle"
           />
           <BasicButton
             class="btn btn-outline-primary"
-            title="Download Result CSV"
+            title="Download CSV"
             @click="downloadFileAsCSV"
           />
         </div>
@@ -619,6 +635,39 @@ export default {
   }
 }
 
+.result-status {
+  width: 100%;
+  text-align: center;
+}
+
+.result-summary {
+  margin-bottom: 0;
+  font-size: 1.05rem;
+  font-weight: 600;
+}
+
+.moodle-publish-intro {
+  width: 100%;
+  max-width: 500px;
+  margin-top: 1.25rem;
+  margin-bottom: 0.75rem;
+  padding-top: 1rem;
+  border-top: 1px solid #dee2e6;
+  text-align: left;
+}
+
+.moodle-publish-intro h3 {
+  margin-bottom: 0.35rem;
+  font-size: 1rem;
+  font-weight: 600;
+}
+
+.moodle-publish-intro p {
+  margin-bottom: 0;
+  color: #555;
+  font-size: 0.925rem;
+}
+
 .error-container {
   margin: 0.25rem auto 0.5rem;
   color: firebrick;

From 5e0c4f0a2d44f7a7b1563a6b8443429dd6ba47a5 Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Fri, 21 Aug 2026 17:10:48 +0200
Subject: [PATCH 15/16] doc: update Moodle documentation

---
 docs/source/for_researchers/moodle_usage.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/source/for_researchers/moodle_usage.rst b/docs/source/for_researchers/moodle_usage.rst
index 1bdb4384b..c90c18335 100644
--- a/docs/source/for_researchers/moodle_usage.rst
+++ b/docs/source/for_researchers/moodle_usage.rst
@@ -77,7 +77,9 @@ Before using this feature, make sure Moodle API access is configured as describe
 User data can be imported from Moodle using the course ID:
 
 1. In the Dashboard navigate to ``Users > Import via Moodle``
-2. CARE will match users by email address
+2. After CARE retrieves the Moodle users, review the role mapping step
+3. Map each Moodle role label to the corresponding CARE role, or choose ``Do not assign additional role`` if the role should not grant additional CARE permissions
+4. CARE will match users by email address
 
 CARE handles three scenarios:
 
@@ -85,6 +87,10 @@ CARE handles three scenarios:
 - Duplicate users are merged based on email match
 - Conflicts (e.g., mismatched emails) require manual correction
 
+Moodle role labels can vary by Moodle instance and may include multilingual markup such as ``{mlang de}Lehrende{mlang}{mlang other}Lecturer{mlang}``. CARE hides this markup in the mapping step while keeping the original Moodle role string for the import.
+
+CSV user import also includes a role mapping step. CARE reads the distinct values from the CSV ``roles`` column and asks you to map each value to a CARE role before previewing the import. Multiple roles in one CSV cell should be separated by commas.
+
 .. warning::
 
    Never delete a user with an ``extId`` unless you are certain it won't be needed. This could prevent future updates or synchronization.

From d65cdc5730d5dd8154b8f37ef3a108b58a87cdfb Mon Sep 17 00:00:00 2001
From: Linyin Huang <pdji1602003@gmail.com>
Date: Fri, 21 Aug 2026 17:59:53 +0200
Subject: [PATCH 16/16] fix: prevent form fields from being given empty string

---
 frontend/src/components/dashboard/users/ImportModal.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/dashboard/users/ImportModal.vue b/frontend/src/components/dashboard/users/ImportModal.vue
index da6267874..66ae567d7 100644
--- a/frontend/src/components/dashboard/users/ImportModal.vue
+++ b/frontend/src/components/dashboard/users/ImportModal.vue
@@ -276,15 +276,17 @@ export default {
       return [sourceStep, { key: "roleMapping", title: "Role Mapping" }, ...commonSteps];
     },
     stepValid() {
-      const { courseID, apiUrl, apiKey } = this.moodleOptions;
       const sourceIsValid = this.importType === "csv"
         ? this.file.name !== "" && this.file.errors.length < 1
-        : courseID && apiUrl && apiKey;
+        : this.hasRequiredMoodleOptions(this.moodleOptions);
       const hasRoleMappings = this.roleRows.every((role) => Object.prototype.hasOwnProperty.call(this.roleMappings, role.raw));
       return [sourceIsValid, hasRoleMappings, this.selectedUsers.length > 0, true, true];
     },
   },
   methods: {
+    hasRequiredMoodleOptions({ courseID, apiUrl, apiKey } = {}) {
+      return [courseID, apiUrl, apiKey].every((value) => String(value ?? "").trim() !== "");
+    },
     initializeRoleMappings() {
       this.roleMappings = buildInitialRoleMappings(this.users, this.roleMappings);
     },
@@ -384,8 +386,7 @@ export default {
     },
     prepareUserImport() {
       if (this.importType === "moodle") {
-        const { courseID, apiUrl, apiKey } = this.moodleOptions;
-        if (!courseID || !apiUrl || !apiKey || (this.$refs.moodleOptionsForm && !this.$refs.moodleOptionsForm.validate())) return;
+        if (!this.hasRequiredMoodleOptions(this.moodleOptions) || (this.$refs.moodleOptionsForm && !this.$refs.moodleOptionsForm.validate())) return;
         this.$refs.importStepper?.setWaiting(true);
         this.$socket.emit("userMoodleUserGetAll", this.moodleOptions, (res) => {
           this.$refs.importStepper?.setWaiting(false);