searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-06-02 19:08:03 +02:00
Code Issues Releases Wiki Activity

Revert "Display more than one indexUid in a task view if necessary"

Browse Source 
This reverts commit 1f2e253bb6.
This commit is contained in:
Loïc Lecrenier 2022-10-26 13:39:58 +02:00 committed by Clément Renault
parent 3b158bb966
commit 36c9f05998
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meilisearch-http/src/routes/tasks.rs
View File

@ -32,30 +32,12 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
.service(web::resource("/{task_id}").route(web::get().to(SeqHandler(get_task))));
}
#[derive(Default, Debug, Clone, PartialEq, Serialize)]
#[serde(untagged, rename_all = "camelCase")]
pub enum IndexUidView {
Multiple(Vec<String>),
Single(String),
#[default]
None,
}
impl IndexUidView {
fn new(indexes: &[&str]) -> Self {
match indexes {
[] => Self::None,
[index] => Self::Single(index.to_string()),
indexes => Self::Multiple(indexes.iter().map(ToString::to_string).collect()),
}
}
}
#[derive(Debug, Clone, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct TaskView {
pub uid: TaskId,
#[serde(default)]
pub index_uid: IndexUidView,
pub index_uid: Option<String>,
pub status: Status,
#[serde(rename = "type")]
pub kind: Kind,
@ -82,7 +64,7 @@ impl TaskView {
pub fn from_task(task: &Task) -> TaskView {
TaskView {
uid: task.uid,
index_uid: IndexUidView::new(&task.indexes()),
index_uid: task.index_uid().map(ToOwned::to_owned),
status: task.status,
kind: task.kind.as_kind(),
canceled_by: task.canceled_by,