Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/1.5.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhund
hhund committed Jul 9, 2024
2 parents 8bb5574 + 0e0e4b4 commit 731b8c5
Show file tree
Hide file tree
Showing 34 changed files with 73 additions and 68 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ preferred-citation:
doi: 10.3233/SHTI210060
type: proceedings
title: "Data Sharing Framework (DSF)"
version: 1.5.1
date-released: 2024-04-17
version: 1.5.2
date-released: 2024-07-09
url: https://dsf.dev
repository-code: https://github.com/datasharingframework/dsf
repository-artifact: https://github.com/datasharingframework/dsf/releases
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-process-api-v1/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-server-jetty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-common/dsf-common-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-common-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-common/dsf-common-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-common-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-common/dsf-common-db/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-common-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-common/dsf-common-documentation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-common-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion dsf-common/dsf-common-jetty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-common-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-common/dsf-common-status/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-common-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-common/dsf-common-ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-common-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-rest-adapter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server-jetty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
10 changes: 8 additions & 2 deletions dsf-fhir/dsf-fhir-server/src/main/resources/static/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ window.addEventListener('DOMContentLoaded', () => {
})

// complete questionnaire response
document.querySelector('form > fieldset#form-fieldset > div.row-submit > button#complete-questionnaire-response')?.addEventListener('click', () => completeQuestionnaireResponse())
document.querySelector('form')?.addEventListener('submit', event => {
completeQuestionnaireResponse()
event.preventDefault()
})
}

if (resourceType != null && resourceType[1] === 'Task' && resourceType[2] && (resourceType[3] === undefined || resourceType[4])) {
Expand Down Expand Up @@ -120,7 +123,10 @@ window.addEventListener('DOMContentLoaded', () => {
})

// start process button
document.querySelector('form > fieldset#form-fieldset > div.row-submit > button#start-process')?.addEventListener('click', () => startProcess())
document.querySelector('form')?.addEventListener('submit', event => {
startProcess()
event.preventDefault()
})
}
})

Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceQuestionnaireResponse.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<ul class="error-list" th:for="${i.id}" th:if="${resource.status == 'in-progress'}"></ul>
</div>
<div class="row-submit" th:if="${resource.status == 'in-progress'}">
<button id="complete-questionnaire-response" type="button" name="submit" class="submit">Submit</button>
<button id="complete-questionnaire-response" type="submit" name="submit" class="submit" formnovalidate>Submit</button>
</div>
</fieldset>
</form>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceTask.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h3 th:if="${not #lists.isEmpty(task.input)}">Input</h3>
<ul class="error-list" th:for="${i.id}" th:if="${resource.status == 'draft'}"></ul>
</div>
<div class="row-submit" th:if="${resource.status == 'draft'}">
<button id="start-process" type="button" name="submit" class="submit">Start Process</button>
<button id="start-process" type="submit" name="submit" class="submit" formnovalidate>Start Process</button>
</div>
</fieldset>
</form>
Expand Down
4 changes: 2 additions & 2 deletions dsf-fhir/dsf-fhir-validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -104,7 +104,7 @@
</configuration>
<!-- Workaround for exec maven plugin version 3.1.0 issue -->
<!-- https://github.com/mojohaus/exec-maven-plugin/issues/247 -->
<!-- <dependencies> <dependency> <groupId>dev.dsf</groupId> <artifactId>dsf-tools-bundle-generator</artifactId> <version>1.5.1</version> </dependency>
<!-- <dependencies> <dependency> <groupId>dev.dsf</groupId> <artifactId>dsf-tools-bundle-generator</artifactId> <version>1.5.2</version> </dependency>
</dependencies> -->
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-webservice-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
3 changes: 1 addition & 2 deletions ...-fhir-webservice-client/src/main/java/dev/dsf/fhir/client/FhirWebserviceClientJersey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ private PreferReturn toPreferReturn(PreferReturnType returnType, Class<? extends
{
return switch (returnType)
{
case REPRESENTATION ->
{
case REPRESENTATION -> {
// TODO remove workaround if HAPI bug fixed
Resource resource = referenceCleaner.cleanReferenceResourcesIfBundle(response.readEntity(resourceType));
yield PreferReturn.resource(resource);
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-websocket-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-build-info-reader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-bundle-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-db-migration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-docker-secrets-reader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-documentation-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-proxy-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-test-data-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</parent>

<modules>
Expand Down
Loading

0 comments on commit 731b8c5

Please sign in to comment.