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:files): share file summary between selection and clipboard
johaven165bc13ec06c
diff --git a/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.html b/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.htmlindex f8221b52..c5ff6188 100644--- a/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.html+++ b/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.html@@ -16,7 +16,8 @@</div>@if (files.length) {<div class="px-2 pt-2 pb-2 fs-xs">- <div class="d-flex justify-content-between mt-2">+ <app-files-summary [files]="files" class="mb-2"></app-files-summary>+ <div class="d-flex justify-content-between"><select [(ngModel)]="selectedAction" class="form-select form-select-sm">@for (item of operations| keyvalue: originalOrderKeyValue; track item.key) {<option [ngValue]="item.key" l10nTranslate>{{ item.value.text }}</option>@@ -26,7 +27,7 @@</div></div><hr class="mx-0 my-2">- <div appAutoResize class="sidebar-item" [resizeOffset]=120>+ <div appAutoResize class="sidebar-item" [resizeOffset]="170">@for (f of files; track f.id) {<div class="sidebar-item-container"><div class="sidebar-item-content" [tooltip]="f.path">diff --git a/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.ts b/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.tsindex f9bb8b55..4df103cb 100644--- a/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.ts+++ b/frontend/src/app/applications/files/components/sidebar/files-clipboard.component.ts@@ -18,10 +18,20 @@ import { StoreService } from '../../../../store/store.service'import { FileModel } from '../../models/file.model'import { FilesService } from '../../services/files.service'import { FilesCompressionDialogComponent } from '../dialogs/files-compression-dialog.component'+import { FilesSummaryComponent } from '../utils/files-summary.component'@Component({selector: 'app-files-clipboard',- imports: [AutoResizeDirective, FaIconComponent, L10nTranslatePipe, TooltipModule, L10nTranslateDirective, KeyValuePipe, FormsModule],+ imports: [+ AutoResizeDirective,+ FaIconComponent,+ L10nTranslatePipe,+ TooltipModule,+ L10nTranslateDirective,+ KeyValuePipe,+ FormsModule,+ FilesSummaryComponent+ ],templateUrl: 'files-clipboard.component.html'})export class FilesClipboardComponent implements OnDestroy {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.htmlindex 35d1b080..db06d223 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@@ -1,22 +1,7 @@@if (files().length) {@if (files().length > 1) {- @let stats = selectionStats();- @let totalSize = selectionSize | async;<div class="p-2 fs-sm">- <div class="app-small-card rounded d-flex justify-content-center align-items-center text-nowrap py-2 mb-3">- <span><span class="text-bold">{{ stats.directories }}</span> {{ (stats.directories === 1 ? 'directory' : 'directories') | translate:locale.language }}</span>- <span class="mx-1 lh-1">•</span>- <span><span class="text-bold">{{ stats.files }}</span> {{ (stats.files === 1 ? 'file' : 'files') | translate:locale.language }}</span>- @if (totalSize !== null) {- <span class="mx-1 lh-1">•</span>- <span>- @if (totalSize.pendingDirectories || totalSize.hasError) {- ≥ - }- {{ totalSize.size | toBytes:0:true }}- </span>- }- </div>+ <app-files-summary [files]="files()" class="mb-2"></app-files-summary><div class="d-flex"><select [(ngModel)]="selectedAction" class="form-select form-select-sm"><option value="clipboard" l10nTranslate>Clipboard</option>@@ -28,7 +13,7 @@</div></div><hr class="mx-0 my-1">- <div appAutoResize class="sidebar-item" [resizeOffset]="200">+ <div appAutoResize class="sidebar-item" [resizeOffset]="170">@for (f of files(); track f.id) {<div class="sidebar-item-container"><div class="sidebar-item-content">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.tsindex f7f51412..29a15f5a 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@@ -1,6 +1,5 @@import { AsyncPipe } from '@angular/common'-import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core'-import { toObservable } from '@angular/core/rxjs-interop'+import { ChangeDetectionStrategy, Component, inject, input } from '@angular/core'import { FormsModule } from '@angular/forms'import { Router } from '@angular/router'import { FaIconComponent } from '@fortawesome/angular-fontawesome'@@ -8,12 +7,9 @@ import { faLock, faSpinner, faTimes, faUnlock } from '@fortawesome/free-solid-svimport { TAR_EXTENSION } from '@sync-in-server/backend/src/applications/files/constants/compress'import type { CompressFileDto } from '@sync-in-server/backend/src/applications/files/dto/file-operations.dto'import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'-import { from, of, shareReplay } from 'rxjs'-import { catchError, concatMap, scan, startWith, switchMap, tap } from 'rxjs/operators'import { BadgePermissionsComponent } from '../../../../common/components/badge-permissions.component'import { AutoResizeDirective } from '../../../../common/directives/auto-resize.directive'import { TimeDateFormatPipe } from '../../../../common/pipes/time-date-format.pipe'-import { ToBytesPipe } from '../../../../common/pipes/to-bytes.pipe'import { defaultCardImageSize } from '../../../../layout/layout.constants'import { TAB_MENU } from '../../../../layout/layout.interfaces'import { LayoutService } from '../../../../layout/layout.service'@@ -21,12 +17,13 @@ import { SPACES_ICON, SPACES_PATH } from '../../../spaces/spaces.constants'import { SYNC_ICON } from '../../../sync/sync.constants'import { UserAvatarComponent } from '../../../users/components/utils/user-avatar.component'import { USER_PATH } from '../../../users/user.constants'-import type { SelectionAction, SelectionSize } from '../../interfaces/file-selection.interface'+import type { SelectionAction } from '../../interfaces/file-selection.interface'import { FileModel } from '../../models/file.model'import { FilesService } from '../../services/files.service'import { FilesCompressionDialogComponent } from '../dialogs/files-compression-dialog.component'import { FileLockFormatPipe } from '../utils/file-lock.utils'import { FilesViewerMediaComponent } from '../viewers/files-viewer-media.component'+import { FilesSummaryComponent } from '../utils/files-summary.component'@Component({selector: 'app-files-selection',@@ -44,7 +41,7 @@ import { FilesViewerMediaComponent } from '../viewers/files-viewer-media.componeAsyncPipe,FileLockFormatPipe,FormsModule,- ToBytesPipe+ FilesSummaryComponent],styles: ['.card {width: 100%; background: transparent; border: none}']})@@ -56,33 +53,6 @@ export class FilesSelectionComponent {protected readonly locale = inject<L10nLocale>(L10N_LOCALE)protected readonly cardImageSize = defaultCardImageSizeprotected selectedAction: SelectionAction = 'clipboard'- protected readonly selectionStats = computed(() => {- const files = this.files()- const directories = files.filter((file) => file.isDir).length- return { directories, files: files.length - directories }- })- protected readonly selectionSize = toObservable(this.files).pipe(- switchMap((files) => {- const directories = files.filter((file) => file.isDir)- const initial: SelectionSize = {- size: files.reduce((size, file) => size + (file.isDir ? 0 : file.size), 0),- pendingDirectories: directories.length,- hasError: false- }- return from(directories).pipe(- concatMap((directory) => this.getSizeLazy(directory)),- scan(- (total: SelectionSize, size: number | undefined): SelectionSize => ({- size: total.size + (size ?? 0),- pendingDirectories: total.pendingDirectories - 1,- hasError: total.hasError || size === undefined- }),- initial- ),- startWith(initial)- )- })- )protected readonly icons = {SPACES: SPACES_ICON.SPACES,SHARES: SPACES_ICON.SHARES,@@ -150,10 +120,6 @@ export class FilesSelectionComponent {}getSizeLazy(f: FileModel) {- return (f.dirSize ??= this.filesService.getSize(f).pipe(- tap((size) => f.updateSize(size)),- catchError(() => of(undefined)),- shareReplay(1)- ))+ return this.filesService.getSizeLazy(f)}}diff --git a/frontend/src/app/applications/files/components/utils/files-summary.component.ts b/frontend/src/app/applications/files/components/utils/files-summary.component.tsnew file mode 100644index 00000000..b1be46a6--- /dev/null+++ b/frontend/src/app/applications/files/components/utils/files-summary.component.ts@@ -0,0 +1,78 @@+import { AsyncPipe } from '@angular/common'+import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core'+import { toObservable } from '@angular/core/rxjs-interop'+import { L10N_LOCALE, L10nLocale, L10nTranslatePipe } from 'angular-l10n'+import { from } from 'rxjs'+import { concatMap, scan, startWith, switchMap } from 'rxjs/operators'+import { ToBytesPipe } from '../../../../common/pipes/to-bytes.pipe'+import { FileModel } from '../../models/file.model'+import { FilesService } from '../../services/files.service'++interface FilesSummarySize {+ size: number+ pendingDirectories: number+ hasError: boolean+}++@Component({+ selector: 'app-files-summary',+ changeDetection: ChangeDetectionStrategy.OnPush,+ imports: [AsyncPipe, L10nTranslatePipe, ToBytesPipe],+ host: { class: 'd-block' },+ template: `+ @let fileStats = stats();+ @let sizeSummary = totalSize | async;+ <div class="app-small-card rounded d-flex justify-content-center align-items-center text-nowrap fs-sm py-2">+ <span>+ <span class="text-bold">{{ fileStats.directories }}</span>+ {{ (fileStats.directories === 1 ? 'directory' : 'directories') | translate: locale.language }}+ </span>+ <span class="mx-1 lh-1">•</span>+ <span>+ <span class="text-bold">{{ fileStats.files }}</span>+ {{ (fileStats.files === 1 ? 'file' : 'files') | translate: locale.language }}+ </span>+ @if (sizeSummary !== null) {+ <span class="mx-1 lh-1">•</span>+ <span>+ @if (sizeSummary.pendingDirectories || sizeSummary.hasError) {+ ≥ + }+ {{ sizeSummary.size | toBytes: 0 : true }}+ </span>+ }+ </div>+ `+})+export class FilesSummaryComponent {+ readonly files = input.required<FileModel[]>()+ private readonly filesService = inject(FilesService)+ protected readonly locale = inject<L10nLocale>(L10N_LOCALE)+ protected readonly stats = computed(() => {+ const files = this.files()+ const directories = files.filter((file) => file.isDir).length+ return { directories, files: files.length - directories }+ })+ protected readonly totalSize = toObservable(this.files).pipe(+ switchMap((files) => {+ const directories = files.filter((file) => file.isDir)+ const initial: FilesSummarySize = {+ size: files.reduce((size, file) => size + (file.isDir ? 0 : file.size), 0),+ pendingDirectories: directories.length,+ hasError: false+ }+ return from(directories).pipe(+ concatMap((directory) => this.filesService.getSizeLazy(directory)),+ scan(+ (total: FilesSummarySize, size: number | undefined): FilesSummarySize => ({+ size: total.size + (size ?? 0),+ pendingDirectories: total.pendingDirectories - 1,+ hasError: total.hasError || size === undefined+ }),+ initial+ ),+ startWith(initial)+ )+ })+ )+}diff --git a/frontend/src/app/applications/files/interfaces/file-selection.interface.ts b/frontend/src/app/applications/files/interfaces/file-selection.interface.tsindex 05f6253d..d509d970 100644--- a/frontend/src/app/applications/files/interfaces/file-selection.interface.ts+++ b/frontend/src/app/applications/files/interfaces/file-selection.interface.ts@@ -1,7 +1 @@export type SelectionAction = 'clipboard' | 'copyMove' | 'download' | 'compress'--export interface SelectionSize {- size: number- pendingDirectories: number- hasError: boolean-}diff --git a/frontend/src/app/applications/files/services/files.service.ts b/frontend/src/app/applications/files/services/files.service.tsindex f7b88040..63721fd7 100644--- a/frontend/src/app/applications/files/services/files.service.ts+++ b/frontend/src/app/applications/files/services/files.service.ts@@ -39,7 +39,7 @@ import { API_SPACES_TREE } from '@sync-in-server/backend/src/applications/spacesimport { SPACE_OPERATION } from '@sync-in-server/backend/src/applications/spaces/constants/spaces'import { forbiddenChars, isValidFileName } from '@sync-in-server/backend/src/common/shared'import { BsModalRef } from 'ngx-bootstrap/modal'-import { BehaviorSubject, catchError, EMPTY, filter, firstValueFrom, map, Observable, Subject, switchMap, timer } from 'rxjs'+import { BehaviorSubject, catchError, EMPTY, filter, firstValueFrom, map, Observable, of, shareReplay, Subject, switchMap, tap, timer } from 'rxjs'import { downloadWithAnchor } from '../../../common/utils/functions'import { TAB_MENU } from '../../../layout/layout.interfaces'import { LayoutService } from '../../../layout/layout.service'@@ -263,6 +263,14 @@ export class FilesService {return this.http.get<{ size: number }>(`${API_FILES_OPERATION}/${FILE_OPERATION.GET_SIZE}/${file.path}`).pipe(map((r) => r.size))}+ getSizeLazy(file: FileModel): Observable<number | undefined> {+ return (file.dirSize ??= this.getSize(file).pipe(+ tap((size) => file.updateSize(size)),+ catchError(() => of(undefined)),+ shareReplay(1)+ ))+ }+openLockDialog(file: FileModel): void {this.layout.openDialog(FilesLockDialogComponent, null, {initialState: {