Merge branch 'dspace-cris-7' into alignment-with-7.3

# Conflicts:
#	src/app/collection-page/collection-page-routing.module.ts
#	src/app/core/auth/auth-request.service.ts
#	src/app/core/auth/auth.service.ts
#	src/app/core/metadata/metadata.service.ts
#	src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.spec.ts
#	src/app/profile-page/profile-page.component.ts
#	src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
#	src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
#	src/app/shared/search/search-filters/search-filters.component.spec.ts
#	src/app/shared/search/search-filters/search-filters.component.ts
#	src/app/shared/search/search.component.spec.ts
#	src/app/submission/sections/accesses/section-accesses.component.spec.ts
#	src/app/submission/sections/accesses/section-accesses.component.ts
#	src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
#	src/assets/i18n/en.json5

Author: atarix83

angular.json

@@ -282,6 +282,10 @@
   "defaultProject": "dspace-angular",
   "cli": {
     "analytics": false,
-    "defaultCollection": "@angular-eslint/schematics"
+    "defaultCollection": "@angular-eslint/schematics",
+    "cache": {
+      "enabled": true,
+      "environment": "local"
+    }
   }
 }

package.json

@@ -1,12 +1,12 @@
 {
   "name": "dspace-angular",
-  "version": "2021.01.02-SNAPSHOT",
+  "version": "2022.01.03-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
     "test:rest": "ts-node --project ./tsconfig.ts-node.json scripts/test-rest.ts",
     "start": "yarn run start:prod",
-    "start:dev": "nodemon --exec \"cross-env NODE_ENV=development yarn run serve\"",
+    "start:dev": "ng config cli.cache.environment local && nodemon --exec \"cross-env NODE_ENV=development yarn run serve\"",
     "start:prod": "yarn run build:prod && cross-env NODE_ENV=production yarn run serve:ssr",
     "start:mirador:prod": "yarn run build:mirador && yarn run start:prod",
     "preserve": "yarn base-href",
@@ -15,6 +15,7 @@
     "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
     "build": "ng build --configuration development",
     "build:stats": "ng build --stats-json",
+    "build:ci": "ng config cli.cache.environment ci && yarn run build:ssr",
     "build:prod": "yarn run build:ssr",
     "build:ssr": "npm run ng-high-memory -- build --configuration production && ng run dspace-angular:server:production",
     "ng-high-memory": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng",

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

@@ -21,6 +21,7 @@ import { CollectionPageAdministratorGuard } from './collection-page-administrato
 import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { EditCollectionResolver } from '../core/shared/resolvers/edit-collection.resolver';
 
 @NgModule({
   imports: [
@@ -39,6 +40,9 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
         runGuardsAndResolvers: 'always',
         children: [
           {
+            resolve: {
+              dso: EditCollectionResolver,
+            },
             path: COLLECTION_EDIT_PATH,
             loadChildren: () => import('./edit-collection-page/edit-collection-page.module')
               .then((m) => m.EditCollectionPageModule),
@@ -90,7 +94,8 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
     DSOBreadcrumbsService,
     LinkService,
     CreateCollectionPageGuard,
-    CollectionPageAdministratorGuard
+    CollectionPageAdministratorGuard,
+    EditCollectionResolver
   ]
 })
 export class CollectionPageRoutingModule {

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

@@ -16,6 +16,7 @@ import { CollectionFormModule } from './collection-form/collection-form.module';
 import { ContextMenuModule } from '../shared/context-menu/context-menu.module';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 import { ComcolModule } from '../shared/comcol/comcol.module';
+import { EditCollectionResolver } from './../core/shared/resolvers/edit-collection.resolver';
 
 @NgModule({
   imports: [
@@ -38,6 +39,7 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
   ],
   providers: [
     SearchService,
+    EditCollectionResolver
   ]
 })
 export class CollectionPageModule {

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

@@ -10,6 +10,7 @@ import { CommunityAuthorizationsComponent } from './community-authorizations/com
 import { CommunityFormModule } from '../community-form/community-form.module';
 import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { DataService } from '../../core/data/data.service';
 
 /**
  * Module that contains all components related to the Edit Community page administrator functionality

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

@@ -11,6 +11,7 @@ import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/cr
 import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
 import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
 import { CommunityAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/community-administrator.guard';
+import { EditCommunityResolver } from './../../core/shared/resolvers/edit-community.resolver';
 
 /**
  * Routing module that handles the routing for the Edit Community page administrator functionality
@@ -21,7 +22,8 @@ import { CommunityAdministratorGuard } from '../../core/data/feature-authorizati
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
+          dso: EditCommunityResolver
         },
         data: { breadcrumbKey: 'community.edit' },
         component: EditCommunityPageComponent,
@@ -89,7 +91,8 @@ import { CommunityAdministratorGuard } from '../../core/data/feature-authorizati
   ],
   providers: [
     ResourcePolicyResolver,
-    ResourcePolicyTargetResolver
+    ResourcePolicyTargetResolver,
+    EditCommunityResolver
   ]
 })
 export class EditCommunityPageRoutingModule {

src/app/core/auth/auth-request.service.ts

@@ -2,8 +2,8 @@ import { Observable } from 'rxjs';
 import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
-import { isNotEmpty } from '../../shared/empty.util';
-import { GetRequest, PostRequest, } from '../data/request.models';
+import { isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import { DeleteRequest, GetRequest, PostRequest } from '../data/request.models';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -13,13 +13,17 @@ import { ShortLivedToken } from './models/short-lived-token.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { RestRequest } from '../data/rest-request.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { MachineToken } from './models/machine-token.model';
+import { NoContent } from '../shared/NoContent.model';
+import { sendRequest } from '../shared/request.operators';
 
 /**
  * Abstract service to send authentication requests
  */
 export abstract class AuthRequestService {
   protected linkName = 'authn';
   protected shortlivedtokensEndpoint = 'shortlivedtokens';
+  protected machinetokenEndpoint = 'machinetokens';
 
   constructor(protected halService: HALEndpointService,
               protected requestService: RequestService,
@@ -97,4 +101,32 @@ export abstract class AuthRequestService {
       })
     );
   }
+
+  /**
+   * Send a post request to create a machine token
+   */
+  public postToMachineTokenEndpoint(): Observable<RemoteData<MachineToken>> {
+    return this.halService.getEndpoint(this.linkName).pipe(
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      map((href: string) => new URLCombiner(href, this.machinetokenEndpoint).toString()),
+      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL)),
+      tap((request: RestRequest) => this.requestService.send(request)),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<MachineToken>(request.uuid))
+    );
+  }
+
+  /**
+   * Send a delete request to destroy a machine token
+   */
+  public deleteToMachineTokenEndpoint(): Observable<RemoteData<NoContent>> {
+    return this.halService.getEndpoint(this.linkName).pipe(
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      map((href: string) => new URLCombiner(href, this.machinetokenEndpoint).toString()),
+      map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)),
+      sendRequest(this.requestService),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<MachineToken>(request.uuid)),
+    );
+  }
 }

src/app/core/auth/auth.service.ts

@@ -48,6 +48,8 @@ import { Group } from '../eperson/models/group.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { PageInfo } from '../shared/page-info.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
+import { MachineToken } from './models/machine-token.model';
+import { NoContent } from '../shared/NoContent.model';
 
 export const LOGIN_ROUTE = '/login';
 export const LOGOUT_ROUTE = '/logout';
@@ -604,4 +606,18 @@ export class AuthService {
     }
   }
 
+  /**
+   * Create a new machine token for the current user
+   */
+  public createMachineToken(): Observable<RemoteData<MachineToken>> {
+    return this.authRequestService.postToMachineTokenEndpoint();
+  }
+
+  /**
+   * Delete the machine token for the current user
+   */
+  public deleteMachineToken(): Observable<RemoteData<NoContent>> {
+    return this.authRequestService.deleteToMachineTokenEndpoint();
+  }
+
 }

src/app/core/auth/models/machine-token.model.ts

@@ -0,0 +1,36 @@
+import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/object-cache.reducer';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ResourceType } from '../../shared/resource-type';
+import { HALLink } from '../../shared/hal-link.model';
+import { MACHINE_TOKEN } from './machine-token.resource-type';
+
+/**
+ * A machine token that can be used to authenticate a rest request
+ */
+@typedObject
+export class MachineToken implements CacheableObject {
+  static type = MACHINE_TOKEN;
+  /**
+   * The type for this MachineToken
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The value for this MachineToken
+   */
+  @autoserializeAs('token')
+  value: string;
+
+  /**
+   * The {@link HALLink}s for this MachineToken
+   */
+  @deserialize
+  _links: {
+    self: HALLink;
+  };
+}

src/app/core/auth/models/machine-token.resource-type.ts

@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for MachineToken
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const MACHINE_TOKEN = new ResourceType('machinetoken');