Merge branch 'main' into feature/CST-5729

Author: atarix83

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

@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { BitstreamPageResolver } from './bitstream-page.resolver';
 import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
@@ -13,6 +12,7 @@ import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 import { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
 import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
@@ -49,7 +49,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
       },
       {
         path: EDIT_BITSTREAM_PATH,
-        component: EditBitstreamPageComponent,
+        component: ThemedEditBitstreamPageComponent,
         resolve: {
           bitstream: BitstreamPageResolver,
           breadcrumb: BitstreamBreadcrumbResolver,

src/app/bitstream-page/bitstream-page.module.ts

@@ -7,6 +7,7 @@ import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bit
 import { FormModule } from '../shared/form/form.module';
 import { ResourcePoliciesModule } from '../shared/resource-policies/resource-policies.module';
 import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
+import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
 
 /**
  * This module handles all components that are necessary for Bitstream related pages
@@ -22,6 +23,7 @@ import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstr
   declarations: [
     BitstreamAuthorizationsComponent,
     EditBitstreamPageComponent,
+    ThemedEditBitstreamPageComponent,
     BitstreamDownloadPageComponent,
   ]
 })

src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts

@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+
+@Component({
+  selector: 'ds-themed-edit-bitstream-page',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedEditBitstreamPageComponent extends ThemedComponent<EditBitstreamPageComponent> {
+  protected getComponentName(): string {
+    return 'EditBitstreamPageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-bitstream-page.component');
+  }
+}

src/app/item-page/edit-item-page/edit-item-page.module.ts

@@ -39,6 +39,8 @@ import { IdentifierDataComponent } from '../../shared/object-list/identifier-dat
 import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
 import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
 import { ItemCurateComponent } from './item-curate/item-curate.component';
+import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
+
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -67,6 +69,7 @@ import { ItemCurateComponent } from './item-curate/item-curate.component';
     ItemPublicComponent,
     ItemDeleteComponent,
     ItemStatusComponent,
+    ThemedItemStatusComponent,
     ItemRelationshipsComponent,
     ItemBitstreamsComponent,
     ItemVersionHistoryComponent,
@@ -89,6 +92,9 @@ import { ItemCurateComponent } from './item-curate/item-curate.component';
     IdentifierDataService,
     ObjectValuesPipe
   ],
+  exports: [
+    ItemOperationComponent,
+  ]
 })
 export class EditItemPageModule {
 

src/app/item-page/edit-item-page/edit-item-page.routing.module.ts

@@ -6,7 +6,6 @@ import { ItemReinstateComponent } from './item-reinstate/item-reinstate.componen
 import { ItemPrivateComponent } from './item-private/item-private.component';
 import { ItemPublicComponent } from './item-public/item-public.component';
 import { ItemDeleteComponent } from './item-delete/item-delete.component';
-import { ItemStatusComponent } from './item-status/item-status.component';
 import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemMoveComponent } from './item-move/item-move.component';
@@ -42,6 +41,7 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
 import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
 import { ItemPageRegisterDoiGuard } from './item-page-register-doi.guard';
 import { ItemCurateComponent } from './item-curate/item-curate.component';
+import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
@@ -67,7 +67,7 @@ import { ItemCurateComponent } from './item-curate/item-curate.component';
               },
               {
                 path: 'status',
-                component: ItemStatusComponent,
+                component: ThemedItemStatusComponent,
                 data: { title: 'item.edit.tabs.status.title', showBreadcrumbs: true },
                 canActivate: [ItemPageStatusGuard]
               },

src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts

@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { ItemStatusComponent } from './item-status.component';
+
+@Component({
+  selector: 'ds-themed-item-status',
+  styleUrls: [],
+  templateUrl: '../../../shared/theme-support/themed.component.html',
+})
+export class ThemedItemStatusComponent extends ThemedComponent<ItemStatusComponent> {
+  protected getComponentName(): string {
+    return 'ItemStatusComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/item-page/edit-item-page/item-status/item-status.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./item-status.component');
+  }
+
+}

src/app/shared/context-help-wrapper/context-help-wrapper.component.html

@@ -2,7 +2,7 @@
     <div class="preserve-line-breaks ds-context-help-content">
         <ng-container *ngFor="let elem of (parsedContent$ | async)">
             <ng-container *ngIf="elem.href">
-                <a href="{{elem.href}}" target="_blank">{{elem.text}}</a>
+                <a href="{{elem.href}}" target="_blank" rel="noopener noreferrer">{{elem.text}}</a>
             </ng-container>
             <ng-container *ngIf="elem.href === undefined">
                 {{ elem }}

src/app/shared/search/search-filters/search-filter/search-filter.component.html

@@ -3,7 +3,7 @@
   <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
           class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
           [attr.aria-expanded]="false"
-          [attr.aria-label]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate"
+          [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
           [attr.data-test]="'filter-toggle' | dsBrowserOnly"
   >
     <h5 class="d-inline-block mb-0">

src/app/shared/starts-with/date/starts-with-date.component.ts

@@ -131,7 +131,6 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
     } else {
       this.startsWithYear = +startsWith;
     }
-    this.setStartsWithParam(false);
   }
 
   /**

src/app/shared/starts-with/starts-with-abstract.component.ts

@@ -70,7 +70,6 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
    */
   setStartsWith(startsWith: string) {
     this.startsWith = startsWith;
-    this.setStartsWithParam(false);
   }
 
   /**