optional-citation

open-neuroscience-foundation · Jul 23, 2024 · 44447ad · 44447ad
1 parent fe72c48
commit 44447ad
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/cli", "crates/core", "crates/wasm/overlay"]
 
 [workspace.package]
-version = "0.9.3"
+version = "0.9.4"
 license = "Apache-2.0"
 edition = "2021"
 rust-version = "1.77"

diff --git a/crates/cli/src/build/api.rs b/crates/cli/src/build/api.rs
@@ -404,8 +404,12 @@ impl From<&data::Location> for Location {
 pub(crate) struct Academic {
     pub name: String,
     pub profile_url: String,
-    pub hindex: i32,
-    pub citations: i32,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hindex: Option<i32>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub citations: Option<i32>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub i10index: Option<i32>,

diff --git a/crates/core/src/data.rs b/crates/core/src/data.rs
@@ -691,8 +691,12 @@ pub struct Item {
 pub struct Academic {
     pub name: String,
     pub profile_url: String,
-    pub hindex: i32,
-    pub citations: i32,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hindex: Option<i32>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub citations: Option<i32>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub i10index: Option<i32>,

diff --git a/crates/core/src/data/legacy.rs b/crates/core/src/data/legacy.rs
@@ -158,8 +158,12 @@ pub(crate) struct Location {
 pub(crate) struct Academic {
     pub name: String,
     pub profile_url: String,
-    pub hindex: i32,
-    pub citations: i32,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hindex: Option<i32>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub citations: Option<i32>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub i10index: Option<i32>,

diff --git a/src/build/data.rs b/src/build/data.rs
@@ -640,8 +640,12 @@ pub(crate) struct Location {
 pub(crate) struct Academic {
     pub name: String,
     pub profile_url: String,
-    pub hindex: i32,
-    pub citations: i32,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub hindex: Option<i32>,
+
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub citations: Option<i32>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub i10index: Option<i32>,
@@ -930,8 +934,12 @@ mod legacy {
     pub(crate) struct Academic {
         pub name: String,
         pub profile_url: String,
-        pub hindex: i32,
-        pub citations: i32,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub hindex: Option<i32>,
+
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub citations: Option<i32>,
 
         #[serde(skip_serializing_if = "Option::is_none")]
         pub i10index: Option<i32>,

diff --git a/ui/webapp/src/layout/common/itemModal/AcademicSection.tsx b/ui/webapp/src/layout/common/itemModal/AcademicSection.tsx
@@ -26,8 +26,8 @@ const AcademicSection = (props: Props) => {
         </div>
 
         <div class="row g-4 my-0 mb-2">
-          <Box value={prettifyNumber(primary()!.citations, 1)} legend="Citations" />
-          <Box value={prettifyNumber(primary()!.hindex, 1)} legend="h-index" />
+          <Box value={!isUndefined(primary()!.citations) ? prettifyNumber(primary()!.citations!, 1) : "-"} legend="Citations" />
+          <Box value={!isUndefined(primary()!.hindex) ? prettifyNumber(primary()!.hindex!, 1) : "-"} legend="h-index" />
           <Box value={!isUndefined(primary()!.i10index) ? prettifyNumber(primary()!.i10index!, 1) : "-"} legend="i10-index" />
         </div>
 
@@ -64,8 +64,8 @@ const AcademicSection = (props: Props) => {
                             {q.name}
                           </ExternalLink>
                         </td>
-                        <td class="px-3 text-center text-nowrap">{prettifyNumber(q.citations, 1)}</td>
-                        <td class="px-3 text-center text-nowrap">{prettifyNumber(q.hindex, 1)}</td>
+                        <td class="px-3 text-center text-nowrap">{!isUndefined(q.citations) ? prettifyNumber(q.citations!, 1) : "-"}</td>
+                        <td class="px-3 text-center text-nowrap">{!isUndefined(q.hindex) ? prettifyNumber(q.hindex!, 1) : "-"}</td>
                         <td class="px-3 text-center text-nowrap">{!isUndefined(q.i10index) ? prettifyNumber(q.i10index!, 1) : "-"}</td>
                       </tr>
                     );