Skip to content

Commit edce2a2

Browse files
Jad-el-khouryJad-el-khoury
committed
Update AM & QM based on latest generation
1 parent 7e93059 commit edce2a2

File tree

17 files changed

+210
-61
lines changed

17 files changed

+210
-61
lines changed

‎src/server-am/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
<dependency>
269269
<groupId>org.eclipse.lyo</groupId>
270270
<artifactId>oslc-domains</artifactId>
271-
<version>${version.lyo}</version>
271+
<version>7.0.0-SNAPSHOT</version>
272272
</dependency>
273273

274274
<!-- Swagger dependencies -->

‎src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/Application.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
// End of user code
8888

8989
/**
90-
* Generated by Lyo Designer 6.0.0.qualifier
90+
* Generated by Lyo Designer 7.0.0.202501192243
9191
*/
9292

9393
@OpenAPIDefinition(info = @Info(title = "AM", version = "1.0.0"), servers = @Server(url = "/services/"))

‎src/server-am/src/main/java/co/oslc/refimpl/am/gen/servlet/ServletListener.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@ public void contextInitialized(final ServletContextEvent servletContextEvent)
6666
String fallbackBase = "http://localhost:8080";
6767
String servletName = "JAX-RS Servlet";
6868

69+
logger.info("""
70+
\n
71+
:::::::::: :::::::: ::: ::::::::::: ::::::::: :::::::: :::::::::: ::: ::: ::: ::::::::\s
72+
:+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+:\s
73+
+:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ \s
74+
+#++:++# +#+ +#+ +#+ +#++:++#+ +#++:++#++ +#++:++# +#+ +#++: +#+ +:+ \s
75+
+#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ \s
76+
#+# #+# #+# #+# #+# #+# #+# #+# #+# #+# #+# #+# #+# \s
77+
########## ######## ######### ########## ### ######## ########## ########## ### ######## \s
78+
""");
79+
6980
// Start of user code contextInitialized_init
7081
// End of user code
7182

‎src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/linktypescollection.jsp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@
6767
<div class="page-header">
6868
<h1>Query Capability &quot;LinkTypeQC&quot; results</h1>
6969
<div class="alert alert-secondary" role="alert">
70-
Number of elements:&nbsp;
71-
<%= resources.size()%>
70+
Showing&nbsp;${resources.size()} resources on this page
7271
<% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
7372
</div>
7473
</div>
75-
<% for (LinkType aResource : resources) { %>
76-
<p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
77-
<% } %>
74+
<c:forEach items="${resources}" var="res">
75+
<div class="card mb-3">
76+
<div class="card-body">
77+
<a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
78+
</div>
79+
</div>
80+
</c:forEach>
7881
</div>
7982
<footer class="footer">
8083
<div class="container">

‎src/server-am/src/main/webapp/co/oslc/refimpl/am/gen/resourcescollection.jsp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,17 @@
6767
<div class="page-header">
6868
<h1>Query Capability &quot;ResourceQC&quot; results</h1>
6969
<div class="alert alert-secondary" role="alert">
70-
Number of elements:&nbsp;
71-
<%= resources.size()%>
70+
Showing&nbsp;${resources.size()} resources on this page
7271
<% if (nextPageUri != null) { %><p><a href="<%= nextPageUri %>">Next Page</a></p><% } %>
7372
</div>
7473
</div>
75-
<% for (Resource aResource : resources) { %>
76-
<p><a href="<%= aResource.getAbout() %>" class="oslc-resource-link"><%=aResource.toString()%></a><br /></p>
77-
<% } %>
74+
<c:forEach items="${resources}" var="res">
75+
<div class="card mb-3">
76+
<div class="card-body">
77+
<a href="${fn:escapeXml(res.getAbout())}" class="oslc-resource-link">${fn:escapeXml(res.toString())}</a>
78+
</div>
79+
</div>
80+
</c:forEach>
7881
</div>
7982
<footer class="footer">
8083
<div class="container">

‎src/server-am/src/main/webapp/static/css/adaptor.css‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,15 @@ code {
6060
font-size: 80%;
6161
}
6262

63-
/* 45/11em are the dialog sizes plus bootstrap margins */
6463
.popover {
65-
max-width: calc(45em + 30px);
66-
max-height: calc(11em + 50px);
64+
max-width: 520px;
65+
max-height: 270px;
66+
}
67+
68+
.popover .popover-body {
69+
max-width: 515px;
70+
max-height: 215px;
71+
overflow: hidden;
6772
}
6873

6974
#delegatedUI {

‎src/server-am/src/main/webapp/static/js/ui-preview-helper.js‎

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,77 @@ This file is generated by org.eclipse.lyo.oslc4j.codegenerator
2020

2121
//Setup a popover on each of the oslcLinkElements, where the popover content is an iframe presenting the OSLC UI-Preview.
2222
function setupUiPreviewOnPopover(oslcLinkElements) {
23+
// Destroy any existing popovers first
24+
oslcLinkElements.popover('dispose');
25+
26+
// Initialize popovers with improved settings
2327
oslcLinkElements.popover({
2428
container: "body",
2529
content: "Loading...",
26-
delay: {"show": 120, "hide": 60},
30+
delay: {
31+
"show": 120,
32+
"hide": 200 // Increased hide delay to reduce flickering
33+
},
2734
html: true,
2835
placement: "auto",
29-
trigger: "hover"
36+
trigger: "hover",
37+
boundary: 'window', // Ensures proper positioning relative to viewport
38+
popperConfig: {
39+
modifiers: {
40+
preventOverflow: {
41+
boundariesElement: 'viewport'
42+
}
43+
}
44+
}
45+
});
46+
47+
// Add CSS to prevent pointer events on popover
48+
$("<style>")
49+
.prop("type", "text/css")
50+
.html(`
51+
.popover {
52+
pointer-events: none;
53+
}
54+
.popover-body {
55+
pointer-events: auto;
56+
}
57+
`)
58+
.appendTo("head");
59+
60+
// Modified event handler with debouncing
61+
let loadingTimeout;
62+
oslcLinkElements.on("show.bs.popover", function (e) {
63+
const uiElem = $(this);
64+
const popoverElem = uiElem.data('bs.popover');
65+
66+
// Clear any pending loading timeout
67+
clearTimeout(loadingTimeout);
68+
69+
// Set new timeout for loading
70+
loadingTimeout = setTimeout(() => {
71+
getUiPreviewIframes(
72+
this.getAttribute("href"),
73+
attachIframeToHyperlinkElement,
74+
uiElem
75+
);
76+
}, 50); // Small delay to prevent multiple rapid loads
3077
});
3178

32-
oslcLinkElements.on("show.bs.popover", function () {
33-
var uiElem = $(this);
34-
var popoverElem = uiElem.data('bs.popover');
35-
getUiPreviewIframes(this.getAttribute("href"), attachIframeToHyperlinkElement, uiElem);
36-
})
79+
// Clean up on hide
80+
oslcLinkElements.on("hide.bs.popover", function () {
81+
clearTimeout(loadingTimeout);
82+
});
3783
}
3884

3985
function attachIframeToHyperlinkElement(compactStructure, uiElem) {
4086
uiElem.attr('data-original-title', compactStructure.title);
4187
var preview = compactStructure.small;
4288
var w = preview.width ? preview.width : "450em";
4389
var h = preview.height ? preview.height : "100em";
90+
var w = '100%';
91+
var h = '100%';
4492
var iframeHtml = "<iframe src='" + preview.uri + "' ";
45-
iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "'";
93+
iframeHtml += " style='border:0px; height:" + h + "; width:" + w + "; overflow: hidden'";
4694
iframeHtml += "></iframe>";
4795
uiElem.attr('data-content', iframeHtml);
4896
uiElem.data('bs.popover').setContent();

‎src/server-qm/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
<dependency>
267267
<groupId>org.eclipse.lyo</groupId>
268268
<artifactId>oslc-domains</artifactId>
269-
<version>${version.lyo}</version>
269+
<version>7.0.0-SNAPSHOT</version>
270270
</dependency>
271271

272272
<!-- Swagger dependencies -->

‎src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/Application.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
// End of user code
116116

117117
/**
118-
* Generated by Lyo Designer 6.0.0.qualifier
118+
* Generated by Lyo Designer 7.0.0.202501192243
119119
*/
120120

121121
@OpenAPIDefinition(info = @Info(title = "QM", version = "1.0.0"), servers = @Server(url = "/services/"))

‎src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/servlet/ServletListener.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@ public void contextInitialized(final ServletContextEvent servletContextEvent)
6666
String fallbackBase = "http://localhost:8080";
6767
String servletName = "JAX-RS Servlet";
6868

69+
logger.info("""
70+
\n
71+
:::::::::: :::::::: ::: ::::::::::: ::::::::: :::::::: :::::::::: ::: ::: ::: ::::::::\s
72+
:+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+: :+:\s
73+
+:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ +:+ \s
74+
+#++:++# +#+ +#+ +#+ +#++:++#+ +#++:++#++ +#++:++# +#+ +#++: +#+ +:+ \s
75+
+#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ +#+ \s
76+
#+# #+# #+# #+# #+# #+# #+# #+# #+# #+# #+# #+# #+# \s
77+
########## ######## ######### ########## ### ######## ########## ########## ### ######## \s
78+
""");
79+
6980
// Start of user code contextInitialized_init
7081
// End of user code
7182

0 commit comments

Comments
 (0)