From 15b25377ba76d0d32773110bccdd9393402b4a15 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 25 Jul 2025 12:59:48 +0200
Subject: [PATCH] Some updates

---
 .../components/admin/identities/IdentityList.vue   | 13 +++++++++++--
 .../src/components/tools/ChooseColumnsForm.vue     |  5 +++++
 .../core/management/commands/load_initial_data.py  | 14 +++++++-------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/admin/identities/IdentityList.vue b/frontend/src/components/admin/identities/IdentityList.vue
index 98073605c..fcb23d18c 100644
--- a/frontend/src/components/admin/identities/IdentityList.vue
+++ b/frontend/src/components/admin/identities/IdentityList.vue
@@ -9,7 +9,7 @@
       :items-length="totalIdentities"
       :page="currentPage"
       :items-per-page="itemsPerPageR"
-      item-value="key"
+      item-value="pk"
       elevation="0"
       show-select
       :sort-by="sortByR"
@@ -35,7 +35,7 @@
             :title="$gettext('Customize displayed columns')"
             @click="showColumnsForm = true"
           ></v-btn>
-          <v-menu location="bottom">
+          <v-menu v-if="selected.length > 1" location="bottom">
             <template #activator="{ props }">
               <v-btn
                 append-icon="mdi-chevron-down"
@@ -157,6 +157,7 @@
       <ChooseColumnsForm
         :columns="columns"
         :available-columns="currentAvailableColumns"
+        :mandatory-columns="mandatoryColumns"
         @apply="updateDisplayedColumns"
       />
     </v-dialog>
@@ -294,8 +295,16 @@ const currentAvailableColumns = computed(() => {
   }
 })
 
+const mandatoryColumns = computed(() => {
+  if (identityType.value === 'account') {
+    return ['username']
+  }
+  return ['address']
+})
+
 async function updateType(value) {
   loading.value = true
+  identities.value = []
   sortByR.value = []
   if (value === 'account') {
     columns.value = defaultAccountsColumns
diff --git a/frontend/src/components/tools/ChooseColumnsForm.vue b/frontend/src/components/tools/ChooseColumnsForm.vue
index 5dfc206cf..215f4387c 100644
--- a/frontend/src/components/tools/ChooseColumnsForm.vue
+++ b/frontend/src/components/tools/ChooseColumnsForm.vue
@@ -9,6 +9,7 @@
           color="primary"
           hide-details
           density="compact"
+          :disabled="props.mandatoryColumns.includes(column.key)"
         />
       </div>
     </v-card-text>
@@ -27,6 +28,10 @@ const props = defineProps({
     type: Array,
     default: null,
   },
+  mandatoryColumns: {
+    type: Array,
+    default: null,
+  },
   columns: {
     type: Array,
     default: null,
diff --git a/modoboa/core/management/commands/load_initial_data.py b/modoboa/core/management/commands/load_initial_data.py
index 9c04cd974..e6f605ee9 100644
--- a/modoboa/core/management/commands/load_initial_data.py
+++ b/modoboa/core/management/commands/load_initial_data.py
@@ -119,14 +119,14 @@ class Command(BaseCommand):
         redirect_uris = " ".join([f"{uri}/login/logged" for uri in base_uris_list])
         redirect_uri = redirect_uris.split(" ")[0]
         client_id = ""
+        if options["dev"]:
+            base_uri = "https://localhost:3000/"
+            base_uris = base_uri
+            redirect_uri = "https://localhost:3000/login/logged"
+            redirect_uris = redirect_uri
+            client_id = "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD"
         if not frontend_application.exists():
-            if options["dev"]:
-                base_uri = "https://localhost:3000/"
-                base_uris = base_uri
-                redirect_uri = "https://localhost:3000/login/logged"
-                redirect_uris = redirect_uri
-                client_id = "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD"
-            else:
+            if not options["dev"]:
                 client_id = str(uuid.uuid4())
             call_command(
                 "createapplication",