Skip to content

Commit

Permalink
Merge branch 'develop' into 3702-return-to-author
Browse files Browse the repository at this point in the history
  • Loading branch information
luddaniel committed Feb 28, 2024
2 parents 2efa607 + de45c13 commit 0028b90
Show file tree
Hide file tree
Showing 324 changed files with 12,688 additions and 5,011 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ APP_IMAGE=gdcc/dataverse:unstable
POSTGRES_VERSION=13
DATAVERSE_DB_USER=dataverse
SOLR_VERSION=9.3.0
SKIP_DEPLOY=0
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ If you are interested in working on the main Dataverse code, great! Before you s

Please read http://guides.dataverse.org/en/latest/developers/version-control.html to understand how we use the "git flow" model of development and how we will encourage you to create a GitHub issue (if it doesn't exist already) to associate with your pull request. That page also includes tips on making a pull request.

After making your pull request, your goal should be to help it advance through our kanban board at https://github.com/orgs/IQSS/projects/2 . If no one has moved your pull request to the code review column in a timely manner, please reach out. Note that once a pull request is created for an issue, we'll remove the issue from the board so that we only track one card (the pull request).
After making your pull request, your goal should be to help it advance through our kanban board at https://github.com/orgs/IQSS/projects/34 . If no one has moved your pull request to the code review column in a timely manner, please reach out. Note that once a pull request is created for an issue, we'll remove the issue from the board so that we only track one card (the pull request).

Thanks for your contribution!

[dataverse-community Google Group]: https://groups.google.com/group/dataverse-community
[Community Call]: https://dataverse.org/community-calls
[dataverse-dev Google Group]: https://groups.google.com/group/dataverse-dev
[community contributors]: https://docs.google.com/spreadsheets/d/1o9DD-MQ0WkrYaEFTD5rF_NtyL8aUISgURsAXSL7Budk/edit?usp=sharing
[dev efforts]: https://github.com/orgs/IQSS/projects/2#column-5298405
[dev efforts]: https://github.com/orgs/IQSS/projects/34/views/6
3 changes: 3 additions & 0 deletions conf/localstack/buckets.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash
# https://stackoverflow.com/questions/53619901/auto-create-s3-buckets-on-localstack
awslocal s3 mb s3://mybucket
12 changes: 12 additions & 0 deletions conf/proxy/Caddyfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This configuration is intended to be used with Caddy, a very small high perf proxy.
# It will serve the application containers Payara Admin GUI via HTTP instead of HTTPS,
# avoiding the trouble of self signed certificates for local development.

:4848 {
reverse_proxy https://dataverse:4848 {
transport http {
tls_insecure_skip_verify
}
header_down Location "^https://" "http://"
}
}
3 changes: 3 additions & 0 deletions conf/solr/9.3.0/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@
check for "Circuit Breakers tripped" in logs and the corresponding error message should tell
you what transpired (if the failure was caused by tripped circuit breakers).
-->

<!--
<str name="memEnabled">true</str>
<str name="memThreshold">75</str>
Expand All @@ -599,10 +600,12 @@
whether the circuit breaker is enabled and the average load over the last minute at which the
circuit breaker should start rejecting queries.
-->

<!--
<str name="cpuEnabled">true</str>
<str name="cpuThreshold">75</str>
-->

</circuitBreaker>

<!-- Request Dispatcher
Expand Down
13 changes: 0 additions & 13 deletions doc/release-notes/10001-datasets-files-api-user-permissions.md

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes/10060-api-changelog.md

This file was deleted.

5 changes: 0 additions & 5 deletions doc/release-notes/10093-signedUrl_improvements.md

This file was deleted.

1 change: 1 addition & 0 deletions doc/release-notes/10101-qa-guide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A new QA Guide is intended mostly for the core development team but may be of interest to contributors.
1 change: 0 additions & 1 deletion doc/release-notes/10104-dataset-citation-deaccessioned.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The getCanDownloadAtLeastOneFile (/api/datasets/{id}/versions/{versionId}/canDownloadAtLeastOneFile) endpoint has been created.

This API endpoint indicates if the calling user can download at least one file from a dataset version. Note that Shibboleth group permissions are not considered.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The response for getVersionFiles (/api/datasets/{id}/versions/{versionId}/files) endpoint has been modified to include a total count of records available (totalCount:x).
This will aid in pagination by allowing the caller to know how many pages can be iterated through. The existing API (getVersionFileCounts) to return the count will still be available.
5 changes: 5 additions & 0 deletions doc/release-notes/10216-metadatablocks.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The API endpoint `/api/metadatablocks/{block_id}` has been extended to include the following fields:

- `isRequired`: Whether or not this field is required
- `displayOrder`: The display order of the field in create/edit forms
- `typeClass`: The type class of this field ("controlledVocabulary", "compound", or "primitive")
1 change: 1 addition & 0 deletions doc/release-notes/10238-container-demo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The Container Guide now containers a tutorial for running Dataverse in containers for demo or evaluation purposes: https://guides.dataverse.org/en/6.2/container
5 changes: 5 additions & 0 deletions doc/release-notes/10240-file-citation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Get file citation as JSON

It is now possible to retrieve via API the file citation as it appears on the file landing page. It is formatted in HTML and encoded in JSON.

This API is not for downloading various citation formats such as EndNote XML, RIS, or BibTeX. This functionality has been requested in https://github.com/IQSS/dataverse/issues/3140 and https://github.com/IQSS/dataverse/issues/9994
10 changes: 10 additions & 0 deletions doc/release-notes/10280-get-file-api-extension.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
The API endpoint `api/files/{id}` has been extended to support the following optional query parameters:

- `includeDeaccessioned`: Indicates whether or not to consider deaccessioned dataset versions in the latest file search. (Default: `false`).
- `returnDatasetVersion`: Indicates whether or not to include the dataset version of the file in the response. (Default: `false`).

A new endpoint `api/files/{id}/versions/{datasetVersionId}` has been created. This endpoint returns the file metadata present in the requested dataset version. To specify the dataset version, you can use ``:latest-published``, or ``:latest``, or ``:draft`` or ``1.0`` or any other available version identifier.

The endpoint supports the `includeDeaccessioned` and `returnDatasetVersion` optional query parameters, as does the `api/files/{id}` endpoint.

`api/files/{id}/draft` endpoint is no longer available in favor of the new endpoint `api/files/{id}/versions/{datasetVersionId}`, which can use the version identifier ``:draft`` (`api/files/{id}/versions/:draft`) to obtain the same result.
1 change: 1 addition & 0 deletions doc/release-notes/10297-metadata-api-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The API endpoint `api/datasets/{id}/metadata` has been changed to default to the latest version of the dataset that the user has access.
4 changes: 4 additions & 0 deletions doc/release-notes/3437-new-index-api-added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(this API was added as a side feature of the pr #10222. the main point of the pr was an improvement in the OAI set housekeeping logic, I believe it's too obscure part of the system to warrant a relase note by itself. but the new API below needs to be announced).

A new Index API endpoint has been added allowing an admin to clear an individual dataset from Solr.

Loading

0 comments on commit 0028b90

Please sign in to comment.