From 2e75d64995fcdcc4a54af3ee86d31709f8ebfac8 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 25 Jul 2024 12:23:21 -0400 Subject: [PATCH] ACS-7408: version manager as standalone --- .../src/lib/content.module.ts | 6 ++-- .../new-version-uploader.dialog.spec.ts | 10 +++++-- .../version-comparison.component.html | 4 +-- .../version-comparison.component.ts | 11 ++++---- .../version-manager/version-list.component.ts | 24 +++++++++++++++- .../version-manager.component.html | 8 +----- .../version-manager.component.ts | 26 ++++++++--------- .../version-manager/version-manager.module.ts | 21 +++++++------- .../version-upload.component.html | 9 +++--- .../version-upload.component.ts | 28 +++++++++++-------- 10 files changed, 87 insertions(+), 60 deletions(-) diff --git a/lib/content-services/src/lib/content.module.ts b/lib/content-services/src/lib/content.module.ts index 5600cf43c1..9f53ac56f2 100644 --- a/lib/content-services/src/lib/content.module.ts +++ b/lib/content-services/src/lib/content.module.ts @@ -25,7 +25,7 @@ import { DocumentListModule } from './document-list/document-list.module'; import { UploadModule } from './upload/upload.module'; import { SearchModule } from './search/search.module'; import { BREADCRUMB_DIRECTIVES } from './breadcrumb/breadcrumb.module'; -import { VersionManagerModule } from './version-manager/version-manager.module'; +import { CONTENT_VERSION_DIRECTIVES } from './version-manager/version-manager.module'; import { ContentNodeSelectorModule } from './content-node-selector/content-node-selector.module'; import { ContentNodeShareModule } from './content-node-share/content-node-share.module'; import { ContentDirectiveModule } from './directives/content-directive.module'; @@ -68,7 +68,7 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader'; ...CONTENT_METADATA_DIRECTIVES, ContentDirectiveModule, PermissionManagerModule, - VersionManagerModule, + ...CONTENT_VERSION_DIRECTIVES, TreeViewModule, ContentTypeModule, AspectListModule, @@ -95,7 +95,7 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader'; ...CONTENT_DIALOG_DIRECTIVES, ContentDirectiveModule, PermissionManagerModule, - VersionManagerModule, + ...CONTENT_VERSION_DIRECTIVES, TreeViewModule, AspectListModule, ContentTypeModule, diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts index f97fc10e2c..834d6f87ac 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts @@ -44,8 +44,14 @@ describe('NewVersionUploaderDialog', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, NewVersionUploaderDialogComponent], - declarations: [VersionListComponent, VersionUploadComponent, UploadVersionButtonComponent, VersionComparisonComponent], + imports: [ + ContentTestingModule, + NewVersionUploaderDialogComponent, + VersionListComponent, + VersionUploadComponent, + VersionComparisonComponent + ], + declarations: [UploadVersionButtonComponent], providers: [ { provide: MAT_DIALOG_DATA, useValue: { node: mockNode, showVersionsOnly, file: mockFile } }, { diff --git a/lib/content-services/src/lib/version-manager/version-comparison.component.html b/lib/content-services/src/lib/version-manager/version-comparison.component.html index 4ba7258efa..af26d760fd 100644 --- a/lib/content-services/src/lib/version-manager/version-comparison.component.html +++ b/lib/content-services/src/lib/version-manager/version-comparison.component.html @@ -1,6 +1,6 @@
-

{{'ADF_VERSION_COMPARISON.CURRENT_VERSION'|translate }}

+

{{'ADF_VERSION_COMPARISON.CURRENT_VERSION' | translate }}

keyboard_arrow_right
-

{{'ADF_VERSION_COMPARISON.NEW_VERSION'|translate }}

+

{{'ADF_VERSION_COMPARISON.NEW_VERSION' | translate }}

- -
@@ -19,20 +17,16 @@
-
- close', [ - style({visibility: 'hidden'}), - animate('0.4s cubic-bezier(0.25, 0.8, 0.25, 1)') - ]), - transition('close => open', [ - style({visibility: 'visible'}), - animate('0.4s cubic-bezier(0.25, 0.8, 0.25, 1)') - ]) + state('open', style({ height: '175px', opacity: 1, visibility: 'visible' })), + state('close', style({ height: '0%', opacity: 0, visibility: 'hidden' })), + transition('open => close', [style({ visibility: 'hidden' }), animate('0.4s cubic-bezier(0.25, 0.8, 0.25, 1)')]), + transition('close => open', [style({ visibility: 'visible' }), animate('0.4s cubic-bezier(0.25, 0.8, 0.25, 1)')]) ]) ], encapsulation: ViewEncapsulation.None }) export class VersionManagerComponent implements OnInit { - /** Target node to manage version history. */ @Input() node: Node; @@ -86,9 +86,7 @@ export class VersionManagerComponent implements OnInit { uploadState: string = 'close'; - constructor(private contentService: ContentService, - private nodesApiService: NodesApiService) { - } + constructor(private contentService: ContentService, private nodesApiService: NodesApiService) {} ngOnInit() { if (this.newFileVersion) { diff --git a/lib/content-services/src/lib/version-manager/version-manager.module.ts b/lib/content-services/src/lib/version-manager/version-manager.module.ts index 7d19b06d58..bfe732b453 100644 --- a/lib/content-services/src/lib/version-manager/version-manager.module.ts +++ b/lib/content-services/src/lib/version-manager/version-manager.module.ts @@ -15,23 +15,22 @@ * limitations under the License. */ -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; import { NgModule } from '@angular/core'; -import { MaterialModule } from '../material.module'; - import { VersionUploadComponent } from './version-upload.component'; import { VersionManagerComponent } from './version-manager.component'; import { VersionListComponent } from './version-list.component'; -import { UploadModule } from '../upload/upload.module'; -import { VersionCompatibilityModule } from '../version-compatibility/version-compatibility.module'; -import { CoreModule, FileTypePipe } from '@alfresco/adf-core'; import { VersionComparisonComponent } from './version-comparison.component'; -import { ScrollingModule } from '@angular/cdk/scrolling'; +export const CONTENT_VERSION_DIRECTIVES = [ + VersionUploadComponent, + VersionManagerComponent, + VersionListComponent, + VersionComparisonComponent +] as const; + +/** @deprecated use `...CONTENT_VERSION_DIRECTIVES` instead */ @NgModule({ - imports: [CommonModule, MaterialModule, CoreModule, UploadModule, VersionCompatibilityModule, FormsModule, ScrollingModule, FileTypePipe], - exports: [VersionUploadComponent, VersionManagerComponent, VersionListComponent, FormsModule, VersionComparisonComponent], - declarations: [VersionUploadComponent, VersionManagerComponent, VersionListComponent, VersionComparisonComponent] + imports: [...CONTENT_VERSION_DIRECTIVES], + exports: [...CONTENT_VERSION_DIRECTIVES] }) export class VersionManagerModule {} diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.html b/lib/content-services/src/lib/version-manager/version-upload.component.html index 8aeb14ea08..da7f98f4b0 100644 --- a/lib/content-services/src/lib/version-manager/version-upload.component.html +++ b/lib/content-services/src/lib/version-manager/version-upload.component.html @@ -8,11 +8,12 @@ - {{'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate}} - + {{'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate}} + -
(); - constructor(private contentService: ContentService, private uploadService: UploadService) { - } + constructor(private contentService: ContentService, private uploadService: UploadService) {} ngOnInit() { - this.uploadService.fileUploadStarting - .pipe(takeUntil(this.onDestroy$)) - .subscribe((event: FileUploadEvent) => { - this.disabled = true; - this.uploadStarted.emit(event); - }); + this.uploadService.fileUploadStarting.pipe(takeUntil(this.onDestroy$)).subscribe((event: FileUploadEvent) => { + this.disabled = true; + this.uploadStarted.emit(event); + }); } canUpload(): boolean { @@ -143,8 +149,8 @@ export class VersionUploadComponent implements OnInit, OnDestroy { } getNextMajorVersion(version: string): string { - const { major} = this.getParsedVersion(version); - return `${major + 1 }.0`; + const { major } = this.getParsedVersion(version); + return `${major + 1}.0`; } private getParsedVersion(version: string) {