From 14e253bbc78e36e07f4aec699fe3ee1316cc826b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFssous?= <kayyissa.haissous@etu.u-pec.fr>
Date: Mon, 27 Mar 2023 11:16:06 +0200
Subject: [PATCH 1/4] search etape 2/3

---
 components/search.riot | 45 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/components/search.riot b/components/search.riot
index 43399f4..82a5f7a 100644
--- a/components/search.riot
+++ b/components/search.riot
@@ -4,7 +4,7 @@
 		<div id="list-formations">
             <ul>
 	            <li each={item in this.state.items}>
-		           <a href={item.path} target="_blank">{item.name}</a>
+		           <span onclick={()=>filter(item.name)}>{item.name}</span>
                    <span>{item.count}</span>
 	            </li>
             </ul>
@@ -12,8 +12,8 @@
     </label>
     <script>
 
-        async function formation(){
-            let result = await fetch("https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&sort=tri&facet=fili&timezone=Europe%2FBerlin")
+        async function formation(whatToSearch){
+            let result = await fetch("https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&sort=tri&facet="+whatToSearch+"&timezone=Europe%2FBerlin")
             let resultats = await result.json()
             let table = resultats["facet_groups"][0]["facets"]
             return table
@@ -26,9 +26,10 @@
                     this.state = {
                         formation: props.formation,
                         items: null,
-                        allitems: null
+                        allitems: null,
+                        whatToSearch: "fili"
                     }
-                    formation().then((response) => {
+                    formation(this.state.whatToSearch).then((response) => {
 			            this.update({
                             items: response,
                             allitems: response
@@ -38,14 +39,44 @@
                 searchF(e){
                     let responseFiltered=[]
 			        this.state.allitems.forEach(formation => {
-                        if (formation.name.includes(e.target.value)) {
+                        if (formation.name.toUpperCase().includes(e.target.value.toUpperCase())) {
                             responseFiltered.push(formation)
                         }
                     });
                     this.update({
                         items: responseFiltered
 				    })
-                    console.log(this.state.items)
+                },
+                filter(fili){
+                    console.log("filter! "+fili)
+                    if (this.state.whatToSearch==="form_lib_voe_acc"){
+                        this.update({
+                                formation: "Filière de formation détaillée",
+                                whatToSearch: "lib_for_voe_ins"
+                            })
+                    } else {
+                        this.update({
+                                formation: "Filière de formation",
+                                whatToSearch: "form_lib_voe_acc"
+                            })
+                    }
+                    formation(this.state.whatToSearch).then((response) => {
+                        this.update({
+                            allitems: response,
+                            item: response
+                        })
+                        console.log(this.state.items)
+                    })
+                    let responseFiltered=[]
+			        this.state.allitems.forEach(formation => {
+                        if (formation.name.includes(fili)) {
+                            responseFiltered.push(formation)
+                        }
+                    });
+                    this.update({
+                        allitems: responseFiltered,
+                        items: responseFiltered
+				    })
                 }
             }
         }

From 77c36b7d8b94786322fe59cb007f34d0c6c4f518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFssous?= <kayyissa.haissous@etu.u-pec.fr>
Date: Mon, 27 Mar 2023 16:15:49 +0200
Subject: [PATCH 2/4] aled le search.js en sueurs

---
 components/search.riot |  43 +++++++--------
 index.html             |   2 -
 javascript/search.js   | 120 -----------------------------------------
 3 files changed, 19 insertions(+), 146 deletions(-)
 delete mode 100644 javascript/search.js

diff --git a/components/search.riot b/components/search.riot
index 82a5f7a..5776dab 100644
--- a/components/search.riot
+++ b/components/search.riot
@@ -1,6 +1,6 @@
 <search>
     <label>
-	    <input onkeydown={searchF} type="input" placeholder= {state.formation}>
+	    <input onkeydown={searchF} type="input" placeholder= {state.placeholder}>
 		<div id="list-formations">
             <ul>
 	            <li each={item in this.state.items}>
@@ -12,10 +12,10 @@
     </label>
     <script>
 
-        async function formation(whatToSearch){
+        async function apiLink(whatToSearch, whereToSearch){
             let result = await fetch("https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&sort=tri&facet="+whatToSearch+"&timezone=Europe%2FBerlin")
             let resultats = await result.json()
-            let table = resultats["facet_groups"][0]["facets"]
+            let table = resultats["facet_groups"][whereToSearch]["facets"]
             return table
         }
 
@@ -24,12 +24,14 @@
                 onBeforeMount(props, state) {
                 // initial state
                     this.state = {
-                        formation: props.formation,
+                        placeholder: "Formation",
                         items: null,
                         allitems: null,
-                        whatToSearch: "fili"
+                        whatToSearch: "fili",
+                        fili: null,
+                        sousfili: null
                     }
-                    formation(this.state.whatToSearch).then((response) => {
+                    apiLink(this.state.whatToSearch,0).then((response) => {
 			            this.update({
                             items: response,
                             allitems: response
@@ -49,34 +51,27 @@
                 },
                 filter(fili){
                     console.log("filter! "+fili)
-                    if (this.state.whatToSearch==="form_lib_voe_acc"){
+                    let step=0;
+                    if (this.state.placeholder==="Filière de formation"){
                         this.update({
-                                formation: "Filière de formation détaillée",
-                                whatToSearch: "lib_for_voe_ins"
-                            })
+                            placeholder: "Filière de formation détaillée",
+                            sousfili: fili,
+                            whatToSearch: "fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.form_lib_voe_acc="+this.state.sousfili+"&refine.fili="this.state.fili
+                        })
                     } else {
                         this.update({
-                                formation: "Filière de formation",
-                                whatToSearch: "form_lib_voe_acc"
-                            })
+                            placeholder: "Filière de formation",
+                            fili: fili,
+                            whatToSearch: "fili&facet=form_lib_voe_acc&refine.fili="+this.state.fili
+                        })
                     }
-                    formation(this.state.whatToSearch).then((response) => {
+                    apiLink(this.state.whatToSearch).then((response) => {
                         this.update({
                             allitems: response,
                             item: response
                         })
                         console.log(this.state.items)
                     })
-                    let responseFiltered=[]
-			        this.state.allitems.forEach(formation => {
-                        if (formation.name.includes(fili)) {
-                            responseFiltered.push(formation)
-                        }
-                    });
-                    this.update({
-                        allitems: responseFiltered,
-                        items: responseFiltered
-				    })
                 }
             }
         }
diff --git a/index.html b/index.html
index f8ba9ba..b4e2b3e 100644
--- a/index.html
+++ b/index.html
@@ -17,8 +17,6 @@
 		<script>
 			riot.compile().then(() => {
 				riot.mount('search', {
-					formation:'Formation',
-					items: null
 				})
 			})
 		</script>
diff --git a/javascript/search.js b/javascript/search.js
deleted file mode 100644
index ad7b098..0000000
--- a/javascript/search.js
+++ /dev/null
@@ -1,120 +0,0 @@
-let model = {
-  getFormations(search) {
-    return new Promise((resolve, reject) => {
-      let xhr = new XMLHttpRequest();
-      xhr.open("GET", "/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&sort=tri&facet=fili&timezone=Europe%2FBerlin");
-      xhr.responseType = "json";
-      xhr.onload = ev => {
-        if (xhr.status == 200) resolve(xhr.response);
-      };
-      xhr.onerror = () => {
-        reject("error");
-      };
-      xhr.send();
-    });
-  }
-};
-
-class Controller {
-  constructor(view, model) {
-    this.view = view;
-    this.model = model;
-    this.loading = false;
-    this.lastSearch = null;
-    this.error = null;
-    this.results = [];
-    this.view.setLoading(false);
-    this.view.bindSearch(this.search.bind(this));
-  }
-  reset() {
-    this.loading = false;
-    this.error = null;
-    this.results = [];
-  }
-  async search(formation) {
-    this.model.getFormations(formation).then(response => {
-      let table = response["facet groups"][0]["facets"];
-      this.view.renderList(table);
-    }).catch(error => {
-      this.view.renderMessage(error);
-    });
-  }
-}
-
-function debounce(fn, wait) {
-  let timeout;
-  return (...args) => {
-    clearTimeout(timeout);
-    timeout = setTimeout(() => fn(...args), wait);
-  };
-}
-class View {
-  constructor() {
-    this.listFormations = document.querySelector("#list-formations");
-    this.inputSearch = document.querySelector("input");
-    this.message = document.querySelector("p.error");
-  }
-  _getInput() {
-    return this.inputSearch.value;
-  }
-  renderMessage(error) {
-    this.message.style.display = "block";
-    this.message.textContent = error;
-  }
-  renderList(formations) {
-    let ul = document.createElement("ul");
-    formations.forEach(formation => {
-      let li = document.createElement("li");
-      let a = document.createElement("a");
-      let span = document.createElement("span");
-      //a.href = `test`
-      a.target = "_blank";
-      a.textContent = formation.name;
-      span.textContent = formation.name;
-      li.appendChild(a);
-      li.appendChild(span);
-      ul.appendChild(li);
-    });
-    this.listFormations.replaceChildren(ul);
-  }
-  bindSearch(handler) {
-    this.inputSearch.addEventListener("input", debounce(e => {
-      handler(this._getInput());
-    }, 500));
-  }
-}
-
-var search = {
-  css: null,
-  exports: function search() {
-    return {
-      onBeforeMount(props, state) {
-        // initial state
-        this.state = {
-          formation: props.formation
-        };
-      },
-      search() {
-        console.log("test1");
-        const view = new View();
-        new Controller(view, model);
-      }
-    };
-  },
-  template: (template, expressionTypes, bindingTypes, getComponent) => template('<label><input expr1="expr1" type="input"/><p class="error"></p><div id="list-formations"></div></label>', [{
-    redundantAttribute: 'expr1',
-    selector: '[expr1]',
-    expressions: [{
-      type: expressionTypes.EVENT,
-      name: 'oninput',
-      evaluate: _scope => _scope.search
-    }, {
-      type: expressionTypes.ATTRIBUTE,
-      name: 'placeholder',
-      evaluate: _scope => _scope.state.formation
-    }]
-  }]),
-  name: 'search'
-};
-
-export { search as default };

From d4112402c10f3a6321eb47c7b0a6ae72b8035fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFssous?= <kayyissa.haissous@etu.u-pec.fr>
Date: Mon, 27 Mar 2023 20:19:59 +0200
Subject: [PATCH 3/4] search 3/3

---
 components/search.riot          |  90 ++++++++++++++++-----
 javascript/components/search.js | 139 ++++++++++++++++++++++++++++++++
 javascript/parcoursup-link.js   |   2 +-
 javascript/search.js            | 123 ++++++++++++++++++++++++++++
 4 files changed, 332 insertions(+), 22 deletions(-)
 create mode 100644 javascript/components/search.js
 create mode 100644 javascript/search.js

diff --git a/components/search.riot b/components/search.riot
index 5776dab..48e9c91 100644
--- a/components/search.riot
+++ b/components/search.riot
@@ -1,6 +1,7 @@
 <search>
     <label>
 	    <input onkeydown={searchF} type="input" placeholder= {state.placeholder}>
+        <button onclick={back}><</button>
 		<div id="list-formations">
             <ul>
 	            <li each={item in this.state.items}>
@@ -12,11 +13,27 @@
     </label>
     <script>
 
-        async function apiLink(whatToSearch, whereToSearch){
-            let result = await fetch("https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&sort=tri&facet="+whatToSearch+"&timezone=Europe%2FBerlin")
-            let resultats = await result.json()
-            let table = resultats["facet_groups"][whereToSearch]["facets"]
-            return table
+        const searchURL = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&timezone=Europe%2FBerlin`
+
+        async function fetchFiliere0() {
+            let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fili`)
+            let result  = await request.json()
+
+            return result["facet_groups"][0]["facets"]
+        }
+
+        async function fetchFiliere1(filiere) {
+            let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`)
+            let result  = await request.json()
+
+            return result["facet_groups"][0]["facets"]
+        }
+
+        async function fetchFiliere2(sousfiliere) {
+            let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${sousfiliere}`)
+            let result  = await request.json()
+
+            return result["facet_groups"][0]["facets"]
         }
 
         export default function search(){
@@ -27,11 +44,10 @@
                         placeholder: "Formation",
                         items: null,
                         allitems: null,
-                        whatToSearch: "fili",
                         fili: null,
                         sousfili: null
                     }
-                    apiLink(this.state.whatToSearch,0).then((response) => {
+                    fetchFiliere0().then((response) => {
 			            this.update({
                             items: response,
                             allitems: response
@@ -51,27 +67,59 @@
                 },
                 filter(fili){
                     console.log("filter! "+fili)
-                    let step=0;
                     if (this.state.placeholder==="Filière de formation"){
                         this.update({
                             placeholder: "Filière de formation détaillée",
                             sousfili: fili,
-                            whatToSearch: "fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.form_lib_voe_acc="+this.state.sousfili+"&refine.fili="this.state.fili
                         })
-                    } else {
-                        this.update({
-                            placeholder: "Filière de formation",
-                            fili: fili,
-                            whatToSearch: "fili&facet=form_lib_voe_acc&refine.fili="+this.state.fili
-                        })
-                    }
-                    apiLink(this.state.whatToSearch).then((response) => {
-                        this.update({
-                            allitems: response,
-                            item: response
+                        fetchFiliere2(this.state.sousfili).then((response) => {
+                            this.update({
+                                allitems: response,
+                                items: response
+                            })
                         })
                         console.log(this.state.items)
-                    })
+                    } else if (this.state.placeholder="Formation"){
+                        this.update({
+                            placeholder: "Filière de formation",
+                            fili: fili
+                        })
+                        fetchFiliere1(this.state.fili).then((response) => {
+                            this.update({
+                                allitems: response,
+                                items: response
+                            })
+                            console.log(this.state.items)
+                        })
+                    }
+                },
+                back(){
+                    console.log("back")
+                    if (this.state.placeholder==="Filière de formation"){
+                        this.update({
+                            placeholder: "Formation",
+                            fili: null,
+                        })
+                        fetchFiliere0().then((response) => {
+                            this.update({
+                                allitems: response,
+                                items: response
+                            })
+                        })
+                        console.log(this.state.items)
+                    } else if (this.state.placeholder="Filière de formation détaillée"){
+                        this.update({
+                            placeholder: "Filière de formation",
+                            sousfili: null
+                        })
+                        fetchFiliere1(this.state.fili).then((response) => {
+                            this.update({
+                                allitems: response,
+                                items: response
+                            })
+                            console.log(this.state.items)
+                        })
+                    }
                 }
             }
         }
diff --git a/javascript/components/search.js b/javascript/components/search.js
new file mode 100644
index 0000000..2e9037e
--- /dev/null
+++ b/javascript/components/search.js
@@ -0,0 +1,139 @@
+const searchURL = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&timezone=Europe%2FBerlin`;
+async function fetchFiliere0() {
+  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fili`);
+  let result = await request.json();
+  return result["facet_groups"][0]["facets"];
+}
+async function fetchFiliere1(filiere) {
+  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`);
+  let result = await request.json();
+  return result["facet_groups"][0]["facets"];
+}
+async function fetchFiliere2(sousfiliere) {
+  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${sousfiliere}`);
+  let result = await request.json();
+  return result["facet_groups"][0]["facets"];
+}
+var search = {
+  css: null,
+  exports: function search() {
+    return {
+      onBeforeMount(props, state) {
+        // initial state
+        this.state = {
+          placeholder: "Formation",
+          items: null,
+          allitems: null,
+          fili: null,
+          button: "disabled"
+        };
+        fetchFiliere0().then(response => {
+          this.update({
+            items: response,
+            allitems: response
+          });
+        });
+      },
+      searchF(e) {
+        let responseFiltered = [];
+        this.state.allitems.forEach(formation => {
+          if (formation.name.toUpperCase().includes(e.target.value.toUpperCase())) {
+            responseFiltered.push(formation);
+          }
+        });
+        this.update({
+          items: responseFiltered
+        });
+      },
+      filter(fili) {
+        console.log("filter! " + fili);
+        if (this.state.placeholder === "Filière de formation") {
+          this.update({
+            placeholder: "Filière de formation détaillée",
+            fili: fili
+          });
+          fetchFiliere2(this.state.fili).then(response => {
+            this.update({
+              allitems: response,
+              items: response
+            });
+          });
+          console.log(this.state.items);
+        } else if (this.state.placeholder = "Formation") {
+          this.update({
+            placeholder: "Filière de formation",
+            fili: fili
+          });
+          fetchFiliere1(this.state.fili).then(response => {
+            this.update({
+              allitems: response,
+              items: response
+            });
+            console.log(this.state.items);
+          });
+        }
+      },
+      back() {
+        console.log("back");
+      }
+    };
+  },
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<label><input expr0="expr0" type="input"/><button expr1="expr1"><</button><div id="list-formations"><ul><li expr2="expr2"></li></ul></div></label>', [{
+    redundantAttribute: 'expr0',
+    selector: '[expr0]',
+    expressions: [{
+      type: expressionTypes.EVENT,
+      name: 'onkeydown',
+      evaluate: _scope => _scope.searchF
+    }, {
+      type: expressionTypes.ATTRIBUTE,
+      name: 'placeholder',
+      evaluate: _scope => _scope.state.placeholder
+    }]
+  }, {
+    redundantAttribute: 'expr1',
+    selector: '[expr1]',
+    expressions: [{
+      type: expressionTypes.EVENT,
+      name: 'onclick',
+      evaluate: _scope => _scope.back
+    }, {
+      type: expressionTypes.ATTRIBUTE,
+      name: 'this.state.button',
+      evaluate: _scope => _scope.state.button
+    }]
+  }, {
+    type: bindingTypes.EACH,
+    getKey: null,
+    condition: null,
+    template: template('<span expr3="expr3"> </span><span expr4="expr4"> </span>', [{
+      redundantAttribute: 'expr3',
+      selector: '[expr3]',
+      expressions: [{
+        type: expressionTypes.TEXT,
+        childNodeIndex: 0,
+        evaluate: _scope => _scope.item.name
+      }, {
+        type: expressionTypes.EVENT,
+        name: 'onclick',
+        evaluate: _scope => () => _scope.filter(_scope.item.name)
+      }]
+    }, {
+      redundantAttribute: 'expr4',
+      selector: '[expr4]',
+      expressions: [{
+        type: expressionTypes.TEXT,
+        childNodeIndex: 0,
+        evaluate: _scope => _scope.item.count
+      }]
+    }]),
+    redundantAttribute: 'expr2',
+    selector: '[expr2]',
+    itemName: 'item',
+    indexName: null,
+    evaluate: _scope => _scope.state.items
+  }]),
+  name: 'search'
+};
+
+export { search as default };
diff --git a/javascript/parcoursup-link.js b/javascript/parcoursup-link.js
index 1dd04b4..525ab0e 100644
--- a/javascript/parcoursup-link.js
+++ b/javascript/parcoursup-link.js
@@ -17,7 +17,7 @@ class PAPI {
     }
 
     static async fetchFiliere(filiere) {
-        let request = await fetch(`${PAPI.searchURL}&rows=0&sort=tri&facet=lib_for_voe_ins&refine.fili=${filiere}`)
+        let request = await fetch(`${PAPI.searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`)
         let result  = await request.json()
 
         return result["facet_groups"][0]["facets"]
diff --git a/javascript/search.js b/javascript/search.js
new file mode 100644
index 0000000..583464a
--- /dev/null
+++ b/javascript/search.js
@@ -0,0 +1,123 @@
+const searchURL = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&timezone=Europe%2FBerlin`;
+async function fetchFiliere0() {
+  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fili`);
+  let result = await request.json();
+  return result["facet_groups"][0]["facets"];
+}
+async function fetchFiliere1(filiere) {
+  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`);
+  let result = await request.json();
+  return result["facet_groups"][0]["facets"];
+}
+async function fetchFiliere2(sousfiliere) {
+  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${sousfiliere}`);
+  let result = await request.json();
+  return result["facet_groups"][0]["facets"];
+}
+var search = {
+  css: null,
+  exports: function search() {
+    return {
+      onBeforeMount(props, state) {
+        // initial state
+        this.state = {
+          placeholder: "Formation",
+          items: null,
+          allitems: null,
+          fili: null
+        };
+        fetchFiliere0().then(response => {
+          this.update({
+            items: response,
+            allitems: response
+          });
+        });
+      },
+      searchF(e) {
+        let responseFiltered = [];
+        this.state.allitems.forEach(formation => {
+          if (formation.name.toUpperCase().includes(e.target.value.toUpperCase())) {
+            responseFiltered.push(formation);
+          }
+        });
+        this.update({
+          items: responseFiltered
+        });
+      },
+      filter(fili) {
+        console.log("filter! " + fili);
+        if (this.state.placeholder === "Filière de formation") {
+          this.update({
+            placeholder: "Filière de formation détaillée",
+            fili: fili
+          });
+          fetchFiliere2(this.state.fili).then(response => {
+            this.update({
+              allitems: response,
+              items: response
+            });
+          });
+          console.log(this.state.items);
+        } else if (this.state.placeholder = "Formation") {
+          this.update({
+            placeholder: "Filière de formation",
+            fili: fili
+          });
+          fetchFiliere1(this.state.fili).then(response => {
+            this.update({
+              allitems: response,
+              items: response
+            });
+            console.log(this.state.items);
+          });
+        }
+      }
+    };
+  },
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<label><input expr36="expr36" type="input"/><div id="list-formations"><ul><li expr37="expr37"></li></ul></div></label>', [{
+    redundantAttribute: 'expr36',
+    selector: '[expr36]',
+    expressions: [{
+      type: expressionTypes.EVENT,
+      name: 'onkeydown',
+      evaluate: _scope => _scope.searchF
+    }, {
+      type: expressionTypes.ATTRIBUTE,
+      name: 'placeholder',
+      evaluate: _scope => _scope.state.placeholder
+    }]
+  }, {
+    type: bindingTypes.EACH,
+    getKey: null,
+    condition: null,
+    template: template('<span expr38="expr38"> </span><span expr39="expr39"> </span>', [{
+      redundantAttribute: 'expr38',
+      selector: '[expr38]',
+      expressions: [{
+        type: expressionTypes.TEXT,
+        childNodeIndex: 0,
+        evaluate: _scope => _scope.item.name
+      }, {
+        type: expressionTypes.EVENT,
+        name: 'onclick',
+        evaluate: _scope => () => _scope.filter(_scope.item.name)
+      }]
+    }, {
+      redundantAttribute: 'expr39',
+      selector: '[expr39]',
+      expressions: [{
+        type: expressionTypes.TEXT,
+        childNodeIndex: 0,
+        evaluate: _scope => _scope.item.count
+      }]
+    }]),
+    redundantAttribute: 'expr37',
+    selector: '[expr37]',
+    itemName: 'item',
+    indexName: null,
+    evaluate: _scope => _scope.state.items
+  }]),
+  name: 'search'
+};
+
+export { search as default };

From 2a60706e63c7a4535cffa4bcfe684eb5435f5bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFssous?= <kayyissa.haissous@etu.u-pec.fr>
Date: Mon, 27 Mar 2023 21:22:11 +0200
Subject: [PATCH 4/4] opti code search

---
 components/search.riot          | 68 +++++++++++----------------------
 javascript/components/search.js | 61 +++++++++++++++++++----------
 2 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/components/search.riot b/components/search.riot
index 48e9c91..769432d 100644
--- a/components/search.riot
+++ b/components/search.riot
@@ -15,24 +15,15 @@
 
         const searchURL = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&timezone=Europe%2FBerlin`
 
-        async function fetchFiliere0() {
-            let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fili`)
+        async function fetchFiliere(state) {
+            if (state.sousfili){
+                var request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${state.sousfili}`)
+            } else if (state.fili&&!state.sousfili){
+                var request = await fetch(`${searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${state.fili}`)
+            } else if (!state.fili&&!state.sousfili){
+                var request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fili`)
+            }
             let result  = await request.json()
-
-            return result["facet_groups"][0]["facets"]
-        }
-
-        async function fetchFiliere1(filiere) {
-            let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`)
-            let result  = await request.json()
-
-            return result["facet_groups"][0]["facets"]
-        }
-
-        async function fetchFiliere2(sousfiliere) {
-            let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${sousfiliere}`)
-            let result  = await request.json()
-
             return result["facet_groups"][0]["facets"]
         }
 
@@ -47,7 +38,7 @@
                         fili: null,
                         sousfili: null
                     }
-                    fetchFiliere0().then((response) => {
+                    fetchFiliere(this.state).then((response) => {
 			            this.update({
                             items: response,
                             allitems: response
@@ -72,26 +63,19 @@
                             placeholder: "Filière de formation détaillée",
                             sousfili: fili,
                         })
-                        fetchFiliere2(this.state.sousfili).then((response) => {
-                            this.update({
-                                allitems: response,
-                                items: response
-                            })
-                        })
-                        console.log(this.state.items)
                     } else if (this.state.placeholder="Formation"){
                         this.update({
                             placeholder: "Filière de formation",
                             fili: fili
                         })
-                        fetchFiliere1(this.state.fili).then((response) => {
-                            this.update({
-                                allitems: response,
-                                items: response
-                            })
-                            console.log(this.state.items)
-                        })
                     }
+                    fetchFiliere(this.state).then((response) => {
+                        this.update({
+                            allitems: response,
+                            items: response
+                        })
+                        console.log(this.state.items)
+                    })
                 },
                 back(){
                     console.log("back")
@@ -100,26 +84,18 @@
                             placeholder: "Formation",
                             fili: null,
                         })
-                        fetchFiliere0().then((response) => {
-                            this.update({
-                                allitems: response,
-                                items: response
-                            })
-                        })
-                        console.log(this.state.items)
                     } else if (this.state.placeholder="Filière de formation détaillée"){
                         this.update({
                             placeholder: "Filière de formation",
                             sousfili: null
                         })
-                        fetchFiliere1(this.state.fili).then((response) => {
-                            this.update({
-                                allitems: response,
-                                items: response
-                            })
-                            console.log(this.state.items)
-                        })
                     }
+                    fetchFiliere(this.state).then((response) => {
+                        this.update({
+                            allitems: response,
+                            items: response
+                        })
+                    })
                 }
             }
         }
diff --git a/javascript/components/search.js b/javascript/components/search.js
index 2e9037e..8ca828e 100644
--- a/javascript/components/search.js
+++ b/javascript/components/search.js
@@ -1,16 +1,14 @@
 const searchURL = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&timezone=Europe%2FBerlin`;
-async function fetchFiliere0() {
-  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fili`);
-  let result = await request.json();
-  return result["facet_groups"][0]["facets"];
-}
-async function fetchFiliere1(filiere) {
-  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`);
-  let result = await request.json();
-  return result["facet_groups"][0]["facets"];
-}
-async function fetchFiliere2(sousfiliere) {
-  let request = await fetch(`${searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${sousfiliere}`);
+async function fetchFiliere(state) {
+  if (state.sousfili) {
+    await fetch(`${searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${sousfiliere}`);
+  } else if (state.fili & !state.sousfili) {
+    await fetch(`${searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`);
+  } else if (!state.fili & !state.sousfili) {
+    await fetch(`${searchURL}&rows=0&sort=tri&facet=fili`);
+  } else {
+    console.log("ta verif elle pue");
+  }
   let result = await request.json();
   return result["facet_groups"][0]["facets"];
 }
@@ -25,9 +23,9 @@ var search = {
           items: null,
           allitems: null,
           fili: null,
-          button: "disabled"
+          sousfili: null
         };
-        fetchFiliere0().then(response => {
+        fetchFiliere(this.state).then(response => {
           this.update({
             items: response,
             allitems: response
@@ -50,9 +48,9 @@ var search = {
         if (this.state.placeholder === "Filière de formation") {
           this.update({
             placeholder: "Filière de formation détaillée",
-            fili: fili
+            sousfili: fili
           });
-          fetchFiliere2(this.state.fili).then(response => {
+          fetchFiliere(this.state).then(response => {
             this.update({
               allitems: response,
               items: response
@@ -64,7 +62,7 @@ var search = {
             placeholder: "Filière de formation",
             fili: fili
           });
-          fetchFiliere1(this.state.fili).then(response => {
+          fetchFiliere(this.state).then(response => {
             this.update({
               allitems: response,
               items: response
@@ -75,6 +73,31 @@ var search = {
       },
       back() {
         console.log("back");
+        if (this.state.placeholder === "Filière de formation") {
+          this.update({
+            placeholder: "Formation",
+            fili: null
+          });
+          fetchFiliere(state).then(response => {
+            this.update({
+              allitems: response,
+              items: response
+            });
+          });
+          console.log(this.state.items);
+        } else if (this.state.placeholder = "Filière de formation détaillée") {
+          this.update({
+            placeholder: "Filière de formation",
+            sousfili: null
+          });
+          fetchFiliere(this.state).then(response => {
+            this.update({
+              allitems: response,
+              items: response
+            });
+            console.log(this.state.items);
+          });
+        }
       }
     };
   },
@@ -97,10 +120,6 @@ var search = {
       type: expressionTypes.EVENT,
       name: 'onclick',
       evaluate: _scope => _scope.back
-    }, {
-      type: expressionTypes.ATTRIBUTE,
-      name: 'this.state.button',
-      evaluate: _scope => _scope.state.button
     }]
   }, {
     type: bindingTypes.EACH,