diff --git a/claims/linking/linkingGeneric.component.ts b/claims/linking/linkingGeneric.component.ts
index 4cbeb91f..23b41780 100644
--- a/claims/linking/linkingGeneric.component.ts
+++ b/claims/linking/linkingGeneric.component.ts
@@ -17,7 +17,22 @@ declare var UIkit:any;
@Component({
selector: 'linking-generic',
- templateUrl: 'linkingGeneric.component.html'
+ templateUrl: 'linkingGeneric.component.html',
+ styles:[ `
+ .mat-stepper-horizontal-line {
+ border-top-width: 1px;
+ border-top-style: solid;
+ flex: auto;
+ height: 0;
+ margin: 0 -16px;
+ margin-left: -16px;
+ min-width: 32px;
+}
+.mat-horizontal-stepper-header::before, .mat-horizontal-stepper-header::after, .mat-stepper-horizontal-line {
+ border-top-color: rgba(0, 0, 0, 0.12);
+}
+
+ `]
})
export class LinkingGenericComponent {
diff --git a/claims/linking/selected/metadataPreview.component.html b/claims/linking/selected/metadataPreview.component.html
index b5eff289..91e7069f 100644
--- a/claims/linking/selected/metadataPreview.component.html
+++ b/claims/linking/selected/metadataPreview.component.html
@@ -1,34 +1,4 @@
-
-
-
-
-
-
-
- LINKING CONFIRMATION
-
- Confirm that the links you provided are all correct
-
-
-
-
-
-
-
+
@@ -39,402 +9,401 @@
-
-
-
-
- SOURCES ({{sources.length + (inlineEntity ? 1 : 0) | number}})
-
-
-
-
-
-
-
- {{(!inlineEntity.result) ? inlineEntity.type : ((inlineEntity.result && inlineEntity.result.source == 'openaire') ? inlineEntity.type : (inlineEntity.result && inlineEntity.result.source + ' result'))}}
-
-
Link couldn't be saved
-
-
-
-
-
-
-
-
-
SOURCES cannot be empty.
- Start by adding your linking sources first, go to
- sources
- page .
+
+
+
+
+
+
SOURCES ({{sources.length + (inlineEntity ? 1 : 0) | number}})
+
+
+
-
-
-
-
-
-
-
-
- {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
+
+
+
+
+ {{(!inlineEntity.result) ? inlineEntity.type : ((inlineEntity.result && inlineEntity.result.source == 'openaire') ? inlineEntity.type : (inlineEntity.result && inlineEntity.result.source + ' result'))}}
+
+
Link couldn't be saved
+
Link couldn't be saved
+
+
+
+
+
+
+
+
+
+
+
+
+
SOURCES cannot be empty.
+ Start by adding your linking sources first, go to
+ sources
+ page .
+
+
+
+
+
+
+
+
+
+ {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
+
+
Link couldn't be saved
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Type
+
+ Publication
+
+ Research data
+
+ Software
+
+ Other research product
+
+
+
+
+
+
+
+
+
+ Access mode
+
+ {{type}}
+
+
+
+
+
+
{{getEmbargoEndDateMessage(entity)}}
+
+
+
+
+
+
+
+
+
+
+
+
LINK TO list cannot be empty.
+ Select an entity type to link to:
+
+
+
+
+
+
+
+
+
Research results
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Type
+
+
+
+
+
+ {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
+
+
Link couldn't be saved
+
+
+
+
+
+
+
+
+
+
+
+ Type
+ class=" matSelection"
+ [disableOptionCentering]="true"
+ panelClass="matSelectionPanel">
Publication
+ (click)="onTypeChanged('publication',entity, false)">Publication
Research data
+ (click)="onTypeChanged('dataset',entity, false)">Research data
Software
Other research product
+ (click)="onTypeChanged('other',entity, false)">Other research product
-
-
-
-
-
-
-
- Access mode
+
+
+
+
+
+
+ Access mode
{{type}}
+ (click)="accessRightsTypeChanged(type,entity, true)">{{type}}
-
-
-
-
-
{{getEmbargoEndDateMessage(entity)}}
+
+
+
+
+
{{getEmbargoEndDateMessage(entity)}}
+
+
-
-
-
-
-
-
-
- LINK TO ({{results.length | number}})
-
-
-
-
+
+
+
+
-
-
-
LINK TO list cannot be empty.
- Select an entity type to link to:
-
-
-
-
-
-
-
-
-
Research results
-
-
-
-
-
-
-
-
-
-
- {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
-
-
Link couldn't be saved
-
-
-
-
-
-
-
-
-
-
-
- Type
-
- Publication
-
- Research data
-
- Software
-
- Other research product
-
-
-
-
-
-
-
-
- Access mode
-
- {{type}}
-
-
-
-
-
-
{{getEmbargoEndDateMessage(entity)}}
-
-
-
-
-
-
+
+
-
-
-
- ERRORS ({{errors.length | number}})
-
-
-
-
-
-
-
-
-
Fail to save {{message.failed|number}}
- {{message.failed > 1 ? 'links.' : 'link.'}}
-
-
But {{message.inserted|number}} link{{message.inserted > 1 ? 's' : ''}} was
- successfully inserted.
-
-
-
-
-
-
-
-
- An error occured while saving your links.
-
+
-
WARNINGS
- ({{warnings.length
- | number}})
-
-
-
-
-
-
-
- Embargo date must be later than published date in
+
+
+
+
+ ERRORS ({{errors.length | number}})
+
+
+
+
+
+
+
+
Fail to save {{message.failed|number}}
+ {{message.failed > 1 ? 'links.' : 'link.'}}
+
+
But {{message.inserted|number}} link{{message.inserted > 1 ? 's' : ''}} was
+ successfully inserted.
+
+
+
-
- {{message.resultTitle}}
+
+
+
+
+ An error occured while saving your links.
+
-
-
- Published date must be in the project's date boundaries
- (from {{message.projectInfo.startDate}}{{(message.projectInfo.endDate) ? (' to ' + (addStringToNumber(message.projectInfo.endDate, 5))) : ''}}) in
+
+
WARNINGS
+ ({{warnings.length
+ | number}})
+
+
+
+
+
+
+
+ Embargo date must be later than published date in
+
+
+ {{message.resultTitle}}
+
-
- {{message.resultTitle}}
-
-
- with link to
-
-
- {{message.projectInfo.title}}
-
-
- Project boundaries: ({{message.projectInfo.startDate}}{{(message.projectInfo.endDate) ? (' - ' + (message.projectInfo.endDate) + ') +5 years') : ')'}}
+
+
+ Published date must be in the project's date boundaries
+ (from {{message.projectInfo.startDate}}{{(message.projectInfo.endDate) ? (' to ' + (addStringToNumber(message.projectInfo.endDate, 5))) : ''}}) in
+
+
+ {{message.resultTitle}}
+
+
+ with link to
+
+
+ {{message.projectInfo.title}}
+
+
+ Project boundaries: ({{message.projectInfo.startDate}}{{(message.projectInfo.endDate) ? (' - ' + (message.projectInfo.endDate) + ') +5 years') : ')'}}
+
+
-
-
@@ -444,10 +413,11 @@
+
+
-
diff --git a/claims/linking/selected/metadataPreview.component.ts b/claims/linking/selected/metadataPreview.component.ts
index 8e2c038f..8aedd081 100644
--- a/claims/linking/selected/metadataPreview.component.ts
+++ b/claims/linking/selected/metadataPreview.component.ts
@@ -12,10 +12,10 @@ import {HelperFunctions} from "../../../utils/HelperFunctions.class";
})
export class MetadataPreviewComponent {
- showSources = true;
- showLinksTo = true;
- showErrors = true;
- showWarnings = true;
+/* showSources = true;
+ showLinksTo = true;*/
+ // showErrors = true;
+ // showWarnings = true;
@Input() results: ClaimEntity[];
@Input() sources: ClaimEntity[];
@Input() title: string = "Research Results";
@@ -40,10 +40,10 @@ export class MetadataPreviewComponent {
ngOnInit() {
this.setEmbargoEndDates();
- if (this.inlineEntity) {
+/* if (this.inlineEntity) {
this.showSources = true;
this.showLinksTo = true;
- }
+ }*/
this.runValidation(true);
}
setEmbargoEndDates(){
diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts
index d98ce778..18bde834 100644
--- a/connect/connectHelper.ts
+++ b/connect/connectHelper.ts
@@ -6,7 +6,7 @@ export class ConnectHelper {
public static getCommunityFromDomain(domain: string): string{
if(properties.environment == "development") {
- // domain = "aginfra.openaire.eu"; //for testing
+ domain = "covid-19.openaire.eu"; //for testing
}
domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix
if (domain.indexOf('eosc-portal.eu') != -1) {