From ebe458cc19a7082b4ef1724822c6d25821fe506a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 25 Jul 2024 12:51:09 -0400 Subject: [PATCH] ACS-7408: version manager as standalone --- lib/content-services/src/lib/content.module.ts | 6 +++--- .../version-compatibility.directive.spec.ts | 4 ++-- .../version-compatibility.directive.ts | 7 +++---- .../version-compatibility/version-compatibility.module.ts | 7 +++---- .../src/lib/version-manager/version-list.component.ts | 6 +++--- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/content-services/src/lib/content.module.ts b/lib/content-services/src/lib/content.module.ts index 9f53ac56f2..4f7a33a5d5 100644 --- a/lib/content-services/src/lib/content.module.ts +++ b/lib/content-services/src/lib/content.module.ts @@ -35,7 +35,6 @@ import { PermissionManagerModule } from './permission-manager/permission-manager import { TreeViewModule } from './tree-view/tree-view.module'; import { ContentTypeModule } from './content-type/content-type.module'; import { AspectListModule } from './aspect-list/aspect-list.module'; -import { VersionCompatibilityModule } from './version-compatibility/version-compatibility.module'; import { versionCompatibilityFactory } from './version-compatibility/version-compatibility-factory'; import { VersionCompatibilityService } from './version-compatibility/version-compatibility.service'; import { CONTENT_PIPES } from './pipes/content-pipe.module'; @@ -47,6 +46,7 @@ import { DropdownSitesComponent } from './content-node-selector/site-dropdown/si import { CategoriesManagementComponent } from './category'; import { TreeComponent } from './tree'; import { NewVersionUploaderDialogComponent } from './new-version-uploader'; +import { VersionCompatibilityDirective } from './version-compatibility'; @NgModule({ imports: [ @@ -72,7 +72,7 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader'; TreeViewModule, ContentTypeModule, AspectListModule, - VersionCompatibilityModule, + VersionCompatibilityDirective, NodeCommentsModule, TreeComponent, SearchTextModule, @@ -99,7 +99,7 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader'; TreeViewModule, AspectListModule, ContentTypeModule, - VersionCompatibilityModule, + VersionCompatibilityDirective, NodeCommentsModule, TreeComponent, SearchTextModule, diff --git a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts index 0b176a0b39..6a27511f9e 100644 --- a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts +++ b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts @@ -21,10 +21,10 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { VersionCompatibilityService } from './version-compatibility.service'; import { VersionInfo } from '@alfresco/js-api'; -import { VersionCompatibilityModule } from './version-compatibility.module'; import { RedirectAuthService } from '@alfresco/adf-core'; import { EMPTY, of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { VersionCompatibilityDirective } from '@alfresco/adf-content-services'; @Component({ template: ` @@ -51,7 +51,7 @@ describe('VersionCompatibilityDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [VersionCompatibilityModule, HttpClientTestingModule], + imports: [VersionCompatibilityDirective, HttpClientTestingModule], declarations: [TestComponent], providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }] }); diff --git a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.ts b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.ts index 260595cf4b..14d3809d5b 100644 --- a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.ts +++ b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.ts @@ -20,10 +20,10 @@ import { VersionCompatibilityService } from './version-compatibility.service'; import { take } from 'rxjs/operators'; @Directive({ - selector: '[adf-acs-version]' + selector: '[adf-acs-version]', + standalone: true }) export class VersionCompatibilityDirective { - /** Minimum version required for component to work correctly . */ @Input('adf-acs-version') set version(requiredVersion: string) { @@ -34,8 +34,7 @@ export class VersionCompatibilityDirective { private templateRef: TemplateRef, private viewContainer: ViewContainerRef, private versionCompatibilityService: VersionCompatibilityService - ) { - } + ) {} private validateAcsVersion(requiredVersion: string) { this.versionCompatibilityService.acsVersionInitialized$.pipe(take(1)).subscribe(() => { diff --git a/lib/content-services/src/lib/version-compatibility/version-compatibility.module.ts b/lib/content-services/src/lib/version-compatibility/version-compatibility.module.ts index 6e1707371e..066ec2204c 100644 --- a/lib/content-services/src/lib/version-compatibility/version-compatibility.module.ts +++ b/lib/content-services/src/lib/version-compatibility/version-compatibility.module.ts @@ -15,13 +15,12 @@ * limitations under the License. */ -import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { VersionCompatibilityDirective } from './version-compatibility.directive'; +/** @deprecated use `VersionCompatibilityDirective` instead */ @NgModule({ - imports: [CommonModule], - exports: [VersionCompatibilityDirective], - declarations: [VersionCompatibilityDirective] + imports: [VersionCompatibilityDirective], + exports: [VersionCompatibilityDirective] }) export class VersionCompatibilityModule {} diff --git a/lib/content-services/src/lib/version-manager/version-list.component.ts b/lib/content-services/src/lib/version-manager/version-list.component.ts index 2cc1d536be..3801dd6223 100644 --- a/lib/content-services/src/lib/version-manager/version-list.component.ts +++ b/lib/content-services/src/lib/version-manager/version-list.component.ts @@ -30,9 +30,9 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatListModule } from '@angular/material/list'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { VersionCompatibilityModule } from '../version-compatibility'; import { TranslateModule } from '@ngx-translate/core'; import { MatButtonModule } from '@angular/material/button'; +import { VersionCompatibilityDirective } from '../version-compatibility'; export class VersionListDataSource extends InfiniteScrollDatasource { constructor(private versionsApi: VersionsApi, private node: Node) { @@ -59,9 +59,9 @@ export class VersionListDataSource extends InfiniteScrollDatasource