Merge branch 'release/v1.1.0'

Author: ja573

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[1.1.0]](https://github.com/thoth-pub/thoth/releases/tag/v1.1.0) - 2026-04-17
+### Added
+  - [745](https://github.com/thoth-pub/thoth/pull/745) - Add Venda locale support for titles/books with `ve` and `ve-ZA`
+  - [745](https://github.com/thoth-pub/thoth/pull/745) - Implement markup support for series description
+
 ## [[1.0.5]](https://github.com/thoth-pub/thoth/releases/tag/v1.0.5) - 2026-04-15
 ### Added
   - Add `workStatuses` filtering to `subjects` and `subjectCount` queries

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "1.0.5"
+version = "1.1.0"
 authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -15,10 +15,10 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-api-server", "thoth-client", "thoth-errors", "thoth-export-server"]
 
 [dependencies]
-thoth-api = { version = "=1.0.5", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "=1.0.5", path = "thoth-api-server" }
-thoth-errors = { version = "=1.0.5", path = "thoth-errors" }
-thoth-export-server = { version = "=1.0.5", path = "thoth-export-server" }
+thoth-api = { version = "=1.1.0", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "=1.1.0", path = "thoth-api-server" }
+thoth-errors = { version = "=1.1.0", path = "thoth-errors" }
+thoth-export-server = { version = "=1.1.0", path = "thoth-export-server" }
 base64 = "0.22.1"
 clap = { version = "4.5.32", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "1.0.5"
+version = "1.1.0"
 authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "=1.0.5", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "=1.0.5", path = "../thoth-errors" }
+thoth-api = { version = "=1.1.0", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "=1.1.0", path = "../thoth-errors" }
 actix-web = "4.10"
 actix-cors = "0.7.1"
 actix-http = "3.10.0"

thoth-api-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "1.0.5"
+version = "1.1.0"
 authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -31,7 +31,7 @@ backend = [
 ]
 
 [dependencies]
-thoth-errors = { version = "=1.0.5", path = "../thoth-errors" }
+thoth-errors = { version = "=1.1.0", path = "../thoth-errors" }
 actix-web = { version = "4.10", optional = true }
 isbn = "0.6.0"
 chrono = { version = "0.4.40", features = ["serde"] }

thoth-api/Cargo.toml

@@ -0,0 +1,74 @@
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT
+            1
+        FROM
+            (
+                SELECT
+                    locale_code::text AS locale_code
+                FROM
+                    public.abstract
+                UNION ALL
+                SELECT
+                    locale_code::text
+                FROM
+                    public.biography
+                UNION ALL
+                SELECT
+                    default_locale::text
+                FROM
+                    public.imprint
+                WHERE
+                    default_locale IS NOT NULL
+                UNION ALL
+                SELECT
+                    locale_code::text
+                FROM
+                    public.title
+            ) AS locale_codes
+        WHERE
+            locale_code IN ('ve', 've_za')
+    ) THEN
+        RAISE EXCEPTION 'Cannot revert locale_code enum while ve/ve_za values are in use.';
+    END IF;
+END
+$$;
+
+ALTER TYPE public.locale_code
+    RENAME TO locale_code_old;
+
+DO $$
+DECLARE
+    locale_enum_labels TEXT;
+BEGIN
+    SELECT
+        string_agg(quote_literal(enumlabel), ', ' ORDER BY enumsortorder)
+    INTO locale_enum_labels
+    FROM
+        pg_enum
+    WHERE
+        enumtypid = 'public.locale_code_old'::regtype
+        AND enumlabel NOT IN ('ve', 've_za');
+
+    EXECUTE 'CREATE TYPE public.locale_code AS ENUM (' || locale_enum_labels || ')';
+END
+$$;
+
+ALTER TABLE public.abstract
+    ALTER COLUMN locale_code TYPE public.locale_code
+    USING locale_code::text::public.locale_code;
+
+ALTER TABLE public.biography
+    ALTER COLUMN locale_code TYPE public.locale_code
+    USING locale_code::text::public.locale_code;
+
+ALTER TABLE public.imprint
+    ALTER COLUMN default_locale TYPE public.locale_code
+    USING default_locale::text::public.locale_code;
+
+ALTER TABLE public.title
+    ALTER COLUMN locale_code TYPE public.locale_code
+    USING locale_code::text::public.locale_code;
+
+DROP TYPE public.locale_code_old;

thoth-api/migrations/20260417_v1.1.0/down.sql

@@ -0,0 +1,5 @@
+ALTER TYPE public.locale_code
+    ADD VALUE IF NOT EXISTS 've' BEFORE 'vi';
+
+ALTER TYPE public.locale_code
+    ADD VALUE IF NOT EXISTS 've_za' BEFORE 'vi';

thoth-api/migrations/20260417_v1.1.0/up.sql

@@ -1718,8 +1718,25 @@ impl Series {
     }
 
     #[graphql(description = "Description of the series")]
-    pub fn series_description(&self) -> Option<&String> {
-        self.series_description.as_ref()
+    pub fn series_description(
+        &self,
+        #[graphql(
+            default = MarkupFormat::JatsXml,
+            description = "Markup format used for rendering series description",
+        )]
+        markup_format: Option<MarkupFormat>,
+    ) -> FieldResult<Option<String>> {
+        self.series_description
+            .as_ref()
+            .map(|series_description| {
+                convert_from_jats(
+                    series_description,
+                    markup_format.ok_or(ThothError::MissingMarkupFormat)?,
+                    ConversionLimit::Abstract,
+                )
+            })
+            .transpose()
+            .map_err(Into::into)
     }
 
     #[graphql(description = "URL of the series' call for proposals page")]

thoth-api/src/graphql/model.rs

@@ -117,9 +117,20 @@ impl MutationRoot {
     #[graphql(description = "Create a new series with the specified values")]
     fn create_series(
         context: &Context,
-        #[graphql(description = "Values for series to be created")] data: NewSeries,
+        #[graphql(description = "The markup format of the series description")]
+        markup_format: Option<MarkupFormat>,
+        #[graphql(description = "Values for series to be created")] mut data: NewSeries,
     ) -> FieldResult<Series> {
         SeriesPolicy::can_create(context, &data, ())?;
+
+        let markup = markup_format.unwrap_or(MarkupFormat::JatsXml);
+        data.series_description = data
+            .series_description
+            .map(|series_description| {
+                convert_to_jats(series_description, markup, ConversionLimit::Abstract)
+            })
+            .transpose()?;
+
         Series::create(&context.db, &data).map_err(Into::into)
     }
 
@@ -466,11 +477,21 @@ impl MutationRoot {
     #[graphql(description = "Update an existing series with the specified values")]
     fn update_series(
         context: &Context,
-        #[graphql(description = "Values to apply to existing series")] data: PatchSeries,
+        #[graphql(description = "The markup format of the series description")]
+        markup_format: Option<MarkupFormat>,
+        #[graphql(description = "Values to apply to existing series")] mut data: PatchSeries,
     ) -> FieldResult<Series> {
         let series = context.load_current(&data.series_id)?;
         SeriesPolicy::can_update(context, &series, &data, ())?;
 
+        let markup = markup_format.unwrap_or(MarkupFormat::JatsXml);
+        data.series_description = data
+            .series_description
+            .map(|series_description| {
+                convert_to_jats(series_description, markup, ConversionLimit::Abstract)
+            })
+            .transpose()?;
+
         series.update(context, &data).map_err(Into::into)
     }
 

thoth-api/src/graphql/mutation.rs

@@ -1509,8 +1509,11 @@ fn assert_series_resolvers(series: &Series, context: &Context) {
     assert_eq!(series.issn_digital(), series.issn_digital.as_ref());
     assert_eq!(series.series_url(), series.series_url.as_ref());
     assert_eq!(
-        series.series_description(),
-        series.series_description.as_ref()
+        series
+            .series_description(Some(MarkupFormat::JatsXml))
+            .unwrap()
+            .as_ref(),
+        series.series_description.as_ref(),
     );
     assert_eq!(series.series_cfp_url(), series.series_cfp_url.as_ref());
     assert_eq!(series.imprint_id(), series.imprint_id);
@@ -2369,6 +2372,80 @@ fn graphql_award_supports_role_prize_statement_and_new_fields() {
         .contains("<bold>"));
 }
 
+#[test]
+fn graphql_series_description_supports_markup_roundtrip() {
+    let (_guard, pool) = test_db::setup_test_db();
+    let schema = create_schema();
+    let superuser = test_db::test_superuser("user-series-markup");
+    let context = test_db::test_context_with_user(pool.clone(), superuser);
+    let seed = seed_data(&schema, &context);
+
+    let series = create_with_data_and_markup(
+        &schema,
+        &context,
+        "createSeries",
+        "NewSeries",
+        "seriesId seriesDescription(markupFormat: PLAIN_TEXT)",
+        NewSeries {
+            series_type: SeriesType::Journal,
+            series_name: unique("Series"),
+            issn_print: None,
+            issn_digital: None,
+            series_url: Some("https://example.com/series".to_string()),
+            series_description: Some("**Initial** description".to_string()),
+            series_cfp_url: Some("https://example.com/cfp".to_string()),
+            imprint_id: seed.imprint_id,
+        },
+        MarkupFormat::Markdown,
+    );
+
+    assert_eq!(
+        series["seriesDescription"].as_str(),
+        Some("Initial description")
+    );
+
+    let series_id = json_uuid(&series["seriesId"]);
+    let stored = Series::from_id(pool.as_ref(), &series_id).expect("Failed to fetch series");
+    assert!(stored
+        .series_description
+        .as_deref()
+        .unwrap_or_default()
+        .contains("<bold>"));
+
+    let updated = update_with_data_and_markup(
+        &schema,
+        &context,
+        "updateSeries",
+        "PatchSeries",
+        "seriesId seriesDescription(markupFormat: PLAIN_TEXT)",
+        PatchSeries {
+            series_id,
+            series_type: stored.series_type,
+            series_name: stored.series_name.clone(),
+            issn_print: stored.issn_print.clone(),
+            issn_digital: stored.issn_digital.clone(),
+            series_url: stored.series_url.clone(),
+            series_description: Some("_Updated_ description".to_string()),
+            series_cfp_url: stored.series_cfp_url.clone(),
+            imprint_id: stored.imprint_id,
+        },
+        MarkupFormat::Markdown,
+    );
+
+    assert_eq!(
+        updated["seriesDescription"].as_str(),
+        Some("Updated description")
+    );
+
+    let updated_stored =
+        Series::from_id(pool.as_ref(), &series_id).expect("Failed to fetch series");
+    assert!(updated_stored
+        .series_description
+        .as_deref()
+        .unwrap_or_default()
+        .contains("<italic>"));
+}
+
 #[test]
 fn graphql_additional_resource_exposes_date() {
     let (_guard, pool) = test_db::setup_test_db();