Revision 46486
Added by Claudio Atzori about 7 years ago
modules/dnet-springboot-apps/trunk/dnet-administration-uis/src/main/java/eu/dnetlib/administration/uis/UIConfiguration.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.administration.uis; |
2 | 2 |
|
3 |
import io.prometheus.client.exporter.MetricsServlet; |
|
4 |
import io.prometheus.client.hotspot.DefaultExports; |
|
5 |
import org.springframework.beans.factory.annotation.Value; |
|
6 |
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; |
|
7 |
import org.springframework.boot.web.servlet.ServletRegistrationBean; |
|
8 |
import org.springframework.context.annotation.Bean; |
|
9 | 3 |
import org.springframework.context.annotation.Configuration; |
10 | 4 |
|
11 | 5 |
@Configuration |
12 | 6 |
public class UIConfiguration { |
13 | 7 |
|
14 |
@Bean |
|
15 |
@ConditionalOnMissingBean(name = "prometheusMetricsServletRegistrationBean") |
|
16 |
ServletRegistrationBean prometheusMetricsServletRegistrationBean(@Value("${prometheus.metrics.path:/prometheus}") String metricsPath) { |
|
17 |
DefaultExports.initialize(); |
|
18 |
return new ServletRegistrationBean(new MetricsServlet(), metricsPath); |
|
19 |
} |
|
20 |
|
|
21 | 8 |
} |
modules/dnet-springboot-apps/trunk/dnet-administration-uis/src/main/resources/eu/dnetlib/functionality/modular/ui/workflows/xslt/repoApi.xslt | ||
---|---|---|
75 | 75 |
|
76 | 76 |
<xsl:if test="//extra_info/extraFields/field[@name = 'last_collection_date'] and //extra_info/extraFields/field[@name = 'last_collection_mdId'] and //extra_info/extraFields/field[@name = 'last_collection_total']"> |
77 | 77 |
<hr /> |
78 |
<wf-form-row-store-link name="Last recordCollection"
|
|
78 |
<wf-form-row-store-link name="Last collection"
|
|
79 | 79 |
date="{//extra_info/extraFields/field[@name = 'last_collection_date']}" |
80 | 80 |
total="{//extra_info/extraFields/field[@name = 'last_collection_total']}" |
81 | 81 |
url="../inspector/mdstore.do?id={//extra_info/extraFields/field[@name = 'last_collection_mdId']}" /> |
modules/dnet-springboot-apps/trunk/dnet-administration-uis/src/main/resources/eu/dnetlib/functionality/modular/ui/workflows/xslt/wf_profile2html.xslt | ||
---|---|---|
54 | 54 |
<wf-form-row-static name="Protocol" value="{@protocol}"/> |
55 | 55 |
|
56 | 56 |
<xsl:if test=".//extraFields/field[@name = 'last_collection_date'] and .//extraFields/field[@name = 'last_collection_mdId'] and .//extraFields/field[@name = 'last_collection_total']"> |
57 |
<wf-form-row-store-link name="Last recordCollection"
|
|
57 |
<wf-form-row-store-link name="Last collection"
|
|
58 | 58 |
date="{.//extraFields/field[@name = 'last_collection_date']}" |
59 | 59 |
total="{.//extraFields/field[@name = 'last_collection_total']}" |
60 | 60 |
url="../inspector/mdstore.do?id={.//extraFields/field[@name = 'last_collection_mdId']}" /> |
modules/dnet-springboot-apps/trunk/dnet-administration-uis/src/main/resources/eu/dnetlib/functionality/modular/ui/workflows/xquery/find_repohi.xquery | ||
---|---|---|
1 | 1 |
for $x in |
2 |
recordCollection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')
|
|
2 |
collection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')
|
|
3 | 3 |
where |
4 | 4 |
$x//WORKFLOW_FAMILY='REPO_HI' |
5 | 5 |
return |
modules/dnet-springboot-apps/trunk/dnet-administration-uis/src/main/resources/eu/dnetlib/functionality/modular/xquery/listSubWorkflows.xquery.st | ||
---|---|---|
1 |
for \$wf in recordCollection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')[.//RESOURCE_IDENTIFIER/@value='$wfId$']/RESOURCE_PROFILE
|
|
1 |
for \$wf in collection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')[.//RESOURCE_IDENTIFIER/@value='$wfId$']/RESOURCE_PROFILE
|
|
2 | 2 |
for \$x in \$wf//NODE[@type='LaunchWorkflow'] |
3 |
for \$y in recordCollection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')[.//RESOURCE_IDENTIFIER/@value = \$x//PARAM[@name='wfId']/@value]
|
|
3 |
for \$y in collection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')[.//RESOURCE_IDENTIFIER/@value = \$x//PARAM[@name='wfId']/@value]
|
|
4 | 4 |
return <res> |
5 | 5 |
<id>{\$x//PARAM[@name='wfId']/@value/string()}</id> |
6 | 6 |
<name>{\$x/@name/string()}</name> |
... | ... | |
12 | 12 |
<parent>{\$wf//RESOURCE_IDENTIFIER/@value/string()}</parent> |
13 | 13 |
</res>, |
14 | 14 |
|
15 |
for \$wf in recordCollection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')[.//RESOURCE_IDENTIFIER/@value='$wfId$']/RESOURCE_PROFILE
|
|
15 |
for \$wf in collection('/db/DRIVER/WorkflowDSResources/WorkflowDSResourceType')[.//RESOURCE_IDENTIFIER/@value='$wfId$']/RESOURCE_PROFILE
|
|
16 | 16 |
for \$x in \$wf//NODE[@type='LaunchWorkflowTemplate'] |
17 | 17 |
return <res> |
18 | 18 |
<id>{\$x//PARAM[@name='wfTemplateId']/@value/string()}</id> |
modules/dnet-springboot-apps/trunk/dnet-administration-uis/src/main/resources/isStartupResources/profiles/vocabularies/publication_resource.xml | ||
---|---|---|
87 | 87 |
</TERM> |
88 | 88 |
<TERM native_name="Collection" code="Collection" english_name="Collection" encoding="ISTI"> |
89 | 89 |
<SYNONYMS> |
90 |
<SYNONYM term="recordCollection" encoding="DataCite"/>
|
|
90 |
<SYNONYM term="collection" encoding="DataCite"/>
|
|
91 | 91 |
</SYNONYMS> |
92 | 92 |
<RELATIONS/> |
93 | 93 |
</TERM> |
... | ... | |
360 | 360 |
</STATUS> |
361 | 361 |
<SECURITY_PARAMETERS>String</SECURITY_PARAMETERS> |
362 | 362 |
</BODY> |
363 |
</RESOURCE_PROFILE> |
|
363 |
</RESOURCE_PROFILE> |
Also available in: Unified diff
reverted bad commit