Skip to content

Commit d29813e

Browse files
ja573ja573
committed
Merge branch 'release/v0.11.13'
2 parents 037eba0 + e7816d5 commit d29813e

File tree

15 files changed

+80
-65
lines changed

15 files changed

+80
-65
lines changed

‎CHANGELOG.md

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

77
## [Unreleased]
88

9+
## [[0.11.13]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.13) - 2024-01-08
10+
### Changed
11+
- Upgrade rust to `1.75.0` in production and development `Dockerfile`
12+
- Upgrade `juniper` to v0.15.12
13+
- Upgrade `actix-web` to v4.4.1
14+
- Upgrade `actix-cors` to v0.7.0
15+
- Increase size of URL columns in locations component
16+
17+
### Fixed
18+
- [531](https://github.com/thoth-pub/thoth/pull/531) - Fix bug where New Publication form for Chapter could have an ISBN pre-populated but greyed out
19+
920
## [[0.11.12]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.12) - 2023-12-20
1021
### Fixed
1122
- [530](https://github.com/thoth-pub/thoth/pull/530) - Fix pagination offset calculation in export API

‎Cargo.lock

+22-23
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.12"
3+
version = "0.11.13"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
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.12", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "0.11.12", path = "thoth-api-server" }
21-
thoth-app-server = { version = "0.11.12", path = "thoth-app-server" }
22-
thoth-errors = { version = "0.11.12", path = "thoth-errors" }
23-
thoth-export-server = { version = "0.11.12", path = "thoth-export-server" }
19+
thoth-api = { version = "0.11.13", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "0.11.13", path = "thoth-api-server" }
21+
thoth-app-server = { version = "0.11.13", path = "thoth-app-server" }
22+
thoth-errors = { version = "0.11.13", path = "thoth-errors" }
23+
thoth-export-server = { version = "0.11.13", 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"

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG RUST_IMAGE=rust:1.74.1
2-
ARG MUSL_IMAGE=clux/muslrust:1.74.1
1+
ARG RUST_IMAGE=rust:1.75.0
2+
ARG MUSL_IMAGE=clux/muslrust:1.75.0
33

44
FROM ${RUST_IMAGE} as wasm
55

‎Dockerfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG RUST_VERSION=1.74.1
1+
ARG RUST_VERSION=1.75.0
22

33
FROM rust:${RUST_VERSION}
44

‎thoth-api-server/Cargo.toml

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

1111
[dependencies]
12-
thoth-api = { version = "0.11.12", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
14-
actix-web = "4.4.0"
15-
actix-cors = "0.6.4"
12+
thoth-api = { version = "0.11.13", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
14+
actix-web = "4.4.1"
15+
actix-cors = "0.7.0"
1616
actix-identity = "0.6.0"
1717
actix-session = { version = "0.8.0", features = ["cookie-session"] }
1818
env_logger = "0.10.0"
19-
juniper = "0.15.11"
19+
juniper = "0.15.12"
2020
serde = { version = "1.0", features = ["derive"] }
2121
serde_json = "1.0"

‎thoth-api/Cargo.toml

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

1818
[dependencies]
19-
thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
20-
actix-web = { version = "4.4.0", optional = true }
19+
thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
20+
actix-web = { version = "4.4.1", optional = true }
2121
argon2rs = "0.2.5"
2222
isbn2 = "0.4.0"
2323
chrono = { version = "0.4.31", features = ["serde"] }
@@ -28,7 +28,7 @@ diesel_migrations = { version = "2.1.0", features = ["postgres"], optional = tru
2828
dotenv = "0.15.0"
2929
futures = { version = "0.3.29", optional = true }
3030
jsonwebtoken = "8.3.0"
31-
juniper = "0.15.11"
31+
juniper = "0.15.12"
3232
lazy_static = "1.4.0"
3333
phf = { version = "0.11", features = ["macros"] }
3434
rand = "0.8.5"

‎thoth-app-server/Cargo.toml

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

1111
[dependencies]
12-
actix-web = "4.4.0"
13-
actix-cors = "0.6.4"
12+
actix-web = "4.4.1"
13+
actix-cors = "0.7.0"
1414
env_logger ="0.10.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.12"
3+
version = "0.11.13"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -41,5 +41,5 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
4141
# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
4242
# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
4343
getrandom = { version = "0.2", features = ["js"] }
44-
thoth-api = { version = "0.11.12", path = "../thoth-api" }
45-
thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
44+
thoth-api = { version = "0.11.13", path = "../thoth-api" }
45+
thoth-errors = { version = "0.11.13", path = "../thoth-errors" }

‎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.12",
12+
"version": "0.11.13",
1313
"icons": [
1414
{
1515
"src": "\/android-icon-36x36.png",

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -378,25 +378,25 @@ 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: 8em;">
381+
<div class="field" style="width: 11em;">
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: 8em;">
387+
<div class="field" style="width: 11em;">
388388
<label class="label">{ "Full Text URL" }</label>
389389
<div class="control is-expanded">
390390
{&l.full_text_url.clone().unwrap_or_default()}
391391
</div>
392392
</div>
393-
<div class="field" style="width: 8em;">
393+
<div class="field" style="width: 5em;">
394394
<label class="label">{ "Platform" }</label>
395395
<div class="control is-expanded">
396396
{&l.location_platform}
397397
</div>
398398
</div>
399-
<div class="field" style="width: 8em;">
399+
<div class="field" style="width: 5em;">
400400
<label class="label">{ "Canonical" }</label>
401401
<div class="control is-expanded">
402402
{

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

+5
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ impl Component for PublicationModalComponent {
140140
if let Some(publication) = ctx.props().publication_under_edit.clone() {
141141
// Editing existing publication: load its current values.
142142
self.publication = publication;
143+
} else {
144+
// Previous values will be retained if creating new publication, which may be
145+
// useful for batch-adding, but this is less likely for ISBNs (and they also
146+
// cannot be added for publications whose work type is Book Chapter).
147+
self.publication.isbn = None;
143148
}
144149
// Ensure ISBN variable value is kept in sync with publication object.
145150
self.isbn = self

‎thoth-client/Cargo.toml

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

1111
[dependencies]
12-
thoth-api = {version = "0.11.12", path = "../thoth-api" }
13-
thoth-errors = {version = "0.11.12", path = "../thoth-errors" }
12+
thoth-api = {version = "0.11.13", path = "../thoth-api" }
13+
thoth-errors = {version = "0.11.13", path = "../thoth-errors" }
1414
graphql_client = "0.13.0"
1515
chrono = { version = "0.4.31", features = ["serde"] }
1616
reqwest = { version = "0.11", features = ["json"] }

‎thoth-errors/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-errors"
3-
version = "0.11.12"
3+
version = "0.11.13"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -17,11 +17,11 @@ uuid = { package = "uuid", version = "0.8.2", features = ["serde", "v4"] }
1717
yewtil = { version = "0.4.0", features = ["fetch"] }
1818

1919
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
20-
actix-web = "4.4.0"
20+
actix-web = "4.4.1"
2121
dialoguer = { version = "0.11.0", features = ["password"] }
2222
diesel = "2.1.3"
2323
csv = "1.3.0"
24-
juniper = "0.15.11"
24+
juniper = "0.15.12"
2525
marc = { version = "3.1.1", features = ["xml"] }
2626
phf = { version = "0.11", features = ["macros"] }
2727
reqwest-middleware = "0.2.4"

0 commit comments

Comments
 (0)