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

Merge pull request #1828 from FelixNicol/Virtual-metadatas-visibility-workflow-not-updated

Browse Source 
Fix for PR#1822 - Adjusted two equality checks for scope type which always return false.
This commit is contained in:
Tim Donohue
2022-10-03 17:15:26 -05:00
committed by GitHub
parent 60c317c020 fcae738db6
commit 9305705ab6
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/core/eperson/models/workspaceitem.resource-type.ts Normal file
View File

@@ -0,0 +1,3 @@
import { ResourceType } from '../../shared/resource-type';
export const WORKSPACEITEM = new ResourceType('workspaceitem');

4
src/app/core/submission/models/workspaceitem.model.ts
View File

@@ -2,7 +2,7 @@ import { deserializeAs, inheritSerialization } from 'cerialize';
import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
import { SubmissionObject } from './submission-object.model';
import { ResourceType } from '../../shared/resource-type';
import { WORKSPACEITEM } from '../../eperson/models/workspaceitem.resource-type';
/**
* A model class for a WorkspaceItem.
@@ -11,7 +11,7 @@ import { ResourceType } from '../../shared/resource-type';
@inheritSerialization(SubmissionObject)
@inheritLinkAnnotations(SubmissionObject)
export class WorkspaceItem extends SubmissionObject {
static type = new ResourceType('workspaceitem');
static type = WORKSPACEITEM;
/**
* The universally unique identifier of this WorkspaceItem

4
src/app/submission/sections/form/section-form.component.spec.ts
View File

@@ -357,7 +357,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
describe('in workspace scope', () => {
beforeEach(() => {
// @ts-ignore
comp.submissionObject = { type: WorkspaceItem.type };
comp.submissionObject = { type: WorkspaceItem.type.value };
});
it('should return true for unscoped fields', () => {
@@ -376,7 +376,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
describe('in workflow scope', () => {
beforeEach(() => {
// @ts-ignore
comp.submissionObject = { type: WorkflowItem.type };
comp.submissionObject = { type: WorkflowItem.type.value };
});
it('should return true when field is unscoped', () => {

4
src/app/submission/sections/form/section-form.component.ts
View File

@@ -261,10 +261,10 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
switch (scope) {
case SubmissionScopeType.WorkspaceItem: {
return this.submissionObject.type === WorkspaceItem.type;
return (this.submissionObject as any).type === WorkspaceItem.type.value;
}
case SubmissionScopeType.WorkflowItem: {
return this.submissionObject.type === WorkflowItem.type;
return (this.submissionObject as any).type === WorkflowItem.type.value;
}
default: {
return true;