From e4b9cf3dbe96b03e42d8fa3a94a713d0a02d09a5 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@gmail.com>
Date: Fri, 26 Jul 2024 11:04:02 -0400
Subject: [PATCH] ACS-7390: Migrating content components to Standalone (#9997)

* ACS-7393: content metadata as standalone

* ACS-7408: version manager as standalone

* ACS-7408: version manager as standalone

* ACS-7408: version manager as standalone

* ACS-7407: upload as standalone

* ACS-7404: tag as standalone

* ACS-7404: tag as standalone

* ACS-7401: permission manager as standalone

* ACS-7395: content node share as standalone

* ACS-7402: search components [ci:force]

* ACS-7402: search components [ci:force]

* content node selector panel

* content node selector panel

* Revert "content node selector panel"

This reverts commit 3ad828e443a51b9c058f97d3c9090ed0f5b2519f.

* Revert "content node selector panel"

This reverts commit 5a2cd5a5b32bed1ad0b0ca6004c39aaaac751b42.
---
 .../content-metadata-card.component.spec.ts   |   5 +-
 .../content-metadata-card.component.ts        |   8 ++
 .../content-metadata.component.spec.ts        |   3 +-
 .../content-metadata.component.ts             |  56 ++++++---
 .../content-metadata.module.ts                |  29 +----
 .../content-node-share.dialog.html            |   1 -
 .../content-node-share.dialog.spec.ts         |  18 +--
 .../content-node-share.dialog.ts              |  29 ++++-
 .../content-node-share.directive.spec.ts      |   7 +-
 .../content-node-share.directive.ts           |   1 +
 .../content-node-share.module.ts              |  11 +-
 .../src/lib/content.module.ts                 |  54 ++++----
 .../new-version-uploader.dialog.spec.ts       |   3 -
 .../add-permission-dialog.component.spec.ts   |   2 +-
 .../add-permission-dialog.component.ts        |  44 +++++--
 .../add-permission-panel.component.spec.ts    |   2 +-
 .../add-permission-panel.component.ts         |  23 +++-
 .../add-permission.component.html             |   4 +-
 .../add-permission.component.spec.ts          |   2 +-
 .../add-permission.component.ts               |  32 +++--
 .../components/inherited-button.directive.ts  |  18 +--
 .../node-path-column.component.ts             |   5 +-
 .../permission-container.component.ts         |  44 ++++++-
 .../permission-list.component.html            |   4 +-
 .../permission-list.component.ts              |  23 +++-
 .../components/pop-over.directive.spec.ts     |   5 +-
 .../components/pop-over.directive.ts          |  16 +--
 .../user-icon-column.component.ts             |  10 +-
 .../user-name-column.component.ts             |   3 +
 .../user-role-column.component.ts             |   7 ++
 .../permission-manager.module.ts              |  48 +++----
 .../search-check-list.component.ts            |  18 +--
 ...-chip-autocomplete-input.component.spec.ts |   3 +-
 ...earch-chip-autocomplete-input.component.ts |  12 +-
 .../search-chip-list.component.spec.ts        |   8 +-
 .../search-chip-list.component.ts             |   7 +-
 .../src/lib/search/search.module.ts           |  20 +--
 .../src/lib/tag/tag-actions.component.spec.ts |   2 +-
 .../src/lib/tag/tag-actions.component.ts      |  41 +++---
 .../src/lib/tag/tag-list.component.spec.ts    |   2 +-
 .../src/lib/tag/tag-list.component.ts         |  18 +--
 .../lib/tag/tag-node-list.component.spec.ts   |   2 +-
 .../src/lib/tag/tag-node-list.component.ts    |   8 +-
 .../src/lib/tag/tag.module.ts                 |  27 +---
 .../tags-creator.component.spec.ts            |  26 +---
 .../tags-creator/tags-creator.component.ts    |  24 +++-
 .../src/lib/tree-view/tree-view.module.ts     |   2 +-
 .../file-uploading-dialog.component.ts        | 117 +++++++++---------
 .../file-uploading-list-row.component.html    |   2 +-
 .../file-uploading-list-row.component.ts      |  22 ++++
 .../file-uploading-list.component.ts          |  56 +++------
 .../components/upload-button.component.ts     |   6 +
 .../components/upload-drag-area.component.ts  |   3 +
 .../upload-version-button.component.ts        |  18 ++-
 .../file-draggable.directive.spec.ts          |  20 +--
 .../directives/file-draggable.directive.ts    |   6 +-
 .../directives/toggle-icon.directive.spec.ts  |  11 +-
 .../directives/toggle-icon.directive.ts       |   1 +
 .../src/lib/upload/upload.module.ts           |  41 +++---
 .../version-compatibility.directive.spec.ts   |   4 +-
 .../version-compatibility.directive.ts        |   7 +-
 .../version-compatibility.module.ts           |   7 +-
 .../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               |  37 ++++--
 70 files changed, 682 insertions(+), 516 deletions(-)

diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts
index d030fecc74..9e7e5b6234 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts
@@ -61,7 +61,8 @@ describe('ContentMetadataCardComponent', () => {
                 MatDialogModule,
                 PipeModule,
                 MatSnackBarModule,
-                MatTooltipModule
+                MatTooltipModule,
+                ContentMetadataCardComponent
             ],
             providers: [
                 { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
@@ -69,7 +70,7 @@ describe('ContentMetadataCardComponent', () => {
                 {
                     provide: APP_INITIALIZER,
                     useFactory: versionCompatibilityFactory,
-                    deps: [ VersionCompatibilityService ],
+                    deps: [VersionCompatibilityService],
                     multi: true
                 }
             ]
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
index a8054fb081..af55a615bd 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
@@ -22,9 +22,17 @@ import { ContentMetadataCustomPanel, PresetConfig } from '../../interfaces/conte
 import { VersionCompatibilityService } from '../../../version-compatibility/version-compatibility.service';
 import { ContentService } from '../../../common/services/content.service';
 import { AllowableOperationsEnum } from '../../../common/models/allowable-operations.enum';
+import { CommonModule } from '@angular/common';
+import { MatCardModule } from '@angular/material/card';
+import { ContentMetadataComponent } from '../content-metadata/content-metadata.component';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     selector: 'adf-content-metadata-card',
+    standalone: true,
+    imports: [CommonModule, MatCardModule, ContentMetadataComponent, MatButtonModule, MatIconModule, TranslateModule],
     templateUrl: './content-metadata-card.component.html',
     styleUrls: ['./content-metadata-card.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts
index 64b1db0966..886f34500d 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts
@@ -195,7 +195,8 @@ describe('ContentMetadataComponent', () => {
                 MatSnackBarModule,
                 MatProgressBarModule,
                 MatTooltipModule,
-                PipeModule
+                PipeModule,
+                ContentMetadataComponent
             ],
             providers: [
                 { provide: TranslationService, useClass: TranslationMock },
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
index c24ba5d5a4..ec4f84e51e 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
@@ -15,21 +15,14 @@
  * limitations under the License.
  */
 
-import {
-    Component,
-    Input,
-    OnChanges,
-    OnDestroy,
-    OnInit,
-    SimpleChanges,
-    ViewEncapsulation
-} from '@angular/core';
+import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { Category, CategoryEntry, CategoryLinkBody, CategoryPaging, Node, TagBody, TagEntry, TagPaging } from '@alfresco/js-api';
 import { forkJoin, Observable, of, Subject, zip } from 'rxjs';
 import {
     AppConfigService,
     CardViewBaseItemModel,
     CardViewItem,
+    CardViewModule,
     NotificationService,
     TranslationService,
     UpdateNotification
@@ -45,6 +38,17 @@ import { CategoryService } from '../../../category/services/category.service';
 import { CategoriesManagementMode } from '../../../category/categories-management/categories-management-mode';
 import { AllowableOperationsEnum } from '../../../common/models/allowable-operations.enum';
 import { ContentService } from '../../../common/services/content.service';
+import { CommonModule } from '@angular/common';
+import { MatExpansionModule } from '@angular/material/expansion';
+import { ContentMetadataHeaderComponent } from './content-metadata-header.component';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
+import { MatChipsModule } from '@angular/material/chips';
+import { CategoriesManagementComponent } from '../../../category';
+import { DynamicExtensionComponent } from '@alfresco/adf-extensions';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { TagsCreatorComponent } from '../../../tag';
 
 const DEFAULT_SEPARATOR = ', ';
 
@@ -56,6 +60,21 @@ enum DefaultPanels {
 
 @Component({
     selector: 'adf-content-metadata',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatExpansionModule,
+        ContentMetadataHeaderComponent,
+        MatButtonModule,
+        TranslateModule,
+        MatIconModule,
+        CardViewModule,
+        MatChipsModule,
+        CategoriesManagementComponent,
+        DynamicExtensionComponent,
+        MatProgressBarModule,
+        TagsCreatorComponent
+    ],
     templateUrl: './content-metadata.component.html',
     styleUrls: ['./content-metadata.component.scss'],
     host: { class: 'adf-content-metadata' },
@@ -173,12 +192,10 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
                 this.updateChanges(updatedNode.changed);
             });
 
-        this.cardViewContentUpdateService.updatedAspect$
-            .pipe(debounceTime(500), takeUntil(this.onDestroy$))
-            .subscribe((node) => {
-                this.node.aspectNames = node?.aspectNames;
-                this.loadProperties(node);
-            });
+        this.cardViewContentUpdateService.updatedAspect$.pipe(debounceTime(500), takeUntil(this.onDestroy$)).subscribe((node) => {
+            this.node.aspectNames = node?.aspectNames;
+            this.loadProperties(node);
+        });
 
         this.loadProperties(this.node);
         this.verifyAllowableOperations();
@@ -210,7 +227,10 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
     }
 
     isPanelEditing(panelTitle: string): boolean {
-        return this.editing && ((this.currentPanel.panelTitle === panelTitle && this.editedPanelTitle === panelTitle) || this.editedPanelTitle === panelTitle);
+        return (
+            this.editing &&
+            ((this.currentPanel.panelTitle === panelTitle && this.editedPanelTitle === panelTitle) || this.editedPanelTitle === panelTitle)
+        );
     }
 
     protected handleUpdateError(error: Error) {
@@ -250,7 +270,6 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
         if (changes.displayDefaultProperties?.currentValue) {
             this.expandPanel(this.DefaultPanels.PROPERTIES);
         }
-
     }
 
     ngOnDestroy() {
@@ -365,7 +384,8 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
     }
 
     keyDown(event: KeyboardEvent) {
-        if (event.keyCode === 37 || event.keyCode === 39) { // ArrowLeft && ArrowRight
+        if (event.keyCode === 37 || event.keyCode === 39) {
+            // ArrowLeft && ArrowRight
             event.stopPropagation();
         }
     }
diff --git a/lib/content-services/src/lib/content-metadata/content-metadata.module.ts b/lib/content-services/src/lib/content-metadata/content-metadata.module.ts
index ea2fcac59d..aa5538b247 100644
--- a/lib/content-services/src/lib/content-metadata/content-metadata.module.ts
+++ b/lib/content-services/src/lib/content-metadata/content-metadata.module.ts
@@ -15,35 +15,16 @@
  * limitations under the License.
  */
 
-import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { MaterialModule } from '../material.module';
-import { CoreModule } from '@alfresco/adf-core';
 import { ContentMetadataComponent } from './components/content-metadata/content-metadata.component';
 import { ContentMetadataCardComponent } from './components/content-metadata-card/content-metadata-card.component';
-import { TagModule } from '../tag/tag.module';
-import { CategoriesModule } from '../category/category.module';
-import { ExtensionsModule } from '@alfresco/adf-extensions';
 import { ContentMetadataHeaderComponent } from './components/content-metadata/content-metadata-header.component';
 
+export const CONTENT_METADATA_DIRECTIVES = [ContentMetadataComponent, ContentMetadataCardComponent, ContentMetadataHeaderComponent] as const;
+
+/** @deprecated use `...CONTENT_METADATA_DIRECTIVES` instead */
 @NgModule({
-    imports: [
-        CommonModule,
-        MaterialModule,
-        CoreModule,
-        TagModule,
-        CategoriesModule,
-        ExtensionsModule,
-        ContentMetadataHeaderComponent
-    ],
-    exports: [
-        ContentMetadataComponent,
-        ContentMetadataCardComponent,
-        ContentMetadataHeaderComponent
-    ],
-    declarations: [
-        ContentMetadataComponent,
-        ContentMetadataCardComponent
-    ]
+    imports: [...CONTENT_METADATA_DIRECTIVES],
+    exports: [...CONTENT_METADATA_DIRECTIVES]
 })
 export class ContentMetadataModule {}
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
index 35775a2787..5dc9f98e45 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
@@ -83,7 +83,6 @@
                         data-automation-id="adf-share-link"
                         class="adf-share-link__input"
                         matInput
-                        cdkFocusInitial
                         placeholder="{{ 'SHARE.PUBLIC-LINK' | translate }}"
                         [attr.aria-label]="'SHARE.PUBLIC-LINK' | translate"
                         formControlName="sharedUrl"
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
index e534164b33..7c037077ec 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { MatDialogRef, MAT_DIALOG_DATA, MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { of } from 'rxjs';
 import { NotificationService } from '@alfresco/adf-core';
 import { NodesApiService, RenditionService } from '../common';
@@ -33,7 +33,6 @@ import { MatSlideToggleHarness } from '@angular/material/slide-toggle/testing';
 describe('ShareDialogComponent', () => {
     let loader: HarnessLoader;
     let node: NodeEntry;
-    let matDialog: MatDialog;
     const notificationServiceMock = {
         openSnackMessage: jasmine.createSpy('openSnackMessage')
     };
@@ -56,7 +55,7 @@ describe('ShareDialogComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule],
+            imports: [ContentTestingModule, MatDialogModule, ShareDialogComponent],
             providers: [
                 { provide: NotificationService, useValue: notificationServiceMock },
                 {
@@ -71,7 +70,6 @@ describe('ShareDialogComponent', () => {
         fixture = TestBed.createComponent(ShareDialogComponent);
         component = fixture.componentInstance;
 
-        matDialog = TestBed.inject(MatDialog);
         sharedLinksApiService = TestBed.inject(SharedLinksApiService);
         renditionService = TestBed.inject(RenditionService);
         nodesApiService = TestBed.inject(NodesApiService);
@@ -179,7 +177,8 @@ describe('ShareDialogComponent', () => {
     });
 
     it('should open a confirmation dialog when unshare button is triggered', async () => {
-        spyOn(matDialog, 'open').and.returnValue({ beforeClosed: () => of(false) } as any);
+        const dialog = fixture.debugElement.injector.get(MatDialog);
+        const openSpy = spyOn(dialog, 'open').and.returnValue({ beforeClosed: () => of(false) } as any);
         spyOn(sharedLinksApiService, 'deleteSharedLink').and.callThrough();
 
         node.entry.properties['qshare:sharedId'] = 'sharedId';
@@ -194,11 +193,12 @@ describe('ShareDialogComponent', () => {
         const toggle = await loader.getHarness(MatSlideToggleHarness.with({ selector: shareToggleId }));
         await toggle.toggle();
 
-        expect(matDialog.open).toHaveBeenCalled();
+        expect(openSpy).toHaveBeenCalled();
     });
 
     it('should unshare file when confirmation dialog returns true', async () => {
-        spyOn(matDialog, 'open').and.returnValue({ beforeClosed: () => of(true) } as any);
+        const dialog = fixture.debugElement.injector.get(MatDialog);
+        spyOn(dialog, 'open').and.returnValue({ beforeClosed: () => of(true) } as any);
         spyOn(sharedLinksApiService, 'deleteSharedLink').and.returnValue(of({}));
         node.entry.properties['qshare:sharedId'] = 'sharedId';
 
@@ -208,6 +208,7 @@ describe('ShareDialogComponent', () => {
         };
 
         fixture.detectChanges();
+        await fixture.whenStable();
 
         const toggle = await loader.getHarness(MatSlideToggleHarness.with({ selector: shareToggleId }));
         await toggle.toggle();
@@ -216,7 +217,8 @@ describe('ShareDialogComponent', () => {
     });
 
     it('should not unshare file when confirmation dialog returns false', async () => {
-        spyOn(matDialog, 'open').and.returnValue({ beforeClosed: () => of(false) } as any);
+        const dialog = fixture.debugElement.injector.get(MatDialog);
+        spyOn(dialog, 'open').and.returnValue({ beforeClosed: () => of(false) } as any);
         spyOn(sharedLinksApiService, 'deleteSharedLink').and.callThrough();
         node.entry.properties['qshare:sharedId'] = 'sharedId';
 
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
index c5111a718f..5f1d241e8a 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
@@ -16,17 +16,24 @@
  */
 
 import { Component, Inject, OnInit, ViewEncapsulation, ViewChild, OnDestroy } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
-import { MatSlideToggleChange } from '@angular/material/slide-toggle';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatSlideToggleChange, MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { Subject } from 'rxjs';
 import { ContentService } from '../common/services/content.service';
 import { SharedLinksApiService } from './services/shared-links-api.service';
 import { SharedLinkBodyCreate } from '@alfresco/js-api';
-import { ConfirmDialogComponent } from '@alfresco/adf-core';
+import { ClipboardModule, ConfirmDialogComponent } from '@alfresco/adf-core';
 import { ContentNodeShareSettings } from './content-node-share.settings';
 import { RenditionService } from '../common/services/rendition.service';
 import { format, add, endOfDay, isBefore } from 'date-fns';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+import { MatButtonModule } from '@angular/material/button';
 
 interface SharedDialogFormProps {
     sharedUrl: FormControl<string>;
@@ -35,6 +42,20 @@ interface SharedDialogFormProps {
 
 @Component({
     selector: 'adf-share-dialog',
+    standalone: true,
+    imports: [
+        CommonModule,
+        TranslateModule,
+        MatIconModule,
+        MatDialogModule,
+        ReactiveFormsModule,
+        MatSlideToggleModule,
+        MatFormFieldModule,
+        MatDatepickerModule,
+        MatInputModule,
+        ClipboardModule,
+        MatButtonModule
+    ],
     templateUrl: './content-node-share.dialog.html',
     styleUrls: ['./content-node-share.dialog.scss'],
     host: { class: 'adf-share-dialog' },
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts
index aa19ffa4c8..65b77e4f9a 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts
@@ -21,10 +21,12 @@ import { Component } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { CoreModule } from '@alfresco/adf-core';
-import { ContentNodeShareModule } from './content-node-share.module';
+import { NodeSharedDirective } from '@alfresco/adf-content-services';
 
 @Component({
     selector: 'adf-node-share-test-component',
+    standalone: true,
+    imports: [NodeSharedDirective],
     template: `
         <button
             [disabled]="!shareRef.isFile"
@@ -51,8 +53,7 @@ describe('NodeSharedDirective', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [CoreModule.forRoot(), ContentTestingModule, ContentNodeShareModule],
-            declarations: [NodeShareTestComponent]
+            imports: [CoreModule.forRoot(), ContentTestingModule, NodeShareTestComponent]
         });
         fixture = TestBed.createComponent(NodeShareTestComponent);
         document = TestBed.inject(DOCUMENT);
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
index 79d2148eae..15c3e375bb 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
@@ -26,6 +26,7 @@ import { takeUntil } from 'rxjs/operators';
 
 @Directive({
     selector: '[adf-share]',
+    standalone: true,
     exportAs: 'adfShare'
 })
 export class NodeSharedDirective implements OnChanges, OnDestroy {
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.module.ts b/lib/content-services/src/lib/content-node-share/content-node-share.module.ts
index 1ad1e4e253..99f2b2fe1c 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.module.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.module.ts
@@ -16,15 +16,14 @@
  */
 
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CoreModule } from '@alfresco/adf-core';
-import { MaterialModule } from '../material.module';
 import { ShareDialogComponent } from './content-node-share.dialog';
 import { NodeSharedDirective } from './content-node-share.directive';
 
+export const CONTENT_NODE_SHARE_DIRECTIVES = [ShareDialogComponent, NodeSharedDirective] as const;
+
+/** @deprecated use `...CONTENT_NODE_SHARE_DIRECTIVES` or import each directive individually */
 @NgModule({
-    imports: [CoreModule, CommonModule, MaterialModule],
-    declarations: [ShareDialogComponent, NodeSharedDirective],
-    exports: [ShareDialogComponent, NodeSharedDirective]
+    imports: [...CONTENT_NODE_SHARE_DIRECTIVES],
+    exports: [...CONTENT_NODE_SHARE_DIRECTIVES]
 })
 export class ContentNodeShareModule {}
diff --git a/lib/content-services/src/lib/content.module.ts b/lib/content-services/src/lib/content.module.ts
index ef6f01864d..e4ab61c6f9 100644
--- a/lib/content-services/src/lib/content.module.ts
+++ b/lib/content-services/src/lib/content.module.ts
@@ -20,22 +20,19 @@ import { NgModule, ModuleWithProviders, APP_INITIALIZER } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CoreModule, SearchTextModule, provideTranslations } from '@alfresco/adf-core';
 import { MaterialModule } from './material.module';
-import { TagModule } from './tag/tag.module';
+import { CONTENT_TAG_DIRECTIVES } from './tag/tag.module';
 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';
+import { CONTENT_NODE_SHARE_DIRECTIVES } from './content-node-share/content-node-share.module';
+import { CONTENT_DIRECTIVES } from './directives/content-directive.module';
 import { CONTENT_DIALOG_DIRECTIVES } from './dialogs/dialog.module';
-import { ContentMetadataModule } from './content-metadata/content-metadata.module';
-import { PermissionManagerModule } from './permission-manager/permission-manager.module';
-import { TreeViewModule } from './tree-view/tree-view.module';
+import { CONTENT_METADATA_DIRECTIVES } from './content-metadata/content-metadata.module';
+import { CONTENT_PERMISSION_MANAGER_DIRECTIVES } from './permission-manager/permission-manager.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,32 +44,35 @@ 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';
+import { CONTENT_UPLOAD_DIRECTIVES } from './upload';
+import { TreeViewComponent } from './tree-view';
 
 @NgModule({
     imports: [
         ...CONTENT_PIPES,
         CoreModule,
-        TagModule,
+        ...CONTENT_TAG_DIRECTIVES,
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
         ...CONTENT_DIALOG_DIRECTIVES,
         SearchModule,
         DocumentListModule,
-        UploadModule,
+        ...CONTENT_UPLOAD_DIRECTIVES,
         MaterialModule,
         DropdownSitesComponent,
         ...BREADCRUMB_DIRECTIVES,
         ContentNodeSelectorModule,
-        ContentNodeShareModule,
-        ContentMetadataModule,
-        ContentDirectiveModule,
-        PermissionManagerModule,
-        VersionManagerModule,
-        TreeViewModule,
+        ...CONTENT_NODE_SHARE_DIRECTIVES,
+        ...CONTENT_METADATA_DIRECTIVES,
+        ...CONTENT_DIRECTIVES,
+        ...CONTENT_PERMISSION_MANAGER_DIRECTIVES,
+        ...CONTENT_VERSION_DIRECTIVES,
+        TreeViewComponent,
         ContentTypeModule,
         AspectListModule,
-        VersionCompatibilityModule,
+        VersionCompatibilityDirective,
         NodeCommentsModule,
         TreeComponent,
         SearchTextModule,
@@ -83,23 +83,23 @@ import { NewVersionUploaderDialogComponent } from './new-version-uploader';
     providers: [provideTranslations('adf-content-services', 'assets/adf-content-services')],
     exports: [
         ...CONTENT_PIPES,
-        TagModule,
+        ...CONTENT_TAG_DIRECTIVES,
         DocumentListModule,
-        UploadModule,
+        ...CONTENT_UPLOAD_DIRECTIVES,
         SearchModule,
         DropdownSitesComponent,
         ...BREADCRUMB_DIRECTIVES,
         ContentNodeSelectorModule,
-        ContentNodeShareModule,
-        ContentMetadataModule,
+        ...CONTENT_NODE_SHARE_DIRECTIVES,
+        ...CONTENT_METADATA_DIRECTIVES,
         ...CONTENT_DIALOG_DIRECTIVES,
-        ContentDirectiveModule,
-        PermissionManagerModule,
-        VersionManagerModule,
-        TreeViewModule,
+        ...CONTENT_DIRECTIVES,
+        ...CONTENT_PERMISSION_MANAGER_DIRECTIVES,
+        ...CONTENT_VERSION_DIRECTIVES,
+        TreeViewComponent,
         AspectListModule,
         ContentTypeModule,
-        VersionCompatibilityModule,
+        VersionCompatibilityDirective,
         NodeCommentsModule,
         TreeComponent,
         SearchTextModule,
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..bd2b48f485 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
@@ -19,8 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { mockFile, mockNode } from '../mock';
 import { ContentTestingModule } from '../testing/content.testing.module';
-import { UploadVersionButtonComponent } from '../upload';
-import { VersionComparisonComponent, VersionListComponent, VersionUploadComponent } from '../version-manager';
 import { NewVersionUploaderDataAction } from './models';
 import { NewVersionUploaderDialogComponent } from './new-version-uploader.dialog';
 
@@ -45,7 +43,6 @@ describe('NewVersionUploaderDialog', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ContentTestingModule, NewVersionUploaderDialogComponent],
-            declarations: [VersionListComponent, VersionUploadComponent, UploadVersionButtonComponent, VersionComparisonComponent],
             providers: [
                 { provide: MAT_DIALOG_DATA, useValue: { node: mockNode, showVersionsOnly, file: mockFile } },
                 {
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts
index 32f64ed039..1a4b4d38a5 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts
@@ -63,7 +63,7 @@ describe('AddPermissionDialog', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule],
+            imports: [ContentTestingModule, AddPermissionDialogComponent],
             providers: [
                 { provide: MatDialogRef, useValue: dialogRef },
                 { provide: MAT_DIALOG_DATA, useValue: data }
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts
index 20f05fb09f..c53e885d39 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts
@@ -16,13 +16,38 @@
  */
 
 import { Component, Inject, ViewEncapsulation } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { NodeEntry, PermissionElement } from '@alfresco/js-api';
 import { AddPermissionDialogData } from './add-permission-dialog-data.interface';
 import { MemberModel } from '../../models/member.model';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
+import { DataColumnComponent, DataColumnListComponent, DataTableComponent, DateColumnHeaderComponent } from '@alfresco/adf-core';
+import { MatIconModule } from '@angular/material/icon';
+import { AddPermissionPanelComponent } from './add-permission-panel.component';
+import { UserIconColumnComponent } from '../user-icon-column/user-icon-column.component';
+import { UserNameColumnComponent } from '../user-name-column/user-name-column.component';
+import { UserRoleColumnComponent } from '../user-role-column/user-role-column.component';
 
 @Component({
     selector: 'adf-add-permission-dialog',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatDialogModule,
+        MatButtonModule,
+        TranslateModule,
+        DataTableComponent,
+        DataColumnListComponent,
+        DataColumnComponent,
+        DateColumnHeaderComponent,
+        MatIconModule,
+        AddPermissionPanelComponent,
+        UserIconColumnComponent,
+        UserNameColumnComponent,
+        UserRoleColumnComponent
+    ],
     templateUrl: './add-permission-dialog.component.html',
     styleUrls: ['./add-permission-dialog.component.scss'],
     encapsulation: ViewEncapsulation.None
@@ -34,8 +59,7 @@ export class AddPermissionDialogComponent {
     private existingMembers: PermissionElement[] = [];
     currentSelection: NodeEntry[] = [];
 
-    constructor(@Inject(MAT_DIALOG_DATA) public data: AddPermissionDialogData,
-                private dialogRef: MatDialogRef<AddPermissionDialogComponent>) {
+    constructor(@Inject(MAT_DIALOG_DATA) public data: AddPermissionDialogData, private dialogRef: MatDialogRef<AddPermissionDialogComponent>) {
         this.existingMembers = this.data.node.permissions.locallySet || [];
     }
 
@@ -44,18 +68,19 @@ export class AddPermissionDialogComponent {
     }
 
     onAddClicked() {
-        const selection = this.selectedMembers.filter(member => !member.readonly).map(member => member.toPermissionElement());
+        const selection = this.selectedMembers.filter((member) => !member.readonly).map((member) => member.toPermissionElement());
         this.data.confirm.next(selection);
         this.data.confirm.complete();
     }
 
     onSearchAddClicked() {
-        const newMembers = this.currentSelection.map(item => MemberModel.parseFromSearchResult(item))
-            .filter(({id}) => !this.selectedMembers.find((member) => member.id === id));
+        const newMembers = this.currentSelection
+            .map((item) => MemberModel.parseFromSearchResult(item))
+            .filter(({ id }) => !this.selectedMembers.find((member) => member.id === id));
         this.selectedMembers = this.selectedMembers.concat(newMembers);
 
         this.selectedMembers.forEach((member) => {
-            const existingMember = this.existingMembers.find(({authorityId}) => authorityId === member.id);
+            const existingMember = this.existingMembers.find(({ authorityId }) => authorityId === member.id);
             if (existingMember) {
                 member.role = existingMember.name;
                 member.accessStatus = existingMember.accessStatus;
@@ -82,8 +107,7 @@ export class AddPermissionDialogComponent {
     }
 
     onBulkUpdate(role: string) {
-        this.selectedMembers.filter(member => !member.readonly)
-            .forEach(member => (member.role = role));
+        this.selectedMembers.filter((member) => !member.readonly).forEach((member) => (member.role = role));
     }
 
     onMemberDelete({ id }: MemberModel) {
@@ -101,6 +125,6 @@ export class AddPermissionDialogComponent {
     }
 
     isValid(): boolean {
-        return this.selectedMembers.filter(({readonly}) => !readonly).length && this.selectedMembers.every(({role}) => !!role);
+        return this.selectedMembers.filter(({ readonly }) => !readonly).length && this.selectedMembers.every(({ role }) => !!role);
     }
 }
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
index d8fb8ff98b..f22983db60 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
@@ -37,7 +37,7 @@ describe('AddPermissionPanelComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule]
+            imports: [ContentTestingModule, AddPermissionPanelComponent]
         });
         fixture = TestBed.createComponent(AddPermissionPanelComponent);
         loader = TestbedHarnessEnvironment.loader(fixture);
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts
index be466fddb6..d692e235a2 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts
@@ -19,14 +19,33 @@ import { SearchConfigurationService } from '../../../search/services/search-conf
 import { SearchService } from '../../../search/services/search.service';
 import { Node, NodeEntry } from '@alfresco/js-api';
 import { Component, EventEmitter, Output, ViewChild, ViewEncapsulation } from '@angular/core';
-import { UntypedFormControl } from '@angular/forms';
+import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
 import { debounceTime } from 'rxjs/operators';
 import { SearchPermissionConfigurationService } from './search-config-permission.service';
 import { SearchComponent } from '../../../search/components/search.component';
-import { MatSelectionList } from '@angular/material/list';
+import { MatListModule, MatSelectionList } from '@angular/material/list';
+import { CommonModule } from '@angular/common';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
+import { SearchModule } from '../../../search';
+import { UserIconColumnComponent } from '../user-icon-column/user-icon-column.component';
 
 @Component({
     selector: 'adf-add-permission-panel',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatFormFieldModule,
+        MatInputModule,
+        TranslateModule,
+        ReactiveFormsModule,
+        MatIconModule,
+        SearchModule,
+        MatListModule,
+        UserIconColumnComponent
+    ],
     templateUrl: './add-permission-panel.component.html',
     styleUrls: ['./add-permission-panel.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.html b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.html
index 9c1a9f1e92..708626b222 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.html
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.html
@@ -1,6 +1,4 @@
-<adf-add-permission-panel
-    (select)="onSelect($event)">
-</adf-add-permission-panel>
+<adf-add-permission-panel (select)="onSelect($event)"></adf-add-permission-panel>
 <div id="adf-add-permission-actions">
    <button mat-button
           id="adf-add-permission-action-button"
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts
index 0f6c234584..65bf1b6066 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts
@@ -32,7 +32,7 @@ describe('AddPermissionComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule]
+            imports: [ContentTestingModule, AddPermissionComponent]
         });
         nodePermissionService = TestBed.inject(NodePermissionService);
         const response: any = { node: { id: 'fake-node', allowableOperations: ['updatePermissions'] }, roles: [{ label: 'Test', role: 'test' }] };
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts
index b50a3fb107..a8cc22d676 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.ts
@@ -21,9 +21,15 @@ import { NodePermissionService } from '../../services/node-permission.service';
 import { RoleModel } from '../../models/role.model';
 import { ContentService } from '../../../common/services/content.service';
 import { AllowableOperationsEnum } from '../../../common/models/allowable-operations.enum';
+import { CommonModule } from '@angular/common';
+import { AddPermissionPanelComponent } from './add-permission-panel.component';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     selector: 'adf-add-permission',
+    standalone: true,
+    imports: [CommonModule, AddPermissionPanelComponent, MatButtonModule, TranslateModule],
     templateUrl: './add-permission.component.html',
     styleUrls: ['./add-permission.component.scss'],
     encapsulation: ViewEncapsulation.None
@@ -32,7 +38,6 @@ import { AllowableOperationsEnum } from '../../../common/models/allowable-operat
  * @deprecated in 4.4.0, use adf-add-permission-panel instead.
  */
 export class AddPermissionComponent implements OnInit {
-
     /** ID of the target node. */
     @Input()
     nodeId: string;
@@ -49,11 +54,10 @@ export class AddPermissionComponent implements OnInit {
     currentNode: Node;
     currentNodeRoles: RoleModel[];
 
-    constructor(private nodePermissionService: NodePermissionService,
-                private contentService: ContentService) { }
+    constructor(private nodePermissionService: NodePermissionService, private contentService: ContentService) {}
 
     ngOnInit(): void {
-        this.nodePermissionService.getNodeWithRoles(this.nodeId).subscribe(({node, roles }) => {
+        this.nodePermissionService.getNodeWithRoles(this.nodeId).subscribe(({ node, roles }) => {
             this.currentNode = node;
             this.currentNodeRoles = roles;
         });
@@ -64,20 +68,22 @@ export class AddPermissionComponent implements OnInit {
     }
 
     isAddEnabled(): boolean {
-        return this.contentService.hasAllowableOperations(this.currentNode, AllowableOperationsEnum.UPDATEPERMISSIONS) &&
-                this.selectedItems.length !== 0;
+        return (
+            this.contentService.hasAllowableOperations(this.currentNode, AllowableOperationsEnum.UPDATEPERMISSIONS) && this.selectedItems.length !== 0
+        );
     }
 
     applySelection() {
         if (this.contentService.hasAllowableOperations(this.currentNode, AllowableOperationsEnum.UPDATEPERMISSIONS)) {
             const permissions = this.transformNodeToPermissionElement(this.selectedItems, this.currentNodeRoles[0].role);
-            this.nodePermissionService.updateNodePermissions(this.nodeId, permissions)
-                .subscribe((node) => {
-                        this.success.emit(node);
-                    },
-                    (error) => {
-                        this.error.emit(error);
-                    });
+            this.nodePermissionService.updateNodePermissions(this.nodeId, permissions).subscribe(
+                (node) => {
+                    this.success.emit(node);
+                },
+                (error) => {
+                    this.error.emit(error);
+                }
+            );
         }
     }
 
diff --git a/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.ts b/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.ts
index 2cfa4cd87b..682c11f8cd 100644
--- a/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.ts
+++ b/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.ts
@@ -24,13 +24,13 @@ import { AllowableOperationsEnum } from '../../common/models/allowable-operation
 
 @Directive({
     selector: 'button[adf-inherit-permission], mat-button-toggle[adf-inherit-permission]',
+    standalone: true,
     host: {
         role: 'button',
         '(click)': 'onInheritPermissionClicked()'
     }
 })
 export class InheritPermissionDirective {
-
     /** ID of the node to add/remove inherited permissions. */
     @Input()
     nodeId: string;
@@ -43,21 +43,21 @@ export class InheritPermissionDirective {
     @Output()
     error: EventEmitter<any> = new EventEmitter<any>();
 
-    constructor(private nodeService: NodesApiService,
-                private contentService: ContentService) {
-    }
+    constructor(private nodeService: NodesApiService, private contentService: ContentService) {}
 
     onInheritPermissionClicked() {
         this.nodeService.getNode(this.nodeId).subscribe((node: Node) => {
             if (this.contentService.hasAllowableOperations(node, AllowableOperationsEnum.UPDATEPERMISSIONS)) {
-                const nodeBody = { permissions: { isInheritanceEnabled: !node?.permissions?.isInheritanceEnabled ?? false} };
-                this.nodeService.updateNode(this.nodeId, nodeBody, { include: ['permissions'] }).subscribe((nodeUpdated: Node) => {
-                    this.updated.emit(nodeUpdated);
-                }, (error) => this.error.emit(error));
+                const nodeBody = { permissions: { isInheritanceEnabled: !node?.permissions?.isInheritanceEnabled ?? false } };
+                this.nodeService.updateNode(this.nodeId, nodeBody, { include: ['permissions'] }).subscribe(
+                    (nodeUpdated: Node) => {
+                        this.updated.emit(nodeUpdated);
+                    },
+                    (error) => this.error.emit(error)
+                );
             } else {
                 this.error.emit('PERMISSION_MANAGER.ERROR.NOT-ALLOWED');
             }
         });
     }
-
 }
diff --git a/lib/content-services/src/lib/permission-manager/components/node-path-column/node-path-column.component.ts b/lib/content-services/src/lib/permission-manager/components/node-path-column/node-path-column.component.ts
index bbf373acac..3f6be78fb0 100644
--- a/lib/content-services/src/lib/permission-manager/components/node-path-column/node-path-column.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/node-path-column/node-path-column.component.ts
@@ -18,11 +18,14 @@
 import { Node } from '@alfresco/js-api';
 import { Component, Input, OnInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
+import { CommonModule } from '@angular/common';
 
 @Component({
     selector: 'adf-node-path-column',
+    standalone: true,
+    imports: [CommonModule],
     template: `
-        <span class="adf-user-name-column adf-datatable-cell-value"  title="{{ displayText$ | async }}">
+        <span class="adf-user-name-column adf-datatable-cell-value" title="{{ displayText$ | async }}">
             {{ displayText$ | async }}
         </span>
     `,
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts
index c2694fecbf..7aac542a2f 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts
@@ -19,15 +19,47 @@ import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation }
 import { Node } from '@alfresco/js-api';
 import { PermissionDisplayModel } from '../../models/permission.model';
 import { RoleModel } from '../../models/role.model';
+import { CommonModule } from '@angular/common';
+import {
+    DataColumnComponent,
+    DataColumnListComponent,
+    DataTableComponent,
+    DateColumnHeaderComponent,
+    EmptyContentComponent,
+    NoContentTemplateDirective
+} from '@alfresco/adf-core';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { UserIconColumnComponent } from '../user-icon-column/user-icon-column.component';
+import { UserNameColumnComponent } from '../user-name-column/user-name-column.component';
+import { NodePathColumnComponent } from '../node-path-column/node-path-column.component';
+import { UserRoleColumnComponent } from '../user-role-column/user-role-column.component';
 
 @Component({
-  selector: 'adf-permission-container',
-  templateUrl: './permission-container.component.html',
-  styleUrls: ['./permission-container.component.scss'],
-  encapsulation: ViewEncapsulation.None
+    selector: 'adf-permission-container',
+    standalone: true,
+    imports: [
+        CommonModule,
+        DataTableComponent,
+        DataColumnListComponent,
+        DataColumnComponent,
+        TranslateModule,
+        DateColumnHeaderComponent,
+        MatButtonModule,
+        MatIconModule,
+        NoContentTemplateDirective,
+        EmptyContentComponent,
+        UserIconColumnComponent,
+        UserNameColumnComponent,
+        NodePathColumnComponent,
+        UserRoleColumnComponent
+    ],
+    templateUrl: './permission-container.component.html',
+    styleUrls: ['./permission-container.component.scss'],
+    encapsulation: ViewEncapsulation.None
 })
 export class PermissionContainerComponent implements OnChanges {
-
     @Input()
     node: Node;
 
@@ -48,7 +80,7 @@ export class PermissionContainerComponent implements OnChanges {
 
     /** Emitted when the permission is updated. */
     @Output()
-    update = new EventEmitter<{role: string; permission: PermissionDisplayModel}>();
+    update = new EventEmitter<{ role: string; permission: PermissionDisplayModel }>();
 
     @Output()
     updateAll = new EventEmitter<string>();
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html
index b8ddd586eb..b30b8eeb78 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html
+++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html
@@ -1,8 +1,6 @@
 <mat-card class="adf-permission-card" id="adf-permission-manager-card">
     <div *ngIf="(permissionList.data$ | async) === null && permissionList.loading$ | async" class="adf-permission-loader">
-        <mat-progress-spinner [color]="'primary'"
-                              [mode]="'indeterminate'">
-        </mat-progress-spinner>
+        <mat-progress-spinner [color]="'primary'" [mode]="'indeterminate'"></mat-progress-spinner>
     </div>
 
     <ng-container *ngIf="permissionList.error$ | async">
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts
index 39679d66f4..57ed294c33 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts
@@ -20,9 +20,30 @@ import { PermissionElement } from '@alfresco/js-api';
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { PermissionDisplayModel } from '../../models/permission.model';
 import { PermissionListService } from './permission-list.service';
+import { CommonModule } from '@angular/common';
+import { MatCardModule } from '@angular/material/card';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatButtonModule } from '@angular/material/button';
+import { PermissionContainerComponent } from '../permission-container/permission-container.component';
+import { PopOverDirective } from '../pop-over.directive';
 
 @Component({
     selector: 'adf-permission-list',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatCardModule,
+        MatProgressSpinnerModule,
+        MatIconModule,
+        MatSlideToggleModule,
+        TranslateModule,
+        MatButtonModule,
+        PermissionContainerComponent,
+        PopOverDirective
+    ],
     templateUrl: './permission-list.component.html',
     styleUrls: ['./permission-list.component.scss'],
     encapsulation: ViewEncapsulation.None
@@ -64,7 +85,7 @@ export class PermissionListComponent implements OnInit {
         this.selectedPermissions = [];
     }
 
-    updatePermission({role, permission}) {
+    updatePermission({ role, permission }) {
         this.permissionList.updateRole(role, permission);
     }
 
diff --git a/lib/content-services/src/lib/permission-manager/components/pop-over.directive.spec.ts b/lib/content-services/src/lib/permission-manager/components/pop-over.directive.spec.ts
index b9f1bbf01b..4518981b5b 100644
--- a/lib/content-services/src/lib/permission-manager/components/pop-over.directive.spec.ts
+++ b/lib/content-services/src/lib/permission-manager/components/pop-over.directive.spec.ts
@@ -22,6 +22,8 @@ import { By } from '@angular/platform-browser';
 import { OverlayModule } from '@angular/cdk/overlay';
 
 @Component({
+    standalone: true,
+    imports: [PopOverDirective],
     template: `
         <div
             [adf-pop-over]="popOver"
@@ -43,8 +45,7 @@ describe('PopOverDirective', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [OverlayModule],
-            declarations: [PopOverDirective, PopOverTestComponent]
+            imports: [OverlayModule, PopOverTestComponent]
         });
         fixture = TestBed.createComponent(PopOverTestComponent);
     });
diff --git a/lib/content-services/src/lib/permission-manager/components/pop-over.directive.ts b/lib/content-services/src/lib/permission-manager/components/pop-over.directive.ts
index 141020a7dd..76ef650ba2 100644
--- a/lib/content-services/src/lib/permission-manager/components/pop-over.directive.ts
+++ b/lib/content-services/src/lib/permission-manager/components/pop-over.directive.ts
@@ -15,17 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    AfterViewInit,
-    Directive,
-    ElementRef,
-    HostListener,
-    Input,
-    OnDestroy,
-    OnInit,
-    TemplateRef,
-    ViewContainerRef
-} from '@angular/core';
+import { AfterViewInit, Directive, ElementRef, HostListener, Input, OnDestroy, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
 import { ConnectionPositionPair, Overlay, OverlayRef } from '@angular/cdk/overlay';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { takeUntil } from 'rxjs/operators';
@@ -34,8 +24,8 @@ import { ConfigurableFocusTrap, ConfigurableFocusTrapFactory } from '@angular/cd
 
 @Directive({
     selector: '[adf-pop-over]',
+    standalone: true,
     exportAs: 'adfPopOver'
-
 })
 export class PopOverDirective implements OnInit, OnDestroy, AfterViewInit {
     get open(): boolean {
@@ -58,7 +48,7 @@ export class PopOverDirective implements OnInit, OnDestroy, AfterViewInit {
         private overlay: Overlay,
         private vcr: ViewContainerRef,
         private focusTrapFactory: ConfigurableFocusTrapFactory
-    ) { }
+    ) {}
 
     ngOnInit(): void {
         this.createOverlay();
diff --git a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts
index af85e39785..8ba860c2e7 100644
--- a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts
@@ -15,19 +15,23 @@
  * limitations under the License.
  */
 
-import { User } from '@alfresco/adf-core';
+import { InitialUsernamePipe, User } from '@alfresco/adf-core';
 import { Group, NodeEntry } from '@alfresco/js-api';
 import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { NodePermissionService } from '../../services/node-permission.service';
+import { CommonModule } from '@angular/common';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'adf-user-icon-column',
+    standalone: true,
+    imports: [CommonModule, MatIconModule, InitialUsernamePipe],
     template: `
-        <div class="adf-cell-value" [attr.id]="group ? 'group-icon' : 'person-icon'"  *ngIf="!isSelected">
+        <div class="adf-cell-value" [attr.id]="group ? 'group-icon' : 'person-icon'" *ngIf="!isSelected">
             <ng-container *ngIf="displayText$ | async as user">
                 <mat-icon *ngIf="group" class="adf-group-icon">people_alt_outline</mat-icon>
-                <div *ngIf="!group" [outerHTML]="user | usernameInitials: 'adf-people-initial'"></div>
+                <div *ngIf="!group" [outerHTML]="user | usernameInitials : 'adf-people-initial'"></div>
             </ng-container>
         </div>
         <div class="adf-cell-value" *ngIf="isSelected">
diff --git a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts
index d1cb500424..2bdbf2dd8a 100644
--- a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.ts
@@ -20,9 +20,12 @@ import { BehaviorSubject } from 'rxjs';
 import { Group, NodeEntry } from '@alfresco/js-api';
 import { NodePermissionService } from '../../services/node-permission.service';
 import { EcmUserModel } from '../../../common/models/ecm-user.model';
+import { CommonModule } from '@angular/common';
 
 @Component({
     selector: 'adf-user-name-column',
+    standalone: true,
+    imports: [CommonModule],
     template: `
         <div class="adf-ellipsis-cell" [attr.data-automation-id]="displayText$ | async">
             <span class="adf-user-name-column" title="{{ displayText$ | async }}"> {{ displayText$ | async }}</span>
diff --git a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts
index f782216af1..22af107bea 100644
--- a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.ts
@@ -17,9 +17,16 @@
 
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { RoleModel } from '../../models/role.model';
+import { CommonModule } from '@angular/common';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSelectModule } from '@angular/material/select';
+import { TranslateModule } from '@ngx-translate/core';
+import { LocalizedRolePipe } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-user-role-column',
+    standalone: true,
+    imports: [CommonModule, MatFormFieldModule, MatSelectModule, TranslateModule, LocalizedRolePipe],
     template: `
         <mat-form-field class="adf-role-selector-field" *ngIf="!readonly">
             <mat-select
diff --git a/lib/content-services/src/lib/permission-manager/permission-manager.module.ts b/lib/content-services/src/lib/permission-manager/permission-manager.module.ts
index 1e3980f4bd..fb58cf7c18 100644
--- a/lib/content-services/src/lib/permission-manager/permission-manager.module.ts
+++ b/lib/content-services/src/lib/permission-manager/permission-manager.module.ts
@@ -15,17 +15,12 @@
  * limitations under the License.
  */
 
-import { CoreModule, InitialUsernamePipe, PipeModule } from '@alfresco/adf-core';
-import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MaterialModule } from '../material.module';
 import { PermissionListComponent } from './components/permission-list/permission-list.component';
 import { AddPermissionComponent } from './components/add-permission/add-permission.component';
 import { AddPermissionDialogComponent } from './components/add-permission/add-permission-dialog.component';
 import { InheritPermissionDirective } from './components/inherited-button.directive';
 import { AddPermissionPanelComponent } from './components/add-permission/add-permission-panel.component';
-import { SearchModule } from '../search/search.module';
 import { UserNameColumnComponent } from './components/user-name-column/user-name-column.component';
 import { UserIconColumnComponent } from './components/user-icon-column/user-icon-column.component';
 import { UserRoleColumnComponent } from './components/user-role-column/user-role-column.component';
@@ -33,32 +28,23 @@ import { NodePathColumnComponent } from './components/node-path-column/node-path
 import { PopOverDirective } from './components/pop-over.directive';
 import { PermissionContainerComponent } from './components/permission-container/permission-container.component';
 
+export const CONTENT_PERMISSION_MANAGER_DIRECTIVES = [
+    AddPermissionPanelComponent,
+    AddPermissionComponent,
+    AddPermissionDialogComponent,
+    NodePathColumnComponent,
+    PermissionContainerComponent,
+    PermissionListComponent,
+    UserNameColumnComponent,
+    UserIconColumnComponent,
+    UserRoleColumnComponent,
+    InheritPermissionDirective,
+    PopOverDirective
+] as const;
+
+/** @deprecated use `...CONTENT_PERMISSION_MANAGER_DIRECTIVES` or import the standalone components directly */
 @NgModule({
-    imports: [CoreModule, CommonModule, FormsModule, ReactiveFormsModule, MaterialModule, SearchModule, PipeModule, InitialUsernamePipe],
-    declarations: [
-        PermissionListComponent,
-        AddPermissionPanelComponent,
-        InheritPermissionDirective,
-        AddPermissionComponent,
-        AddPermissionDialogComponent,
-        UserNameColumnComponent,
-        UserIconColumnComponent,
-        UserRoleColumnComponent,
-        PopOverDirective,
-        NodePathColumnComponent,
-        PermissionContainerComponent
-    ],
-    exports: [
-        PermissionListComponent,
-        AddPermissionPanelComponent,
-        InheritPermissionDirective,
-        AddPermissionComponent,
-        AddPermissionDialogComponent,
-        UserNameColumnComponent,
-        UserIconColumnComponent,
-        UserRoleColumnComponent,
-        PopOverDirective,
-        NodePathColumnComponent
-    ]
+    imports: [...CONTENT_PERMISSION_MANAGER_DIRECTIVES],
+    exports: [...CONTENT_PERMISSION_MANAGER_DIRECTIVES]
 })
 export class PermissionManagerModule {}
diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
index 8a1f7067df..bc5ab827ce 100644
--- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
+++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
@@ -16,13 +16,17 @@
  */
 
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { MatCheckboxChange } from '@angular/material/checkbox';
+import { MatCheckboxChange, MatCheckboxModule } from '@angular/material/checkbox';
 import { SearchWidget } from '../../models/search-widget.interface';
 import { SearchWidgetSettings } from '../../models/search-widget-settings.interface';
 import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
 import { SearchFilterList } from '../../models/search-filter-list.model';
 import { TranslationService } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
 
 export interface SearchListOption {
     name: string;
@@ -32,13 +36,14 @@ export interface SearchListOption {
 
 @Component({
     selector: 'adf-search-check-list',
+    standalone: true,
+    imports: [CommonModule, MatCheckboxModule, TranslateModule, MatButtonModule, MatIconModule],
     templateUrl: './search-check-list.component.html',
     styleUrls: ['./search-check-list.component.scss'],
     encapsulation: ViewEncapsulation.None,
     host: { class: 'adf-search-check-list' }
 })
 export class SearchCheckListComponent implements SearchWidget, OnInit {
-
     id: string;
     settings?: SearchWidgetSettings;
     context?: SearchQueryBuilderService;
@@ -101,7 +106,7 @@ export class SearchCheckListComponent implements SearchWidget, OnInit {
     updateDisplayValue(): void {
         const displayValue = this.options.items
             .filter((option) => option.checked)
-            .map(({name}) => this.translationService.instant(name))
+            .map(({ name }) => this.translationService.instant(name))
             .join(', ');
         this.displayValue$.next(displayValue);
     }
@@ -125,15 +130,12 @@ export class SearchCheckListComponent implements SearchWidget, OnInit {
     }
 
     setValue(value: any) {
-        this.options.items.filter((item) => value.includes(item.value))
-            .map((item) => item.checked = true);
+        this.options.items.filter((item) => value.includes(item.value)).map((item) => (item.checked = true));
         this.submitValues();
     }
 
     private getCheckedValues() {
-        return this.options.items
-            .filter((option) => option.checked)
-            .map((option) => option.value);
+        return this.options.items.filter((option) => option.checked).map((option) => option.value);
     }
 
     submitValues() {
diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts
index 3a00fbbd3e..da598ee6fe 100644
--- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts
+++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts
@@ -36,8 +36,7 @@ describe('SearchChipAutocompleteInputComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [SearchChipAutocompleteInputComponent],
-            imports: [ContentTestingModule]
+            imports: [ContentTestingModule, SearchChipAutocompleteInputComponent]
         });
 
         fixture = TestBed.createComponent(SearchChipAutocompleteInputComponent);
diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts
index 5d4ffe0651..b3e57fdcd2 100644
--- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts
+++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts
@@ -29,15 +29,21 @@ import {
     OnChanges
 } from '@angular/core';
 import { ENTER } from '@angular/cdk/keycodes';
-import { FormControl } from '@angular/forms';
-import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
-import { MatChipInputEvent } from '@angular/material/chips';
+import { FormControl, ReactiveFormsModule } from '@angular/forms';
+import { MatAutocompleteModule, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { MatChipInputEvent, MatChipsModule } from '@angular/material/chips';
 import { EMPTY, Observable, Subject, timer } from 'rxjs';
 import { debounce, startWith, takeUntil, tap } from 'rxjs/operators';
 import { AutocompleteOption } from '../../models/autocomplete-option.interface';
+import { CommonModule } from '@angular/common';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'adf-search-chip-autocomplete-input',
+    standalone: true,
+    imports: [CommonModule, MatFormFieldModule, MatChipsModule, TranslateModule, MatIconModule, ReactiveFormsModule, MatAutocompleteModule],
     templateUrl: './search-chip-autocomplete-input.component.html',
     styleUrls: ['./search-chip-autocomplete-input.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts
index 75d762d4da..271ed69a55 100644
--- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts
+++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts
@@ -23,9 +23,12 @@ import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatChipHarness, MatChipRemoveHarness } from '@angular/material/chips/testing';
+import { SearchChipListComponent } from './search-chip-list.component';
 
 @Component({
     selector: 'adf-test-component',
+    standalone: true,
+    imports: [SearchChipListComponent],
     template: ` <adf-search-chip-list [searchFilter]="searchFilter" [clearAll]="allowClear"> </adf-search-chip-list> `
 })
 class TestComponent {
@@ -33,7 +36,7 @@ class TestComponent {
     searchFilter = {
         selectedBuckets: [],
         unselectFacetBucket: () => {}
-    };
+    } as any;
 }
 
 describe('SearchChipListComponent', () => {
@@ -44,8 +47,7 @@ describe('SearchChipListComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule],
-            declarations: [TestComponent]
+            imports: [ContentTestingModule, TestComponent]
         });
         fixture = TestBed.createComponent(TestComponent);
         component = fixture.componentInstance;
diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts
index d22fb35177..8c4f12424b 100644
--- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts
+++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts
@@ -18,16 +18,21 @@
 import { Component, ViewEncapsulation, Input } from '@angular/core';
 import { SearchFilterComponent } from '../../components/search-filter/search-filter.component';
 import { SearchFacetFiltersService } from '../../services/search-facet-filters.service';
+import { CommonModule } from '@angular/common';
+import { MatChipsModule } from '@angular/material/chips';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'adf-search-chip-list',
+    standalone: true,
+    imports: [CommonModule, MatChipsModule, TranslateModule, MatIconModule],
     templateUrl: './search-chip-list.component.html',
     styleUrls: ['./search-chip-list.component.scss'],
     encapsulation: ViewEncapsulation.None,
     host: { class: 'adf-search-chip-list' }
 })
 export class SearchChipListComponent {
-
     /**
      * Search filter to supply the data for the chips.
      * Not required from 4.5.0 and later versions @deprecated
diff --git a/lib/content-services/src/lib/search/search.module.ts b/lib/content-services/src/lib/search/search.module.ts
index f545c90069..f2bb9eedbd 100644
--- a/lib/content-services/src/lib/search/search.module.ts
+++ b/lib/content-services/src/lib/search/search.module.ts
@@ -57,24 +57,32 @@ import { SearchFacetChipTabbedComponent } from './components/search-filter-chips
 import { SearchFacetTabbedContentComponent } from './components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component';
 import { SearchInputComponent } from './components/search-input';
 
+export const CONTENT_SEARCH_DIRECTIVES = [SearchCheckListComponent, SearchChipAutocompleteInputComponent, SearchChipListComponent] as const;
+
 @NgModule({
-    imports: [CommonModule, FormsModule, ReactiveFormsModule, MaterialModule, CoreModule, SearchTextModule, SearchInputComponent],
+    imports: [
+        ...CONTENT_SEARCH_DIRECTIVES,
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MaterialModule,
+        CoreModule,
+        SearchTextModule,
+        SearchInputComponent
+    ],
     declarations: [
         SearchComponent,
         SearchControlComponent,
         EmptySearchResultComponent,
         SearchFilterComponent,
         SearchFilterCardComponent,
-        SearchChipListComponent,
         SearchWidgetContainerComponent,
         SearchTextComponent,
-        SearchChipAutocompleteInputComponent,
         SearchFilterAutocompleteChipsComponent,
         SearchRadioComponent,
         SearchSliderComponent,
         SearchNumberRangeComponent,
         SearchPanelComponent,
-        SearchCheckListComponent,
         SearchDatetimeRangeComponent,
         SearchSortingPickerComponent,
         SearchFilterContainerComponent,
@@ -100,16 +108,14 @@ import { SearchInputComponent } from './components/search-input';
         EmptySearchResultComponent,
         SearchFilterComponent,
         SearchFilterCardComponent,
-        SearchChipListComponent,
         SearchWidgetContainerComponent,
         SearchTextComponent,
-        SearchChipAutocompleteInputComponent,
         SearchFilterAutocompleteChipsComponent,
         SearchRadioComponent,
         SearchSliderComponent,
         SearchNumberRangeComponent,
         SearchPanelComponent,
-        SearchCheckListComponent,
+        ...CONTENT_SEARCH_DIRECTIVES,
         SearchDatetimeRangeComponent,
         SearchSortingPickerComponent,
         SearchFilterContainerComponent,
diff --git a/lib/content-services/src/lib/tag/tag-actions.component.spec.ts b/lib/content-services/src/lib/tag/tag-actions.component.spec.ts
index df4889e0ec..54cdf665d5 100644
--- a/lib/content-services/src/lib/tag/tag-actions.component.spec.ts
+++ b/lib/content-services/src/lib/tag/tag-actions.component.spec.ts
@@ -50,7 +50,7 @@ describe('TagActionsComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule]
+            imports: [ContentTestingModule, TagActionsComponent]
         });
         fixture = TestBed.createComponent(TagActionsComponent);
         tagService = TestBed.inject(TagService);
diff --git a/lib/content-services/src/lib/tag/tag-actions.component.ts b/lib/content-services/src/lib/tag/tag-actions.component.ts
index fee98ce5af..1563b00381 100644
--- a/lib/content-services/src/lib/tag/tag-actions.component.ts
+++ b/lib/content-services/src/lib/tag/tag-actions.component.ts
@@ -21,6 +21,14 @@ import { TagService } from './services/tag.service';
 import { Subject } from 'rxjs';
 import { TagPaging } from '@alfresco/js-api';
 import { takeUntil } from 'rxjs/operators';
+import { CommonModule } from '@angular/common';
+import { MatListModule } from '@angular/material/list';
+import { MatIconModule } from '@angular/material/icon';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
 
 /**
  *
@@ -29,13 +37,14 @@ import { takeUntil } from 'rxjs/operators';
 
 @Component({
     selector: 'adf-tag-node-actions-list',
+    standalone: true,
+    imports: [CommonModule, MatListModule, MatIconModule, MatFormFieldModule, MatInputModule, TranslateModule, FormsModule, MatButtonModule],
     templateUrl: './tag-actions.component.html',
     styleUrls: ['./tag-actions.component.scss'],
     encapsulation: ViewEncapsulation.None,
     host: { class: 'adf-tag-node-actions-list' }
 })
 export class TagActionsComponent implements OnChanges, OnInit, OnDestroy {
-
     /** The identifier of a node. */
     @Input()
     nodeId: string;
@@ -59,13 +68,10 @@ export class TagActionsComponent implements OnChanges, OnInit, OnDestroy {
 
     private onDestroy$ = new Subject<boolean>();
 
-    constructor(private tagService: TagService, private translateService: TranslationService) {
-    }
+    constructor(private tagService: TagService, private translateService: TranslationService) {}
 
     ngOnInit() {
-        this.tagService.refresh
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(() => this.refreshTag());
+        this.tagService.refresh.pipe(takeUntil(this.onDestroy$)).subscribe(() => this.refreshTag());
     }
 
     ngOnChanges() {
@@ -79,15 +85,18 @@ export class TagActionsComponent implements OnChanges, OnInit, OnDestroy {
 
     refreshTag() {
         if (this.nodeId) {
-            this.tagService.getTagsByNodeId(this.nodeId).subscribe((tagPaging: TagPaging) => {
-                this.tagsEntries = tagPaging.list.entries;
-                this.disableAddTag = false;
-                this.result.emit(this.tagsEntries);
-            }, () => {
-                this.tagsEntries = null;
-                this.disableAddTag = true;
-                this.result.emit(this.tagsEntries);
-            });
+            this.tagService.getTagsByNodeId(this.nodeId).subscribe(
+                (tagPaging: TagPaging) => {
+                    this.tagsEntries = tagPaging.list.entries;
+                    this.disableAddTag = false;
+                    this.result.emit(this.tagsEntries);
+                },
+                () => {
+                    this.tagsEntries = null;
+                    this.disableAddTag = true;
+                    this.result.emit(this.tagsEntries);
+                }
+            );
         }
     }
 
@@ -105,7 +114,7 @@ export class TagActionsComponent implements OnChanges, OnInit, OnDestroy {
 
     searchTag(searchTagName: string) {
         if (this.tagsEntries) {
-            return this.tagsEntries.find((currentTag) => (searchTagName === currentTag.entry.tag));
+            return this.tagsEntries.find((currentTag) => searchTagName === currentTag.entry.tag);
         }
     }
 
diff --git a/lib/content-services/src/lib/tag/tag-list.component.spec.ts b/lib/content-services/src/lib/tag/tag-list.component.spec.ts
index 0606a700f5..f459487bc4 100644
--- a/lib/content-services/src/lib/tag/tag-list.component.spec.ts
+++ b/lib/content-services/src/lib/tag/tag-list.component.spec.ts
@@ -50,7 +50,7 @@ describe('TagList', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule]
+            imports: [ContentTestingModule, TagListComponent]
         });
 
         tagService = TestBed.inject(TagService);
diff --git a/lib/content-services/src/lib/tag/tag-list.component.ts b/lib/content-services/src/lib/tag/tag-list.component.ts
index 717b557d77..ae3aa59cf5 100644
--- a/lib/content-services/src/lib/tag/tag-list.component.ts
+++ b/lib/content-services/src/lib/tag/tag-list.component.ts
@@ -21,19 +21,24 @@ import { PaginationModel } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { TagEntry } from '@alfresco/js-api';
+import { CommonModule } from '@angular/common';
+import { MatChipsModule } from '@angular/material/chips';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
 
 /**
  * This component provide a list of all the tag inside the ECM
  */
 @Component({
     selector: 'adf-tag-list',
+    standalone: true,
+    imports: [CommonModule, MatChipsModule, MatButtonModule, MatIconModule],
     templateUrl: './tag-list.component.html',
     styleUrls: ['./tag-list.component.scss'],
     encapsulation: ViewEncapsulation.None,
     host: { class: 'adf-tag-list' }
 })
 export class TagListComponent implements OnInit, OnDestroy {
-
     /** Emitted when a tag is selected. */
     @Output()
     result = new EventEmitter();
@@ -57,7 +62,6 @@ export class TagListComponent implements OnInit, OnDestroy {
     private onDestroy$ = new Subject<boolean>();
 
     constructor(private tagService: TagService) {
-
         this.defaultPagination = {
             skipCount: 0,
             maxItems: this.size,
@@ -66,12 +70,10 @@ export class TagListComponent implements OnInit, OnDestroy {
 
         this.pagination = this.defaultPagination;
 
-        this.tagService.refresh
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(() => {
-                this.tagsEntries = [];
-                this.refreshTag(this.defaultPagination);
-            });
+        this.tagService.refresh.pipe(takeUntil(this.onDestroy$)).subscribe(() => {
+            this.tagsEntries = [];
+            this.refreshTag(this.defaultPagination);
+        });
     }
 
     ngOnInit() {
diff --git a/lib/content-services/src/lib/tag/tag-node-list.component.spec.ts b/lib/content-services/src/lib/tag/tag-node-list.component.spec.ts
index 89c064cf03..d065f9ddcb 100644
--- a/lib/content-services/src/lib/tag/tag-node-list.component.spec.ts
+++ b/lib/content-services/src/lib/tag/tag-node-list.component.spec.ts
@@ -30,7 +30,7 @@ describe('TagNodeList', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ContentTestingModule]
+            imports: [ContentTestingModule, TagNodeListComponent]
         });
         fixture = TestBed.createComponent(TagNodeListComponent);
         component = fixture.componentInstance;
diff --git a/lib/content-services/src/lib/tag/tag-node-list.component.ts b/lib/content-services/src/lib/tag/tag-node-list.component.ts
index 85c42ad095..29792b63dc 100644
--- a/lib/content-services/src/lib/tag/tag-node-list.component.ts
+++ b/lib/content-services/src/lib/tag/tag-node-list.component.ts
@@ -20,7 +20,7 @@ import { TagService } from './services/tag.service';
 import { TagEntry } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { Chip } from '@alfresco/adf-core';
+import { Chip, DynamicChipListComponent } from '@alfresco/adf-core';
 
 /**
  *
@@ -29,6 +29,8 @@ import { Chip } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-tag-node-list',
+    standalone: true,
+    imports: [DynamicChipListComponent],
     templateUrl: './tag-node-list.component.html',
     encapsulation: ViewEncapsulation.None
 })
@@ -63,9 +65,7 @@ export class TagNodeListComponent implements OnChanges, OnDestroy, OnInit {
     }
 
     ngOnInit(): void {
-        this.tagService.refresh
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(() => this.refreshTag());
+        this.tagService.refresh.pipe(takeUntil(this.onDestroy$)).subscribe(() => this.refreshTag());
     }
 
     ngOnDestroy(): void {
diff --git a/lib/content-services/src/lib/tag/tag.module.ts b/lib/content-services/src/lib/tag/tag.module.ts
index abdfe8d58f..eff5302962 100644
--- a/lib/content-services/src/lib/tag/tag.module.ts
+++ b/lib/content-services/src/lib/tag/tag.module.ts
@@ -15,34 +15,17 @@
  * limitations under the License.
  */
 
-import { CommonModule, NgForOf } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MaterialModule } from '../material.module';
 import { TagActionsComponent } from './tag-actions.component';
 import { TagListComponent } from './tag-list.component';
 import { TagNodeListComponent } from './tag-node-list.component';
 import { TagsCreatorComponent } from './tags-creator/tags-creator.component';
-import { ContentDirectiveModule } from '../directives/content-directive.module';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatIconModule } from '@angular/material/icon';
-import { TranslateModule } from '@ngx-translate/core';
-import { DynamicChipListModule } from '@alfresco/adf-core';
 
+export const CONTENT_TAG_DIRECTIVES = [TagsCreatorComponent, TagActionsComponent, TagListComponent, TagNodeListComponent] as const;
+
+/** @deprecated use `...CONTENT_TAG_DIRECTIVES` instead or import standalone components directly */
 @NgModule({
-    imports: [
-        CommonModule,
-        ContentDirectiveModule,
-        MaterialModule,
-        FormsModule,
-        ReactiveFormsModule,
-        TranslateModule,
-        DynamicChipListModule,
-        MatChipsModule,
-        MatIconModule,
-        NgForOf
-    ],
-    exports: [TagActionsComponent, TagListComponent, TagNodeListComponent, TagsCreatorComponent],
-    declarations: [TagActionsComponent, TagListComponent, TagNodeListComponent, TagsCreatorComponent]
+    imports: [...CONTENT_TAG_DIRECTIVES],
+    exports: [...CONTENT_TAG_DIRECTIVES]
 })
 export class TagModule {}
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts
index 0336e4549a..4a2c9736ba 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts
@@ -20,22 +20,15 @@ import { TagsCreatorComponent } from './tags-creator.component';
 import { NotificationService } from '@alfresco/adf-core';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
-import { MatError, MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { ContentDirectiveModule, TagsCreatorMode, TagService } from '@alfresco/adf-content-services';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatError } from '@angular/material/form-field';
+import { TagsCreatorMode, TagService } from '@alfresco/adf-content-services';
 import { EMPTY, of, throwError } from 'rxjs';
 import { DebugElement } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { MatListModule } from '@angular/material/list';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing';
 import { MatChipOptionHarness } from '@angular/material/chips/testing';
-import { MatChipsModule } from '@angular/material/chips';
 
 describe('TagsCreatorComponent', () => {
     let fixture: ComponentFixture<TagsCreatorComponent>;
@@ -46,20 +39,7 @@ describe('TagsCreatorComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [TagsCreatorComponent],
-            imports: [
-                ContentDirectiveModule,
-                MatButtonModule,
-                MatFormFieldModule,
-                MatIconModule,
-                MatInputModule,
-                MatProgressSpinnerModule,
-                MatListModule,
-                MatChipsModule,
-                NoopAnimationsModule,
-                ReactiveFormsModule,
-                TranslateModule.forRoot()
-            ],
+            imports: [NoopAnimationsModule, TranslateModule.forRoot(), TagsCreatorComponent],
             providers: [
                 {
                     provide: TagService,
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
index 34bf4b3cb9..ef54ad14b6 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
@@ -17,12 +17,21 @@
 
 import { TagEntry, TagPaging } from '@alfresco/js-api';
 import { Component, ElementRef, EventEmitter, HostBinding, Input, OnDestroy, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
-import { FormControl, Validators } from '@angular/forms';
+import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
 import { debounce, distinctUntilChanged, finalize, first, map, takeUntil, tap } from 'rxjs/operators';
 import { EMPTY, forkJoin, Observable, Subject, timer } from 'rxjs';
 import { NotificationService } from '@alfresco/adf-core';
 import { TagsCreatorMode } from './tags-creator-mode';
 import { TagService } from '../services/tag.service';
+import { CommonModule } from '@angular/common';
+import { MatInputModule } from '@angular/material/input';
+import { AutoFocusDirective } from '../../directives';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatChipsModule } from '@angular/material/chips';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from '@angular/material/list';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 
 interface TagNameControlErrors {
     duplicatedExistingTag?: boolean;
@@ -42,6 +51,19 @@ const DEFAULT_TAGS_SORTING = {
  */
 @Component({
     selector: 'adf-tags-creator',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatInputModule,
+        ReactiveFormsModule,
+        AutoFocusDirective,
+        TranslateModule,
+        MatChipsModule,
+        MatButtonModule,
+        MatIconModule,
+        MatListModule,
+        MatProgressSpinnerModule
+    ],
     templateUrl: './tags-creator.component.html',
     styleUrls: ['./tags-creator.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/tree-view/tree-view.module.ts b/lib/content-services/src/lib/tree-view/tree-view.module.ts
index 308b958d43..17a29ae078 100644
--- a/lib/content-services/src/lib/tree-view/tree-view.module.ts
+++ b/lib/content-services/src/lib/tree-view/tree-view.module.ts
@@ -18,7 +18,7 @@
 import { NgModule } from '@angular/core';
 import { TreeViewComponent } from './components/tree-view.component';
 
-/** @deprecated this module is deprecated and will be removed in future versions */
+/** @deprecated use `TreeViewComponent` instead */
 @NgModule({
     imports: [TreeViewComponent],
     exports: [TreeViewComponent]
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts
index b1e6f654c7..63ccd75019 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts
+++ b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts
@@ -16,7 +16,19 @@
  */
 
 import { UserPreferencesService } from '@alfresco/adf-core';
-import { ChangeDetectorRef, Component, Input, Output, EventEmitter, OnDestroy, OnInit, ViewChild, HostBinding, ElementRef, ViewEncapsulation } from '@angular/core';
+import {
+    ChangeDetectorRef,
+    Component,
+    Input,
+    Output,
+    EventEmitter,
+    OnDestroy,
+    OnInit,
+    ViewChild,
+    HostBinding,
+    ElementRef,
+    ViewEncapsulation
+} from '@angular/core';
 import { Subscription, merge, Subject } from 'rxjs';
 import { FileUploadingListComponent } from './file-uploading-list.component';
 import { Direction } from '@angular/cdk/bidi';
@@ -24,9 +36,17 @@ import { takeUntil, delay } from 'rxjs/operators';
 import { UploadService } from '../../common/services/upload.service';
 import { FileModel, FileUploadStatus } from '../../common/models/file.model';
 import { FileUploadDeleteEvent, FileUploadCompleteEvent } from '../../common/events/file.event';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
+import { FileUploadingListRowComponent } from './file-uploading-list-row.component';
+import { A11yModule } from '@angular/cdk/a11y';
 
 @Component({
     selector: 'adf-file-uploading-dialog',
+    standalone: true,
+    imports: [CommonModule, MatButtonModule, TranslateModule, MatIconModule, FileUploadingListComponent, FileUploadingListRowComponent, A11yModule],
     templateUrl: './file-uploading-dialog.component.html',
     styleUrls: ['./file-uploading-dialog.component.scss'],
     encapsulation: ViewEncapsulation.None
@@ -53,15 +73,11 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
 
     @HostBinding('attr.adfUploadDialogRight')
     public get isPositionRight(): boolean {
-        return (this.direction === 'ltr' && this.position === 'right')
-            || (this.direction === 'rtl' && this.position === 'left')
-            || null;
+        return (this.direction === 'ltr' && this.position === 'right') || (this.direction === 'rtl' && this.position === 'left') || null;
     }
     @HostBinding('attr.adfUploadDialogLeft')
     public get isPositionLeft(): boolean {
-        return (this.direction === 'ltr' && this.position === 'left')
-            || (this.direction === 'rtl' && this.position === 'right')
-            || null;
+        return (this.direction === 'ltr' && this.position === 'left') || (this.direction === 'rtl' && this.position === 'right') || null;
     }
 
     filesUploadingList: FileModel[] = [];
@@ -81,71 +97,56 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
         private uploadService: UploadService,
         private changeDetector: ChangeDetectorRef,
         private userPreferencesService: UserPreferencesService,
-        private elementRef: ElementRef) {
-    }
+        private elementRef: ElementRef
+    ) {}
 
     ngOnInit() {
-        this.dialogActive
-            .pipe(
-                delay(100),
-                takeUntil(this.onDestroy$)
-            )
-            .subscribe(() => {
-                const element: any = this.elementRef.nativeElement.querySelector('#upload-dialog');
-                if (element) {
-                    element.focus();
-                }
-            });
+        this.dialogActive.pipe(delay(100), takeUntil(this.onDestroy$)).subscribe(() => {
+            const element: any = this.elementRef.nativeElement.querySelector('#upload-dialog');
+            if (element) {
+                element.focus();
+            }
+        });
 
-        this.listSubscription = this.uploadService.queueChanged
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(fileList => {
-                this.filesUploadingList = fileList;
+        this.listSubscription = this.uploadService.queueChanged.pipe(takeUntil(this.onDestroy$)).subscribe((fileList) => {
+            this.filesUploadingList = fileList;
 
-                if (this.filesUploadingList.length && !this.isDialogActive) {
-                    this.isDialogActive = true;
-                    this.dialogActive.next(undefined);
-                } else {
-                    this.dialogActive.next(undefined);
-                }
-            });
+            if (this.filesUploadingList.length && !this.isDialogActive) {
+                this.isDialogActive = true;
+                this.dialogActive.next(undefined);
+            } else {
+                this.dialogActive.next(undefined);
+            }
+        });
 
-        this.counterSubscription = merge(
-            this.uploadService.fileUploadComplete,
-            this.uploadService.fileUploadDeleted
-        )
+        this.counterSubscription = merge(this.uploadService.fileUploadComplete, this.uploadService.fileUploadDeleted)
             .pipe(takeUntil(this.onDestroy$))
             .subscribe((event: FileUploadCompleteEvent | FileUploadDeleteEvent) => {
                 this.totalCompleted = event.totalComplete;
                 this.changeDetector.detectChanges();
             });
 
-        this.errorSubscription = this.uploadService.fileUploadError
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(event => {
-                this.totalErrors = event.totalError;
-                this.changeDetector.detectChanges();
-            });
+        this.errorSubscription = this.uploadService.fileUploadError.pipe(takeUntil(this.onDestroy$)).subscribe((event) => {
+            this.totalErrors = event.totalError;
+            this.changeDetector.detectChanges();
+        });
 
-        this.fileUploadSubscription = this.uploadService.fileUpload
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(() => {
-                this.changeDetector.detectChanges();
-            });
+        this.fileUploadSubscription = this.uploadService.fileUpload.pipe(takeUntil(this.onDestroy$)).subscribe(() => {
+            this.changeDetector.detectChanges();
+        });
 
-        this.uploadService.fileDeleted
-            .pipe(takeUntil(this.onDestroy$))
-            .subscribe(objId => {
-                if (this.filesUploadingList) {
-                    const uploadedFile = this.filesUploadingList.find((file) => file.data ? file.data.entry.id === objId : false);
-                    if (uploadedFile) {
-                        uploadedFile.status = FileUploadStatus.Cancelled;
-                        this.changeDetector.detectChanges();
-                    }
+        this.uploadService.fileDeleted.pipe(takeUntil(this.onDestroy$)).subscribe((objId) => {
+            if (this.filesUploadingList) {
+                const uploadedFile = this.filesUploadingList.find((file) => (file.data ? file.data.entry.id === objId : false));
+                if (uploadedFile) {
+                    uploadedFile.status = FileUploadStatus.Cancelled;
+                    this.changeDetector.detectChanges();
                 }
-            });
+            }
+        });
 
-        this.userPreferencesService.select('textOrientation')
+        this.userPreferencesService
+            .select('textOrientation')
             .pipe(takeUntil(this.onDestroy$))
             .subscribe((textOrientation: Direction) => {
                 this.direction = textOrientation;
@@ -221,6 +222,6 @@ export class FileUploadingDialogComponent implements OnInit, OnDestroy {
     }
 
     hasUploadInProgress(): boolean {
-        return (!this.uploadList?.isUploadCompleted() && !this.uploadList?.isUploadCancelled());
+        return !this.uploadList?.isUploadCompleted() && !this.uploadList?.isUploadCancelled();
     }
 }
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html
index ee92b8b129..7a437f7add 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html
+++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html
@@ -14,7 +14,7 @@
     <span *ngIf="isUploadVersion()" class="adf-file-uploading-row__version" tabindex="0" >
         <mat-chip-option color="primary"
             [attr.aria-label]="'ADF_FILE_UPLOAD.ARIA-LABEL.VERSION' | translate: { version:  versionNumber }"
-            [title]="'version' + versionNumber" disabled
+            [title]="'version' + versionNumber" [disabled]="true"
         >{{ versionNumber }}</mat-chip-option>
     </span>
 
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts
index d57ca2a658..4565eabc56 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts
+++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts
@@ -17,9 +17,31 @@
 
 import { FileModel, FileUploadStatus } from '../../common/models/file.model';
 import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from '@angular/material/list';
+import { FileSizePipe, IconComponent } from '@alfresco/adf-core';
+import { MatChipsModule } from '@angular/material/chips';
+import { TranslateModule } from '@ngx-translate/core';
+import { ToggleIconDirective } from '../directives/toggle-icon.directive';
+import { MatButtonModule } from '@angular/material/button';
+import { FileUploadErrorPipe } from '../pipes/file-upload-error.pipe';
 
 @Component({
     selector: 'adf-file-uploading-list-row',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatIconModule,
+        MatListModule,
+        IconComponent,
+        MatChipsModule,
+        TranslateModule,
+        ToggleIconDirective,
+        FileSizePipe,
+        MatButtonModule,
+        FileUploadErrorPipe
+    ],
     templateUrl: './file-uploading-list-row.component.html',
     styleUrls: ['./file-uploading-list-row.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list.component.ts b/lib/content-services/src/lib/upload/components/file-uploading-list.component.ts
index 6fcf271b26..e34a14df09 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-list.component.ts
+++ b/lib/content-services/src/lib/upload/components/file-uploading-list.component.ts
@@ -15,23 +15,17 @@
  * limitations under the License.
  */
 
-import {
-    TranslationService
-} from '@alfresco/adf-core';
+import { TranslationService } from '@alfresco/adf-core';
 import { UploadService } from '../../common/services/upload.service';
 import { FileModel, FileUploadStatus } from '../../common/models/file.model';
 
-import {
-    Component,
-    ContentChild,
-    Input,
-    Output,
-    TemplateRef,
-    EventEmitter
-} from '@angular/core';
+import { Component, ContentChild, Input, Output, TemplateRef, EventEmitter } from '@angular/core';
+import { CommonModule } from '@angular/common';
 
 @Component({
     selector: 'adf-file-uploading-list',
+    standalone: true,
+    imports: [CommonModule],
     templateUrl: './file-uploading-list.component.html',
     styleUrls: ['./file-uploading-list.component.scss']
 })
@@ -46,10 +40,7 @@ export class FileUploadingListComponent {
     @Output()
     error = new EventEmitter<any>();
 
-    constructor(
-        private uploadService: UploadService,
-        private translateService: TranslationService) {
-    }
+    constructor(private uploadService: UploadService, private translateService: TranslationService) {}
 
     /**
      * Cancel file upload
@@ -79,14 +70,14 @@ export class FileUploadingListComponent {
             this.uploadService.cancelUpload(file);
         }
 
-        this.files = this.files.filter(entry => entry !== file);
+        this.files = this.files.filter((entry) => entry !== file);
     }
 
     /**
      * Calls the appropriate methods for each file, depending on state
      */
     cancelAllFiles(): void {
-        const filesToCancel = this.files.filter(file => this.isUploadingFile(file));
+        const filesToCancel = this.files.filter((file) => this.isUploadingFile(file));
 
         if (filesToCancel.length > 0) {
             this.uploadService.cancelUpload(...filesToCancel);
@@ -103,10 +94,7 @@ export class FileUploadingListComponent {
             !this.isUploadCancelled() &&
             Boolean(this.files.length) &&
             !this.files.some(
-                ({ status }) =>
-                    status === FileUploadStatus.Starting ||
-                    status === FileUploadStatus.Progress ||
-                    status === FileUploadStatus.Pending
+                ({ status }) => status === FileUploadStatus.Starting || status === FileUploadStatus.Progress || status === FileUploadStatus.Pending
             )
         );
     }
@@ -120,22 +108,14 @@ export class FileUploadingListComponent {
         return (
             !!this.files.length &&
             this.files.every(
-                ({ status }) =>
-                    status === FileUploadStatus.Aborted ||
-                    status === FileUploadStatus.Cancelled ||
-                    status === FileUploadStatus.Deleted
+                ({ status }) => status === FileUploadStatus.Aborted || status === FileUploadStatus.Cancelled || status === FileUploadStatus.Deleted
             )
         );
     }
 
     private cancelNodeVersionInstances(file: FileModel) {
         this.files
-            .filter(
-                (item) =>
-                    item.options.newVersion &&
-                    item.data.entry.id === file.data.entry.id
-
-            )
+            .filter((item) => item.options.newVersion && item.data.entry.id === file.data.entry.id)
             .map((item) => {
                 item.status = FileUploadStatus.Deleted;
             });
@@ -145,23 +125,15 @@ export class FileUploadingListComponent {
         let messageError: string = null;
 
         if (files.length === 1) {
-            messageError = this.translateService.instant(
-                'FILE_UPLOAD.MESSAGES.REMOVE_FILE_ERROR',
-                { fileName: files[0].name }
-            );
+            messageError = this.translateService.instant('FILE_UPLOAD.MESSAGES.REMOVE_FILE_ERROR', { fileName: files[0].name });
         } else {
-            messageError = this.translateService.instant(
-                'FILE_UPLOAD.MESSAGES.REMOVE_FILES_ERROR',
-                { total: files.length }
-            );
+            messageError = this.translateService.instant('FILE_UPLOAD.MESSAGES.REMOVE_FILES_ERROR', { total: files.length });
         }
 
         this.error.emit(messageError);
     }
 
     private isUploadingFile(file: FileModel): boolean {
-        return file.status === FileUploadStatus.Pending ||
-            file.status === FileUploadStatus.Starting ||
-            file.status === FileUploadStatus.Progress;
+        return file.status === FileUploadStatus.Pending || file.status === FileUploadStatus.Starting || file.status === FileUploadStatus.Progress;
     }
 }
diff --git a/lib/content-services/src/lib/upload/components/upload-button.component.ts b/lib/content-services/src/lib/upload/components/upload-button.component.ts
index 67f6542da8..a74f991e2d 100644
--- a/lib/content-services/src/lib/upload/components/upload-button.component.ts
+++ b/lib/content-services/src/lib/upload/components/upload-button.component.ts
@@ -25,9 +25,15 @@ import { Subject } from 'rxjs';
 import { PermissionModel } from '../../document-list/models/permissions.model';
 import { UploadBase } from './base-upload/upload-base';
 import { NodeAllowableOperationSubject } from '../../interfaces/node-allowable-operation-subject.interface';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'adf-upload-button',
+    standalone: true,
+    imports: [CommonModule, MatButtonModule, TranslateModule, MatIconModule],
     templateUrl: './upload-button.component.html',
     styleUrls: ['./upload-button.component.scss'],
     viewProviders: [{ provide: EXTENDIBLE_COMPONENT, useExisting: forwardRef(() => UploadButtonComponent) }],
diff --git a/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts b/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts
index da3bdfba20..f867157b4d 100644
--- a/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts
+++ b/lib/content-services/src/lib/upload/components/upload-drag-area.component.ts
@@ -23,9 +23,12 @@ import { AllowableOperationsEnum } from '../../common/models/allowable-operation
 import { ContentService } from '../../common/services/content.service';
 import { FileModel } from '../../common/models/file.model';
 import { Node } from '@alfresco/js-api';
+import { FileDraggableDirective } from '../directives/file-draggable.directive';
 
 @Component({
     selector: 'adf-upload-drag-area',
+    standalone: true,
+    imports: [FileDraggableDirective],
     templateUrl: './upload-drag-area.component.html',
     styleUrls: ['./upload-drag-area.component.scss'],
     host: { class: 'adf-upload-drag-area' },
diff --git a/lib/content-services/src/lib/upload/components/upload-version-button.component.ts b/lib/content-services/src/lib/upload/components/upload-version-button.component.ts
index 0c103b9b3d..0185785058 100644
--- a/lib/content-services/src/lib/upload/components/upload-version-button.component.ts
+++ b/lib/content-services/src/lib/upload/components/upload-version-button.component.ts
@@ -21,25 +21,33 @@ import { Node } from '@alfresco/js-api';
 import { UploadButtonComponent } from './upload-button.component';
 import { AllowableOperationsEnum } from '../../common/models/allowable-operations.enum';
 import { FileModel } from '../../common/models/file.model';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'adf-upload-version-button',
+    standalone: true,
+    imports: [CommonModule, MatButtonModule, TranslateModule, MatIconModule],
     templateUrl: './upload-button.component.html',
     styleUrls: ['./upload-button.component.scss'],
-    viewProviders: [
-        { provide: EXTENDIBLE_COMPONENT, useExisting: forwardRef(() => UploadVersionButtonComponent) }
-    ],
+    viewProviders: [{ provide: EXTENDIBLE_COMPONENT, useExisting: forwardRef(() => UploadVersionButtonComponent) }],
     encapsulation: ViewEncapsulation.None,
     host: { class: 'adf-upload-version-button' }
 })
 export class UploadVersionButtonComponent extends UploadButtonComponent implements OnChanges, OnInit {
-
     /** (**Required**) The node to be versioned. */
     @Input()
     node: Node;
 
     protected createFileModel(file: File): FileModel {
-        const fileModel = super.createFileModel(file, this.rootFolderId, ((file as any).webkitRelativePath || '').replace(/\/[^/]*$/, ''), this.node.id);
+        const fileModel = super.createFileModel(
+            file,
+            this.rootFolderId,
+            ((file as any).webkitRelativePath || '').replace(/\/[^/]*$/, ''),
+            this.node.id
+        );
 
         if (!this.isFileAcceptable(fileModel)) {
             const message = this.translationService.instant('FILE_UPLOAD.VERSION.MESSAGES.INCOMPATIBLE_VERSION');
diff --git a/lib/content-services/src/lib/upload/directives/file-draggable.directive.spec.ts b/lib/content-services/src/lib/upload/directives/file-draggable.directive.spec.ts
index 8dfcc7f784..680d5ab303 100644
--- a/lib/content-services/src/lib/upload/directives/file-draggable.directive.spec.ts
+++ b/lib/content-services/src/lib/upload/directives/file-draggable.directive.spec.ts
@@ -21,10 +21,12 @@ import { FileDraggableDirective, INPUT_FOCUS_CSS_CLASS } from '../directives/fil
 
 @Component({
     selector: 'adf-test-component',
+    standalone: true,
+    imports: [FileDraggableDirective],
     template: `
         <div id="test-container" [adf-file-draggable]="true">
             <div id="test-content"></div>
-       </div>
+        </div>
     `
 })
 class TestComponent {
@@ -42,10 +44,7 @@ describe('FileDraggableDirective', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [
-                TestComponent,
-                FileDraggableDirective
-            ]
+            imports: [TestComponent]
         });
 
         fixture = TestBed.createComponent(TestComponent);
@@ -61,11 +60,12 @@ describe('FileDraggableDirective', () => {
         fixture.destroy();
     });
 
-    const createEvent = (eventName: string): DragEvent => new DragEvent(eventName, {
-        bubbles: true,
-        cancelable: true,
-        dataTransfer: new DataTransfer()
-    });
+    const createEvent = (eventName: string): DragEvent =>
+        new DragEvent(eventName, {
+            bubbles: true,
+            cancelable: true,
+            dataTransfer: new DataTransfer()
+        });
 
     const raiseEvent = (eventName: string): DragEvent => {
         const event = createEvent(eventName);
diff --git a/lib/content-services/src/lib/upload/directives/file-draggable.directive.ts b/lib/content-services/src/lib/upload/directives/file-draggable.directive.ts
index 2a06d47481..18b222c01f 100644
--- a/lib/content-services/src/lib/upload/directives/file-draggable.directive.ts
+++ b/lib/content-services/src/lib/upload/directives/file-draggable.directive.ts
@@ -24,11 +24,11 @@ export const INPUT_FOCUS_CSS_CLASS = 'adf-file-draggable-input-focus';
 export const DROP_EFFECT = 'copy';
 
 @Directive({
-    selector: '[adf-file-draggable]'
+    selector: '[adf-file-draggable]',
+    standalone: true
 })
 export class FileDraggableDirective implements OnInit, OnDestroy {
-
-    files: File [];
+    files: File[];
 
     /** Enables/disables drag-and-drop functionality. */
     @Input('adf-file-draggable')
diff --git a/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts b/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts
index 4e14757e40..27cd25a0fd 100644
--- a/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts
+++ b/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts
@@ -21,9 +21,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 @Component({
     selector: 'adf-test-component',
-    template: `
-       <button id="testButton" adf-toggle-icon>test</button>
-    `
+    standalone: true,
+    imports: [ToggleIconDirective],
+    template: ` <button id="testButton" adf-toggle-icon>test</button> `
 })
 class TestComponent {
     @ViewChild(ToggleIconDirective)
@@ -36,10 +36,7 @@ describe('ToggleIconDirective', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [
-                TestComponent,
-                ToggleIconDirective
-            ]
+            imports: [TestComponent]
         });
         fixture = TestBed.createComponent(TestComponent);
         component = fixture.componentInstance;
diff --git a/lib/content-services/src/lib/upload/directives/toggle-icon.directive.ts b/lib/content-services/src/lib/upload/directives/toggle-icon.directive.ts
index 878c2f93b8..70ecf45691 100644
--- a/lib/content-services/src/lib/upload/directives/toggle-icon.directive.ts
+++ b/lib/content-services/src/lib/upload/directives/toggle-icon.directive.ts
@@ -19,6 +19,7 @@ import { Directive, HostListener } from '@angular/core';
 
 @Directive({
     selector: '[adf-toggle-icon]',
+    standalone: true,
     exportAs: 'toggleIcon'
 })
 export class ToggleIconDirective {
diff --git a/lib/content-services/src/lib/upload/upload.module.ts b/lib/content-services/src/lib/upload/upload.module.ts
index 5eca44abc2..a48bf6cd38 100644
--- a/lib/content-services/src/lib/upload/upload.module.ts
+++ b/lib/content-services/src/lib/upload/upload.module.ts
@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { MaterialModule } from '../material.module';
 import { FileUploadingDialogComponent } from './components/file-uploading-dialog.component';
 import { FileUploadingListRowComponent } from './components/file-uploading-list-row.component';
 import { FileUploadingListComponent } from './components/file-uploading-list.component';
@@ -25,33 +23,24 @@ import { UploadButtonComponent } from './components/upload-button.component';
 import { UploadVersionButtonComponent } from './components/upload-version-button.component';
 import { UploadDragAreaComponent } from './components/upload-drag-area.component';
 import { FileUploadErrorPipe } from './pipes/file-upload-error.pipe';
-import { CoreModule, FileSizePipe } from '@alfresco/adf-core';
 import { FileDraggableDirective } from './directives/file-draggable.directive';
 import { ToggleIconDirective } from './directives/toggle-icon.directive';
-import { A11yModule } from '@angular/cdk/a11y';
 
+export const CONTENT_UPLOAD_DIRECTIVES = [
+    FileUploadErrorPipe,
+    FileDraggableDirective,
+    ToggleIconDirective,
+    UploadDragAreaComponent,
+    UploadButtonComponent,
+    UploadVersionButtonComponent,
+    FileUploadingListRowComponent,
+    FileUploadingListComponent,
+    FileUploadingDialogComponent
+] as const;
+
+/** @deprecated use `...CONTENT_UPLOAD_DIRECTIVES` instead or import standalone components directly */
 @NgModule({
-    imports: [CoreModule, CommonModule, MaterialModule, A11yModule, FileUploadErrorPipe, FileSizePipe],
-    declarations: [
-        FileDraggableDirective,
-        UploadDragAreaComponent,
-        UploadButtonComponent,
-        UploadVersionButtonComponent,
-        FileUploadingDialogComponent,
-        FileUploadingListComponent,
-        FileUploadingListRowComponent,
-        ToggleIconDirective
-    ],
-    exports: [
-        FileDraggableDirective,
-        UploadDragAreaComponent,
-        UploadButtonComponent,
-        UploadVersionButtonComponent,
-        FileUploadingDialogComponent,
-        FileUploadingListComponent,
-        FileUploadingListRowComponent,
-        FileUploadErrorPipe,
-        ToggleIconDirective
-    ]
+    imports: [...CONTENT_UPLOAD_DIRECTIVES],
+    exports: [...CONTENT_UPLOAD_DIRECTIVES]
 })
 export class UploadModule {}
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<any>,
         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-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 @@
 <div class="adf-version-comparison-content">
     <div class="adf-version-current">
-        <p>{{'ADF_VERSION_COMPARISON.CURRENT_VERSION'|translate }}</p>
+        <p>{{'ADF_VERSION_COMPARISON.CURRENT_VERSION' | translate }}</p>
         <img [attr.aria-label]="'ADF_VERSION_COMPARISON.ACCESSIBILITY.ICON_TEXT' | translate:
         { type: (node.content.mimeType | fileType | uppercase) | translate  }"
              [attr.alt]="'ADF_VERSION_COMPARISON.ACCESSIBILITY.ICON_TEXT' | translate:
@@ -10,7 +10,7 @@
     </div>
     <span class="material-icons adf-version-arrow-icon">keyboard_arrow_right</span>
     <div class="adf-version-new">
-        <p>{{'ADF_VERSION_COMPARISON.NEW_VERSION'|translate }}</p>
+        <p>{{'ADF_VERSION_COMPARISON.NEW_VERSION' | translate }}</p>
         <img [attr.aria-label]="'ADF_VERSION_COMPARISON.ACCESSIBILITY.ICON_TEXT' | translate:
         { type: (newFileVersion.type | fileType | uppercase) | translate  }"
              [attr.alt]="'ADF_VERSION_COMPARISON.ACCESSIBILITY.ICON_TEXT' | translate:
diff --git a/lib/content-services/src/lib/version-manager/version-comparison.component.ts b/lib/content-services/src/lib/version-manager/version-comparison.component.ts
index a2b9f53e24..059474ec37 100644
--- a/lib/content-services/src/lib/version-manager/version-comparison.component.ts
+++ b/lib/content-services/src/lib/version-manager/version-comparison.component.ts
@@ -17,16 +17,19 @@
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { Node } from '@alfresco/js-api';
-import { ThumbnailService } from '@alfresco/adf-core';
+import { FileTypePipe, ThumbnailService } from '@alfresco/adf-core';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     selector: 'adf-version-comparison',
+    standalone: true,
+    imports: [CommonModule, TranslateModule, FileTypePipe],
     templateUrl: './version-comparison.component.html',
     styleUrls: ['./version-comparison.component.scss'],
     encapsulation: ViewEncapsulation.None
 })
 export class VersionComparisonComponent {
-
     /** Target node. */
     @Input()
     node: Node;
@@ -35,7 +38,5 @@ export class VersionComparisonComponent {
     @Input()
     newFileVersion: File;
 
-    constructor(public thumbnailService: ThumbnailService) {
-    }
-
+    constructor(public thumbnailService: ThumbnailService) {}
 }
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 5e46f99dac..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
@@ -24,7 +24,15 @@ import { ContentService } from '../common';
 import { InfiniteScrollDatasource } from '../infinite-scroll-datasource';
 import { from, Observable, Subject } from 'rxjs';
 import { map, take, takeUntil } from 'rxjs/operators';
-import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
+import { CdkFixedSizeVirtualScroll, CdkVirtualForOf, CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
+import { CommonModule } from '@angular/common';
+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 { TranslateModule } from '@ngx-translate/core';
+import { MatButtonModule } from '@angular/material/button';
+import { VersionCompatibilityDirective } from '../version-compatibility';
 
 export class VersionListDataSource extends InfiniteScrollDatasource<VersionEntry> {
     constructor(private versionsApi: VersionsApi, private node: Node) {
@@ -41,6 +49,20 @@ export class VersionListDataSource extends InfiniteScrollDatasource<VersionEntry
 
 @Component({
     selector: 'adf-version-list',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatProgressBarModule,
+        MatListModule,
+        CdkVirtualScrollViewport,
+        CdkFixedSizeVirtualScroll,
+        CdkVirtualForOf,
+        MatIconModule,
+        MatMenuModule,
+        TranslateModule,
+        MatButtonModule,
+        VersionCompatibilityDirective
+    ],
     templateUrl: './version-list.component.html',
     styleUrls: ['./version-list.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/version-manager/version-manager.component.html b/lib/content-services/src/lib/version-manager/version-manager.component.html
index e29ac2cd42..82c7bb84cc 100644
--- a/lib/content-services/src/lib/version-manager/version-manager.component.html
+++ b/lib/content-services/src/lib/version-manager/version-manager.component.html
@@ -1,7 +1,5 @@
 <div class="adf-new-version-container">
-
     <adf-version-comparison *ngIf="showVersionComparison" [node]="node" [newFileVersion]="newFileVersion"></adf-version-comparison>
-
     <div class="adf-new-version-uploader-container" id="adf-new-version-uploader-container" [@uploadToggle]="uploadState">
         <table class="adf-version-upload" *ngIf="uploadState !== 'close' && !versionList.isLoading">
             <tr>
@@ -19,20 +17,16 @@
             </tr>
         </table>
     </div>
-
     <div class="adf-version-list-container">
         <div class="adf-version-list-table">
             <div>
                 <button mat-raised-button
                         id="adf-show-version-upload-button"
                         (click)="toggleNewVersion()" color="primary"
-                        *ngIf="uploadState ==='close'">{{
-                    'ADF_VERSION_LIST.ACTIONS.UPLOAD.ADD'|
-                    translate }}
+                        *ngIf="uploadState ==='close'">{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.ADD' | translate }}
                 </button>
             </div>
             <div>
-
                 <adf-version-list
                     #versionList
                     [node]="node"
diff --git a/lib/content-services/src/lib/version-manager/version-manager.component.ts b/lib/content-services/src/lib/version-manager/version-manager.component.ts
index 5ce1635895..986fee08af 100644
--- a/lib/content-services/src/lib/version-manager/version-manager.component.ts
+++ b/lib/content-services/src/lib/version-manager/version-manager.component.ts
@@ -22,29 +22,29 @@ import { trigger, state, style, animate, transition } from '@angular/animations'
 import { ContentService } from '../common/services/content.service';
 import { NodesApiService } from '../common/services/nodes-api.service';
 import { FileUploadErrorEvent } from '../common/events/file.event';
+import { CommonModule } from '@angular/common';
+import { VersionComparisonComponent } from './version-comparison.component';
+import { VersionUploadComponent } from './version-upload.component';
+import { MatButtonModule } from '@angular/material/button';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     selector: 'adf-version-manager',
+    standalone: true,
+    imports: [CommonModule, VersionComparisonComponent, VersionUploadComponent, MatButtonModule, TranslateModule, VersionListComponent],
     templateUrl: './version-manager.component.html',
     styleUrls: ['./version-manager.component.scss'],
     animations: [
         trigger('uploadToggle', [
-            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)')
-            ])
+            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 @@
         </mat-radio-button>
     </mat-radio-group>
     <mat-form-field class="adf-new-version-max-width" subscriptSizing="dynamic">
-                    <mat-label>{{'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate}}</mat-label>
-                    <textarea matInput [(ngModel)]="comment" class="adf-new-version-text-area" id="adf-new-version-text-area"
-                              (change)="onCommentChange()"></textarea>
+        <mat-label>{{'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate}}</mat-label>
+        <textarea matInput
+                  [(ngModel)]="comment"
+                  class="adf-new-version-text-area" id="adf-new-version-text-area"
+                  (change)="onCommentChange()"></textarea>
     </mat-form-field>
-
 </div>
 <div class="adf-version-upload-buttons">
     <adf-upload-version-button *ngIf="showUploadButton"
diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.ts b/lib/content-services/src/lib/version-manager/version-upload.component.ts
index f85269ee13..718e08c08f 100644
--- a/lib/content-services/src/lib/version-manager/version-upload.component.ts
+++ b/lib/content-services/src/lib/version-manager/version-upload.component.ts
@@ -22,16 +22,34 @@ import { takeUntil } from 'rxjs/operators';
 import { ContentService } from '../common/services/content.service';
 import { UploadService } from '../common/services/upload.service';
 import { FileUploadErrorEvent, FileUploadEvent } from '../common/events/file.event';
+import { CommonModule } from '@angular/common';
+import { MatRadioModule } from '@angular/material/radio';
+import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatButtonModule } from '@angular/material/button';
+import { UploadVersionButtonComponent } from '../upload';
 
 @Component({
     selector: 'adf-version-upload',
+    standalone: true,
+    imports: [
+        CommonModule,
+        MatRadioModule,
+        FormsModule,
+        TranslateModule,
+        MatFormFieldModule,
+        MatInputModule,
+        MatButtonModule,
+        UploadVersionButtonComponent
+    ],
     templateUrl: './version-upload.component.html',
     styleUrls: ['./version-upload.component.scss'],
     encapsulation: ViewEncapsulation.None,
     host: { class: 'adf-version-upload' }
 })
 export class VersionUploadComponent implements OnInit, OnDestroy {
-
     semanticVersion: string = 'minor';
     comment: string;
     uploadVersion: boolean = false;
@@ -89,16 +107,13 @@ export class VersionUploadComponent implements OnInit, OnDestroy {
     @Output()
     uploadStarted = new EventEmitter<FileUploadEvent>();
 
-    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 +158,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) {