Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(spaces): harmonize share indicators and personal space labels

johavenb755649c28b0
diff --git a/backend/src/applications/spaces/constants/spaces.ts b/backend/src/applications/spaces/constants/spaces.ts
index 917bef06..d6bfa165 100644
--- a/backend/src/applications/spaces/constants/spaces.ts
+++ b/backend/src/applications/spaces/constants/spaces.ts
@@ -23,6 +23,8 @@ export enum SPACE_ALIAS {
TRASH = SPACE_REPOSITORY.TRASH
}
+export const SPACE_PERSONAL_TITLE = 'Personal space'
+
export enum SPACE_ROLE {
IS_MEMBER,
IS_MANAGER
diff --git a/backend/src/applications/spaces/services/spaces-manager.service.ts b/backend/src/applications/spaces/services/spaces-manager.service.ts
index fa734b9f..be6390f8 100644
--- a/backend/src/applications/spaces/services/spaces-manager.service.ts
+++ b/backend/src/applications/spaces/services/spaces-manager.service.ts
@@ -27,6 +27,7 @@ import {
SPACE_MAX_DISABLED_DAYS,
SPACE_OPERATION,
SPACE_PERSONAL,
+ SPACE_PERSONAL_TITLE,
SPACE_REPOSITORY,
SPACE_ROLE,
SPACE_SHARES
@@ -171,8 +172,15 @@ export class SpacesManager {
async listTrashes(user: UserModel): Promise<SpaceTrash[]> {
const trashes: SpaceTrash[] = []
- // todo: store 'Personal files' as const somewhere (used in frontend too)
- const personalTrash: SpaceTrash = { id: 0, name: 'Personal files', alias: SPACE_ALIAS.PERSONAL, nb: 0, mtime: 0, ctime: 0, enabled: true }
+ const personalTrash: SpaceTrash = {
+ id: 0,
+ name: SPACE_PERSONAL_TITLE,
+ alias: SPACE_ALIAS.PERSONAL,
+ nb: 0,
+ mtime: 0,
+ ctime: 0,
+ enabled: true
+ }
for (const space of [...(await this.listSpaces(user.id)), personalTrash] as SpaceTrash[]) {
const rPath = space.alias === SPACE_ALIAS.PERSONAL ? user.trashPath : SpaceModel.getTrashPath(space.alias)
try {
diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.html b/frontend/src/app/applications/admin/components/admin-spaces.component.html
index 2ef44b36..7744155c 100644
--- a/frontend/src/app/applications/admin/components/admin-spaces.component.html
+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.html
@@ -24,7 +24,7 @@
class="btn btn-default me-1"
[tooltip]="'Edit children shares' | translate:locale.language"
type="button">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
</button>
<div class="ms-auto">
<!--Start Filter Button-->
@@ -96,7 +96,7 @@
@case ('info') {
@if (s.counts.shares) {
<span (click)="openChildShareDialog(s)" class="badge bg-purple cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
{{ s.counts.shares }}
</span>
}
@@ -139,7 +139,7 @@
</ng-template>
@if (!!selected?.counts.shares) {
<ng-template (execute)="openChildShareDialog()" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.SHARED"></fa-icon>Edit children shares</span>
+ <span l10nTranslate><fa-icon [icon]="icons.SHARES"></fa-icon>Edit children shares</span>
</ng-template>
}
<ng-template [divider]="true" contextMenuItem></ng-template>
diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.ts b/frontend/src/app/applications/admin/components/admin-spaces.component.ts
index 7e9e739b..97938c42 100644
--- a/frontend/src/app/applications/admin/components/admin-spaces.component.ts
+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.ts
@@ -61,7 +61,7 @@ export class AdminSpacesComponent {
protected readonly TAB_MENU = TAB_MENU
protected readonly icons = {
SPACES: ADMIN_ICON.SPACES,
- SHARED: SPACES_ICON.SHARED_WITH_OTHERS,
+ SHARES: SPACES_ICON.SHARES,
faArrowDown,
faArrowUp,
faRotate,
diff --git a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html b/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
index db06d223..1d6bb91a 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
+++ b/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
@@ -94,7 +94,7 @@
<div class="d-flex col-7 col-sm-7">
@if (f.shares.length || f.links.length) {
<span class="badge bg-primary">
- <fa-icon [icon]="icons.SHARES"></fa-icon>
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
{{ f.shares.length + f.links.length }}
</span>
} @else {
@@ -162,7 +162,7 @@
}
@for (share of f.shares; track share.id) {
<div (click)="goToShare(share)" class="badge white-space-normal bg-primary cursor-pointer me-1 mb-2">
- <fa-icon [icon]="icons.SHARES"></fa-icon>
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
{{ share.name }}
</div>
}
diff --git a/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts b/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
index 29a15f5a..53112711 100755
--- a/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
+++ b/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
@@ -55,7 +55,7 @@ export class FilesSelectionComponent {
protected selectedAction: SelectionAction = 'clipboard'
protected readonly icons = {
SPACES: SPACES_ICON.SPACES,
- SHARES: SPACES_ICON.SHARES,
+ SHARED: SPACES_ICON.SHARED_WITH_OTHERS,
LINKS: SPACES_ICON.LINKS,
SYNC: SYNC_ICON.SYNC,
faLock,
diff --git a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
index 96149d48..4e45eddb 100644
--- a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
+++ b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.html
@@ -212,7 +212,7 @@
<button (click)="openSelectRootDialog()"
class="btn btn-success" type="button" l10nTranslate>
<fa-icon [icon]="icons.faPlus"></fa-icon>
- <fa-icon [icon]="icons.SHARES"></fa-icon>
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
File
</button>
@if (user.isAdmin) {
diff --git a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts
index 91b7e260..e289bb25 100644
--- a/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts
+++ b/frontend/src/app/applications/shares/components/dialogs/share-dialog.component.ts
@@ -70,7 +70,6 @@ export class ShareDialogComponent implements OnInit {
protected readonly layout = inject(LayoutService)
protected readonly icons = {
SHARED: SPACES_ICON.SHARED_WITH_OTHERS,
- SHARES: SPACES_ICON.SHARES,
LINKS: SPACES_ICON.LINKS,
faPlus,
faSpinner,
diff --git a/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html b/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html
index 420294da..3b5e42e7 100644
--- a/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html
+++ b/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.html
@@ -1,6 +1,6 @@
<div class="modal-header">
<h4 class="modal-title">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
<span>{{ share?.name || space?.name }}</span>
</h4>
<h4 class="modal-title ms-auto">
@@ -41,4 +41,4 @@
<div class="modal-footer">
<button (click)="openChildShare()" [disabled]="!selected" class="btn btn-primary" l10nTranslate type="button">Edit</button>
<button (click)="layout.closeDialog()" class="btn btn-secondary" data-dismiss="modal" l10nTranslate type="button">Close</button>
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.ts b/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.ts
index c91b2ac5..cb91687b 100644
--- a/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.ts
+++ b/frontend/src/app/applications/shares/components/dialogs/shared-children-dialog.component.ts
@@ -34,7 +34,7 @@ export class SharedChildrenDialogComponent implements OnInit {
@Input() fromAdmin = false
@Output() sharesCountEvent = new EventEmitter<number>()
protected readonly layout = inject(LayoutService)
- protected readonly icons = { SHARED: SPACES_ICON.SHARED_WITH_OTHERS, LINKS: SPACES_ICON.LINKS }
+ protected readonly icons = { SHARES: SPACES_ICON.SHARES, LINKS: SPACES_ICON.LINKS }
protected loading = false
protected childSharesLength = 0
protected childShares: ShareChildModel[]
diff --git a/frontend/src/app/applications/shares/components/shared.component.html b/frontend/src/app/applications/shares/components/shared.component.html
index 5f09936d..c3206791 100644
--- a/frontend/src/app/applications/shares/components/shared.component.html
+++ b/frontend/src/app/applications/shares/components/shared.component.html
@@ -24,7 +24,7 @@
class="btn btn-default me-1"
[tooltip]="'Edit children shares' | translate:locale.language"
type="button">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
</button>
<button (click)="goTo()"
[disabled]="!selected"
@@ -87,7 +87,7 @@
@if (s.counts.shares) {
<div (click)="openChildShareDialog(s)"
class="badge bg-purple cursor-pointer">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
{{ s.counts.shares }}
</div>
}
@@ -164,7 +164,7 @@
@case ('info') {
@if (s.counts.shares) {
<span (click)="openChildShareDialog(s)" class="badge bg-purple cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
{{ s.counts.shares }}
</span>
}
@@ -214,7 +214,7 @@
</ng-template>
@if (!!selected?.counts.shares) {
<ng-template (execute)="openChildShareDialog()" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.SHARED"></fa-icon>Edit children shares</span>
+ <span l10nTranslate><fa-icon [icon]="icons.SHARES"></fa-icon>Edit children shares</span>
</ng-template>
}
<ng-template [divider]="true" contextMenuItem></ng-template>
diff --git a/frontend/src/app/applications/shares/components/shared.component.ts b/frontend/src/app/applications/shares/components/shared.component.ts
index 0a856676..1ec96f65 100644
--- a/frontend/src/app/applications/shares/components/shared.component.ts
+++ b/frontend/src/app/applications/shares/components/shared.component.ts
@@ -77,6 +77,7 @@ export class SharedComponent implements OnInit {
protected readonly layout = inject(LayoutService)
protected readonly icons = {
SHARED: SPACES_ICON.SHARED_WITH_OTHERS,
+ SHARES: SPACES_ICON.SHARES,
faArrowRotateRight,
faArrowDown,
faArrowUp,
diff --git a/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html b/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html
index d1af1622..3bc93491 100644
--- a/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html
+++ b/frontend/src/app/applications/shares/components/sidebar/share-selection.component.html
@@ -31,7 +31,7 @@
<div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Child shares</div>
@if (share().counts.shares) {
<span (click)="childShareDialog(share())" class="badge bg-purple cursor-pointer me-1">
- <fa-icon [icon]="iconShared"></fa-icon>
+ <fa-icon [icon]="iconShares"></fa-icon>
{{ share().counts.shares }}
</span>
} @else {
@@ -57,4 +57,3 @@
-
diff --git a/frontend/src/app/applications/shares/components/sidebar/share-selection.component.ts b/frontend/src/app/applications/shares/components/sidebar/share-selection.component.ts
index 7c99f340..6e72e572 100755
--- a/frontend/src/app/applications/shares/components/sidebar/share-selection.component.ts
+++ b/frontend/src/app/applications/shares/components/sidebar/share-selection.component.ts
@@ -31,7 +31,7 @@ import { ShareRepositoryComponent } from '../utils/share-repository.component'
export class ShareSelectionComponent {
share: InputSignal<ShareFileModel> = input.required<ShareFileModel>()
protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
- protected readonly iconShared = SPACES_ICON.SHARED_WITH_OTHERS
+ protected readonly iconShares = SPACES_ICON.SHARES
protected readonly cardImageSize = defaultCardImageSize
protected readonly resizeOffset = defaultResizeOffset
private readonly layout = inject(LayoutService)
diff --git a/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html b/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html
index c382f28a..38d92bdb 100644
--- a/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html
+++ b/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.html
@@ -51,7 +51,7 @@
<div class="d-flex col-5 col-sm-5 text-bold" l10nTranslate>Child shares</div>
@if (space().counts.shares) {
<span (click)="openChildShareDialog(space())" class="badge bg-purple cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
{{ space().counts.shares }}
</span>
} @else {
@@ -81,4 +81,3 @@
}
-
diff --git a/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.ts b/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.ts
index 49910966..57b2b965 100755
--- a/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.ts
+++ b/frontend/src/app/applications/spaces/components/sidebar/space-selection.component.ts
@@ -34,7 +34,7 @@ export class SpaceSelectionComponent {
space: InputSignal<SpaceModel> = input.required<SpaceModel>()
protected readonly locale = inject<L10nLocale>(L10N_LOCALE)
protected readonly SPACE_ROLE = SPACE_ROLE
- protected readonly icons = { SPACES: SPACES_ICON.SPACES, ANCHORED: SPACES_ICON.ANCHORED, SHARED: SPACES_ICON.SHARED_WITH_OTHERS }
+ protected readonly icons = { SPACES: SPACES_ICON.SPACES, ANCHORED: SPACES_ICON.ANCHORED, SHARES: SPACES_ICON.SHARES }
protected readonly cardImageSize = defaultCardImageSize
protected resizeOffset = defaultResizeOffset
private readonly userService = inject(UserService)
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.html b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
index 67b4393d..ac9efce5 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.html
@@ -63,12 +63,12 @@
class="btn btn-default dropdown-toggle"
[tooltip]="'Share' | translate:locale.language"
type="button">
- <fa-icon [icon]="icons.SHARES"></fa-icon>
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
</button>
<ul *dropdownMenu class="dropdown-menu" role="menu">
<li role="menuitem">
<a (click)="openShareDialog()" class="dropdown-item">
- <span l10nTranslate><fa-icon [icon]="icons.SHARES"></fa-icon>New share</span>
+ <span l10nTranslate><fa-icon [icon]="icons.SHARED"></fa-icon>New share</span>
</a>
</li>
<li role="menuitem">
@@ -273,29 +273,37 @@
@case ('shares') {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer">
- <fa-icon [icon]="icons.SHARES"></fa-icon>
- {{ f.shares.length }}
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
+ @if (f.shares.length > 1) {
+ {{ f.shares.length }}
+ }
</span>
}
@case ('spaces') {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer">
<fa-icon [icon]="icons.SPACES"></fa-icon>
- {{ f.spaces.length }}
+ @if (f.spaces.length > 1) {
+ {{ f.spaces.length }}
+ }
</span>
}
@case ('links') {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer">
<fa-icon [icon]="icons.LINKS"></fa-icon>
- {{ f.links.length }}
+ @if (f.links.length > 1) {
+ {{ f.links.length }}
+ }
</span>
}
@case ('syncs') {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer">
<fa-icon [icon]="icons.SYNC"></fa-icon>
- {{ f.syncs.length }}
+ @if (f.syncs.length > 1) {
+ {{ f.syncs.length }}
+ }
</span>
}
}
@@ -452,29 +460,37 @@
@if (f.shares.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARES"></fa-icon>
- {{ f.shares.length }}
+ <fa-icon [icon]="icons.SHARED"></fa-icon>
+ @if (f.shares.length > 1) {
+ {{ f.shares.length }}
+ }
</span>
}
@if (f.links.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer me-1">
<fa-icon [icon]="icons.LINKS"></fa-icon>
- {{ f.links.length }}
+ @if (f.links.length > 1) {
+ {{ f.links.length }}
+ }
</span>
}
@if (f.spaces.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer me-1">
<fa-icon [icon]="icons.SPACES"></fa-icon>
- {{ f.spaces.length }}
+ @if (f.spaces.length > 1) {
+ {{ f.spaces.length }}
+ }
</span>
}
@if (f.syncs.length) {
<span (click)="layout.showRSideBarTab(TAB_MENU.SELECTION, true)"
class="badge bg-primary cursor-pointer">
<fa-icon [icon]="icons.SYNC"></fa-icon>
- {{ f.syncs.length }}
+ @if (f.syncs.length > 1) {
+ {{ f.syncs.length }}
+ }
</span>
}
}
@@ -572,7 +588,7 @@
}
@if (canShare.outside || inSharesList && selection[0]?.canBeReShared) {
<ng-template [subMenu]="ShareContextMenu" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.SHARES"></fa-icon>Share</span>
+ <span l10nTranslate><fa-icon [icon]="icons.SHARED"></fa-icon>Share</span>
</ng-template>
}
}
@@ -599,7 +615,7 @@
</context-menu>
<context-menu #ShareContextMenu>
<ng-template (execute)="openShareDialog()" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.SHARES"></fa-icon>New share</span>
+ <span l10nTranslate><fa-icon [icon]="icons.SHARED"></fa-icon>New share</span>
</ng-template>
<ng-template (execute)="openShareLinkDialog()" contextMenuItem>
<span l10nTranslate><fa-icon [icon]="icons.faLink"></fa-icon>New share link</span>
diff --git a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
index 06cda435..f0beebc4 100644
--- a/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces-browser.component.ts
@@ -128,7 +128,7 @@ export class SpacesBrowserComponent implements OnInit, AfterViewInit, OnDestroy
// Static
protected readonly icons = {
SPACES: SPACES_ICON.SPACES,
- SHARES: SPACES_ICON.SHARES,
+ SHARED: SPACES_ICON.SHARED_WITH_OTHERS,
TRASH: SPACES_ICON.TRASH,
PERSONAL: SPACES_ICON.PERSONAL,
LINKS: SPACES_ICON.LINKS,
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.html
index 1b05a134..a26bd099 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.html
+++ b/frontend/src/app/applications/spaces/components/spaces.component.html
@@ -26,7 +26,7 @@
class="btn btn-default me-1"
[tooltip]="'Edit children shares' | translate:locale.language"
type="button">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
</button>
<button (click)="openSpaceRootsDialog()"
[disabled]="!canManageRoots"
@@ -98,7 +98,7 @@
}
@if (s.role === SPACE_ROLE.IS_MANAGER && s.counts.shares) {
<span (click)="openChildShareDialog(s)" class="badge bg-purple cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
{{ s.counts.shares }}
</span>
}
@@ -177,7 +177,7 @@
}
@if (s.role === SPACE_ROLE.IS_MANAGER && s.counts.shares) {
<span (click)="openChildShareDialog(s)" class="badge bg-purple cursor-pointer me-1">
- <fa-icon [icon]="icons.SHARED"></fa-icon>
+ <fa-icon [icon]="icons.SHARES"></fa-icon>
{{ s.counts.shares }}
</span>
}
@@ -228,7 +228,7 @@
</ng-template>
@if (!!selected?.counts.shares) {
<ng-template (execute)="openChildShareDialog()" contextMenuItem>
- <span l10nTranslate><fa-icon [icon]="icons.SHARED"></fa-icon>Edit children shares</span>
+ <span l10nTranslate><fa-icon [icon]="icons.SHARES"></fa-icon>Edit children shares</span>
</ng-template>
}
}
diff --git a/frontend/src/app/applications/spaces/components/spaces.component.ts b/frontend/src/app/applications/spaces/components/spaces.component.ts
index a9029be6..84210726 100644
--- a/frontend/src/app/applications/spaces/components/spaces.component.ts
+++ b/frontend/src/app/applications/spaces/components/spaces.component.ts
@@ -78,7 +78,7 @@ export class SpacesComponent implements OnInit {
protected readonly TAB_MENU = TAB_MENU
protected readonly icons = {
SPACES: SPACES_ICON.SPACES,
- SHARED: SPACES_ICON.SHARED_WITH_OTHERS,
+ SHARES: SPACES_ICON.SHARES,
faAnchor,
faArrowDown,
faArrowUp,
diff --git a/frontend/src/app/applications/spaces/components/trash.component.html b/frontend/src/app/applications/spaces/components/trash.component.html
index 9761639d..6aaad200 100644
--- a/frontend/src/app/applications/spaces/components/trash.component.html
+++ b/frontend/src/app/applications/spaces/components/trash.component.html
@@ -54,12 +54,10 @@
</span>
</div>
<div class="card-footer text-center text-truncate p-1">
- <span class="no-pointer-events text-file-name-preserve" draggable="false">
- @if (t.isPersonal) {
- {{ t.name | translate:locale.language }}
- } @else {
- {{ t.name }}
- }
+ <span
+ class="no-pointer-events text-file-name-preserve"
+ draggable="false"
+ [textContent]="t.isPersonal ? (t.name | translate:locale.language) : t.name">
</span>
</div>
</div>
@@ -111,12 +109,10 @@
@case ('name') {
<div class="d-flex align-items-center">
<fa-icon [icon]="t.isPersonal ? icons.PERSONAL : icons.SPACES" class="circle-primary-icon"></fa-icon>
- <span class="no-pointer-events text-file-name-preserve" draggable="false">
- @if (t.isPersonal) {
- {{ t.name | translate:locale.language }}
- } @else {
- {{ t.name }}
- }
+ <span
+ class="no-pointer-events text-file-name-preserve"
+ draggable="false"
+ [textContent]="t.isPersonal ? (t.name | translate:locale.language) : t.name">
</span>
</div>
}
diff --git a/frontend/src/app/applications/spaces/spaces.constants.ts b/frontend/src/app/applications/spaces/spaces.constants.ts
index 4b54eadd..a154ae6d 100644
--- a/frontend/src/app/applications/spaces/spaces.constants.ts
+++ b/frontend/src/app/applications/spaces/spaces.constants.ts
@@ -10,23 +10,28 @@ import {
faLink,
faShare,
faShareNodes,
- faTrashCan,
- faUser
+ faTrashCan
} from '@fortawesome/free-solid-svg-icons'
import { SPACES_BASE_ROUTE } from '@sync-in-server/backend/src/applications/spaces/constants/routes'
-import { SPACE_ALIAS, SPACE_OPERATION, SPACE_REPOSITORY } from '@sync-in-server/backend/src/applications/spaces/constants/spaces'
+import {
+ SPACE_ALIAS,
+ SPACE_OPERATION,
+ SPACE_PERSONAL_TITLE,
+ SPACE_REPOSITORY
+} from '@sync-in-server/backend/src/applications/spaces/constants/spaces'
import { USER_PERMISSION } from '@sync-in-server/backend/src/applications/users/constants/user'
import { AppMenu, AppMenuSeparator } from '../../layout/layout.interfaces'
+import { FAVORITES_ICON, FAVORITES_PATH, FAVORITES_TITLE } from '../favorites/favorites.constants'
import { LINKS_PATH } from '../links/links.constants'
import { RECENTS_ICON, RECENTS_PATH, RECENTS_TITLE } from '../recents/recents.constants'
export const SPACES_TITLE = {
RECENTS: 'Recents',
FILES: 'Files',
- PERSONAL_SPACE: 'Personal space',
- SHORT_PERSONAL_SPACE: 'Personal',
+ PERSONAL_SPACE: SPACE_PERSONAL_TITLE,
+ PERSONAL_SPACE_SHORT: 'Personal',
COLLABORATIVE_SPACES: 'Collaborative spaces',
- SHORT_COLLABORATIVE_SPACES: 'Collaborative',
+ COLLABORATIVE_SPACES_SHORT: 'Collaborative',
TRASH: 'Trash',
SPACES: 'Spaces',
SHARES: 'Shares',
@@ -43,7 +48,7 @@ export const SPACES_ICON = {
PERSONAL: faFolderClosed,
SPACES: faLayerGroup,
SHARES: faShareNodes,
- SHARED_WITH_ME: faUser,
+ SHARED_WITH_ME: faShareNodes,
SHARED_WITH_OTHERS: faShare,
ANCHORED: faAnchor,
LINKS: faLink,
@@ -72,7 +77,7 @@ export const SPACES_PERMISSIONS_TEXT: Record<SPACE_OPERATION, { text: string; ic
m: { text: 'Edit', icon: faFilePen },
d: { text: 'Delete', icon: faFileCircleMinus },
si: { text: 'Share inside', icon: SPACES_ICON.ANCHORED },
- so: { text: 'Share outside', icon: SPACES_ICON.SHARES }
+ so: { text: 'Share outside', icon: SPACES_ICON.SHARED_WITH_OTHERS }
} as const
export const SPACES_PERMISSIONS_MODEL: Record<SPACE_OPERATION, boolean> = {
@@ -94,7 +99,7 @@ export const SPACES_MENU: AppMenu = {
icon: faFolderClosed,
link: SPACES_PATH.PERSONAL_FILES,
matchLink: new RegExp(
- `^${RECENTS_PATH.BASE}|^${SPACES_PATH.SPACES}|^${SPACES_PATH.TRASH}|^${SPACES_PATH.SHARES}|^${SPACES_PATH.SHARED}|^${SPACES_PATH.LINKS}`
+ `^${RECENTS_PATH.BASE}|^${FAVORITES_PATH.BASE}|^${SPACES_PATH.SPACES}|^${SPACES_PATH.TRASH}|^${SPACES_PATH.SHARES}|^${SPACES_PATH.SHARED}|^${SPACES_PATH.LINKS}`
),
submenus: [
{
@@ -105,7 +110,7 @@ export const SPACES_MENU: AppMenu = {
SPACES_MENU_SECTION.SPACES,
{
id: USER_PERMISSION.PERSONAL_SPACE,
- title: SPACES_TITLE.SHORT_PERSONAL_SPACE,
+ title: SPACES_TITLE.PERSONAL_SPACE_SHORT,
icon: SPACES_ICON.PERSONAL,
link: SPACES_PATH.PERSONAL_FILES,
matchLink: new RegExp(`^${SPACES_PATH.PERSONAL_FILES}[/|?]`),
@@ -113,7 +118,7 @@ export const SPACES_MENU: AppMenu = {
},
{
id: USER_PERMISSION.SPACES,
- title: SPACES_TITLE.SHORT_COLLABORATIVE_SPACES,
+ title: SPACES_TITLE.COLLABORATIVE_SPACES_SHORT,
icon: SPACES_ICON.SPACES,
link: SPACES_PATH.SPACES,
matchLink: new RegExp(`^${SPACES_PATH.SPACES}(\\?|$)|^${SPACES_PATH.SPACES}/${SPACES_PATH.FILES}/(?!${SPACES_PATH.PERSONAL}(/|\\?|$))`),