diff --git a/CHANGELOG.md b/CHANGELOG.md index 2da061fa..3b92da7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [[0.11.18]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.18) - 2024-03-07 +### Added + - [441](https://github.com/thoth-pub/thoth/issues/441) - Implement ONIX 3.0 "Thoth" specification (i.e. complete record reflecting full data model) + - [401](https://github.com/thoth-pub/thoth/issues/401) - Add BDS Live to list of supported platforms for JSTOR ONIX output + +### Fixed + - [475](https://github.com/thoth-pub/thoth/issues/475) - Add seconds to timestamp for Crossref metadata output + - [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 + +### Changed + - [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-identity` to v0.7.1 + - [578](https://github.com/thoth-pub/thoth/pull/578) - Upgrade `actix-session` to v0.9.0 + +### Security + - [572](https://github.com/thoth-pub/thoth/pull/572) - Upgrade `mio` to v0.8.11 + ## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29 ### Changed - [568](https://github.com/thoth-pub/thoth/issues/568) - Allow building `thoth-app` directly from cargo, using a build script in `thoth-app-server` diff --git a/Cargo.lock b/Cargo.lock index 4b15f18a..8c81f5fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -75,9 +75,9 @@ dependencies = [ [[package]] name = "actix-identity" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e1cc6f95e245b2f3c6995df4e1c0c697704c48c28ec325d135a3ca039d4952" +checksum = "f2c99b7a5614b72a78f04aa2021e5370fc1aef2475fffeffc0c1266b99007062" dependencies = [ "actix-service", "actix-session", @@ -154,15 +154,14 @@ dependencies = [ [[package]] name = "actix-session" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6a28f813a6671e1847d005cad0be36ae4d016287690f765c303379837c13d6" +checksum = "b671404ec72194d8af58c2bdaf51e3c477a0595056bd5010148405870dda8df2" dependencies = [ "actix-service", "actix-utils", "actix-web", "anyhow", - "async-trait", "derive_more", "serde", "serde_json", @@ -1998,14 +1997,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3088,7 +3087,7 @@ dependencies = [ [[package]] name = "thoth" -version = "0.11.17" +version = "0.11.18" dependencies = [ "cargo-husky", "clap", @@ -3103,7 +3102,7 @@ dependencies = [ [[package]] name = "thoth-api" -version = "0.11.17" +version = "0.11.18" dependencies = [ "actix-web", "argon2rs", @@ -3132,7 +3131,7 @@ dependencies = [ [[package]] name = "thoth-api-server" -version = "0.11.17" +version = "0.11.18" dependencies = [ "actix-cors", "actix-identity", @@ -3148,7 +3147,7 @@ dependencies = [ [[package]] name = "thoth-app" -version = "0.11.17" +version = "0.11.18" dependencies = [ "anyhow", "chrono", @@ -3177,7 +3176,7 @@ dependencies = [ [[package]] name = "thoth-app-server" -version = "0.11.17" +version = "0.11.18" dependencies = [ "actix-cors", "actix-web", @@ -3187,7 +3186,7 @@ dependencies = [ [[package]] name = "thoth-client" -version = "0.11.17" +version = "0.11.18" dependencies = [ "chrono", "graphql_client", @@ -3203,7 +3202,7 @@ dependencies = [ [[package]] name = "thoth-errors" -version = "0.11.17" +version = "0.11.18" dependencies = [ "actix-web", "csv", @@ -3224,7 +3223,7 @@ dependencies = [ [[package]] name = "thoth-export-server" -version = "0.11.17" +version = "0.11.18" dependencies = [ "actix-cors", "actix-web", @@ -3702,15 +3701,6 @@ dependencies = [ "windows_x86_64_msvc 0.42.1", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.1", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -3729,21 +3719,6 @@ dependencies = [ "windows-targets 0.52.3", ] -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - [[package]] name = "windows-targets" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index d68146cf..f4bf8e48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth" -version = "0.11.17" +version = "0.11.18" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" 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.17", path = "thoth-api", features = ["backend"] } -thoth-api-server = { version = "0.11.17", path = "thoth-api-server" } -thoth-app-server = { version = "0.11.17", path = "thoth-app-server" } -thoth-errors = { version = "0.11.17", path = "thoth-errors" } -thoth-export-server = { version = "0.11.17", path = "thoth-export-server" } +thoth-api = { version = "0.11.18", path = "thoth-api", features = ["backend"] } +thoth-api-server = { version = "0.11.18", path = "thoth-api-server" } +thoth-app-server = { version = "0.11.18", path = "thoth-app-server" } +thoth-errors = { version = "0.11.18", path = "thoth-errors" } +thoth-export-server = { version = "0.11.18", path = "thoth-export-server" } clap = { version = "4.4.7", features = ["cargo", "env"] } dialoguer = { version = "0.11.0", features = ["password"] } dotenv = "0.15.0" diff --git a/thoth-api-server/Cargo.toml b/thoth-api-server/Cargo.toml index 6468fc13..33c868c4 100644 --- a/thoth-api-server/Cargo.toml +++ b/thoth-api-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-api-server" -version = "0.11.17" +version = "0.11.18" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -9,12 +9,12 @@ repository = "https://github.com/thoth-pub/thoth" readme = "README.md" [dependencies] -thoth-api = { version = "0.11.17", path = "../thoth-api", features = ["backend"] } -thoth-errors = { version = "0.11.17", path = "../thoth-errors" } +thoth-api = { version = "0.11.18", path = "../thoth-api", features = ["backend"] } +thoth-errors = { version = "0.11.18", path = "../thoth-errors" } actix-web = "4.5.1" actix-cors = "0.7.0" -actix-identity = "0.6.0" -actix-session = { version = "0.8.0", features = ["cookie-session"] } +actix-identity = "0.7.1" +actix-session = { version = "0.9.0", features = ["cookie-session"] } env_logger = "0.11.2" juniper = "0.15.12" serde = { version = "1.0", features = ["derive"] } diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml index 1a734808..8698de5d 100644 --- a/thoth-api/Cargo.toml +++ b/thoth-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-api" -version = "0.11.17" +version = "0.11.18" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" } backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web", "jsonwebtoken"] [dependencies] -thoth-errors = { version = "0.11.17", path = "../thoth-errors" } +thoth-errors = { version = "0.11.18", path = "../thoth-errors" } actix-web = { version = "4.5.1", optional = true } argon2rs = "0.2.5" isbn2 = "0.4.0" diff --git a/thoth-app-server/Cargo.toml b/thoth-app-server/Cargo.toml index ac21b31e..ed298870 100644 --- a/thoth-app-server/Cargo.toml +++ b/thoth-app-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-app-server" -version = "0.11.17" +version = "0.11.18" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml index 04b013d8..6e4232e9 100644 --- a/thoth-app/Cargo.toml +++ b/thoth-app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "thoth-app" -version = "0.11.17" +version = "0.11.18" authors = ["Javier Arias ", "Ross Higman "] edition = "2021" license = "Apache-2.0" @@ -36,8 +36,8 @@ 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.17", path = "../thoth-api" } -thoth-errors = { version = "0.11.17", path = "../thoth-errors" } +thoth-api = { version = "0.11.18", path = "../thoth-api" } +thoth-errors = { version = "0.11.18", path = "../thoth-errors" } [build-dependencies] dotenv = "0.15.0" diff --git a/thoth-app/manifest.json b/thoth-app/manifest.json index 04b3f381..f75b02c5 100644 --- a/thoth-app/manifest.json +++ b/thoth-app/manifest.json @@ -9,7 +9,7 @@ "start_url": "/?homescreen=1", "background_color": "#ffffff", "theme_color": "#ffdd57", - "version": "0.11.17", + "version": "0.11.18", "icons": [ { "src": "\/android-icon-36x36.png", diff --git a/thoth-app/src/component/locations_form.rs b/thoth-app/src/component/locations_form.rs index 7a43cb3d..8ee8c1f8 100644 --- a/thoth-app/src/component/locations_form.rs +++ b/thoth-app/src/component/locations_form.rs @@ -378,13 +378,13 @@ impl LocationsFormComponent {
-
+
{&l.landing_page.clone().unwrap_or_default()}
-
+
{&l.full_text_url.clone().unwrap_or_default()} diff --git a/thoth-app/src/models/work/mod.rs b/thoth-app/src/models/work/mod.rs index 95bc683d..f1d0c8e9 100644 --- a/thoth-app/src/models/work/mod.rs +++ b/thoth-app/src/models/work/mod.rs @@ -116,6 +116,7 @@ pub trait DisplayWork { fn marc21_thoth_endpoint(&self) -> String; fn marc21markup_thoth_endpoint(&self) -> String; fn marc21xml_thoth_endpoint(&self) -> String; + fn onix_thoth_endpoint(&self) -> String; fn onix_projectmuse_endpoint(&self) -> String; fn onix_oapen_endpoint(&self) -> String; fn onix_jstor_endpoint(&self) -> String; @@ -156,6 +157,13 @@ impl DisplayWork for WorkWithRelations { ) } + fn onix_thoth_endpoint(&self) -> String { + format!( + "{}/specifications/onix_3.0::thoth/work/{}", + THOTH_EXPORT_API, &self.work_id + ) + } + fn onix_projectmuse_endpoint(&self) -> String { format!( "{}/specifications/onix_3.0::project_muse/work/{}", @@ -424,6 +432,12 @@ impl DisplayWork for WorkWithRelations {