From bf606995f12de3b8c110e450de80c1bd8d114395 Mon Sep 17 00:00:00 2001
From: Javier Ferrer <javier.ferrer@cern.ch>
Date: Tue, 26 Sep 2023 14:15:44 +0200
Subject: [PATCH 1/2] Ceph fixes

---
 packages/web-app-files/src/index.ts           | 24 +++++++++----------
 .../driveResolver/useDriveResolver.ts         |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/web-app-files/src/index.ts b/packages/web-app-files/src/index.ts
index eb63b4456f7..2fb8b2fbcb6 100644
--- a/packages/web-app-files/src/index.ts
+++ b/packages/web-app-files/src/index.ts
@@ -70,7 +70,7 @@ const navItems = [
     }
   },
   {
-    name: $gettext('Projects'),
+    name: $gettext('EOS projects'),
     icon: 'layout-grid',
     route: {
       path: `/${appInfo.id}/spaces/projects`
@@ -80,6 +80,17 @@ const navItems = [
       return capabilities.spaces && capabilities.spaces.projects === true
     }
   },
+  {
+    name: $gettext('Win spaces'),
+    icon: 'layout-grid',
+    route: {
+      path: `/${appInfo.id}/spaces/cephfs`
+    },
+    activeFor: [{ path: `/${appInfo.id}/spaces/cephfs` }],
+    enabled(capabilities) {
+      return capabilities.group_based?.capabilities?.includes('cephfs-mount') || false
+    }
+  },
   {
     name: $gettext('Deleted files'),
     icon: 'delete-bin-5',
@@ -104,17 +115,6 @@ const navItems = [
     enabled(capabilities) {
       return true
     }
-  },
-  {
-    name: $gettext('HPC Data'),
-    icon: 'folder',
-    route: {
-      path: `/${appInfo.id}/spaces/cephfs`
-    },
-    separate: true,
-    enabled(capabilities) {
-      return capabilities.group_based?.capabilities?.includes('cephfs-mount') || false
-    }
   }
 ]
 
diff --git a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
index 0fe71a86011..4e015e89c81 100644
--- a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
+++ b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
@@ -95,7 +95,7 @@ export const useDriveResolver = (options: DriveResolverOptions = {}): DriveResol
         }
         if (matchingSpace) {
           path = driveAliasAndItem.slice(matchingSpace.driveAlias.length)
-        } else if (driveAliasAndItem.startsWith('eos')) {
+        } else if (driveAliasAndItem.startsWith('eos') || driveAliasAndItem.startsWith('cephfs')) {
           matchingSpace = unref(spaces).find((s) => s.driveType === 'personal')
           path = driveAliasAndItem
         }

From 23893106193616a2ade3852238fb139670460f4b Mon Sep 17 00:00:00 2001
From: Javier Ferrer <javier.ferrer@cern.ch>
Date: Mon, 2 Oct 2023 15:22:26 +0200
Subject: [PATCH 2/2] Change ceph path to winspaces

---
 packages/web-app-files/src/index.ts                           | 4 ++--
 .../web-pkg/src/composables/driveResolver/useDriveResolver.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/web-app-files/src/index.ts b/packages/web-app-files/src/index.ts
index 2fb8b2fbcb6..295d67702cc 100644
--- a/packages/web-app-files/src/index.ts
+++ b/packages/web-app-files/src/index.ts
@@ -84,9 +84,9 @@ const navItems = [
     name: $gettext('Win spaces'),
     icon: 'layout-grid',
     route: {
-      path: `/${appInfo.id}/spaces/cephfs`
+      path: `/${appInfo.id}/spaces/winspaces`
     },
-    activeFor: [{ path: `/${appInfo.id}/spaces/cephfs` }],
+    activeFor: [{ path: `/${appInfo.id}/spaces/winspaces` }],
     enabled(capabilities) {
       return capabilities.group_based?.capabilities?.includes('cephfs-mount') || false
     }
diff --git a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
index 4e015e89c81..4ddf9fe0771 100644
--- a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
+++ b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
@@ -95,7 +95,7 @@ export const useDriveResolver = (options: DriveResolverOptions = {}): DriveResol
         }
         if (matchingSpace) {
           path = driveAliasAndItem.slice(matchingSpace.driveAlias.length)
-        } else if (driveAliasAndItem.startsWith('eos') || driveAliasAndItem.startsWith('cephfs')) {
+        } else if (driveAliasAndItem.startsWith('eos') || driveAliasAndItem.startsWith('winspaces')) {
           matchingSpace = unref(spaces).find((s) => s.driveType === 'personal')
           path = driveAliasAndItem
         }