Merge branch 'release/v0.11.13'

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.11.13]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.13) - 2024-01-08
+### Changed
+  - Upgrade rust to `1.75.0` in production and development `Dockerfile`
+  - Upgrade `juniper` to v0.15.12
+  - Upgrade `actix-web` to v4.4.1
+  - Upgrade `actix-cors` to v0.7.0
+  - Increase size of URL columns in locations component
+
+### Fixed
+  - [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
+
 ## [[0.11.12]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.12) - 2023-12-20
 ### Fixed
   - [530](https://github.com/thoth-pub/thoth/pull/530) - Fix pagination offset calculation in export API

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.11.12"
+version = "0.11.13"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
 
 [dependencies]
-thoth-api = { version = "0.11.12", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.11.12", path = "thoth-api-server" }
-thoth-app-server = { version = "0.11.12", path = "thoth-app-server" }
-thoth-errors = { version = "0.11.12", path = "thoth-errors" }
-thoth-export-server = { version = "0.11.12", path = "thoth-export-server" }
+thoth-api = { version = "0.11.13", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.11.13", path = "thoth-api-server" }
+thoth-app-server = { version = "0.11.13", path = "thoth-app-server" }
+thoth-errors = { version = "0.11.13", path = "thoth-errors" }
+thoth-export-server = { version = "0.11.13", path = "thoth-export-server" }
 clap = { version = "4.4.7", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }
 dotenv = "0.15.0"

Dockerfile

@@ -1,5 +1,5 @@
-ARG RUST_IMAGE=rust:1.74.1
-ARG MUSL_IMAGE=clux/muslrust:1.74.1
+ARG RUST_IMAGE=rust:1.75.0
+ARG MUSL_IMAGE=clux/muslrust:1.75.0
 
 FROM ${RUST_IMAGE} as wasm
 

Dockerfile.dev

@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.74.1
+ARG RUST_VERSION=1.75.0
 
 FROM rust:${RUST_VERSION}
 

thoth-api-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.11.12"
+version = "0.11.13"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,13 +9,13 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.11.12", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
-actix-web = "4.4.0"
-actix-cors = "0.6.4"
+thoth-api = { version = "0.11.13", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
+actix-web = "4.4.1"
+actix-cors = "0.7.0"
 actix-identity = "0.6.0"
 actix-session = { version = "0.8.0", features = ["cookie-session"] }
 env_logger = "0.10.0"
-juniper = "0.15.11"
+juniper = "0.15.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

thoth-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.11.12"
+version = "0.11.13"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,8 +16,8 @@ maintenance = { status = "actively-developed" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
 
 [dependencies]
-thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
-actix-web = { version = "4.4.0", optional = true }
+thoth-errors = { version = "0.11.13", path = "../thoth-errors" }
+actix-web = { version = "4.4.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"
 chrono = { version = "0.4.31", features = ["serde"] }
@@ -28,7 +28,7 @@ diesel_migrations = { version = "2.1.0", features = ["postgres"], optional = tru
 dotenv = "0.15.0"
 futures = { version  = "0.3.29", optional = true }
 jsonwebtoken = "8.3.0"
-juniper = "0.15.11"
+juniper = "0.15.12"
 lazy_static = "1.4.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"

thoth-app-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app-server"
-version = "0.11.12"
+version = "0.11.13"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,6 +9,6 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-actix-web = "4.4.0"
-actix-cors = "0.6.4"
+actix-web = "4.4.1"
+actix-cors = "0.7.0"
 env_logger ="0.10.0"

thoth-app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app"
-version = "0.11.12"
+version = "0.11.13"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -41,5 +41,5 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
 # `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
 # https://docs.rs/getrandom/latest/getrandom/#webassembly-support
 getrandom = { version = "0.2", features = ["js"] }
-thoth-api = { version = "0.11.12", path = "../thoth-api"  }
-thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
+thoth-api = { version = "0.11.13", path = "../thoth-api"  }
+thoth-errors = { version = "0.11.13", path = "../thoth-errors" }

thoth-app/manifest.json

@@ -9,7 +9,7 @@
   "start_url": "/?homescreen=1",
   "background_color": "#ffffff",
   "theme_color": "#ffdd57",
-  "version": "0.11.12",
+  "version": "0.11.13",
   "icons": [
       {
         "src": "\/android-icon-36x36.png",

thoth-app/src/component/locations_form.rs

@@ -378,25 +378,25 @@ impl LocationsFormComponent {
                     <i class="fas fa-file-invoice-dollar" aria-hidden="true"></i>
                 </span>
                 <div class="field-body">
-                    <div class="field" style="width: 8em;">
+                    <div class="field" style="width: 11em;">
                         <label class="label">{ "Landing Page" }</label>
                         <div class="control is-expanded">
                             {&l.landing_page.clone().unwrap_or_default()}
                         </div>
                     </div>
-                    <div class="field" style="width: 8em;">
+                    <div class="field" style="width: 11em;">
                         <label class="label">{ "Full Text URL" }</label>
                         <div class="control is-expanded">
                             {&l.full_text_url.clone().unwrap_or_default()}
                         </div>
                     </div>
-                    <div class="field" style="width: 8em;">
+                    <div class="field" style="width: 5em;">
                         <label class="label">{ "Platform" }</label>
                         <div class="control is-expanded">
                             {&l.location_platform}
                         </div>
                     </div>
-                    <div class="field" style="width: 8em;">
+                    <div class="field" style="width: 5em;">
                         <label class="label">{ "Canonical" }</label>
                         <div class="control is-expanded">
                             {

thoth-app/src/component/publication_modal.rs

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

thoth-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.11.12"
+version = "0.11.13"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = {version = "0.11.12", path = "../thoth-api" }
-thoth-errors = {version = "0.11.12", path = "../thoth-errors" }
+thoth-api = {version = "0.11.13", path = "../thoth-api" }
+thoth-errors = {version = "0.11.13", path = "../thoth-errors" }
 graphql_client = "0.13.0"
 chrono = { version = "0.4.31", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }

thoth-errors/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.11.12"
+version = "0.11.13"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -17,11 +17,11 @@ uuid = { package = "uuid", version = "0.8.2", features = ["serde", "v4"] }
 yewtil = { version = "0.4.0", features = ["fetch"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-actix-web = "4.4.0"
+actix-web = "4.4.1"
 dialoguer = { version = "0.11.0", features = ["password"] }
 diesel = "2.1.3"
 csv = "1.3.0"
-juniper = "0.15.11"
+juniper = "0.15.12"
 marc = { version = "3.1.1", features = ["xml"] }
 phf = { version = "0.11", features = ["macros"] }
 reqwest-middleware = "0.2.4"