Merge branch 'main' into w2p-72699_Hard-redirect-after-log-in

Conflicts:
	src/app/app-routing.module.ts
	src/app/shared/log-in/log-in.component.ts

.github/workflows/label_merge_conflicts.yml

@@ -0,0 +1,25 @@
+# This workflow checks open PRs for merge conflicts and labels them when conflicts are found
+name: Check for merge conflicts
+
+# Run whenever the "main" branch is updated
+# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      # See: https://github.com/mschilde/auto-label-merge-conflicts/
+      - name: Auto-label PRs with merge conflicts
+        uses: mschilde/auto-label-merge-conflicts@v2.0
+        # Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
+        # Note, the authentication token is created automatically
+        # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
+        with:
+          CONFLICT_LABEL_NAME: 'merge conflict'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # Ignore errors
+        continue-on-error: true

src/app/+admin/admin-access-control/admin-access-control-routing-paths.ts

@@ -0,0 +1,8 @@
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { getAccessControlModuleRoute } from '../admin-routing-paths';
+
+export const GROUP_EDIT_PATH = 'groups';
+
+export function getGroupEditRoute(id: string) {
+  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
+}

src/app/+admin/admin-access-control/admin-access-control-routing.module.ts

@@ -3,14 +3,7 @@ import { RouterModule } from '@angular/router';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { getAccessControlModulePath } from '../admin-routing.module';
-
-export const GROUP_EDIT_PATH = 'groups';
-
-export function getGroupEditPath(id: string) {
-  return new URLCombiner(getAccessControlModulePath(), GROUP_EDIT_PATH, id).toString();
-}
+import { GROUP_EDIT_PATH } from './admin-access-control-routing-paths';
 
 @NgModule({
   imports: [

src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html

@@ -7,87 +7,88 @@ <h2 id="header" class="border-bottom pb-2">{{labelPrefix + 'head' | translate}}<
       <ds-eperson-form *ngIf="isEPersonFormShown" (submitForm)="forceUpdateEPeople()"
                        (cancelForm)="isEPersonFormShown = false"></ds-eperson-form>
 
-      <div *ngIf="!isEPersonFormShown" class="button-row top d-flex pb-2">
-        <button class="mr-auto btn btn-success addEPerson-button"
-                (click)="isEPersonFormShown = true">
-          <i class="fas fa-plus"></i>
-          <span class="d-none d-sm-inline">{{labelPrefix + 'button.add' | translate}}</span>
-        </button>
-      </div>
-
-      <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
-        <button (click)="clearFormAndResetResult();"
-                class="btn btn-primary float-right">{{labelPrefix + 'button.see-all' | translate}}</button>
-      </h3>
-      <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="row">
-        <div class="col-12 col-sm-3">
-          <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
-            <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
-            <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
-          </select>
+      <div *ngIf="!isEPersonFormShown">
+        <div class="button-row top d-flex pb-2">
+          <button class="mr-auto btn btn-success addEPerson-button"
+                  (click)="isEPersonFormShown = true">
+            <i class="fas fa-plus"></i>
+            <span class="d-none d-sm-inline">{{labelPrefix + 'button.add' | translate}}</span>
+          </button>
         </div>
-        <div class="col-sm-9 col-12">
-          <div class="form-group input-group">
-            <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" aria-label="Search input">
-            <span class="input-group-append">
-            <button type="submit"
-                    class="search-button btn btn-secondary">{{ labelPrefix + 'search.button' | translate }}</button>
-        </span>
+
+        <h3 id="search" class="border-bottom pb-2">{{labelPrefix + 'search.head' | translate}}
+          <button (click)="clearFormAndResetResult();"
+                  class="btn btn-primary float-right">{{labelPrefix + 'button.see-all' | translate}}</button>
+        </h3>
+        <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="row">
+          <div class="col-12 col-sm-3">
+            <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+              <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
+              <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
+            </select>
           </div>
-        </div>
-      </form>
+          <div class="col-sm-9 col-12">
+            <div class="form-group input-group">
+              <input type="text" name="query" id="query" formControlName="query"
+                    class="form-control" aria-label="Search input">
+              <span class="input-group-append">
+              <button type="submit"
+                      class="search-button btn btn-secondary">{{ labelPrefix + 'search.button' | translate }}</button>
+          </span>
+            </div>
+          </div>
+        </form>
 
-      <ds-pagination
-        *ngIf="(ePeople | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(ePeople | async)?.payload"
-        [collectionSize]="(ePeople | async)?.payload?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
+        <ds-pagination
+          *ngIf="(ePeople | async)?.payload?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="(ePeople | async)?.payload"
+          [collectionSize]="(ePeople | async)?.payload?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true"
+          (pageChange)="onPageChange($event)">
 
-        <div class="table-responsive">
-          <table id="epeople" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
-              <th>{{labelPrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let eperson of (ePeople | async)?.payload?.page"
-                [ngClass]="{'table-primary' : isActive(eperson) | async}">
-              <td>{{eperson.id}}</td>
-              <td>{{eperson.name}}</td>
-              <td>{{eperson.email}}</td>
-              <td>
-                <div class="btn-group edit-field">
-                  <button (click)="toggleEditEPerson(eperson)"
-                          class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.edit' | translate: {name: eperson.name} }}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button (click)="deleteEPerson(eperson)"
-                          class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: eperson.name} }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
+          <div class="table-responsive">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
+                <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
+                <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
+                <th>{{labelPrefix + 'table.edit' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr *ngFor="let eperson of (ePeople | async)?.payload?.page"
+                  [ngClass]="{'table-primary' : isActive(eperson) | async}">
+                <td>{{eperson.id}}</td>
+                <td>{{eperson.name}}</td>
+                <td>{{eperson.email}}</td>
+                <td>
+                  <div class="btn-group edit-field">
+                    <button (click)="toggleEditEPerson(eperson)"
+                            class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
+                            title="{{labelPrefix + 'table.edit.buttons.edit' | translate: {name: eperson.name} }}">
+                      <i class="fas fa-edit fa-fw"></i>
+                    </button>
+                    <button (click)="deleteEPerson(eperson)"
+                            class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
+                            title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: eperson.name} }}">
+                      <i class="fas fa-trash-alt fa-fw"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
 
-      </ds-pagination>
+        </ds-pagination>
 
-      <div *ngIf="(ePeople | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{labelPrefix + 'no-items' | translate}}
+        <div *ngIf="(ePeople | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+          {{labelPrefix + 'no-items' | translate}}
+        </div>
       </div>
-
     </div>
   </div>
 </div>

src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts

@@ -175,14 +175,18 @@ describe('EPeopleRegistryComponent', () => {
       it('editEPerson form is toggled', () => {
         const ePeopleIds = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
         ePersonDataServiceStub.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-          if (activeEPerson === ePeopleIds[0].nativeElement.textContent) {
+          if (ePeopleIds[0] && activeEPerson === ePeopleIds[0].nativeElement.textContent) {
             expect(component.isEPersonFormShown).toEqual(false);
           } else {
             expect(component.isEPersonFormShown).toEqual(true);
           }
 
         })
       });
+
+      it('EPerson search section is hidden', () => {
+        expect(fixture.debugElement.query(By.css('#search'))).toBeNull();
+      });
     });
   });
 

src/app/+admin/admin-registries/admin-registries-routing-paths.ts

@@ -0,0 +1,8 @@
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { getRegistriesModuleRoute } from '../admin-routing-paths';
+
+export const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
+
+export function getBitstreamFormatsModuleRoute() {
+  return new URLCombiner(getRegistriesModuleRoute(), BITSTREAMFORMATS_MODULE_PATH).toString();
+}

src/app/+admin/admin-registries/admin-registries-routing.module.ts

@@ -2,15 +2,8 @@ import { MetadataRegistryComponent } from './metadata-registry/metadata-registry
 import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { getRegistriesModulePath } from '../admin-routing.module';
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-
-const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
-
-export function getBitstreamFormatsModulePath() {
-  return new URLCombiner(getRegistriesModulePath(), BITSTREAMFORMATS_MODULE_PATH).toString();
-}
+import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
 
 @NgModule({
   imports: [

src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts

@@ -5,8 +5,8 @@ import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RestResponse } from '../../../../core/cache/response.models';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * This component renders the page to create a new bitstream format.
@@ -37,7 +37,7 @@ export class AddBitstreamFormatComponent {
         if (response.isSuccessful) {
           this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.create.success.head'),
             this.translateService.get('admin.registries.bitstream-formats.create.success.content'));
-          this.router.navigate([getBitstreamFormatsModulePath()]);
+          this.router.navigate([getBitstreamFormatsModuleRoute()]);
           this.bitstreamFormatDataService.clearBitStreamFormatRequests().subscribe();
         } else {
           this.notificationService.error(this.translateService.get('admin.registries.bitstream-formats.create.failure.head'),

src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts

@@ -7,8 +7,8 @@ import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model'
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RestResponse } from '../../../../core/cache/response.models';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * This component renders the edit page of a bitstream format.
@@ -51,7 +51,7 @@ export class EditBitstreamFormatComponent implements OnInit {
         if (response.isSuccessful) {
           this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.edit.success.head'),
             this.translateService.get('admin.registries.bitstream-formats.edit.success.content'));
-          this.router.navigate([getBitstreamFormatsModulePath()]);
+          this.router.navigate([getBitstreamFormatsModuleRoute()]);
         } else {
           this.notificationService.error('admin.registries.bitstream-formats.edit.failure.head',
             'admin.registries.bitstream-formats.create.edit.content');

src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.ts

@@ -12,9 +12,9 @@ import {
   DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
 import { Router } from '@angular/router';
-import { getBitstreamFormatsModulePath } from '../../admin-registries-routing.module';
 import { hasValue, isEmpty } from '../../../../shared/empty.util';
 import { TranslateService } from '@ngx-translate/core';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * The component responsible for rendering the form to create/edit a bitstream format
@@ -189,6 +189,6 @@ export class FormatFormComponent implements OnInit {
    * Cancels the edit/create action of the bitstream format and navigates back to the bitstream format registry
    */
   onCancel() {
-    this.router.navigate([getBitstreamFormatsModulePath()]);
+    this.router.navigate([getBitstreamFormatsModuleRoute()]);
   }
 }

src/app/+admin/admin-routing-paths.ts

@@ -0,0 +1,13 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { getAdminModuleRoute } from '../app-routing-paths';
+
+export const REGISTRIES_MODULE_PATH = 'registries';
+export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
+
+export function getRegistriesModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), REGISTRIES_MODULE_PATH).toString();
+}
+
+export function getAccessControlModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), ACCESS_CONTROL_MODULE_PATH).toString();
+}

src/app/+admin/admin-routing.module.ts

@@ -1,24 +1,12 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { getAdminModulePath } from '../app-routing.module';
 import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
 import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-
-const REGISTRIES_MODULE_PATH = 'registries';
-export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
-
-export function getRegistriesModulePath() {
-  return new URLCombiner(getAdminModulePath(), REGISTRIES_MODULE_PATH).toString();
-}
-
-export function getAccessControlModulePath() {
-  return new URLCombiner(getAdminModulePath(), ACCESS_CONTROL_MODULE_PATH).toString();
-}
+import { ACCESS_CONTROL_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
 
 @NgModule({
   imports: [

src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts

@@ -12,7 +12,7 @@ import { CollectionSearchResult } from '../../../../../shared/object-collection/
 import { Collection } from '../../../../../core/shared/collection.model';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
+import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
 
 describe('CollectionAdminSearchResultGridElementComponent', () => {
   let component: CollectionAdminSearchResultGridElementComponent;
@@ -61,6 +61,6 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
   it('should render an edit button with the correct link', () => {
     const a = fixture.debugElement.query(By.css('a.edit-link'));
     const link = a.nativeElement.href;
-    expect(link).toContain(getCollectionEditPath(id));
+    expect(link).toContain(getCollectionEditRoute(id));
   })
 });

src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts

@@ -4,8 +4,8 @@ import { listableObjectComponent } from '../../../../../shared/object-collection
 import { Context } from '../../../../../core/shared/context.model';
 import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
 import { Collection } from '../../../../../core/shared/collection.model';
-import { getCollectionEditPath } from '../../../../../+collection-page/collection-page-routing.module';
 import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+import { getCollectionEditRoute } from '../../../../../+collection-page/collection-page-routing-paths';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
@@ -21,6 +21,6 @@ export class CollectionAdminSearchResultGridElementComponent extends SearchResul
 
   ngOnInit() {
     super.ngOnInit();
-    this.editPath = getCollectionEditPath(this.dso.uuid);
+    this.editPath = getCollectionEditRoute(this.dso.uuid);
   }
 }