fix(#43,#44): in space users manager, only display invitation button …

…on admin tabs + fix button text
bimdata · Sep 9, 2021 · edc8438 · edc8438
1 parent f799e0f
commit edc8438
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/components/specific/models/models-manager/ModelsManager.vue b/src/components/specific/models/models-manager/ModelsManager.vue
@@ -108,9 +108,7 @@ export default {
 
     const tabs = ref([]);
     const currentTab = ref(tabsDef[0].id);
-    const selectTab = tab => {
-      currentTab.value = tab.id;
-    };
+    const selectTab = tab => (currentTab.value = tab.id);
     watch(
       () => locale.value,
       () => {

diff --git a/src/components/specific/users/space-users-manager/SpaceUsersManager.vue b/src/components/specific/users/space-users-manager/SpaceUsersManager.vue
@@ -16,7 +16,7 @@
       clear
     />
 
-    <transition name="fade" mode="out-in">
+    <transition v-if="showInvitations" name="fade" mode="out-in">
       <template v-if="showInvitationForm">
         <InvitationForm
           :space="space"
@@ -72,6 +72,8 @@ import InvitationCard from "@/components/specific/users/invitation-card/Invitati
 import InvitationForm from "@/components/specific/users/invitation-form/InvitationForm";
 import UserCard from "@/components/specific/users/user-card/UserCard";
 
+const tabsDef = [{ id: "admins" }, { id: "users" }];
+
 export default {
   components: {
     InvitationCard,
@@ -96,20 +98,18 @@ export default {
     const { locale, t } = useI18n();
 
     const tabs = ref([]);
-    const currentTab = ref("admins");
+    const currentTab = ref(tabsDef[0].id);
+    const selectTab = tab => (currentTab.value = tab.id);
     watch(
-      locale,
+      () => locale.value,
       () => {
-        tabs.value = [
-          { id: "admins", label: t("SpaceUsersManager.tabs.admins") },
-          { id: "users", label: t("SpaceUsersManager.tabs.users") }
-        ];
+        tabs.value = tabsDef.map(tab => ({
+          ...tab,
+          label: t(`SpaceUsersManager.tabs.${tab.id}`)
+        }));
       },
       { immediate: true }
     );
-    const selectTab = tab => {
-      currentTab.value = tab.id;
-    };
 
     const admins = ref([]);
     const users = ref([]);

diff --git a/src/i18n/lang/fr.json b/src/i18n/lang/fr.json
@@ -441,7 +441,7 @@
       "users": "Utilisateurs"
     },
     "searchInputPlaceholder": "Rechercher un utilisateur",
-    "addUserButtonText": "Ajouter un utilisateur"
+    "addUserButtonText": "Ajouter un administrateur"
   },
 
   "UserCard": {