diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainController.java index debaff70..2300dfc2 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainController.java @@ -1,6 +1,8 @@ package eu.dnetlib.is; +import java.util.Arrays; import java.util.Optional; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -16,6 +18,7 @@ import eu.dnetlib.data.is.resource.model.ResourceType; import eu.dnetlib.data.is.resource.repository.ResourceTypeRepository; import eu.dnetlib.data.is.vocabulary.model.Vocabulary; import eu.dnetlib.data.is.vocabulary.repository.VocabularyRepository; +import eu.dnetlib.is.info.KeyValue; import eu.dnetlib.is.wfs.WfHistoryAjaxController; import eu.dnetlib.openaire.dsm.utils.DsmBrowsableFields; @@ -34,15 +37,12 @@ public class MainController { @GetMapping("/main") public void mainPage() {} - @GetMapping("/searchDatasources") + @GetMapping("/dsm") public void searchDsApi(final ModelMap map) { - map.addAttribute("browsableFields", DsmBrowsableFields.values()); - } - - @GetMapping("/resultsDatasources") - public void resultsDsApi(@RequestParam(required = false, defaultValue = "") final String field, @RequestParam final String value, final ModelMap map) { - map.addAttribute("field", field); - map.addAttribute("value", value); + map.addAttribute("pageSize", 100); + map.addAttribute("browsableFields", Arrays.stream(DsmBrowsableFields.values()) + .map(f -> new KeyValue(f.name(), f.desc)) + .collect(Collectors.toList())); } @GetMapping("/resources") diff --git a/apps/dnet-is-application/src/main/resources/static/dsm/results.html b/apps/dnet-is-application/src/main/resources/static/dsm/results.html new file mode 100644 index 00000000..8dd60ea8 --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/static/dsm/results.html @@ -0,0 +1,79 @@ +
+ Number of results: {{nResults}}
+ Page: {{currPage + 1}} / {{nPages}}- / -
+
+ +
+ +Id | +{{r.id}} | +
---|---|
Type | +{{r.type}} | +
Collected From | +{{r.collectedFrom}} | +
URL | +{{r.websiteUrl}} | +
Namespace Prefix | +{{r.nsprefix}} | +
Organization(s) | +
+
+ {{o.name}}
+
+ + + |
+
APIs | +
+
+ {{a.id}}
+ {{a.protocol}}
+ {{a.compliance}}
+ activenot active
+
+ Last aggregation: {{a.aggrDate}} (total: {{a.aggrTotal}}) + |
+
Consent Terms of Use | +YES | +
Fulltext Download | +YES | +
+ Or browse using: +