Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(frontend:common): add reusable user avatar stack tooltip
johaven160ec6644f7d
diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.html b/frontend/src/app/applications/admin/components/admin-spaces.component.htmlindex 091b9050..f964b8f8 100644--- a/frontend/src/app/applications/admin/components/admin-spaces.component.html+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.html@@ -83,11 +83,7 @@</div>}@case ('managers') {- <div class="avatar-stack">- @for (m of s.managers; track m.mid) {- <app-user-avatar [user]="m" [isMember]="true" [container]="'body'"></app-user-avatar>- }- </div>+ <app-user-avatar-stack [users]="s.managers" [isMember]="true" [container]="'body'"></app-user-avatar-stack>}@case ('storage') {@if (s.storageUsage || s.storageQuota) {diff --git a/frontend/src/app/applications/admin/components/admin-spaces.component.ts b/frontend/src/app/applications/admin/components/admin-spaces.component.tsindex c92ac03e..7e9e739b 100644--- a/frontend/src/app/applications/admin/components/admin-spaces.component.ts+++ b/frontend/src/app/applications/admin/components/admin-spaces.component.ts@@ -25,7 +25,7 @@ import { SpaceDialogComponent } from '../../spaces/components/dialogs/space-dialimport type { SpaceModel } from '../../spaces/models/space.model'import { SpacesService } from '../../spaces/services/spaces.service'import { SPACES_ICON } from '../../spaces/spaces.constants'-import { UserAvatarComponent } from '../../users/components/utils/user-avatar.component'+import { UserAvatarStackComponent } from '../../users/components/utils/user-avatar-stack.component'import { ADMIN_ICON, ADMIN_PATH, ADMIN_TITLE } from '../admin.constants'import { AdminService } from '../admin.service'import { ToBytesPipe } from '../../../common/pipes/to-bytes.pipe'@@ -36,7 +36,7 @@ import { ToBytesPipe } from '../../../common/pipes/to-bytes.pipe'KeyValuePipe,L10nTranslateDirective,FaIconComponent,- UserAvatarComponent,+ UserAvatarStackComponent,VirtualScrollComponent,TooltipModule,L10nTranslatePipe,diff --git a/frontend/src/app/applications/admin/components/admin-users.component.html b/frontend/src/app/applications/admin/components/admin-users.component.htmlindex 548ef91c..4eb500b0 100644--- a/frontend/src/app/applications/admin/components/admin-users.component.html+++ b/frontend/src/app/applications/admin/components/admin-users.component.html@@ -107,11 +107,7 @@</div>}@case ('managers') {- <div class="avatar-stack">- @for (m of u.managers; track m.mid) {- <app-user-avatar [user]="m" [isMember]="true"></app-user-avatar>- }- </div>+ <app-user-avatar-stack [users]="u.managers" [isMember]="true"></app-user-avatar-stack>}@case ('storage') {@if (u.storageUsage || u.storageQuota) {diff --git a/frontend/src/app/applications/admin/components/admin-users.component.ts b/frontend/src/app/applications/admin/components/admin-users.component.tsindex 17c457d0..d58a43f7 100644--- a/frontend/src/app/applications/admin/components/admin-users.component.ts+++ b/frontend/src/app/applications/admin/components/admin-users.component.ts@@ -34,7 +34,7 @@ import { TimeDateFormatPipe } from '../../../common/pipes/time-date-format.pipe'import { originalOrderKeyValue } from '../../../common/utils/functions'import { SortSettings, SortTable } from '../../../common/utils/sort-table'import { LayoutService } from '../../../layout/layout.service'-import { UserAvatarComponent } from '../../users/components/utils/user-avatar.component'+import { UserAvatarStackComponent } from '../../users/components/utils/user-avatar-stack.component'import { GuestUserModel } from '../../users/models/guest.model'import { UserService } from '../../users/user.service'import { ADMIN_ICON, ADMIN_PATH, ADMIN_TITLE } from '../admin.constants'@@ -60,7 +60,7 @@ import { ToBytesPipe } from '../../../common/pipes/to-bytes.pipe'ContextMenuModule,ButtonCheckboxDirective,FormsModule,- UserAvatarComponent,+ UserAvatarStackComponent,TapDirective,ToBytesPipe],diff --git a/frontend/src/app/applications/spaces/components/spaces.component.html b/frontend/src/app/applications/spaces/components/spaces.component.htmlindex 9fcaddf9..e6593f54 100644--- a/frontend/src/app/applications/spaces/components/spaces.component.html+++ b/frontend/src/app/applications/spaces/components/spaces.component.html@@ -84,15 +84,13 @@</span>@if (s.managers.length) {<span class="label-bottom-left">- @for (m of s.managers; track m.mid) {- <app-user-avatar- [user]="m"+ <app-user-avatar-stack+ [users]="s.managers"[isMember]="true"[height]="galleryMode.dimensions / 3.5"[width]="galleryMode.dimensions / 3.5"[fontSize]="galleryMode.faSize / 2.5">- </app-user-avatar>- }+ </app-user-avatar-stack></span>}<span class="label-bottom-right">@@ -169,11 +167,7 @@</div>}@case ('managers') {- <div class="avatar-stack">- @for (m of s.managers; track m.mid) {- <app-user-avatar [user]="m" [isMember]="true" [container]="'body'"></app-user-avatar>- }- </div>+ <app-user-avatar-stack [users]="s.managers" [isMember]="true" [container]="'body'"></app-user-avatar-stack>}@case ('members') {<app-badge-members [members]="s.counts"></app-badge-members>diff --git a/frontend/src/app/applications/spaces/components/spaces.component.ts b/frontend/src/app/applications/spaces/components/spaces.component.tsindex 82c88e79..832526cf 100644--- a/frontend/src/app/applications/spaces/components/spaces.component.ts+++ b/frontend/src/app/applications/spaces/components/spaces.component.ts@@ -36,7 +36,7 @@ import { TAB_MENU } from '../../../layout/layout.interfaces'import { LayoutService } from '../../../layout/layout.service'import { StoreService } from '../../../store/store.service'import { SharedChildrenDialogComponent } from '../../shares/components/dialogs/shared-children-dialog.component'-import { UserAvatarComponent } from '../../users/components/utils/user-avatar.component'+import { UserAvatarStackComponent } from '../../users/components/utils/user-avatar-stack.component'import { UserService } from '../../users/user.service'import { SpaceModel } from '../models/space.model'import { SpacesService } from '../services/spaces.service'@@ -50,7 +50,7 @@ import { SpaceUserAnchorsDialogComponent } from './dialogs/space-user-anchors-diKeyValuePipe,L10nTranslateDirective,FaIconComponent,- UserAvatarComponent,+ UserAvatarStackComponent,VirtualScrollComponent,TooltipModule,L10nTranslatePipe,diff --git a/frontend/src/app/applications/users/components/user-guests.component.html b/frontend/src/app/applications/users/components/user-guests.component.htmlindex 6c846b4c..c77d1662 100644--- a/frontend/src/app/applications/users/components/user-guests.component.html+++ b/frontend/src/app/applications/users/components/user-guests.component.html@@ -81,11 +81,7 @@</div>}@case ('managers') {- <div class="avatar-stack">- @for (m of u.managers; track m.mid) {- <app-user-avatar [user]="m" [isMember]="true" [container]="'body'"></app-user-avatar>- }- </div>+ <app-user-avatar-stack [users]="u.managers" [isMember]="true" [container]="'body'"></app-user-avatar-stack>}@case ('isActive') {<span class="{{u.isActive ? 'text-success' : 'text-danger'}}" l10nTranslate>diff --git a/frontend/src/app/applications/users/components/user-guests.component.ts b/frontend/src/app/applications/users/components/user-guests.component.tsindex c6d6e679..85bffaae 100644--- a/frontend/src/app/applications/users/components/user-guests.component.ts+++ b/frontend/src/app/applications/users/components/user-guests.component.ts@@ -23,7 +23,7 @@ import { GuestUserModel } from '../models/guest.model'import { USER_ICON, USER_PATH, USER_TITLE } from '../user.constants'import { UserService } from '../user.service'import { UserGuestDialogComponent } from './dialogs/user-guest-dialog.component'-import { UserAvatarComponent } from './utils/user-avatar.component'+import { UserAvatarStackComponent } from './utils/user-avatar-stack.component'@Component({selector: 'app-user-guests',@@ -38,7 +38,7 @@ import { UserAvatarComponent } from './utils/user-avatar.component'SearchFilterPipe,TimeDateFormatPipe,ContextMenuModule,- UserAvatarComponent,+ UserAvatarStackComponent,TapDirective,TimeAgoPipe],diff --git a/frontend/src/app/applications/users/components/utils/user-avatar-stack.component.ts b/frontend/src/app/applications/users/components/utils/user-avatar-stack.component.tsnew file mode 100644index 00000000..272de210--- /dev/null+++ b/frontend/src/app/applications/users/components/utils/user-avatar-stack.component.ts@@ -0,0 +1,76 @@+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'+import { AvailableBSPositions } from 'ngx-bootstrap/positioning'+import { TooltipModule } from 'ngx-bootstrap/tooltip'+import { OwnerType } from '../../interfaces/owner.interface'+import { MemberModel } from '../../models/member.model'+import { UserAvatarComponent } from './user-avatar.component'+import { UserAvatarTooltipComponent } from './user-avatar-tooltip.component'++@Component({+ selector: 'app-user-avatar-stack',+ changeDetection: ChangeDetectionStrategy.OnPush,+ imports: [TooltipModule, UserAvatarComponent, UserAvatarTooltipComponent],+ styles: [+ `+ :host {+ display: inline-flex;+ max-width: 100%;+ }++ .avatar-stack {+ --avatar-overlap: 18px;+ display: inline-flex;+ align-items: center;+ }++ .avatar-stack > app-user-avatar + app-user-avatar {+ margin-left: calc(var(--avatar-overlap) * -1);+ }++ .avatar-stack > app-user-avatar {+ position: relative;+ }+ `+ ],+ template: `+ <span+ class="avatar-stack"+ [tooltip]="usersTooltip"+ [isDisabled]="!users?.length"+ [placement]="tooltipPlacement"+ [container]="container"+ containerClass="user-avatar-tooltip-container"+ >+ @for (user of users || []; track trackUser($index, user)) {+ <app-user-avatar+ [user]="user"+ [isMember]="isMember"+ [unknownUserAsInfo]="unknownUserAsInfo"+ [height]="height"+ [width]="width"+ [fontSize]="fontSize"+ [disableTooltip]="true"+ >+ </app-user-avatar>+ }+ </span>++ <ng-template #usersTooltip>+ <app-user-avatar-tooltip [users]="users" [isMember]="isMember" [unknownUserAsInfo]="unknownUserAsInfo"></app-user-avatar-tooltip>+ </ng-template>+ `+})+export class UserAvatarStackComponent {+ @Input() users: (OwnerType | MemberModel | any)[] = []+ @Input() isMember = false+ @Input() unknownUserAsInfo = false+ @Input() height = 32+ @Input() width = 32+ @Input() fontSize = 16+ @Input() tooltipPlacement: AvailableBSPositions = 'auto'+ @Input() container: string = null++ protected trackUser(index: number, user: OwnerType | MemberModel | any): string | number {+ return user?.mid ?? user?.id ?? user?.login ?? user?.name ?? index+ }+}diff --git a/frontend/src/app/applications/users/components/utils/user-avatar-tooltip.component.ts b/frontend/src/app/applications/users/components/utils/user-avatar-tooltip.component.tsnew file mode 100644index 00000000..32b90a73--- /dev/null+++ b/frontend/src/app/applications/users/components/utils/user-avatar-tooltip.component.ts@@ -0,0 +1,155 @@+import { ChangeDetectionStrategy, Component, inject, Input, ViewEncapsulation } from '@angular/core'+import { FaIconComponent } from '@fortawesome/angular-fontawesome'+import { faLightbulb, faUsers, faUserShield } from '@fortawesome/free-solid-svg-icons'+import { L10N_LOCALE, L10nLocale, L10nTranslatePipe } from 'angular-l10n'+import { OwnerType } from '../../interfaces/owner.interface'+import { MemberModel } from '../../models/member.model'++@Component({+ selector: 'app-user-avatar-tooltip',+ changeDetection: ChangeDetectionStrategy.OnPush,+ encapsulation: ViewEncapsulation.None,+ imports: [FaIconComponent, L10nTranslatePipe],+ styles: [+ `+ .user-avatar-tooltip {+ display: flex;+ flex-direction: column;+ gap: 6px;+ width: max-content;+ max-width: 100%;+ text-align: left;+ }++ .user-avatar-tooltip-container .tooltip-inner {+ max-width: min(90vw, 520px);+ }++ .user-avatar-tooltip-user {+ display: flex;+ align-items: center;+ min-width: 0;+ max-width: 100%;+ }++ .user-avatar-tooltip-avatar {+ margin-right: 0.2rem;+ }++ .user-avatar-tooltip-text {+ display: flex;+ flex-direction: column;+ min-width: 0;+ }++ .user-avatar-tooltip-title,+ .user-avatar-tooltip-subtitle {+ overflow: hidden;+ }++ .user-avatar-tooltip-title {+ text-overflow: ellipsis;+ white-space: nowrap;+ font-weight: 600;+ }++ .user-avatar-tooltip-subtitle {+ opacity: 0.8;+ font-size: 0.75rem;+ text-overflow: ellipsis;+ white-space: nowrap;+ }+ `+ ],+ template: `+ <div class="user-avatar-tooltip">+ @for (tooltipUser of tooltipUsers; track trackUser($index, tooltipUser)) {+ <div class="user-avatar-tooltip-user">+ @if (userHasAvatar(tooltipUser)) {+ <img alt="" class="avatar-base-img user-avatar-tooltip-avatar" height="24" width="24" [src]="tooltipUser.avatarUrl" />+ } @else {+ <fa-icon+ [icon]="userIcon()"+ [class.circle-primary-icon]="isMember"+ [class.circle-gray-icon]="!isMember"+ class="user-avatar-tooltip-avatar"+ [style.min-width.px]="24"+ [style.min-height.px]="24"+ [style.font-size.px]="12"+ >+ </fa-icon>+ }+ <div class="user-avatar-tooltip-text">+ @if (translateTitle(tooltipUser)) {+ <span class="user-avatar-tooltip-title">{{ userTitle(tooltipUser) | translate: locale.language }}</span>+ } @else {+ <span class="user-avatar-tooltip-title">{{ userTitle(tooltipUser) }}</span>+ }+ @if (userSubtitle(tooltipUser); as subtitle) {+ @if (translateSubtitle(tooltipUser)) {+ <span class="user-avatar-tooltip-subtitle">{{ subtitle | translate: locale.language }}</span>+ } @else {+ <span class="user-avatar-tooltip-subtitle">{{ subtitle }}</span>+ }+ }+ </div>+ </div>+ }+ </div>+ `+})+export class UserAvatarTooltipComponent {+ @Input() user: OwnerType | MemberModel | any+ @Input() users: (OwnerType | MemberModel | any)[] = []+ @Input() isMember = false+ @Input() unknownUserAsInfo = false+ protected readonly locale = inject<L10nLocale>(L10N_LOCALE)+ protected readonly icons = { faUsers, faUserShield, faLightbulb }++ protected get tooltipUsers(): (OwnerType | MemberModel | any)[] {+ if (this.users?.length) {+ return this.users+ }+ return this.user ? [this.user] : []+ }++ protected trackUser(index: number, user: OwnerType | MemberModel | any): string | number {+ return user?.mid ?? user?.id ?? user?.login ?? user?.name ?? index+ }++ protected userHasAvatar(user: OwnerType | MemberModel | any): boolean {+ return this.isMember ? user?.isUser : !!user?.login+ }++ protected userIcon() {+ return this.isMember ? this.icons.faUsers : this.unknownUserAsInfo ? this.icons.faLightbulb : this.icons.faUserShield+ }++ protected userTitle(user: OwnerType | MemberModel | any): string {+ if (this.isMember) {+ return user?.name+ }+ if (user?.login) {+ return user?.fullName+ }+ return this.unknownUserAsInfo ? 'Info' : 'Administrator'+ }++ protected userSubtitle(user: OwnerType | MemberModel | any): string {+ if (this.isMember) {+ return user?.description ?? user?.type+ }+ if (user?.login) {+ return user?.email+ }+ return null+ }++ protected translateTitle(user: OwnerType | MemberModel | any): boolean {+ return !this.isMember && !user?.login+ }++ protected translateSubtitle(user: OwnerType | MemberModel | any): boolean {+ return this.isMember && !user?.isUser && !!user?.type+ }+}diff --git a/frontend/src/app/applications/users/components/utils/user-avatar.component.ts b/frontend/src/app/applications/users/components/utils/user-avatar.component.tsindex 8ddc34d1..9fc2fef3 100644--- a/frontend/src/app/applications/users/components/utils/user-avatar.component.ts+++ b/frontend/src/app/applications/users/components/utils/user-avatar.component.ts@@ -1,68 +1,51 @@-import { ChangeDetectionStrategy, Component, inject, Input, OnInit } from '@angular/core'+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'import { FaIconComponent } from '@fortawesome/angular-fontawesome'import { faLightbulb, faUsers, faUserShield } from '@fortawesome/free-solid-svg-icons'-import { L10N_LOCALE, L10nLocale, L10nTranslatePipe } from 'angular-l10n'import { AvailableBSPositions } from 'ngx-bootstrap/positioning'import { TooltipModule } from 'ngx-bootstrap/tooltip'import { OwnerType } from '../../interfaces/owner.interface'import { MemberModel } from '../../models/member.model'+import { UserAvatarTooltipComponent } from './user-avatar-tooltip.component'@Component({selector: 'app-user-avatar',changeDetection: ChangeDetectionStrategy.OnPush,- imports: [TooltipModule, FaIconComponent, L10nTranslatePipe],+ imports: [TooltipModule, FaIconComponent, UserAvatarTooltipComponent],template: `- @if (isMember) {- @if (user.isUser) {- <img- alt=""- class="avatar-base-img cursor-pointer me-1"- [height]="height"- [width]="width"- [src]="user.avatarUrl"- tooltip="{{ user.name }} - {{ user.description }}"- [placement]="tooltipPlacement"- [container]="container"- />- } @else {- <fa-icon- [icon]="icons.faUsers"- class="circle-primary-icon cursor-pointer me-1"- tooltip="{{ user.name }} - {{ user.type | translate: locale.language }}"- [placement]="tooltipPlacement"- [container]="container"- [style.min-width.px]="width"- [style.min-height.px]="height"- [style.font-size.px]="fontSize"- >- </fa-icon>- }+ @if (userHasAvatar()) {+ <img+ alt=""+ class="avatar-base-img cursor-pointer me-1"+ [height]="height"+ [width]="width"+ [src]="user.avatarUrl"+ [tooltip]="userTooltip"+ [isDisabled]="disableTooltip"+ [placement]="tooltipPlacement"+ [container]="container"+ containerClass="user-avatar-tooltip-container"+ />} @else {- @if (user.login) {- <img- alt=""- class="avatar-base-img cursor-pointer me-1"- [height]="height"- [width]="width"- [src]="user.avatarUrl"- tooltip="{{ user.fullName }} - {{ user.email }}"- [placement]="tooltipPlacement"- [container]="container"- />- } @else {- <fa-icon- [icon]="unknownUserAsInfo ? icons.faLightbulb : icons.faUserShield"- class="circle-gray-icon cursor-pointer me-1"- [tooltip]="(unknownUserAsInfo ? 'Info' : 'Administrator') | translate: locale.language"- [placement]="tooltipPlacement"- [container]="container"- [style.min-width.px]="width"- [style.min-height.px]="height"- [style.font-size.px]="fontSize"- >- </fa-icon>- }+ <fa-icon+ [icon]="userIcon()"+ [class.circle-primary-icon]="isMember"+ [class.circle-gray-icon]="!isMember"+ class="cursor-pointer me-1"+ [tooltip]="userTooltip"+ [isDisabled]="disableTooltip"+ [placement]="tooltipPlacement"+ [container]="container"+ containerClass="user-avatar-tooltip-container"+ [style.min-width.px]="width"+ [style.min-height.px]="height"+ [style.font-size.px]="fontSize"+ >+ </fa-icon>}++ <ng-template #userTooltip>+ <app-user-avatar-tooltip [user]="user" [isMember]="isMember" [unknownUserAsInfo]="unknownUserAsInfo"></app-user-avatar-tooltip>+ </ng-template>`})export class UserAvatarComponent implements OnInit {@@ -74,7 +57,7 @@ export class UserAvatarComponent implements OnInit {@Input() fontSize = 16@Input() tooltipPlacement: AvailableBSPositions = 'auto'@Input() container: string = null- protected readonly locale = inject<L10nLocale>(L10N_LOCALE)+ @Input() disableTooltip = falseprotected readonly icons = { faUsers, faUserShield, faLightbulb }ngOnInit(): void {@@ -82,4 +65,12 @@ export class UserAvatarComponent implements OnInit {this.fontSize = 13}}++ protected userHasAvatar(): boolean {+ return this.isMember ? this.user?.isUser : !!this.user?.login+ }++ protected userIcon() {+ return this.isMember ? this.icons.faUsers : this.unknownUserAsInfo ? this.icons.faLightbulb : this.icons.faUserShield+ }}diff --git a/frontend/src/styles/components/_app.scss b/frontend/src/styles/components/_app.scssindex f49c642d..e7bd82f0 100755--- a/frontend/src/styles/components/_app.scss+++ b/frontend/src/styles/components/_app.scss@@ -307,20 +307,6 @@}}-.avatar-stack {- --avatar-overlap: 14px;- display: inline-flex;- align-items: center;-}--.avatar-stack > * + * {- margin-left: calc(var(--avatar-overlap) * -1);-}--.avatar-stack > * {- position: relative;-}-.app-top-menu {display: flex;justify-content: flex-start;