Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
DragonOS-Community
/
triagebot
-ын хуулбар https://github.com/DragonOS-Community/triagebot.git
4
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Filter on the client side

Takayuki Nakata 3 жил өмнө
parent
7656c322f1
commit
cd64ed0bdd
3 өөрчлөгдсөн 49 нэмэгдсэн , 58 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 1 8
      src/main.rs
  2. 2 45
      src/triage.rs
  3. 46 5
      templates/triage/pulls.html

+ 1 - 8
src/main.rs
Файл харах 

@@ -21,14 +21,7 @@ async fn serve_req(req: Request<Body>, ctx: Arc<Context>) -> Result<Response<Bod
 
             let params = matcher.params();
 
             let owner = params.find("owner");
 
             let repo = params.find("repo");
 
-            let filter = if let Some(q) = req.uri.query() {
 
-                let pair = url::form_urlencoded::parse(q.as_bytes()).find(|(k, _)| k == "q");
 
-                pair.map(|(_, filter)| filter.to_string())
 
-            } else {
 
-                None
 
-            };
 
-
 
-            return triagebot::triage::pulls(ctx, owner.unwrap(), repo.unwrap(), filter).await;
 
+            return triagebot::triage::pulls(ctx, owner.unwrap(), repo.unwrap()).await;
 
         } else {
 
             return triagebot::triage::index();
 
         }

+ 2 - 45
src/triage.rs
Файл харах 

@@ -21,7 +21,6 @@ pub async fn pulls(
 
     ctx: Arc<Context>,
 
     owner: &str,
 
     repo: &str,
 
-    filter: Option<String>,
 
 ) -> Result<Response<Body>, hyper::Error> {
 
     let octocrab = &ctx.octocrab;
 
     let res = octocrab
 
@@ -52,24 +51,6 @@ pub async fn pulls(
 
         next_page = page.next;
 
     }
 
 
-    let mut label_filter = Vec::new();
 
-    let mut author_filter = Vec::new();
 
-    let mut assignee_filter = Vec::new();
 
-    if let Some(filter) = filter.clone() {
 
-        let kvs: Vec<&str> = filter.split_whitespace().collect();
 
-        for kv in kvs {
 
-            match kv.split_once(':') {
 
-                Some((k, v)) if !v.is_empty() => match k {
 
-                    "label" => label_filter.push(v.to_string()),
 
-                    "author" => author_filter.push(v.to_string()),
 
-                    "assignee" => assignee_filter.push(v.to_string()),
 
-                    _ => {}
 
-                },
 
-                _ => {}
 
-            }
 
-        }
 
-    }
 
-
 
     let mut pulls: Vec<Value> = Vec::new();
 
     for base_pull in base_pulls.into_iter() {
 
         let assignee = base_pull.assignee.map_or("".to_string(), |v| v.login);
 
@@ -90,25 +71,13 @@ pub async fn pulls(
 
             (Utc::now() - base_pull.created_at).num_days()
 
         };
 
 
-        let labels = base_pull.labels.map_or(Vec::new(), |labels| {
 
+        let labels = base_pull.labels.map_or("".to_string(), |labels| {
 
             labels
 
                 .iter()
 
                 .map(|label| label.name.clone())
 
                 .collect::<Vec<_>>()
 
+                .join(", ")
 
         });
 
-        if !label_filter.is_empty() {
 
-            let mut flg = false;
 
-            for filter in label_filter.iter() {
 
-                if !labels.iter().any(|label| *label == *filter) {
 
-                    flg = true;
 
-                }
 
-            }
 
-            if flg {
 
-                continue;
 
-            }
 
-        }
 
-
 
-        let labels = labels.join(", ");
 
         let wait_for_author = labels.contains("S-waiting-on-author");
 
         let wait_for_review = labels.contains("S-waiting-on-review");
 
         let html_url = base_pull.html_url;
 
@@ -116,13 +85,6 @@ pub async fn pulls(
 
         let title = base_pull.title;
 
         let author = base_pull.user.login;
 
 
-        if !author_filter.is_empty() && !author_filter.iter().all(|s| *s == author) {
 
-            continue;
 
-        }
 
-        if !assignee_filter.is_empty() && !assignee_filter.iter().all(|s| *s == assignee) {
 
-            continue;
 
-        }
 
-
 
         let pull = PullRequest {
 
             html_url,
 
             number,
 
@@ -143,11 +105,6 @@ pub async fn pulls(
 
     context.insert("pulls", &pulls);
 
     context.insert("owner", &owner);
 
     context.insert("repo", &repo);
 
-    if let Some(filter) = filter {
 
-        context.insert("filter", &filter);
 
-    } else {
 
-        context.insert("filter", "");
 
-    }
 
 
     let tera = tera::Tera::new("templates/triage/**/*").unwrap();
 
     let body = Body::from(tera.render("pulls.html", &context).unwrap());

+ 46 - 5
templates/triage/pulls.html
Файл харах 

@@ -38,15 +38,56 @@
 
                 border-radius:2;
 
             }
 
         </style>
 
+        <script>
 
+            function filter() {
 
+                var input, filter, table, tr, i, txtValue;
 
+                input = document.getElementById("filter-input");
 
+                filter = input.value;
 
+                table = document.getElementById("pr-table");
 
+                tr = table.getElementsByTagName("tr");
 
+
 
+                filters = filter.split(' ').map(function(x) {
 
+                    return x.split(':');
 
+                });
 
+
 
+
 
+                for (i = 0; i < tr.length; i++) {
 
+                    filters.forEach(function(flt) {
 
+                        if (flt.length == 2) {
 
+                            var td;
 
+                            switch (flt[0]) {
 
+                                case 'label':
 
+                                    td = tr[i].getElementsByTagName("td")[6];
 
+                                    break;
 
+                                case 'assignee':
 
+                                    td = tr[i].getElementsByTagName("td")[5];
 
+                                    break;
 
+                                case 'author':
 
+                                    td = tr[i].getElementsByTagName("td")[4];
 
+                                    break;
 
+                            }
 
+                            if (td) {
 
+                                txtValue = td.textContent || td.innerText;
 
+                                if (txtValue.indexOf(flt[1]) > -1) {
 
+                                    tr[i].style.display = "";
 
+                                } else {
 
+                                    tr[i].style.display = "none";
 
+                                }
 
+                            }
 
+                        } else {
 
+                            tr[i].style.display = "";
 
+                        }
 
+                    });
 
+                }
 
+            }
 
+        </script>
 
     </head>
 
 
     <body>
 
         <h1>Triage dashboard - <a href="https://github.com/{{ owner }}/{{ repo }}">{{ owner }}/{{ repo }}</a></h1>
 
-        <form action="/triage/{{ owner }}/{{ repo }}" method="get">
 
-            <input type="search" name="q" value="{{ filter }}" style="width: 400px;">
 
-            <input type="submit" value="filter">
 
-        </form>
 
-        <table>
 
+        <input id="filter-input" type="search" style="width: 400px;">
 
+        <input type="submit" value="filter" onclick="filter()">
 
+        <table id="pr-table">
 
             <thead>
 
                 <tr>
 
                     <th>#</th>