mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-18 15:33:04 +00:00
Removed edit item from submission
This commit is contained in:
@@ -1,4 +0,0 @@
|
|||||||
import { Workspaceitem } from './workspaceitem.model';
|
|
||||||
|
|
||||||
export class EditItem extends Workspaceitem {
|
|
||||||
}
|
|
@@ -1,10 +0,0 @@
|
|||||||
import { inheritSerialization } from 'cerialize';
|
|
||||||
import { mapsTo } from '../../cache/builders/build-decorators';
|
|
||||||
import { NormalizedSubmissionObject } from './normalized-submission-object.model';
|
|
||||||
import { EditItem } from './edititem.model';
|
|
||||||
|
|
||||||
@mapsTo(EditItem)
|
|
||||||
@inheritSerialization(NormalizedSubmissionObject)
|
|
||||||
export class NormalizedEditItem extends NormalizedSubmissionObject<EditItem> {
|
|
||||||
|
|
||||||
}
|
|
@@ -11,7 +11,6 @@ export enum SubmissionResourceType {
|
|||||||
Group = 'group',
|
Group = 'group',
|
||||||
WorkspaceItem = 'workspaceitem',
|
WorkspaceItem = 'workspaceitem',
|
||||||
WorkflowItem = 'workflowitem',
|
WorkflowItem = 'workflowitem',
|
||||||
EditItem = 'edititem',
|
|
||||||
SubmissionDefinitions = 'submissiondefinitions',
|
SubmissionDefinitions = 'submissiondefinitions',
|
||||||
SubmissionDefinition = 'submissiondefinition',
|
SubmissionDefinition = 'submissiondefinition',
|
||||||
SubmissionForm = 'submissionform',
|
SubmissionForm = 'submissionform',
|
||||||
|
@@ -13,7 +13,6 @@ import { ObjectCacheService } from '../cache/object-cache.service';
|
|||||||
import { SubmissionResourceType } from './submission-resource-type';
|
import { SubmissionResourceType } from './submission-resource-type';
|
||||||
import { NormalizedWorkspaceItem } from './models/normalized-workspaceitem.model';
|
import { NormalizedWorkspaceItem } from './models/normalized-workspaceitem.model';
|
||||||
import { NormalizedWorkflowItem } from './models/normalized-workflowitem.model';
|
import { NormalizedWorkflowItem } from './models/normalized-workflowitem.model';
|
||||||
import { NormalizedEditItem } from './models/normalized-edititem.model';
|
|
||||||
import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
|
import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
|
||||||
import { SubmissionObject } from './models/submission-object.model';
|
import { SubmissionObject } from './models/submission-object.model';
|
||||||
import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
|
import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
|
||||||
@@ -127,8 +126,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
|
|||||||
let normalizedItem = Object.assign({}, item);
|
let normalizedItem = Object.assign({}, item);
|
||||||
// In case data is an Instance of NormalizedWorkspaceItem normalize field value of all the section of type form
|
// In case data is an Instance of NormalizedWorkspaceItem normalize field value of all the section of type form
|
||||||
if (item instanceof NormalizedWorkspaceItem
|
if (item instanceof NormalizedWorkspaceItem
|
||||||
|| item instanceof NormalizedWorkflowItem
|
|| item instanceof NormalizedWorkflowItem) {
|
||||||
|| item instanceof NormalizedEditItem) {
|
|
||||||
if (item.sections) {
|
if (item.sections) {
|
||||||
const precessedSection = Object.create({});
|
const precessedSection = Object.create({});
|
||||||
// Iterate over all workspaceitem's sections
|
// Iterate over all workspaceitem's sections
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
export enum SubmissionScopeType {
|
export enum SubmissionScopeType {
|
||||||
WorkspaceItem = 'WORKSPACE',
|
WorkspaceItem = 'WORKSPACE',
|
||||||
WorkflowItem = 'WORKFLOW',
|
WorkflowItem = 'WORKFLOW'
|
||||||
EditItem = 'ITEM',
|
|
||||||
}
|
}
|
||||||
|
@@ -660,9 +660,6 @@ describe('SubmissionService test suite', () => {
|
|||||||
router.setRoute('/workflowitems/826/edit');
|
router.setRoute('/workflowitems/826/edit');
|
||||||
expect(service.getSubmissionScope()).toBe(expected);
|
expect(service.getSubmissionScope()).toBe(expected);
|
||||||
|
|
||||||
expected = SubmissionScopeType.EditItem;
|
|
||||||
router.setRoute('/items/9e79b1f2-ae0f-4737-9a4b-990952a8857c/edit');
|
|
||||||
expect(service.getSubmissionScope()).toBe(expected);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@@ -65,7 +65,7 @@ export class SubmissionService {
|
|||||||
* @param {GlobalConfig} EnvConfig
|
* @param {GlobalConfig} EnvConfig
|
||||||
* @param {NotificationsService} notificationsService
|
* @param {NotificationsService} notificationsService
|
||||||
* @param {SubmissionRestService} restService
|
* @param {SubmissionRestService} restService
|
||||||
* @param {Router} restSerroutervice
|
* @param {Router} router
|
||||||
* @param {RouteService} routeService
|
* @param {RouteService} routeService
|
||||||
* @param {Store<SubmissionState>} store
|
* @param {Store<SubmissionState>} store
|
||||||
* @param {TranslateService} translate
|
* @param {TranslateService} translate
|
||||||
@@ -202,6 +202,8 @@ export class SubmissionService {
|
|||||||
*
|
*
|
||||||
* @param submissionId
|
* @param submissionId
|
||||||
* The submission id
|
* The submission id
|
||||||
|
* @param sectionId
|
||||||
|
* The section id
|
||||||
*/
|
*/
|
||||||
dispatchSaveSection(submissionId, sectionId) {
|
dispatchSaveSection(submissionId, sectionId) {
|
||||||
this.store.dispatch(new SaveSubmissionSectionFormAction(submissionId, sectionId));
|
this.store.dispatch(new SaveSubmissionSectionFormAction(submissionId, sectionId));
|
||||||
@@ -327,9 +329,6 @@ export class SubmissionService {
|
|||||||
case 'workflowitems':
|
case 'workflowitems':
|
||||||
scope = SubmissionScopeType.WorkflowItem;
|
scope = SubmissionScopeType.WorkflowItem;
|
||||||
break;
|
break;
|
||||||
case 'edititems':
|
|
||||||
scope = SubmissionScopeType.EditItem;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return scope;
|
return scope;
|
||||||
}
|
}
|
||||||
@@ -400,8 +399,8 @@ export class SubmissionService {
|
|||||||
/**
|
/**
|
||||||
* Return the visibility status of the specified section
|
* Return the visibility status of the specified section
|
||||||
*
|
*
|
||||||
* @param submissionId
|
* @param sectionData
|
||||||
* The submission id
|
* The section data
|
||||||
* @return boolean
|
* @return boolean
|
||||||
* true if section is hidden, false otherwise
|
* true if section is hidden, false otherwise
|
||||||
*/
|
*/
|
||||||
@@ -432,6 +431,8 @@ export class SubmissionService {
|
|||||||
* The submission id
|
* The submission id
|
||||||
* @param sectionId
|
* @param sectionId
|
||||||
* The section id
|
* The section id
|
||||||
|
* @param sectionType
|
||||||
|
* The section type
|
||||||
*/
|
*/
|
||||||
notifyNewSection(submissionId: string, sectionId: string, sectionType?: SectionsType) {
|
notifyNewSection(submissionId: string, sectionId: string, sectionType?: SectionsType) {
|
||||||
const m = this.translate.instant('submission.sections.general.metadata-extracted-new-section', { sectionId });
|
const m = this.translate.instant('submission.sections.general.metadata-extracted-new-section', { sectionId });
|
||||||
|
Reference in New Issue
Block a user