Skip to content

Ceph fixes #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Ceph fixes #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf60699
Ceph fixes
javfg Sep 26, 2023
2389310
Change ceph path to winspaces
javfg Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions packages/web-app-files/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const navItems = [
}
},
{
name: $gettext('Projects'),
name: $gettext('EOS projects'),
icon: 'layout-grid',
route: {
path: `/${appInfo.id}/spaces/projects`
Expand All @@ -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/winspaces`
},
activeFor: [{ path: `/${appInfo.id}/spaces/winspaces` }],
enabled(capabilities) {
return capabilities.group_based?.capabilities?.includes('cephfs-mount') || false
}
},
{
name: $gettext('Deleted files'),
icon: 'delete-bin-5',
Expand All @@ -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
}
}
]

Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('winspaces')) {
matchingSpace = unref(spaces).find((s) => s.driveType === 'personal')
path = driveAliasAndItem
}
Expand Down