fix new version uploader parameters

Alfresco · Aug 2, 2024 · 5534648 · 5534648
1 parent 9ce733a
commit 5534648
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/lib/content-services/src/lib/new-version-uploader/models/new-version-uploader.model.ts b/lib/content-services/src/lib/new-version-uploader/models/new-version-uploader.model.ts
@@ -24,6 +24,8 @@ export interface NewVersionUploaderDialogData {
     file?: File;
     currentVersion?: Version;
     showVersionsOnly?: boolean;
+    showComments?: boolean;
+    allowDownload?: true;
 }
 
 export type NewVersionUploaderData = VersionManagerUploadData | ViewVersion | RefreshData;

diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.html b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.html
@@ -18,8 +18,8 @@ <h1 class="adf-new-version-uploader-dialog-title" mat-dialog-title data-automati
       <div class="adf-version-list-table">
         <adf-version-list
           [node]="data.node"
-          [showComments]="'adf-version-manager.allowComments' | adfAppConfig: true"
-          [allowDownload]="'adf-version-manager.allowDownload' | adfAppConfig: true"
+          [showComments]="data.showComments"
+          [allowDownload]="data.allowDownload"
           (deleted)="refresh($event)"
           (restored)="refresh($event)"
           (viewVersion)="onViewingVersion($event)"

diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.ts
@@ -21,7 +21,6 @@ import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/materia
 import { NewVersionUploaderDialogData, NewVersionUploaderData, NewVersionUploaderDataAction } from './models';
 import { CommonModule } from '@angular/common';
 import { VersionComparisonComponent } from '../version-manager/version-comparison.component';
-import { AppConfigPipe } from '@alfresco/adf-core';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
 import { VersionUploadComponent } from '../version-manager/version-upload.component';
@@ -33,7 +32,6 @@ import { VersionListComponent } from '../version-manager/version-list.component'
     imports: [
         CommonModule,
         MatDialogModule,
-        AppConfigPipe,
         TranslateModule,
         MatButtonModule,
         VersionComparisonComponent,

diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.ts
@@ -19,7 +19,7 @@ import { Injectable } from '@angular/core';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { AlfrescoApiService } from '@alfresco/adf-core';
 import { NewVersionUploaderDialogComponent } from './new-version-uploader.dialog';
-import { VersionPaging, VersionsApi } from '@alfresco/js-api';
+import { VersionsApi } from '@alfresco/js-api';
 import { NewVersionUploaderData, NewVersionUploaderDialogData } from './models';
 import { Observable } from 'rxjs';
 import { OverlayContainer } from '@angular/cdk/overlay';
@@ -45,25 +45,30 @@ export class NewVersionUploaderService {
      * @param data data to pass to MatDialog
      * @param config allow to override default MatDialogConfig
      * @param selectorAutoFocusedOnClose element's selector which should be autofocused after closing modal
+     * @param showComments enable comments
+     * @param allowDownload enable version download
      * @returns an Observable represents the triggered dialog action or an error in case of an error condition
      */
     openUploadNewVersionDialog(
         data: NewVersionUploaderDialogData,
         config?: MatDialogConfig,
-        selectorAutoFocusedOnClose?: string
+        selectorAutoFocusedOnClose?: string,
+        showComments = true,
+        allowDownload = true
     ): Observable<NewVersionUploaderData> {
         const { file, node, showVersionsOnly } = data;
-        const showComments = true;
-        const allowDownload = true;
 
         return new Observable((observer) => {
-            this.versionsApi.listVersionHistory(node.id).then((versionPaging: VersionPaging) => {
-                const dialogRef = this.dialog.open(NewVersionUploaderDialogComponent, {
-                    data: { file, node, currentVersion: versionPaging.list.entries[0].entry, showComments, allowDownload, showVersionsOnly },
-                    panelClass: this.composePanelClass(showVersionsOnly),
-                    width: '630px',
-                    ...(config && Object.keys(config).length > 0 && config)
-                });
+            this.versionsApi.listVersionHistory(node.id).then((versionPaging) => {
+                const dialogRef = this.dialog.open<NewVersionUploaderDialogComponent, NewVersionUploaderDialogData>(
+                    NewVersionUploaderDialogComponent,
+                    {
+                        data: { file, node, currentVersion: versionPaging.list.entries[0].entry, showComments, allowDownload, showVersionsOnly },
+                        panelClass: this.composePanelClass(showVersionsOnly),
+                        width: '630px',
+                        ...(config && Object.keys(config).length > 0 && config)
+                    }
+                );
                 dialogRef.componentInstance.dialogAction.asObservable().subscribe((newVersionUploaderData) => {
                     observer.next(newVersionUploaderData);
                 });

diff --git a/...s-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts b/...s-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
@@ -227,8 +227,8 @@ export class AttachFileCloudWidgetComponent extends UploadCloudWidgetComponent i
         this.processCloudContentService.downloadFile(file.id);
     }
 
-    onUploadNewFileVersion(node: NewVersionUploaderDialogData): void {
-        this.newVersionUploaderService.openUploadNewVersionDialog(node).subscribe(
+    onUploadNewFileVersion(config: NewVersionUploaderDialogData): void {
+        this.newVersionUploaderService.openUploadNewVersionDialog(config).subscribe(
             (newVersionUploaderData) => {
                 if (newVersionUploaderData.action === NewVersionUploaderDataAction.upload) {
                     this.replaceOldFileVersionWithNew(newVersionUploaderData as VersionManagerUploadData);