Merge pull request #434 from thoth-pub/feature/display_ordered_relationships

Feature/display ordered relationships

Author: ja573

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [#424](https://github.com/thoth-pub/thoth/issues/424) - Fix inactive tag on catalogue
   - Added derives for `Eq` alongside `PartialEq` to comply with [`rustc 1.63.0`](https://github.com/rust-lang/rust/releases/tag/1.63.0)
   - Upgrade rust to `1.63.0` in development `Dockerfile`
+  - Order contributions and relations by ordinal, and subjects by type and ordinal
 
 ## [[0.8.8]](https://github.com/thoth-pub/thoth/releases/tag/v0.8.8) - 2022-08-02
 ### Added

thoth-api/src/model/subject/mod.rs

@@ -15,7 +15,9 @@ use thoth_errors::ThothResult;
 
 #[cfg_attr(feature = "backend", derive(DbEnum, juniper::GraphQLEnum))]
 #[cfg_attr(feature = "backend", DieselType = "Subject_type")]
-#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize, EnumString, Display)]
+#[derive(
+    Debug, Clone, PartialEq, Eq, Ord, PartialOrd, Deserialize, Serialize, EnumString, Display,
+)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum SubjectType {
     #[strum(serialize = "BIC")]

thoth-app/src/component/subjects_form.rs

@@ -235,7 +235,7 @@ impl Component for SubjectsFormComponent {
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
-        let subjects = ctx.props().subjects.clone().unwrap_or_default();
+        let mut subjects = ctx.props().subjects.clone().unwrap_or_default();
         let open_modal = ctx.link().callback(|e: MouseEvent| {
             e.prevent_default();
             Msg::ToggleAddFormDisplay(true)
@@ -244,6 +244,13 @@ impl Component for SubjectsFormComponent {
             e.prevent_default();
             Msg::ToggleAddFormDisplay(false)
         });
+        subjects.sort_by(|a, b| {
+            if a.subject_type == b.subject_type {
+                a.subject_ordinal.partial_cmp(&b.subject_ordinal).unwrap()
+            } else {
+                a.subject_type.partial_cmp(&b.subject_type).unwrap()
+            }
+        });
         html! {
             <nav class="panel">
                 <p class="panel-heading">

thoth-app/src/models/work/work_query.rs

@@ -42,7 +42,7 @@ pub const WORK_QUERY: &str = "
             firstPage
             lastPage
             pageInterval
-            relations {
+            relations(order: {field: RELATION_ORDINAL, direction: ASC}) {
                 workRelationId
                 relatorWorkId
                 relatedWorkId
@@ -61,7 +61,7 @@ pub const WORK_QUERY: &str = "
                     updatedAt
                 }
             }
-            contributions {
+            contributions(order: {field: CONTRIBUTION_ORDINAL, direction: ASC}) {
                 contributionId
                 workId
                 contributorId