[DURACOM-456] refactoring

Author: FrancescoMolinaro

src/app/app-routes.ts

@@ -28,7 +28,6 @@ import { ACCESS_CONTROL_MODULE_PATH } from './access-control/access-control-rout
 import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
 import {
   ADMIN_MODULE_PATH,
-  BULK_IMPORT_PATH,
   EDIT_ITEM_PATH,
   FORGOT_PASSWORD_PATH,
   HEALTH_PAGE_PATH,
@@ -276,11 +275,6 @@ export const APP_ROUTES: Route[] = [
         loadChildren: () => import('./audit-page/audit-page-routes').then((m) => m.ROUTES),
         canActivate: [siteAdministratorGuard, endUserAgreementCurrentUserGuard],
       },
-      {
-        path: BULK_IMPORT_PATH,
-        loadChildren: () => import('./bulk-import/bulk-import-page-routes').then((m) => m.ROUTES),
-        canActivate: [authenticatedGuard, endUserAgreementCurrentUserGuard],
-      },
       {
         path: 'subscriptions',
         loadChildren: () => import('./subscriptions-page/subscriptions-page-routes')

src/app/app-routing-paths.ts

@@ -1,4 +1,3 @@
-import { Collection } from './core/shared/collection.model';
 
 export const COAR_NOTIFY_SUPPORT = 'coar-notify-support';
 
@@ -58,9 +57,3 @@ export function getEditItemPageRoute() {
   return `/${EDIT_ITEM_PATH}`;
 }
 export const CORRECTION_TYPE_PATH = 'corrections';
-
-export const BULK_IMPORT_PATH = 'bulk-import';
-
-export function getBulkImportRoute(collection: Collection): string {
-  return `/${BULK_IMPORT_PATH}/${collection.id}`;
-}

src/app/bulk-import/bulk-import-page-routes.ts

@@ -10,7 +10,7 @@ import { bulkImportPageResolver } from './bulk-import-page.resolver';
  */
 export const ROUTES: Route[] = [
   {
-    path: ':id',
+    path: '',
     component: BulkImportPageComponent,
     resolve: {
       collection: bulkImportPageResolver,

src/app/bulk-import/bulk-import-page.component.html

@@ -1,5 +1,5 @@
 <div class="container">
-  <h2 class="mb-3">{{ 'bulk-import.title' | translate }}</h2>
+  <h1 class="mb-3">{{ 'bulk-import.title' | translate }}</h1>
   <form [formGroup]="form" (ngSubmit)="submit()">
     <div class="form-group mb-2">
       <label for="name">{{ 'bulk-import.collection-name' | translate }}</label>

src/app/bulk-import/bulk-import-page.component.ts

@@ -1,4 +1,3 @@
-import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -55,7 +54,6 @@ interface BulkImportFormValues {
   selector: 'ds-bulk-import-page',
   templateUrl: './bulk-import-page.component.html',
   imports: [
-    AsyncPipe,
     BtnDisabledDirective,
     FileValidator,
     ReactiveFormsModule,

src/app/collection-page/collection-page-routes.ts

@@ -3,6 +3,7 @@ import { authenticatedGuard } from '@dspace/core/auth/authenticated.guard';
 import { collectionBreadcrumbResolver } from '@dspace/core/breadcrumbs/collection-breadcrumb.resolver';
 import { communityBreadcrumbResolver } from '@dspace/core/breadcrumbs/community-breadcrumb.resolver';
 import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
+import { endUserAgreementCurrentUserGuard } from '@dspace/core/end-user-agreement/end-user-agreement-current-user.guard';
 
 import { ObjectAuditLogsComponent } from '../audit-page/object-audit-overview/object-audit-logs.component';
 import { browseByGuard } from '../browse-by/browse-by-guard';
@@ -14,6 +15,7 @@ import { viewTrackerResolver } from '../statistics/angulartics/dspace/view-track
 import { collectionPageResolver } from './collection-page.resolver';
 import { collectionPageAdministratorGuard } from './collection-page-administrator.guard';
 import {
+  BULK_IMPORT_PATH,
   COLLECTION_CREATE_PATH,
   COLLECTION_EDIT_PATH,
   ITEMTEMPLATE_PATH,
@@ -87,6 +89,11 @@ export const ROUTES: Route[] = [
         },
         data: { title: 'collection.edit.template.title', breadcrumbKey: 'collection.edit.template' },
       },
+      {
+        path: BULK_IMPORT_PATH,
+        loadChildren: () => import('../bulk-import/bulk-import-page-routes').then((m) => m.ROUTES),
+        canActivate: [authenticatedGuard, endUserAgreementCurrentUserGuard],
+      },
       {
         path: '',
         component: ThemedCollectionPageComponent,

src/app/collection-page/collection-page-routing-paths.ts

@@ -24,3 +24,8 @@ export const COLLECTION_CREATE_PATH = 'create';
 export const COLLECTION_EDIT_PATH = 'edit';
 export const COLLECTION_EDIT_ROLES_PATH = 'roles';
 export const ITEMTEMPLATE_PATH = 'itemtemplate';
+export const BULK_IMPORT_PATH = 'bulk-import';
+
+export function getBulkImportRoute(id: string): string {
+  return new URLCombiner(getCollectionPageRoute(id), BULK_IMPORT_PATH).toString();
+}

src/app/shared/menu/providers/bulk-import.menu.spec.ts

@@ -18,16 +18,17 @@ describe('BulkImportMenuProvider', () => {
       model: {
         type: MenuItemType.LINK,
         text: 'context-menu.actions.bulk-import.btn',
-        link: '/bulk-import/test-uuid',
+        link: '/collections/test-id/bulk-import',
       },
+      icon: 'file-excel',
     },
   ];
 
   let provider: BulkImportMenuProvider;
 
   const dso: Collection = Object.assign(new Collection(), {
     type: COLLECTION.value,
-    id: 'test-uuid',
+    id: 'test-id',
     _links: { self: { href: 'self-link' } },
   });
 

src/app/shared/menu/providers/bulk-import.menu.ts

@@ -8,13 +8,12 @@
 import { Injectable } from '@angular/core';
 import { AuthorizationDataService } from '@dspace/core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
-import { Collection } from '@dspace/core/shared/collection.model';
 import { DSpaceObject } from '@dspace/core/shared/dspace-object.model';
 import {
   map,
   Observable,
 } from 'rxjs';
-import { getBulkImportRoute } from 'src/app/app-routing-paths';
+import { getBulkImportRoute } from 'src/app/collection-page/collection-page-routing-paths';
 
 import { LinkMenuItemModel } from '../menu-item/models/link.model';
 import { MenuItemType } from '../menu-item-type.model';
@@ -39,9 +38,10 @@ export class BulkImportMenuProvider extends DSpaceObjectPageMenuProvider {
           model: {
             type: MenuItemType.LINK,
             text: 'context-menu.actions.bulk-import.btn',
-            link: getBulkImportRoute(dso as Collection),
+            link: getBulkImportRoute(dso.id),
           } as LinkMenuItemModel,
           visible: isAuthorized,
+          icon: 'file-excel',
         }] as PartialMenuSection[];
       }),
     );

src/assets/i18n/en.json5

@@ -1207,7 +1207,7 @@
 
   "bulk-import.back": "Back",
 
-  "bulk-import.breadcrumbs": "Bulk import",
+  "bulk-import.breadcrumbs": "Bulk Import from Excel",
 
   "bulk-import.collection-name": "Collection",
 
@@ -1217,15 +1217,15 @@
 
   "bulk-import.file": "Source file",
 
-  "bulk-import.header": "Bulk import",
+  "bulk-import.header": "Bulk Import from Excel",
 
   "bulk-import.processing": "Processing...",
 
   "bulk-import.success": "The import process was successfully created",
 
   "bulk-import.submit": "Start import",
 
-  "bulk-import.title": "Bulk import",
+  "bulk-import.title": "Bulk Import from Excel",
 
   "search.browse.item-back": "Back to Results",
 
@@ -1731,7 +1731,7 @@
 
   "context-menu.actions.audit-item.btn": "Audit",
 
-  "context-menu.actions.bulk-import.btn": "Import into collection",
+  "context-menu.actions.bulk-import.btn": "Import from Excel",
 
   "context-menu.actions.subscription.frequency.required": "Please select a frequency",