Merged in task/dspace-cris-2025_02_x/DSC-2797 (pull request DSpace#4276)

[DSC-2797] fixes(log-in): align registration and forgot password links position with dspace base code

Approved-by: Andrea Barbasso

Author: atarix83

src/app/shared/log-in/log-in.component.html

@@ -8,18 +8,6 @@
       @if (!last) {
         <div class="dropdown-divider my-2"></div>
       }
-      @if (canShowDivider$ | async) {
-        <div class="mt-2">
-          @if (canRegister$ | async) {
-            <a class="dropdown-item" [routerLink]="[getRegisterRoute()]"
-               [attr.data-test]="'register' | dsBrowserOnly">{{"login.form.new-user" | translate}}</a>
-          }
-          @if (canForgot$ | async) {
-            <a class="dropdown-item" [routerLink]="[getForgotRoute()]"
-               [attr.data-test]="'forgot' | dsBrowserOnly">{{"login.form.forgot-password" | translate}}</a>
-          }
-        </div>
-      }
     }
   </div>
 }

src/app/shared/log-in/log-in.component.ts

@@ -6,27 +6,19 @@ import {
   OnDestroy,
   OnInit,
 } from '@angular/core';
-import {
-  ActivatedRoute,
-  RouterLink,
-} from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import {
   select,
   Store,
 } from '@ngrx/store';
-import { TranslatePipe } from '@ngx-translate/core';
 import uniqBy from 'lodash/uniqBy';
 import {
-  combineLatest,
   combineLatestWith,
   map,
   Observable,
   Subscription,
 } from 'rxjs';
-import {
-  filter,
-  shareReplay,
-} from 'rxjs/operators';
+import { filter } from 'rxjs/operators';
 
 import { environment } from '../../../environments/environment';
 import {
@@ -44,10 +36,8 @@ import {
 } from '../../core/auth/selectors';
 import { CoreState } from '../../core/core-state.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { hasValue } from '../empty.util';
 import { ThemedLoadingComponent } from '../loading/themed-loading.component';
-import { BrowserOnlyPipe } from '../utils/browser-only.pipe';
 import { LogInContainerComponent } from './container/log-in-container.component';
 import {
   AUTH_METHOD_FOR_DECORATOR_MAP,
@@ -61,11 +51,8 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     AsyncPipe,
-    BrowserOnlyPipe,
     LogInContainerComponent,
-    RouterLink,
     ThemedLoadingComponent,
-    TranslatePipe,
   ],
 })
 export class LogInComponent implements OnInit, OnDestroy {
@@ -103,21 +90,6 @@ export class LogInComponent implements OnInit, OnDestroy {
    */
   public loading: Observable<boolean>;
 
-  /**
-   * Whether or not the current user (or anonymous) is authorized to register an account
-   */
-  canRegister$: Observable<boolean>;
-
-  /**
-   * Whether or not the current user (or anonymous) is authorized to register an account
-   */
-  canForgot$: Observable<boolean>;
-
-  /**
-   * Shows the divider only if contains at least one link to show
-   */
-  canShowDivider$: Observable<boolean>;
-
   /**
    * Track subscription to unsubscribe on destroy
    * @private
@@ -156,18 +128,6 @@ export class LogInComponent implements OnInit, OnDestroy {
         this.authService.clearRedirectUrl();
       }
     });
-
-    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration);
-
-    this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(shareReplay({ refCount: false, bufferSize: 1 }));
-    this.canShowDivider$ = combineLatest([
-      this.canRegister$,
-      this.canForgot$,
-      this.route.data,
-    ]).pipe(
-      map(([canRegister, canForgot, routeData]) => (canRegister || canForgot) && !routeData?.isBackDoor),
-      filter(Boolean),
-    );
   }
 
   filterAndSortAuthMethods(authMethods: AuthMethod[], isBackdoor: boolean, isPasswordLoginEnabledForAdminsOnly = false): AuthMethod[] {

src/app/shared/log-in/methods/password/log-in-password.component.html

@@ -30,3 +30,16 @@
   <button class="btn btn-lg btn-primary w-100" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
     [dsBtnDisabled]="!form.valid" role="button" tabindex="0"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
   </form>
+
+  @if (canShowDivider$ | async) {
+    <div class="mt-2">
+      @if (canRegister$ | async) {
+        <a class="dropdown-item" [routerLink]="[getRegisterRoute()]"
+        [attr.data-test]="'register' | dsBrowserOnly" tabindex="0">{{"login.form.new-user" | translate}}</a>
+      }
+      @if (canForgot$ | async) {
+        <a class="dropdown-item" [routerLink]="[getForgotRoute()]"
+        [attr.data-test]="'forgot' | dsBrowserOnly" tabindex="0">{{"login.form.forgot-password" | translate}}</a>
+      }
+    </div>
+  }