From 56e45a9f08f15124c4226a48db014b4b150cc24e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 2 May 2025 17:08:12 +0200
Subject: [PATCH] 117287: Fixed various layout issues

- The unthemed home news didn't stick to the header like the dspace theme
- Impersonate user button has additional margin
- Submission form loading icon is not translatable
- Create resource policy page doesn't have the correct heading
---
 .../eperson-form/eperson-form.component.html        |  2 +-
 .../eperson-form/eperson-form.component.ts          |  6 +-----
 .../home-page/home-news/home-news.component.html    |  2 +-
 .../create/resource-policy-create.component.html    |  2 +-
 .../submission/form/submission-form.component.html  |  4 ++--
 .../form/submission-form.component.spec.ts          | 13 ++++++-------
 .../submission/form/submission-form.component.ts    |  2 ++
 7 files changed, 14 insertions(+), 17 deletions(-)

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 9947d775a2..ae36b27c87 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
@@ -30,7 +30,7 @@
           </div>
         }
         @if (canImpersonate$ | async) {
-          <div between class="btn-group ms-1">
+          <div between class="btn-group">
             @if (!isImpersonated) {
               <button class="btn btn-primary" type="button" (click)="impersonate()">
                 <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
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 8b5a8817a9..56c6e86d2e 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
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -84,7 +81,6 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     FormComponent,
     AsyncPipe,
     TranslateModule,
-    NgClass,
     ThemedLoadingComponent,
     PaginationComponent,
     RouterLink,
diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
index 972c8cc293..969ca15c26 100644
--- a/src/app/home-page/home-news/home-news.component.html
+++ b/src/app/home-page/home-news/home-news.component.html
@@ -1,4 +1,4 @@
-<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
+<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-ncs mb-4">
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.html b/src/app/shared/resource-policies/create/resource-policy-create.component.html
index 85d0d13e96..207513cc94 100644
--- a/src/app/shared/resource-policies/create/resource-policy-create.component.html
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-  <h4 class="mb-3">{{'resource-policies.create.page.heading' | translate}} {{targetResourceName}}</h4>
+  <h1 class="mb-3">{{'resource-policies.create.page.heading' | translate}} {{targetResourceName}}</h1>
 
   <ds-resource-policy-form [isProcessing]="isProcessing()"
                            (reset)="redirectToAuthorizationsPage()"
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 5ba96d6037..b193e551fc 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -30,8 +30,8 @@
   }
 
   <div class="submission-form-content">
-    @if ((isLoading$ | async)) {
-      <ds-loading message="Loading..."></ds-loading>
+    @if (isLoading$ | async) {
+      <ds-loading [message]="'form.loading' | translate"></ds-loading>
     }
     @for (object of $any(submissionSections | async); track object) {
       <ds-submission-section-container [collectionId]="collectionId"
diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts
index ef5d9898b4..e7ea1ec34b 100644
--- a/src/app/submission/form/submission-form.component.spec.ts
+++ b/src/app/submission/form/submission-form.component.spec.ts
@@ -1,7 +1,6 @@
 import {
   ChangeDetectorRef,
   Component,
-  NO_ERRORS_SCHEMA,
   SimpleChange,
 } from '@angular/core';
 import {
@@ -10,6 +9,7 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import {
   cold,
   getTestScheduler,
@@ -31,12 +31,10 @@ import {
   mockSubmissionSelfUrl,
   mockSubmissionState,
 } from '../../shared/mocks/submission.mock';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../shared/testing/utils.test';
-import { ThemeService } from '../../shared/theme-support/theme.service';
 import { SubmissionSectionContainerComponent } from '../sections/container/section-container.component';
 import { SectionsService } from '../sections/sections.service';
 import { VisibilityType } from '../sections/visibility-type';
@@ -47,7 +45,7 @@ import { SubmissionFormSectionAddComponent } from './section-add/submission-form
 import { SubmissionFormComponent } from './submission-form.component';
 import { ThemedSubmissionUploadFilesComponent } from './submission-upload-files/themed-submission-upload-files.component';
 
-describe('SubmissionFormComponent Component', () => {
+describe('SubmissionFormComponent', () => {
 
   let comp: SubmissionFormComponent;
   let compAsAny: any;
@@ -67,18 +65,19 @@ describe('SubmissionFormComponent Component', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [SubmissionFormComponent, TestComponent,
+      imports: [
+        SubmissionFormComponent,
+        TestComponent,
+        TranslateModule.forRoot(),
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
         { provide: HALEndpointService, useValue: new HALEndpointServiceStub('workspaceitems') },
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SectionsService, useValue: { isSectionTypeAvailable: () => observableOf(true) } },
-        { provide: ThemeService, useValue: getMockThemeService() },
         ChangeDetectorRef,
         SubmissionFormComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA],
     })
       .overrideComponent(SubmissionFormComponent, {
         remove: {
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 2cebeb7ac1..2ba4fe38c2 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -7,6 +7,7 @@ import {
   OnDestroy,
   SimpleChanges,
 } from '@angular/core';
+import { TranslatePipe } from '@ngx-translate/core';
 import isEqual from 'lodash/isEqual';
 import {
   Observable,
@@ -64,6 +65,7 @@ import { ThemedSubmissionUploadFilesComponent } from './submission-upload-files/
     ThemedSubmissionUploadFilesComponent,
     SubmissionFormCollectionComponent,
     SubmissionFormSectionAddComponent,
+    TranslatePipe,
   ],
   standalone: true,
 })