MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Fixes various code missteps, moves mock data and readds eestore on external source.

This commit is contained in:
gkolokythas 2019-10-14 14:14:09 +03:00
parent cc2bb9afd2
commit f5aeb56133
15 changed files with 404 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
View File

@ -88,9 +88,8 @@ public class DMPs extends BaseController {
@RequestMapping(method = RequestMethod.GET, value = {"{id}"}) @RequestMapping(method = RequestMethod.GET, value = {"{id}"})
public @ResponseBody public @ResponseBody
ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, Principal principal) throws IllegalAccessException, InstantiationException, IOException { ResponseEntity getSingle(@PathVariable String id, @RequestHeader("Content-Type") String contentType, Principal principal) throws IllegalAccessException, InstantiationException, IOException {
if (contentType.equals("application/xml") || contentType.equals("application/msword")) { //|| contentType.equals("application/pdf") if (contentType.equals("application/xml") || contentType.equals("application/msword")) {
ResponseEntity<byte[]> document = this.dataManagementPlanManager.getDocument(id, contentType); return this.dataManagementPlanManager.getDocument(id, contentType);
return document;
} else { } else {
eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = this.dataManagementPlanManager.getSingle(id, principal, this.dynamicGrantConfiguration); eu.eudat.models.data.dmp.DataManagementPlan dataManagementPlan = this.dataManagementPlanManager.getSingle(id, principal, this.dynamicGrantConfiguration);
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlan>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan)); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlan>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));

6
dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java
View File

@ -39,18 +39,18 @@ public class DatasetProfileController extends BaseController {
this.datasetProfileManager = datasetProfileManager; this.datasetProfileManager = datasetProfileManager;
} }
@Transactional /* @Transactional
@RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/save/{id}"}, consumes = "application/json", produces = "application/json") @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/save/{id}"}, consumes = "application/json", produces = "application/json")
public ResponseEntity<Object> updateDataset(@PathVariable String id, @RequestBody PropertiesModel properties) { public ResponseEntity<Object> updateDataset(@PathVariable String id, @RequestBody PropertiesModel properties) {
eu.eudat.data.entities.Dataset dataset = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id)); eu.eudat.data.entities.Dataset dataset = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id));
Map<String, Object> values = new HashMap(); Map<String, Object> values = new HashMap<>();
properties.toMap(values); properties.toMap(values);
JSONObject jobject = new JSONObject(values); JSONObject jobject = new JSONObject(values);
dataset.setProperties(jobject.toString()); dataset.setProperties(jobject.toString());
dataset.setStatus((short) properties.getStatus()); dataset.setStatus((short) properties.getStatus());
this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); //TODO this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset); //TODO
return ResponseEntity.status(HttpStatus.OK).body(properties); return ResponseEntity.status(HttpStatus.OK).body(properties);
} }*/
@Transactional @Transactional
@RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/clone/{id}"}, consumes = "application/json", produces = "application/json") @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/clone/{id}"}, consumes = "application/json", produces = "application/json")

1
dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java
View File

@ -54,7 +54,6 @@ public class B2AccessCustomProviderImpl implements B2AccessCustomProvider {
map.add("redirect_uri", redirectUri); map.add("redirect_uri", redirectUri);
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(map, headers); HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(map, headers);
Map<String, Object> values = template.postForObject(this.environment.getProperty("b2access.externallogin.access_token_url"), request, Map.class); Map<String, Object> values = template.postForObject(this.environment.getProperty("b2access.externallogin.access_token_url"), request, Map.class);
B2AccessResponseToken b2AccessResponseToken = new B2AccessResponseToken(); B2AccessResponseToken b2AccessResponseToken = new B2AccessResponseToken();
b2AccessResponseToken.setAccessToken((String) values.get("access_token")); b2AccessResponseToken.setAccessToken((String) values.get("access_token"));

804
dmp-backend/web/src/main/resources/ExternalUrls.xml
View File

@ -25,40 +25,40 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/metadataschemarepo/</url>--> <url>https://eestore.paas2.uninett.no/api/metadataschemarepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>RegistriesInternalMockUpData.json</url>--> <url>mockData/RegistriesInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <label>'name'</label>--> <label>'name'</label>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</registries> </registries>
@ -84,40 +84,40 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/tags/</url>--> <url>https://eestore.paas2.uninett.no/api/tags/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>internal</label>--> <label>internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>TagsInternalMockUpData.json</url>--> <url>mockData/TagsInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</tags> </tags>
@ -127,7 +127,7 @@
<urlConfig> <urlConfig>
<key>cristin</key> <key>cristin</key>
<label>Cristin</label> <label>Cristin</label>
<ordinal>1</ordinal> <ordinal>2</ordinal>
<url>https://eestore.paas2.uninett.no/api/projectrepo/?search={like}&amp;page={page}&amp;size={pageSize}</url> <url>https://eestore.paas2.uninett.no/api/projectrepo/?search={like}&amp;page={page}&amp;size={pageSize}</url>
<firstPage>1</firstPage> <firstPage>1</firstPage>
<contenttype>application/vnd.api+json; charset=utf-8</contenttype> <contenttype>application/vnd.api+json; charset=utf-8</contenttype>
@ -160,167 +160,161 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>--> <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <url>GrantInternalMockUpData.json</url>--> <url>mockData/GrantInternalMockUpData.json</url>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</grants> </grants>
<projects> <projects>
<urls> <urls>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>cristin</key>--> <key>cristin</key>
<!-- <label>Cristin</label>--> <label>Cristin</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>--> <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>
<!-- <firstPage>1</firstPage>--> <firstPage>1</firstPage>
<!-- <contenttype>application/vnd.api+json; charset=utf-8</contenttype>--> <contenttype>application/vnd.api+json; charset=utf-8</contenttype>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>openAIRE</key>--> <key>openAIRE</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://services.openaire.eu/search/v2/api/resources?query=((oaftype%20exact%20project)%20and%20((projectcode_nt%20exact%20%22*%22)or(*)))&amp;fq=(funder%20exact%20{funderId})&amp;page={page}&amp;size={pageSize}&amp;format=json</url>--> <url>https://services.openaire.eu/search/v2/api/resources?query=((oaftype%20exact%20project)%20and%20((projectcode_nt%20exact%20%22*%22)or(*)))&amp;fq=(funder%20exact%20{funderId})&amp;page={page}&amp;size={pageSize}&amp;format=json</url>
<!-- <firstPage>0</firstPage>--> <firstPage>0</firstPage>
<!-- <contenttype>application/json; charset=utf-8</contenttype>--> <contenttype>application/json; charset=utf-8</contenttype>
<!-- <data>--> <data>
<!-- <path>$['response']['results']['result'][*]['metadata']['oaf:entity']['oaf:project']</path>--> <path>$['response']['results']['result'][*]['metadata']['oaf:entity']['oaf:project']</path>
<!-- <fields>--> <fields>
<!-- <id>'originalId'</id>--> <id>'originalId'</id>
<!-- <name>'title'</name>--> <name>'title'</name>
<!-- <count>'count'</count>--> <count>'count'</count>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>--> <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>ProjectInternalMockUpData.json</url>--> <url>mockData/ProjectInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</projects> </projects>
<funders> <funders>
<urls> <urls>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>cristin</key>--> <key>cristin</key>
<!-- <label>Cristin</label>--> <label>Cristin</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <search>--> <type>External</type>
<!-- <type>queryParam</type>--> <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>
<!-- <queryparam>search</queryparam>--> <contenttype>application/vnd.api+json; charset=utf-8</contenttype>
<!-- </search>--> <data>
<!-- <page>--> <path>$['data'][*]['attributes']</path>
<!-- <type>queryParam</type>--> <fields>
<!-- <pageparam>page</pageparam>--> <id>'pid'</id>
<!-- </page>--> <name>'name'</name>
<!-- <type>External</type>--> <uri>'uri'</uri>
<!-- <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>--> <description>'description'</description>
<!-- <contenttype>application/vnd.api+json; charset=utf-8</contenttype>--> </fields>
<!-- <data>--> </data>
<!-- <path>$['data'][*]['attributes']</path>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- <fields>--> </urlConfig>-->
<!-- <id>'pid'</id>-->
<!-- <name>'name'</name>-->
<!-- <uri>'uri'</uri>-->
<!-- <description>'description'</description>-->
<!-- </fields>-->
<!-- </data>-->
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>-->
<!-- </urlConfig>-->
<!-- <urlConfig>-->
<!-- <key>openAire</key>-->
<!-- <label>OpenAIRE</label>-->
<!-- <ordinal>1</ordinal>-->
<!-- <type>External</type>-->
<!-- <url>https://eestore.paas2.uninett.no/api/projectrepo/</url>-->
<!-- <data>-->
<!-- <path>$['data'][*]['attributes']</path>-->
<!-- <fields>-->
<!-- <id>'pid'</id>-->
<!-- <name>'name'</name>-->
<!-- <uri>'uri'</uri>-->
<!-- <description>'description'</description>-->
<!-- </fields>-->
<!-- </data>-->
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>-->
<!-- </urlConfig>-->
<urlConfig> <urlConfig>
<key>openAire</key>
<label>OpenAIRE</label>
<ordinal>1</ordinal>
<type>External</type>
<url>https://eestore.paas2.uninett.no/api/projectrepo/</url>
<contenttype>application/vnd.api+json; charset=utf-8</contenttype>
<data>
<path>$['data'][*]['attributes']</path>
<fields>
<id>'pid'</id>
<name>'name'</name>
<uri>'uri'</uri>
<description>'description'</description>
<source>'source'</source>
</fields>
</data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig>
<!-- <urlConfig>
<key>servicesOpenAire</key> <key>servicesOpenAire</key>
<label>OpenAIRE</label> <label>OpenAIRE</label>
<ordinal>1</ordinal> <ordinal>1</ordinal>
@ -387,24 +381,24 @@
<count>'count'</count> <count>'count'</count>
</fields> </fields>
</data> </data>
</urlConfig> </urlConfig>-->
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>FunderInternalMockUpData.json</url>--> <url>FunderInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</funders> </funders>
@ -430,40 +424,40 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/datarepo/</url>--> <url>https://eestore.paas2.uninett.no/api/datarepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>RepositoriesInternalMockUpData.json</url>--> <url>mockData/RepositoriesInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</repositories> </repositories>
@ -490,40 +484,40 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/servicerepo/</url>--> <url>https://eestore.paas2.uninett.no/api/servicerepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>ServicesInternalMockUpData.json</url>--> <url>mockData/ServicesInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <label>'name'</label>--> <label>'name'</label>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</services> </services>
@ -550,40 +544,40 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/personrepo/</url>--> <url>https://eestore.paas2.uninett.no/api/personrepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>ResearcherInternalMockUpData.json</url>--> <url>mockData/ResearcherInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</researchers> </researchers>
@ -610,40 +604,40 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/organizationrepo/</url>--> <url>https://eestore.paas2.uninett.no/api/organizationrepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>OrganisationInternalMockUpData.json</url>--> <url>mockData/OrganisationInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</organisations> </organisations>
@ -669,40 +663,40 @@
</data> </data>
<paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
</urlConfig> </urlConfig>
<!-- <urlConfig>--> <!-- <urlConfig>
<!-- <key>openAire</key>--> <key>openAire</key>
<!-- <label>OpenAIRE</label>--> <label>OpenAIRE</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>External</type>--> <type>External</type>
<!-- <url>https://eestore.paas2.uninett.no/api/datasetrepo/</url>--> <url>https://eestore.paas2.uninett.no/api/datasetrepo/</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>
<!-- <urlConfig>--> <urlConfig>
<!-- <key>internal</key>--> <key>internal</key>
<!-- <label>Internal</label>--> <label>Internal</label>
<!-- <ordinal>1</ordinal>--> <ordinal>1</ordinal>
<!-- <type>Internal</type>--> <type>Internal</type>
<!-- <url>DatasetsInternalMockUpData.json</url>--> <url>mockData/DatasetsInternalMockUpData.json</url>
<!-- <data>--> <data>
<!-- <path>$['data'][*]['attributes']</path>--> <path>$['data'][*]['attributes']</path>
<!-- <fields>--> <fields>
<!-- <id>'pid'</id>--> <id>'pid'</id>
<!-- <name>'name'</name>--> <name>'name'</name>
<!-- <uri>'uri'</uri>--> <uri>'uri'</uri>
<!-- <description>'description'</description>--> <description>'description'</description>
<!-- </fields>--> </fields>
<!-- </data>--> </data>
<!-- <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>--> <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
<!-- </urlConfig>--> </urlConfig>-->
</urls> </urls>
<fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' --> <fetchMode>FIRST</fetchMode> <!-- EITHER 'FIRST' OR 'ALL' -->
</datasets> </datasets>

0
dmp-backend/web/src/main/resources/DatasetsInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/DatasetsInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/FunderInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/FunderInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/GrantInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/GrantInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/OrganisationInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/OrganisationInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/ProjectInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/ProjectInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/RegistriesInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/RegistriesInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/RepositoriesInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/RepositoriesInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/ResearcherInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/ResearcherInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/ServicesInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/ServicesInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/TagsInternalMockUpData.json → dmp-backend/web/src/main/resources/mockData/TagsInternalMockUpData.json
View File

0
dmp-backend/web/src/main/resources/mockupTags.json → dmp-backend/web/src/main/resources/mockData/mockupTags.json
View File