Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

6480 webjar dependencies #6491

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

6480 webjar dependencies #6491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7bb65f
removing bootstrap 4 dep in favour of bootstrap 5
Nov 19, 2024
d22b724
accordions
Nov 20, 2024
245b1b5
fixing some tabs
Nov 20, 2024
bcac80d
radios
Nov 20, 2024
3c3a8f8
some tweaks
Nov 21, 2024
6cc7ca5
adding changelog
Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6480-update-bootstrap-dependency.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
type: fix
issue: 6480
title: "Updated front-end bootstrap dependency due to
security vulnerabilities.
"
4 changes: 2 additions & 2 deletions hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/subscriptions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ <h3 class="panel-title">Subscriptions Playground</h3>
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#wss"
aria-controls="wss" role="tab" data-toggle="tab">Static
aria-controls="wss" role="tab" data-bs-toggle="tab">Static
Websocket</a></li>
<li role="presentation"><a href="#wsd" aria-controls="wsd"
role="tab" data-toggle="tab">Dynamic Websocket</a></li>
role="tab" data-bs-toggle="tab">Dynamic Websocket</a></li>
</ul>

<!-- Tab panes -->
Expand Down
4 changes: 2 additions & 2 deletions hapi-fhir-testpage-overlay/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<artifactId>ace-builds</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -185,7 +185,7 @@
<artifactId>moment</artifactId>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<groupId>org.webjars</groupId>
<artifactId>popper.js</artifactId>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/FhirTesterMvcConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public class FhirTesterMvcConfig implements WebMvcConfigurer {

@Override
public void addResourceHandlers(@Nonnull ResourceHandlerRegistry theRegistry) {
WebUtil.webJarAddAceBuilds(theRegistry);
WebUtil.webJarAddBoostrap(theRegistry);
WebUtil.webJarAddAceBuilds(theRegistry);
WebUtil.webJarAddJQuery(theRegistry);
WebUtil.webJarAddFontAwesome(theRegistry);
WebUtil.webJarAddJSTZ(theRegistry);
Expand Down
4 changes: 2 additions & 2 deletions hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/util/WebUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public class WebUtil {
public static final String BOOTSTRAP_ID = "bootstrap";
public static final String BOOTSTRAP_PKG = "org.webjars.npm";
public static final String BOOTSTRAP_PKG = "org.webjars";
public static final String JQUERY_ID = "jquery";
public static final String JQUERY_PKG = "org.webjars.bower";

Expand Down Expand Up @@ -84,6 +84,6 @@ public static void webJarAddSelect2(ResourceHandlerRegistry theRegistry) {
}

public static void webJarAddPopperJs(ResourceHandlerRegistry theRegistry) {
WebUtil.addStaticResourceWebJar(theRegistry, "org.webjars.npm", "popper.js");
WebUtil.addStaticResourceWebJar(theRegistry, "org.webjars", "popper.js");
}
}
42 changes: 24 additions & 18 deletions hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ <h3 class="card-header">Server Actions</h3>
</div>
<div class="row">
<div class="col-sm-3 form-group">
<a type="button" id="fetch-conformance-btn"
class="btn btn-primary btn-block">
<i class="far fa-dot-circle"></i>
Conformance
</a>
<div class="d-grid gap-2">
<a type="button" id="fetch-conformance-btn"
class="btn btn-primary">
<i class="far fa-dot-circle"></i>
Conformance
</a>
</div>
<script type="text/javascript">
$('#fetch-conformance-btn').click(
function() {
Expand All @@ -97,32 +99,34 @@ <h3 class="card-header">Server Actions</h3>
</div>
<div class="row top-buffer">
<div class="col-sm-3">
<button type="button" id="server-history-btn" class="btn btn-primary btn-block">
<i class="far fa-calendar-alt"></i>
History
</button>
<div class="d-grid gap-29">
<button type="button" id="server-history-btn" class="btn btn-primary">
<i class="far fa-calendar-alt"></i>
History
</button>
</div>
</div>
<div class='col-sm-5'>
<div class="form-group">
<div class='input-group date' id='server-history-datetime' data-date-format="YYYY-MM-DDTHH:mm:ss">
<div class="input-group-prepend">
<div class='input-group date' id='server-history-datetime' data-bs-toggledate-format="YYYY-MM-DDTHH:mm:ss">
<div>
<span class="input-group-text">
Since
</span>
</div>
<input type='text' class="form-control" id="server-history-since"/>
<div class="input-group-append input-group-addon"> <!-- input-group-addon is from Bootstrap3 but the time picker needs it there -->
<div class=" input-group-addon"> <!-- input-group-addon is from Bootstrap3 but the time picker needs it there -->
<span class="input-group-text">
<i class="far fa-calendar-alt"></i>
</span>
</div>
</div>
</div>
</div>
</div>
<div class='col-sm-3'>
<div class="form-group">
<div class='input-group'>
<div class="input-group-prepend">
<div>
<span class="input-group-text">
Limit #
</span>
Expand Down Expand Up @@ -164,10 +168,12 @@ <h3 class="card-header">Server Actions</h3>
</div>
<div class="row">
<div class="col-sm-3">
<button type="button" id="transaction-btn" class="btn btn-primary btn-block">
<i class="fas fa-file-archive"></i>
Transaction
</button>
<div class="d-grid gap-2">
<button type="button" id="transaction-btn" class="btn btn-primary">
<i class="fas fa-file-archive"></i>
Transaction
</button>
</div>
</div>
<div class='col-sm-9'>
<div class="form-group">
Expand Down
35 changes: 17 additions & 18 deletions hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/resource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,21 @@ <h3 class="card-header panel-title" th:text="'Resource: ' + ${resourceName}">Res
<ul class="nav nav-tabs" role="tablist" id="resource-nav-tabs" style="margin-top: 20px; padding-left: 5px;">
<!-- Search Tab -->
<li th:if="${haveSearchParams}" class="nav-item">
<a href="#tab-search" role="tab" data-toggle="tab" class="nav-link" id="search-tab">Search</a>
<a href="#tab-search" role="tab" data-bs-toggle="tab" class="nav-link" id="search-tab">Search</a>
</li>
<li th:if="${!haveSearchParams}" class="disabled nav-item">
<a href="#tab-search" role="tab" class="nav-link disabled">Search</a>
</li>
<!-- Queries Tab -->
<li th:if="${!queries.empty}" class="nav-item">
<a href="#tab-queries" role="tab" data-toggle="tab" class="nav-link" id="queries-tab">Queries</a>
<a href="#tab-queries" role="tab" data-bs-toggle="tab" class="nav-link" id="queries-tab">Queries</a>
</li>
<li th:if="${queries.empty}" class="disabled nav-item">
<a href="#tab-queries" role="tab" class="nav-link disabled">Queries</a>
</li>
<!-- CRUD Tab -->
<li th:class="(${!haveSearchParams} and ${queries.empty}) ? 'active'" class="nav-item">
<a href="#tab-otheractions" role="tab" data-toggle="tab" name="tabCrudOperationsLink" class="nav-link" id="crud-tab">CRUD Operations</a>
<a href="#tab-otheractions" role="tab" data-bs-toggle="tab" name="tabCrudOperationsLink" class="nav-link" id="crud-tab">CRUD Operations</a>
</li>
</ul>
<script type="text/javascript">
Expand All @@ -74,7 +74,7 @@ <h3 class="card-header panel-title" th:text="'Resource: ' + ${resourceName}">Res
if (!$('#resource-nav-tabs li:eq('+i+')').hasClass('disabled')) {
$('#resource-nav-tabs li:eq('+i+') a').tab('show');
break;
}
}
}
});
</script>
Expand All @@ -85,7 +85,7 @@ <h3 class="card-header panel-title" th:text="'Resource: ' + ${resourceName}">Res
<!-- *************************************************** -->
<!-- Search Tab -->
<!-- *************************************************** -->
<div class="tab-pane active" id="tab-search" aria-labelledby="search-tab">
<div class="tab-pane" id="tab-search" aria-labelledby="search-tab">

<!-- Search contents -->
<div class="container-fluid">
Expand All @@ -95,7 +95,7 @@ <h3 class="card-header panel-title" th:text="'Resource: ' + ${resourceName}">Res
<i class="fab fa-searchengin"></i>
Search
</button>
</div>
</div>
</div>
<script type="text/javascript">
$('#search-btn').click(function() {
Expand Down Expand Up @@ -154,9 +154,9 @@ <h4>Sort Results</h4>
<div class="btn-group">
<input type="hidden" id="sort_by" />
<button type="button" class="btn btn-info" id="search_sort_button">Default</button>
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-info dropdown-toggle" data-bs-toggle="dropdown">
<span class="caret"></span>
<span class="sr-only">Default Sort</span>
<span class="visually-hidden">Default Sort</span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="javascript:updateSort('');">Default Sort</a></li>
Expand All @@ -169,9 +169,9 @@ <h4>Sort Results</h4>
<div class="btn-group">
<input type="hidden" id="sort_direction" />
<button type="button" class="btn btn-info" id="search_sort_direction_button">Default</button>
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-info dropdown-toggle" data-bs-toggle="dropdown">
<span class="caret"></span>
<span class="sr-only">Default Sort</span>
<span class="visually-hidden">Default Sort</span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="javascript:updateSortDirection('');">Default</a></li>
Expand Down Expand Up @@ -327,7 +327,7 @@ <h4>Reverse Includes <small>Also include resources which reference to the search
</div>
<div class='col-sm-5'>
<div class="form-group">
<div class='input-group date' id='resource-history-datetime' data-date-format="YYYY-MM-DDTHH:mm:ss">
<div class='input-group date' id='resource-history-datetime' data-bs-toggledate-format="YYYY-MM-DDTHH:mm:ss">
<div class="input-group-prepend">
<span class="input-group-text">
Since
Expand Down Expand Up @@ -360,8 +360,7 @@ <h4>Reverse Includes <small>Also include resources which reference to the search
format: 'YYYY-MM-DDTHH:mm:ssZ'
});
});
$('#resource-history-btn').click(
function() {
$('#resource-history-btn').click(function() {
var btn = $(this);
handleActionButtonClick($(this));
var limit = $('#resource-history-limit').val();
Expand All @@ -371,7 +370,7 @@ <h4>Reverse Includes <small>Also include resources which reference to the search
var id = $('#resource-history-id').val();
if (id != null) btn.append($('<input />', { type: 'hidden', name: 'resource-history-id', value: id }));
$("#outerForm").attr("action", "history-type").submit();
});
});
</script>
</div>
<br clear="all"/>
Expand Down Expand Up @@ -399,7 +398,7 @@ <h4>Reverse Includes <small>Also include resources which reference to the search
<span class="loadingStar">*</span>
</span>
</div>
<input type="text" class="form-control rounded-right" id="resource-delete-id"/>
<input type="text" class="form-control rounded-start" id="resource-delete-id"/>
</div>
</div>
</div>
Expand All @@ -415,9 +414,9 @@ <h4>Reverse Includes <small>Also include resources which reference to the search
</script>
</div>
<br clear="all"/>

<!-- Create -->

<div class="row">
<div class="col-12">
<b>Create</b> an instance of the resource. Generally you do not need to specify an ID
Expand Down Expand Up @@ -616,7 +615,7 @@ <h4>Reverse Includes <small>Also include resources which reference to the search

<!--
<script type="text/javascript">
$(function () { $("[data-toggle='tooltip']").tooltip(); });
$(function () { $("[data-bs-toggle='tooltip']").tooltip(); });
</script>
-->
</body>
Expand Down
8 changes: 4 additions & 4 deletions hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<!-- JQuery and Bootstrap -->
<script th:src="@{/resources/jquery/dist/jquery.js}"></script>
<link rel="stylesheet" th:href="@{/resources/bootstrap/dist/css/bootstrap.css}"/>
<link rel="stylesheet" th:href="@{/resources/bootstrap/css/bootstrap.css}"/>
<link rel="stylesheet" media="screen" th:href="@{/resources/font-awesome/css/fontawesome.min.css}" />
<script th:src="@{/resources/font-awesome/js/all.min.js}" data-auto-replace-svg="nest"></script>
<script th:src="@{/resources/font-awesome/js/all.min.js}" data-bs-toggleauto-replace-svg="nest"></script>
<link rel="stylesheet" media="screen" th:href="@{/resources/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css}" />
<script th:src="@{/resources/bootstrap/dist/js/bootstrap.min.js}"></script>
<script th:src="@{/resources/bootstrap/js/bootstrap.min.js}"></script>
<!--<script th:src="@{/resources/bootstrap/js/tab.js}"></script>-->


Expand All @@ -25,7 +25,7 @@
</script>

<link rel="stylesheet" media="screen" th:href="@{/resources/font-awesome/css/all.min.css}" />
<script th:src="@{/resources/font-awesome/js/all.min.js}" data-auto-replace-svg="nest"></script>
<script th:src="@{/resources/font-awesome/js/all.min.js}" data-bs-toggleauto-replace-svg="nest"></script>


<script th:src="@{/resources/moment/min/moment-with-locales.min.js}"></script>
Expand Down
Loading
Loading