diff --git a/claims/claim-utils/claimHelper.class.ts b/claims/claim-utils/claimHelper.class.ts index e85ab9ef..c3dd8e73 100644 --- a/claims/claim-utils/claimHelper.class.ts +++ b/claims/claim-utils/claimHelper.class.ts @@ -90,6 +90,7 @@ export class ClaimRecord2Insert { targetCollectedFrom: string; targetAccessRights: string; targetEmbargoEndDate: string; + claimedInDashboard: string; constructor() { diff --git a/claims/linking/insertClaim/insertClaim.component.ts b/claims/linking/insertClaim/insertClaim.component.ts index 6d387342..115d93d2 100644 --- a/claims/linking/insertClaim/insertClaim.component.ts +++ b/claims/linking/insertClaim/insertClaim.component.ts @@ -114,6 +114,7 @@ export class ClaimInsertComponent { this.loading.open(); let claims: ClaimRecord2Insert[] = []; let directclaims: DirectIndexRecord[] = []; + let dashboard = this.properties.environment+"_"+this.properties.dashboard; for (let j = 0; j < this.sources.length; j++) { // if an external result -> direct insert in the index const result: ClaimEntity = this.sources[j]; if (result.result && ["crossref", "datacite", "orcid"].indexOf(result.result.source) != -1) { @@ -144,11 +145,11 @@ export class ClaimInsertComponent { for (let j = 0; j < this.sources.length; j++) { const result: ClaimEntity = this.sources[j]; // this is a research result if (entity.result) { - claims.push(ClaimInsertComponent.createResultClaim(result, entity, user.email)); + claims.push(ClaimInsertComponent.createResultClaim(result, entity, user.email, dashboard)); } else if (entity.context) { - claims.push(ClaimInsertComponent.createContextClaim(result, entity, user.email)); + claims.push(ClaimInsertComponent.createContextClaim(result, entity, user.email, dashboard)); } else if (entity.project) { - claims.push(ClaimInsertComponent.createProjectClaim(result, entity, user.email)); + claims.push(ClaimInsertComponent.createProjectClaim(result, entity, user.email, dashboard)); } @@ -156,15 +157,16 @@ export class ClaimInsertComponent { if (this.inlineEntity) { if (this.inlineEntity.result) { if (entity.result) { - claims.push(ClaimInsertComponent.createResultClaim(this.inlineEntity, entity, user.email)); + + claims.push(ClaimInsertComponent.createResultClaim(this.inlineEntity, entity, user.email, dashboard)); } else if (entity.context) { - claims.push(ClaimInsertComponent.createContextClaim(this.inlineEntity, entity, user.email)); + claims.push(ClaimInsertComponent.createContextClaim(this.inlineEntity, entity, user.email, dashboard)); } else if (entity.project) { - claims.push(ClaimInsertComponent.createProjectClaim(this.inlineEntity, entity, user.email)); + claims.push(ClaimInsertComponent.createProjectClaim(this.inlineEntity, entity, user.email, dashboard)); } } else if (this.inlineEntity.project) { if (entity.result) { - claims.push(ClaimInsertComponent.createProjectClaim(entity, this.inlineEntity, user.email)); + claims.push(ClaimInsertComponent.createProjectClaim(entity, this.inlineEntity, user.email, dashboard)); } } } @@ -347,7 +349,7 @@ export class ClaimInsertComponent { } - private static createContextClaim(resultEntity: ClaimEntity, contextEntity: ClaimEntity, user: any): ClaimRecord2Insert { + private static createContextClaim(resultEntity: ClaimEntity, contextEntity: ClaimEntity, user: any, dashboard:string): ClaimRecord2Insert { return { claimedBy: user, sourceId: contextEntity.context.concept.id, @@ -359,11 +361,12 @@ export class ClaimInsertComponent { targetType: resultEntity.type, targetCollectedFrom: resultEntity.result.source, targetAccessRights: resultEntity.result.accessRights, - targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(resultEntity) + targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(resultEntity), + claimedInDashboard : dashboard }; } - private static createProjectClaim(resultEntity: ClaimEntity, projectEntity: ClaimEntity, user: any): ClaimRecord2Insert { + private static createProjectClaim(resultEntity: ClaimEntity, projectEntity: ClaimEntity, user: any, dashboard:string): ClaimRecord2Insert { return { claimedBy: user, sourceId: projectEntity.id, @@ -375,11 +378,12 @@ export class ClaimInsertComponent { targetType: resultEntity.type, targetCollectedFrom: resultEntity.result.source, targetAccessRights: resultEntity.result.accessRights, - targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(resultEntity) + targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(resultEntity), + claimedInDashboard : dashboard }; } - private static createResultClaim(inlineResult: ClaimEntity, resultEntity: ClaimEntity, user: string): ClaimRecord2Insert { + private static createResultClaim(inlineResult: ClaimEntity, resultEntity: ClaimEntity, user: string, dashboard:string): ClaimRecord2Insert { return { claimedBy: user, @@ -392,7 +396,8 @@ export class ClaimInsertComponent { targetType: inlineResult.type, targetCollectedFrom: inlineResult.result.source, targetAccessRights: inlineResult.result.accessRights, - targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(inlineResult) + targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(inlineResult), + claimedInDashboard : dashboard }; } diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 4c274b9b..e890aa45 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -1,5 +1,6 @@ export class EnvProperties { environment: string; //{beta,test,production, development} + dashboard:string; //{explore, connect, monitor} domain: string; enablePiwikTrack: boolean; useCache: boolean;