[LM-46] revert changes by using LinkMenuItemModel

Author: alisaismailati

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html

@@ -4,7 +4,7 @@
        [attr.aria-disabled]="isDisabled"
        [attr.aria-labelledby]="'sidebarName-' + section.id"
        [title]="('menu.section.icon.' + section.id) | translate"
-       [routerLink]="itemModel.link ?? itemModel.href"
+       [routerLink]="itemModel.link"
        (keyup.space)="navigate($event)"
        (keyup.enter)="navigate($event)"
        href="javascript:void(0);"

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts

@@ -10,19 +10,13 @@ import { AdminSidebarSectionComponent } from './admin-sidebar-section.component'
 import { RouterTestingModule } from '@angular/router/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
-import { of } from 'rxjs';
-import { HardRedirectService } from '../../../core/services/hard-redirect.service';
 
 describe('AdminSidebarSectionComponent', () => {
   let component: AdminSidebarSectionComponent;
   let fixture: ComponentFixture<AdminSidebarSectionComponent>;
   const menuService = new MenuServiceStub();
   const iconString = 'test';
 
-  const hardRedirectService = jasmine.createSpyObj('HardRedirectService', {
-    redirect: of({})
-  });
-
   describe('when not disabled', () => {
 
     beforeEach(waitForAsync(() => {
@@ -34,7 +28,6 @@ describe('AdminSidebarSectionComponent', () => {
           {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com'}, icon: iconString}},
           {provide: MenuService, useValue: menuService},
           {provide: CSSVariableService, useClass: CSSVariableServiceStub},
-          {provide: HardRedirectService, useValue: hardRedirectService},
         ]
       }).overrideComponent(AdminSidebarSectionComponent, {
         set: {
@@ -75,7 +68,6 @@ describe('AdminSidebarSectionComponent', () => {
           {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com', disabled: true}, icon: iconString}},
           {provide: MenuService, useValue: menuService},
           {provide: CSSVariableService, useClass: CSSVariableServiceStub},
-          {provide: HardRedirectService, useValue: hardRedirectService},
         ]
       }).overrideComponent(AdminSidebarSectionComponent, {
         set: {

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts

@@ -1,4 +1,4 @@
-import { Component, Inject, Injector, OnInit, Optional } from '@angular/core';
+import { Component, Inject, Injector, OnInit } from '@angular/core';
 import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-section.component';
 import { MenuService } from '../../../shared/menu/menu.service';
 import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
@@ -7,8 +7,6 @@ import { MenuSection } from '../../../shared/menu/menu-section.model';
 import { MenuID } from '../../../shared/menu/menu-id.model';
 import { isEmpty } from '../../../shared/empty.util';
 import { Router } from '@angular/router';
-import { ExternalLinkMenuItemModel } from '../../../shared/menu/menu-item/models/external-link.model';
-import { HardRedirectService } from '../../../core/services/hard-redirect.service';
 
 /**
  * Represents a non-expandable section in the admin sidebar
@@ -38,33 +36,20 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
     protected menuService: MenuService,
     protected injector: Injector,
     protected router: Router,
-    protected hardRedirectService: HardRedirectService,
   ) {
     super(menuSection, menuService, injector);
-    this.itemModel = menuSection.model as LinkMenuItemModel | ExternalLinkMenuItemModel;
+    this.itemModel = menuSection.model as LinkMenuItemModel;
   }
 
   ngOnInit(): void {
-    if (this.itemModel instanceof LinkMenuItemModel) {
-      this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link);
-    } else if (this.itemModel instanceof ExternalLinkMenuItemModel) {
-      this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.href);
-    } else {
-      this.isDisabled = true;
-    }
-
+    this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link);
     super.ngOnInit();
   }
 
   navigate(event: any): void {
     event.preventDefault();
     if (!this.isDisabled) {
-
-      if (this.itemModel instanceof LinkMenuItemModel) {
-        this.router.navigate([this.itemModel.link]);
-      } else if (this.itemModel instanceof ExternalLinkMenuItemModel) {
-        this.hardRedirectService.redirect(this.itemModel.href);
-      }
+      this.router.navigateByUrl(this.itemModel.link);
     }
   }
 }

src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts

@@ -5,23 +5,19 @@ import { MenuService } from '../../../shared/menu/menu.service';
 import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
 import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
-import { of as observableOf, of } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { Component } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { Router } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
-import { HardRedirectService } from '../../../core/services/hard-redirect.service';
 
 describe('ExpandableAdminSidebarSectionComponent', () => {
   let component: ExpandableAdminSidebarSectionComponent;
   let fixture: ComponentFixture<ExpandableAdminSidebarSectionComponent>;
   const menuService = new MenuServiceStub();
   const iconString = 'test';
-  const hardRedirectService = jasmine.createSpyObj('HardRedirectService', {
-    redirect: of({})
-  });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -32,7 +28,6 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
         { provide: Router, useValue: new RouterStub() },
-        {provide: HardRedirectService, useValue: hardRedirectService},
       ]
     }).overrideComponent(ExpandableAdminSidebarSectionComponent, {
       set: {

src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts

@@ -10,7 +10,6 @@ import { map } from 'rxjs/operators';
 import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
 import { MenuID } from '../../../shared/menu/menu-id.model';
 import { Router } from '@angular/router';
-import { HardRedirectService } from '../../../core/services/hard-redirect.service';
 
 /**
  * Represents a expandable section in the sidebar
@@ -56,9 +55,8 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
     private variableService: CSSVariableService,
     protected injector: Injector,
     protected router: Router,
-    protected hardRedirectService: HardRedirectService,
   ) {
-    super(menuSection, menuService, injector, router, hardRedirectService);
+    super(menuSection, menuService, injector, router);
   }
 
   /**

src/app/menu.resolver.ts

@@ -622,20 +622,22 @@ export class MenuResolver implements Resolve<boolean> {
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
       this.getDLExporterURL()
     ]).subscribe(([authorized, url]) => {
-      this.menuService.addSection(MenuID.ADMIN, {
-        id: 'loginmiur_dlexporter_url',
-        index: 15,
-        active: false,
-        visible: authorized && (hasValue(url) && url.length > 0),
-        model: {
-          type: MenuItemType.EXTERNAL,
-          text: 'menu.section.loginmiur_dlexporter_url',
-          disabled: false,
-          href: url
-        } as ExternalLinkMenuItemModel,
-        icon: 'fa-solid fa-arrows-spin',
-        shouldPersistOnRouteChange: true
-      });
+      this.menuService.addSection(MenuID.ADMIN,
+        {
+          id: 'loginmiur_dlexporter_url',
+          index: 15,
+          active: false,
+          visible: authorized && (hasValue(url) && url.length > 0),
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.loginmiur_dlexporter_url',
+            disabled: false,
+            link: url
+          } as LinkMenuItemModel,
+          icon: 'fa-solid fa-arrows-spin',
+          shouldPersistOnRouteChange: true
+        }
+      );
     });
   }