From 1eb6797ab87c5cf7babfabf64b3732950285c55b Mon Sep 17 00:00:00 2001
From: Maxime GRANDCOLAS <maxime.grandcolas@scille.fr>
Date: Tue, 14 Jan 2025 15:23:20 +0100
Subject: [PATCH 1/2] [MS] Replaced workspaces by recent workspaces in sidebar

---
 .../sidebar/SidebarRecentFileItem.vue         |   2 +-
 .../sidebar/SidebarWorkspaceItem.vue          |   6 +-
 client/src/components/users/types.ts          |   1 +
 client/src/components/workspaces/utils.ts     |   3 +-
 client/src/locales/en-US.json                 |   1 +
 client/src/locales/fr-FR.json                 |   1 +
 client/src/parsec/workspace.ts                |   8 +-
 client/src/services/fileOpener.ts             |   6 +-
 client/src/services/recentDocuments.ts        | 137 ++++++++++++++++++
 client/src/services/recentFiles.ts            |  52 -------
 client/src/services/storageManager.ts         |   7 +-
 client/src/views/layouts/ConnectedLayout.vue  |  51 ++++++-
 .../views/sidebar-menu/SidebarMenuPage.vue    |  72 +++------
 client/src/views/users/UsersPage.vue          |   5 +-
 .../src/views/workspaces/WorkspacesPage.vue   |  14 ++
 client/tests/e2e/specs/sidebar.spec.ts        |   2 +-
 .../e2e/specs/workspaces_actions.spec.ts      |   8 +-
 17 files changed, 256 insertions(+), 120 deletions(-)
 create mode 100644 client/src/services/recentDocuments.ts
 delete mode 100644 client/src/services/recentFiles.ts

diff --git a/client/src/components/sidebar/SidebarRecentFileItem.vue b/client/src/components/sidebar/SidebarRecentFileItem.vue
index 8d091c9da26..cac3ba109f0 100644
--- a/client/src/components/sidebar/SidebarRecentFileItem.vue
+++ b/client/src/components/sidebar/SidebarRecentFileItem.vue
@@ -23,7 +23,7 @@
 <script setup lang="ts">
 import { IonItem, IonText, IonIcon } from '@ionic/vue';
 import { close } from 'ionicons/icons';
-import { RecentFile } from '@/services/recentFiles';
+import { RecentFile } from '@/services/recentDocuments';
 
 defineProps<{
   file: RecentFile;
diff --git a/client/src/components/sidebar/SidebarWorkspaceItem.vue b/client/src/components/sidebar/SidebarWorkspaceItem.vue
index c7c281bca6e..07cdd3f3238 100644
--- a/client/src/components/sidebar/SidebarWorkspaceItem.vue
+++ b/client/src/components/sidebar/SidebarWorkspaceItem.vue
@@ -4,7 +4,7 @@
   <ion-item
     lines="none"
     button
-    @click="$emit('workspaceClicked', workspace.handle)"
+    @click="$emit('workspaceClicked', workspace)"
     :class="currentRouteIsWorkspaceRoute(workspace.handle) ? 'item-selected' : 'item-not-selected'"
     class="sidebar-item button-medium ion-no-padding"
     ref="itemRef"
@@ -23,7 +23,7 @@
 
 <script setup lang="ts">
 import { IonItem, IonText, IonIcon } from '@ionic/vue';
-import { WorkspaceInfo, WorkspaceHandle } from '@/parsec';
+import { WorkspaceInfo } from '@/parsec';
 import { ellipsisHorizontal } from 'ionicons/icons';
 import { currentRouteIsWorkspaceRoute } from '@/router';
 import { onMounted, onBeforeUnmount, ref } from 'vue';
@@ -33,7 +33,7 @@ defineProps<{
 }>();
 
 const emits = defineEmits<{
-  (e: 'workspaceClicked', handle: WorkspaceHandle): void;
+  (e: 'workspaceClicked', workspace: WorkspaceInfo): void;
   (e: 'contextMenuRequested', event: Event): void;
 }>();
 
diff --git a/client/src/components/users/types.ts b/client/src/components/users/types.ts
index 84adca0573c..4012813d859 100644
--- a/client/src/components/users/types.ts
+++ b/client/src/components/users/types.ts
@@ -72,6 +72,7 @@ export class UserCollection {
   setFilters(filters: UserFilterLabels): void {
     this.filters.statusActive = filters.statusActive;
     this.filters.statusRevoked = filters.statusRevoked;
+    this.filters.statusFrozen = filters.statusFrozen;
     this.filters.profileAdmin = filters.profileAdmin;
     this.filters.profileStandard = filters.profileStandard;
     this.filters.profileOutsider = filters.profileOutsider;
diff --git a/client/src/components/workspaces/utils.ts b/client/src/components/workspaces/utils.ts
index 363b540fd3b..1ffda857249 100644
--- a/client/src/components/workspaces/utils.ts
+++ b/client/src/components/workspaces/utils.ts
@@ -21,6 +21,7 @@ import WorkspaceContextMenu, { WorkspaceAction } from '@/views/workspaces/Worksp
 import WorkspaceSharingModal from '@/views/workspaces/WorkspaceSharingModal.vue';
 import { modalController, popoverController } from '@ionic/vue';
 import { Clipboard, DisplayState, Translatable, getTextFromUser } from 'megashark-lib';
+import { toRaw } from 'vue';
 
 export const WORKSPACES_PAGE_DATA_KEY = 'WorkspacesPage';
 
@@ -102,7 +103,7 @@ export async function toggleFavorite(
   }
   await storageManager.updateComponentData<WorkspacesPageSavedData>(
     WORKSPACES_PAGE_DATA_KEY,
-    { favoriteList: favorites },
+    { favoriteList: toRaw(favorites) },
     WorkspaceDefaultData,
   );
   eventDistributor.dispatchEvent(Events.WorkspaceFavorite);
diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json
index 3815f561032..f704c7144da 100644
--- a/client/src/locales/en-US.json
+++ b/client/src/locales/en-US.json
@@ -698,6 +698,7 @@
     },
     "SideMenu": {
         "workspaces": "Workspaces",
+        "recentWorkspaces": "Recent workspaces",
         "favorites": "Favorites",
         "noWorkspace": "No workspaces",
         "users": "Users",
diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json
index faf810459e9..d5956ce56d3 100644
--- a/client/src/locales/fr-FR.json
+++ b/client/src/locales/fr-FR.json
@@ -698,6 +698,7 @@
     },
     "SideMenu": {
         "workspaces": "Espaces de travail",
+        "recentWorkspaces": "Espaces récents",
         "favorites": "Favoris",
         "noWorkspace": "Aucun espace de travail",
         "users": "Utilisateurs",
diff --git a/client/src/parsec/workspace.ts b/client/src/parsec/workspace.ts
index 0dccb13c3c0..2defadd114b 100644
--- a/client/src/parsec/workspace.ts
+++ b/client/src/parsec/workspace.ts
@@ -68,8 +68,12 @@ export async function initializeWorkspace(
   return startedWorkspaceResult;
 }
 
-export async function listWorkspaces(): Promise<Result<Array<WorkspaceInfo>, ClientListWorkspacesError>> {
-  const handle = getParsecHandle();
+export async function listWorkspaces(
+  handle: ConnectionHandle | null = null,
+): Promise<Result<Array<WorkspaceInfo>, ClientListWorkspacesError>> {
+  if (!handle) {
+    handle = getParsecHandle();
+  }
 
   if (handle !== null && !needsMocks()) {
     const result = await libparsec.clientListWorkspaces(handle);
diff --git a/client/src/services/fileOpener.ts b/client/src/services/fileOpener.ts
index bcaca199a86..ad1f3100e8c 100644
--- a/client/src/services/fileOpener.ts
+++ b/client/src/services/fileOpener.ts
@@ -4,7 +4,7 @@ import { detectFileContentType, FileContentType } from '@/common/fileTypes';
 import { entryStat, EntryStat, entryStatAt, FsPath, getSystemPath, isDesktop, WorkspaceHandle, WorkspaceHistoryEntryStat } from '@/parsec';
 import { navigateTo, Routes } from '@/router';
 import { Information, InformationLevel, InformationManager, PresentationMode } from '@/services/informationManager';
-import { recentFileManager } from '@/services/recentFiles';
+import { recentDocumentManager } from '@/services/recentDocuments';
 import { DateTime } from 'luxon';
 import { Base64, openSpinnerModal } from 'megashark-lib';
 
@@ -21,7 +21,7 @@ async function openWithSystem(
   informationManager: InformationManager,
 ): Promise<void> {
   if (entry.isFile()) {
-    recentFileManager.addFile({
+    recentDocumentManager.addFile({
       entryId: entry.id,
       path: entry.path,
       workspaceHandle: workspaceHandle,
@@ -113,7 +113,7 @@ async function openPath(
         return;
       }
 
-      recentFileManager.addFile({
+      recentDocumentManager.addFile({
         entryId: entry.id,
         path: entry.path,
         workspaceHandle: workspaceHandle,
diff --git a/client/src/services/recentDocuments.ts b/client/src/services/recentDocuments.ts
new file mode 100644
index 00000000000..1f44842819e
--- /dev/null
+++ b/client/src/services/recentDocuments.ts
@@ -0,0 +1,137 @@
+// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
+
+import { DetectedFileType } from '@/common/fileTypes';
+import {
+  ConnectionHandle,
+  EntryID,
+  EntryName,
+  FsPath,
+  getClientInfo,
+  listWorkspaces,
+  UserID,
+  WorkspaceHandle,
+  WorkspaceID,
+  WorkspaceInfo,
+} from '@/parsec';
+import { StorageManager } from '@/services/storageManager';
+import { Ref, ref } from 'vue';
+
+interface RecentFile {
+  entryId: EntryID;
+  workspaceHandle: WorkspaceHandle;
+  path: FsPath;
+  name: EntryName;
+  contentType?: DetectedFileType;
+}
+
+type RecentWorkspace = WorkspaceInfo;
+
+const FILE_HISTORY_SIZE = 5;
+const WORKSPACE_HISTORY_SIZE = 5;
+
+interface RecentDocumentStorageData {
+  workspaces: Array<WorkspaceID>;
+}
+
+class RecentDocumentManager {
+  files: Ref<Array<RecentFile>> = ref([]);
+  workspaces: Ref<Array<RecentWorkspace>> = ref([]);
+
+  constructor() {
+    this.files.value = new Array<RecentFile>();
+    this.workspaces.value = new Array<RecentWorkspace>();
+  }
+
+  private _getStorageDataKey(userId: UserID): string {
+    return `recentDocuments_${userId}`;
+  }
+
+  async loadFromStorage(storage: StorageManager, handle: ConnectionHandle | null = null): Promise<void> {
+    const clientInfoResult = await getClientInfo(handle);
+    if (!clientInfoResult.ok) {
+      window.electronAPI.log('error', `Failed to load recent workspaces: ${JSON.stringify(clientInfoResult.error)}`);
+      return;
+    }
+    const dataKey = this._getStorageDataKey(clientInfoResult.value.userId);
+    const storedData = await storage.retrieveComponentData<RecentDocumentStorageData>(dataKey, { workspaces: [] });
+    if (!storedData || !storedData.workspaces) {
+      return;
+    }
+    const workspacesResult = await listWorkspaces(handle);
+    if (!workspacesResult.ok) {
+      window.electronAPI.log('error', `Failed to load recent workspaces: ${JSON.stringify(workspacesResult.error)}`);
+      return;
+    }
+
+    for (const workspaceId of storedData.workspaces.toReversed()) {
+      const wk = workspacesResult.value.find((w) => w.id === workspaceId);
+      if (wk) {
+        this.addWorkspace(wk);
+      }
+    }
+  }
+
+  async saveToStorage(storage: StorageManager): Promise<void> {
+    const clientInfoResult = await getClientInfo();
+    if (!clientInfoResult.ok) {
+      window.electronAPI.log('error', `Failed to save recent workspaces: ${JSON.stringify(clientInfoResult.error)}`);
+      return;
+    }
+    const dataKey = this._getStorageDataKey(clientInfoResult.value.userId);
+    await storage.storeComponentData<RecentDocumentStorageData>(dataKey, {
+      workspaces: this.workspaces.value.map((workspace) => workspace.id),
+    });
+  }
+
+  private _arrayMove(array: Array<any>, from: number, to: number): void {
+    array.splice(to, 0, array.splice(from, 1)[0]);
+  }
+
+  addFile(file: RecentFile): void {
+    const index = this.files.value.findIndex((item) => item.entryId === file.entryId);
+    if (index !== -1) {
+      this._arrayMove(this.files.value, index, 0);
+    } else if (this.files.value.unshift(file) > FILE_HISTORY_SIZE) {
+      this.files.value.pop();
+    }
+  }
+
+  addWorkspace(workspace: RecentWorkspace): void {
+    const index = this.workspaces.value.findIndex((item) => item.id === workspace.id);
+    if (index !== -1) {
+    } else if (this.workspaces.value.unshift(workspace) > WORKSPACE_HISTORY_SIZE) {
+      this.workspaces.value.pop();
+    }
+  }
+
+  removeFile(file: RecentFile): void {
+    const index = this.files.value.findIndex((item) => item.entryId === file.entryId);
+    if (index !== -1) {
+      this.files.value.splice(index, 1);
+    }
+  }
+
+  removeWorkspace(workspace: RecentWorkspace): void {
+    const index = this.workspaces.value.findIndex((item) => item.id === workspace.id);
+    if (index !== -1) {
+      this.workspaces.value.splice(index, 1);
+    }
+  }
+
+  resetHistory(): void {
+    this.files.value = new Array<RecentFile>();
+    this.workspaces.value = new Array<RecentWorkspace>();
+  }
+
+  getFiles(): Array<RecentFile> {
+    return this.files.value;
+  }
+
+  getWorkspaces(): Array<RecentWorkspace> {
+    return this.workspaces.value;
+  }
+}
+
+const recentDocumentManager = new RecentDocumentManager();
+
+export { recentDocumentManager, RecentFile, RecentWorkspace };
diff --git a/client/src/services/recentFiles.ts b/client/src/services/recentFiles.ts
deleted file mode 100644
index 529e60210ce..00000000000
--- a/client/src/services/recentFiles.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
-
-import { DetectedFileType } from '@/common/fileTypes';
-import { EntryID, EntryName, FsPath, WorkspaceHandle } from '@/parsec';
-import { Ref, ref } from 'vue';
-
-interface RecentFile {
-  entryId: EntryID;
-  workspaceHandle: WorkspaceHandle;
-  path: FsPath;
-  name: EntryName;
-  contentType?: DetectedFileType;
-}
-
-const HISTORY_SIZE = 5;
-
-class RecentFileManager {
-  files: Ref<Array<RecentFile>> = ref([]);
-
-  constructor() {
-    this.files.value = new Array<RecentFile>();
-  }
-
-  addFile(file: RecentFile): void {
-    const exists = this.files.value.find((item) => item.entryId === file.entryId) !== undefined;
-    if (exists) {
-      return;
-    }
-    if (this.files.value.unshift(file) > HISTORY_SIZE) {
-      this.files.value.pop();
-    }
-  }
-
-  removeFile(file: RecentFile): void {
-    const index = this.files.value.findIndex((item) => item.entryId === file.entryId);
-    if (index !== -1) {
-      this.files.value.splice(index, 1);
-    }
-  }
-
-  resetHistory(): void {
-    this.files.value = new Array<RecentFile>();
-  }
-
-  getFiles(): Array<RecentFile> {
-    return this.files.value;
-  }
-}
-
-const recentFileManager = new RecentFileManager();
-
-export { RecentFile, recentFileManager };
diff --git a/client/src/services/storageManager.ts b/client/src/services/storageManager.ts
index 9dd67a2e6d6..ba03ae8a392 100644
--- a/client/src/services/storageManager.ts
+++ b/client/src/services/storageManager.ts
@@ -99,7 +99,7 @@ export class StorageManager {
 
   async storeComponentData<Type>(componentKey: string, data: Type): Promise<void> {
     const key = `${StorageManager.STORED_COMPONENT_PREFIX}_${componentKey}`;
-    await this.internalStore.set(key, JSON.stringify(data));
+    await this.internalStore.set(key, data);
   }
 
   async updateComponentData<Type>(componentKey: string, newData: Type, defaultValues: Required<Type>): Promise<void> {
@@ -114,7 +114,7 @@ export class StorageManager {
       }
     }
     try {
-      await this.internalStore.set(key, JSON.stringify(data));
+      await this.internalStore.set(key, data);
     } catch (error) {
       console.log(`Failed to serialize ${componentKey}: ${error}`);
     }
@@ -125,7 +125,7 @@ export class StorageManager {
     const data = await this.internalStore.get(key);
 
     try {
-      const parsedData = JSON.parse(data) || {};
+      const parsedData = data || {};
       for (const element in defaultValues) {
         if (!(element in parsedData)) {
           parsedData[element] = defaultValues[element];
@@ -134,6 +134,7 @@ export class StorageManager {
       return parsedData;
     } catch (error) {
       console.log(`Failed to deserialize ${componentKey}: ${error}`);
+      await this.internalStore.set(key, {});
     }
     return defaultValues;
   }
diff --git a/client/src/views/layouts/ConnectedLayout.vue b/client/src/views/layouts/ConnectedLayout.vue
index 28d1dc604e3..45a6a8a95e7 100644
--- a/client/src/views/layouts/ConnectedLayout.vue
+++ b/client/src/views/layouts/ConnectedLayout.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script lang="ts" setup>
-import { getConnectionInfo, getTOS, needsMocks, logout as parsecLogout, acceptTOS, mockLoggedInDevice } from '@/parsec';
+import { getConnectionInfo, getTOS, needsMocks, logout as parsecLogout, acceptTOS, mockLoggedInDevice, WorkspaceRole } from '@/parsec';
 import { getConnectionHandle, navigateTo, Routes } from '@/router';
 import { EventData, EventDistributor, EventDistributorKey, Events } from '@/services/eventDistributor';
 import { FileOperationManagerKey } from '@/services/fileOperationManager';
@@ -21,6 +21,8 @@ import useUploadMenu from '@/services/fileUploadMenu';
 import { MsModalResult, openSpinnerModal } from 'megashark-lib';
 import { DateTime } from 'luxon';
 import { StorageManagerKey, StorageManager } from '@/services/storageManager';
+import { recentDocumentManager } from '@/services/recentDocuments';
+import { FileContentType } from '@/common/fileTypes';
 
 const injectionProvider: InjectionProvider = inject(InjectionProviderKey)!;
 const storageManager: StorageManager = inject(StorageManagerKey)!;
@@ -64,6 +66,10 @@ onMounted(async () => {
     },
   );
 
+  recentDocumentManager.resetHistory();
+  await recentDocumentManager.loadFromStorage(storageManager, handle);
+  await mockRecentDocuments();
+
   initialized.value = true;
 
   const connInfo = getConnectionInfo();
@@ -103,6 +109,48 @@ async function tryOpeningTOSModal(): Promise<void> {
   }
 }
 
+async function mockRecentDocuments(): Promise<void> {
+  // Adds fake files and workspace by default in dev mode
+  // to make sure we keep the feature in mind
+  if (needsMocks()) {
+    recentDocumentManager.addFile({
+      entryId: crypto.randomUUID().toString(),
+      workspaceHandle: 1337,
+      path: '/a/b/File_Fake image.png',
+      name: 'File_Fake image.png',
+      contentType: {
+        type: FileContentType.Image,
+        extension: 'png',
+        mimeType: 'image/png',
+      },
+    });
+    recentDocumentManager.addFile({
+      entryId: crypto.randomUUID().toString(),
+      workspaceHandle: 1337,
+      path: '/a/b/File_Fake PDF document.pdf',
+      name: 'File_Fake PDF document.pdf',
+      contentType: {
+        type: FileContentType.PdfDocument,
+        extension: 'pdf',
+        mimeType: 'application/pdf',
+      },
+    });
+    recentDocumentManager.addWorkspace({
+      id: '1',
+      currentName: 'Trademeet',
+      currentSelfRole: WorkspaceRole.Owner,
+      size: 934_583,
+      lastUpdated: DateTime.now().minus(2000),
+      availableOffline: false,
+      isStarted: false,
+      isBootstrapped: false,
+      sharing: [],
+      mountpoints: [[1, '/home/a']],
+      handle: 1,
+    });
+  }
+}
+
 async function logout(): Promise<void> {
   const modal = await openSpinnerModal('HomePage.topbar.logoutWait');
   const menuCtrls = useUploadMenu();
@@ -133,6 +181,7 @@ async function logout(): Promise<void> {
       window.electronAPI.log('error', `Error when logging out: ${JSON.stringify(logoutResult.error)}`);
     }
   }
+  recentDocumentManager.resetHistory();
 
   await modal.dismiss();
   await navigateTo(Routes.Home, { replace: true, skipHandle: true });
diff --git a/client/src/views/sidebar-menu/SidebarMenuPage.vue b/client/src/views/sidebar-menu/SidebarMenuPage.vue
index 214408776a9..85a64eebf5f 100644
--- a/client/src/views/sidebar-menu/SidebarMenuPage.vue
+++ b/client/src/views/sidebar-menu/SidebarMenuPage.vue
@@ -16,7 +16,7 @@
         class="sidebar"
       >
         <ion-header class="sidebar-header">
-          <div v-show="!currentRouteIsOrganizationManagementRoute()">
+          <div v-show="!isManagement()">
             <!-- active organization -->
             <ion-card class="organization-card">
               <ion-card-header
@@ -85,7 +85,7 @@
             <!-- end of active organization -->
           </div>
 
-          <div v-show="currentRouteIsOrganizationManagementRoute()">
+          <div v-show="isManagement()">
             <div
               class="back-organization"
               @click="navigateTo(Routes.Workspaces)"
@@ -154,9 +154,14 @@
             </ion-button>
           </div>
 
+          <div
+            class="list-sidebar-divider"
+            v-if="!isManagement() && (recentDocumentManager.getWorkspaces().length > 0 || favoritesWorkspaces.length > 0)"
+          />
+
           <!-- workspaces -->
           <div
-            v-show="!currentRouteIsOrganizationManagementRoute()"
+            v-show="!isManagement()"
             class="organization-workspaces"
           >
             <!-- list of favorite workspaces -->
@@ -182,7 +187,8 @@
 
             <!-- list of workspaces -->
             <sidebar-menu-list
-              title="SideMenu.workspaces"
+              v-if="recentDocumentManager.getWorkspaces().length > 0"
+              title="SideMenu.recentWorkspaces"
               :icon="business"
               class="workspaces"
               v-model:is-content-visible="workspacesMenuVisible"
@@ -195,7 +201,7 @@
                 {{ $msTranslate('SideMenu.noWorkspace') }}
               </ion-text>
               <sidebar-workspace-item
-                v-for="workspace in nonFavoriteWorkspaces"
+                v-for="workspace in recentDocumentManager.getWorkspaces()"
                 :workspace="workspace"
                 :key="workspace.id"
                 @workspace-clicked="goToWorkspace"
@@ -208,7 +214,7 @@
 
           <div
             class="list-sidebar-divider"
-            v-if="recentFileManager.getFiles().length > 0 && !currentRouteIsOrganizationManagementRoute()"
+            v-if="recentDocumentManager.getFiles().length > 0 && !currentRouteIsOrganizationManagementRoute()"
           />
 
           <!-- last opened files -->
@@ -219,12 +225,12 @@
             <sidebar-menu-list
               title="SideMenu.recentDocuments"
               :icon="documentIcon"
-              v-show="recentFileManager.getFiles().length > 0"
+              v-show="recentDocumentManager.getFiles().length > 0"
               v-model:is-content-visible="recentFilesMenuVisible"
               @update:is-content-visible="onRecentFilesMenuVisibilityChanged"
             >
               <sidebar-recent-file-item
-                v-for="file in recentFileManager.getFiles()"
+                v-for="file in recentDocumentManager.getFiles()"
                 :file="file"
                 :key="file.entryId"
                 @file-clicked="openRecentFile"
@@ -321,7 +327,6 @@ import {
   AvailableDevice,
   ClientInfo,
   UserProfile,
-  WorkspaceHandle,
   WorkspaceID,
   WorkspaceInfo,
   getCurrentAvailableDevice,
@@ -330,7 +335,6 @@ import {
   getConnectionInfo,
   getLoggedInDevices,
   LoggedInDeviceInfo,
-  needsMocks,
 } from '@/parsec';
 import {
   Routes,
@@ -383,10 +387,9 @@ import {
 } from 'ionicons/icons';
 import { Ref, computed, inject, onMounted, onUnmounted, ref, watch } from 'vue';
 import { Duration } from 'luxon';
-import { recentFileManager, RecentFile } from '@/services/recentFiles';
+import { recentDocumentManager, RecentFile } from '@/services/recentDocuments';
 import { openPath } from '@/services/fileOpener';
 import { SIDEBAR_MENU_DATA_KEY, SidebarDefaultData, SidebarSavedData } from '@/views/sidebar-menu/utils';
-import { FileContentType } from '@/common/fileTypes';
 
 const workspaces: Ref<Array<WorkspaceInfo>> = ref([]);
 const eventDistributor: EventDistributor = inject(EventDistributorKey)!;
@@ -432,8 +435,13 @@ const watchSidebarWidthCancel = watch(computedWidth, async (value: number) => {
   }, 2000);
 });
 
-async function goToWorkspace(workspaceHandle: WorkspaceHandle): Promise<void> {
-  await navigateToWorkspace(workspaceHandle);
+const isManagement = currentRouteIsOrganizationManagementRoute;
+
+async function goToWorkspace(workspace: WorkspaceInfo): Promise<void> {
+  recentDocumentManager.addWorkspace(workspace);
+  await recentDocumentManager.saveToStorage(storageManager);
+
+  await navigateToWorkspace(workspace.handle);
   await menuController.close();
 }
 
@@ -512,33 +520,6 @@ onMounted(async () => {
       expirationDuration.value = getDurationBeforeExpiration(currentDevice.value.createdOn);
     }
   }
-
-  // Adds fake files by default in dev mode
-  // to make sure we keep the feature in mind
-  if (needsMocks()) {
-    recentFileManager.addFile({
-      entryId: crypto.randomUUID().toString(),
-      workspaceHandle: 1337,
-      path: '/a/b/File_Fake image.png',
-      name: 'File_Fake image.png',
-      contentType: {
-        type: FileContentType.Image,
-        extension: 'png',
-        mimeType: 'image/png',
-      },
-    });
-    recentFileManager.addFile({
-      entryId: crypto.randomUUID().toString(),
-      workspaceHandle: 1337,
-      path: '/a/b/File_Fake PDF document.pdf',
-      name: 'File_Fake PDF document.pdf',
-      contentType: {
-        type: FileContentType.PdfDocument,
-        extension: 'pdf',
-        mimeType: 'application/pdf',
-      },
-    });
-  }
 });
 
 onUnmounted(async () => {
@@ -569,10 +550,6 @@ const favoritesWorkspaces = computed(() => {
     });
 });
 
-const nonFavoriteWorkspaces = computed(() => {
-  return workspaces.value.filter((workspace: WorkspaceInfo) => !favorites.value.includes(workspace.id));
-});
-
 function onMove(detail: GestureDetail): void {
   if (detail.currentX < MIN_WIDTH) {
     computedWidth.value = MIN_WIDTH;
@@ -610,7 +587,7 @@ async function openRecentFile(file: RecentFile): Promise<void> {
 }
 
 async function removeRecentFile(file: RecentFile): Promise<void> {
-  recentFileManager.removeFile(file);
+  recentDocumentManager.removeFile(file);
 }
 
 async function onWorkspacesMenuVisibilityChanged(visible: boolean): Promise<void> {
@@ -726,7 +703,6 @@ async function onRecentFilesMenuVisibilityChanged(visible: boolean): Promise<voi
   flex-direction: column;
   margin: 0;
   border-radius: 0;
-  border-bottom: 1px solid var(--parsec-color-light-primary-30-opacity15);
 
   &-header {
     display: flex;
@@ -794,7 +770,7 @@ async function onRecentFilesMenuVisibilityChanged(visible: boolean): Promise<voi
     flex-direction: column;
     user-select: none;
     gap: 0.75rem;
-    padding: 1rem 0 1.5rem;
+    padding: 1rem 0 0;
     margin-inline: 0.5rem;
 
     &__item {
diff --git a/client/src/views/users/UsersPage.vue b/client/src/views/users/UsersPage.vue
index 83df6323f99..c7ebd74c9ff 100644
--- a/client/src/views/users/UsersPage.vue
+++ b/client/src/views/users/UsersPage.vue
@@ -156,7 +156,7 @@ import UserGridDisplay from '@/views/users/UserGridDisplay.vue';
 import UserListDisplay from '@/views/users/UserListDisplay.vue';
 import { IonContent, IonPage, IonText, modalController, popoverController } from '@ionic/vue';
 import { informationCircle, personAdd, personRemove } from 'ionicons/icons';
-import { Ref, inject, onMounted, onUnmounted, ref } from 'vue';
+import { Ref, inject, onMounted, onUnmounted, ref, toRaw } from 'vue';
 import BulkRoleAssignmentModal from '@/views/users/BulkRoleAssignmentModal.vue';
 import { EventData, EventDistributor, EventDistributorKey, Events, InvitationUpdatedData } from '@/services/eventDistributor';
 
@@ -186,7 +186,7 @@ interface UsersPageSavedData {
 async function storeComponentData(): Promise<void> {
   await storageManager.storeComponentData<UsersPageSavedData>(USERS_PAGE_DATA_KEY, {
     displayState: displayView.value,
-    filters: users.value.getFilters(),
+    filters: toRaw(users.value.getFilters()),
     sortProperty: currentSortProperty.value,
     sortAscending: currentSortOrder.value,
   });
@@ -198,6 +198,7 @@ async function restoreComponentData(): Promise<void> {
     filters: {
       statusActive: true,
       statusRevoked: true,
+      statusFrozen: true,
       profileAdmin: true,
       profileStandard: true,
       profileOutsider: true,
diff --git a/client/src/views/workspaces/WorkspacesPage.vue b/client/src/views/workspaces/WorkspacesPage.vue
index 647c7958324..28644998191 100644
--- a/client/src/views/workspaces/WorkspacesPage.vue
+++ b/client/src/views/workspaces/WorkspacesPage.vue
@@ -213,6 +213,7 @@ import {
 } from '@ionic/vue';
 import { addCircle } from 'ionicons/icons';
 import { Ref, computed, inject, onMounted, onUnmounted, ref } from 'vue';
+import { recentDocumentManager } from '@/services/recentDocuments';
 
 enum SortWorkspaceBy {
   Name = 'name',
@@ -384,6 +385,9 @@ async function handleFileLink(fileLink: ParsecWorkspacePathAddr): Promise<boolea
     path = await Path.parent(path);
   }
 
+  recentDocumentManager.addWorkspace(workspace);
+  await recentDocumentManager.saveToStorage(storageManager);
+
   await navigateToWorkspace(workspace.handle, path, selectFile, true);
   return true;
 }
@@ -420,6 +424,14 @@ async function refreshWorkspacesList(): Promise<void> {
       }
     }
     workspaceList.value = result.value;
+    const recentWorkspaces = recentDocumentManager.getWorkspaces();
+    // If a workspace is listed in recent workspaces but not present in the list, remove it
+    for (const recentWorkspace of recentWorkspaces) {
+      if (workspaceList.value.find((wk) => wk.id === recentWorkspace.id) === undefined) {
+        recentDocumentManager.removeWorkspace(recentWorkspace);
+      }
+    }
+    await recentDocumentManager.saveToStorage(storageManager);
   } else {
     informationManager.present(
       new Information({
@@ -505,6 +517,8 @@ async function openCreateWorkspaceModal(): Promise<void> {
 }
 
 async function onWorkspaceClick(workspace: WorkspaceInfo): Promise<void> {
+  recentDocumentManager.addWorkspace(workspace);
+  await recentDocumentManager.saveToStorage(storageManager);
   await navigateToWorkspace(workspace.handle);
 }
 
diff --git a/client/tests/e2e/specs/sidebar.spec.ts b/client/tests/e2e/specs/sidebar.spec.ts
index d5b4df77769..301023f2cfc 100644
--- a/client/tests/e2e/specs/sidebar.spec.ts
+++ b/client/tests/e2e/specs/sidebar.spec.ts
@@ -20,7 +20,7 @@ msTest('Sidebar in workspaces page', async ({ connected }) => {
 
   await expect(sidebar.locator('.file-workspaces')).toBeVisible();
   await expect(sidebar.locator('.favorites')).toBeHidden();
-  await expect(sidebar.locator('.workspaces')).toBeVisible();
+  await expect(sidebar.locator('.workspaces')).toBeHidden();
 
   await expect(sidebar.locator('.manage-organization')).toBeHidden();
 });
diff --git a/client/tests/e2e/specs/workspaces_actions.spec.ts b/client/tests/e2e/specs/workspaces_actions.spec.ts
index 5194b2b79b2..9c6d555537c 100644
--- a/client/tests/e2e/specs/workspaces_actions.spec.ts
+++ b/client/tests/e2e/specs/workspaces_actions.spec.ts
@@ -26,7 +26,9 @@ async function openContextMenu(page: Page, mode: Mode): Promise<void> {
     const wk = page.locator('.workspaces-container').locator('.workspace-list-item').nth(1);
     await wk.locator('.workspace-options').click();
   } else {
-    const wk = page.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(1);
+    const sidebar = page.locator('.sidebar');
+    const a = sidebar.locator('.organization-workspaces').locator('.workspaces');
+    const wk = a.locator('.list-sidebar-content').locator('.sidebar-item-workspace').nth(0);
     await wk.hover();
     await wk.locator('.sidebar-item-workspace__option').click();
   }
@@ -79,7 +81,7 @@ for (const mode of ['grid', 'list', 'sidebar']) {
       const wk = connected.locator('.workspaces-container').locator('.workspace-list-item').nth(1);
       await wk.click({ button: 'right' });
     } else {
-      const wk = connected.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(1);
+      const wk = connected.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(0);
       await wk.click({ button: 'right' });
     }
 
@@ -107,7 +109,7 @@ for (const mode of ['grid', 'list', 'sidebar']) {
       await toggleViewMode(connected);
       await connected.locator('.workspaces-container').locator('.workspace-list-item').nth(1).click();
     } else {
-      await connected.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(1).click();
+      await connected.locator('.sidebar').locator('.list-sidebar.workspaces').getByRole('listitem').nth(0).click();
     }
     await expect(connected).toHaveHeader(['Trademeet'], true, true);
   });

From a7eb155fbd21b848dd45553077defce156b4ea40 Mon Sep 17 00:00:00 2001
From: Maxime GRANDCOLAS <maxime.grandcolas@scille.fr>
Date: Wed, 15 Jan 2025 13:06:50 +0100
Subject: [PATCH 2/2] [MS] Renamed favorites to pinned

---
 client/src/locales/en-US.json                 |  6 +--
 client/src/locales/fr-FR.json                 |  6 +--
 client/src/services/recentDocuments.ts        |  1 +
 .../views/sidebar-menu/SidebarMenuPage.vue    | 37 +++++++++++++------
 client/tests/e2e/specs/sidebar.spec.ts        |  4 +-
 .../e2e/specs/workspaces_actions.spec.ts      |  7 +++-
 6 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/client/src/locales/en-US.json b/client/src/locales/en-US.json
index f704c7144da..a7f994398b7 100644
--- a/client/src/locales/en-US.json
+++ b/client/src/locales/en-US.json
@@ -417,8 +417,8 @@
             "actionShare": "Sharing and roles",
             "actionDetails": "Details",
             "actionCopyLink": "Copy link",
-            "actionAddFavorite": "Add to favorites",
-            "actionRemoveFavorite": "Remove from favorites"
+            "actionAddFavorite": "Pin",
+            "actionRemoveFavorite": "Unpin"
         },
         "CreateWorkspaceModal": {
             "pageTitle": "Create a new workspace",
@@ -699,7 +699,7 @@
     "SideMenu": {
         "workspaces": "Workspaces",
         "recentWorkspaces": "Recent workspaces",
-        "favorites": "Favorites",
+        "favorites": "Pinned",
         "noWorkspace": "No workspaces",
         "users": "Users",
         "storage": "Storage",
diff --git a/client/src/locales/fr-FR.json b/client/src/locales/fr-FR.json
index d5956ce56d3..1b35c4623de 100644
--- a/client/src/locales/fr-FR.json
+++ b/client/src/locales/fr-FR.json
@@ -417,8 +417,8 @@
             "actionShare": "Partage et rôles",
             "actionDetails": "Détails",
             "actionCopyLink": "Copier le lien",
-            "actionAddFavorite": "Ajouter aux favoris",
-            "actionRemoveFavorite": "Retirer des favoris"
+            "actionAddFavorite": "Épingler",
+            "actionRemoveFavorite": "Désépingler"
         },
         "CreateWorkspaceModal": {
             "pageTitle": "Créer un nouvel espace de travail",
@@ -699,7 +699,7 @@
     "SideMenu": {
         "workspaces": "Espaces de travail",
         "recentWorkspaces": "Espaces récents",
-        "favorites": "Favoris",
+        "favorites": "Épinglés",
         "noWorkspace": "Aucun espace de travail",
         "users": "Utilisateurs",
         "storage": "Stockage",
diff --git a/client/src/services/recentDocuments.ts b/client/src/services/recentDocuments.ts
index 1f44842819e..cbd50beba58 100644
--- a/client/src/services/recentDocuments.ts
+++ b/client/src/services/recentDocuments.ts
@@ -99,6 +99,7 @@ class RecentDocumentManager {
   addWorkspace(workspace: RecentWorkspace): void {
     const index = this.workspaces.value.findIndex((item) => item.id === workspace.id);
     if (index !== -1) {
+      this._arrayMove(this.workspaces.value, index, 0);
     } else if (this.workspaces.value.unshift(workspace) > WORKSPACE_HISTORY_SIZE) {
       this.workspaces.value.pop();
     }
diff --git a/client/src/views/sidebar-menu/SidebarMenuPage.vue b/client/src/views/sidebar-menu/SidebarMenuPage.vue
index 85a64eebf5f..2dc2d6ab1a5 100644
--- a/client/src/views/sidebar-menu/SidebarMenuPage.vue
+++ b/client/src/views/sidebar-menu/SidebarMenuPage.vue
@@ -194,12 +194,6 @@
               v-model:is-content-visible="workspacesMenuVisible"
               @update:is-content-visible="onWorkspacesMenuVisibilityChanged"
             >
-              <ion-text
-                class="body list-sidebar__no-workspace"
-                v-if="workspaces.length === 0"
-              >
-                {{ $msTranslate('SideMenu.noWorkspace') }}
-              </ion-text>
               <sidebar-workspace-item
                 v-for="workspace in recentDocumentManager.getWorkspaces()"
                 :workspace="workspace"
@@ -210,6 +204,18 @@
                 "
               />
             </sidebar-menu-list>
+            <div
+              class="current-workspace"
+              v-if="!workspacesMenuVisible && currentWorkspace"
+            >
+              <sidebar-workspace-item
+                :workspace="currentWorkspace"
+                @workspace-click="goToWorkspace"
+                @context-menu-requested="
+                  openWorkspaceContextMenu($event, currentWorkspace, favorites, eventDistributor, informationManager, storageManager, true)
+                "
+              />
+            </div>
           </div>
 
           <div
@@ -341,6 +347,7 @@ import {
   currentRouteIs,
   currentRouteIsOrganizationManagementRoute,
   currentRouteIsUserRoute,
+  currentRouteIsWorkspaceRoute,
   navigateTo,
   navigateToWorkspace,
   switchOrganization,
@@ -437,6 +444,15 @@ const watchSidebarWidthCancel = watch(computedWidth, async (value: number) => {
 
 const isManagement = currentRouteIsOrganizationManagementRoute;
 
+const currentWorkspace = computed(() => {
+  for (const wk of recentDocumentManager.getWorkspaces()) {
+    if (currentRouteIsWorkspaceRoute(wk.handle)) {
+      return wk;
+    }
+  }
+  return undefined;
+});
+
 async function goToWorkspace(workspace: WorkspaceInfo): Promise<void> {
   recentDocumentManager.addWorkspace(workspace);
   await recentDocumentManager.saveToStorage(storageManager);
@@ -811,6 +827,10 @@ async function onRecentFilesMenuVisibilityChanged(visible: boolean): Promise<voi
   }
 }
 
+.current-workspace {
+  margin-bottom: 1rem;
+}
+
 .back-organization {
   display: flex;
   align-items: center;
@@ -873,11 +893,6 @@ ion-menu {
     gap: 0.5rem;
   }
 
-  &__no-workspace {
-    color: var(--parsec-color-light-secondary-inversed-contrast);
-    opacity: 0.5;
-  }
-
   &-divider {
     background: var(--parsec-color-light-primary-30-opacity15);
     display: flex;
diff --git a/client/tests/e2e/specs/sidebar.spec.ts b/client/tests/e2e/specs/sidebar.spec.ts
index 301023f2cfc..70ca4f73a90 100644
--- a/client/tests/e2e/specs/sidebar.spec.ts
+++ b/client/tests/e2e/specs/sidebar.spec.ts
@@ -20,7 +20,9 @@ msTest('Sidebar in workspaces page', async ({ connected }) => {
 
   await expect(sidebar.locator('.file-workspaces')).toBeVisible();
   await expect(sidebar.locator('.favorites')).toBeHidden();
-  await expect(sidebar.locator('.workspaces')).toBeHidden();
+  await expect(sidebar.locator('.workspaces')).toBeVisible();
+  await expect(sidebar.locator('.workspaces').locator('.list-sidebar-header')).toHaveText('Recent workspaces');
+  await expect(sidebar.locator('.workspaces').getByRole('listitem').nth(0)).toHaveText('Trademeet');
 
   await expect(sidebar.locator('.manage-organization')).toBeHidden();
 });
diff --git a/client/tests/e2e/specs/workspaces_actions.spec.ts b/client/tests/e2e/specs/workspaces_actions.spec.ts
index 9c6d555537c..d9775252ce9 100644
--- a/client/tests/e2e/specs/workspaces_actions.spec.ts
+++ b/client/tests/e2e/specs/workspaces_actions.spec.ts
@@ -45,7 +45,7 @@ const MENU = [
   },
   {
     title: 'Miscellaneous',
-    actions: ['Add to favorites'],
+    actions: ['Pin'],
   },
 ];
 
@@ -146,6 +146,8 @@ for (const mode of ['grid', 'list', 'sidebar']) {
   });
 
   msTest(`Toggle workspace favorite ${mode}`, async ({ connected }) => {
+    const favorites = connected.locator('.sidebar').locator('.favorites');
+    await expect(favorites).toBeHidden();
     await openContextMenu(connected, mode as Mode);
     const popover = connected.locator('.workspace-context-menu');
     await popover.getByRole('listitem').nth(7).click();
@@ -158,6 +160,9 @@ for (const mode of ['grid', 'list', 'sidebar']) {
       await expect(wk.locator('.workspace-name')).toHaveText('Trademeet');
     }
     await expect(wk.locator('.workspace-favorite-icon')).toHaveTheClass('workspace-favorite-icon__on');
+    await expect(favorites).toBeVisible();
+    await expect(favorites.locator('.list-sidebar-header')).toHaveText('Pinned');
+    await expect(favorites.getByRole('listitem').nth(0)).toHaveText('Trademeet');
   });
 
   msTest(`Open workspace sharing ${mode}`, async ({ connected }) => {