From e37c46a604b282a577c4a3cfbf8c1fa69f459a66 Mon Sep 17 00:00:00 2001
From: Gaelle <gaelle@bimdata.io>
Date: Wed, 3 Dec 2025 08:58:26 +0100
Subject: [PATCH 1/5] update @bimdata/typescript-fetch-api-client version

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 073f733b..d8e22caf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@bimdata/bcf-components": "6.7.5",
         "@bimdata/components": "1.9.2",
         "@bimdata/design-system": "2.3.0",
-        "@bimdata/typescript-fetch-api-client": "10.30.4",
+        "@bimdata/typescript-fetch-api-client": "10.31.0",
         "@bimdata/viewer": "2.15.0-beta.5",
         "@paddle/paddle-js": "^1.5.1",
         "async": "^3.2.6",
@@ -1868,9 +1868,9 @@
       "integrity": "sha512-/3vKXSptTUz2yaY4fcPCHu6fNeLYLqr03J4vQ8Tb8zKlIaUdgwcmFSTGM7bgXfyW6BlAkXPxp8wcEkcPnk2/Dw=="
     },
     "node_modules/@bimdata/typescript-fetch-api-client": {
-      "version": "10.30.4",
-      "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-10.30.4.tgz",
-      "integrity": "sha512-VTCbs3+rIXHsOGtw0Vz6By5yoobKexERGc/vGPbzg9QDc1J9SBtuhvChWouBtbwhxIoBtWrvAd9SqOl64BFCcQ=="
+      "version": "10.31.0",
+      "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-10.31.0.tgz",
+      "integrity": "sha512-FZt0dZFck1ST+uPLbrYZ7y1ZSqzAA3z5grSkF9/oQBDu/772nBvor6WvMTY/vduuISBaFu1FM0DkMXAFM9wjiQ=="
     },
     "node_modules/@bimdata/viewer": {
       "version": "2.15.0-beta.5",
diff --git a/package.json b/package.json
index 78921d3f..01502c3d 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@bimdata/bcf-components": "6.7.5",
     "@bimdata/components": "1.9.2",
     "@bimdata/design-system": "2.3.0",
-    "@bimdata/typescript-fetch-api-client": "10.30.4",
+    "@bimdata/typescript-fetch-api-client": "10.31.0",
     "@bimdata/viewer": "2.15.0-beta.5",
     "@paddle/paddle-js": "^1.5.1",
     "async": "^3.2.6",

From 648b95548f09e28bf0a4d4fd93eb78d634c307ac Mon Sep 17 00:00:00 2001
From: Gaelle <gaelle@bimdata.io>
Date: Wed, 3 Dec 2025 09:00:04 +0100
Subject: [PATCH 2/5] add project/space role distinction (spaceAdmin,
 projectAdmin, spaceUser, projectUser)

---
 .../specific/users/user-card/UserCard.vue     | 40 ++++++-------------
 .../users/user-role-badge/UserRoleBadge.scss  | 12 +++++-
 .../users/user-role-badge/UserRoleBadge.vue   | 34 +++++++++++-----
 src/i18n/lang/fr.json                         |  6 ++-
 4 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/components/specific/users/user-card/UserCard.vue b/src/components/specific/users/user-card/UserCard.vue
index e66e99da..19432095 100644
--- a/src/components/specific/users/user-card/UserCard.vue
+++ b/src/components/specific/users/user-card/UserCard.vue
@@ -33,11 +33,9 @@
               <BIMDataTextbox
                 width="auto"
                 maxWidth="220px"
-                :text="
-                  fullName(user) + (isSelf(user) ? ` (${$t('UserCard.self')})` : '')
-                "
+                :text="fullName(user) + (isSelf(user) ? ` (${$t('UserCard.self')})` : '')"
               />
-              <UserRoleBadge :role="role" />
+              <UserRoleBadge :role="role" :isSpaceRole="user.in_all_projects" />
             </div>
             <div class="user-card__content__info__email">
               {{ user.email }}
@@ -72,47 +70,35 @@ export default {
     UserRoleBadge,
     UserCardActionMenu,
     UserCardDeleteGuard,
-    UserCardUpdateForm
+    UserCardUpdateForm,
   },
   props: {
     user: {
       type: Object,
-      required: true
+      required: true,
     },
     space: {
       type: Object,
-      default: null
+      default: null,
     },
     project: {
       type: Object,
-      default: null
-    }
+      default: null,
+    },
   },
   setup(props) {
     const { isSelf, isSpaceAdmin, isProjectAdmin } = useUser();
 
     const showActionMenu = computed(
-      () =>
-        !isSelf(props.user) &&
-        (isSpaceAdmin(props.space) || isProjectAdmin(props.project))
-    );
-    const role = computed(() =>
-      props.project ? props.user.role : props.user.cloud_role
+      () => !isSelf(props.user) && (isSpaceAdmin(props.space) || isProjectAdmin(props.project))
     );
+    const role = computed(() => (props.project ? props.user.role : props.user.cloud_role));
 
     const loading = ref(false);
     provide("loading", loading);
 
-    const {
-      isOpen: showUpdateForm,
-      open: openUpdateForm,
-      close: closeUpdateForm
-    } = useToggle();
-    const {
-      isOpen: showDeleteGuard,
-      open: openDeleteGuard,
-      close: closeDeleteGuard
-    } = useToggle();
+    const { isOpen: showUpdateForm, open: openUpdateForm, close: closeUpdateForm } = useToggle();
+    const { isOpen: showDeleteGuard, open: openDeleteGuard, close: closeDeleteGuard } = useToggle();
 
     const resetCard = () => {
       loading.value = false;
@@ -134,9 +120,9 @@ export default {
       isSelf,
       openDeleteGuard,
       openUpdateForm,
-      resetCard
+      resetCard,
     };
-  }
+  },
 };
 </script>
 
diff --git a/src/components/specific/users/user-role-badge/UserRoleBadge.scss b/src/components/specific/users/user-role-badge/UserRoleBadge.scss
index 152238f3..e895640a 100644
--- a/src/components/specific/users/user-role-badge/UserRoleBadge.scss
+++ b/src/components/specific/users/user-role-badge/UserRoleBadge.scss
@@ -4,12 +4,20 @@
   font-size: 12px;
   font-weight: normal;
 
-  &--admin {
+  &--spaceAdmin {
+    background-color: #fe4a23;
+    color: var(--color-white);
+  }
+  &--projectAdmin {
     background-color: var(--color-primary);
     color: var(--color-white);
   }
 
-  &--user {
+  &--spaceUser {
+    background-color: #a375ff;
+    color: var(--color-white);
+  }
+  &--projectUser {
     background-color: var(--color-success);
     color: var(--color-white);
   }
diff --git a/src/components/specific/users/user-role-badge/UserRoleBadge.vue b/src/components/specific/users/user-role-badge/UserRoleBadge.vue
index caa0a010..706e7a2a 100644
--- a/src/components/specific/users/user-role-badge/UserRoleBadge.vue
+++ b/src/components/specific/users/user-role-badge/UserRoleBadge.vue
@@ -1,6 +1,20 @@
 <template>
   <span class="user-role-badge" :class="`user-role-badge--${roleName}`">
-    {{ $t(`UserRoleBadge.${roleName}`) }}
+    <template v-if="roleName === 'guest'">
+      {{ $t("UserRoleBadge.guest") }}
+    </template>
+    <template v-if="isSpaceRole && roleName === 'spaceAdmin'">
+      {{ $t(`UserRoleBadge.spaceAdmin`) }}
+    </template>
+    <template v-if="!isSpaceRole && roleName === 'projectAdmin'">
+      {{ $t(`UserRoleBadge.projectAdmin`) }}
+    </template>
+    <template v-if="isSpaceRole && roleName === 'spaceUser'">
+      {{ $t(`UserRoleBadge.spaceUser`) }}
+    </template>
+    <template v-if="!isSpaceRole && roleName === 'projectUser'">
+      {{ $t(`UserRoleBadge.projectUser`) }}
+    </template>
   </span>
 </template>
 
@@ -13,18 +27,20 @@ export default {
   props: {
     role: {
       type: Number,
-      required: true
-    }
+      required: true,
+    },
+    isSpaceRole: {
+      type: Boolean,
+      default: false,
+    },
   },
   setup(props) {
     const roleName = computed(() => {
       switch (props.role) {
         case SPACE_ROLE.ADMIN:
-        case PROJECT_ROLE.ADMIN:
-          return "admin";
+          return props.isSpaceRole ? "spaceAdmin" : "projectAdmin";
         case SPACE_ROLE.USER:
-        case PROJECT_ROLE.USER:
-          return "user";
+          return props.isSpaceRole ? "spaceUser" : "projectUser";
         case PROJECT_ROLE.GUEST:
         default:
           return "guest";
@@ -32,9 +48,9 @@ export default {
     });
 
     return {
-      roleName
+      roleName,
     };
-  }
+  },
 };
 </script>
 
diff --git a/src/i18n/lang/fr.json b/src/i18n/lang/fr.json
index b1c3931e..dcdda9c3 100644
--- a/src/i18n/lang/fr.json
+++ b/src/i18n/lang/fr.json
@@ -421,8 +421,10 @@
     }
   },
   "UserRoleBadge": {
-    "admin": "Admin",
-    "user": "Utilisateur",
+    "spaceAdmin": "Admin espace",
+    "projectAdmin": "Admin projet",
+    "spaceUser": "Utilisateur espace",
+    "projectUser": "Utilisateur projet",
     "guest": "Invité"
   },
   "UsersManagerOnboarding": {

From a71bc583be5297bdfd6f5ec62df2ac2e5241d095 Mon Sep 17 00:00:00 2001
From: Gaelle <gaelle@bimdata.io>
Date: Wed, 3 Dec 2025 11:05:15 +0100
Subject: [PATCH 3/5] fix invitations & cloud admin

---
 .../users/space-users-manager/SpaceUsersManager.vue    | 10 ++--------
 .../specific/users/user-role-badge/UserRoleBadge.vue   |  5 +----
 src/i18n/lang/fr.json                                  |  1 -
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/components/specific/users/space-users-manager/SpaceUsersManager.vue b/src/components/specific/users/space-users-manager/SpaceUsersManager.vue
index 7af67180..12de6deb 100644
--- a/src/components/specific/users/space-users-manager/SpaceUsersManager.vue
+++ b/src/components/specific/users/space-users-manager/SpaceUsersManager.vue
@@ -37,7 +37,7 @@
       <transition-group name="list">
         <template v-for="user in displayedUsers">
           <InvitationCard
-            v-if="user.from === 'invitation'"
+            v-if="user.redirect_uri"
             :key="`invitation-${user.id}`"
             :space="space"
             :invitation="user"
@@ -115,19 +115,13 @@ export default {
 
     const list = computed(() => {
       props.invitations.forEach((invitation) => {
-        invitation.from = "invitation";
+        invitation.redirect_uri.includes("invitation");
       });
       if (currentTab.value === "admins") {
-        admins.value.forEach((invitation) => {
-          invitation.from = "user";
-        });
         return props.invitations
           .filter((invitation) => invitation.role === 100)
           .concat(admins.value);
       } else {
-        users.value.forEach((invitation) => {
-          invitation.from = "user";
-        });
         return props.invitations.filter((invitation) => invitation.role === 50).concat(users.value);
       }
     });
diff --git a/src/components/specific/users/user-role-badge/UserRoleBadge.vue b/src/components/specific/users/user-role-badge/UserRoleBadge.vue
index 706e7a2a..9961933b 100644
--- a/src/components/specific/users/user-role-badge/UserRoleBadge.vue
+++ b/src/components/specific/users/user-role-badge/UserRoleBadge.vue
@@ -3,12 +3,9 @@
     <template v-if="roleName === 'guest'">
       {{ $t("UserRoleBadge.guest") }}
     </template>
-    <template v-if="isSpaceRole && roleName === 'spaceAdmin'">
+    <template v-if="role === 100">
       {{ $t(`UserRoleBadge.spaceAdmin`) }}
     </template>
-    <template v-if="!isSpaceRole && roleName === 'projectAdmin'">
-      {{ $t(`UserRoleBadge.projectAdmin`) }}
-    </template>
     <template v-if="isSpaceRole && roleName === 'spaceUser'">
       {{ $t(`UserRoleBadge.spaceUser`) }}
     </template>
diff --git a/src/i18n/lang/fr.json b/src/i18n/lang/fr.json
index dcdda9c3..4258a81b 100644
--- a/src/i18n/lang/fr.json
+++ b/src/i18n/lang/fr.json
@@ -422,7 +422,6 @@
   },
   "UserRoleBadge": {
     "spaceAdmin": "Admin espace",
-    "projectAdmin": "Admin projet",
     "spaceUser": "Utilisateur espace",
     "projectUser": "Utilisateur projet",
     "guest": "Invité"

From 8ad5896f5a237ca92b11f1d11ec5a3133794d8c9 Mon Sep 17 00:00:00 2001
From: Gaelle <gaelle@bimdata.io>
Date: Wed, 3 Dec 2025 11:13:48 +0100
Subject: [PATCH 4/5] add computed for roleClass

---
 .../specific/users/user-role-badge/UserRoleBadge.scss  | 10 +++-------
 .../specific/users/user-role-badge/UserRoleBadge.vue   |  9 +++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/specific/users/user-role-badge/UserRoleBadge.scss b/src/components/specific/users/user-role-badge/UserRoleBadge.scss
index e895640a..3cdde6d3 100644
--- a/src/components/specific/users/user-role-badge/UserRoleBadge.scss
+++ b/src/components/specific/users/user-role-badge/UserRoleBadge.scss
@@ -4,20 +4,16 @@
   font-size: 12px;
   font-weight: normal;
 
-  &--spaceAdmin {
-    background-color: #fe4a23;
-    color: var(--color-white);
-  }
-  &--projectAdmin {
+  &--space-admin {
     background-color: var(--color-primary);
     color: var(--color-white);
   }
 
-  &--spaceUser {
+  &--space-user {
     background-color: #a375ff;
     color: var(--color-white);
   }
-  &--projectUser {
+  &--project-user {
     background-color: var(--color-success);
     color: var(--color-white);
   }
diff --git a/src/components/specific/users/user-role-badge/UserRoleBadge.vue b/src/components/specific/users/user-role-badge/UserRoleBadge.vue
index 9961933b..f3e14b72 100644
--- a/src/components/specific/users/user-role-badge/UserRoleBadge.vue
+++ b/src/components/specific/users/user-role-badge/UserRoleBadge.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="user-role-badge" :class="`user-role-badge--${roleName}`">
+  <span class="user-role-badge" :class="`user-role-badge--${roleClass}`">
     <template v-if="roleName === 'guest'">
       {{ $t("UserRoleBadge.guest") }}
     </template>
@@ -35,7 +35,7 @@ export default {
     const roleName = computed(() => {
       switch (props.role) {
         case SPACE_ROLE.ADMIN:
-          return props.isSpaceRole ? "spaceAdmin" : "projectAdmin";
+          return "spaceAdmin";
         case SPACE_ROLE.USER:
           return props.isSpaceRole ? "spaceUser" : "projectUser";
         case PROJECT_ROLE.GUEST:
@@ -44,8 +44,13 @@ export default {
       }
     });
 
+    const roleClass = computed(() => {
+      return roleName.value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+    });
+
     return {
       roleName,
+      roleClass,
     };
   },
 };

From 5eeaed76eb361b1e6e04be5b81c6398d568e4bff Mon Sep 17 00:00:00 2001
From: Gaelle <gaelle@bimdata.io>
Date: Wed, 3 Dec 2025 12:08:21 +0100
Subject: [PATCH 5/5] add comment for redirect_uri & delete unused code

---
 .../specific/users/space-users-manager/SpaceUsersManager.vue  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/specific/users/space-users-manager/SpaceUsersManager.vue b/src/components/specific/users/space-users-manager/SpaceUsersManager.vue
index 12de6deb..9540ac98 100644
--- a/src/components/specific/users/space-users-manager/SpaceUsersManager.vue
+++ b/src/components/specific/users/space-users-manager/SpaceUsersManager.vue
@@ -36,6 +36,7 @@
     <div class="list-container">
       <transition-group name="list">
         <template v-for="user in displayedUsers">
+          <!-- Render only pending invitations (those with redirect_uri because only not-yet-accepted invitations have this field) -->
           <InvitationCard
             v-if="user.redirect_uri"
             :key="`invitation-${user.id}`"
@@ -114,9 +115,6 @@ export default {
     );
 
     const list = computed(() => {
-      props.invitations.forEach((invitation) => {
-        invitation.redirect_uri.includes("invitation");
-      });
       if (currentTab.value === "admins") {
         return props.invitations
           .filter((invitation) => invitation.role === 100)