From e5c2c968bbdadc20155e8fe203fa8c0d1b8e7b64 Mon Sep 17 00:00:00 2001
From: NicolasRichel <nicolas@bimdata.io>
Date: Wed, 1 Apr 2026 14:20:15 +0200
Subject: [PATCH 1/3] perf: add some cache to projects/models loading

---
 .../projects/project-card/ProjectCard.vue     |  2 +-
 src/router/resolvers/views/project-board.js   |  4 +--
 src/router/resolvers/views/space-board.js     |  2 +-
 src/services/ModelService.js                  | 21 ++++++++++----
 src/services/ProjectService.js                | 28 ++++++++++++++++---
 src/state/models.js                           |  4 +--
 src/state/projects.js                         |  8 +++---
 7 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/components/specific/projects/project-card/ProjectCard.vue b/src/components/specific/projects/project-card/ProjectCard.vue
index 4a65cb84d..8528ac7c8 100644
--- a/src/components/specific/projects/project-card/ProjectCard.vue
+++ b/src/components/specific/projects/project-card/ProjectCard.vue
@@ -152,7 +152,7 @@ onMounted(() => {
           () => props.project,
           async () => {
             loading.value = true;
-            const models = await ModelService.fetchModels(props.project);
+            const models = await ModelService.fetchModels(props.project, { cache: true });
             displayedModels.value = models.reduce(
               (acc, model) => {
                 if (
diff --git a/src/router/resolvers/views/project-board.js b/src/router/resolvers/views/project-board.js
index e85f4899c..84f25f4da 100644
--- a/src/router/resolvers/views/project-board.js
+++ b/src/router/resolvers/views/project-board.js
@@ -17,14 +17,14 @@ export default function projectBoardResolver(route) {
   const project = projects.setCurrentProject(+route.params.projectID);
 
   spaces.loadSpaceSubInfo(space);
-  projects.loadSpaceProjects(space);
+  projects.loadSpaceProjects(space, { cache: true });
 
   load("project-users", [
     projects.loadProjectUsers(project),
     projects.loadProjectInvitations(project)
   ]);
   load("project-models", [
-    models.loadProjectModels(project)
+    models.loadProjectModels(project, { cache: true })
   ]);
   load("project-files", [
     files.loadProjectFileStructure(project),
diff --git a/src/router/resolvers/views/space-board.js b/src/router/resolvers/views/space-board.js
index 6b885540e..4c5fddc8f 100644
--- a/src/router/resolvers/views/space-board.js
+++ b/src/router/resolvers/views/space-board.js
@@ -16,6 +16,6 @@ export default async function spaceBoardResolver(route) {
     spaces.loadSpaceInvitations(space)
   ]);
   load("space-projects", [
-    projects.loadSpaceProjects(space)
+    projects.loadSpaceProjects(space, { cache: true })
   ]);
 }
diff --git a/src/services/ModelService.js b/src/services/ModelService.js
index 3ccc33ec9..64abe7109 100644
--- a/src/services/ModelService.js
+++ b/src/services/ModelService.js
@@ -4,13 +4,23 @@ import { MODEL_TYPE } from "../config/models.js";
 import { ERRORS, RuntimeError, ErrorService } from "./ErrorService.js";
 
 class ModelService {
-  callQueue = queue(async task => {
-    return await task();
-  }, 40);
+  constructor() {
+    this.cache = new Map();
+    this.callQueue = queue(async task => {
+      return await task();
+    }, 40);
+  }
 
-  async fetchModels(project) {
+  async fetchModels(project, { cache } = {}) {
     try {
-      return await this.callQueue.push(() => apiClient.modelApi.getModelsSummary(project.cloud.id, project.id));
+      const key = `project-models-${project.id}`;
+      if (cache && this.cache.has(key)) {
+        return this.cache.get(key);
+      } else {
+        const models = await this.callQueue.push(() => apiClient.modelApi.getModelsSummary(project.cloud.id, project.id));
+        this.cache.set(key, models);
+        return models;
+      }
     } catch (error) {
       ErrorService.handleError(
         new RuntimeError(ERRORS.MODELS_FETCH_ERROR, error)
@@ -101,6 +111,7 @@ class ModelService {
       throw new RuntimeError(ERRORS.MODEL_DELETE_ERROR, error);
     }
   }
+
   fetchModelElements(project, model, params = {}) {
     return apiClient.modelApi.getElements(
       project.cloud.id,
diff --git a/src/services/ProjectService.js b/src/services/ProjectService.js
index f7e9c1f4f..6ba61d478 100644
--- a/src/services/ProjectService.js
+++ b/src/services/ProjectService.js
@@ -2,18 +2,36 @@ import { apiClient, backendClient } from "./api-client.js";
 import { ERRORS, RuntimeError, ErrorService } from "./ErrorService.js";
 
 class ProjectService {
-  async fetchUserProjects() {
+  constructor() {
+    this.cache = new Map();
+  }
+
+  async fetchUserProjects({ cache } = {}) {
     try {
-      return await apiClient.collaborationApi.getSelfProjects();
+      const key = "user-projects";
+      if (cache && this.cache.has(key)) {
+        return this.cache.get(key);
+      } else {
+        const projects = await apiClient.collaborationApi.getSelfProjects();
+        this.cache.set(key, projects);
+        return projects;
+      }
     } catch (error) {
       ErrorService.handleError(new RuntimeError(ERRORS.PROJECTS_FETCH_ERROR, error));
       return [];
     }
   }
 
-  async fetchSpaceProjects(space) {
+  async fetchSpaceProjects(space, { cache } = {}) {
     try {
-      return await apiClient.collaborationApi.getProjects(space.id);
+      const key = `space-projects-${space.id}`;
+      if (cache && this.cache.has(key)) {
+        return this.cache.get(key);
+      } else {
+        const projects = await apiClient.collaborationApi.getProjects(space.id);
+        this.cache.set(key, projects);
+        return projects;
+      }
     } catch (error) {
       ErrorService.handleError(new RuntimeError(ERRORS.PROJECTS_FETCH_ERROR, error));
       return [];
@@ -165,9 +183,11 @@ class ProjectService {
     }
     return res;
   }
+
   updateProjectNotification(spaceId, projectId, notification) {
     return backendClient.put(`/cloud/${spaceId}/project/${projectId}/notification`, notification);
   }
+
   deleteProjectNotification(spaceId, projectId) {
     return backendClient.delete(`/cloud/${spaceId}/project/${projectId}/notification`);
   }
diff --git a/src/state/models.js b/src/state/models.js
index 5a404e066..7bded290e 100644
--- a/src/state/models.js
+++ b/src/state/models.js
@@ -8,8 +8,8 @@ const state = reactive({
   projectModels: []
 });
 
-const loadProjectModels = async project => {
-  const models = await ModelService.fetchModels(project);
+const loadProjectModels = async (project, options) => {
+  const models = await ModelService.fetchModels(project, options);
   const projectModels = [];
   for (const model of models) {
     if (model.id === project.main_model_id) {
diff --git a/src/state/projects.js b/src/state/projects.js
index 7448110dd..7ad495d43 100644
--- a/src/state/projects.js
+++ b/src/state/projects.js
@@ -24,8 +24,8 @@ const setCurrentProject = (id) => {
   return readonly(state.currentProject);
 };
 
-const loadUserProjects = async () => {
-  const projects = await ProjectService.fetchUserProjects();
+const loadUserProjects = async options => {
+  const projects = await ProjectService.fetchUserProjects(options);
 
   state.userProjects = sortProjects(projects);
 
@@ -40,8 +40,8 @@ const loadUserProjects = async () => {
   return projects;
 };
 
-const loadSpaceProjects = async (space) => {
-  const projects = await ProjectService.fetchSpaceProjects(space);
+const loadSpaceProjects = async (space, options) => {
+  const projects = await ProjectService.fetchSpaceProjects(space, options);
   state.spaceProjects = sortProjects(projects);
   return projects;
 };

From b2aee4a0a9e94373b4a998848471ef5bad97a090 Mon Sep 17 00:00:00 2001
From: NicolasRichel <nicolas@bimdata.io>
Date: Thu, 2 Apr 2026 14:48:36 +0200
Subject: [PATCH 2/3] perf: keep scroll position when navigating back to
 space-board from project-board

---
 src/composables/session.js               | 28 ++++++++++++++++++++++++
 src/views/space-board/SpaceBoard.vue     | 22 ++++++++++++++++++-
 src/views/user-projects/UserProjects.vue | 22 ++++++++++++++++++-
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/src/composables/session.js b/src/composables/session.js
index 38b094876..ac21c5322 100644
--- a/src/composables/session.js
+++ b/src/composables/session.js
@@ -7,6 +7,8 @@ const STORAGE_KEYS = Object.freeze({
   PROJECT_MODEL_TAB: `${KEY_PREFIX}:project-model-tab`,
   GED_FILES_TAB: `${KEY_PREFIX}:ged-files-tab`,
   GED_TARGET_FOLDER: `${KEY_PREFIX}:ged-target-folder`,
+  SPACE_BOARD_VIEW_SCROLL: `${KEY_PREFIX}:space-board-view-scroll`,
+  USER_PROJECTS_VIEW_SCROLL: `${KEY_PREFIX}:user-projects-view-scroll`,
 });
 
 const getEntry = (key) => JSON.parse(sessionStorage.getItem(key));
@@ -70,6 +72,30 @@ const gedTargetFolder = {
   },
 };
 
+const spaceBoardViewScroll = {
+  get(spaceId) {
+    return getEntry(`${STORAGE_KEYS.SPACE_BOARD_VIEW_SCROLL}:${spaceId}`);
+  },
+  set(spaceId, value) {
+    setEntry(`${STORAGE_KEYS.SPACE_BOARD_VIEW_SCROLL}:${spaceId}`, value);
+  },
+  clear(spaceId) {
+    sessionStorage.removeItem(`${STORAGE_KEYS.SPACE_BOARD_VIEW_SCROLL}:${spaceId}`);
+  },
+};
+
+const userProjectsViewScroll = {
+  get() {
+    return getEntry(`${STORAGE_KEYS.USER_PROJECTS_VIEW_SCROLL}`);
+  },
+  set(value) {
+    setEntry(`${STORAGE_KEYS.USER_PROJECTS_VIEW_SCROLL}`, value);
+  },
+  clear() {
+    sessionStorage.removeItem(`${STORAGE_KEYS.USER_PROJECTS_VIEW_SCROLL}`);
+  },
+};
+
 export function useSession() {
   return {
     currentView,
@@ -78,5 +104,7 @@ export function useSession() {
     gedFilesTab,
     gedTargetFolder,
     projectModelTab,
+    spaceBoardViewScroll,
+    userProjectsViewScroll,
   };
 }
diff --git a/src/views/space-board/SpaceBoard.vue b/src/views/space-board/SpaceBoard.vue
index 5fcf5c428..e75f4667e 100644
--- a/src/views/space-board/SpaceBoard.vue
+++ b/src/views/space-board/SpaceBoard.vue
@@ -78,13 +78,16 @@
 </template>
 
 <script>
-import { ref } from "vue";
+import { inject, onMounted, ref } from "vue";
+import { onBeforeRouteLeave } from "vue-router";
 import { useAppSidePanel } from "../../components/specific/app/app-side-panel/app-side-panel.js";
 import { useInterval } from "../../composables/interval.js";
 import { useListFilter } from "../../composables/list-filter.js";
 import { useListSort } from "../../composables/list-sort.js";
 import { useStandardBreakpoints } from "../../composables/responsive.js";
+import { useSession } from "../../composables/session.js";
 import { IS_SUBSCRIPTION_ENABLED } from "../../config/subscription.js";
+import routeNames from "../../router/route-names.js";
 import { useProjects } from "../../state/projects.js";
 import { useSpaces } from "../../state/spaces.js";
 import { useUser } from "../../state/user.js";
@@ -117,6 +120,8 @@ export default {
     StatusFilterButton,
   },
   setup() {
+    const viewContainer = inject("viewContainer");
+    const { spaceBoardViewScroll } = useSession();
     const { isOpenRight, openSidePanel } = useAppSidePanel();
     const { isSpaceAdmin } = useUser();
     const {
@@ -144,6 +149,21 @@ export default {
       }
     }, 10000);
 
+    onMounted(() => {
+      const scroll = spaceBoardViewScroll.get(currentSpace.value.id);
+      if (scroll) {
+        viewContainer.value.scrollTo({ top: scroll, behavior: "instant" });
+      }
+    });
+
+    onBeforeRouteLeave((to) => {
+      if (to.name === routeNames.projectBoard) {
+        spaceBoardViewScroll.set(currentSpace.value.id, viewContainer.value.scrollTop);
+      } else {
+        spaceBoardViewScroll.clear(currentSpace.value.id);
+      }
+    });
+
     return {
       // References
       invitations: spaceInvitations,
diff --git a/src/views/user-projects/UserProjects.vue b/src/views/user-projects/UserProjects.vue
index 41caa1f7c..fdc6ea75c 100644
--- a/src/views/user-projects/UserProjects.vue
+++ b/src/views/user-projects/UserProjects.vue
@@ -50,10 +50,13 @@
 </template>
 
 <script>
-import { ref } from "vue";
+import { inject, onMounted, ref } from "vue";
+import { onBeforeRouteLeave } from "vue-router";
 import { useListFilter } from "../../composables/list-filter.js";
 import { useListSort } from "../../composables/list-sort.js";
+import { useSession } from "../../composables/session.js";
 import { useStandardBreakpoints } from "../../composables/responsive.js";
+import routeNames from "../../router/route-names.js";
 import { useProjects } from "../../state/projects.js";
 
 // Components
@@ -70,6 +73,8 @@ export default {
     StatusFilterButton
   },
   setup() {
+    const viewContainer = inject("viewContainer");
+    const { userProjectsViewScroll } = useSession();
     const { userProjects } = useProjects();
     const filteredProjects = ref(userProjects.value);
 
@@ -83,6 +88,21 @@ export default {
       (project) => project.name + project.description ?? ""
     );
 
+    onMounted(() => {
+      const scroll = userProjectsViewScroll.get();
+      if (scroll) {
+        viewContainer.value.scrollTo({ top: scroll, behavior: "instant" });
+      }
+    });
+
+    onBeforeRouteLeave((to) => {
+      if (to.name === routeNames.userProjects) {
+        userProjectsViewScroll.set(viewContainer.value.scrollTop);
+      } else {
+        userProjectsViewScroll.clear();
+      }
+    });
+
     return {
       // References
       userProjects,

From d6aa68a072a31c1b6abdcb18455b59532f39cd9b Mon Sep 17 00:00:00 2001
From: NicolasRichel <nicolas@bimdata.io>
Date: Thu, 2 Apr 2026 17:09:43 +0200
Subject: [PATCH 3/3] fix(perf): 'soft update' state project
 create/update/delete

---
 .../specific/spaces/space-card/SpaceCard.vue  |  9 +---
 .../favorite-space-card/FavoriteSpaceCard.vue |  9 +---
 src/router/guards/views/subscribe.js          | 11 +---
 src/services/SpaceService.js                  | 15 +++++-
 src/services/SubscriptionService.js           |  3 +-
 src/state/invitations.js                      |  7 ++-
 src/state/models.js                           | 16 ++----
 src/state/projects.js                         | 51 +++++++++----------
 src/state/user.js                             | 10 ++++
 9 files changed, 63 insertions(+), 68 deletions(-)

diff --git a/src/components/specific/spaces/space-card/SpaceCard.vue b/src/components/specific/spaces/space-card/SpaceCard.vue
index b89aa6695..2b7cd4db9 100644
--- a/src/components/specific/spaces/space-card/SpaceCard.vue
+++ b/src/components/specific/spaces/space-card/SpaceCard.vue
@@ -25,7 +25,7 @@
             {{ $t("SpaceCard.projects") }}
           </div>
           <div class="space-card__sub-title__number">
-            {{ nbProjects }}
+            {{ projectsCount[space.id] }}
           </div>
         </div>
       </template>
@@ -34,7 +34,6 @@
 </template>
 
 <script setup>
-import { computed } from "vue";
 import routeNames from "../../../../router/route-names.js";
 import { useProjects } from "../../../../state/projects.js";
 import { useSpaces } from "../../../../state/spaces.js";
@@ -58,11 +57,7 @@ const props = defineProps({
 
 const { isFavoriteSpace } = useUser();
 const { isFreeSpace } = useSpaces();
-const { projectsBySpace } = useProjects();
-
-const nbProjects = computed(
-  () => projectsBySpace.value[props.space.id]?.length ?? 0
-);
+const { projectsCount } = useProjects();
 </script>
 
 <style scoped src="./SpaceCard.css"></style>
diff --git a/src/components/specific/users/user-favorites-manager/favorite-space-card/FavoriteSpaceCard.vue b/src/components/specific/users/user-favorites-manager/favorite-space-card/FavoriteSpaceCard.vue
index ed13d6526..128a7b5e4 100644
--- a/src/components/specific/users/user-favorites-manager/favorite-space-card/FavoriteSpaceCard.vue
+++ b/src/components/specific/users/user-favorites-manager/favorite-space-card/FavoriteSpaceCard.vue
@@ -17,7 +17,7 @@
         <BIMDataTextbox maxWidth="260px" :text="space.name" />
       </div>
       <div class="card__info__data">
-        {{ nbProjects + " " + $t("t.projects") }}
+        {{ projectsCount[space.id] + " " + $t("t.projects") }}
       </div>
     </AppLink>
     <BIMDataButton ghost rounded icon @click.stop="removeFavoriteSpace(space)">
@@ -27,7 +27,6 @@
 </template>
 
 <script setup>
-import { computed } from "vue";
 import routeNames from "../../../../../router/route-names.js";
 import { useProjects } from "../../../../../state/projects.js";
 import { useUser } from "../../../../../state/user.js";
@@ -43,11 +42,7 @@ const props = defineProps({
 });
 
 const { removeFavoriteSpace } = useUser();
-const { projectsBySpace } = useProjects();
-
-const nbProjects = computed(
-  () => projectsBySpace.value[props.space.id]?.length ?? 0
-);
+const { projectsCount } = useProjects();
 </script>
 
 <style scoped>
diff --git a/src/router/guards/views/subscribe.js b/src/router/guards/views/subscribe.js
index 7f105c9b3..0335f177d 100644
--- a/src/router/guards/views/subscribe.js
+++ b/src/router/guards/views/subscribe.js
@@ -1,19 +1,10 @@
-import { useSession } from "../../../composables/session.js";
 import routeNames from "../../../router/route-names.js";
 import { useSpaces } from "../../../state/spaces.js";
 
-const { previousView } = useSession();
 const { freeSpaces } = useSpaces();
 
 export default async function subscribeGuard() {
-  // If this is the landing view (i.e. there is no previous route)
-  // then continue navigation and skip free space check.
-  // if (!previousView.get()?.name) {
-  //   return true;
-  // }
-
-  // Redirect to pro plan subscription
-  // if the user already has a free space
+  // Redirect to pro plan subscription if the user already has a free space
   if (freeSpaces.value.length > 0) {
     return { name: routeNames.subscriptionPro };
   }
diff --git a/src/services/SpaceService.js b/src/services/SpaceService.js
index d739a0200..e67e1d8c8 100644
--- a/src/services/SpaceService.js
+++ b/src/services/SpaceService.js
@@ -3,9 +3,20 @@ import { IS_NOTIFICATION_ENABLED } from "../config/notification.js";
 import { ERRORS, ErrorService, RuntimeError } from "./ErrorService.js";
 
 class SpaceService {
-  async fetchUserSpaces() {
+  constructor() {
+    this.cache = new Map();
+  }
+
+  async fetchUserSpaces({ cache } = {}) {
     try {
-      return await apiClient.collaborationApi.getClouds();
+      const key = "user-spaces";
+      if (cache && this.cache.has(key)) {
+        return this.cache.get(key);
+      } else {
+        const spaces = await apiClient.collaborationApi.getClouds();
+        this.cache.set(key, spaces);
+        return spaces;
+      }
     } catch (error) {
       ErrorService.handleError(
         new RuntimeError(ERRORS.SPACES_FETCH_ERROR, error)
diff --git a/src/services/SubscriptionService.js b/src/services/SubscriptionService.js
index a17ac8c7d..3c155a587 100644
--- a/src/services/SubscriptionService.js
+++ b/src/services/SubscriptionService.js
@@ -53,7 +53,7 @@ class SubscriptionService {
       return [];
     }
     try {
-      return await privateApiClient.get(`/payment/free-cloud`);
+      return await privateApiClient.get("/payment/free-cloud");
     } catch (error) {
       ErrorService.handleError(error);
       return [];
@@ -66,7 +66,6 @@ class SubscriptionService {
     }
 
     let subInfo;
-
     try {
       subInfo = await apiClient.collaborationApi.getCloudSize(space.id);
     } catch (error) {
diff --git a/src/state/invitations.js b/src/state/invitations.js
index 416267be4..96efefc34 100644
--- a/src/state/invitations.js
+++ b/src/state/invitations.js
@@ -32,8 +32,11 @@ const acceptInvitations = async invitations => {
     UserService.acceptInvitation
   );
   await loadUser();
-  await Promise.all([loadUserSpaces(), loadUserProjects()]);
-  await loadUserInvitations();
+  await Promise.all([
+    loadUserSpaces(),
+    loadUserProjects(),
+    loadUserInvitations()
+  ]);
 };
 
 const declineInvitation = async invitation => {
diff --git a/src/state/models.js b/src/state/models.js
index 7bded290e..e2309e5da 100644
--- a/src/state/models.js
+++ b/src/state/models.js
@@ -22,18 +22,14 @@ const loadProjectModels = async (project, options) => {
   return models;
 };
 
-const fetchModelByID = async (project, id) => {
-  const model = await ModelService.fetchModelByID(project, id);
-  return model;
-};
+const fetchModelByID = (project, id) => ModelService.fetchModelByID(project, id);
 
-const createModel = async (project, file) => {
-  const newModel = await ModelService.createModel(project, file);
-  return newModel;
-};
+const createModel = (project, file) => ModelService.createModel(project, file);
 
 const createPhotosphere = (project, file) => ModelService.createPhotosphere(project, file);
 
+const mergeModels = (project, models, name) => ModelService.mergeModels(project, models, name);
+
 const updateModels = async (project, models) => {
   const newModels = await ModelService.updateModels(project, models);
   await loadProjectModels(project);
@@ -48,10 +44,6 @@ const updateModelName = async (project, model, name) => {
   return { ...model, name };
 };
 
-const mergeModels = async (project, models, name) => {
-  await ModelService.mergeModels(project, models, name);
-};
-
 const deleteModels = async (project, models, options) => {
   await ModelService.deleteModels(project, models, options);
 
diff --git a/src/state/projects.js b/src/state/projects.js
index 7ad495d43..c4cda543e 100644
--- a/src/state/projects.js
+++ b/src/state/projects.js
@@ -1,18 +1,19 @@
 import { reactive, readonly, toRefs } from "vue";
+import { PROJECT_ROLE } from "../config/projects.js";
 import ProjectService from "../services/ProjectService.js";
 import { sortProjects } from "../utils/projects.js";
 import { fullName, sortUsers } from "../utils/users.js";
 
 import { useUser } from "./user.js";
 
-const { loadUser, isSelf, isProjectAdmin } = useUser();
+const { setProjectRole, isSelf, isProjectAdmin } = useUser();
 
 // ---
 
 const state = reactive({
   userProjects: [],
   spaceProjects: [],
-  projectsBySpace: {},
+  projectsCount: {},
   currentProject: null,
   projectUsers: [],
   projectInvitations: [],
@@ -29,11 +30,11 @@ const loadUserProjects = async options => {
 
   state.userProjects = sortProjects(projects);
 
-  state.projectsBySpace = projects.reduce((acc, project) => {
+  state.projectsCount = projects.reduce((acc, project) => {
     if (!acc[project.cloud.id]) {
-      acc[project.cloud.id] = [];
+      acc[project.cloud.id] = 0;
     }
-    acc[project.cloud.id].push(project);
+    acc[project.cloud.id] += 1;
     return acc;
   }, {});
 
@@ -64,9 +65,10 @@ const loadProjectInvitations = async (project) => {
 const createProject = async (space, project) => {
   const newProject = await ProjectService.createProject(space, project);
 
-  await loadUser();
-  await loadUserProjects();
-  await loadSpaceProjects(space);
+  setProjectRole(newProject, PROJECT_ROLE.ADMIN);
+  state.userProjects.unshift(newProject);
+  state.spaceProjects.unshift(newProject);
+  state.projectsCount[newProject.cloud.id] += 1;
 
   return newProject;
 };
@@ -77,8 +79,10 @@ const updateProject = async (project) => {
   if (newProject.id === state.currentProject?.id) {
     state.currentProject = newProject;
   }
-  await loadUserProjects();
-  await loadSpaceProjects({ id: project.cloud.id });
+
+  let i = state.userProjects.findIndex(p => p.id === newProject.id);
+  state.userProjects.splice(i, 1, newProject);
+  state.spaceProjects.splice(i, 1, newProject);
 
   return newProject;
 };
@@ -86,9 +90,10 @@ const updateProject = async (project) => {
 const deleteProject = async (project) => {
   await ProjectService.deleteProject(project);
 
-  await loadUser();
-  await loadUserProjects();
-  await loadSpaceProjects({ id: project.cloud.id });
+  let i = state.userProjects.findIndex(p => p.id === project.id);
+  state.userProjects.splice(i, 1);
+  state.spaceProjects.splice(i, 1);
+  state.projectsCount[project.cloud.id] -= 1;
 
   return project;
 };
@@ -96,9 +101,10 @@ const deleteProject = async (project) => {
 const leaveProject = async (project) => {
   await ProjectService.leaveProject(project);
 
-  await loadUser();
-  await loadUserProjects();
-  await loadSpaceProjects({ id: project.cloud.id });
+  let i = state.userProjects.findIndex(p => p.id === project.id);
+  state.userProjects.splice(i, 1);
+  state.spaceProjects.splice(i, 1);
+  state.projectsCount[project.cloud.id] -= 1;
 
   return project;
 };
@@ -129,17 +135,11 @@ const deleteProjectUser = async (project, user) => {
   return user;
 };
 
-const fetchFolderProjectUsers = async (project, folder) => {
+const getUserProjectList = async (project, folder) => {
   let users = await ProjectService.fetchFolderProjectUsers(project, folder);
-  users = sortUsers(users);
-  return users;
-};
+  users = sortUsers(users).filter((user) => !isSelf(user));
 
-const getUserProjectList = async (project, folder) => {
-  const users = await fetchFolderProjectUsers(project, folder);
-  return users
-    .filter((user) => !isSelf(user))
-    .map((user) => ({
+  return users.map((user) => ({
       ...user,
       fullName: fullName(user),
       hasAccess: user.permission >= 50,
@@ -199,7 +199,6 @@ export function useProjects() {
     cancelProjectInvitation,
     updateProjectUser,
     deleteProjectUser,
-    fetchFolderProjectUsers,
     getUserProjectList,
     getProjectFolderTree,
     fetchProjectNotification,
diff --git a/src/state/user.js b/src/state/user.js
index 982000710..7edb5c27c 100644
--- a/src/state/user.js
+++ b/src/state/user.js
@@ -41,6 +41,14 @@ const setIsNew = value => {
   state.isNew = value;
 };
 
+const setSpaceRole = (space, value) => {
+  state.spaceRoles[space.id] = value;
+};
+
+const setProjectRole = (project, value) => {
+  state.projectRoles[project.id] = value;
+};
+
 const addFavoriteSpace = async space => {
   const res = await UserService.addFavoriteSpace(space);
   state.favorites = await UserService.fetchUserFavorites();
@@ -122,6 +130,8 @@ export function useUser() {
     // Methods
     loadUser,
     setIsNew,
+    setSpaceRole,
+    setProjectRole,
     addFavoriteSpace,
     removeFavoriteSpace,
     addFavoriteProject,