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
fix(frontend:files): reconcile file metadata after editor close
johaven1c6d494870b7
diff --git a/frontend/src/app/applications/files/components/utils/only-office.component.ts b/frontend/src/app/applications/files/components/utils/only-office.component.tsindex 6e432958..3e159e20 100644--- a/frontend/src/app/applications/files/components/utils/only-office.component.ts+++ b/frontend/src/app/applications/files/components/utils/only-office.component.ts@@ -12,7 +12,6 @@ export class OnlyOfficeComponent implements OnInit, OnChanges, OnDestroy {@Input({ required: true }) documentServerUrl: string@Input({ required: true }) config: OnlyOfficeConfig@Output() loadError = new EventEmitter<{ title: string; message: string }>()- @Output() wasSaved = new EventEmitter<string>()private isFirstOnChanges = truengOnInit(): void {@@ -68,7 +67,6 @@ export class OnlyOfficeComponent implements OnInit, OnChanges, OnDestroy {}const config: OnlyOfficeConfig = JSON.parse(JSON.stringify(this.config))- config.events = { onDocumentStateChange: (e: { data: boolean }) => (e.data ? this.wasSaved.emit() : null) }window.DocEditor.instances[this.id] = window.DocsAPI.DocEditor(this.id, config)} catch (err) {console.error(err)diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.ts b/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.tsindex 273ac28d..925ed9d0 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.ts+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-collabora-online.component.ts@@ -8,6 +8,7 @@ import { API_COLLABORA_ONLINE_SETTINGS } from '@sync-in-server/backend/src/appliimport { LayoutService } from '../../../../layout/layout.service'import { StoreService } from '../../../../store/store.service'import { FileModel } from '../../models/file.model'+import { FilesService } from '../../services/files.service'import { fileLockPropsToString } from '../utils/file-lock.utils'@Component({@@ -40,9 +41,11 @@ export class FilesViewerCollaboraOnlineComponent implements OnInit, OnDestroy {currentHeight = input<number>()protected documentServerUrl: SafeResourceUrl = nullprivate readonly http = inject(HttpClient)+ private readonly filesService = inject(FilesService)private readonly layout = inject(LayoutService)private readonly store = inject(StoreService)private readonly sanitizer = inject(DomSanitizer)+ private shouldReconcileMetadata = falsengOnInit() {this.http.get<CollaboraOnlineReqDto>(`${API_COLLABORA_ONLINE_SETTINGS}/${this.file().path}`).subscribe({@@ -61,6 +64,7 @@ export class FilesViewerCollaboraOnlineComponent implements OnInit, OnDestroy {}}this.isReadonly.set(data.mode === FILE_MODE.VIEW)+ this.shouldReconcileMetadata = !this.isReadonly()if (!this.isReadonly() && !this.file().lock) {// Set lock on filethis.file().createLock({@@ -83,6 +87,9 @@ export class FilesViewerCollaboraOnlineComponent implements OnInit, OnDestroy {}ngOnDestroy() {+ if (this.shouldReconcileMetadata) {+ this.filesService.reconcileMetadataAfterEditorClose(this.file())+ }if (!this.isReadonly() && this.file().lock && this.file().lock.owner.login === this.store.user.getValue().login) {// Remove lockthis.file().removeLock()diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-only-office.component.ts b/frontend/src/app/applications/files/components/viewers/files-viewer-only-office.component.tsindex 5d850984..1b282907 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-only-office.component.ts+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-only-office.component.ts@@ -7,6 +7,7 @@ import { API_ONLY_OFFICE_SETTINGS } from '@sync-in-server/backend/src/applicatioimport { LayoutService } from '../../../../layout/layout.service'import { StoreService } from '../../../../store/store.service'import { FileModel } from '../../models/file.model'+import { FilesService } from '../../services/files.service'import { fileLockPropsToString } from '../utils/file-lock.utils'import { OnlyOfficeComponent } from '../utils/only-office.component'@@ -30,7 +31,6 @@ import { OnlyOfficeComponent } from '../utils/only-office.component'[documentServerUrl]="documentConfig.documentServerUrl"[config]="documentConfig.config"(loadError)="loadError($event)"- (wasSaved)="onSave()"></app-files-onlyoffice-document></div>}@@ -43,8 +43,10 @@ export class FilesViewerOnlyOfficeComponent implements OnInit, OnDestroy {protected docId: stringprotected documentConfig: OnlyOfficeReqDto = nullprivate readonly http = inject(HttpClient)+ private readonly filesService = inject(FilesService)private readonly layout = inject(LayoutService)private readonly store = inject(StoreService)+ private shouldReconcileMetadata = falseprotected readonly officeEditorName = this.store.server().files.editors.onlyoffice ? ONLY_OFFICE_APP_LOCK : EURO_OFFICE_APP_LOCKngOnInit() {@@ -65,6 +67,7 @@ export class FilesViewerOnlyOfficeComponent implements OnInit, OnDestroy {}}this.isReadonly.set(data.config.editorConfig.mode === FILE_MODE.VIEW)+ this.shouldReconcileMetadata = !this.isReadonly()if (!this.isReadonly() && !this.file().lock) {// Set lock on filethis.file().createLock({@@ -97,11 +100,10 @@ export class FilesViewerOnlyOfficeComponent implements OnInit, OnDestroy {this.layout.sendNotification('error', e.title, e.message)}- onSave() {- this.file().updateHTimeAgo()- }-ngOnDestroy() {+ if (this.shouldReconcileMetadata) {+ this.filesService.reconcileMetadataAfterEditorClose(this.file())+ }if (!this.isReadonly() && this.file().lock && this.file().lock.owner.login === this.store.user.getValue().login) {// Remove lockthis.file().removeLock()diff --git a/frontend/src/app/applications/files/services/files.service.ts b/frontend/src/app/applications/files/services/files.service.tsindex a9871250..66445e67 100644--- a/frontend/src/app/applications/files/services/files.service.ts+++ b/frontend/src/app/applications/files/services/files.service.ts@@ -1,5 +1,5 @@import type { TreeNode } from '@ali-hm/angular-tree-component'-import { HttpClient, HttpErrorResponse, HttpParams } from '@angular/common/http'+import { HttpClient, HttpErrorResponse, HttpParams, HttpResponse } from '@angular/common/http'import { inject, Injectable } from '@angular/core'import { DomSanitizer } from '@angular/platform-browser'import { TAR_EXTENSION, TAR_GZ_EXTENSION } from '@sync-in-server/backend/src/applications/files/constants/compress'@@ -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 { EMPTY, firstValueFrom, map, Observable, Subject } from 'rxjs'+import { catchError, EMPTY, filter, firstValueFrom, map, Observable, Subject, switchMap, timer } from 'rxjs'import { downloadWithAnchor } from '../../../common/utils/functions'import { TAB_MENU } from '../../../layout/layout.interfaces'import { LayoutService } from '../../../layout/layout.service'@@ -67,6 +67,7 @@ export class FilesService {public clipboardAction: 'copyPaste' | 'cutPaste' = 'copyPaste'// Filespublic currentRoute: string+ private readonly editorMetadataReconciliationDelay = 2_000private readonly textFileSizeLimitExceededMessage = 'File size limit exceeded'private readonly textBinaryProbeBytes = 4096private readonly http = inject(HttpClient)@@ -303,12 +304,26 @@ export class FilesService {await this.openViewerAfterAvailabilityCheck(file, directoryFiles, permissions).catch((e) => this.sendOpenDocumentError(file, e))return}- this.http.head(file.dataUrl).subscribe({- next: () => this.openViewerAfterAvailabilityCheck(file, directoryFiles, permissions).catch((e) => this.sendOpenDocumentError(file, e)),+ this.http.head(file.dataUrl, { observe: 'response' }).subscribe({+ next: (response) => {+ this.syncFileMetadata(file, response)+ this.openViewerAfterAvailabilityCheck(file, directoryFiles, permissions).catch((e) => this.sendOpenDocumentError(file, e))+ },error: (e: HttpErrorResponse | any) => this.sendOpenDocumentError(file, e)})}+ reconcileMetadataAfterEditorClose(file: FileModel, delay = this.editorMetadataReconciliationDelay): void {+ const fileDirectory = file.path.split('/').slice(0, -1).join('/')+ timer(delay)+ .pipe(+ filter(() => this.currentRoute === fileDirectory),+ switchMap(() => this.http.head(file.dataUrl, { observe: 'response' })),+ catchError(() => EMPTY)+ )+ .subscribe((response) => this.syncFileMetadata(file, response))+ }+private async openViewerAfterAvailabilityCheck(file: FileModel, directoryFiles: FileModel[], permissions: string): Promise<void> {// This check is only used for the text viewer; other viewers are read-only or enforce permissions on the backend.const isWriteable = !file?.lock?.isExclusive && permissions.includes(SPACE_OPERATION.MODIFY)@@ -386,6 +401,21 @@ export class FilesService {this.layout.sendNotification('error', 'Unable to open document', file?.name, e)}+ private syncFileMetadata(file: FileModel, response: HttpResponse<unknown>): void {+ const lastModified = response.headers.get('last-modified')+ const contentLength = response.headers.get('content-length')+ const mtime = lastModified ? Date.parse(lastModified) : NaN+ const size = contentLength !== null ? Number(contentLength) : NaN+ const mtimeChanged = Number.isFinite(mtime) && mtime !== Math.floor(file.mtime / 1_000) * 1_000+ const sizeChanged = Number.isFinite(size) && size !== file.size+ if (!mtimeChanged && !sizeChanged) return+ if (Number.isFinite(mtime)) {+ file.mtime = mtime+ file.updateHTimeAgo(mtime)+ }+ if (Number.isFinite(size)) file.updateSize(size)+ }+private async viewerHook(file: FileModel): Promise<ViewerHookResult> {if (file.shortMime === SHORT_MIME.TEXT || file.shortMime === SHORT_MIME.MARKDOWN) {if (file.shortMime === SHORT_MIME.TEXT && (await this.hasBinaryContent(file))) {