Compare commits
No commits in common. "8f9547f498c07da781fae027c1d207740a97b559" and "b7bd667486353a7697674a98866a256fcf5b0cea" have entirely different histories.
8f9547f498
...
b7bd667486
|
|
@ -47,6 +47,8 @@ ELK.Docker/shared/data-elk/
|
|||
bin/
|
||||
*.classpath
|
||||
.run
|
||||
openDMP/backend/uploads/
|
||||
openDMP/backend/tmp/
|
||||
logs/
|
||||
backend/web/src/main/resources/certificates/
|
||||
/storage/
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>core</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>${revision}</version>
|
||||
|
||||
<parent>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>opencdmp-backend</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>${revision}</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
@ -20,6 +20,7 @@
|
|||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<revision>1.0.0-SNAPSHOT</revision>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -51,7 +52,7 @@
|
|||
<dependency>
|
||||
<groupId>gr.cite</groupId>
|
||||
<artifactId>oidc-authz</artifactId>
|
||||
<version>2.2.1</version>
|
||||
<version>2.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
|
|
@ -81,12 +82,12 @@
|
|||
<dependency>
|
||||
<groupId>gr.cite</groupId>
|
||||
<artifactId>queue-inbox</artifactId>
|
||||
<version>2.1.2</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>gr.cite</groupId>
|
||||
<artifactId>queue-outbox</artifactId>
|
||||
<version>2.1.2</version>
|
||||
<version>2.1.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -119,7 +120,6 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<source>21</source>
|
||||
<target>21</target>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
package org.opencdmp.commons.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import org.opencdmp.data.converters.enums.DatabaseEnum;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public enum ProviderType implements DatabaseEnum<Integer> {
|
||||
|
||||
Google (1),
|
||||
Facebook ( 2),
|
||||
Twitter ( 3),
|
||||
LinkedIn (4),
|
||||
NativeLogin ( 5),
|
||||
B2Access ( 6),
|
||||
ORCID (7),
|
||||
OpenAire ( 8),
|
||||
Configurable ( 9),
|
||||
Zenodo (10),
|
||||
Keycloack ( 128);
|
||||
|
||||
private final Integer value;
|
||||
|
||||
ProviderType(Integer value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
@JsonValue
|
||||
public Integer getValue() { return this.value; }
|
||||
|
||||
private static final Map<Integer, ProviderType> map = EnumUtils.getEnumValueMap(ProviderType.class);
|
||||
public static ProviderType of(Integer i) {
|
||||
return map.get(i);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
package org.opencdmp.data.converters.enums;
|
||||
|
||||
import org.opencdmp.commons.enums.ProviderType;
|
||||
import jakarta.persistence.AttributeConverter;
|
||||
import jakarta.persistence.Converter;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
package org.opencdmp.data.converters.enums;
|
||||
|
||||
import org.opencdmp.commons.enums.ProviderType;
|
||||
import jakarta.persistence.AttributeConverter;
|
||||
import jakarta.persistence.Converter;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Converter
|
||||
public class ProviderTypeConverter extends DatabaseEnumConverter<ProviderType, Integer> {
|
||||
public ProviderType of(Integer i) {
|
||||
return ProviderType.of(i);
|
||||
}
|
||||
}
|
||||
114
backend/pom.xml
114
backend/pom.xml
|
|
@ -5,13 +5,13 @@
|
|||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>opencdmp-backend</artifactId>
|
||||
<name>OpenCDMP Backend Parent</name>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>${revision}</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>3.3.4</version>
|
||||
<version>3.3.3</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
|
|
@ -24,16 +24,19 @@
|
|||
<project.oauth.version>1.19.0</project.oauth.version>
|
||||
<project.version>0.2.0</project.version>
|
||||
<java.version>21</java.version>
|
||||
|
||||
<commons-codec.version>1.9</commons-codec.version>
|
||||
<org.junit.version>4.11</org.junit.version>
|
||||
<log4j.version>1.2.17</log4j.version>
|
||||
<log4j2.version>2.15.0</log4j2.version>
|
||||
<revision>1.0.0-SNAPSHOT</revision>
|
||||
<maven.compiler.release>21</maven.compiler.release>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.json</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
|
|
@ -47,41 +50,55 @@
|
|||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents.client5</groupId>
|
||||
<artifactId>httpclient5</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore-nio</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpcore</artifactId>
|
||||
<version>4.4.13</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.hibernate.orm</groupId>
|
||||
<artifactId>hibernate-core</artifactId>
|
||||
<version>6.5.2.Final</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.hibernate.orm</groupId>
|
||||
<artifactId>hibernate-c3p0</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/com.jayway.jsonpath/json-path -->
|
||||
<dependency>
|
||||
<groupId>com.jayway.jsonpath</groupId>
|
||||
<artifactId>json-path</artifactId>
|
||||
<version>2.9.0</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml -->
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-xml</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackeu.eudat.corecore/jackeu.eudat.corecore -->
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-core</artifactId>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackeu.eudat.corecore/jackson-databind -->
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
|
|
@ -91,11 +108,62 @@
|
|||
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||
<version>2.17.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- g/a spring -->
|
||||
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackeu.eudat.corecore/jackson-databind -->
|
||||
|
||||
|
||||
|
||||
<!-- Various libs -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.14.0</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/fop -->
|
||||
|
||||
|
||||
|
||||
<!--<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
<artifactId>hibernate-jpamodelgen</artifactId>
|
||||
</dependency>-->
|
||||
|
||||
<!--<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-to-slf4j</artifactId>
|
||||
<version>2.8.2</version>
|
||||
</dependency>-->
|
||||
|
||||
|
||||
<!-- <!– The client –>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>io.prometheus</groupId>-->
|
||||
<!-- <artifactId>simpleclient</artifactId>-->
|
||||
<!-- <version>0.11.0</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <!– Hotspot JVM metrics–>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>io.prometheus</groupId>-->
|
||||
<!-- <artifactId>simpleclient_hotspot</artifactId>-->
|
||||
<!-- <version>0.11.0</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <!– Exposition HTTPServer–>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>io.prometheus</groupId>-->
|
||||
<!-- <artifactId>simpleclient_httpserver</artifactId>-->
|
||||
<!-- <version>0.11.0</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <!– Pushgateway exposition–>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>io.prometheus</groupId>-->
|
||||
<!-- <artifactId>simpleclient_pushgateway</artifactId>-->
|
||||
<!-- <version>0.11.0</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-prometheus</artifactId>
|
||||
|
|
@ -105,6 +173,7 @@
|
|||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</dependency>
|
||||
<!-- Micormeter core dependecy -->
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-core</artifactId>
|
||||
|
|
@ -136,10 +205,46 @@
|
|||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>cite-dev</id>
|
||||
<id>devel</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<properties>
|
||||
<packaging.type>jar</packaging.type>
|
||||
</properties>
|
||||
</profile>
|
||||
<!-- <profile>-->
|
||||
<!-- <id>intellij-properties-launcher</id>-->
|
||||
|
||||
<!-- <dependencies>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||
<!-- <artifactId>spring-boot-loader</artifactId>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- </dependencies>-->
|
||||
|
||||
<!-- </profile>-->
|
||||
<profile>
|
||||
<id>production</id>
|
||||
<properties>
|
||||
<packaging.type>jar</packaging.type>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<activation>
|
||||
<property>
|
||||
<name>profile</name>
|
||||
<value>production</value>
|
||||
</property>
|
||||
</activation>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>cite-dev</id>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>cite-maven</id>
|
||||
|
|
@ -147,6 +252,9 @@
|
|||
<url>https://crepo.cite.gr/repository/cite-maven/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>web</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
<version>${revision}</version>
|
||||
<packaging>${packaging.type}</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>opencdmp-backend</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>${revision}</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
@ -20,13 +20,15 @@
|
|||
<maven.compiler.release>21</maven.compiler.release>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<revision>1.0.0-SNAPSHOT</revision>
|
||||
<packaging.type>jar</packaging.type>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.opencdmp</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
@ -37,6 +39,10 @@
|
|||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
|
||||
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
|
|
@ -45,17 +51,36 @@
|
|||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.springframework/spring-context -->
|
||||
<!--<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<version>5.3.8</version>
|
||||
</dependency>-->
|
||||
|
||||
<!-- guava org.opencdmp.cache -->
|
||||
<!-- <dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>30.1.1-jre</version>
|
||||
</dependency>-->
|
||||
<!-- https://mvnrepository.com/artifact/org.springframework/spring-context-support -->
|
||||
|
||||
<dependency>
|
||||
<groupId>io.swagger</groupId>
|
||||
<artifactId>swagger-annotations</artifactId>
|
||||
<version>1.6.14</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/junit/junit -->
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.10.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
|
|
@ -64,25 +89,44 @@
|
|||
<groupId>org.hibernate.orm</groupId>
|
||||
<artifactId>hibernate-core</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger2</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-boot-starter</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
|
||||
<version>2.3.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--CITE DEPENDENCIES-->
|
||||
<dependency>
|
||||
<groupId>gr.cite</groupId>
|
||||
<artifactId>cors-web</artifactId>
|
||||
<version>2.1.1</version>
|
||||
<version>2.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>gr.cite</groupId>
|
||||
<artifactId>exceptions-web</artifactId>
|
||||
<version>2.2.1</version>
|
||||
<version>2.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>gr.cite</groupId>
|
||||
|
|
@ -97,6 +141,19 @@
|
|||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>${project.artifactId}-${project.version}</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/ui-resources</directory>
|
||||
<excludes>
|
||||
<exclude>node_modules/**</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
|
@ -111,6 +168,39 @@
|
|||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addClasspath>true</addClasspath>
|
||||
<mainClass>org.opencdmp.OpenCDMPApplication</mainClass>
|
||||
<classpathPrefix>dependency-jars/</classpathPrefix>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>2.5.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-dependencies</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>copy-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>
|
||||
${project.build.directory}/dependency-jars/
|
||||
</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -14,7 +14,6 @@ import org.springframework.stereotype.Service;
|
|||
|
||||
@Service
|
||||
public class OpencdmpPermissionPolicyContextImpl extends PermissionPolicyContextImpl {
|
||||
|
||||
private final CustomPolicyService customPolicyService;
|
||||
private final CustomPolicyCacheService customPolicyCacheService;
|
||||
private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(OpencdmpPermissionPolicyContextImpl.class));
|
||||
|
|
@ -47,4 +46,5 @@ public class OpencdmpPermissionPolicyContextImpl extends PermissionPolicyContext
|
|||
logger.info("Authorization policies found: {}", this.policies.size());
|
||||
this.reload();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public class SecurityConfiguration {
|
|||
.headers(httpSecurityHeadersConfigurer -> httpSecurityHeadersConfigurer.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable))
|
||||
.addFilterBefore(apiKeyFilter, AbstractPreAuthenticatedProcessingFilter.class)
|
||||
.authorizeHttpRequests(authRequest ->
|
||||
authRequest.requestMatchers(buildAntPatterns(webSecurityProperties.getAllowedEndpoints())).anonymous()
|
||||
authRequest.requestMatchers(buildAntPatterns(webSecurityProperties.getAllowedEndpoints())).anonymous()
|
||||
.requestMatchers(buildAntPatterns(webSecurityProperties.getAuthorizedEndpoints())).authenticated())
|
||||
.sessionManagement( sessionManagementConfigurer-> sessionManagementConfigurer.sessionCreationPolicy(SessionCreationPolicy.NEVER))
|
||||
.oauth2ResourceServer(oauth2 -> oauth2.authenticationManagerResolver(authenticationManagerResolver));
|
||||
|
|
@ -108,7 +108,7 @@ public class SecurityConfiguration {
|
|||
// public PermissionPolicyContext permissionPolicyContext(){
|
||||
// return new PermissionPolicyContextImpl(configuration);
|
||||
// }
|
||||
|
||||
|
||||
@Bean
|
||||
AuthorizationRequirementMapper authorizationRequirementMapper() {
|
||||
return new AuthorizationRequirementMapper() {
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ public class UserController {
|
|||
))
|
||||
@Swagger404
|
||||
public User get(
|
||||
@Parameter(name = "email", description = "The email of a user to fetch", example = "opencdmp@cite.gr", required = true) @PathVariable("email") String email,
|
||||
@Parameter(name = "email", description = "The email of a user to fetch", example = "admin@cite.gr", required = true) @PathVariable("email") String email,
|
||||
@Parameter(name = "fieldSet", description = SwaggerHelpers.Commons.fieldset_description, required = true) FieldSet fieldSet
|
||||
) throws MyApplicationException, MyForbiddenException, MyNotFoundException {
|
||||
logger.debug(new MapLogEntry("retrieving" + User.class.getSimpleName()).And("email", email).And("fields", fieldSet));
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ public final class PublicApiStaticHelpers {
|
|||
" \"users\": [\n" +
|
||||
" {\n" +
|
||||
" \"id\": \"00476b4d-0491-44ca-b2fd-92e695062a48\",\n" +
|
||||
" \"name\": \"OpenCDMP OpenCDMP\",\n" +
|
||||
" \"name\": \"OpenDMP OpenDMP\",\n" +
|
||||
" \"role\": 0,\n" +
|
||||
" \"email\": \"opendmpeu@gmail.com\",\n" +
|
||||
" \"hint\": \"UserInfoListingModel\"\n" +
|
||||
|
|
@ -213,7 +213,7 @@ public final class PublicApiStaticHelpers {
|
|||
" \"users\": [\n" +
|
||||
" {\n" +
|
||||
" \"id\": \"00476b4d-0491-44ca-b2fd-92e695062a48\",\n" +
|
||||
" \"name\": \"OpenCDMP OpenCDMP\",\n" +
|
||||
" \"name\": \"OpenDMP OpenDMP\",\n" +
|
||||
" \"role\": 0,\n" +
|
||||
" \"email\": \"opendmpeu@gmail.com\",\n" +
|
||||
" \"hint\": \"UserInfoListingModel\"\n" +
|
||||
|
|
|
|||
|
|
@ -4299,7 +4299,7 @@ public final class SwaggerHelpers {
|
|||
"contacts":[
|
||||
{
|
||||
"id":"20d108c6-8277-40d0-a2b8-e6d8c9c332f0",
|
||||
"value":"opencdmp@cite.gr",
|
||||
"value":"dmproot@cite.gr",
|
||||
"type":0,
|
||||
"ordinal":0,
|
||||
"user":{
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<file>logs/logging.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>logs/logging.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFileNamingAndTriggeringPolicy">
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>100MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
<maxHistory>15</maxHistory>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<file>logs/auditing.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>logs/auditing.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFileNamingAndTriggeringPolicy">
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>100MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
<maxHistory>15</maxHistory>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,8 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<p>OpenCDMP is an open and extensible software platform designed to simplify the management, monitoring, and maintenance of Output Management Plans (OMPs), such as Data Management Plans (DMPs) and Software Management Plans (SMPs). It provides a flexible and customizable environment that streamlines the complex processes involved in handling OMPs, ensuring efficiency, compliance, and collaboration across various projects and organizations.</p>
|
||||
<p>ARGOS is an online tool in support of automated processes to creating, managing, sharing and linking DMPs with research artifacts they correspond to. It is the joint effort of OpenAIRE and EUDAT to deliver an open platform for Data Management Planning that addresses FAIR and Open best practices and assumes no barriers for its use and adoption. It does so by applying common standards for machine-actionable DMPs as defined by the global research data community of RDA and by communicating and consulting with researchers, research communities and funders to better reflect on their needs.
|
||||
<br /><br />ARGOS provides a flexible environment and an easy interface for users to navigate and use.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -84,26 +84,27 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<p><span>OpenCDMP </span><span>("us", "we", "our") uses cookies. By using OpenCDMP, you consent to the use of cookies.</span></p>
|
||||
<p><span>Our Cookies Policy explains what cookies are, how we use cookies, how third-parties we may partner with may use cookies on OpenCDMP, your choices regarding cookies and further information about cookies.</span></p>
|
||||
<p><span>ARGOS </span><span>("us", "we", "our") uses cookies. By using ARGOS, you consent to the use of cookies.</span></p>
|
||||
<p><span>Our Cookies Policy explains what cookies are, how we use cookies, how third-parties we may partner with may use cookies on ARGOS, your choices regarding cookies and further information about cookies.</span></p>
|
||||
<p><span></span></p>
|
||||
<br />
|
||||
<p><strong>What are cookies</strong></p>
|
||||
<p><span>Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows OpenCDMP or a third-party to recognize you and make your next visit easier and OpenCDMP more useful to you.</span></p>
|
||||
<p><span>Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows ARGOS or a third-party to recognize you and make your next visit easier and ARGOS more useful to you.</span></p>
|
||||
<p><span>Cookies can be "persistent" or "session" cookies.</span></p>
|
||||
<br />
|
||||
<p><strong>How OpenCDMP uses cookies</strong></p>
|
||||
<p><span>When you use and access OpenCDMP, we may place cookies files in your web browser. </span></p>
|
||||
<p><span>We use cookies for the following purposes: to enable certain functions of OpenCDMP and to provide analytics.</span></p>
|
||||
<p><span>We use both session and persistent cookies on OpenCDMP and we use different types of cookies to run the Service: </span></p>
|
||||
<p><strong>How Argos uses cookies</strong></p>
|
||||
<p><span>When you use and access ARGOS, we may place cookies files in your web browser. </span></p>
|
||||
<p><span>We use cookies for the following purposes: to enable certain functions of ARGOS and to provide analytics.</span></p>
|
||||
<p><span>We use both session and persistent cookies on ARGOS and we use different types of cookies to run the Service: </span></p>
|
||||
<p><span>1. Essential cookies. We may use essential cookies to authenticate users and prevent fraudulent use of user accounts.</span></p>
|
||||
<p><span>2. Performance cookies. We use performance cookies to count visits and traffic sources, so we can measure and improve the performance of OpenCDMP, for example by analysing patterns of user behaviour in order to enhance user experience or by identifying areas of the website which may require maintenance. All information these cookies collect is anonymous.</span></p>
|
||||
<p><span> 3. Third-party cookies. Apart from our own cookies, we may use cookies from sources that OpenCDMP makes use of for OpenCDMP to properly function and validate input and output. Third-party cookies are also used to report usage statistics of OpenCDMP.</span></p>
|
||||
<p><span>2. Performance cookies. We use performance cookies to count visits and traffic sources, so we can measure and improve the performance of Argos, for example by analysing patterns of user behaviour in order to enhance user experience or by identifying areas of the website which may require maintenance. All information these cookies collect is anonymous.</span></p>
|
||||
<p><span> 3. Third-party cookies. Apart from our own cookies, we may use cookies from sources that Argos and OpenAIRE (Argos provider) makes use of for Argos to properly function and validate input and output. Third-party cookies are also used to report usage statistics of Argos.</span></p>
|
||||
<p><span></span></p>
|
||||
<br />
|
||||
<p><strong>What are your choices regarding cookies</strong></p>
|
||||
<p><span>If you'd like to delete cookies or instruct your web browser to delete or refuse cookies, please visit the help pages of your web browser.</span></p>
|
||||
<p><span>Please note, however, that if you delete cookies or refuse to accept them, you might not be able to use all of the features we offer, you may not be able to store your preferences, and some of our pages might not display properly.</span></p>
|
||||
<p><span>Please contact OpenAIRE’s Data Protection Officer for further </span><span>information on the cookies that we use and their purposes</span><span>: </span><span class="c5"><a href="mailto:dpo@openaire.eu">dpo@openaire.eu</a></span><span> </span></p>
|
||||
<p><span></span></p>
|
||||
<p><span>Last updated: 16/06/2020</span></p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -74,8 +74,673 @@
|
|||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h3>About OpenCDMP</h3>
|
||||
FAQ page placeholder.
|
||||
<h3>About ARGOS</h3>
|
||||
<h4>What is ARGOS?</h4>
|
||||
<p>Argos is an open and collaborative platform developed by <a href="https://www.openaire.eu/"
|
||||
target="_blank">OpenAIRE</a> to facilitate
|
||||
Research Data Management (RDM) activities concerning the implementation of Data
|
||||
Management Plans. It uses OpenAIRE guides created by the <a
|
||||
href="https://www.openaire.eu/task-forces-in-openaire-advance" target="_blank">RDM Task Force</a> to
|
||||
familiarize users with basic RDM concepts and guide them throughout the process of
|
||||
writing DMPs. It also utilises the OpenAIRE pool of services and inferred sources to
|
||||
make DMPs more dynamic in use and easier to be completed and published. Argos is
|
||||
based on the OpenDMP <a href="https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master"
|
||||
target="_blank">open source software</a> and is available through the <a
|
||||
href="http://catalogue.openaire.eu/" target="_blank">OpenAIRE
|
||||
Service catalogue</a> and the <a
|
||||
href="https://marketplace.eosc-portal.eu/services/argos?fromc=data-management"
|
||||
target="_blank">EOSC</a>.</p>
|
||||
|
||||
<br />
|
||||
<h4>Is Argos designed for one specific funder, e.g. the EC/Horizon Europe?</h4>
|
||||
<p>
|
||||
Argos is a flexible tool, designed to accommodate all research performing
|
||||
and research funding organisations’ policies and Research Data Management (RDM) needs.
|
||||
It already supports templates for different authorities.
|
||||
These templates are created by Admin users in Argos.
|
||||
In addition, we currently work to provide non-administrative users with the capability
|
||||
to modify templates according to their own needs.
|
||||
</p>
|
||||
<br />
|
||||
<h4>Why use Argos?</h4>
|
||||
<p>Argos is easy to use and navigate around. It familiarises users with the DMP process
|
||||
and provides guidance on basic RDM concepts so that users find useful resources to
|
||||
learn from without having to leave the Argos environment. Users can invite their
|
||||
colleagues and collaboratively work on completing a DMP. Moreover, Argos is an
|
||||
integral part of the OpeAIRE ecosystem and the <a href="https://zenodo.org/record/2643199#.X3HL0WgzY2x"
|
||||
target="_blank">Research
|
||||
Graph</a>. Argos integrates
|
||||
other services of the ecosystem to enable contextualisation of information, which is
|
||||
especially useful when data are re-used, for example to understand how/ if they can
|
||||
be repurposed.</p>
|
||||
<br />
|
||||
<h4>Who is Argos for?</h4>
|
||||
<p>Argos is designed as a tool for inclusive use by researchers, students, funders,
|
||||
research communities and institutions. It can be used in the context of research
|
||||
projects’ conduct to comply with funders’ RDM requirements, as a tool in support of
|
||||
literacy programmes in academia or can be independently deployed to meet given
|
||||
stakeholder demands. Also, it is available in native languages, thanks to the help
|
||||
of OpenAIRE NOADs, which strengthens common understanding of all researchers
|
||||
involved in the DMP writing process.
|
||||
By using Argos, researchers and students are able to create their DMPs in
|
||||
collaboration with other colleagues, learn basic RDM concepts throughout the process
|
||||
and publish DMPs as outputs in an open and FAIR manner, among other things by
|
||||
assigning DOIs and licenses and by maintaining DMPs as living documents through
|
||||
versioning.
|
||||
At the same time, Argos can be configured and deployed by funders, institutions and
|
||||
research communities. They can plug in their own services and/ or make use of
|
||||
OpenAIRE underlying services that Argos is built with ad-hoc.</p>
|
||||
<br />
|
||||
<h4>Using Argos</h4>
|
||||
<p>
|
||||
Argos consists of two main functionalities: DMPs and Datasets.
|
||||
Argos can be used for:
|
||||
<br /><br /><span style="padding:20px;">
|
||||
A. Viewing/ consulting publicly released DMPs and Datasets or Projects
|
||||
corresponding to
|
||||
DMPs
|
||||
</span><br /><br />
|
||||
Argos offers options for publishing DMPs in two modes, private or public. To view
|
||||
public DMPs and Datasets, there is no need for login to the platform.
|
||||
<br /><br /><span style="padding:20px;">
|
||||
B. Writing and publishing a DMP
|
||||
</span><br /><br />
|
||||
Argos helps researchers comply with mandates that may be attached to their grant
|
||||
proposal/ project funding. They can therefore choose from the most suitable to their
|
||||
needs template from the Datasets collection and proceed with answering the
|
||||
corresponding questions. Once finalized, researchers can assign a DOI to their DMP,
|
||||
publish and eventually cite it.
|
||||
<br /><br /><span style="padding:20px;">
|
||||
C. Practicing on writing DMPs and Dataset Descriptions
|
||||
</span><br /><br />
|
||||
Argos may be used for educational purposes. The process of Data Management Planning
|
||||
reflects the data management lifecycle, hence the tool can be used in response to
|
||||
global RDM training demands. Examples may refer to embedding DMPs and DMP tools in
|
||||
specific curricula or be embedded in library instructions’ sessions to familiarize
|
||||
researchers and students the processes of RDM and DMP.
|
||||
</p>
|
||||
<br />
|
||||
<h4>Can I exploit ARGOS DMPs?</h4>
|
||||
<p>
|
||||
Of course. If you want to compare DMPs or analyse DMP data, then we advise you to export the records in .xml.
|
||||
This schema is the most complete as it includes all information held in a DMP: information provided by the Admin
|
||||
when structuring the template and input provided by researchers when completing their DMPs.
|
||||
</p>
|
||||
<br />
|
||||
<h3>Manage Account</h3>
|
||||
<h4>Log in and out of Argos</h4>
|
||||
<p>
|
||||
You can log in Argos by selecting one of the providers from the Login page. Argos
|
||||
does not require Sign Up.
|
||||
</p>
|
||||
<br />
|
||||
<h4>Create an administrator account</h4>
|
||||
<p>
|
||||
If you are interested in becoming an administrator in Argos and benefit from extra
|
||||
features relevant to creating tailored templates, please email <a href="mailto:argos@openaire.eu"
|
||||
target="_blank">argos@openaire.eu</a> .
|
||||
</p>
|
||||
|
||||
<br />
|
||||
<h4>
|
||||
Switch from administrator account
|
||||
</h4>
|
||||
<p>
|
||||
There is no need to switch from your administrator account to use Argos. The only
|
||||
difference between regular users and administrators profiles in Argos is an extra
|
||||
set of tools at the bottom of the main tool bar that is positioned on the left
|
||||
handside.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Change your email
|
||||
</h4>
|
||||
<p>
|
||||
Argos does not have Sign Up. To change email, please see “Switch between accounts”.
|
||||
Alternatevily, you can add more email addresses to your user account by selecting
|
||||
the “Add alternative email” from your profile.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Switch between accounts
|
||||
</h4>
|
||||
<p>
|
||||
You can switch between email accounts by loging in with different providers from the
|
||||
Login page. The change depends on whether you have used different email addresses to
|
||||
sign up with those providers. On the occassion that only one email address is used
|
||||
for all providers offered by Argos, then no change is expected. You can always add
|
||||
new email accounts in your profile from the “Add alternative email” in your profile
|
||||
page.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Delete your account
|
||||
</h4>
|
||||
<p>
|
||||
If you want to delete your Argos profile, please email <a href="mailto:argos@openaire.eu"
|
||||
target="_blank">argos@openaire.eu</a> .
|
||||
</p>
|
||||
<br />
|
||||
<h3>
|
||||
Accounts access and safety
|
||||
</h3>
|
||||
<h4>
|
||||
How can I access my account and edit my profile?
|
||||
</h4>
|
||||
<p>
|
||||
You can access your profile page and make desired edits from clicking on the avatar
|
||||
at the very top of the toolbar located on the right handside.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can’t login to ARGOS
|
||||
</h4>
|
||||
<p>
|
||||
Please try using a different provider from the Login page and contact us at:
|
||||
<a href="mailto:argos@openaire.eu" target="_blank">argos@openaire.eu</a> .
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Accessing Argos
|
||||
</h4>
|
||||
<p>
|
||||
If you are reading this right now, you probably know the answer already! One way to
|
||||
access Argos is through the <a href="http://catalogue.openaire.eu/" target="_blank">OpenAIRE Service
|
||||
catalogue</a>. Another way is through the
|
||||
<a href="https://marketplace.eosc-portal.eu/services/argos?fromc=data-management" target="_blank">EOSC
|
||||
Catalogue</a>. But, you can always find Argos at
|
||||
argos.openaire.eu .
|
||||
To access Argos software, please visit
|
||||
<a href="https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master"
|
||||
target="_blank">https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master</a>
|
||||
.
|
||||
</p>
|
||||
<br />
|
||||
<h3>Argos User Roles</h3>
|
||||
<h4>
|
||||
Who is the author of a DMP?
|
||||
</h4>
|
||||
<p>
|
||||
Author of the DMP is everyone contributing to writing the DMP. Both Argos owners and
|
||||
Argos members are DMP authors. Researchers, however, are not DMP authors.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What is the difference between owners and
|
||||
members?
|
||||
</h4>
|
||||
<p>
|
||||
Argos DMP owner is the person initiating the DMP. People who are invited to join the
|
||||
DMP process are members who contribute to writing the DMP. DMP owners have extra
|
||||
editing rights and they are the ones to finalize the DMP process. Members can view
|
||||
and edit DMPs and Datasets, but can not perform further actions for its validation
|
||||
or finalization.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What is the role of a researcher in Argos?
|
||||
</h4>
|
||||
<p>
|
||||
Researchers in Argos are project contributors and usually those who own or have
|
||||
managed data described in respective DMPs.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can a researcher be a DMP author?
|
||||
</h4>
|
||||
<p>
|
||||
Of course! This depends on whether the researcher has also been involved in the DMP
|
||||
writing process.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What does an Admin user do?
|
||||
</h4>
|
||||
<p>
|
||||
Not everyone can become an Admin user in Argos. This happens upon request at
|
||||
<a href="mailto:argos@openaire.eu" target="_blank">argos@openaire.eu</a>. Admin users are able to create
|
||||
their own tailored templates from
|
||||
a specialised editor, configure their own APIs and integrate services with Argos in
|
||||
collaboration with and support of the Argos development team. Fees may apply
|
||||
according to the type of requests.
|
||||
</p>
|
||||
<br />
|
||||
<h3>Creating DMPs</h3>
|
||||
<h4>
|
||||
I can’t find my project in the list. What should
|
||||
I do?
|
||||
</h4>
|
||||
<p>
|
||||
DMPs that are created as part of the project proposal are not included in Argos.
|
||||
Only accepted project proposals are listed in the platform. If you can’t find your
|
||||
project in the list (drop-down menu), please use the “Insert manually”
|
||||
functionality.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
I can’t find my grant in the list. What should I
|
||||
do?
|
||||
</h4>
|
||||
<p>
|
||||
If you can’t find your grant in the list (drop-down menu), please use the “Insert
|
||||
manually” functionality.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
How do I edit and design my own DMP
|
||||
template?
|
||||
</h4>
|
||||
<p>
|
||||
You have to be an Admin user to design your own template in Argos. To learn more
|
||||
about Admin users, check “What does an Admin user do?”.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can I create my own templates in Argos?
|
||||
</h4>
|
||||
<p>
|
||||
Yes, you can, provided that you are an Admin user. To learn more about Admin users,
|
||||
check “What does an Admin user do?”.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What is the difference between “Save”, “Save &
|
||||
Close”, “Save & Add New”?
|
||||
</h4>
|
||||
<div>
|
||||
<p>They all perform the same action, but the difference lies in where you are directed
|
||||
after you have saved your DMP or Dataset.</p>
|
||||
<ul>
|
||||
<li>
|
||||
When choosing Save, information that you have added in the editor is kept
|
||||
and you
|
||||
can continue adding more from the same page you were working on.
|
||||
</li>
|
||||
<li>
|
||||
When choosing Save & Close, information that you have added is kept, but the
|
||||
editor’s window closes and you are redirected to your dashboard.
|
||||
</li>
|
||||
<li>
|
||||
[only for datasets] When choosing Save & Add New, information that you have
|
||||
added is
|
||||
kept, and you are redirected to another editor to start a new dataset.
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<br />
|
||||
<h4>
|
||||
Can I modify things once I have finalized
|
||||
them?
|
||||
</h4>
|
||||
<p>
|
||||
Yes, you can, as long as you haven’t assigned a DOI to your DMP. You just select
|
||||
“Undo Finalization”.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
How do I invite collaborators?
|
||||
</h4>
|
||||
<p>
|
||||
You may use the “Invite” button to share DMPs with your colleagues and start working
|
||||
on them together.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can scientists collaborate on the same DMP even though they may belong to different institutions (e.g. a hospital, a University, etc, collaborating on a project) and the dataset also "belongs" to different institutions?
|
||||
</h4>
|
||||
<p>
|
||||
Of course. Argos supports collaborations across diverse teams. There are two most frequent ways that can address this question:
|
||||
<br /><br /><span style="padding:20px;">
|
||||
A. Everyone works on the same DMP, but on different dataset descriptions
|
||||
</span><br /><br />
|
||||
In this case, each organisation makes its own dataset description(s) in a single DMP.
|
||||
That means that the manager (i.e. person responsible for the DMP activity) creates a DMP in ARGOS
|
||||
and shares it with everyone. If the DMP is shared with co-ownership rights,
|
||||
then the people will be able to edit it and add their dataset descriptions at any time during the project.
|
||||
If there is the need to control editing rights of people writing the DMPs, then the manager can create the dataset description(s)
|
||||
and share these each time with the team members that are responsible for adding input for the specified datasets.
|
||||
<br /><br /><span style="padding:20px;">
|
||||
B. Everyone works on their own DMP and content is later merged into one single DMP
|
||||
</span><br /><br />
|
||||
In this case, each organisation might work on their own DMP for the same project.
|
||||
At one point, you need to decide which DMP is going to be the core for the work you perform, share co-ownership
|
||||
between managers of all DMPs so they can copy all dataset descriptions of their DMPs in this single DMP document.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
How do I create an identical DMP or Dataset as a
|
||||
copy?
|
||||
</h4>
|
||||
<p>
|
||||
DMPs and Datasets can be cloned and used in different research contexts.
|
||||
Existing DMPs presenting similarities with new ones, can be cloned, changed name and
|
||||
then edited according to the new project data requirements.
|
||||
Existing Datasets can be cloned and used in new DMPs that are reusing data described
|
||||
in their context.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What is the DMP version? How is it set?
|
||||
</h4>
|
||||
<p>
|
||||
Versioning in Argos is both an internal and an external process. That means that
|
||||
versioning happens both in the Argos environment when editing the DMP, and outside
|
||||
of Argos when a DMP output is published in Zenodo. At every stage of the DMP
|
||||
lifecycle, users have the option of keeping versions of the DMPs they are editing.
|
||||
In Argos, users can create new versions of their DMPs by selecting the “Start New
|
||||
Version” option to keep track of the evolution of their DMP throughout the writing
|
||||
process. When published, versioning is associated with a DOI. Published DMPs are
|
||||
automatically versioned every time a newer version of the same output is uploaded in
|
||||
Zenodo.
|
||||
</p>
|
||||
<br />
|
||||
<h3>
|
||||
DMPs and Datasets
|
||||
</h3>
|
||||
<h4>
|
||||
What is the DMP?
|
||||
</h4>
|
||||
<p>
|
||||
A DMP in Argos consists of vital information about the research project on behalf of
|
||||
which the DMP is created and of more in depth information about the management,
|
||||
handling and curation of datasets collected, produced or reused during the research
|
||||
lifetime. A DMP in Argos accommodates documentation of more than one datasets. That
|
||||
way datasets are provided with the flexibility to be described separately, following
|
||||
different templates per type of dataset or research community concerned each time,
|
||||
also possible to be copied and used in multiple DMPs. Datasets are then bundled up
|
||||
in a DMP and can be shared more broadly. Special attention is given to the handling
|
||||
of data that are being re-used via OpenAIRE APIs.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
How do I find which Dataset template to use?
|
||||
</h4>
|
||||
<p>
|
||||
This depends on the reason why you are creating a DMP in the first place. If it is
|
||||
for compliance matters with funders, institutions or research communities RDM
|
||||
policies, then you may select the dataset template of that particular stakeholder.
|
||||
If you are creating a DMP for training purposes, you may select and work on any
|
||||
template from the Argos collection.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
How do I create my own Dataset template?
|
||||
</h4>
|
||||
<p>
|
||||
Currently, it is not possible for all Argos users to create dataset templates of
|
||||
their own, so they have to work on predefined templates. Additional rights for
|
||||
editing Dataset templates according to tailored needs have Admin users. This is
|
||||
expected to change in the near future. To learn more about Admin users, check “What
|
||||
does an Admin user do?”.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can I create smaller versions of a template for project proposals?
|
||||
</h4>
|
||||
<p>
|
||||
Yes, it is possible in Argos to create short versions of templates that can be used
|
||||
for grant proposals, such as for Horizon Europe.
|
||||
If you are interested in working with us to create this short version of any ARGOS template,
|
||||
please contact us: <a href="mailto:argos@openaire.eu" target="_blank">argos@openaire.eu</a>.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can I customise an existing template (e.g. for a specific institution)?
|
||||
</h4>
|
||||
<p>
|
||||
Yes, you can. In the current version, this is possible for Admin users who have their own deployment on-premises or cloud.
|
||||
Please note that this subject to change in the near future as we are working on a feature that will allow all users
|
||||
to customise (remove/add/extend) specific questions on the template they are working on.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What is a Dataset?
|
||||
</h4>
|
||||
<p>
|
||||
A Dataset in Argos is an editor with set up questions that support the creation of
|
||||
descriptions of how data are / have been handled, managed and curated throughout the
|
||||
research data lifecycle. The editor holds a collection of Dataset templates each one
|
||||
with different sets of predefined questions as per funders, institutions, research
|
||||
communities RDM policy requirements. Researchers and students can choose the
|
||||
template that corresponds to their RDM needs in order to get funding or get their
|
||||
degree, respectively. A DMP in Argos may consist of one or more datasets.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Why do I need more than one Dataset?
|
||||
</h4>
|
||||
<p>
|
||||
You don’t necessarily need to have many Datasets in a DMP. However, you might be
|
||||
producing a plethora of data during your research that are diverse in type and/ or
|
||||
scope of collection/ re-use, thus presenting diverse management needs. Argos gives
|
||||
you the flexibility to describe all data produced and/ or re-used in your research
|
||||
separately. That way it is easy to perform the mapping of information provided in a
|
||||
DMP to the respective data types or data collections they correspond to. Equally,
|
||||
reuse of particular datasets in different DMPs is easier. For the latter, please
|
||||
check “How do I create an identical DMP or Dataset as a copy?”.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
It is not very clear to me when one should choose to add a dataset or to describe several "data products" in the same description.
|
||||
</h4>
|
||||
<p>
|
||||
This is something that has to be tackled conceptually, from the author of the DMP.
|
||||
If those "products" have their own lifetime and rules (IPR, Access rights, etc), they should be described as different datasets.
|
||||
Alternative formats should not be treated as different datasets, unless they have other differences due to the format, too.
|
||||
But, for instance, if you have datasets in CSV and JSON formats and under the same terms, they could be seen as one dataset description in the DMP.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can I add to my DMP information about datasets published on Zenodo?
|
||||
</h4>
|
||||
<p>
|
||||
Argos offers a search to Zenodo for prefilling the DMP you are working with dataset metadata.
|
||||
This search has been developed according to the rules set by Zenodo
|
||||
and therefore has the same behaviour as when you are using the search bar on the Zenodo interface.
|
||||
However, we understand the need to be able to find records with their PID,
|
||||
hence we introduced some changes and now support searching DOIs from the Argos interface.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Is it possible to describe a dataset that is not yet in a repository?
|
||||
</h4>
|
||||
<p>
|
||||
Of course! You can choose to manually describe your dataset, e.g. for a dataset you are planning to produce,
|
||||
instead of pre-filling the template with available metadata from a dataset that has already been shared and preserved in a repository.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What are public DMPs and Datasets?
|
||||
</h4>
|
||||
<p>
|
||||
Public DMPs and Public Datasets are collections of openly available Argos outputs.
|
||||
That means that DMP owners and members are making their DMP and/or Dataset outputs
|
||||
available to all Argos and non-Argos users who might want to consult or re-use them
|
||||
under the framework provided by the assigned DMP license. Please also check “Is all
|
||||
the information I create visible by default?”.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Is all information I create visible by
|
||||
default?
|
||||
</h4>
|
||||
<p>
|
||||
No, it is not. You can choose how your DMP is displayed in Argos from the
|
||||
“Visibility” option. Choosing Public will immediately locate your DMP in the “Public
|
||||
DMPs” collection and make it available to all Argos and non-Argos users.
|
||||
Choosing Private will keep the DMP visible only to you and to the people invited to
|
||||
edit the DMP in collaboration with you. Private DMPs are not publicly displayed to
|
||||
other users.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What is the difference between the DMP and the dataset export?
|
||||
</h4>
|
||||
<p>
|
||||
DMP export contains all vital information for a DMP, including funding and dataset details,
|
||||
while dataset export is a subset of the DMP export containing information only about a dataset described in the DMP.
|
||||
Both DMP and Dataset exports are available in .pdf, .docx, .xml.
|
||||
In addition, DMP export is available in the RDA .json format
|
||||
to increase interoperability of ARGOS exchanged DMPs.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Is there a storage allowance limitation for the
|
||||
DMPs and Dataset files?
|
||||
</h4>
|
||||
<p>
|
||||
No, there is no storage limit or fee for either files stored in Argos.
|
||||
</p>
|
||||
<br />
|
||||
<h3>
|
||||
Publishing DMPs
|
||||
</h3>
|
||||
<h4>
|
||||
Is it possible to publish DMPs in different repositories (so not Zenodo)?
|
||||
</h4>
|
||||
<p>
|
||||
Yes, it is possible.
|
||||
But, to have different repositories attached to the system, you will need your own on-premises or cloud deployment.
|
||||
We are already working on that for DSpace and Dataverse repositories.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Do you know that Zenodo has empty DMPs from ARGOS?
|
||||
</h4>
|
||||
<p>
|
||||
Yes, we are aware of that.
|
||||
Argos has no control over the DMPs that you generate and publish and thus can not be held accountable for empty DMPs.
|
||||
Please remember that, as on all other occasions where you publish content, you should do so responsinbly.
|
||||
If you have any questions regarding publishing DMPs, don’t hesitate to contact us at <a href="mailto:argos@openaire.eu" target="_blank">argos@openaire.eu</a>.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Once I upload a final version of a DMP to Zenodo, do I need to update this first final version from Zenodo or from Argos?
|
||||
</h4>
|
||||
<p>
|
||||
Both options are possible according to how you have deposited the DMP in the first place.
|
||||
If you have deposited your DMP with a token (i.e. from the ARGOS account on Zenodo),
|
||||
then you won’t have editing rights on the Zenodo record, but you will still be able to make changes
|
||||
on ARGOS by starting and depositing a new version of the published DMP.
|
||||
However, if you have deposited your DMP using your own account on Zenodo (i.e. login to Zenodo with your own credentials),
|
||||
then you are able to also make minor changes, e.g. on the title of the DMP, directly from the Zenodo interface.
|
||||
</p>
|
||||
<br />
|
||||
<h3>Troubleshooting</h3>
|
||||
<h4>
|
||||
Can’t finalize a DMP
|
||||
</h4>
|
||||
<p>
|
||||
You might be experiencing this problem because there are incomplete mandatory fields
|
||||
in your DMP. Please check for those fields, fill in with appropriate information and
|
||||
try again. Should the problem persists, please contact <a href="mailto:argos@openaire.eu"
|
||||
target="_blank">argos@openaire.eu</a> .
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can’t co-edit a DMP
|
||||
</h4>
|
||||
<p>
|
||||
DMPs can be shared with many colleagues in support of collaborative writing, but
|
||||
DMPs should be worked by one person at a time. Argos will inform you if another
|
||||
colleague has the DMP you are trying to edit open, so that your team avoids
|
||||
information loss.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Deposit is not working
|
||||
</h4>
|
||||
<p>
|
||||
You need to have a Zenodo login to perform a deposit. Please sign up in Zenodo or
|
||||
use the token option to publish your DMPs and get a DOI.
|
||||
</p>
|
||||
<br />
|
||||
<h3>Legal and privacy</h3>
|
||||
<h4>
|
||||
Is Argos open source?
|
||||
</h4>
|
||||
<p>
|
||||
Yes, it is. The OpenDMP software that Argos has deployed upon is open source code
|
||||
available under Apache 2.0 license. You may find more information about the software
|
||||
<a href="https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master"
|
||||
target="_blank">here</a>.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Can I contribute to Argos development?
|
||||
</h4>
|
||||
<p>
|
||||
Of course! Please feel free to suggest new features and to actively contribute to
|
||||
Argos development via pull requests in <a
|
||||
href="https://code-repo.d4science.org/MaDgiK-CITE/argos/src/branch/master"
|
||||
target="_blank">Gitea</a>.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Is Argos GDPR compliant?
|
||||
</h4>
|
||||
<p>
|
||||
Argos takes all necessary steps in handling and protecting personal and sensitive
|
||||
information. Please check the <a href="https://argos.openaire.eu/terms-and-conditions"
|
||||
target="_blank">Argos Terms of Service and Privacy Policy</a>.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Which is the Argos data policy?
|
||||
</h4>
|
||||
<p>
|
||||
Please find all information about Argos Terms of Service and Privacy, <a
|
||||
href="https://argos.openaire.eu/terms-and-conditions" target="_blank">here</a>.
|
||||
Additionally, you may find Argos Cookies policy, <a href="https://argos.openaire.eu/cookies-policy"
|
||||
target="_blank">here</a>.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
What is the work ownership of information
|
||||
created in Argos?
|
||||
</h4>
|
||||
<p>
|
||||
Unless there are any contractual or institutional agreements stating ownership of
|
||||
outputs produced in the context of a project/ collaboration, owners of Argos outputs
|
||||
are DMP contributors, i.e. DMP owners and DMP members, who have been involved with
|
||||
writing the DMP.
|
||||
</p>
|
||||
<br />
|
||||
<h4>
|
||||
Which are the terms and policies of Argos?
|
||||
</h4>
|
||||
<p>
|
||||
Please find all information about Argos Terms of Service and Privacy, <a
|
||||
href="https://argos.openaire.eu/terms-and-conditions" target="_blank">here</a>.
|
||||
Additionally, you may find Argos Cookies policy, <a href="https://argos.openaire.eu/cookies-policy"
|
||||
target="_blank">here</a>.
|
||||
</p>
|
||||
|
||||
<!-- <h4>What is ARGOS?</h4>
|
||||
<p>ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.</p>
|
||||
|
||||
<br />
|
||||
<h4>Who is it for?</h4>
|
||||
<p>ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.</p>
|
||||
|
||||
<br />
|
||||
<h4>How can I use it?</h4>
|
||||
<p>ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.<br />ARGOS can be used for:
|
||||
<br /><br /><u style="padding:20px;"> A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs</u><br /><br />
|
||||
The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform.
|
||||
|
||||
<br /><br /><u style="padding:20px;"> B. writing and publishing a DMP</u><br /><br />
|
||||
The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it.
|
||||
|
||||
<br /><br /><u style="padding:20px;"> C. practicing in writing DMPs and Dataset Descriptions</u><br /><br />
|
||||
Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions.
|
||||
</p>
|
||||
|
||||
<br />
|
||||
<h4>What is the difference between the “Wizard” and the “Expert” modes/ features?</h4>
|
||||
<p>There are two ways of creating a DMP: the “Wizard” and the “Expert”. The DMP Wizard combines the most necessary fields of the DMP template and the Data Description template. It is an easy way of starting a DMP and completing a Dataset Description. The downside when using the Wizard is that it only supports one Dataset Description. To add more datasets documentation, someone must open the DMP from DMP Expert.
|
||||
<br />DMP expert contains extra fields for describing the project, grant, funding, contributors and associations between DMP authors, etc. DMP Expert is advised for use when further modification and personalization is to take place.
|
||||
</p> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,29 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
Terms of Service page placeholder.
|
||||
<p><span>The </span><span>OpenDMP</span><span> service was developed to provide a more flexible, </span><span>collaborative </span><span>environment with machine actionable solutions in writing, sharing and publishing Data Management Plans (DMPs). It is a product of </span><span>cooperation between </span><span>OpenAIRE </span><span>AMKE</span><span class="c0"> and EUDAT CDI and is offered both as a software “OpenDMP '' and as an online service under the name “ARGOS”. </span></p>
|
||||
<p><span></span></p>
|
||||
<ol>
|
||||
<li><span><a href="https://code-repo.d4science.org/MaDgiK-CITE/argos">OpenDMP software</a></span><span> is offered under the Free Open Source Software license </span><span>Apache 2.0</span><span class="c0">, for further development and use by institutions and interested parties.</span></li>
|
||||
<li><span><a href="https://argos.openaire.eu/">ARGOS</a></span><span> service</span><span> is offered by</span><span> </span><span>OpenAIRE</span><span> as </span><span>part of its mission to support Open Science in the European Research Area, focusing on information linking and contextualisation that enriches its </span><span class="c5"><a href="https://zenodo.org/record/2600275#.XZpJgUYzY2w">Research Graph</a></span><span>.</span><span class="c0"> Use of ARGOS denotes agreement with the following terms:</span>
|
||||
<ol>
|
||||
<li><span>ARGOS is a software interface and a database with no storage capacity to store or preserve research data. The DMPs created are hosted in the </span><span>OpenAIRE </span><span>production environment for the sole purpose of exposing the DMP records once finalised (“published”). If assigned a DOI, the DMP records are linked to and preserved in Zenodo, the OpenAIRE’s repository service. The ARGOS service is made available for use free-of-charge for research, educational and informational purposes.</span></li>
|
||||
<li><span>Login to ARGOS is possible through a variety of external providers, among which Google, Facebook, Twitter, B2Access </span><span>and OpenAIRE Login</span><span>, that share information of their user profiles with ARGOS, </span><span>according to the rights that have been granted to the given provider by the user.</span><span> External email addresses that are used in invitations for collaborations are held in ARGOS database that stores information about only the </span><span class="c11">name</span><span>, </span><span class="c11">surname</span><span> </span><span>and </span><span class="c11">email address</span><span> </span><span>of the DMP creator and collaborator. Personal data is collected via the login option and via email invitations sent to external DMP contributors. This personal information as well as the activity of ARGOS users is used only for deriving usage metrics and assessing the service quality. They are stored in ARGOS database for as long as the account is active and they are accessible only from people in the team in charge of </span><span>quality and risk assessment</span><span>. </span><span>They will not be used for other purposes other than the ones stated in this document and they can be deleted at any time should the user claim a relevant request. </span><span>The aforementioned processes are also facilitated by the use of c</span><span>ookies</span><span> (see below the “Cookie policy”). </span></li>
|
||||
<li><span>Data concerning DMP information will be used by OpenAIRE for research and development </span><span>purposes, </span><span>such as identifying DMP models, and for ensuring compliance with policy requirements and monitoring of DMPs uptake linked to OpenAIRE’s Monitoring Dashboards and the Open Science Observatory.</span></li>
|
||||
<li><span>The DMP Manager</span><span>, i.e. the person who creates and manages a DMP, and/ or the </span><span>contributor, i.e. the person who is invited to collaborate on a DMP, shall ensure that content is accurate and presented in a way that adheres to these </span><span>Terms of Service</span><span> and applicable laws, including, but not limited to, privacy, data protection and intellectual property rights.</span></li>
|
||||
<li><span>ARGOS service is provided by OpenAIRE “as is”. Although OpenAIRE and its partners take measures for the availability, dependability, and accuracy of the service, access to ARGOS, utilisation of its features and preservation of the data deposited or produced by the service are not guaranteed. OpenAIRE cannot be held responsible </span><span>for any data loss regarding DMPs,</span><span> ethical or financial damage or any other direct or indirect impact that any failure of ARGOS service may have on its users. </span></li>
|
||||
<li><span>ARGOS </span><span>users are exclusively responsible for their use of content, and shall hold OpenAIRE free and harmless in connection with their download and/or use.</span></li>
|
||||
<li><span>OpenAIRE may not be held responsible for the content provided </span><span>or statements</span><span> made in Data Management Plans created and managed by its users. </span></li>
|
||||
<li><span>All content is provided “as-is”. Users of content (“Users”) shall respect applicable license conditions. Download and use of content from ARGOS does not transfer any intellectual property rights in the content to the User.</span></li>
|
||||
<li><span>In the case any content is reported as violating third party rights or other legal provisions, ARGOS reserves the right to remove the content from the service until the dispute is legally settled. Any such incidents should be reported at </span><span class="c5"><a href="mailto:noticeandtakedown@openaire.eu">noticeandtakedown@openaire.eu</a></span><span class="c0"> </span></li>
|
||||
<li><span>ARGOS users are held responsible for the data and information they provide in the service. Users may not add information, data or any other type of artifact that may be </span><span>malicious</span><span>, intentionally erroneous and potentially harmful for other ARGOS users, IPR owners and/or the general public.</span></li>
|
||||
<li><span>In case a user of ARGOS identifies a potential </span><span>infringement</span><span> of copyright, </span><span>harmful</span><span> or </span><span>malicious </span><span>operation, function, code, information or data, shall inform OpenAIRE providing sufficient evidence for the identification of the case and the information and/or data challenged.</span></li>
|
||||
<li><span>OpenAIRE reserves the right, without notice, at its sole discretion and without liability, (i) to alter or delete inappropriate content, and (ii) to restrict or remove User access where it considers that use of ARGOS interferes with its operations or violates these Terms of Service or applicable laws.</span></li>
|
||||
<li><span>These Terms of Service are subject to change by OpenAIRE at any time and without notice, other than through posting the updated Terms of Service on the OpenAIRE website and indicating the version and date of last update.</span></li>
|
||||
</ol>
|
||||
</li>
|
||||
</ol>
|
||||
<p><span>For any questions or comments you may have about the current Terms of Service, please contact us: </span><span class="c5"><a href="mailto:argos@openaire.eu">argos@openaire.eu</a></span><span class="c0"> </span></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -427,7 +427,18 @@ public class DatasetMigrationService {
|
|||
propertyDefinitionFieldSetEntity.setItems(new ArrayList<>());
|
||||
propertyDefinitionEntity.getFieldSets().put(currentFieldSet.getId().trim(), propertyDefinitionFieldSetEntity);
|
||||
}
|
||||
propertyDefinitionFieldSetEntity.setComment(comment);
|
||||
|
||||
PropertyDefinitionFieldSetItemEntity propertyDefinitionFieldSetItemEntity;
|
||||
if (this.conventionService.isListNullOrEmpty(propertyDefinitionFieldSetEntity.getItems())){
|
||||
propertyDefinitionFieldSetItemEntity = new PropertyDefinitionFieldSetItemEntity();
|
||||
propertyDefinitionFieldSetItemEntity.setFields(new HashMap<>());
|
||||
propertyDefinitionFieldSetItemEntity.setOrdinal(SimpleFieldSetOrdinal);
|
||||
propertyDefinitionFieldSetEntity.getItems().add(propertyDefinitionFieldSetItemEntity);
|
||||
} else {
|
||||
propertyDefinitionFieldSetItemEntity = propertyDefinitionFieldSetEntity.getItems().getFirst();
|
||||
}
|
||||
|
||||
propertyDefinitionFieldSetItemEntity.setComment(comment);
|
||||
}
|
||||
|
||||
private FieldEntity buildField(Dataset item, org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField, Object propertyValue, Map<UUID, ReferenceTypeDefinitionEntity> referenceTypeDefinitionEntityMap, Map<ReferenceKey, ReferenceEntity> referenceMap, int ordinal, List<DescriptionReferenceEntity> createdDescriptionReferenceEntities, Map<TagKey, UUID> savedTagIdsByName, HashSet<UUID> existingTagIds){
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
# Frontend2
|
||||
|
||||
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.7.4.
|
||||
|
||||
## Development server
|
||||
|
||||
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
|
||||
|
||||
## Code scaffolding
|
||||
|
||||
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
|
||||
|
||||
## Build
|
||||
|
||||
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
|
||||
|
||||
## Running unit tests
|
||||
|
||||
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
|
||||
|
||||
## Running end-to-end tests
|
||||
|
||||
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
|
||||
|
||||
## Further help
|
||||
|
||||
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
|
||||
Loading…
Reference in New Issue