hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into metadata-and-relationships-combined-in-submission

Browse Source
This commit is contained in:
Art Lowel
2020-02-24 11:42:55 +01:00
parent c98a4a1c3f 92ee38c9ff
commit 9d059e190e
125 changed files with 2667 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/submission/objects/submission-objects.actions.ts
View File

@@ -798,4 +798,5 @@ export type SubmissionObjectAction = DisableSectionAction
| SaveSubmissionSectionFormAction
| SaveSubmissionSectionFormSuccessAction
| SaveSubmissionSectionFormErrorAction
| SetActiveSectionAction;
| SetActiveSectionAction
| DepositSubmissionAction;

7
src/app/submission/objects/submission-objects.reducer.spec.ts
View File

@@ -22,14 +22,13 @@ import {
SaveAndDepositSubmissionAction,
SaveForLaterSubmissionFormAction,
SaveForLaterSubmissionFormErrorAction,
SaveForLaterSubmissionFormSuccessAction,
SaveSubmissionFormAction,
SaveSubmissionFormErrorAction,
SaveSubmissionFormSuccessAction,
SaveSubmissionSectionFormAction,
SaveSubmissionSectionFormErrorAction,
SaveSubmissionSectionFormSuccessAction,
SectionStatusChangeAction,
SectionStatusChangeAction, SubmissionObjectAction,
UpdateSectionDataAction
} from './submission-objects.actions';
import { SectionsType } from '../sections/sections-type';
@@ -117,7 +116,7 @@ describe('submissionReducer test suite', () => {
});
it('should set to true savePendig flag on save', () => {
let action = new SaveSubmissionFormAction(submissionId);
let action: SubmissionObjectAction = new SaveSubmissionFormAction(submissionId);
let newState = submissionObjectReducer(initState, action);
expect(newState[826].savePending).toBeTruthy();
@@ -273,7 +272,7 @@ describe('submissionReducer test suite', () => {
it('should enable submission section properly', () => {
let action = new EnableSectionAction(submissionId, 'traditionalpagetwo');
let action: SubmissionObjectAction = new EnableSectionAction(submissionId, 'traditionalpagetwo');
let newState = submissionObjectReducer(initState, action);
action = new DisableSectionAction(submissionId, 'traditionalpagetwo');

2
src/app/submission/objects/submission-objects.reducer.ts
View File

@@ -548,7 +548,7 @@ function startDeposit(state: SubmissionObjectState, action: DepositSubmissionAct
* @return SubmissionObjectState
* the new state, with the deposit flag changed.
*/
function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSuccessAction | DepositSubmissionErrorAction): SubmissionObjectState {
function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSuccessAction | DepositSubmissionErrorAction | DepositSubmissionAction): SubmissionObjectState {
if (hasValue(state[ action.payload.submissionId ])) {
return Object.assign({}, state, {
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {