[DSC-1864] resolve conflicts on 7.6.2 alignment

Author: FrancescoMolinaro

package.json

@@ -114,8 +114,8 @@
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "domino": "^2.1.6",
-    "ejs": "^3.1.9",
-    "express": "^4.18.2",
+    "ejs": "^3.1.10",
+    "express": "^4.19.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "file-saver": "^2.0.5",
@@ -145,14 +145,16 @@
     "ng2-nouislider": "^2.0.0",
     "ngx-infinite-scroll": "^15.0.0",
     "ngx-pagination": "6.0.3",
-    "ngx-ui-switch": "^14.0.3",
+    "ngx-sortablejs": "^11.1.0",
+    "ngx-ui-switch": "^14.1.0",
     "nouislider": "^15.7.1",
     "pem": "1.14.7",
     "prop-types": "^15.8.1",
     "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.0",
-    "sanitize-html": "^2.10.0",
+    "sanitize-html": "^2.12.1",
+    "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "~0.11.5"
@@ -165,7 +167,7 @@
     "@angular-eslint/eslint-plugin-template": "15.2.1",
     "@angular-eslint/schematics": "15.2.1",
     "@angular-eslint/template-parser": "15.2.1",
-    "@angular/cli": "^15.2.6",
+    "@angular/cli": "^16.0.4",
     "@angular/compiler-cli": "^15.2.8",
     "@angular/language-service": "^15.2.8",
     "@cypress/schematic": "^1.5.0",
@@ -194,7 +196,7 @@
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^39.6.4",
+    "eslint-plugin-jsdoc": "^45.0.0",
     "eslint-plugin-jsonc": "^2.6.0",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-unused-imports": "^2.0.0",
@@ -208,7 +210,7 @@
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
     "ngx-export-as": "~1.15.1",
-    "ngx-mask": "13.1.7",
+    "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.22",
     "postcss": "^8.4",
     "postcss-apply": "0.12.0",

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

@@ -1,23 +1,22 @@
 <div class="sidebar-section">
     <a class="nav-item nav-link d-flex flex-row flex-nowrap"
        [ngClass]="{ disabled: isDisabled }"
+       role="menuitem"
        [attr.aria-disabled]="isDisabled"
-       [attr.aria-labelledby]="'sidebarName-' + section.id"
+       [attr.aria-labelledby]="adminMenuSectionTitleId(section.id)"
        [title]="('menu.section.icon.' + section.id) | translate"
        [routerLink]="itemModel.link"
        [queryParams]="itemModel.queryParams"
        (keyup.space)="navigate($event)"
        (keyup.enter)="navigate($event)"
        href="javascript:void(0);"
     >
-      <div class="shortcut-icon">
+      <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
         <i class="fas fa-{{section.icon}} fa-fw"></i>
       </div>
-      <div class="sidebar-collapsible">
-        <div class="toggle">
-          <span id="sidebarName-{{section.id}}" class="section-header-text">
-            {{itemModel.text | translate}}
-          </span>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+          <span [id]="adminMenuSectionTitleId(section.id)">{{itemModel.text | translate}}</span>
         </div>
       </div>
     </a>

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

@@ -1,4 +1,4 @@
-import { Component, HostListener, Injector, OnInit } from '@angular/core';
+import { Component, HostListener, Injector, Input, OnInit } from '@angular/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { debounceTime, distinctUntilChanged, first, map, withLatestFrom } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
@@ -29,9 +29,14 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
   menuID = MenuID.ADMIN;
 
   /**
-   * Observable that emits the width of the collapsible menu sections
+   * Observable that emits the width of the sidebar when expanded
    */
-  sidebarWidth: Observable<string>;
+  @Input() expandedSidebarWidth$: Observable<string>;
+
+  /**
+   * Observable that emits the width of the sidebar when collapsed
+   */
+  @Input() collapsedSidebarWidth$: Observable<string>;
 
   /**
    * Is true when the sidebar is open, is false when the sidebar is animating or closed
@@ -45,6 +50,12 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   sidebarClosed = !this.sidebarOpen; // Closed in UI, animation finished
 
+  /**
+   * Is true when the sidebar is opening or closing
+   * @type {boolean}
+   */
+  sidebarTransitioning = !this.sidebarOpen; // Animation in progress
+
   /**
    * Emits true when either the menu OR the menu's preview is expanded, else emits false
    */
@@ -70,7 +81,6 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarWidth = this.variableService.getVariable('--ds-sidebar-items-width');
     combineLatest([
       this.authService.isAuthenticated(),
       this.menuService.getMenuTopSections(this.menuID).pipe(
@@ -141,6 +151,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   startSlide(event: any): void {
+    this.sidebarTransitioning = true;
     if (event.toState === 'expanded') {
       this.sidebarClosed = false;
     } else if (event.toState === 'collapsed') {
@@ -153,6 +164,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * @param event The animation event
    */
   finishSlide(event: any): void {
+    this.sidebarTransitioning = false;
     if (event.fromState === 'expanded') {
       this.sidebarClosed = true;
     } else if (event.fromState === 'collapsed') {

src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html

@@ -1,6 +1,6 @@
 <div class="container">
   <div class="d-flex justify-content-between">
-    <h3>{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h3>
+    <h1 class="h2">{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h1>
     <div class="pt-3">
       <button *ngIf="hasHistory" (click)="back()" class="btn btn-outline-secondary">
         <i class="fas fa-arrow-left"></i> {{'bitstream.download.page.back' | translate}}

src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts

@@ -24,6 +24,8 @@ import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { SearchManager } from '../../core/browse/search-manager';
+import { cold } from 'jasmine-marbles';
+
 
 describe('BrowseByDatePageComponent', () => {
   let comp: BrowseByDatePageComponent;
@@ -118,9 +120,13 @@ describe('BrowseByDatePageComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should initialize the list of items', () => {
+  it('should initialize the list of items', (done: DoneFn) => {
+    expect(comp.loading$).toBeObservable(cold('(a|)', {
+      a: false,
+    }));
     comp.items$.subscribe((result) => {
       expect(result.payload.page).toEqual([firstItem]);
+      done();
     });
   });
 

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts

@@ -31,6 +31,8 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { SearchManager } from '../../core/browse/search-manager';
+import { cold } from 'jasmine-marbles';
+
 
 describe('BrowseByMetadataPageComponent', () => {
   let comp: BrowseByMetadataPageComponent;
@@ -155,9 +157,13 @@ describe('BrowseByMetadataPageComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should fetch items', () => {
+    it('should fetch items', (done: DoneFn) => {
+      expect(comp.loading$).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
       comp.items$.subscribe((result) => {
         expect(result.payload.page).toEqual(mockItems);
+        done();
       });
     });
 

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts

@@ -1,4 +1,4 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, Subscription, of as observableOf } from 'rxjs';
 import { Component, Inject, OnInit, OnDestroy } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list.model';
@@ -109,9 +109,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
   value = '';
 
   /**
-   * The authority key (may be undefined) associated with {@link #value}.
-   */
-   authority: string;
+  * The authority key (may be undefined) associated with {@link #value}.
+  */
+  authority: string;
 
   /**
    * The current startsWith option (fetched and updated from query-params)
@@ -123,6 +123,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   fetchThumbnails: boolean;
 
+  /**
+   * Observable determining if the loading animation needs to be shown
+   */
+  loading$ = observableOf(true);
+
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
                      protected searchManager: SearchManager,
@@ -202,9 +207,11 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePage(searchOptions: BrowseEntrySearchOptions) {
     this.browseEntries$ = this.browseService.getBrowseEntriesFor(searchOptions);
+    this.loading$ = this.browseEntries$.pipe(
+      map((browseEntriesRD: RemoteData<PaginatedList<BrowseEntry>>) => browseEntriesRD.isLoading),
+    );
     this.items$ = undefined;
   }
-
   /**
    * Updates the current page with searchOptions and display items linked to the given value
    * @param searchOptions   Options to narrow down your search:
@@ -216,8 +223,10 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    * @param authority      The metadata authority of the browse-entry to display items for
    */
   updatePageWithItems(searchOptions: BrowseEntrySearchOptions, value: string, authority: string) {
-    const embedMetrics = followLink('metrics');
-    this.items$ = this.searchManager.getBrowseItemsFor(value, authority, searchOptions, embedMetrics);
+    this.items$ = this.browseService.getBrowseItemsFor(value, authority, searchOptions);
+    this.loading$ = this.items$.pipe(
+      map((itemsRD: RemoteData<PaginatedList<Item>>) => itemsRD.isLoading),
+    );
   }
 
   /**

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

@@ -23,6 +23,7 @@ import { ThemedCollectionPageComponent } from './themed-collection-page.componen
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver';
+import { EditCollectionResolver } from "../core/shared/resolvers/edit-collection.resolver";
 
 @NgModule({
   imports: [
@@ -60,6 +61,9 @@ import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-bread
         runGuardsAndResolvers: 'always',
         children: [
           {
+            resolve: {
+              dso: EditCollectionResolver,
+            },
             path: COLLECTION_EDIT_PATH,
             loadChildren: () => import('./edit-collection-page/edit-collection-page.module')
               .then((m) => m.EditCollectionPageModule),
@@ -92,7 +96,7 @@ import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-bread
             public: [{
               id: 'statistics_collection_:id',
               active: true,
-              visible: true,
+              visible: false,
               index: 2,
               model: {
                 type: MenuItemType.LINK,

src/app/core/core.module.ts

@@ -238,6 +238,8 @@ import {
 import { ProductDatasetSchemaType } from './metadata/schema-json-ld/schema-types/product/product-dataset-schema-type';
 import { PersonSchemaType } from './metadata/schema-json-ld/schema-types/Person/person-schema-type';
 import { InternalLinkService } from './services/internal-link.service';
+import { SubmissionParentBreadcrumbsService } from './submission/submission-parent-breadcrumb.service';
+
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -375,6 +377,7 @@ const PROVIDERS = [
   WorkflowStepStatisticsDataService,
   WorkflowOwnerStatisticsDataService,
   LoginStatisticsService,
+  SubmissionParentBreadcrumbsService
 ];
 
 const SCHEMA_PROVIDERS = [

src/app/core/data/relationship-data.service.ts

@@ -225,6 +225,35 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     );
   }
 
+  /**
+   * Get an item's relationships in the form of an array with size 100
+   *
+   * @param item            The {@link Item} to get {@link Relationship}s for
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s
+   *                        should be automatically resolved
+   */
+  getItemRelationshipsAsArrayAll(item: Item, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<Relationship[]> {
+    // Set the pagination info
+    const findOptions: FindListOptions = {
+      elementsPerPage: 100
+    };
+    return this.findListByHref(item._links.relationships.href, findOptions, false, false, ...linksToFollow).pipe(
+        getFirstSucceededRemoteData(),
+        getRemoteDataPayload(),
+        map((rels: PaginatedList<Relationship>) => rels.page),
+        hasValueOperator(),
+        distinctUntilChanged(compareArraysUsingIds()),
+    );
+  }
+
+  public updateRightPlace(rel: Relationship): Observable<RemoteData<Relationship>> {
+
+    const update$ = this.update(rel);
+
+    return update$;
+  }
+
+
   /**
    * Get an array of the labels of an item’s unique relationship types
    * The array doesn't contain any duplicate labels