Skip to content

Commit 5b0b0b7

Browse files
ja573ja573
committed
Merge branch 'release/v0.11.18'
2 parents f570a6a + 45bd4ab commit 5b0b0b7

31 files changed

+3566
-127
lines changed

‎CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [[0.11.18]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.18) - 2024-03-07
10+
### Added
11+
- [441](https://github.com/thoth-pub/thoth/issues/441) - Implement ONIX 3.0 "Thoth" specification (i.e. complete record reflecting full data model)
12+
- [401](https://github.com/thoth-pub/thoth/issues/401) - Add BDS Live to list of supported platforms for JSTOR ONIX output
13+
14+
### Fixed
15+
- [475](https://github.com/thoth-pub/thoth/issues/475) - Add seconds to timestamp for Crossref metadata output
16+
- [571](https://github.com/thoth-pub/thoth/issues/571) - Fix overlapping URL text for Locations in Thoth Admin panel on website in Safari and Chromium browsers
17+
18+
### Changed
19+
- [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-identity` to v0.7.1
20+
- [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-session` to v0.9.0
21+
22+
### Security
23+
- [572](https://github.com/thoth-pub/thoth/pull/572) - Upgrade `mio` to v0.8.11
24+
925
## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29
1026
### Changed
1127
- [568](https://github.com/thoth-pub/thoth/issues/568) - Allow building `thoth-app` directly from cargo, using a build script in `thoth-app-server`

‎Cargo.lock

+15-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.11.17"
3+
version = "0.11.18"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
1616
members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
1717

1818
[dependencies]
19-
thoth-api = { version = "0.11.17", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "0.11.17", path = "thoth-api-server" }
21-
thoth-app-server = { version = "0.11.17", path = "thoth-app-server" }
22-
thoth-errors = { version = "0.11.17", path = "thoth-errors" }
23-
thoth-export-server = { version = "0.11.17", path = "thoth-export-server" }
19+
thoth-api = { version = "0.11.18", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "0.11.18", path = "thoth-api-server" }
21+
thoth-app-server = { version = "0.11.18", path = "thoth-app-server" }
22+
thoth-errors = { version = "0.11.18", path = "thoth-errors" }
23+
thoth-export-server = { version = "0.11.18", path = "thoth-export-server" }
2424
clap = { version = "4.4.7", features = ["cargo", "env"] }
2525
dialoguer = { version = "0.11.0", features = ["password"] }
2626
dotenv = "0.15.0"

‎thoth-api-server/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api-server"
3-
version = "0.11.17"
3+
version = "0.11.18"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -9,12 +9,12 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
12+
thoth-api = { version = "0.11.18", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
1414
actix-web = "4.5.1"
1515
actix-cors = "0.7.0"
16-
actix-identity = "0.6.0"
17-
actix-session = { version = "0.8.0", features = ["cookie-session"] }
16+
actix-identity = "0.7.1"
17+
actix-session = { version = "0.9.0", features = ["cookie-session"] }
1818
env_logger = "0.11.2"
1919
juniper = "0.15.12"
2020
serde = { version = "1.0", features = ["derive"] }

‎thoth-api/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.11.17"
3+
version = "0.11.18"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
1616
backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web", "jsonwebtoken"]
1717

1818
[dependencies]
19-
thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
19+
thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
2020
actix-web = { version = "4.5.1", optional = true }
2121
argon2rs = "0.2.5"
2222
isbn2 = "0.4.0"

‎thoth-app-server/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app-server"
3-
version = "0.11.17"
3+
version = "0.11.18"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
66
license = "Apache-2.0"

‎thoth-app/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app"
3-
version = "0.11.17"
3+
version = "0.11.18"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -36,8 +36,8 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
3636
# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
3737
# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
3838
getrandom = { version = "0.2", features = ["js"] }
39-
thoth-api = { version = "0.11.17", path = "../thoth-api" }
40-
thoth-errors = { version = "0.11.17", path = "../thoth-errors" }
39+
thoth-api = { version = "0.11.18", path = "../thoth-api" }
40+
thoth-errors = { version = "0.11.18", path = "../thoth-errors" }
4141

4242
[build-dependencies]
4343
dotenv = "0.15.0"

‎thoth-app/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start_url": "/?homescreen=1",
1010
"background_color": "#ffffff",
1111
"theme_color": "#ffdd57",
12-
"version": "0.11.17",
12+
"version": "0.11.18",
1313
"icons": [
1414
{
1515
"src": "\/android-icon-36x36.png",

‎thoth-app/src/component/locations_form.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -378,13 +378,13 @@ impl LocationsFormComponent {
378378
<i class="fas fa-file-invoice-dollar" aria-hidden="true"></i>
379379
</span>
380380
<div class="field-body">
381-
<div class="field" style="width: 11em;">
381+
<div class="field" style="width: 11em; word-wrap: break-word;">
382382
<label class="label">{ "Landing Page" }</label>
383383
<div class="control is-expanded">
384384
{&l.landing_page.clone().unwrap_or_default()}
385385
</div>
386386
</div>
387-
<div class="field" style="width: 11em;">
387+
<div class="field" style="width: 11em; word-wrap: break-word;">
388388
<label class="label">{ "Full Text URL" }</label>
389389
<div class="control is-expanded">
390390
{&l.full_text_url.clone().unwrap_or_default()}

‎thoth-app/src/models/work/mod.rs

+14
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ pub trait DisplayWork {
116116
fn marc21_thoth_endpoint(&self) -> String;
117117
fn marc21markup_thoth_endpoint(&self) -> String;
118118
fn marc21xml_thoth_endpoint(&self) -> String;
119+
fn onix_thoth_endpoint(&self) -> String;
119120
fn onix_projectmuse_endpoint(&self) -> String;
120121
fn onix_oapen_endpoint(&self) -> String;
121122
fn onix_jstor_endpoint(&self) -> String;
@@ -156,6 +157,13 @@ impl DisplayWork for WorkWithRelations {
156157
)
157158
}
158159

160+
fn onix_thoth_endpoint(&self) -> String {
161+
format!(
162+
"{}/specifications/onix_3.0::thoth/work/{}",
163+
THOTH_EXPORT_API, &self.work_id
164+
)
165+
}
166+
159167
fn onix_projectmuse_endpoint(&self) -> String {
160168
format!(
161169
"{}/specifications/onix_3.0::project_muse/work/{}",
@@ -424,6 +432,12 @@ impl DisplayWork for WorkWithRelations {
424432
</div>
425433
<div class="dropdown-menu" id="dropdown-menu" role="menu">
426434
<div class="dropdown-content">
435+
<a
436+
href={self.onix_thoth_endpoint()}
437+
class="dropdown-item"
438+
>
439+
{"ONIX 3.0 (Thoth)"}
440+
</a>
427441
<a
428442
href={self.onix_projectmuse_endpoint()}
429443
class="dropdown-item"

‎thoth-client/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-client"
3-
version = "0.11.17"
3+
version = "0.11.18"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -10,8 +10,8 @@ readme = "README.md"
1010
build = "build.rs"
1111

1212
[dependencies]
13-
thoth-api = {version = "0.11.17", path = "../thoth-api" }
14-
thoth-errors = {version = "0.11.17", path = "../thoth-errors" }
13+
thoth-api = {version = "0.11.18", path = "../thoth-api" }
14+
thoth-errors = {version = "0.11.18", path = "../thoth-errors" }
1515
graphql_client = "0.13.0"
1616
chrono = { version = "0.4.31", features = ["serde"] }
1717
reqwest = { version = "0.11", features = ["json"] }
@@ -22,4 +22,4 @@ serde_json = "1.0"
2222
uuid = { version = "0.8.2", features = ["serde"] }
2323

2424
[build-dependencies]
25-
thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"] }
25+
thoth-api = { version = "0.11.18", path = "../thoth-api", features = ["backend"] }

‎thoth-client/assets/queries.graphql

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ fragment Work on Work {
167167
place
168168
firstPage
169169
lastPage
170+
pageCount
170171
pageInterval
171172
landingPage
172173
imprint {

‎thoth-client/src/queries.rs

+12
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ impl fmt::Display for work_query::LanguageCode {
2626
}
2727
}
2828

29+
impl fmt::Display for work_query::CurrencyCode {
30+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
31+
write!(f, "{self:?}")
32+
}
33+
}
34+
2935
impl fmt::Display for work_query::SubjectType {
3036
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
3137
write!(f, "{self:?}")
@@ -38,6 +44,12 @@ impl fmt::Display for work_query::PublicationType {
3844
}
3945
}
4046

47+
impl fmt::Display for work_query::LocationPlatform {
48+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
49+
write!(f, "{self:?}")
50+
}
51+
}
52+
4153
#[derive(GraphQLQuery)]
4254
#[graphql(
4355
schema_path = "assets/schema.graphql",

0 commit comments

Comments
 (0)