Merge branch 'release/v0.2.3'

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to thoth will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [[0.2.3]](https://github.com/thoth-pub/thoth/releases/tag/v0.2.3) - 2020-11-06
+### Added
+  - Implemented pagination in all admin components
+  - Implemented pagination in catalogue
+
 ## [[0.2.2]](https://github.com/thoth-pub/thoth/releases/tag/v0.2.2) - 2020-11-03
 ### Changed
   - Set `THOTH_API` on build via docker

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Javier Arias <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,8 +16,8 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-app", "thoth-client"]
 
 [dependencies]
-thoth-api = {version = "0.2.2", path = "thoth-api", features = ["backend"] }
-thoth-client = {version = "0.2.2", path = "thoth-client" }
+thoth-api = {version = "0.2.3", path = "thoth-api", features = ["backend"] }
+thoth-client = {version = "0.2.3", path = "thoth-client" }
 actix-http = "1.0.1"
 actix-rt = "1.0.0"
 actix-web = "3.0.0"

thoth-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Javier Arias <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"

thoth-api/migrations/0.1.0/up.sql

@@ -71,8 +71,8 @@ CREATE TABLE work (
     license             TEXT CHECK (license ~* '^[^:]*:\/\/(?:[^\/:]*:[^\/@]*@)?(?:[^\/:.]*\.)+([^:\/]+)'),
     copyright_holder    TEXT NOT NULL CHECK (octet_length(copyright_holder) >= 1),
     landing_page        TEXT CHECK (landing_page ~* '^[^:]*:\/\/(?:[^\/:]*:[^\/@]*@)?(?:[^\/:.]*\.)+([^:\/]+)'),
-    lccn                INTEGER CHECK(lccn > 0),
-    oclc                INTEGER CHECK (oclc > 0),
+    lccn                TEXT CHECK (octet_length(lccn) >= 1),
+    oclc                TEXT CHECK (octet_length(oclc) >= 1),
     short_abstract      TEXT CHECK (octet_length(short_abstract) >= 1),
     long_abstract       TEXT CHECK (octet_length(long_abstract) >= 1),
     general_note        TEXT CHECK (octet_length(general_note) >= 1),

thoth-api/src/graphql/model.rs

@@ -253,13 +253,19 @@ impl QueryRoot {
         description = "Query the full list of imprints",
         arguments(
             limit(default = 100, description = "The number of items to return"),
-            offset(default = 0, description = "The number of items to skip")
+            offset(default = 0, description = "The number of items to skip"),
+            filter(
+                default = "".to_string(),
+                description = "A query string to search. This argument is a test, do not rely on it. At present it simply searches for case insensitive literals on imprint_name and imprint_url"
+            ),
         )
     )]
-    fn imprints(context: &Context, limit: i32, offset: i32) -> Vec<Imprint> {
+    fn imprints(context: &Context, limit: i32, offset: i32, filter: String) -> Vec<Imprint> {
         use crate::schema::imprint::dsl::*;
         let connection = context.db.get().unwrap();
         imprint
+            .filter(imprint_name.ilike(format!("%{}%", filter)))
+            .or_filter(imprint_url.ilike(format!("%{}%", filter)))
             .order(imprint_name.asc())
             .limit(limit.into())
             .offset(offset.into())
@@ -1375,11 +1381,11 @@ impl Work {
         self.landing_page.as_ref()
     }
 
-    pub fn lccn(&self) -> Option<&i32> {
+    pub fn lccn(&self) -> Option<&String> {
         self.lccn.as_ref()
     }
 
-    pub fn oclc(&self) -> Option<&i32> {
+    pub fn oclc(&self) -> Option<&String> {
         self.oclc.as_ref()
     }
 

thoth-api/src/schema.rs

@@ -196,8 +196,8 @@ table! {
         license -> Nullable<Text>,
         copyright_holder -> Text,
         landing_page -> Nullable<Text>,
-        lccn -> Nullable<Int4>,
-        oclc -> Nullable<Int4>,
+        lccn -> Nullable<Text>,
+        oclc -> Nullable<Text>,
         short_abstract -> Nullable<Text>,
         long_abstract -> Nullable<Text>,
         general_note -> Nullable<Text>,

thoth-api/src/work/model.rs

@@ -75,8 +75,8 @@ pub struct Work {
     pub license: Option<String>,
     pub copyright_holder: String,
     pub landing_page: Option<String>,
-    pub lccn: Option<i32>,
-    pub oclc: Option<i32>,
+    pub lccn: Option<String>,
+    pub oclc: Option<String>,
     pub short_abstract: Option<String>,
     pub long_abstract: Option<String>,
     pub general_note: Option<String>,
@@ -113,8 +113,8 @@ pub struct NewWork {
     pub license: Option<String>,
     pub copyright_holder: String,
     pub landing_page: Option<String>,
-    pub lccn: Option<i32>,
-    pub oclc: Option<i32>,
+    pub lccn: Option<String>,
+    pub oclc: Option<String>,
     pub short_abstract: Option<String>,
     pub long_abstract: Option<String>,
     pub general_note: Option<String>,
@@ -153,8 +153,8 @@ pub struct PatchWork {
     pub license: Option<String>,
     pub copyright_holder: String,
     pub landing_page: Option<String>,
-    pub lccn: Option<i32>,
-    pub oclc: Option<i32>,
+    pub lccn: Option<String>,
+    pub oclc: Option<String>,
     pub short_abstract: Option<String>,
     pub long_abstract: Option<String>,
     pub general_note: Option<String>,

thoth-app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Javier Arias <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -30,4 +30,4 @@ wasm-logger = "0.2.0"
 stdweb = "0.4.20"
 serde = { version = "1.0.115", features = ["derive"] }
 url = "2.1.1"
-thoth-api = { version = "0.2.2", path = "../thoth-api"  }
+thoth-api = { version = "0.2.3", path = "../thoth-api"  }