mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-18 07:23:03 +00:00
Merge remote-tracking branch 'origin/main' into upgrade_angular10
# Conflicts: # src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts # src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts # src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts # src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts # src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts # src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts # src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts # src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts # src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts # src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts # src/app/+admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.spec.ts # src/app/+admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts # src/app/+bitstream-page/bitstream-page.resolver.ts # src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts # src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts # src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts # src/app/+collection-page/collection-page.component.ts # src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts # src/app/+collection-page/edit-item-template-page/item-template-page.resolver.spec.ts # src/app/+collection-page/edit-item-template-page/item-template-page.resolver.ts # src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts # src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts # src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts # src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts # src/app/+item-page/edit-item-page/item-private/item-private.component.ts # src/app/+item-page/edit-item-page/item-public/item-public.component.ts # src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts # src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts # src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts # src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts # src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts # src/app/+my-dspace-page/collection-selector/collection-selector.component.spec.ts # src/app/+search-page/search-tracker.component.ts # src/app/app-routing.module.ts # src/app/community-list-page/community-list-service.ts # src/app/community-list-page/community-list.reducer.spec.ts # src/app/core/auth/auth-response-parsing.service.spec.ts # src/app/core/auth/auth.interceptor.spec.ts # src/app/core/browse/browse.service.spec.ts # src/app/core/browse/browse.service.ts # src/app/core/cache/builders/link.service.spec.ts # src/app/core/cache/builders/remote-data-build.service.ts # src/app/core/cache/object-cache.service.spec.ts # src/app/core/cache/response.models.ts # src/app/core/data/base-response-parsing.service.ts # src/app/core/data/bitstream-data.service.ts # src/app/core/data/bitstream-format-data.service.ts # src/app/core/data/bundle-data.service.spec.ts # src/app/core/data/bundle-data.service.ts # src/app/core/data/change-analyzer.ts # src/app/core/data/collection-data.service.spec.ts # src/app/core/data/collection-data.service.ts # src/app/core/data/comcol-data.service.spec.ts # src/app/core/data/comcol-data.service.ts # src/app/core/data/data.service.ts # src/app/core/data/entity-type-data.service.ts # src/app/core/data/entity-type.service.ts # src/app/core/data/feature-authorization/authorization-data.service.ts # src/app/core/data/feature-authorization/feature-data.service.ts # src/app/core/data/item-template-data.service.ts # src/app/core/data/license-data.service.ts # src/app/core/data/metadata-field-data.service.ts # src/app/core/data/processes/process-data.service.ts # src/app/core/data/processes/script-data.service.ts # src/app/core/data/relationship.service.spec.ts # src/app/core/data/relationship.service.ts # src/app/core/data/remote-data.ts # src/app/core/data/request.actions.ts # src/app/core/data/request.effects.ts # src/app/core/data/request.reducer.spec.ts # src/app/core/data/request.reducer.ts # src/app/core/data/request.service.spec.ts # src/app/core/data/request.service.ts # src/app/core/dspace-rest/dspace-rest.service.spec.ts # src/app/core/eperson/eperson-data.service.spec.ts # src/app/core/eperson/eperson-data.service.ts # src/app/core/eperson/group-data.service.spec.ts # src/app/core/eperson/group-data.service.ts # src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts # src/app/core/index/index.reducer.ts # src/app/core/json-patch/json-patch-operations.service.spec.ts # src/app/core/json-patch/json-patch-operations.service.ts # src/app/core/locale/locale.interceptor.spec.ts # src/app/core/registry/registry.service.ts # src/app/core/resource-policy/resource-policy.service.ts # src/app/core/shared/operators.ts # src/app/core/shared/search/search.service.ts # src/app/core/submission/submission-object-data.service.ts # src/app/core/submission/submission-rest.service.ts # src/app/core/submission/vocabularies/vocabulary-entries-response-parsing.service.spec.ts # src/app/core/submission/vocabularies/vocabulary.service.spec.ts # src/app/core/submission/vocabularies/vocabulary.service.ts # src/app/core/submission/workflowitem-data.service.ts # src/app/core/tasks/tasks.service.ts # src/app/curation-form/curation-form.component.ts # src/app/process-page/process-page.resolver.ts # src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts # src/app/shared/collection-dropdown/collection-dropdown.component.ts # src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts # src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts # src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts # src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts # src/app/shared/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts # src/app/shared/dso-selector/dso-selector/dso-selector.component.ts # src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts # src/app/shared/form/builder/form-builder.service.ts # src/app/shared/item/item-versions/item-versions.component.ts # src/app/shared/mocks/remote-data-build.service.mock.ts # src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts # src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts # src/app/shared/object-select/collection-select/collection-select.component.spec.ts # src/app/shared/object-select/item-select/item-select.component.spec.ts # src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts # src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts # src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts # src/app/shared/search/search-query-response.model.ts # src/app/statistics/statistics.module.ts # src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts # src/app/submission/sections/form/section-form.component.ts # src/app/submission/sections/upload/section-upload.component.spec.ts # src/app/submission/sections/upload/section-upload.component.ts # src/app/submission/submission.service.spec.ts # src/app/submission/submission.service.ts
This commit is contained in:
Giuseppe Digilio
@@ -1,7 +1,8 @@
|
||||
import { Action } from '@ngrx/store';
|
||||
import { type } from '../../shared/ngrx/type';
|
||||
import { RestRequest } from './request.models';
|
||||
import { RestResponse } from '../cache/response.models';
|
||||
import { HALLink } from '../shared/hal-link.model';
|
||||
import { UnCacheableObject } from '../shared/uncacheable-object.model';
|
||||
|
||||
/**
|
||||
* The list of RequestAction type definitions
|
||||
@@ -9,24 +10,36 @@ import { RestResponse } from '../cache/response.models';
|
||||
export const RequestActionTypes = {
|
||||
CONFIGURE: type('dspace/core/data/request/CONFIGURE'),
|
||||
EXECUTE: type('dspace/core/data/request/EXECUTE'),
|
||||
COMPLETE: type('dspace/core/data/request/COMPLETE'),
|
||||
SUCCESS: type('dspace/core/data/request/SUCCESS'),
|
||||
ERROR: type('dspace/core/data/request/ERROR'),
|
||||
STALE: type('dspace/core/data/request/STALE'),
|
||||
RESET_TIMESTAMPS: type('dspace/core/data/request/RESET_TIMESTAMPS'),
|
||||
REMOVE: type('dspace/core/data/request/REMOVE')
|
||||
};
|
||||
|
||||
/* tslint:disable:max-classes-per-file */
|
||||
export class RequestConfigureAction implements Action {
|
||||
export abstract class RequestUpdateAction implements Action {
|
||||
abstract type: string;
|
||||
lastUpdated: number;
|
||||
|
||||
constructor() {
|
||||
this.lastUpdated = new Date().getTime();
|
||||
}
|
||||
}
|
||||
|
||||
export class RequestConfigureAction extends RequestUpdateAction {
|
||||
type = RequestActionTypes.CONFIGURE;
|
||||
payload: RestRequest;
|
||||
|
||||
constructor(
|
||||
request: RestRequest
|
||||
) {
|
||||
super();
|
||||
this.payload = request;
|
||||
}
|
||||
}
|
||||
|
||||
export class RequestExecuteAction implements Action {
|
||||
export class RequestExecuteAction extends RequestUpdateAction {
|
||||
type = RequestActionTypes.EXECUTE;
|
||||
payload: string;
|
||||
|
||||
@@ -37,36 +50,107 @@ export class RequestExecuteAction implements Action {
|
||||
* the request's uuid
|
||||
*/
|
||||
constructor(uuid: string) {
|
||||
super();
|
||||
this.payload = uuid;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An ngrx action to indicate a response was returned
|
||||
* An ngrx action to indicate a successful response was returned
|
||||
*/
|
||||
export class RequestCompleteAction implements Action {
|
||||
type = RequestActionTypes.COMPLETE;
|
||||
export class RequestSuccessAction extends RequestUpdateAction {
|
||||
type = RequestActionTypes.SUCCESS;
|
||||
payload: {
|
||||
uuid: string,
|
||||
response: RestResponse
|
||||
timeCompleted: number,
|
||||
statusCode: number,
|
||||
link?: HALLink,
|
||||
unCacheableObject?: UnCacheableObject
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a new RequestCompleteAction
|
||||
* Create a new RequestSuccessAction
|
||||
*
|
||||
* @param uuid
|
||||
* the request's uuid
|
||||
* @param statusCode
|
||||
* the statusCode of the response
|
||||
* @param link
|
||||
* the HALlink to the object that was returned, and has been cached
|
||||
* @param unCacheableObject
|
||||
* in case the REST API returns an object that can't be cached, because it doesn't have a self
|
||||
* link, provide it here
|
||||
*/
|
||||
constructor(uuid: string, response: RestResponse) {
|
||||
constructor(uuid: string, statusCode: number, link?: HALLink, unCacheableObject?: UnCacheableObject) {
|
||||
super();
|
||||
this.payload = {
|
||||
uuid,
|
||||
response
|
||||
timeCompleted: new Date().getTime(),
|
||||
statusCode,
|
||||
link,
|
||||
unCacheableObject
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An ngrx action to reset the timeAdded property of all responses in the cached objects
|
||||
* An ngrx action to indicate an error response was returned
|
||||
*/
|
||||
export class RequestErrorAction extends RequestUpdateAction {
|
||||
type = RequestActionTypes.ERROR;
|
||||
payload: {
|
||||
uuid: string,
|
||||
timeCompleted: number,
|
||||
statusCode: number,
|
||||
errorMessage: string
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a new RequestErrorAction
|
||||
*
|
||||
* @param uuid
|
||||
* the request's uuid
|
||||
* @param statusCode
|
||||
* the statusCode of the response
|
||||
* @param errorMessage
|
||||
* the error message in the response
|
||||
*/
|
||||
constructor(uuid: string, statusCode: number, errorMessage: string) {
|
||||
super();
|
||||
this.payload = {
|
||||
uuid,
|
||||
timeCompleted: new Date().getTime(),
|
||||
statusCode,
|
||||
errorMessage
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An ngrx action to indicate the response to this request is stale
|
||||
*/
|
||||
export class RequestStaleAction extends RequestUpdateAction {
|
||||
type = RequestActionTypes.STALE;
|
||||
payload: {
|
||||
uuid: string,
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a new RequestStaleAction
|
||||
*
|
||||
* @param uuid
|
||||
* the request's uuid
|
||||
*/
|
||||
constructor(uuid: string) {
|
||||
super();
|
||||
this.payload = {
|
||||
uuid,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* An ngrx action to reset the timeCompleted property of all responses in the cached objects
|
||||
*/
|
||||
export class ResetResponseTimestampsAction implements Action {
|
||||
type = RequestActionTypes.RESET_TIMESTAMPS;
|
||||
@@ -76,7 +160,7 @@ export class ResetResponseTimestampsAction implements Action {
|
||||
* Create a new ResetResponseTimestampsAction
|
||||
*
|
||||
* @param newTimestamp
|
||||
* the new timeAdded all objects should get
|
||||
* the new timeCompleted all objects should get
|
||||
*/
|
||||
constructor(newTimestamp: number) {
|
||||
this.payload = newTimestamp;
|
||||
@@ -109,6 +193,8 @@ export class RequestRemoveAction implements Action {
|
||||
export type RequestAction
|
||||
= RequestConfigureAction
|
||||
| RequestExecuteAction
|
||||
| RequestCompleteAction
|
||||
| RequestSuccessAction
|
||||
| RequestErrorAction
|
||||
| RequestStaleAction
|
||||
| ResetResponseTimestampsAction
|
||||
| RequestRemoveAction;
|
||||
|
||||
Reference in New Issue
Block a user