Merge #201

201: Changes related to the next MeiliSearch release (v0.24.0) r=curquiza a=meili-bot

Related to this issue: meilisearch/integration-guides#149

This PR:
- gathers the changes related to the next MeiliSearch release (v0.24.0) so that this package is ready when the official release is out.
- should pass the tests against the [latest pre-release of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases).
- might eventually contain test failures until the MeiliSearch v0.24.0 is out.

⚠️ This PR should NOT be merged until the next release of MeiliSearch (v0.24.0) is out.

_This PR is auto-generated for the [pre-release week](https://github.com/meilisearch/integration-guides/blob/master/guides/pre-release-week.md) purpose._


Co-authored-by: meili-bot <[email protected]>
Co-authored-by: Clémentine Urquizar - curqui <[email protected]>
Co-authored-by: Clémentine Urquizar <[email protected]>

Author: 3 people

README.md

@@ -190,7 +190,7 @@ WARNING: `meilisearch-sdk` will panic if no Window is available (ex: Web extensi
 
 ## 🤖 Compatibility with MeiliSearch
 
-This package only guarantees the compatibility with the [version v0.23.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.23.0).
+This package only guarantees the compatibility with the [version v0.24.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.24.0).
 
 ## ⚙️ Development Workflow and Contributing
 

README.tpl

@@ -97,7 +97,7 @@ WARNING: `meilisearch-sdk` will panic if no Window is available (ex: Web extensi
 
 ## 🤖 Compatibility with MeiliSearch
 
-This package only guarantees the compatibility with the [version v0.23.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.23.0).
+This package only guarantees the compatibility with the [version v0.24.0 of MeiliSearch](https://github.com/meilisearch/MeiliSearch/releases/tag/v0.24.0).
 
 ## ⚙️ Development Workflow and Contributing
 

examples/web_app/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
+serde_json = "1.0"
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4.18"
 yew = "0.18"

examples/web_app/src/document.rs

@@ -1,5 +1,6 @@
 use meilisearch_sdk::document::Document;
 use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
 use yew::prelude::*;
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -22,58 +23,56 @@ impl Document for Crate {
     }
 }
 
-impl Crate {
-    
-    pub fn get_readable_download_count(&self) -> String {
-        if let Some(downloads) = self.downloads {
-            if downloads < 1000 {
-                downloads.to_string()
-            } else if downloads < 1000000 {
-                format!("{:.1}k", downloads as f64 / 1000.0)
-            } else {
-                format!("{:.1}M", downloads as f64 / 1000000.0)
-            }
+
+fn get_readable_download_count(this: &Map<String, Value>) -> String {
+    if let Some(downloads) = this["downloads"].as_f64() {
+        if downloads < 1000.0 {
+            downloads.to_string()
+        } else if downloads < 1000000.0 {
+            format!("{:.1}k", downloads / 1000.0)
         } else {
-            String::from("?")
+            format!("{:.1}M", downloads / 1000000.0)
         }
+    } else {
+        String::from("?")
     }
+}
 
-    pub fn display(&self) -> Html {
-        let mut url = format!("https://lib.rs/crates/{}", self.name);
-        url = url.replace("<em>", "");
-        url = url.replace("</em>", "");
+pub fn display(this: &Map<String, Value>) -> Html {
+    let mut url = format!("https://lib.rs/crates/{}", this["name"].as_str().unwrap_or_default());
+    url = url.replace("<em>", "");
+    url = url.replace("</em>", "");
 
-        html! {
-            <li><a href=url>
-                <div class="h">
-                    <h4>
-                        {
-                            // This field is formatted so we don't want Yew to escape the HTML tags
-                            unescaped_html(&self.name)
-                        }
-                    </h4>
-                    <p class="desc">{unescaped_html(&self.description)}</p>
-                </div>
-                <div class="meta">
-                    <span class="version stable">
-                        <span>{"v"}</span>
-                        {&self.version}
-                    </span>
-                    <span class="downloads" title=format!("{} recent downloads", self.downloads.unwrap_or(0))>
-                        {self.get_readable_download_count()}
-                    </span>
-                    {for self.keywords.iter().map(|keyword|
-                        html! {
-                            <span class="k">
-                                <span>{"#"}</span>
-                                {keyword}
-                            </span>
-                        }
-                    )}
-                </div>
+    html! {
+        <li><a href=url>
+            <div class="h">
+                <h4>
+                    {
+                        // This field is formatted so we don't want Yew to escape the HTML tags
+                        unescaped_html(&this["name"].as_str().unwrap_or_default())
+                    }
+                </h4>
+                <p class="desc">{unescaped_html(&this["description"].as_str().unwrap_or_default())}</p>
+            </div>
+            <div class="meta">
+                <span class="version stable">
+                    <span>{"v"}</span>
+                    {&this["version"].as_str().unwrap_or_default()}
+                </span>
+                <span class="downloads" title=format!("{} recent downloads", this["downloads"].as_f64().unwrap_or(0.0))>
+                    {get_readable_download_count(this)}
+                </span>
+                {for this["keywords"].as_array().unwrap().iter().map(|keyword|
+                    html! {
+                        <span class="k">
+                            <span>{"#"}</span>
+                            {keyword.as_str().unwrap_or_default()}
+                        </span>
+                    }
+                )}
+            </div>
 
-            </a></li>
-        }
+        </a></li>
     }
 }
 

examples/web_app/src/lib.rs

@@ -4,14 +4,15 @@ use meilisearch_sdk::{
     indexes::Index,
     search::{SearchResults, Selectors::All},
 };
+use serde_json::{Map, Value};
 use std::rc::Rc;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 use lazy_static::lazy_static;
 
 mod document;
-use crate::document::Crate;
+use crate::document::{Crate, display};
 
 lazy_static! {
     static ref CLIENT: Client = Client::new(
@@ -23,7 +24,7 @@ lazy_static! {
 struct Model {
     link: Rc<ComponentLink<Self>>,
     index: Rc<Index>,
-    results: Vec<Crate>,
+    results: Vec<Map<String, Value>>,
     processing_time_ms: usize,
 
     // These two fields are used to avoid rollbacks by giving an ID to each request
@@ -35,7 +36,7 @@ enum Msg {
     /// An event sent to update the results with a query
     Input(String),
     /// The event sent to display new results once they are received
-    Update{results: Vec<Crate>, processing_time_ms: usize, request_id: usize},
+    Update{results: Vec<Map<String, Value>>, processing_time_ms: usize, request_id: usize},
 }
 
 impl Component for Model {
@@ -126,7 +127,7 @@ impl Component for Model {
                     <ol id="handlebars-list">
                         {
                             // Display the results
-                            for self.results.iter().map(|r| r.display())
+                            for self.results.iter().map(|r| display(r))
                         }
                     </ol>
                 </div>

src/client.rs

@@ -179,7 +179,7 @@ impl Client {
         match self.delete_index(uid).await {
             Ok (_) => Ok(true),
             Err (Error::MeiliSearchError {
-                message: _,
+                error_message: _,
                 error_code: ErrorCode::IndexNotFound,
                 error_type: _,
                 error_link: _,