Removed edit item from submission

This commit is contained in:
Giuseppe Digilio
2019-03-21 11:41:10 +01:00
parent 4539ee704a
commit 7ac39f05b9
7 changed files with 9 additions and 29 deletions

View File

@@ -1,4 +0,0 @@
import { Workspaceitem } from './workspaceitem.model';
export class EditItem extends Workspaceitem {
}

View File

@@ -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> {
}

View File

@@ -11,7 +11,6 @@ export enum SubmissionResourceType {
Group = 'group',
WorkspaceItem = 'workspaceitem',
WorkflowItem = 'workflowitem',
EditItem = 'edititem',
SubmissionDefinitions = 'submissiondefinitions',
SubmissionDefinition = 'submissiondefinition',
SubmissionForm = 'submissionform',

View File

@@ -13,7 +13,6 @@ import { ObjectCacheService } from '../cache/object-cache.service';
import { SubmissionResourceType } from './submission-resource-type';
import { NormalizedWorkspaceItem } from './models/normalized-workspaceitem.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 { SubmissionObject } from './models/submission-object.model';
import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
@@ -127,8 +126,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
let normalizedItem = Object.assign({}, item);
// In case data is an Instance of NormalizedWorkspaceItem normalize field value of all the section of type form
if (item instanceof NormalizedWorkspaceItem
|| item instanceof NormalizedWorkflowItem
|| item instanceof NormalizedEditItem) {
|| item instanceof NormalizedWorkflowItem) {
if (item.sections) {
const precessedSection = Object.create({});
// Iterate over all workspaceitem's sections

View File

@@ -1,5 +1,4 @@
export enum SubmissionScopeType {
WorkspaceItem = 'WORKSPACE',
WorkflowItem = 'WORKFLOW',
EditItem = 'ITEM',
WorkflowItem = 'WORKFLOW'
}

View File

@@ -660,9 +660,6 @@ describe('SubmissionService test suite', () => {
router.setRoute('/workflowitems/826/edit');
expect(service.getSubmissionScope()).toBe(expected);
expected = SubmissionScopeType.EditItem;
router.setRoute('/items/9e79b1f2-ae0f-4737-9a4b-990952a8857c/edit');
expect(service.getSubmissionScope()).toBe(expected);
});
});

View File

@@ -65,7 +65,7 @@ export class SubmissionService {
* @param {GlobalConfig} EnvConfig
* @param {NotificationsService} notificationsService
* @param {SubmissionRestService} restService
* @param {Router} restSerroutervice
* @param {Router} router
* @param {RouteService} routeService
* @param {Store<SubmissionState>} store
* @param {TranslateService} translate
@@ -202,6 +202,8 @@ export class SubmissionService {
*
* @param submissionId
* The submission id
* @param sectionId
* The section id
*/
dispatchSaveSection(submissionId, sectionId) {
this.store.dispatch(new SaveSubmissionSectionFormAction(submissionId, sectionId));
@@ -327,9 +329,6 @@ export class SubmissionService {
case 'workflowitems':
scope = SubmissionScopeType.WorkflowItem;
break;
case 'edititems':
scope = SubmissionScopeType.EditItem;
break;
}
return scope;
}
@@ -400,8 +399,8 @@ export class SubmissionService {
/**
* Return the visibility status of the specified section
*
* @param submissionId
* The submission id
* @param sectionData
* The section data
* @return boolean
* true if section is hidden, false otherwise
*/
@@ -432,6 +431,8 @@ export class SubmissionService {
* The submission id
* @param sectionId
* The section id
* @param sectionType
* The section type
*/
notifyNewSection(submissionId: string, sectionId: string, sectionType?: SectionsType) {
const m = this.translate.instant('submission.sections.general.metadata-extracted-new-section', { sectionId });