From b6df0c9a5cdfbacf0a72636844bc926fac6fc371 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 26 Aug 2024 14:08:22 +0200
Subject: [PATCH] 117544: port to 8.0 standard after merge

---
 .../bulk-access/bulk-access.component.ts      |   2 +
 .../epeople-registry.component.spec.ts        |   2 +-
 .../eperson-form/eperson-form.component.html  |   2 +-
 .../eperson-form.component.spec.ts            |   4 +-
 .../eperson-form/eperson-form.component.ts    |   2 +
 .../members-list/members-list.component.html  |   6 +-
 .../members-list/members-list.component.ts    |   2 +
 .../groups-registry.component.spec.ts         |   4 +-
 .../groups-registry.component.ts              |   2 +
 .../filtered-items.component.html             |   8 +-
 .../filtered-items.component.ts               |   2 +
 .../delete-collection-page.component.ts       |   2 +
 .../collection-source-controls.component.html |  12 +-
 ...llection-source-controls.component.spec.ts |   2 +-
 .../collection-source-controls.component.ts   |   2 +
 .../collection-source.component.html          |   8 +-
 .../collection-source.component.ts            |   2 +
 .../delete-community-page.component.html      |   4 +-
 .../delete-community-page.component.ts        |   2 +
 .../dso-edit-metadata-value.component.html    |  12 +-
 .../dso-edit-metadata-value.component.spec.ts |   7 +-
 .../dso-edit-metadata-value.component.ts      |   3 +-
 .../dso-edit-metadata.component.html          |  14 +-
 .../dso-edit-metadata.component.spec.ts       |   4 +-
 .../dso-edit-metadata.component.ts            |   3 +-
 .../forgot-password-form.component.ts         |   2 +
 .../end-user-agreement.component.spec.ts      |   2 +-
 .../end-user-agreement.component.ts           |   3 +-
 .../feedback-form.component.html              |   2 +-
 .../feedback-form.component.spec.ts           |   2 +-
 .../feedback-form/feedback-form.component.ts  |   3 +-
 ...bitstream-request-a-copy-page.component.ts |   2 +
 .../item-bitstreams.component.html            |   8 +-
 .../item-bitstreams.component.ts              |   2 +
 .../item-edit-bitstream.component.html        |   4 +-
 .../item-edit-bitstream.component.ts          |   2 +
 .../item-delete/item-delete.component.html    |   6 +-
 .../item-delete/item-delete.component.ts      |   2 +
 .../item-move/item-move.component.ts          |   2 +
 .../item-operation.component.spec.ts          |   2 +-
 .../item-operation.component.ts               |   2 +
 .../edit-relationship-list.component.html     |   2 +-
 .../edit-relationship-list.component.ts       |   2 +
 .../edit-relationship.component.ts            |   2 +
 .../item-relationships.component.html         |   4 +-
 .../item-relationships.component.ts           |   2 +
 .../media-viewer-video.component.ts           |   2 +
 .../orcid-auth/orcid-auth.component.html      |   2 +-
 .../orcid-auth/orcid-auth.component.ts        |   2 +
 ...ersions-row-element-version.component.html |   4 +-
 ...-versions-row-element-version.component.ts |   2 +
 .../versions/item-versions.component.html     |   2 +-
 .../versions/item-versions.component.spec.ts  |   2 +-
 .../versions/item-versions.component.ts       |   3 +-
 ...space-new-external-dropdown.component.html |   4 +-
 ...-dspace-new-external-dropdown.component.ts |   2 +
 ...ace-new-submission-dropdown.component.html |   4 +-
 ...space-new-submission-dropdown.component.ts |   2 +
 .../quality-assurance-events.component.html   |  16 +--
 .../quality-assurance-events.component.ts     |   3 +-
 .../project-entry-import-modal.component.html |   6 +-
 .../project-entry-import-modal.component.ts   |   3 +-
 .../suggestion-actions.component.html         |   2 +-
 .../suggestion-actions.component.ts           |   2 +
 .../overview/process-overview.component.ts    |   3 +-
 .../profile-claim-item-modal.component.ts     |   2 +
 .../profile-page-researcher-form.component.ts |   2 +
 .../register-email-form.component.html        |   4 +-
 .../register-email-form.component.ts          |   3 +-
 .../create-profile.component.ts               |   2 +
 .../email-request-copy.component.html         |   2 +-
 .../email-request-copy.component.ts           |   3 +-
 .../access-control-array-form.component.html  |  10 +-
 .../access-control-array-form.component.ts    |   3 +-
 ...cess-control-form-container.component.html |  16 +--
 ...access-control-form-container.component.ts |   3 +-
 src/app/shared/disabled-directive.spec.ts     | 124 ++++++++++--------
 src/app/shared/disabled-directive.ts          |  30 +++--
 .../shared/ds-select/ds-select.component.ts   |   4 +-
 ...dit-menu-expandable-section.component.html |   2 +-
 ...-edit-menu-expandable-section.component.ts |   3 +-
 .../dso-edit-menu-section.component.html      |   4 +-
 .../dso-edit-menu-section.component.ts        |   3 +-
 ...ynamic-form-control-container.component.ts |   2 +
 .../dynamic-date-picker-inline.component.ts   |   3 +
 .../date-picker/date-picker.component.ts      |   2 +
 .../disabled/dynamic-disabled.component.ts    |   2 +
 .../lookup/dynamic-lookup.component.spec.ts   |   2 +-
 .../models/lookup/dynamic-lookup.component.ts |   2 +
 .../models/onebox/dynamic-onebox.component.ts |   2 +
 .../dynamic-relation-group.components.ts      |   2 +
 .../dynamic-scrollable-dropdown.component.ts  |   2 +
 ...namic-lookup-relation-modal.component.html |   8 +-
 ...ic-lookup-relation-modal.component.spec.ts |   2 +-
 ...dynamic-lookup-relation-modal.component.ts |   2 +
 ...nal-source-entry-import-modal.component.ts |   2 +
 src/app/shared/form/form.component.html       |   4 +-
 src/app/shared/form/form.component.ts         |   2 +
 .../number-picker/number-picker.component.ts  |   2 +
 .../vocabulary-treeview.component.html        |   2 +-
 .../vocabulary-treeview.component.ts          |   2 +
 .../password/log-in-password.component.ts     |   3 +-
 .../claimed-task-actions-approve.component.ts |   3 +-
 ...med-task-actions-decline-task.component.ts |   3 +-
 .../claimed-task-actions-reject.component.ts  |   3 +-
 ...d-task-actions-return-to-pool.component.ts |   3 +-
 .../pool-task/pool-task-actions.component.ts  |   3 +-
 .../collection-select.component.html          |   2 +-
 .../collection-select.component.ts            |   3 +-
 .../item-select/item-select.component.html    |   4 +-
 .../item-select/item-select.component.spec.ts |   7 +-
 .../item-select/item-select.component.ts      |   3 +-
 .../shared/pagination/pagination.component.ts |   3 +-
 .../form/resource-policy-form.component.html  |   4 +-
 .../resource-policy-form.component.spec.ts    |   4 +-
 .../form/resource-policy-form.component.ts    |   2 +
 .../resource-policies.component.html          |   4 +-
 .../resource-policies.component.ts            |   2 +
 .../advanced-search.component.html            |   2 +-
 .../advanced-search.component.ts              |   2 +
 .../subscription-modal.component.ts           |   3 +-
 .../subscription-view.component.ts            |   3 +-
 .../upload/uploader/uploader.component.ts     |   3 +-
 .../submission-form-collection.component.html |   2 +-
 ...bmission-form-collection.component.spec.ts |   4 +-
 .../submission-form-collection.component.ts   |   2 +
 .../submission-form-footer.component.html     |   8 +-
 .../submission-form-footer.component.spec.ts  |   4 +-
 .../submission-form-footer.component.ts       |   3 +-
 ...submission-form-section-add.component.html |   2 +-
 .../submission-form-section-add.component.ts  |   3 +-
 ...n-import-external-searchbar.component.html |   2 +-
 ...ion-import-external-searchbar.component.ts |   2 +
 ...ubmission-section-cc-licenses.component.ts |   2 +
 .../section-upload-file-edit.component.ts     |   2 +
 .../file/section-upload-file.component.html   |   2 +-
 .../file/section-upload-file.component.ts     |   2 +
 .../system-wide-alert-form.component.html     |   4 +-
 .../system-wide-alert-form.component.ts       |   3 +-
 .../reviewers-list.component.ts               |   2 +
 .../dso-edit-metadata.component.ts            |   3 +-
 .../forgot-password-form.component.ts         |   2 +
 .../end-user-agreement.component.ts           |   3 +-
 .../feedback-form/feedback-form.component.ts  |   3 +-
 .../media-viewer-video.component.ts           |   2 +
 .../register-email-form.component.ts          |   3 +-
 .../create-profile.component.ts               |   2 +
 .../email-request-copy.component.ts           |   4 +-
 ...nal-source-entry-import-modal.component.ts |   2 +
 .../file/section-upload-file.component.ts     |   2 +
 150 files changed, 404 insertions(+), 242 deletions(-)

diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
index bd8e893b59..10be65f24a 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -14,6 +14,7 @@ import {
 } from 'rxjs/operators';
 
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
 import { BulkAccessBrowseComponent } from './browse/bulk-access-browse.component';
@@ -27,6 +28,7 @@ import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.com
     TranslateModule,
     BulkAccessSettingsComponent,
     BulkAccessBrowseComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index 933224a6e9..9ce1674e23 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -42,6 +42,7 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
@@ -57,7 +58,6 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { EPeopleRegistryComponent } from './epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form/eperson-form.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index b4c0781ac7..694fe9d7c5 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -25,7 +25,7 @@
           </button>
         </div>
         <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [disabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
+          <button class="btn btn-primary" [dsDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
             <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
           </button>
         </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index 415ab4955c..0b5a6ec752 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -45,6 +45,7 @@ import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -68,7 +69,6 @@ import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { EPeopleRegistryComponent } from '../epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form.component';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -547,7 +547,7 @@ describe('EPersonFormComponent', () => {
       // ePersonDataServiceStub.activeEPerson = eperson;
       spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBeNull();
       expect(deleteButton.nativeElement.classList.contains('disabled')).toBeFalse();
       deleteButton.triggerEventHandler('click', null);
       fixture.detectChanges();
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 05efde7cf7..40f920f8d8 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -66,6 +66,7 @@ import { PageInfo } from '../../../core/shared/page-info.model';
 import { Registration } from '../../../core/shared/registration.model';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
@@ -92,6 +93,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     PaginationComponent,
     RouterLink,
     HasNoValuePipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index 591d80bdd5..e531b35f9e 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -35,14 +35,14 @@
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
                       *ngIf="epersonDTO.ableToDelete"
-                      [disabled]="actionConfig.remove.disabled"
+                      [dsDisabled]="actionConfig.remove.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
               <button *ngIf="!epersonDTO.ableToDelete"
                       (click)="addMemberToGroup(epersonDTO.eperson)"
-                      [disabled]="actionConfig.add.disabled"
+                      [dsDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
@@ -122,7 +122,7 @@
           <td class="align-middle">
             <div class="btn-group edit-field">
               <button (click)="addMemberToGroup(eperson)"
-                      [disabled]="actionConfig.add.disabled"
+                      [dsDisabled]="actionConfig.add.disabled"
                       [ngClass]="['btn btn-sm', actionConfig.add.css]"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
                 <i [ngClass]="actionConfig.add.icon"></i>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 9b123ae447..9e6087be35 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -55,6 +55,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
@@ -113,6 +114,7 @@ export interface EPersonListActionConfig {
     RouterLink,
     NgClass,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 4dd380b62b..22bf2c35db 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -50,6 +50,7 @@ import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   DSONameServiceMock,
   UNDEFINED_NAME,
@@ -71,7 +72,6 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
 import { GroupsRegistryComponent } from './groups-registry.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('GroupsRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -209,7 +209,7 @@ describe('GroupsRegistryComponent', () => {
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot(),
         GroupsRegistryComponent,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index dec3dc955d..73cfea2718 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -62,6 +62,7 @@ import {
   getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { hasValue } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -84,6 +85,7 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     NgSwitchCase,
     NgbTooltipModule,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index 4b6679bdbc..38591b0fcd 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -12,7 +12,7 @@
                         </ng-template>
                         <ng-template ngbPanelContent>
                             <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
-                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
+                                <option *ngFor="let item of collections" [value]="item.id" [dsDisabled]="item.disabled">{{item.name$ | async}}</option>
                             </select>
                             <div class="row">
                                 <span class="col-3"></span>
@@ -54,7 +54,7 @@
                                             <div class="col-auto">
                                                 <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
                                                 &nbsp;
-                                                <button class="btn btn-light" [disabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                                                <button class="btn btn-light" [dsDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
                                             </div>
                                         </div>
                                     </div>
@@ -158,8 +158,8 @@
                                 {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
                             </div>
                             <div>
-                                <button id="prev" class="btn btn-light" (click)="prevPage()" [disabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
-                                <button id="next" class="btn btn-light" (click)="nextPage()" [disabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+                                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                                <button id="next" class="btn btn-light" (click)="nextPage()" [dsDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
 <!--
                                 <button id="export">{{'admin.reports.commons.export' | translate}}</button>
 -->
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 9fd4643573..52454f2e8e 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -42,6 +42,7 @@ import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operator
 import { isEmpty } from 'src/app/shared/empty.util';
 import { environment } from 'src/environments/environment';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
 import { FilteredItems } from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
@@ -63,6 +64,7 @@ import { QueryPredicate } from './query-predicate.model';
     NgIf,
     NgForOf,
     FiltersComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index dbb5f8846f..1fab715aa4 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -16,6 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -31,6 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 7edaadb0a1..cc01848290 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -19,32 +19,32 @@
         </div>
 
         <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
         <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
         <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
+                [dsDisabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
         <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
+                [dsDisabled]="true">
             <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 83683382b9..22012263e0 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,12 +22,12 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
 import { Process } from '../../../../process-page/processes/process.model';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { VarDirective } from '../../../../shared/utils/var.directive';
 import { CollectionSourceControlsComponent } from './collection-source-controls.component';
-import {DisabledDirective} from '../../../../shared/disabled-directive';
 
 describe('CollectionSourceControlsComponent', () => {
   let comp: CollectionSourceControlsComponent;
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 3b51a8e9d9..fef7868561 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -40,6 +40,7 @@ import {
 } from '../../../../core/shared/operators';
 import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { VarDirective } from '../../../../shared/utils/var.directive';
@@ -56,6 +57,7 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     AsyncPipe,
     NgIf,
     VarDirective,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 8f807c1aee..5b13401d22 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
     <div class="d-inline-block float-right space-children-mr">
         <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [disabled]="(hasChanges$ | async) !== true"
+                [dsDisabled]="(hasChanges$ | async) !== true"
                 (click)="discard()"><i
                 class="fas fa-times"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -12,7 +12,7 @@
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
         <button class="btn btn-primary"
-                [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                 (click)="onSubmit()"><i
                 class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -45,7 +45,7 @@
         <div class="col-12">
             <div class="d-inline-block float-right ml-1 space-children-mr">
                 <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [disabled]="(hasChanges$ | async) !== true"
+                        [dsDisabled]="(hasChanges$ | async) !== true"
                         (click)="discard()"><i
                         class="fas fa-times"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
@@ -56,7 +56,7 @@
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
                 </button>
                 <button class="btn btn-primary"
-                        [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+                        [dsDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
                         (click)="onSubmit()"><i
                         class="fas fa-save"></i>
                     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 43614e43a6..96861c47a5 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -56,6 +56,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
 } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -81,6 +82,7 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index b241a7027c..49058b0ebd 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
                 <div class="form-group row">
                     <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsDisabled]="(processing$ | async)">
                             <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [dsDisabled]="(processing$ | async)">
                             <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
                             <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index f35e2d6bd2..59fb75fa97 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -16,6 +16,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { Community } from '../../core/shared/community.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
 
@@ -31,6 +32,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     AsyncPipe,
     VarDirective,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 25b82b9b43..450dfae98c 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -36,7 +36,7 @@
           [authorityValue]="mdValue.newValue.confidence"
           [iconMode]="true"
       ></i>
-        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
+        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [dsDisabled]="!editingAuthority"
               [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
               (change)="onChangeAuthorityKey()" />
         <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
@@ -71,29 +71,29 @@
           <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
-                  [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+                  [dsDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
             <i class="fas fa-edit fa-fw"></i>
           </button>
           <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
                   [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                  [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+                  [dsDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
             <i class="fas fa-check fa-fw"></i>
           </button>
           <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                  [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+                  [dsDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
             <i class="fas fa-trash-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-warning btn-sm" data-test="metadata-undo-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                  [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+                  [dsDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
+                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsDisabled]="disabled"
                   [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
             <i class="fas fa-grip-vertical fa-fw"></i>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
index 50834126ff..dee03772f8 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
@@ -34,6 +34,7 @@ import {
   VIRTUAL_METADATA_PREFIX,
 } from '../../../core/shared/metadata.models';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -44,7 +45,6 @@ import {
   DsoEditMetadataValue,
 } from '../dso-edit-metadata-form';
 import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 const EDIT_BTN = 'edit';
 const CONFIRM_BTN = 'confirm';
@@ -189,7 +189,7 @@ describe('DsoEditMetadataValueComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataValueComponent,
         VarDirective,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
@@ -462,7 +462,8 @@ describe('DsoEditMetadataValueComponent', () => {
         fixture.detectChanges();
         fixture.whenStable().then(() => {
           const inputElement = fixture.nativeElement.querySelector('input[data-test="authority-input"]');
-          expect(inputElement.disabled).toBeTruthy();
+          expect(inputElement.getAttribute('aria-disabled')).toBe('true');
+          expect(inputElement.classList.contains('disabled')).toBeTrue();
           done();
         });
       });
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index 11bbcfd9d5..1076be8431 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -67,6 +67,7 @@ import {
 import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model';
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import {
@@ -94,7 +95,7 @@ import {
   styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
   templateUrl: './dso-edit-metadata-value.component.html',
   standalone: true,
-  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective],
+  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, DisabledDirective],
 })
 /**
  * Component displaying a single editable row for a metadata value
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index d6c72abdb9..f288b39d6e 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,23 +1,23 @@
 <div class="item-metadata" *ngIf="form">
   <div class="button-row top d-flex my-2 space-children-mr ml-gap">
-    <button class="mr-auto btn btn-success" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
+    <button class="mr-auto btn btn-success" id="dso-add-btn" [dsDisabled]="form.newValue || (saving$ | async)"
             [title]="dsoType + '.edit.metadata.add-button' | translate"
             (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
     </button>
-    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [dsDisabled]="(saving$ | async)"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
             (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
     </button>
-    <button class="btn btn-primary ml-1" id="dso-save-btn" [disabled]="!hasChanges || (saving$ | async)"
+    <button class="btn btn-primary ml-1" id="dso-save-btn" [dsDisabled]="!hasChanges || (saving$ | async)"
             [title]="dsoType + '.edit.metadata.save-button' | translate"
             (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
     </button>
     <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
-            [disabled]="!hasChanges || (saving$ | async)"
+            [dsDisabled]="!hasChanges || (saving$ | async)"
             (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
     </button>
@@ -73,19 +73,19 @@
   </div>
   <div class="button-row bottom d-inline-block w-100">
     <div class="mt-2 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+      <button class="btn btn-warning" *ngIf="isReinstatable" [dsDisabled]="(saving$ | async)"
               [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
               (click)="reinstate()">
         <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
       </button>
-      <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
+      <button class="btn btn-primary" [dsDisabled]="!hasChanges || (saving$ | async)"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()">
         <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
       </button>
       <button class="btn btn-danger" *ngIf="!isReinstatable"
               [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [disabled]="!hasChanges || (saving$ | async)"
+              [dsDisabled]="!hasChanges || (saving$ | async)"
               (click)="discard()">
         <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
       </button>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
index 5009960fed..7f54c6eeeb 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
@@ -22,6 +22,7 @@ import { Item } from '../../core/shared/item.model';
 import { ITEM } from '../../core/shared/item.resource-type';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { AlertComponent } from '../../shared/alert/alert.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TestDataService } from '../../shared/testing/test-data-service.mock';
@@ -32,7 +33,6 @@ import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata-headers/dso
 import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value/dso-edit-metadata-value.component';
 import { DsoEditMetadataValueHeadersComponent } from './dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 const ADD_BTN = 'add';
 const REINSTATE_BTN = 'reinstate';
@@ -88,7 +88,6 @@ describe('DsoEditMetadataComponent', () => {
     ]);
 
     TestBed.configureTestingModule({
-      declarations: [DisabledDirective]
       imports: [
         CommonModule,
         BrowserModule,
@@ -96,6 +95,7 @@ describe('DsoEditMetadataComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataComponent,
         VarDirective,
+        DisabledDirective,
       ],
       providers: [
         { provide: APP_DATA_SERVICES_MAP, useValue: mockDataServiceMap },
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index 677a601b9d..12d77ab24f 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -47,6 +47,7 @@ import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -66,7 +67,7 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component showing a table of all metadata on a DSpaceObject and options to modify them
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 442e4bf9fa..ada7e66f9e 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -26,6 +26,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
@@ -39,6 +40,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index 725ff8322a..8195ce75eb 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -16,11 +16,11 @@ import { of as observableOf } from 'rxjs';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('EndUserAgreementComponent', () => {
   let component: EndUserAgreementComponent;
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
index 5c10c02432..7a02f10039 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -23,6 +23,7 @@ import { AppState } from '../../app.reducer';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
@@ -32,7 +33,7 @@ import { EndUserAgreementContentComponent } from './end-user-agreement-content/e
   templateUrl: './end-user-agreement.component.html',
   styleUrls: ['./end-user-agreement.component.scss'],
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
 })
 /**
  * Component displaying the End User Agreement and an option to accept it
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index a3437d1f0e..3fdc66820a 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -41,7 +41,7 @@
 
       <div class="row mt-3">
         <div class="control-group col-sm-12 text-right">
-          <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+          <button [dsDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index 61ef939c2d..0b1f3439f4 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,6 +18,7 @@ import { FeedbackDataService } from '../../../core/feedback/feedback-data.servic
 import { Feedback } from '../../../core/feedback/models/feedback.model';
 import { RouteService } from '../../../core/services/route.service';
 import { NativeWindowService } from '../../../core/services/window.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -26,7 +27,6 @@ import { EPersonMock } from '../../../shared/testing/eperson.mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { FeedbackFormComponent } from './feedback-form.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 
 describe('FeedbackFormComponent', () => {
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index 59be526f17..f33ef35352 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -30,6 +30,7 @@ import {
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ErrorComponent } from '../../../shared/error/error.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
@@ -38,7 +39,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
   templateUrl: './feedback-form.component.html',
   styleUrls: ['./feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
 })
 /**
  * Component displaying the contents of the Feedback Statement
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index e32239a577..35fd357da2 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -55,6 +55,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -71,6 +72,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     AsyncPipe,
     ReactiveFormsModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 88d984c19f..f068864b45 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -12,7 +12,7 @@
             class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
-    <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
+    <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
             [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
             (click)="submit()"><i
             class="fas fa-save"></i>
@@ -20,7 +20,7 @@
     </button>
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
             [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [disabled]="(hasChanges$ | async) !== true || submitting"
+            [dsDisabled]="(hasChanges$ | async) !== true || submitting"
             (click)="discard()"><i
             class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
@@ -58,7 +58,7 @@
         class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
+      <button class="btn btn-primary" [dsDisabled]="(hasChanges$ | async) !== true || submitting"
               [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
               (click)="submit()"><i
         class="fas fa-save"></i>
@@ -66,7 +66,7 @@
       </button>
       <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
               [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [disabled]="(hasChanges$ | async) !== true || submitting"
+              [dsDisabled]="(hasChanges$ | async) !== true || submitting"
               (click)="discard()"><i
         class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 685ad006e0..6c734ad7c0 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -50,6 +50,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -79,6 +80,7 @@ import { ItemEditBitstreamDragHandleComponent } from './item-edit-bitstream-drag
     ItemEditBitstreamDragHandleComponent,
     NgForOf,
     ThemedLoadingComponent,
+    DisabledDirective,
   ],
   providers: [ObjectValuesPipe],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index 7d52ab220f..d9a679a654 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -37,13 +37,13 @@
                 title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
           <i class="fas fa-edit fa-fw"></i>
         </button>
-        <button [disabled]="!canRemove()" (click)="remove()"
+        <button [dsDisabled]="!canRemove()" (click)="remove()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
                 class="btn btn-outline-danger btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [disabled]="!canUndo()" (click)="undo()"
+        <button [dsDisabled]="!canUndo()" (click)="undo()"
                 [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                 class="btn btn-outline-warning btn-sm"
                 title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
index 81950d3321..e0b819b873 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
@@ -29,6 +29,7 @@ import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
 
@@ -43,6 +44,7 @@ import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
     NgbTooltipModule,
     AsyncPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index ed6ba3eabc..eadec9babf 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -18,7 +18,7 @@
 
                             <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
                                 <label>
-                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
+                                    <input type="checkbox" [checked]="selected" [dsDisabled]="isDeleting$ | async">
                                 </label>
                             </div>
 
@@ -86,10 +86,10 @@
             </ng-container>
 
             <div class="space-children-mr">
-              <button [disabled]="isDeleting$ | async" (click)="performAction()"
+              <button [dsDisabled]="isDeleting$ | async" (click)="performAction()"
                       class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
               </button>
-              <button [disabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+              <button [dsDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
                       class="btn btn-outline-secondary cancel">
                 {{cancelMessage| translate}}
               </button>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index 1655856a3e..4e09a0b9ea 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -56,6 +56,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -109,6 +110,7 @@ class RelationshipDTO {
     VarDirective,
     NgForOf,
     RouterLink,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 1115260901..5e2d355bba 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -37,6 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -56,6 +57,7 @@ import {
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index 43287fa8d8..42765f4d74 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -6,9 +6,9 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ItemOperationComponent } from './item-operation.component';
 import { ItemOperation } from './itemOperation.model';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('ItemOperationComponent', () => {
   let itemOperation: ItemOperation;
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 9cf4b30e6c..b82fb154bf 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -7,6 +7,7 @@ import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ItemOperation } from './itemOperation.model';
 
 @Component({
@@ -17,6 +18,7 @@ import { ItemOperation } from './itemOperation.model';
     RouterLink,
     NgbTooltipModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index e32938590f..b0157cb989 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
     {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
+    <button class="ml-2 btn btn-success" [dsDisabled]="(hasChanges | async)" (click)="openLookup()">
         <i class="fas fa-plus"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
     </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 656d608935..1bc95291c7 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -65,6 +65,7 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -100,6 +101,7 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index f79d0ee0d1..95aa87a28b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -37,6 +37,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -54,6 +55,7 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
     NgIf,
     TranslateModule,
     VirtualMetadataComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 4c8ea49f99..cced89db93 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -35,7 +35,7 @@
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
     <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [disabled]="(hasChanges$ | async) !== true"
+            [dsDisabled]="(hasChanges$ | async) !== true"
             (click)="discard()">
       <i aria-hidden="true" class="fas fa-times"></i>
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
@@ -45,7 +45,7 @@
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
     </button>
     <button class="btn btn-primary"
-            [disabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+            [dsDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
             (click)="submit()">
       <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
       <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 7b0cc46647..359177c253 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -42,6 +42,7 @@ import {
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -67,6 +68,7 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     TranslateModule,
     VarDirective,
     EditRelationshipListWrapperComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 700431ff3f..bf1b58b467 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -12,6 +12,7 @@ import { Bitstream } from 'src/app/core/shared/bitstream.model';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { CaptionInfo } from './caption-info';
 import { languageHelper } from './language-helper';
 
@@ -27,6 +28,7 @@ import { languageHelper } from './language-helper';
     NgbDropdownModule,
     TranslateModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index b53c400385..d5aa0e2789 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -48,7 +48,7 @@
     <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [disabled]="(unlinkProcessing | async)">
+                [dsDisabled]="(unlinkProcessing | async)">
           <span *ngIf="(unlinkProcessing | async) !== true"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 5825ecc4e4..6870d7e63e 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -33,6 +33,7 @@ import {
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
@@ -45,6 +46,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
     NgIf,
     NgForOf,
     AlertComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index a664245668..845a785168 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -31,7 +31,7 @@
         <!--CREATE-->
         <ng-container *ngIf="canCreateVersion$ | async">
           <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                  [disabled]="isAnyBeingEdited() || hasDraftVersion"
+                  [dsDisabled]="isAnyBeingEdited() || hasDraftVersion"
                   (click)="createNewVersion(version)"
                   title="{{createVersionTitle | translate }}">
             <i class="fas fa-code-branch fa-fw"></i>
@@ -41,7 +41,7 @@
         <ng-container *ngIf="canDeleteVersion$ | async">
           <button class="btn btn-sm version-row-element-delete"
                   [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                  [disabled]="isAnyBeingEdited()"
+                  [dsDisabled]="isAnyBeingEdited()"
                   (click)="deleteVersion(version, version.id === itemVersion.id)"
                   title="{{'item.version.history.table.action.deleteVersion' | translate}}">
             <i class="fas fa-trash fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index 3d017c38a4..2e41819c22 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -49,6 +49,7 @@ import { VersionHistory } from '../../../core/shared/version-history.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   getItemEditVersionhistoryRoute,
@@ -67,6 +68,7 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     TranslateModule,
     NgClass,
     NgIf,
+    DisabledDirective,
   ],
   templateUrl: './item-versions-row-element-version.component.html',
   styleUrl: './item-versions-row-element-version.component.scss',
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index e9ea3bb0f9..d26b59bde3 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -63,7 +63,7 @@
                 <ng-container *ngIf="canEditVersion$(version) | async">
                   <button class="btn btn-outline-primary btn-sm version-row-element-edit"
                           *ngIf="!isThisBeingEdited(version)"
-                          [disabled]="isAnyBeingEdited()"
+                          [dsDisabled]="isAnyBeingEdited()"
                           (click)="enableVersionEditing(version)"
                           title="{{'item.version.history.table.action.editSummary' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index 836fffe7fd..030c5a898a 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -42,6 +42,7 @@ import { VersionHistory } from '../../core/shared/version-history.model';
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { AlertComponent } from '../../shared/alert/alert.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -51,7 +52,6 @@ import { PaginationServiceStub } from '../../shared/testing/pagination-service.s
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { ItemVersionsComponent } from './item-versions.component';
-import {DisabledDirective} from '../../shared/disabled-directive';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index a4f9d9328b..34598266a5 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -51,6 +51,7 @@ import { Version } from '../../core/shared/version.model';
 import { VersionHistory } from '../../core/shared/version-history.model';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   hasValue,
   hasValueOperator,
@@ -69,7 +70,7 @@ import { ItemVersionsRowElementVersionComponent } from './item-versions-row-elem
   templateUrl: './item-versions.component.html',
   styleUrls: ['./item-versions.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent],
+  imports: [VarDirective, NgIf, AlertComponent, PaginationComponent, NgFor, RouterLink, NgClass, FormsModule, AsyncPipe, DatePipe, TranslateModule, ItemVersionsRowElementVersionComponent, DisabledDirective],
 })
 
 /**
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 0157110035..7dbc440436 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [disabled]="(initialized$ | async) !== true"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsDisabled]="(initialized$ | async) !== true"
             (click)="openPage(singleEntity)" role="button"
             title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
@@ -10,7 +10,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [disabled]="(initialized$ | async) !== true"
+            type="button" [dsDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission-external' | translate"
             [attr.data-test]="'import-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 86960725a5..3af2f74bfe 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -27,6 +27,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
@@ -45,6 +46,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 730b1db1c7..f40041f8a6 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,6 +1,6 @@
   <div class="add" *ngIf="(moreThanOne$ | async) !== true">
     <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [disabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
+            [dsDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
@@ -8,7 +8,7 @@
        ngbDropdown
        *ngIf="(moreThanOne$ | async)">
     <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [disabled]="(initialized$ | async) !== true"
+            type="button"  [dsDisabled]="(initialized$ | async) !== true"
             [attr.aria-label]="'mydspace.new-submission' | translate"
             [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
             title="{{'mydspace.new-submission' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 8604c3322c..f893ac0525 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -28,6 +28,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
@@ -47,6 +48,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     TranslateModule,
     BrowserOnlyPipe,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index 4341764d1c..fa4fc5d3da 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -138,7 +138,7 @@
                       <div class="btn-group">
                         <button *ngIf="!eventElement.hasProject"
                                 class="btn btn-outline-primary btn-sm"
-                                [disabled]="eventElement.isRunning"
+                                [dsDisabled]="eventElement.isRunning"
                                 (click)="openModalLookup(eventElement); $event.stopPropagation();"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
                         >
@@ -146,7 +146,7 @@
                         </button>
                         <button *ngIf="eventElement.hasProject"
                                 class="btn btn-outline-danger btn-sm"
-                                [disabled]="eventElement.isRunning"
+                                [dsDisabled]="eventElement.isRunning"
                                 (click)="removeProject(eventElement)"
                                 [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
                         >
@@ -161,7 +161,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
                               [attr.aria-label]="'quality-assurance.event.action.import' | translate"
                       >
@@ -171,7 +171,7 @@
                               class="btn btn-outline-success btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="executeAction('ACCEPTED', eventElement)"
                               [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
                       >
@@ -180,7 +180,7 @@
                       <button class="btn btn-outline-dark btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="openModal('DISCARDED', eventElement, ignoreModal)"
                               [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
                       >
@@ -190,7 +190,7 @@
                               *ngIf="(isAdmin$ | async)"
                               ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               (click)="openModal('REJECTED', eventElement, rejectModal)"
                               [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
                       >
@@ -200,7 +200,7 @@
                               *ngIf="(isAdmin$ | async) === false"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
@@ -210,7 +210,7 @@
                       <button class="btn btn-outline-danger btn-sm button-width"
                               ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
                               container="body"
-                              [disabled]="eventElement.isRunning"
+                              [dsDisabled]="eventElement.isRunning"
                               [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
                               (click)="openModal('UNDO', eventElement, undoModal)">
                         <i class="fas fa-trash-alt"></i>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index 6276226c69..2c1e850ce4 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -65,6 +65,7 @@ import {
 } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -86,7 +87,7 @@ import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent],
+  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, DisabledDirective],
 })
 export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index 026f863412..f6375c2e02 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -32,8 +32,8 @@
     <div id="project-search" class="input-group mb-3">
       <input type="text" class="form-control" (keyup.enter)="search(projectTitle)" [(ngModel)]="projectTitle" placeholder="{{labelPrefix + label + '.placeholder' |translate}}" aria-label="" aria-describedby="">
       <div class="input-group-append">
-        <button type="button" class="btn btn-outline-secondary" [disabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
-        <button type="button" class="btn btn-primary" [disabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
+        <button type="button" class="btn btn-outline-secondary" [dsDisabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
+        <button type="button" class="btn btn-primary" [dsDisabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
       </div>
     </div>
 
@@ -66,6 +66,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + label + '.cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsDisabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 4b31e2316a..845a773769 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -29,6 +29,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -104,7 +105,7 @@ export interface QualityAssuranceEventData {
   styleUrls: ['./project-entry-import-modal.component.scss'],
   templateUrl: './project-entry-import-modal.component.html',
   standalone: true,
-  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component to display a modal window for linking a project to an Quality Assurance event
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index 2a46191dee..e83d0a4123 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -21,7 +21,7 @@
   </div>
   <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
     {{ ignoreSuggestionLabel() | translate}}</button>
-  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [disabled]="!hasEvidence" class="btn btn-info ml-2">
+  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [dsDisabled]="!hasEvidence" class="btn btn-info ml-2">
     <i class="fa fa-eye"></i>
     <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
     <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 36d58acbbf..1cb03bb8d2 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -15,6 +15,7 @@ import { take } from 'rxjs/operators';
 import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
 import { Collection } from '../../core/shared/collection.model';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { EntityDropdownComponent } from '../../shared/entity-dropdown/entity-dropdown.component';
 import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-approve-and-import';
@@ -31,6 +32,7 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
     TranslateModule,
     NgIf,
     NgbDropdownModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 1d10a87b64..09bc00d6f1 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -16,6 +16,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { hasValue } from '../../shared/empty.util';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -31,7 +32,7 @@ import { ProcessOverviewTableComponent } from './table/process-overview-table.co
   selector: 'ds-process-overview',
   templateUrl: './process-overview.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent],
+  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, DisabledDirective],
 })
 /**
  * Component displaying a list of all processes in a paginated table
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index 4ff9b637f6..53a013e7d3 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -25,6 +25,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
 import { ListableObjectComponentLoaderComponent } from '../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -42,6 +43,7 @@ import { ProfileClaimService } from '../profile-claim/profile-claim.service';
     AsyncPipe,
     TranslateModule,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index cfbbacac12..c31184e3d3 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -37,6 +37,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
@@ -53,6 +54,7 @@ import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/prof
     TranslateModule,
     UiSwitchModule,
     VarDirective,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index a38c4a81c0..18cd7b9de2 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -48,13 +48,13 @@
     </div>
 
     <ng-container *ngIf="(!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible')); else v2Invisible">
-      <button class="btn btn-primary" [disabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+      <button class="btn btn-primary" [dsDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-container>
 
     <ng-template #v2Invisible>
-      <button class="btn btn-primary" [disabled]="form.invalid" (click)="executeRecaptcha()">
+      <button class="btn btn-primary" [dsDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     </ng-template>
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index ac13abb865..302c6bc9c5 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -55,6 +55,7 @@ import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
 import { KlaroService } from '../shared/cookies/klaro.service';
+import { DisabledDirective } from '../shared/disabled-directive';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -66,7 +67,7 @@ export const TYPE_REQUEST_REGISTER = 'register';
   selector: 'ds-base-register-email-form',
   templateUrl: './register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component responsible to render an email registration form.
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 7e88c5a1c0..1ec95c8f52 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -43,6 +43,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { isEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 
@@ -60,6 +61,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 286e87554b..815a9a9691 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -13,7 +13,7 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!subject || subject.length === 0"
+            [dsDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index 66a9e0b17f..eb39ada853 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -12,6 +12,7 @@ import {
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../shared/disabled-directive';
 import { RequestCopyEmail } from './request-copy-email.model';
 
 
@@ -20,7 +21,7 @@ import { RequestCopyEmail } from './request-copy-email.model';
   styleUrls: ['./email-request-copy.component.scss'],
   templateUrl: './email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 2ec3b51219..630812c345 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -13,7 +13,7 @@
           </label>
           <select
             id="accesscontroloption-{{control.id}}"
-            [disabled]="ngForm.disabled"
+            [dsDisabled]="ngForm.disabled"
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
@@ -47,7 +47,7 @@
             <div class="input-group-append">
               <button
                 class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d.toggle()" type="button">
               </button>
             </div>
@@ -76,7 +76,7 @@
             <div class="input-group-append">
               <button
                 type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
+                [dsDisabled]="ngForm.disabled"
                 (click)="d1.toggle()">
               </button>
             </div>
@@ -93,7 +93,7 @@
 
           <button type="button" class="btn btn-outline-danger"
                   [attr.aria-label]="'access-control-remove' | translate"
-                  [disabled]="ngForm.disabled || form.accessControls.length === 1"
+                  [dsDisabled]="ngForm.disabled || form.accessControls.length === 1"
                   (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
@@ -103,7 +103,7 @@
   </ng-container>
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [disabled]="ngForm.disabled"
+          [dsDisabled]="ngForm.disabled"
           (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index dc6fe4d297..9c308ce1a2 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -17,6 +17,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
 import { dateToISOFormat } from '../../date.util';
+import { DisabledDirective } from '../../disabled-directive';
 import { ToDatePipe } from './to-date.pipe';
 
 @Component({
@@ -25,7 +26,7 @@ import { ToDatePipe } from './to-date.pipe';
   styleUrls: ['./access-control-array-form.component.scss'],
   exportAs: 'accessControlArrayForm',
   standalone: true,
-  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe],
+  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe, DisabledDirective],
 })
 export class AccessControlArrayFormComponent implements OnInit {
   @Input() dropdownOptions: AccessesConditionOption[] = [];
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index ce0f5845c6..b01c3a30a6 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -31,7 +31,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemReplace" value="replace"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
@@ -40,7 +40,7 @@
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
                          name="itemMode" id="itemAdd" value="add"
-                         [disabled]="!state.item.toggleStatus"
+                         [dsDisabled]="!state.item.toggleStatus"
                          [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
@@ -85,7 +85,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="changesLimit" id="processAll" value="all"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processAll">
                   {{'access-control-process-all-bitstreams' | translate}}
@@ -94,7 +94,7 @@
               <div class="form-check">
                 <input class="form-check-input mt-2" type="radio"
                        name="changesLimit" id="processSelected" value="selected"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.changesLimit">
                 <label class="form-check-label" for="processSelected">
                   {{ state.bitstream.selectedBitstreams.length }}
@@ -103,7 +103,7 @@
                   <button
                     *ngIf="itemRD"
                     [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                    [dsDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
                     (click)="openSelectBitstreamsModal(itemRD.payload)"
                     class="btn btn-outline-dark border-0" type="button">
                     <i class="fa fa-search"></i>
@@ -123,7 +123,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
@@ -132,7 +132,7 @@
               <div class="form-check">
                 <input class="form-check-input" type="radio"
                        name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [disabled]="!state.bitstream.toggleStatus"
+                       [dsDisabled]="!state.bitstream.toggleStatus"
                        [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
@@ -161,7 +161,7 @@
           {{ 'access-control-cancel' | translate }}
         </button>
         <button class="btn btn-primary"
-                [disabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                [dsDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
                 (click)="submit()" type="submit">
           {{ 'access-control-execute' | translate }}
         </button>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 56a6e92323..11313dfc99 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -31,6 +31,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { AlertComponent } from '../alert/alert.component';
 import { AlertType } from '../alert/alert-type';
+import { DisabledDirective } from '../disabled-directive';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
 import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
 import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
@@ -46,7 +47,7 @@ import {
   styleUrls: ['./access-control-form-container.component.scss'],
   exportAs: 'dsAccessControlForm',
   standalone: true,
-  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
 
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index c4ca4f0599..7099e62d52 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -1,89 +1,97 @@
-import { Component, DebugElement } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
 import { DisabledDirective } from './disabled-directive';
 
 @Component({
-    template: `
+  template: `
     <button [dsDisabled]="isDisabled">Test Button</button>
-  `
+  `,
 })
 class TestComponent {
-    isDisabled = false;
+  isDisabled = false;
 }
 
 describe('DisabledDirective', () => {
-    let component: TestComponent;
-    let fixture: ComponentFixture<TestComponent>;
-    let button: DebugElement;
+  let component: TestComponent;
+  let fixture: ComponentFixture<TestComponent>;
+  let button: DebugElement;
 
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            declarations: [TestComponent, DisabledDirective]
-        });
-        fixture = TestBed.createComponent(TestComponent);
-        component = fixture.componentInstance;
-        button = fixture.debugElement.query(By.css('button'));
-        fixture.detectChanges();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [DisabledDirective],
+      declarations: [TestComponent],
     });
+    fixture = TestBed.createComponent(TestComponent);
+    component = fixture.componentInstance;
+    button = fixture.debugElement.query(By.css('button'));
+    fixture.detectChanges();
+  });
 
-    it('should bind aria-disabled to false initially', () => {
-        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
-        expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
-    });
+  it('should bind aria-disabled to false initially', () => {
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
 
-    it('should bind aria-disabled to true and add disabled class when isDisabled is true', () => {
-        component.isDisabled = true;
-        fixture.detectChanges();
+  it('should bind aria-disabled to true and add disabled class when isDisabled is true', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
 
-        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
-        expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
-    });
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+    expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+  });
 
-    it('should prevent click events when disabled', () => {
-        component.isDisabled = true;
-        fixture.detectChanges();
+  it('should prevent click events when disabled', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
 
-        let clickHandled = false;
-        button.nativeElement.addEventListener('click', () => clickHandled = true);
+    let clickHandled = false;
+    button.nativeElement.addEventListener('click', () => clickHandled = true);
 
-        button.nativeElement.click();
+    button.nativeElement.click();
 
-        expect(clickHandled).toBeFalse();
-    });
+    expect(clickHandled).toBeFalse();
+  });
 
-    it('should prevent Enter or Space keydown events when disabled', () => {
-        component.isDisabled = true;
-        fixture.detectChanges();
+  it('should prevent Enter or Space keydown events when disabled', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
 
-        let keydownHandled = false;
-        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+    let keydownHandled = false;
+    button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
 
-        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
-        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+    const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
 
-        button.nativeElement.dispatchEvent(enterEvent);
-        button.nativeElement.dispatchEvent(spaceEvent);
+    button.nativeElement.dispatchEvent(enterEvent);
+    button.nativeElement.dispatchEvent(spaceEvent);
 
-        expect(keydownHandled).toBeFalse();
-    });
+    expect(keydownHandled).toBeFalse();
+  });
 
-    it('should allow click and keydown events when not disabled', () => {
-        let clickHandled = false;
-        let keydownHandled = false;
+  it('should allow click and keydown events when not disabled', () => {
+    let clickHandled = false;
+    let keydownHandled = false;
 
-        button.nativeElement.addEventListener('click', () => clickHandled = true);
-        button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+    button.nativeElement.addEventListener('click', () => clickHandled = true);
+    button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
 
-        button.nativeElement.click();
+    button.nativeElement.click();
 
-        const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
-        const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+    const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
 
-        button.nativeElement.dispatchEvent(enterEvent);
-        button.nativeElement.dispatchEvent(spaceEvent);
+    button.nativeElement.dispatchEvent(enterEvent);
+    button.nativeElement.dispatchEvent(spaceEvent);
 
-        expect(clickHandled).toBeTrue();
-        expect(keydownHandled).toBeTrue();
-    });
+    expect(clickHandled).toBeTrue();
+    expect(keydownHandled).toBeTrue();
+  });
 });
diff --git a/src/app/shared/disabled-directive.ts b/src/app/shared/disabled-directive.ts
index 38f92cd1d7..8939c744ad 100644
--- a/src/app/shared/disabled-directive.ts
+++ b/src/app/shared/disabled-directive.ts
@@ -1,31 +1,37 @@
-import { Directive, Input, HostBinding, HostListener } from '@angular/core';
+import {
+  Directive,
+  HostBinding,
+  HostListener,
+  Input,
+} from '@angular/core';
 
 @Directive({
-    selector: '[dsDisabled]'
+  selector: '[dsDisabled]',
+  standalone: true,
 })
 export class DisabledDirective {
 
     @Input() set dsDisabled(value: boolean) {
-        this.isDisabled = !!value;
-    }
+    this.isDisabled = !!value;
+  }
 
     @HostBinding('attr.aria-disabled') isDisabled = false;
     @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
 
     @HostListener('click', ['$event'])
     handleClick(event: Event) {
-        if (this.isDisabled) {
-            event.preventDefault();
-            event.stopImmediatePropagation();
-        }
+      if (this.isDisabled) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+      }
     }
 
     @HostListener('keydown', ['$event'])
     handleKeydown(event: KeyboardEvent) {
-        if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
-            event.preventDefault();
-            event.stopImmediatePropagation();
-        }
+      if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+      }
     }
 }
 
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index d82378d4e5..c7a8fafa72 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -8,6 +8,8 @@ import {
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../disabled-directive';
+
 /**
  * Component which represent a DSpace dropdown selector.
  */
@@ -16,7 +18,7 @@ import { TranslateModule } from '@ngx-translate/core';
   templateUrl: './ds-select.component.html',
   styleUrls: ['./ds-select.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgIf, TranslateModule],
+  imports: [NgbDropdownModule, NgIf, TranslateModule, DisabledDirective],
 })
 export class DsSelectComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 6e427400ee..747d14cac6 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,7 +1,7 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
          [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [disabled]="section.model?.disabled">
+        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsDisabled]="section.model?.disabled">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </button>
         <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 8f458d4e56..de4457935a 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -21,6 +21,7 @@ import { MenuID } from 'src/app/shared/menu/menu-id.model';
 import { MenuSection } from 'src/app/shared/menu/menu-section.model';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
+import { DisabledDirective } from '../../../disabled-directive';
 import { hasValue } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 
@@ -32,7 +33,7 @@ import { MenuService } from '../../../menu/menu.service';
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe],
+  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe, DisabledDirective],
 })
 export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index bbc388a601..9f796c35ce 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -5,7 +5,7 @@
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [disabled]="true">
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [dsDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
@@ -13,7 +13,7 @@
 
 <div *ngIf="canActivate" class="dso-button-menu mb-1"
      [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+    <button class="btn btn-dark btn-sm" [dsDisabled]="section.model.disabled"
             (click)="activate($event)">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index 2e2397f860..2f68c6a23e 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -10,6 +10,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
+import { DisabledDirective } from '../../../disabled-directive';
 import { isNotEmpty } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 import { MenuID } from '../../../menu/menu-id.model';
@@ -23,7 +24,7 @@ import { MenuSection } from '../../../menu/menu-section.model';
   templateUrl: './dso-edit-menu-section.component.html',
   styleUrls: ['./dso-edit-menu-section.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule],
+  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule, DisabledDirective],
 })
 export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 595a1304a0..0ea0910a66 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -99,6 +99,7 @@ import { SubmissionObject } from '../../../../core/submission/models/submission-
 import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
 import { SubmissionService } from '../../../../submission/submission.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -140,6 +141,7 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
     NgbTooltipModule,
     NgTemplateOutlet,
     ExistingRelationListElementComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index 62c86f1bad..7130bfaf1a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -26,6 +26,8 @@ import {
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 
+import { DisabledDirective } from '../../../../../disabled-directive';
+
 @Component({
   selector: 'ds-dynamic-date-picker-inline',
   templateUrl: './dynamic-date-picker-inline.component.html',
@@ -34,6 +36,7 @@ import {
     NgbDatepickerModule,
     ReactiveFormsModule,
     NgIf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 62a6b8044f..a43286dda8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -24,6 +24,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import isEqual from 'lodash/isEqual';
 
+import { DisabledDirective } from '../../../../../disabled-directive';
 import { hasValue } from '../../../../../empty.util';
 import { NumberPickerComponent } from '../../../../number-picker/number-picker.component';
 import { DynamicDsDatePickerModel } from './date-picker.model';
@@ -41,6 +42,7 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
     NgIf,
     NumberPickerComponent,
     FormsModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
index 1d8a152df5..6d4d39d67f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -12,6 +12,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../../../disabled-directive';
 import { DynamicDisabledModel } from './dynamic-disabled.model';
 
 /**
@@ -22,6 +23,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
   templateUrl: './dynamic-disabled.component.html',
   imports: [
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 2f4576b729..77de7953f1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -33,6 +33,7 @@ import { of as observableOf } from 'rxjs';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService,
@@ -48,7 +49,6 @@ import {
   DynamicLookupModelConfig,
 } from './dynamic-lookup.model';
 import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
-import {DisabledDirective} from '../../../../../disabled-directive';
 
 let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   vocabularyOptions: {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index 7e4bc3a002..b16ec0e537 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -46,6 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -76,6 +77,7 @@ import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
     NgForOf,
     NgTemplateOutlet,
     ObjNgFor,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 23cec6b502..4cd5d39ebd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -58,6 +58,7 @@ import { Vocabulary } from '../../../../../../core/submission/vocabularies/model
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -89,6 +90,7 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
     ObjNgFor,
     NgForOf,
     FormsModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index e6f5e41888..d9c5fbd9e1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -46,6 +46,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { shrinkInOut } from '../../../../../animations/shrink';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -81,6 +82,7 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
     ThemedLoadingComponent,
     ChipsComponent,
     forwardRef(() => FormComponent),
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 051bb3f225..1dfa624d61 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -43,6 +43,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { DisabledDirective } from '../../../../../disabled-directive';
 import { isEmpty } from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
@@ -62,6 +63,7 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo
     InfiniteScrollModule,
     NgForOf,
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index cef8516b84..cd5979f779 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [disabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
+    <button type="button" [dsDisabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
             (click)="close()">
         <span aria-hidden="true">&times;</span>
     </button>
@@ -73,18 +73,18 @@
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
   <div class="d-flex float-right space-children-mr">
     <div class="close-button">
-        <button type="button" [disabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+        <button type="button" [dsDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
             {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+              [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="discardEv()">
               <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+            [dsDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
                               aria-hidden="true"></span>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 7b0ec3ccfe..c1a795d5c3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -33,6 +33,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
+import { DisabledDirective } from '../../../../disabled-directive';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
@@ -44,7 +45,6 @@ import {
   AddRelationshipAction,
   RemoveRelationshipAction,
 } from './relationship.actions';
-import {DisabledDirective} from '../../../../disabled-directive';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 6033fa1b61..c81ea8eccd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -50,6 +50,7 @@ import {
 } from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
+import { DisabledDirective } from '../../../../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -91,6 +92,7 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
     AsyncPipe,
     NgForOf,
     DsDynamicLookupRelationSelectionTabComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index c2516ca9a8..89504ccdfc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -38,6 +38,7 @@ import {
 } from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
+import { DisabledDirective } from '../../../../../../disabled-directive';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
 import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
 import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
@@ -69,6 +70,7 @@ export enum ImportType {
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index ef75f34b9b..92b0e05552 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -41,7 +41,7 @@
                     title="{{'form.discard' | translate}}"
                     attr.aria-label="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    [dsDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
               <span>{{'form.discard' | translate}}</span>
             </button>
           </div>
@@ -62,7 +62,7 @@
             </button>
             <ng-content select="[between]"></ng-content>
             <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="(isValid() | async) !== true">
+                    [dsDisabled]="(isValid() | async) !== true">
               <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
             </button>
             <ng-content select="[after]"></ng-content>
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index e1d47da7bd..d96f16044a 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -39,6 +39,7 @@ import {
   map,
 } from 'rxjs/operators';
 
+import { DisabledDirective } from '../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -69,6 +70,7 @@ import { FormService } from './form.service';
     DynamicFormsCoreModule,
     NgIf,
     AsyncPipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index e268919101..773a1367f9 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -19,6 +19,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../disabled-directive';
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -32,6 +33,7 @@ import { isEmpty } from '../../empty.util';
     NgClass,
     FormsModule,
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index cb66544e04..d9f5738cc7 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -14,7 +14,7 @@
         <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsDisabled]="this.vocabularyOptions.closed">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
index cd836a4a47..9d2a8e12ab 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -30,6 +30,7 @@ import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/mod
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { AlertComponent } from '../../alert/alert.component';
 import { AlertType } from '../../alert/alert-type';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -65,6 +66,7 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
     AsyncPipe,
     ThemedLoadingComponent,
     AlertComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index bcc2048dee..84d618cb79 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -49,6 +49,7 @@ import { AuthorizationDataService } from '../../../../core/data/feature-authoriz
 import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 import { fadeOut } from '../../../animations/fade';
+import { DisabledDirective } from '../../../disabled-directive';
 import { isNotEmpty } from '../../../empty.util';
 import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
 
@@ -62,7 +63,7 @@ import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
   styleUrls: ['./log-in-password.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, DisabledDirective],
 })
 export class LogInPasswordComponent implements OnInit {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index 6de3df6e09..a03a1eb00c 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -22,6 +22,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -33,7 +34,7 @@ export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
   styleUrls: ['./claimed-task-actions-approve.component.scss'],
   templateUrl: './claimed-task-actions-approve.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the approve action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
index 74df54e9e0..5bc0ccb946 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -21,6 +21,7 @@ import { RemoteData } from 'src/app/core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -32,7 +33,7 @@ export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
   templateUrl: './claimed-task-actions-decline-task.component.html',
   styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the decline task action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 9a8c98c66e..433bfa8fc3 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -33,6 +33,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -44,7 +45,7 @@ export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
   styleUrls: ['./claimed-task-actions-reject.component.scss'],
   templateUrl: './claimed-task-actions-reject.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the reject action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index ea93769b9d..313a6efe6b 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -20,6 +20,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { DisabledDirective } from '../../../disabled-directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 
@@ -30,7 +31,7 @@ export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
   styleUrls: ['./claimed-task-actions-return-to-pool.component.scss'],
   templateUrl: './claimed-task-actions-return-to-pool.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule, DisabledDirective],
 })
 /**
  * Component for displaying and processing the return to pool action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 35b75b3aa1..2f1cb1b95e 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -34,6 +34,7 @@ import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { DisabledDirective } from '../../disabled-directive';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 
@@ -45,7 +46,7 @@ import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actio
   styleUrls: ['./pool-task-actions.component.scss'],
   templateUrl: './pool-task-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent<PoolTask, PoolTaskDataService> implements OnDestroy {
 
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 9bfe3e1156..bc07b6b049 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -16,7 +16,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [dsDisabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
             <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
           </tr>
         </tbody>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index 267d8a2a60..f11fc45c13 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -20,6 +20,7 @@ import { getCollectionPageRoute } from '../../../collection-page/collection-page
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -36,7 +37,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   templateUrl: './collection-select.component.html',
   styleUrls: ['./collection-select.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index e0e71fb939..9159b7e617 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -18,7 +18,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [dsDisabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
               <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
@@ -42,7 +42,7 @@
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
+            [dsDisabled]="selectedIds?.length === 0"
             (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 6bd27a4ece..259b134a99 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -18,6 +18,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { DisabledDirective } from '../../disabled-directive';
 import { HostWindowService } from '../../host-window.service';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
@@ -28,7 +29,6 @@ import { SearchConfigurationServiceStub } from '../../testing/search-configurati
 import { createPaginatedList } from '../../testing/utils.test';
 import { ObjectSelectService } from '../object-select.service';
 import { ItemSelectComponent } from './item-select.component';
-import {DisabledDirective} from '../../disabled-directive';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -197,9 +197,8 @@ describe('ItemSelectComponent', () => {
 
       const checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
       expect(authorizationDataService.isAuthorized).toHaveBeenCalled();
-        expect(checkbox.getAttribute('aria-disabled')).toBe('true');
-        expect(checkbox.classList.contains('disabled')).toBe(true);
-      });
+      expect(checkbox.getAttribute('aria-disabled')).toBe('true');
+      expect(checkbox.classList.contains('disabled')).toBe(true);
     }));
   });
 });
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index 973b4aff87..64d6a9b2ba 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -19,6 +19,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -34,7 +35,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   selector: 'ds-item-select',
   templateUrl: './item-select.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, DisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 40f51fe70b..93fe8036ec 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -40,6 +40,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface';
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { DisabledDirective } from '../disabled-directive';
 import { hasValue } from '../empty.util';
 import { HostWindowService } from '../host-window.service';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
@@ -58,7 +59,7 @@ import { PaginationComponentOptions } from './pagination-component-options.model
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe],
+  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, DisabledDirective],
 })
 export class PaginationComponent implements OnDestroy, OnInit {
   /**
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 3d5465f0e6..64f97696ed 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -31,11 +31,11 @@
         <div class="col text-right">
           <button type="reset"
                   class="btn btn-default"
-                  [disabled]="(isProcessing | async)"
+                  [dsDisabled]="(isProcessing | async)"
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [disabled]="(isFormValid() | async) !== true || (isProcessing | async)"
+                  [dsDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 3ae04a9e94..64836aeb8c 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -49,6 +49,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
+import { DisabledDirective } from '../../disabled-directive';
 import { isNotEmptyOperator } from '../../empty.util';
 import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
 import { dsDynamicFormControlMapFn } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
@@ -68,7 +69,6 @@ import {
   ResourcePolicyEvent,
   ResourcePolicyFormComponent,
 } from './resource-policy-form.component';
-import {DisabledDirective} from '../../disabled-directive';
 
 export const mockResourcePolicyFormData = {
   name: [
@@ -217,7 +217,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
         ResourcePolicyFormComponent,
         TestComponent,
         NgxMaskModule.forRoot(),
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index 534e88bcef..e61940dad4 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -51,6 +51,7 @@ import {
   dateToISOFormat,
   stringToNgbDateStruct,
 } from '../../date.util';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   hasValueOperator,
@@ -95,6 +96,7 @@ export interface ResourcePolicyEvent {
     AsyncPipe,
     NgIf,
     NgFor,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index bb6073df85..3de68cfa63 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -13,7 +13,7 @@
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [disabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
+                      [dsDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
                       [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
@@ -25,7 +25,7 @@
                 </span>
               </button>
               <button class="btn btn-success p-1"
-                      [disabled]="(isProcessingDelete() | async)"
+                      [dsDisabled]="(isProcessingDelete() | async)"
                       [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus' aria-hidden="true"></i>
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 1d098f554d..971f3a747b 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -41,6 +41,7 @@ import { GroupDataService } from '../../core/eperson/group-data.service';
 import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
+import { DisabledDirective } from '../disabled-directive';
 import {
   hasValue,
   isEmpty,
@@ -63,6 +64,7 @@ import {
     NgIf,
     AsyncPipe,
     NgForOf,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
index bd8ad0dfc9..1465d73645 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -30,7 +30,7 @@
                                (findSuggestions)="findSuggestions($event)"
                                ngDefaultControl>
   </ds-filter-input-suggestions>
-  <button (click)="applyFilter()" [disabled]="currentValue === ''" class="btn btn-primary mt-2">
+  <button (click)="applyFilter()" [dsDisabled]="currentValue === ''" class="btn btn-primary mt-2">
     {{ 'search.sidebar.advanced-search.add' | translate }}
   </button>
 </div>
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
index f8ebb51dad..dfc934ad9c 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.ts
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -31,6 +31,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { FilterConfig } from '../../../core/shared/search/search-filters/search-config.model';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -55,6 +56,7 @@ import { SearchFilterConfig } from '../models/search-filter-config.model';
     KeyValuePipe,
     NgForOf,
     TranslateModule,
+    DisabledDirective,
   ],
 })
 export class AdvancedSearchComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 452d890a55..23fba5f502 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -50,6 +50,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../alert/alert.component';
+import { DisabledDirective } from '../../disabled-directive';
 import { isNotEmpty } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -61,7 +62,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-modal.component.html',
   styleUrls: ['./subscription-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, DisabledDirective],
 })
 /**
  * Modal that allows to manage the subscriptions for the selected item
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 001a2ed687..15239fd506 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -20,6 +20,7 @@ import { getDSORoute } from 'src/app/app-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
+import { DisabledDirective } from '../../disabled-directive';
 import { hasValue } from '../../empty.util';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
 import { Subscription } from '../models/subscription.model';
@@ -32,7 +33,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-view.component.html',
   styleUrls: ['./subscription-view.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule],
+  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule, DisabledDirective],
 })
 /**
  * Table row representing a subscription that displays all information and action buttons to manage it
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index f4b2c35314..fe8fb6d038 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -25,6 +25,7 @@ import {
   XSRF_REQUEST_HEADER,
   XSRF_RESPONSE_HEADER,
 } from '../../../core/xsrf/xsrf.constants';
+import { DisabledDirective } from '../../disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -40,7 +41,7 @@ import { UploaderProperties } from './uploader-properties.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [TranslateModule, FileUploadModule, CommonModule],
+  imports: [TranslateModule, FileUploadModule, CommonModule, DisabledDirective],
 })
 export class UploaderComponent {
 
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 16370a5873..2af47497b2 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -25,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
+            [dsDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index a1ff8acce3..9ff048a626 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -31,6 +31,7 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso
 import { Collection } from '../../../core/shared/collection.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import {
   mockSubmissionId,
@@ -43,7 +44,6 @@ import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SectionsService } from '../../sections/sections.service';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormCollectionComponent } from './submission-form-collection.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -153,7 +153,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         TranslateModule.forRoot(),
         SubmissionFormCollectionComponent,
         TestComponent,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index dcbcfd9cb3..1749e9165a 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -35,6 +35,7 @@ import { SubmissionObject } from '../../../core/submission/models/submission-obj
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -56,6 +57,7 @@ import { SubmissionService } from '../../submission.service';
     TranslateModule,
     NgbDropdownModule,
     ThemedCollectionDropdownComponent,
+    DisabledDirective,
   ],
 })
 export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index f1162cea4d..4d3e76ff51 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -5,7 +5,7 @@
             id="discard"
             [attr.data-test]="'discard' | dsBrowserOnly"
             class="btn btn-danger"
-            [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
             (click)="$event.preventDefault();confirmDiscard(content)">
       <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
     </button>
@@ -28,7 +28,7 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
+              [dsDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
@@ -38,7 +38,7 @@
               class="btn"
               id="saveForLater"
               [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="saveLater($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
       </button>
@@ -47,7 +47,7 @@
               id="deposit"
               [attr.data-test]="'deposit' | dsBrowserOnly"
               class="btn btn-success"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+              [dsDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
               (click)="deposit($event)">
         <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
       </button>
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index a430ec81fa..3b36d56aca 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -25,13 +25,13 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormFooterComponent } from './submission-form-footer.component';
-import {DisabledDirective} from '../../../shared/disabled-directive';
 
 const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
 
@@ -52,7 +52,7 @@ describe('SubmissionFormFooterComponent', () => {
         TranslateModule.forRoot(),
         SubmissionFormFooterComponent,
         TestComponent,
-        DisabledDirective
+        DisabledDirective,
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index 712a944a84..adaf5c85ef 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -15,6 +15,7 @@ import { map } from 'rxjs/operators';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 import { SubmissionService } from '../../submission.service';
@@ -27,7 +28,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-footer.component.scss'],
   templateUrl: './submission-form-footer.component.html',
   standalone: true,
-  imports: [CommonModule, BrowserOnlyPipe, TranslateModule],
+  imports: [CommonModule, BrowserOnlyPipe, TranslateModule, DisabledDirective],
 })
 export class SubmissionFormFooterComponent implements OnChanges {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 0c7035c7f8..c5f8d25fc2 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -6,7 +6,7 @@
   <ng-container *ngIf="hasSections$ | async">
   <button class="btn btn-outline-primary dropdown-toggle"
           id="sectionControls"
-          [disabled]="(hasSections$ | async) !== true"
+          [dsDisabled]="(hasSections$ | async) !== true"
           [ngClass]="{'w-100': (windowService.isXs() | async)}"
           ngbDropdownToggle>
           {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.ts b/src/app/submission/form/section-add/submission-form-section-add.component.ts
index 4cf10e55d8..c97afc9d83 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.ts
@@ -9,6 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { SectionDataObject } from '../../sections/models/section-data.model';
 import { SectionsService } from '../../sections/sections.service';
@@ -22,7 +23,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-section-add.component.scss'],
   templateUrl: './submission-form-section-add.component.html',
   standalone: true,
-  imports: [CommonModule, TranslateModule, NgbDropdownModule],
+  imports: [CommonModule, TranslateModule, NgbDropdownModule, DisabledDirective],
 })
 export class SubmissionFormSectionAddComponent implements OnInit {
 
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 7b5a2004d7..96e7e2e172 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -23,6 +23,6 @@
         <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
       </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [dsDisabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index aace4de79a..7572d3ac8b 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -36,6 +36,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { hasValue } from '../../../shared/empty.util';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
@@ -70,6 +71,7 @@ export interface ExternalSourceData {
     InfiniteScrollModule,
     NgbDropdownModule,
     FormsModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index d286a830e2..62546e1835 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -40,6 +40,7 @@ import {
 import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
 import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
+import { DisabledDirective } from '../../../shared/disabled-directive';
 import { DsSelectComponent } from '../../../shared/ds-select/ds-select.component';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -64,6 +65,7 @@ import { SectionsType } from '../sections-type';
     VarDirective,
     NgForOf,
     DsSelectComponent,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 24488d1adb..c7ba64e4b9 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -39,6 +39,7 @@ import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/build
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
 import { dateToISOFormat } from '../../../../../shared/date.util';
+import { DisabledDirective } from '../../../../../shared/disabled-directive';
 import {
   hasNoValue,
   hasValue,
@@ -80,6 +81,7 @@ import {
     FormComponent,
     NgIf,
     TranslateModule,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index f8d6b9ca93..20e2e80a56 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -7,7 +7,7 @@
         type="checkbox"
         class="custom-control-input"
         id="primaryBitstream{{fileIndex}}"
-        [disabled]="processingSaveStatus$ | async"
+        [dsDisabled]="processingSaveStatus$ | async"
         [checked]="isPrimary"
         (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index a0519f6c85..9e9c15bb2f 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -28,6 +28,7 @@ import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import {
   hasValue,
   isNotUndefined,
@@ -54,6 +55,7 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
+    DisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 770f465a4b..0f20e0e927 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -87,8 +87,8 @@
         <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
         </button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid" (click)="save()">
+        <button class="btn btn-primary" [dsDisabled]="alertForm.invalid" (click)="save()">
             <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
         </button>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index b30e864fa1..b695bb47ed 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -43,6 +43,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { RequestService } from '../../core/data/request.service';
 import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { DisabledDirective } from '../../shared/disabled-directive';
 import {
   hasValue,
   isNotEmpty,
@@ -59,7 +60,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-form.component.scss'],
   templateUrl: './system-wide-alert-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class SystemWideAlertFormComponent implements OnInit {
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index 5ae3a13f31..e87a292c0c 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -45,6 +45,7 @@ import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
+import { DisabledDirective } from '../../../../shared/disabled-directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
@@ -76,6 +77,7 @@ enum SubKey {
     RouterLink,
     NgClass,
     NgForOf,
+    DisabledDirective,
   ],
 })
 export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy {
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index a7437c0408..40a6264e4e 100644
--- a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -13,6 +13,7 @@ import { DsoEditMetadataValueComponent } from '../../../../../app/dso-shared/dso
 import { DsoEditMetadataValueHeadersComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 import { MetadataFieldSelectorComponent } from '../../../../../app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
 import { AlertComponent } from '../../../../../app/shared/alert/alert.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
 
 @Component({
@@ -22,7 +23,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   // templateUrl: './dso-edit-metadata.component.html',
   templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class DsoEditMetadataComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 9656e7b85c..ff64b09664 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -7,6 +7,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pipe';
 
 @Component({
@@ -22,6 +23,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
     ProfilePageSecurityFormComponent,
     AsyncPipe,
     NgIf,
+    DisabledDirective,
   ],
 })
 /**
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index 05f2252216..e557fc466c 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 import { EndUserAgreementContentComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 
 @Component({
   selector: 'ds-themed-end-user-agreement',
@@ -12,7 +13,7 @@ import { EndUserAgreementContentComponent } from '../../../../../app/info/end-us
   // templateUrl: './end-user-agreement.component.html'
   templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html',
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, DisabledDirective],
 })
 
 /**
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
index b3cd90e73e..b86fecae7a 100644
--- a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -7,6 +7,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 
 import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
+import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
 
 @Component({
@@ -16,7 +17,7 @@ import { ErrorComponent } from '../../../../../../app/shared/error/error.compone
   // styleUrls: ['./feedback-form.component.scss'],
   styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule, DisabledDirective],
 })
 export class FeedbackFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 5c6c7f3507..020293214e 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -7,6 +7,7 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
+import { DisabledDirective } from '../../../../../../app/shared/disabled-directive';
 
 @Component({
   selector: 'ds-themed-media-viewer-video',
@@ -20,6 +21,7 @@ import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../ap
     NgbDropdownModule,
     TranslateModule,
     NgIf,
+    DisabledDirective,
   ],
 })
 export class MediaViewerVideoComponent extends BaseComponent {
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
index 44426c527f..d9be35f39d 100644
--- a/src/themes/custom/app/register-email-form/register-email-form.component.ts
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -12,13 +12,14 @@ import { AlertComponent } from 'src/app/shared/alert/alert.component';
 import { GoogleRecaptchaComponent } from 'src/app/shared/google-recaptcha/google-recaptcha.component';
 
 import { RegisterEmailFormComponent as BaseComponent } from '../../../../app/register-email-form/register-email-form.component';
+import { DisabledDirective } from '../../../../app/shared/disabled-directive';
 
 @Component({
   selector: 'ds-themed-register-email-form',
   // templateUrl: './register-email-form.component.html',
   templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule],
+  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, DisabledDirective],
 })
 export class RegisterEmailFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index ac2491cc4e..659e260b1c 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -9,6 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
 import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component';
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
 
 /**
  * Component that renders the create profile page to be used by a user registering through a token
@@ -27,6 +28,7 @@ import { CreateProfileComponent as BaseComponent } from '../../../../../app/regi
     AsyncPipe,
     ReactiveFormsModule,
     NgForOf,
+    DisabledDirective,
   ],
 })
 export class CreateProfileComponent extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
index 1876b134a2..a299e47a27 100644
--- a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -7,6 +7,8 @@ import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component';
 
+import { DisabledDirective } from '../../../../../app/shared/disabled-directive';
+
 @Component({
   selector: 'ds-themed-email-request-copy',
   // styleUrls: ['./email-request-copy.component.scss'],
@@ -14,7 +16,7 @@ import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy
   // templateUrl: './email-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule],
+  imports: [FormsModule, NgClass, NgIf, TranslateModule, DisabledDirective],
 })
 export class EmailRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index 424adb7942..7936deb406 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -5,6 +5,7 @@ import {
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DisabledDirective } from '../../../../../../../../../../app/shared/disabled-directive';
 import { ExternalSourceEntryImportModalComponent as BaseComponent } from '../../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/shared/search/search-results/themed-search-results.component';
 
@@ -19,6 +20,7 @@ import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/
     ThemedSearchResultsComponent,
     NgIf,
     AsyncPipe,
+    DisabledDirective,
   ],
 })
 export class ExternalSourceEntryImportModalComponent extends BaseComponent {
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
index 13f5f97650..17bc5d9136 100644
--- a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -6,6 +6,7 @@ import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
 
+import { DisabledDirective } from '../../../../../../../app/shared/disabled-directive';
 import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
 import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
 import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../app/submission/sections/upload/file/view/section-upload-file-view.component';
@@ -27,6 +28,7 @@ import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../a
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
+    DisabledDirective,
   ],
 })
 export class SubmissionSectionUploadFileComponent