From d0244ff2100d592b9d3cb969a5835969b4875f51 Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Thu, 18 Jan 2024 17:00:04 +0100
Subject: [PATCH 01/19] feat: providers list handler

---
 eodag_labextension/handlers.py | 44 ++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/eodag_labextension/handlers.py b/eodag_labextension/handlers.py
index e0fa6b6..49489e3 100644
--- a/eodag_labextension/handlers.py
+++ b/eodag_labextension/handlers.py
@@ -16,17 +16,51 @@
 
 
 class ProductTypeHandler(APIHandler):
-    """Product type listing handler
+    """Product type listing handlerd"""
 
-    .. note::
+    @tornado.web.authenticated
+    def get(self):
+        """Get endpoint"""
+
+        get_product_types_kwargs = {}
+        query_dict = parse_qs(self.request.query)
+        if "provider" in query_dict and isinstance(query_dict["provider"], list) and len(query_dict["provider"]) > 0:
+            get_product_types_kwargs["provider"] = query_dict["provider"][0]
+        product_types = get_product_types(**get_product_types_kwargs)
+
+        self.write(json.dumps(product_types))
 
-        Product types endpoint filtered by provider not implemented"""
+
+class ProvidersHandler(APIHandler):
+    """Providers listing handler"""
 
     @tornado.web.authenticated
     def get(self):
         """Get endpoint"""
 
-        self.write(json.dumps(get_product_types()))
+        available_providers_kwargs = {}
+        query_dict = parse_qs(self.request.query)
+        if (
+            "product_type" in query_dict
+            and isinstance(query_dict["product_type"], list)
+            and len(query_dict["product_type"]) > 0
+        ):
+            available_providers_kwargs["product_type"] = query_dict["product_type"][0]
+        available_providers = eodag_api.available_providers(**available_providers_kwargs)
+
+        providers_list = [
+            dict(
+                provider=provider,
+                priority=conf.priority,
+                description=getattr(conf, "description", None),
+                url=getattr(conf, "url", None),
+            )
+            for provider, conf in eodag_api.providers_config.items()
+            if provider in available_providers
+        ]
+        providers_list.sort(key=lambda x: (x["priority"] * -1, x["provider"]))
+
+        self.write(json.dumps(providers_list))
 
 
 class GuessProductTypeHandler(APIHandler):
@@ -121,12 +155,14 @@ def setup_handlers(web_app, url_path):
     # matching patterns
     host_pattern = ".*$"
     product_types_pattern = url_path_join(base_url, url_path, "product-types")
+    providers_pattern = url_path_join(base_url, url_path, "providers")
     guess_product_types_pattern = url_path_join(base_url, url_path, "guess-product-type")
     search_pattern = url_path_join(base_url, url_path, r"(?P<product_type>[\w-]+)")
 
     # handlers added for each pattern
     handlers = [
         (product_types_pattern, ProductTypeHandler),
+        (providers_pattern, ProvidersHandler),
         (guess_product_types_pattern, GuessProductTypeHandler),
         (MethodAndPathMatch("POST", search_pattern), SearchHandler),
     ]

From cacbb7302a087803994adc41c9b52925a94066d8 Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Fri, 19 Jan 2024 17:28:11 +0100
Subject: [PATCH 02/19] feat: add provider select

---
 src/Autocomplete.tsx  | 35 +++++++++++++--------
 src/FormComponent.tsx | 73 +++++++++++++++++++++++++++++++++++++++++--
 src/types.ts          |  1 +
 3 files changed, 94 insertions(+), 15 deletions(-)

diff --git a/src/Autocomplete.tsx b/src/Autocomplete.tsx
index 9b62b7d..0398674 100644
--- a/src/Autocomplete.tsx
+++ b/src/Autocomplete.tsx
@@ -92,11 +92,13 @@ interface IProps {
   suggestions: OptionTypeBase[];
   value: string;
   handleChange: any;
+  url: string;
+  label: string;
 }
 
 class IntegrationReactSelect extends React.Component<IProps> {
   render() {
-    const { suggestions, value, handleChange } = this.props;
+    const { label, url, suggestions, value, handleChange } = this.props;
     const currentValue: OptionTypeBase = value
       ? suggestions.find(e => e.value === value)
       : undefined;
@@ -108,12 +110,9 @@ class IntegrationReactSelect extends React.Component<IProps> {
         `${EODAG_SERVER_ADRESS}`
       );
 
-      return fetch(
-        URLExt.join(_eodag_server, `guess-product-type?keywords=${inputValue}`),
-        {
-          credentials: 'same-origin'
-        }
-      )
+      return fetch(URLExt.join(_eodag_server, `${url}=${inputValue}`), {
+        credentials: 'same-origin'
+      })
         .then(response => {
           if (response.status >= 400) {
             showErrorMessage(
@@ -125,11 +124,21 @@ class IntegrationReactSelect extends React.Component<IProps> {
           return response.json();
         })
         .then(products => {
-          const guessProductTypes = map(products, product => ({
-            value: product.ID,
-            label: product.ID,
-            description: product.abstract
-          }));
+          const guessProductTypes = map(products, product => {
+            if ('provider' in product) {
+              return {
+                value: product.provider,
+                label: product.provider,
+                description: product.description
+              };
+            } else {
+              return {
+                value: product.ID,
+                label: product.ID,
+                description: product.abstract
+              };
+            }
+          });
           return guessProductTypes;
         });
     };
@@ -142,7 +151,7 @@ class IntegrationReactSelect extends React.Component<IProps> {
     return (
       <div className="jp-EodagWidget-field">
         <label className="jp-EodagWidget-input-name">
-          Product type
+          {label}
           <div
             style={{
               marginTop: 10
diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index 0f3bd26..821463a 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -56,6 +56,7 @@ export const FormComponent: FC<IProps> = ({
   commands
 }) => {
   const [productTypes, setProductTypes] = useState<IOptionTypeBase[]>();
+  const [providers, setProviders] = useState<IOptionTypeBase[]>();
   const defaultStartDate: Date = undefined;
   const defaultEndDate: Date = undefined;
   const [startDate, setStartDate] = useState(undefined);
@@ -64,6 +65,8 @@ export const FormComponent: FC<IProps> = ({
   const [isLoadingSearch, setIsLoadingSearch] = useState(false);
   const [openModal, setOpenModal] = useState(true);
   const [selectValue, setSelectValue] = useState(null);
+  const [providersValue, setProvidersValue] = useState(null);
+  const [productTypesValue, setProductTypesValue] = useState(null);
 
   const {
     control,
@@ -87,7 +90,11 @@ export const FormComponent: FC<IProps> = ({
       _serverSettings.baseUrl,
       `${EODAG_SERVER_ADRESS}`
     );
-    fetch(URLExt.join(_eodag_server, 'product-types/'), {
+    const slug = providersValue
+      ? `product-types?provider=${providersValue}`
+      : 'product-types/';
+
+    fetch(URLExt.join(_eodag_server, slug), {
       credentials: 'same-origin'
     })
       .then(response => {
@@ -106,6 +113,7 @@ export const FormComponent: FC<IProps> = ({
           label: product.ID,
           description: product.abstract
         }));
+        console.log('productTypes changed');
         setProductTypes(productTypes);
       })
       .catch(() => {
@@ -114,7 +122,47 @@ export const FormComponent: FC<IProps> = ({
           {}
         );
       });
-  }, []);
+  }, [providersValue]);
+
+  useEffect(() => {
+    // Fetch providers
+    const _serverSettings = ServerConnection.makeSettings();
+    const _eodag_server = URLExt.join(
+      _serverSettings.baseUrl,
+      `${EODAG_SERVER_ADRESS}`
+    );
+    const slug = productTypesValue
+      ? `providers?product_type=${productTypesValue}`
+      : 'providers/';
+
+    fetch(URLExt.join(_eodag_server, slug), {
+      credentials: 'same-origin'
+    })
+      .then(response => {
+        if (response.status >= 400) {
+          showErrorMessage(
+            `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
+            {}
+          );
+          throw new Error('Bad response from server');
+        }
+        return response.json();
+      })
+      .then(providers => {
+        const providersList = map(providers, provider => ({
+          value: provider.provider,
+          label: provider.provider,
+          description: provider.description
+        }));
+        setProviders(providersList);
+      })
+      .catch(() => {
+        showErrorMessage(
+          `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
+          {}
+        );
+      });
+  }, [productTypesValue]);
 
   // useEffect(
   //   () => {
@@ -182,17 +230,38 @@ export const FormComponent: FC<IProps> = ({
           />
         </div>
         <div className="jp-EodagWidget-field">
+          <Controller
+            name="providers"
+            control={control}
+            rules={{ required: true }}
+            render={({ field: { onChange, value } }) => (
+              <Autocomplete
+                label="Provider"
+                url="providers?product_type"
+                suggestions={providers}
+                value={value}
+                handleChange={(e: IOptionTypeBase | null) => {
+                  onChange(e?.value);
+                  setSelectValue(e?.value);
+                  setProvidersValue(e?.value);
+                }}
+              />
+            )}
+          />
           <Controller
             name="productType"
             control={control}
             rules={{ required: true }}
             render={({ field: { onChange, value } }) => (
               <Autocomplete
+                label="Product Types"
+                url="product-types?provider"
                 suggestions={productTypes}
                 value={value}
                 handleChange={(e: IOptionTypeBase | null) => {
                   onChange(e?.value);
                   setSelectValue(e?.value);
+                  setProductTypesValue(e?.value);
                 }}
               />
             )}
diff --git a/src/types.ts b/src/types.ts
index b9a715e..d2bc7f3 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -8,6 +8,7 @@ export interface IFormInput {
   startDate: Date;
   endDate: Date;
   productType: string;
+  providers: string;
   cloud: number;
   additionnalParameters?: { name: string; value: string }[];
 }

From 338c2703bea8b5427c748487a12bde3fe62e45ca Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Mon, 22 Jan 2024 14:03:00 +0100
Subject: [PATCH 03/19] refacto: dry & add hooks

---
 src/Autocomplete.tsx      | 56 +---------------------
 src/FormComponent.tsx     | 97 ++++++++++++---------------------------
 src/hooks/useFetchData.ts | 44 ++++++++++++++++++
 tsconfig.json             |  5 +-
 4 files changed, 78 insertions(+), 124 deletions(-)
 create mode 100644 src/hooks/useFetchData.ts

diff --git a/src/Autocomplete.tsx b/src/Autocomplete.tsx
index 0398674..d572add 100644
--- a/src/Autocomplete.tsx
+++ b/src/Autocomplete.tsx
@@ -14,13 +14,6 @@ import ReactTooltip from 'react-tooltip';
 import { OptionTypeBase } from 'react-select/src/types';
 import AsyncSelect from 'react-select/async';
 
-import { showErrorMessage } from '@jupyterlab/apputils';
-import { URLExt } from '@jupyterlab/coreutils';
-import { ServerConnection } from '@jupyterlab/services';
-import { EODAG_SERVER_ADRESS } from './config';
-import { map } from 'lodash';
-import { IOptionTypeBase } from './FormComponent';
-
 function NoOptionsMessage(props: any) {
   return (
     <div
@@ -98,56 +91,12 @@ interface IProps {
 
 class IntegrationReactSelect extends React.Component<IProps> {
   render() {
-    const { label, url, suggestions, value, handleChange } = this.props;
+    const { label, suggestions, value, handleChange } = this.props;
+
     const currentValue: OptionTypeBase = value
       ? suggestions.find(e => e.value === value)
       : undefined;
 
-    const guessProductTypes = async (inputValue: string) => {
-      const _serverSettings = ServerConnection.makeSettings();
-      const _eodag_server = URLExt.join(
-        _serverSettings.baseUrl,
-        `${EODAG_SERVER_ADRESS}`
-      );
-
-      return fetch(URLExt.join(_eodag_server, `${url}=${inputValue}`), {
-        credentials: 'same-origin'
-      })
-        .then(response => {
-          if (response.status >= 400) {
-            showErrorMessage(
-              `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
-              {}
-            );
-            throw new Error('Bad response from server');
-          }
-          return response.json();
-        })
-        .then(products => {
-          const guessProductTypes = map(products, product => {
-            if ('provider' in product) {
-              return {
-                value: product.provider,
-                label: product.provider,
-                description: product.description
-              };
-            } else {
-              return {
-                value: product.ID,
-                label: product.ID,
-                description: product.abstract
-              };
-            }
-          });
-          return guessProductTypes;
-        });
-    };
-
-    const loadSuggestions = (inputValue: string) =>
-      new Promise<IOptionTypeBase[]>(resolve => {
-        resolve(guessProductTypes(inputValue));
-      });
-
     return (
       <div className="jp-EodagWidget-field">
         <label className="jp-EodagWidget-input-name">
@@ -162,7 +111,6 @@ class IntegrationReactSelect extends React.Component<IProps> {
               classNamePrefix="jp-EodagWidget-select"
               cacheOptions
               defaultOptions={suggestions}
-              loadOptions={loadSuggestions}
               components={listcomponents}
               value={currentValue}
               onChange={handleChange}
diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index 821463a..f745e22 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -12,14 +12,11 @@ import {
   UseFormReturn
 } from 'react-hook-form';
 import { showErrorMessage } from '@jupyterlab/apputils';
-import { URLExt } from '@jupyterlab/coreutils';
-import { ServerConnection } from '@jupyterlab/services';
 import { map } from 'lodash';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 import 'isomorphic-fetch';
 import Autocomplete from './Autocomplete';
-import { EODAG_SERVER_ADRESS } from './config';
 import SearchService from './SearchService';
 import { ChangeEvent } from 'react';
 import MapExtentComponent from './MapExtentComponent';
@@ -36,6 +33,7 @@ import {
 } from './icones.js';
 import ReactTooltip from 'react-tooltip';
 import { ThreeDots } from 'react-loader-spinner';
+import { useFetchData } from './hooks/useFetchData';
 
 export interface IProps {
   handleShowFeature: any;
@@ -44,10 +42,21 @@ export interface IProps {
   isNotebookCreated: any;
   commands: any;
 }
+
 export interface IOptionTypeBase {
   [key: string]: any;
 }
 
+interface Product {
+  ID: string;
+  abstract: string;
+}
+
+interface Provider {
+  provider: string;
+  description: string;
+}
+
 export const FormComponent: FC<IProps> = ({
   handleShowFeature,
   saveFormValues,
@@ -84,84 +93,36 @@ export const FormComponent: FC<IProps> = ({
   });
 
   useEffect(() => {
-    // Fetch product types
-    const _serverSettings = ServerConnection.makeSettings();
-    const _eodag_server = URLExt.join(
-      _serverSettings.baseUrl,
-      `${EODAG_SERVER_ADRESS}`
-    );
-    const slug = providersValue
-      ? `product-types?provider=${providersValue}`
-      : 'product-types/';
+    useFetchData<Product>({
+      queryParams: providersValue
+        ? `product-types?provider=${providersValue}`
+        : 'product-types',
 
-    fetch(URLExt.join(_eodag_server, slug), {
-      credentials: 'same-origin'
-    })
-      .then(response => {
-        if (response.status >= 400) {
-          showErrorMessage(
-            `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
-            {}
-          );
-          throw new Error('Bad response from server');
-        }
-        return response.json();
-      })
-      .then(products => {
-        const productTypes = map(products, product => ({
+      onSuccess: (products: Product[]) => {
+        const productTypeList: IOptionTypeBase[] = map(products, product => ({
           value: product.ID,
           label: product.ID,
           description: product.abstract
         }));
-        console.log('productTypes changed');
-        setProductTypes(productTypes);
-      })
-      .catch(() => {
-        showErrorMessage(
-          `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
-          {}
-        );
-      });
+        setProductTypes(productTypeList);
+      }
+    });
   }, [providersValue]);
 
   useEffect(() => {
-    // Fetch providers
-    const _serverSettings = ServerConnection.makeSettings();
-    const _eodag_server = URLExt.join(
-      _serverSettings.baseUrl,
-      `${EODAG_SERVER_ADRESS}`
-    );
-    const slug = productTypesValue
-      ? `providers?product_type=${productTypesValue}`
-      : 'providers/';
-
-    fetch(URLExt.join(_eodag_server, slug), {
-      credentials: 'same-origin'
-    })
-      .then(response => {
-        if (response.status >= 400) {
-          showErrorMessage(
-            `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
-            {}
-          );
-          throw new Error('Bad response from server');
-        }
-        return response.json();
-      })
-      .then(providers => {
-        const providersList = map(providers, provider => ({
+    useFetchData<Provider>({
+      queryParams: productTypesValue
+        ? `providers?product_type=${productTypesValue}`
+        : 'providers/',
+      onSuccess: (providers: Provider[]) => {
+        const providersList: IOptionTypeBase[] = map(providers, provider => ({
           value: provider.provider,
           label: provider.provider,
           description: provider.description
         }));
         setProviders(providersList);
-      })
-      .catch(() => {
-        showErrorMessage(
-          `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
-          {}
-        );
-      });
+      }
+    });
   }, [productTypesValue]);
 
   // useEffect(
diff --git a/src/hooks/useFetchData.ts b/src/hooks/useFetchData.ts
new file mode 100644
index 0000000..01b90d2
--- /dev/null
+++ b/src/hooks/useFetchData.ts
@@ -0,0 +1,44 @@
+import { showErrorMessage } from '@jupyterlab/apputils';
+import { URLExt } from '@jupyterlab/coreutils';
+import { ServerConnection } from '@jupyterlab/services';
+
+import { EODAG_SERVER_ADRESS } from './../config';
+
+interface UseFetchDataProps<T> {
+  queryParams: string;
+  onSuccess: (data: T[]) => void;
+}
+
+const useFetchData = <T>({
+  queryParams,
+  onSuccess
+}: UseFetchDataProps<T>): void => {
+  const fetchData = async () => {
+    const serverSettings = ServerConnection.makeSettings();
+    const eodagServer = URLExt.join(
+      serverSettings.baseUrl,
+      `${EODAG_SERVER_ADRESS}`
+    );
+    // const slug = queryParams ? `${queryParams}/` : '';
+
+    try {
+      const response = await fetch(URLExt.join(eodagServer, queryParams), {
+        credentials: 'same-origin'
+      });
+      if (response.status >= 400) {
+        throw new Error('Bad response from server');
+      }
+      const data = await response.json();
+      onSuccess(data);
+    } catch (error) {
+      showErrorMessage(
+        `Unable to contact the EODAG server. Are you sure the address is ${eodagServer}/ ?`,
+        {}
+      );
+    }
+  };
+
+  fetchData();
+};
+
+export { useFetchData };
diff --git a/tsconfig.json b/tsconfig.json
index e46e569..3157439 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,8 @@
     "strict": true,
     "strictNullChecks": false,
     "target": "es2017",
-    "types": []
+    "types": [],
+    "skipLibCheck": true
   },
-  "include": ["src/*", "style/*"]
+  "include": ["src/**/*", "style/*"]
 }

From 5cb908ff4f446499562b3c1eeffd4f42646e3728 Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Mon, 22 Jan 2024 14:11:13 +0100
Subject: [PATCH 04/19] fix: eslint

---
 src/FormComponent.tsx     | 25 ++++++-------------------
 src/hooks/useFetchData.ts |  4 ++--
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index f745e22..e7e1e34 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -47,12 +47,12 @@ export interface IOptionTypeBase {
   [key: string]: any;
 }
 
-interface Product {
+interface IProduct {
   ID: string;
   abstract: string;
 }
 
-interface Provider {
+interface IProvider {
   provider: string;
   description: string;
 }
@@ -93,12 +93,12 @@ export const FormComponent: FC<IProps> = ({
   });
 
   useEffect(() => {
-    useFetchData<Product>({
+    useFetchData<IProduct>({
       queryParams: providersValue
         ? `product-types?provider=${providersValue}`
         : 'product-types',
 
-      onSuccess: (products: Product[]) => {
+      onSuccess: (products: IProduct[]) => {
         const productTypeList: IOptionTypeBase[] = map(products, product => ({
           value: product.ID,
           label: product.ID,
@@ -110,11 +110,11 @@ export const FormComponent: FC<IProps> = ({
   }, [providersValue]);
 
   useEffect(() => {
-    useFetchData<Provider>({
+    useFetchData<IProvider>({
       queryParams: productTypesValue
         ? `providers?product_type=${productTypesValue}`
         : 'providers/',
-      onSuccess: (providers: Provider[]) => {
+      onSuccess: (providers: IProvider[]) => {
         const providersList: IOptionTypeBase[] = map(providers, provider => ({
           value: provider.provider,
           label: provider.provider,
@@ -125,19 +125,6 @@ export const FormComponent: FC<IProps> = ({
     });
   }, [productTypesValue]);
 
-  // useEffect(
-  //   () => {
-  //     if (!_.isEmpty(errors)) {
-  //       showErrorMessage(
-  //         'The following fields are required',
-  //         _.keys(errors).join(', ')
-  //       ).then(() => clearErrors());
-  //     }
-  //   },
-  //   // useEffect is not triggered with only errors as dependency thus we need to list all its elements
-  //   [errors]
-  // );
-
   const onSubmit: SubmitHandler<IFormInput> = data => {
     if (!isNotebookCreated()) {
       return;
diff --git a/src/hooks/useFetchData.ts b/src/hooks/useFetchData.ts
index 01b90d2..ce76f47 100644
--- a/src/hooks/useFetchData.ts
+++ b/src/hooks/useFetchData.ts
@@ -4,7 +4,7 @@ import { ServerConnection } from '@jupyterlab/services';
 
 import { EODAG_SERVER_ADRESS } from './../config';
 
-interface UseFetchDataProps<T> {
+interface IUseFetchDataProps<T> {
   queryParams: string;
   onSuccess: (data: T[]) => void;
 }
@@ -12,7 +12,7 @@ interface UseFetchDataProps<T> {
 const useFetchData = <T>({
   queryParams,
   onSuccess
-}: UseFetchDataProps<T>): void => {
+}: IUseFetchDataProps<T>): void => {
   const fetchData = async () => {
     const serverSettings = ServerConnection.makeSettings();
     const eodagServer = URLExt.join(

From 18b5d602514f3605206e4131e6527bbba245ee9d Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Mon, 22 Jan 2024 14:40:45 +0100
Subject: [PATCH 05/19] feat: handle button logic

---
 src/FormComponent.tsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index e7e1e34..a8aba8e 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -73,7 +73,6 @@ export const FormComponent: FC<IProps> = ({
   const [cloud, setCloud] = useState(100);
   const [isLoadingSearch, setIsLoadingSearch] = useState(false);
   const [openModal, setOpenModal] = useState(true);
-  const [selectValue, setSelectValue] = useState(null);
   const [providersValue, setProvidersValue] = useState(null);
   const [productTypesValue, setProductTypesValue] = useState(null);
 
@@ -190,7 +189,6 @@ export const FormComponent: FC<IProps> = ({
                 value={value}
                 handleChange={(e: IOptionTypeBase | null) => {
                   onChange(e?.value);
-                  setSelectValue(e?.value);
                   setProvidersValue(e?.value);
                 }}
               />
@@ -208,7 +206,6 @@ export const FormComponent: FC<IProps> = ({
                 value={value}
                 handleChange={(e: IOptionTypeBase | null) => {
                   onChange(e?.value);
-                  setSelectValue(e?.value);
                   setProductTypesValue(e?.value);
                 }}
               />
@@ -329,7 +326,7 @@ export const FormComponent: FC<IProps> = ({
                     type="submit"
                     color="primary"
                     className={
-                      !selectValue
+                      !productTypesValue
                         ? 'jp-EodagWidget-buttons-button jp-EodagWidget-buttons-button__disabled'
                         : 'jp-EodagWidget-buttons-button'
                     }
@@ -344,7 +341,7 @@ export const FormComponent: FC<IProps> = ({
                       <br />
                       Results
                     </p>
-                    {!selectValue && (
+                    {!productTypesValue && (
                       <ReactTooltip
                         id="btn-preview-results"
                         className="jp-Eodag-tooltip"
@@ -360,7 +357,7 @@ export const FormComponent: FC<IProps> = ({
                     type="submit"
                     color="primary"
                     className={
-                      !selectValue
+                      !productTypesValue
                         ? 'jp-EodagWidget-buttons-button jp-EodagWidget-buttons-button__disabled'
                         : 'jp-EodagWidget-buttons-button'
                     }
@@ -375,7 +372,7 @@ export const FormComponent: FC<IProps> = ({
                       <br />
                       Code
                     </p>
-                    {!selectValue && (
+                    {!productTypesValue && (
                       <ReactTooltip
                         id="btn-generate-value"
                         className="jp-Eodag-tooltip"

From e717a0befe6a2e766a81ec05b5005b596934f7e0 Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Thu, 1 Feb 2024 17:00:27 +0100
Subject: [PATCH 06/19] feat: add useFetchSuggestions hook

---
 src/Autocomplete.tsx             | 21 ++++++++++++--
 src/FormComponent.tsx            | 13 ++++++++-
 src/hooks/useFetchSuggestions.ts | 50 ++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 src/hooks/useFetchSuggestions.ts

diff --git a/src/Autocomplete.tsx b/src/Autocomplete.tsx
index d572add..0f5194a 100644
--- a/src/Autocomplete.tsx
+++ b/src/Autocomplete.tsx
@@ -14,6 +14,13 @@ import ReactTooltip from 'react-tooltip';
 import { OptionTypeBase } from 'react-select/src/types';
 import AsyncSelect from 'react-select/async';
 
+// import { showErrorMessage } from '@jupyterlab/apputils';
+// import { URLExt } from '@jupyterlab/coreutils';
+// import { ServerConnection } from '@jupyterlab/services';
+// import { EODAG_SERVER_ADRESS } from './config';
+// import { map } from 'lodash';
+import { IOptionTypeBase } from './FormComponent';
+
 function NoOptionsMessage(props: any) {
   return (
     <div
@@ -87,11 +94,20 @@ interface IProps {
   handleChange: any;
   url: string;
   label: string;
+  placeholder?: string;
+  loadSuggestions?: (inputValue: string) => Promise<IOptionTypeBase[]>;
 }
 
 class IntegrationReactSelect extends React.Component<IProps> {
   render() {
-    const { label, suggestions, value, handleChange } = this.props;
+    const {
+      label,
+      suggestions,
+      value,
+      handleChange,
+      placeholder,
+      loadSuggestions
+    } = this.props;
 
     const currentValue: OptionTypeBase = value
       ? suggestions.find(e => e.value === value)
@@ -111,10 +127,11 @@ class IntegrationReactSelect extends React.Component<IProps> {
               classNamePrefix="jp-EodagWidget-select"
               cacheOptions
               defaultOptions={suggestions}
+              loadOptions={loadSuggestions}
               components={listcomponents}
               value={currentValue}
               onChange={handleChange}
-              placeholder="S2_..."
+              placeholder={placeholder}
               isClearable
             />
           </div>
diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index a8aba8e..c2527b2 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -34,6 +34,7 @@ import {
 import ReactTooltip from 'react-tooltip';
 import { ThreeDots } from 'react-loader-spinner';
 import { useFetchData } from './hooks/useFetchData';
+import { useFetchSuggestions } from './hooks/useFetchSuggestions';
 
 export interface IProps {
   handleShowFeature: any;
@@ -162,6 +163,11 @@ export const FormComponent: FC<IProps> = ({
   const handleOpenSettings = (): void => {
     commands.execute('settingeditor:open', { query: 'EODAG' });
   };
+  useEffect(() => {
+    console.log(productTypesValue);
+  }, [productTypesValue]);
+
+  const loadProductTypesSuggestions = useFetchSuggestions();
 
   return (
     <div className="jp-EodagWidget-wrapper">
@@ -185,6 +191,7 @@ export const FormComponent: FC<IProps> = ({
               <Autocomplete
                 label="Provider"
                 url="providers?product_type"
+                placeholder="Any"
                 suggestions={providers}
                 value={value}
                 handleChange={(e: IOptionTypeBase | null) => {
@@ -200,10 +207,14 @@ export const FormComponent: FC<IProps> = ({
             rules={{ required: true }}
             render={({ field: { onChange, value } }) => (
               <Autocomplete
-                label="Product Types"
+                label="Product Type"
                 url="product-types?provider"
                 suggestions={productTypes}
+                placeholder="S2_..."
                 value={value}
+                loadSuggestions={(inputValue: string) =>
+                  loadProductTypesSuggestions(inputValue)
+                }
                 handleChange={(e: IOptionTypeBase | null) => {
                   onChange(e?.value);
                   setProductTypesValue(e?.value);
diff --git a/src/hooks/useFetchSuggestions.ts b/src/hooks/useFetchSuggestions.ts
new file mode 100644
index 0000000..c299303
--- /dev/null
+++ b/src/hooks/useFetchSuggestions.ts
@@ -0,0 +1,50 @@
+import { showErrorMessage } from '@jupyterlab/apputils';
+import { URLExt } from '@jupyterlab/coreutils';
+import { ServerConnection } from '@jupyterlab/services';
+import { map } from 'lodash';
+import { IOptionTypeBase } from './../FormComponent';
+import { EODAG_SERVER_ADRESS } from './../config';
+
+const useFetchSuggestions = () => {
+  const guessProductTypes = async (inputValue: string) => {
+    console.log('01 inputValue', inputValue);
+    const _serverSettings = ServerConnection.makeSettings();
+    const _eodag_server = URLExt.join(
+      _serverSettings.baseUrl,
+      `${EODAG_SERVER_ADRESS}`
+    );
+
+    return fetch(
+      URLExt.join(_eodag_server, `guess-product-type?keywords=${inputValue}`),
+      {
+        credentials: 'same-origin'
+      }
+    )
+      .then(response => {
+        if (response.status >= 400) {
+          showErrorMessage(
+            `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
+            {}
+          );
+          throw new Error('Bad response from server');
+        }
+        return response.json();
+      })
+      .then(products => {
+        const guessProductTypes = map(products, product => ({
+          value: product.ID,
+          label: product.ID,
+          description: product.abstract
+        }));
+        return guessProductTypes;
+      });
+  };
+
+  const loadSuggestions = (inputValue: string) =>
+    new Promise<IOptionTypeBase[]>(resolve => {
+      resolve(guessProductTypes(inputValue));
+    });
+  return loadSuggestions;
+};
+
+export { useFetchSuggestions };

From 4b3a96687c8a7fcd0e84e2664ea130e930839e02 Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Fri, 2 Feb 2024 10:11:27 +0100
Subject: [PATCH 07/19] feat: add provider in request body

---
 src/FormComponent.tsx            | 5 +----
 src/SearchService.ts             | 3 ++-
 src/hooks/useFetchSuggestions.ts | 1 -
 src/types.ts                     | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index c2527b2..86a39fd 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -163,9 +163,6 @@ export const FormComponent: FC<IProps> = ({
   const handleOpenSettings = (): void => {
     commands.execute('settingeditor:open', { query: 'EODAG' });
   };
-  useEffect(() => {
-    console.log(productTypesValue);
-  }, [productTypesValue]);
 
   const loadProductTypesSuggestions = useFetchSuggestions();
 
@@ -184,7 +181,7 @@ export const FormComponent: FC<IProps> = ({
         </div>
         <div className="jp-EodagWidget-field">
           <Controller
-            name="providers"
+            name="provider"
             control={control}
             rules={{ required: true }}
             render={({ field: { onChange, value } }) => (
diff --git a/src/SearchService.ts b/src/SearchService.ts
index 91b3cae..59c4efa 100644
--- a/src/SearchService.ts
+++ b/src/SearchService.ts
@@ -41,7 +41,8 @@ class SearchService {
       dtend: formValues.endDate ? formatDate(formValues.endDate) : undefined,
       cloudCover: formValues.cloud < 100 ? formValues.cloud : undefined,
       page: page,
-      geom: formValues.geometry
+      geom: formValues.geometry,
+      provider: formValues.provider
     };
 
     if (formValues.additionnalParameters) {
diff --git a/src/hooks/useFetchSuggestions.ts b/src/hooks/useFetchSuggestions.ts
index c299303..c928203 100644
--- a/src/hooks/useFetchSuggestions.ts
+++ b/src/hooks/useFetchSuggestions.ts
@@ -7,7 +7,6 @@ import { EODAG_SERVER_ADRESS } from './../config';
 
 const useFetchSuggestions = () => {
   const guessProductTypes = async (inputValue: string) => {
-    console.log('01 inputValue', inputValue);
     const _serverSettings = ServerConnection.makeSettings();
     const _eodag_server = URLExt.join(
       _serverSettings.baseUrl,
diff --git a/src/types.ts b/src/types.ts
index d2bc7f3..cadc6d4 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -8,7 +8,7 @@ export interface IFormInput {
   startDate: Date;
   endDate: Date;
   productType: string;
-  providers: string;
+  provider: string;
   cloud: number;
   additionnalParameters?: { name: string; value: string }[];
 }

From 3a2f1ad3b5947ed3b790ac0cd030f0f328bec9ee Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Fri, 2 Feb 2024 13:25:15 +0100
Subject: [PATCH 08/19] feat: add provider to generated code

---
 src/CodeGenerator.ts  | 12 +++++++++---
 src/FormComponent.tsx |  1 -
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/CodeGenerator.ts b/src/CodeGenerator.ts
index 1d7cad9..24541d6 100644
--- a/src/CodeGenerator.ts
+++ b/src/CodeGenerator.ts
@@ -17,7 +17,8 @@ const formatCode = (
     productType,
     geometry,
     cloud,
-    additionnalParameters
+    additionnalParameters,
+    provider
   }: IFormInput,
   replaceCode: boolean
 ) => {
@@ -44,8 +45,13 @@ ${standardMessage}`
 geometry = "${geojsonToWKT(geometry)}"`;
   }
   code += `
-search_results, total_count = dag.search(
-    productType="${productType}",`;
+search_results, total_count = dag.search(`;
+  if (provider) {
+    code += `
+  provider="${provider}",`;
+  }
+  code += `
+  productType="${productType}",`;
   if (geometryIsOk) {
     code += `
     geom=geometry,`;
diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index 86a39fd..bfaa4f2 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -183,7 +183,6 @@ export const FormComponent: FC<IProps> = ({
           <Controller
             name="provider"
             control={control}
-            rules={{ required: true }}
             render={({ field: { onChange, value } }) => (
               <Autocomplete
                 label="Provider"

From 20065f83f1938f5d32c57000958af873c5c1697d Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Fri, 2 Feb 2024 19:00:40 +0100
Subject: [PATCH 09/19] fix: list before guess product-types

---
 eodag_labextension/handlers.py | 63 +++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/eodag_labextension/handlers.py b/eodag_labextension/handlers.py
index 49489e3..6400a3c 100644
--- a/eodag_labextension/handlers.py
+++ b/eodag_labextension/handlers.py
@@ -8,7 +8,7 @@
 import re
 
 import tornado
-from eodag.rest.utils import eodag_api, get_product_types, search_products
+from eodag.rest.utils import eodag_api, search_products
 from eodag.utils import parse_qs
 from eodag.utils.exceptions import AuthenticationError, NoMatchingProductType, UnsupportedProductType, ValidationError
 from jupyter_server.base.handlers import APIHandler
@@ -21,13 +21,14 @@ class ProductTypeHandler(APIHandler):
     @tornado.web.authenticated
     def get(self):
         """Get endpoint"""
-
-        get_product_types_kwargs = {}
         query_dict = parse_qs(self.request.query)
+
         if "provider" in query_dict and isinstance(query_dict["provider"], list) and len(query_dict["provider"]) > 0:
-            get_product_types_kwargs["provider"] = query_dict["provider"][0]
-        product_types = get_product_types(**get_product_types_kwargs)
+            provider = query_dict.pop("provider")[0]
+        else:
+            provider = None
 
+        product_types = eodag_api.list_product_types(provider=provider)
         self.write(json.dumps(product_types))
 
 
@@ -71,21 +72,49 @@ def get(self):
         """Get endpoint"""
 
         query_dict = parse_qs(self.request.query)
-        guess_kwargs = {}
 
-        # ["aa bb", "cc-dd_ee"] to "*aa* *bb* *cc* **dd* *ee*"
-        for k, v in query_dict.items():
-            guess_kwargs[k] = re.sub(r"(\S+)", r"*\1*", " ".join(v).replace("-", " ").replace("_", " "))
+        if "provider" in query_dict and isinstance(query_dict["provider"], list) and len(query_dict["provider"]) > 0:
+            provider = query_dict.pop("provider")[0]
+        else:
+            provider = None
 
         try:
-            # guessed product types ids
-            guessed_ids_list = eodag_api.guess_product_type(**guess_kwargs)
-            # product types with full associated metadata
-            guessed_list = [
-                dict({"ID": k}, **v) for k, v in eodag_api.product_types_config.source.items() if k in guessed_ids_list
-            ]
-
-            self.write(json.dumps(guessed_list))
+            returned_product_types = []
+            # fetch all product types
+            all_product_types = eodag_api.list_product_types(provider=provider)
+
+            if (
+                "keywords" in query_dict
+                and isinstance(query_dict["keywords"], list)
+                and len(query_dict["keywords"]) > 0
+            ):
+                # 1. List product types starting with given keywords
+                first_keyword = query_dict["keywords"][0]
+                returned_product_types = [
+                    pt for pt in all_product_types if pt["ID"].lower().startswith(first_keyword.lower())
+                ]
+                returned_product_types_ids = [pt["ID"] for pt in returned_product_types]
+
+                # 2. Append guessed product types
+                guess_kwargs = {}
+                # ["aa bb", "cc-dd_ee"] to "*aa* *bb* *cc* **dd* *ee*"
+                for k, v in query_dict.items():
+                    guess_kwargs[k] = re.sub(r"(\S+)", r"*\1*", " ".join(v).replace("-", " ").replace("_", " "))
+
+                # guessed product types ids
+                guessed_ids_list = eodag_api.guess_product_type(**guess_kwargs)
+                # product types with full associated metadata
+                guessed_list = [
+                    pt
+                    for pt in all_product_types
+                    if pt["ID"] in guessed_ids_list and pt["ID"] not in returned_product_types_ids
+                ]
+
+                returned_product_types += guessed_list
+            else:
+                returned_product_types = all_product_types
+
+            self.write(json.dumps(returned_product_types))
         except NoMatchingProductType:
             self.write(json.dumps([]))
 

From 7eb09b274a5d3a6c4b541e25f01403e015841dee Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Fri, 2 Feb 2024 19:03:26 +0100
Subject: [PATCH 10/19] feat: orjson usage

---
 eodag_labextension/handlers.py | 12 ++++++------
 setup.py                       |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eodag_labextension/handlers.py b/eodag_labextension/handlers.py
index 6400a3c..955fc95 100644
--- a/eodag_labextension/handlers.py
+++ b/eodag_labextension/handlers.py
@@ -4,9 +4,9 @@
 
 """Tornado web requests handlers"""
 
-import json
 import re
 
+import orjson
 import tornado
 from eodag.rest.utils import eodag_api, search_products
 from eodag.utils import parse_qs
@@ -29,7 +29,7 @@ def get(self):
             provider = None
 
         product_types = eodag_api.list_product_types(provider=provider)
-        self.write(json.dumps(product_types))
+        self.write(orjson.dumps(product_types))
 
 
 class ProvidersHandler(APIHandler):
@@ -61,7 +61,7 @@ def get(self):
         ]
         providers_list.sort(key=lambda x: (x["priority"] * -1, x["provider"]))
 
-        self.write(json.dumps(providers_list))
+        self.write(orjson.dumps(providers_list))
 
 
 class GuessProductTypeHandler(APIHandler):
@@ -114,9 +114,9 @@ def get(self):
             else:
                 returned_product_types = all_product_types
 
-            self.write(json.dumps(returned_product_types))
+            self.write(orjson.dumps(returned_product_types))
         except NoMatchingProductType:
-            self.write(json.dumps([]))
+            self.write(orjson.dumps([]))
 
 
 class SearchHandler(APIHandler):
@@ -126,7 +126,7 @@ class SearchHandler(APIHandler):
     def post(self, product_type):
         """Post endpoint"""
 
-        arguments = json.loads(self.request.body)
+        arguments = orjson.loads(self.request.body)
 
         # move geom to intersects parameter
         geom = arguments.pop("geom", None)
diff --git a/setup.py b/setup.py
index dbcddad..dd0fe33 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@
         "tornado>=6.0.3,<7.0.0",
         "notebook>=6.0.3,<7.0.0",
         "eodag[notebook]>=2.8.0",
+        "orjson",
     ],
     extras_require={"dev": ["black", "pre-commit"]},
     zip_safe=False,

From cc484fcc61ff6eec62f31c203a3b0227ed9573dc Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Fri, 2 Feb 2024 19:06:24 +0100
Subject: [PATCH 11/19] test: add handlers tests

---
 tests/__init__.py      |  4 +++
 tests/test_handlers.py | 72 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_handlers.py

diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..d5c232e
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Copyright 2024 CS GROUP - France, http://www.c-s.fr
+# All rights reserved
+"""EODAG-labextension tests"""
diff --git a/tests/test_handlers.py b/tests/test_handlers.py
new file mode 100644
index 0000000..4504cf0
--- /dev/null
+++ b/tests/test_handlers.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# Copyright 2024 CS GROUP - France, http://www.c-s.fr
+# All rights reserved
+import json
+from unittest import mock
+
+from notebook.notebookapp import NotebookApp
+from tornado.testing import AsyncHTTPTestCase
+from tornado.web import authenticated
+
+from eodag_labextension import load_jupyter_server_extension
+from eodag_labextension.handlers import APIHandler
+
+
+class MockUser:
+    name = "test"
+
+
+class TestEodagLabExtensionHandler(AsyncHTTPTestCase):
+    def get_app(self):
+        # Create a new NotebookApp instance
+        app = NotebookApp()
+        app.initialize(argv=[])
+
+        # Load extension
+        load_jupyter_server_extension(app)
+
+        return app.web_app
+
+    @mock.patch.object(APIHandler, "get_current_user", return_value=MockUser())
+    @mock.patch.object(authenticated, "__call__", return_value=lambda x: x)
+    def fetch_results(self, url, mock_auth, mock_user):
+        response = self.fetch(url)
+        self.assertEqual(response.code, 200)
+        return json.loads(response.body.decode("utf-8"))
+
+    def test_product_types(self):
+        # all product types
+        results = self.fetch_results("/eodag/product-types")
+        self.assertIn("S2_MSI_L1C", [pt["ID"] for pt in results])
+
+        # single provider product types
+        less_results = self.fetch_results("/eodag/product-types?provider=peps")
+        self.assertGreater(len(less_results), 0)
+        self.assertLess(len(less_results), len(results))
+
+    def test_providers(self):
+        # all providers
+        results = self.fetch_results("/eodag/providers")
+        self.assertIn("peps", [res["provider"] for res in results])
+
+        less_results = self.fetch_results("/eodag/providers?product_type=S2_MSI_L1C")
+        self.assertGreater(len(less_results), 0)
+        self.assertLess(len(less_results), len(results))
+
+    def test_guess_product_types(self):
+        all_results = self.fetch_results("/eodag/guess-product-type")
+        self.assertIn("S2_MSI_L1C", [pt["ID"] for pt in all_results])
+
+        one_result = self.fetch_results("/eodag/guess-product-type?keywords=S2_MSI_L1C")
+        self.assertEqual(len(one_result), 1)
+        self.assertEqual(one_result[0]["ID"], "S2_MSI_L1C")
+
+        another_result = self.fetch_results("/eodag/guess-product-type?keywords=Sentinel2%20L1C")
+        self.assertEqual(len(another_result), 1)
+        self.assertEqual(another_result[0]["ID"], "S2_MSI_L1C")
+
+        more_results = self.fetch_results("/eodag/guess-product-type?keywords=Sentinel")
+        self.assertGreater(len(more_results), 1)
+        self.assertLess(len(more_results), len(all_results))
+        self.assertTrue(more_results[0]["ID"].lower().startswith("sentinel"))
+        self.assertIn("S2_MSI_L1C", [pt["ID"] for pt in more_results])

From a2c83f972c6e9c9318ec0805e0b103580675595c Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Fri, 2 Feb 2024 20:06:05 +0100
Subject: [PATCH 12/19] ci: add python tests

---
 .github/workflows/test.yml | 40 ++++++++++++++++++++++++++++++++++++++
 setup.py                   |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..6b095d9
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,40 @@
+name: Run Tests
+
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+    branches: [master, develop]
+  schedule:
+    - cron: '0 7 * * 1'
+  workflow_dispatch:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: 'x64'
+
+      - name: Setup pip cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: pip-${{ matrix.python-version }}-${{ hashFiles('package.json') }}
+          restore-keys: |
+            pip-${{ matrix.python-version }}-
+            pip-
+
+      - name: Install the extension
+        run: python -m pip install .[dev]
+      - name: Test with pytest
+        run: pytest -v
diff --git a/setup.py b/setup.py
index dd0fe33..3be25a8 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@
         "eodag[notebook]>=2.8.0",
         "orjson",
     ],
-    extras_require={"dev": ["black", "pre-commit"]},
+    extras_require={"dev": ["black", "pre-commit", "pytest"]},
     zip_safe=False,
     include_package_data=True,
     python_requires=">=3.7",

From bb949bbf18457403ef67b933bc8a94cdec25d422 Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Mon, 5 Feb 2024 08:54:40 +0100
Subject: [PATCH 13/19] fix: indent generated code

---
 src/CodeGenerator.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CodeGenerator.ts b/src/CodeGenerator.ts
index 24541d6..1c43f24 100644
--- a/src/CodeGenerator.ts
+++ b/src/CodeGenerator.ts
@@ -48,10 +48,10 @@ geometry = "${geojsonToWKT(geometry)}"`;
 search_results, total_count = dag.search(`;
   if (provider) {
     code += `
-  provider="${provider}",`;
+    provider="${provider}",`;
   }
   code += `
-  productType="${productType}",`;
+    productType="${productType}",`;
   if (geometryIsOk) {
     code += `
     geom=geometry,`;

From ffc6608aedbc1d939440f4daae40955ae5a80fe0 Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Mon, 5 Feb 2024 10:38:13 +0100
Subject: [PATCH 14/19] fix: list product types containing keyword

---
 eodag_labextension/handlers.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/eodag_labextension/handlers.py b/eodag_labextension/handlers.py
index 955fc95..a0ac322 100644
--- a/eodag_labextension/handlers.py
+++ b/eodag_labextension/handlers.py
@@ -89,13 +89,19 @@ def get(self):
                 and len(query_dict["keywords"]) > 0
             ):
                 # 1. List product types starting with given keywords
-                first_keyword = query_dict["keywords"][0]
-                returned_product_types = [
-                    pt for pt in all_product_types if pt["ID"].lower().startswith(first_keyword.lower())
-                ]
+                first_keyword = query_dict["keywords"][0].lower()
+                returned_product_types = [pt for pt in all_product_types if pt["ID"].lower().startswith(first_keyword)]
                 returned_product_types_ids = [pt["ID"] for pt in returned_product_types]
 
-                # 2. Append guessed product types
+                # 2. List product types containing keyword
+                returned_product_types += [
+                    pt
+                    for pt in all_product_types
+                    if first_keyword in pt["ID"].lower() and pt["ID"] not in returned_product_types_ids
+                ]
+                returned_product_types_ids += [pt["ID"] for pt in returned_product_types]
+
+                # 3. Append guessed product types
                 guess_kwargs = {}
                 # ["aa bb", "cc-dd_ee"] to "*aa* *bb* *cc* **dd* *ee*"
                 for k, v in query_dict.items():
@@ -104,13 +110,11 @@ def get(self):
                 # guessed product types ids
                 guessed_ids_list = eodag_api.guess_product_type(**guess_kwargs)
                 # product types with full associated metadata
-                guessed_list = [
+                returned_product_types += [
                     pt
                     for pt in all_product_types
                     if pt["ID"] in guessed_ids_list and pt["ID"] not in returned_product_types_ids
                 ]
-
-                returned_product_types += guessed_list
             else:
                 returned_product_types = all_product_types
 

From 58d921fdcbad17818157ce9efac057338c85e7d5 Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Mon, 5 Feb 2024 14:18:10 +0100
Subject: [PATCH 15/19] fix: keywords for providers fetch

---
 eodag_labextension/handlers.py | 30 +++++++++++++++++++++++++++---
 tests/test_handlers.py         |  8 ++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/eodag_labextension/handlers.py b/eodag_labextension/handlers.py
index a0ac322..c113413 100644
--- a/eodag_labextension/handlers.py
+++ b/eodag_labextension/handlers.py
@@ -49,7 +49,7 @@ def get(self):
             available_providers_kwargs["product_type"] = query_dict["product_type"][0]
         available_providers = eodag_api.available_providers(**available_providers_kwargs)
 
-        providers_list = [
+        all_providers_list = [
             dict(
                 provider=provider,
                 priority=conf.priority,
@@ -59,9 +59,33 @@ def get(self):
             for provider, conf in eodag_api.providers_config.items()
             if provider in available_providers
         ]
-        providers_list.sort(key=lambda x: (x["priority"] * -1, x["provider"]))
+        all_providers_list.sort(key=lambda x: (x["priority"] * -1, x["provider"]))
+
+        returned_providers = []
+        if "keywords" in query_dict and isinstance(query_dict["keywords"], list) and len(query_dict["keywords"]) > 0:
+            # 1. List providers starting with given keyword
+            first_keyword = query_dict["keywords"][0].lower()
+            returned_providers = [p for p in all_providers_list if p["provider"].lower().startswith(first_keyword)]
+            providers_ids = [p["provider"] for p in returned_providers]
+
+            # 2. List providers containing given keyword
+            returned_providers += [
+                p
+                for p in all_providers_list
+                if first_keyword in p["provider"].lower() and p["provider"] not in providers_ids
+            ]
+            providers_ids = [p["provider"] for p in returned_providers]
+
+            # 3. List providers containing given keyword in decription
+            returned_providers += [
+                p
+                for p in all_providers_list
+                if first_keyword in p["description"].lower() and p["provider"] not in providers_ids
+            ]
+        else:
+            returned_providers = all_providers_list
 
-        self.write(orjson.dumps(providers_list))
+        self.write(orjson.dumps(returned_providers))
 
 
 class GuessProductTypeHandler(APIHandler):
diff --git a/tests/test_handlers.py b/tests/test_handlers.py
index 4504cf0..78a7cb4 100644
--- a/tests/test_handlers.py
+++ b/tests/test_handlers.py
@@ -53,6 +53,14 @@ def test_providers(self):
         self.assertGreater(len(less_results), 0)
         self.assertLess(len(less_results), len(results))
 
+        result_with_name = self.fetch_results("/eodag/providers?keywords=peps")
+        self.assertEqual(len(result_with_name), 1)
+        self.assertEqual(result_with_name[0]["provider"], "peps")
+
+        result_with_description = self.fetch_results("/eodag/providers?keywords=cop")
+        self.assertGreater(len(result_with_description), 2)
+        self.assertEqual(result_with_description[0]["provider"], "cop_ads")
+
     def test_guess_product_types(self):
         all_results = self.fetch_results("/eodag/guess-product-type")
         self.assertIn("S2_MSI_L1C", [pt["ID"] for pt in all_results])

From ed198c2b7160c55be42ed37421d42f0fe077c3e9 Mon Sep 17 00:00:00 2001
From: Sylvain Brunato <sylvain.brunato@c-s.fr>
Date: Mon, 5 Feb 2024 19:20:41 +0100
Subject: [PATCH 16/19] fix: handle UnsupportedProvider error

---
 eodag_labextension/handlers.py | 32 ++++++++++++++++++++++++++------
 tests/test_handlers.py         | 26 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/eodag_labextension/handlers.py b/eodag_labextension/handlers.py
index c113413..7f9b454 100644
--- a/eodag_labextension/handlers.py
+++ b/eodag_labextension/handlers.py
@@ -10,7 +10,13 @@
 import tornado
 from eodag.rest.utils import eodag_api, search_products
 from eodag.utils import parse_qs
-from eodag.utils.exceptions import AuthenticationError, NoMatchingProductType, UnsupportedProductType, ValidationError
+from eodag.utils.exceptions import (
+    AuthenticationError,
+    NoMatchingProductType,
+    UnsupportedProductType,
+    UnsupportedProvider,
+    ValidationError,
+)
 from jupyter_server.base.handlers import APIHandler
 from jupyter_server.utils import url_path_join
 
@@ -23,12 +29,18 @@ def get(self):
         """Get endpoint"""
         query_dict = parse_qs(self.request.query)
 
+        provider = None
         if "provider" in query_dict and isinstance(query_dict["provider"], list) and len(query_dict["provider"]) > 0:
             provider = query_dict.pop("provider")[0]
-        else:
-            provider = None
+        provider = None if not provider or provider == "null" else provider
+
+        try:
+            product_types = eodag_api.list_product_types(provider=provider)
+        except UnsupportedProvider as e:
+            self.set_status(400)
+            self.finish({"error": str(e)})
+            return
 
-        product_types = eodag_api.list_product_types(provider=provider)
         self.write(orjson.dumps(product_types))
 
 
@@ -97,10 +109,10 @@ def get(self):
 
         query_dict = parse_qs(self.request.query)
 
+        provider = None
         if "provider" in query_dict and isinstance(query_dict["provider"], list) and len(query_dict["provider"]) > 0:
             provider = query_dict.pop("provider")[0]
-        else:
-            provider = None
+        provider = None if not provider or provider == "null" else provider
 
         try:
             returned_product_types = []
@@ -145,6 +157,10 @@ def get(self):
             self.write(orjson.dumps(returned_product_types))
         except NoMatchingProductType:
             self.write(orjson.dumps([]))
+        except UnsupportedProvider as e:
+            self.set_status(400)
+            self.finish({"error": str(e)})
+            return
 
 
 class SearchHandler(APIHandler):
@@ -161,6 +177,10 @@ def post(self, product_type):
         if geom:
             arguments["intersects"] = geom
 
+        provider = arguments.pop("provider", None)
+        if provider and provider != "null":
+            arguments["provider"] = provider
+
         try:
             response = search_products(product_type, arguments, stac_formatted=False)
         except ValidationError as e:
diff --git a/tests/test_handlers.py b/tests/test_handlers.py
index 78a7cb4..e139c99 100644
--- a/tests/test_handlers.py
+++ b/tests/test_handlers.py
@@ -30,10 +30,19 @@ def get_app(self):
     @mock.patch.object(APIHandler, "get_current_user", return_value=MockUser())
     @mock.patch.object(authenticated, "__call__", return_value=lambda x: x)
     def fetch_results(self, url, mock_auth, mock_user):
+        """Check that request status is 200 and return the json result as dict"""
         response = self.fetch(url)
         self.assertEqual(response.code, 200)
         return json.loads(response.body.decode("utf-8"))
 
+    @mock.patch.object(APIHandler, "get_current_user", return_value=MockUser())
+    @mock.patch.object(authenticated, "__call__", return_value=lambda x: x)
+    def fetch_results_err400(self, url, mock_auth, mock_user):
+        """Check that request returns a 400 error"""
+        response = self.fetch(url)
+        self.assertEqual(response.code, 400)
+        return json.loads(response.body.decode("utf-8"))
+
     def test_product_types(self):
         # all product types
         results = self.fetch_results("/eodag/product-types")
@@ -44,6 +53,9 @@ def test_product_types(self):
         self.assertGreater(len(less_results), 0)
         self.assertLess(len(less_results), len(results))
 
+        # unknown provider
+        self.fetch_results_err400("/eodag/product-types?provider=foo")
+
     def test_providers(self):
         # all providers
         results = self.fetch_results("/eodag/providers")
@@ -61,10 +73,17 @@ def test_providers(self):
         self.assertGreater(len(result_with_description), 2)
         self.assertEqual(result_with_description[0]["provider"], "cop_ads")
 
+        no_result = self.fetch_results("/eodag/providers?product_type=foo")
+        self.assertEqual(len(no_result), 0)
+
     def test_guess_product_types(self):
         all_results = self.fetch_results("/eodag/guess-product-type")
         self.assertIn("S2_MSI_L1C", [pt["ID"] for pt in all_results])
 
+        one_provider_results = self.fetch_results("/eodag/guess-product-type?provider=creodias")
+        self.assertLess(len(one_provider_results), len(all_results))
+        self.assertIn("COP_DEM_GLO90_DGED", [pt["ID"] for pt in all_results])
+
         one_result = self.fetch_results("/eodag/guess-product-type?keywords=S2_MSI_L1C")
         self.assertEqual(len(one_result), 1)
         self.assertEqual(one_result[0]["ID"], "S2_MSI_L1C")
@@ -78,3 +97,10 @@ def test_guess_product_types(self):
         self.assertLess(len(more_results), len(all_results))
         self.assertTrue(more_results[0]["ID"].lower().startswith("sentinel"))
         self.assertIn("S2_MSI_L1C", [pt["ID"] for pt in more_results])
+
+        less_results = self.fetch_results("/eodag/guess-product-type?keywords=Sentinel&provider=peps")
+        self.assertGreater(len(more_results), 1)
+        self.assertLess(len(less_results), len(more_results))
+        self.assertEqual(less_results[0]["ID"], "S1_SAR_GRD")
+
+        self.fetch_results_err400("/eodag/guess-product-type?provider=foo")

From b331bbb6a0c1eeabad94729994416c9bcf95ece6 Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Mon, 5 Feb 2024 14:14:00 +0100
Subject: [PATCH 17/19] feat: change url useFetchSuggestions

---
 src/FormComponent.tsx            |  3 +--
 src/hooks/useFetchSuggestions.ts | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index bfaa4f2..d1f6ae4 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -97,7 +97,6 @@ export const FormComponent: FC<IProps> = ({
       queryParams: providersValue
         ? `product-types?provider=${providersValue}`
         : 'product-types',
-
       onSuccess: (products: IProduct[]) => {
         const productTypeList: IOptionTypeBase[] = map(products, product => ({
           value: product.ID,
@@ -209,7 +208,7 @@ export const FormComponent: FC<IProps> = ({
                 placeholder="S2_..."
                 value={value}
                 loadSuggestions={(inputValue: string) =>
-                  loadProductTypesSuggestions(inputValue)
+                  loadProductTypesSuggestions(providersValue, inputValue)
                 }
                 handleChange={(e: IOptionTypeBase | null) => {
                   onChange(e?.value);
diff --git a/src/hooks/useFetchSuggestions.ts b/src/hooks/useFetchSuggestions.ts
index c928203..f7242d3 100644
--- a/src/hooks/useFetchSuggestions.ts
+++ b/src/hooks/useFetchSuggestions.ts
@@ -6,7 +6,10 @@ import { IOptionTypeBase } from './../FormComponent';
 import { EODAG_SERVER_ADRESS } from './../config';
 
 const useFetchSuggestions = () => {
-  const guessProductTypes = async (inputValue: string) => {
+  const guessProductTypes = async (
+    providerValue: string,
+    inputValue: string
+  ) => {
     const _serverSettings = ServerConnection.makeSettings();
     const _eodag_server = URLExt.join(
       _serverSettings.baseUrl,
@@ -14,7 +17,10 @@ const useFetchSuggestions = () => {
     );
 
     return fetch(
-      URLExt.join(_eodag_server, `guess-product-type?keywords=${inputValue}`),
+      URLExt.join(
+        _eodag_server,
+        `guess-product-type?provider=${providerValue}&keywords=${inputValue}`
+      ),
       {
         credentials: 'same-origin'
       }
@@ -39,10 +45,17 @@ const useFetchSuggestions = () => {
       });
   };
 
-  const loadSuggestions = (inputValue: string) =>
-    new Promise<IOptionTypeBase[]>(resolve => {
-      resolve(guessProductTypes(inputValue));
-    });
+  // const loadSuggestions = (providerValue: string, inputValue: string) =>
+  //   new Promise<IOptionTypeBase[]>(resolve => {
+  //     resolve(guessProductTypes(providerValue, inputValue));
+  //   });
+
+  const loadSuggestions = async (
+    providerValue: string,
+    inputValue: string
+  ): Promise<IOptionTypeBase[]> => {
+    return await guessProductTypes(providerValue, inputValue);
+  };
   return loadSuggestions;
 };
 

From 61a272befeb09528076fa7ec7df7bcbd1e12cabf Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Tue, 6 Feb 2024 15:38:05 +0100
Subject: [PATCH 18/19] feat: add provider loadsuggestions & del useless code

---
 src/Autocomplete.tsx             |   5 --
 src/FormComponent.tsx            |  76 +++++++++------------
 src/hooks/useFetchData.ts        | 112 +++++++++++++++++++++++--------
 src/hooks/useFetchSuggestions.ts |  62 -----------------
 4 files changed, 117 insertions(+), 138 deletions(-)
 delete mode 100644 src/hooks/useFetchSuggestions.ts

diff --git a/src/Autocomplete.tsx b/src/Autocomplete.tsx
index 0f5194a..ce18fa7 100644
--- a/src/Autocomplete.tsx
+++ b/src/Autocomplete.tsx
@@ -14,11 +14,6 @@ import ReactTooltip from 'react-tooltip';
 import { OptionTypeBase } from 'react-select/src/types';
 import AsyncSelect from 'react-select/async';
 
-// import { showErrorMessage } from '@jupyterlab/apputils';
-// import { URLExt } from '@jupyterlab/coreutils';
-// import { ServerConnection } from '@jupyterlab/services';
-// import { EODAG_SERVER_ADRESS } from './config';
-// import { map } from 'lodash';
 import { IOptionTypeBase } from './FormComponent';
 
 function NoOptionsMessage(props: any) {
diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index d1f6ae4..f954375 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -12,7 +12,6 @@ import {
   UseFormReturn
 } from 'react-hook-form';
 import { showErrorMessage } from '@jupyterlab/apputils';
-import { map } from 'lodash';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 import 'isomorphic-fetch';
@@ -33,8 +32,7 @@ import {
 } from './icones.js';
 import ReactTooltip from 'react-tooltip';
 import { ThreeDots } from 'react-loader-spinner';
-import { useFetchData } from './hooks/useFetchData';
-import { useFetchSuggestions } from './hooks/useFetchSuggestions';
+import { useFetchProduct, useFetchProvider } from './hooks/useFetchData';
 
 export interface IProps {
   handleShowFeature: any;
@@ -48,12 +46,12 @@ export interface IOptionTypeBase {
   [key: string]: any;
 }
 
-interface IProduct {
+export interface IProduct {
   ID: string;
   abstract: string;
 }
 
-interface IProvider {
+export interface IProvider {
   provider: string;
   description: string;
 }
@@ -74,8 +72,8 @@ export const FormComponent: FC<IProps> = ({
   const [cloud, setCloud] = useState(100);
   const [isLoadingSearch, setIsLoadingSearch] = useState(false);
   const [openModal, setOpenModal] = useState(true);
-  const [providersValue, setProvidersValue] = useState(null);
-  const [productTypesValue, setProductTypesValue] = useState(null);
+  const [providerValue, setProviderValue] = useState(null);
+  const [productTypeValue, setProductTypeValue] = useState(null);
 
   const {
     control,
@@ -93,36 +91,24 @@ export const FormComponent: FC<IProps> = ({
   });
 
   useEffect(() => {
-    useFetchData<IProduct>({
-      queryParams: providersValue
-        ? `product-types?provider=${providersValue}`
-        : 'product-types',
-      onSuccess: (products: IProduct[]) => {
-        const productTypeList: IOptionTypeBase[] = map(products, product => ({
-          value: product.ID,
-          label: product.ID,
-          description: product.abstract
-        }));
-        setProductTypes(productTypeList);
-      }
-    });
-  }, [providersValue]);
+    const fetchData = async () => {
+      const fetchProduct = useFetchProduct();
+      const productList = await fetchProduct(providerValue);
+      setProductTypes(productList);
+    };
+
+    fetchData();
+  }, [providerValue]);
 
   useEffect(() => {
-    useFetchData<IProvider>({
-      queryParams: productTypesValue
-        ? `providers?product_type=${productTypesValue}`
-        : 'providers/',
-      onSuccess: (providers: IProvider[]) => {
-        const providersList: IOptionTypeBase[] = map(providers, provider => ({
-          value: provider.provider,
-          label: provider.provider,
-          description: provider.description
-        }));
-        setProviders(providersList);
-      }
-    });
-  }, [productTypesValue]);
+    const fetchData = async () => {
+      const fetchProvider = useFetchProvider();
+      const providerList = await fetchProvider(productTypeValue);
+      setProviders(providerList);
+    };
+
+    fetchData();
+  }, [productTypeValue]);
 
   const onSubmit: SubmitHandler<IFormInput> = data => {
     if (!isNotebookCreated()) {
@@ -163,7 +149,8 @@ export const FormComponent: FC<IProps> = ({
     commands.execute('settingeditor:open', { query: 'EODAG' });
   };
 
-  const loadProductTypesSuggestions = useFetchSuggestions();
+  const loadProductTypesSuggestions = useFetchProduct();
+  const loadProviderSuggestions = useFetchProvider();
 
   return (
     <div className="jp-EodagWidget-wrapper">
@@ -189,9 +176,12 @@ export const FormComponent: FC<IProps> = ({
                 placeholder="Any"
                 suggestions={providers}
                 value={value}
+                loadSuggestions={(inputValue: string) =>
+                  loadProviderSuggestions(null, inputValue)
+                }
                 handleChange={(e: IOptionTypeBase | null) => {
                   onChange(e?.value);
-                  setProvidersValue(e?.value);
+                  setProviderValue(e?.value);
                 }}
               />
             )}
@@ -208,11 +198,11 @@ export const FormComponent: FC<IProps> = ({
                 placeholder="S2_..."
                 value={value}
                 loadSuggestions={(inputValue: string) =>
-                  loadProductTypesSuggestions(providersValue, inputValue)
+                  loadProductTypesSuggestions(providerValue, inputValue)
                 }
                 handleChange={(e: IOptionTypeBase | null) => {
                   onChange(e?.value);
-                  setProductTypesValue(e?.value);
+                  setProductTypeValue(e?.value);
                 }}
               />
             )}
@@ -332,7 +322,7 @@ export const FormComponent: FC<IProps> = ({
                     type="submit"
                     color="primary"
                     className={
-                      !productTypesValue
+                      !productTypeValue
                         ? 'jp-EodagWidget-buttons-button jp-EodagWidget-buttons-button__disabled'
                         : 'jp-EodagWidget-buttons-button'
                     }
@@ -347,7 +337,7 @@ export const FormComponent: FC<IProps> = ({
                       <br />
                       Results
                     </p>
-                    {!productTypesValue && (
+                    {!productTypeValue && (
                       <ReactTooltip
                         id="btn-preview-results"
                         className="jp-Eodag-tooltip"
@@ -363,7 +353,7 @@ export const FormComponent: FC<IProps> = ({
                     type="submit"
                     color="primary"
                     className={
-                      !productTypesValue
+                      !productTypeValue
                         ? 'jp-EodagWidget-buttons-button jp-EodagWidget-buttons-button__disabled'
                         : 'jp-EodagWidget-buttons-button'
                     }
@@ -378,7 +368,7 @@ export const FormComponent: FC<IProps> = ({
                       <br />
                       Code
                     </p>
-                    {!productTypesValue && (
+                    {!productTypeValue && (
                       <ReactTooltip
                         id="btn-generate-value"
                         className="jp-Eodag-tooltip"
diff --git a/src/hooks/useFetchData.ts b/src/hooks/useFetchData.ts
index ce76f47..b49921d 100644
--- a/src/hooks/useFetchData.ts
+++ b/src/hooks/useFetchData.ts
@@ -1,44 +1,100 @@
 import { showErrorMessage } from '@jupyterlab/apputils';
 import { URLExt } from '@jupyterlab/coreutils';
 import { ServerConnection } from '@jupyterlab/services';
-
 import { EODAG_SERVER_ADRESS } from './../config';
+import { IOptionTypeBase, IProduct, IProvider } from './../FormComponent';
 
-interface IUseFetchDataProps<T> {
+interface IFetchDataProps<T> {
   queryParams: string;
-  onSuccess: (data: T[]) => void;
+  onSuccess: (data: T[]) => Promise<IOptionTypeBase[]>;
 }
 
-const useFetchData = <T>({
+const fetchData = async <T>({
   queryParams,
   onSuccess
-}: IUseFetchDataProps<T>): void => {
-  const fetchData = async () => {
-    const serverSettings = ServerConnection.makeSettings();
-    const eodagServer = URLExt.join(
-      serverSettings.baseUrl,
-      `${EODAG_SERVER_ADRESS}`
+}: IFetchDataProps<T>): Promise<IOptionTypeBase[]> => {
+  const serverSettings = ServerConnection.makeSettings();
+  const eodagServer = URLExt.join(
+    serverSettings.baseUrl,
+    `${EODAG_SERVER_ADRESS}`
+  );
+
+  try {
+    const response = await fetch(URLExt.join(eodagServer, queryParams), {
+      credentials: 'same-origin'
+    });
+    if (response.status >= 400) {
+      throw new Error('Bad response from server');
+    }
+    const data = await response.json();
+    return onSuccess(data);
+  } catch (error) {
+    showErrorMessage(
+      `Unable to contact the EODAG server. Are you sure the address is ${eodagServer}/ ?`,
+      {}
     );
-    // const slug = queryParams ? `${queryParams}/` : '';
-
-    try {
-      const response = await fetch(URLExt.join(eodagServer, queryParams), {
-        credentials: 'same-origin'
-      });
-      if (response.status >= 400) {
-        throw new Error('Bad response from server');
-      }
-      const data = await response.json();
-      onSuccess(data);
-    } catch (error) {
-      showErrorMessage(
-        `Unable to contact the EODAG server. Are you sure the address is ${eodagServer}/ ?`,
-        {}
-      );
+    return Promise.reject(error);
+  }
+};
+
+const useFetchProduct = () => {
+  const fetchProduct = async (
+    providerValue: string,
+    inputValue?: string
+  ): Promise<IOptionTypeBase[]> => {
+    let queryParams = 'guess-product-type?';
+
+    if (inputValue) {
+      queryParams += `keywords=${inputValue}`;
+    }
+
+    if (providerValue) {
+      queryParams += queryParams.includes('keywords') ? '&' : '';
+      queryParams += `provider=${providerValue}`;
+    }
+    return fetchData<IProduct>({
+      queryParams,
+      onSuccess: data =>
+        Promise.resolve(
+          data.map((d: IProduct) => ({
+            value: d.ID,
+            label: d.ID,
+            description: d.abstract
+          }))
+        )
+    });
+  };
+
+  return fetchProduct;
+};
+
+const useFetchProvider = () => {
+  const fetchProvider = async (
+    productTypeValue: string,
+    inputValue?: string
+  ): Promise<IOptionTypeBase[]> => {
+    let queryParams = 'providers?';
+
+    if (inputValue) {
+      queryParams += `keywords=${inputValue}`;
+    }
+    if (productTypeValue) {
+      queryParams += `product_type=${productTypeValue}`;
     }
+    return fetchData<IProvider>({
+      queryParams,
+      onSuccess: data =>
+        Promise.resolve(
+          data.map((d: IProvider) => ({
+            value: d.provider,
+            label: d.provider,
+            description: d.description
+          }))
+        )
+    });
   };
 
-  fetchData();
+  return fetchProvider;
 };
 
-export { useFetchData };
+export { fetchData, useFetchProduct, useFetchProvider };
diff --git a/src/hooks/useFetchSuggestions.ts b/src/hooks/useFetchSuggestions.ts
deleted file mode 100644
index f7242d3..0000000
--- a/src/hooks/useFetchSuggestions.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { showErrorMessage } from '@jupyterlab/apputils';
-import { URLExt } from '@jupyterlab/coreutils';
-import { ServerConnection } from '@jupyterlab/services';
-import { map } from 'lodash';
-import { IOptionTypeBase } from './../FormComponent';
-import { EODAG_SERVER_ADRESS } from './../config';
-
-const useFetchSuggestions = () => {
-  const guessProductTypes = async (
-    providerValue: string,
-    inputValue: string
-  ) => {
-    const _serverSettings = ServerConnection.makeSettings();
-    const _eodag_server = URLExt.join(
-      _serverSettings.baseUrl,
-      `${EODAG_SERVER_ADRESS}`
-    );
-
-    return fetch(
-      URLExt.join(
-        _eodag_server,
-        `guess-product-type?provider=${providerValue}&keywords=${inputValue}`
-      ),
-      {
-        credentials: 'same-origin'
-      }
-    )
-      .then(response => {
-        if (response.status >= 400) {
-          showErrorMessage(
-            `Unable to contact the EODAG server. Are you sure the adress is ${_eodag_server}/ ?`,
-            {}
-          );
-          throw new Error('Bad response from server');
-        }
-        return response.json();
-      })
-      .then(products => {
-        const guessProductTypes = map(products, product => ({
-          value: product.ID,
-          label: product.ID,
-          description: product.abstract
-        }));
-        return guessProductTypes;
-      });
-  };
-
-  // const loadSuggestions = (providerValue: string, inputValue: string) =>
-  //   new Promise<IOptionTypeBase[]>(resolve => {
-  //     resolve(guessProductTypes(providerValue, inputValue));
-  //   });
-
-  const loadSuggestions = async (
-    providerValue: string,
-    inputValue: string
-  ): Promise<IOptionTypeBase[]> => {
-    return await guessProductTypes(providerValue, inputValue);
-  };
-  return loadSuggestions;
-};
-
-export { useFetchSuggestions };

From 07db53e30d43fbe345bfc94784f07b2f89407092 Mon Sep 17 00:00:00 2001
From: PUECH Fabien <fabien.puech@csgroup.eu>
Date: Tue, 6 Feb 2024 16:11:11 +0100
Subject: [PATCH 19/19] del: cacheOptions for avoided false result

---
 src/Autocomplete.tsx  | 2 --
 src/FormComponent.tsx | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/Autocomplete.tsx b/src/Autocomplete.tsx
index ce18fa7..53f8a8a 100644
--- a/src/Autocomplete.tsx
+++ b/src/Autocomplete.tsx
@@ -87,7 +87,6 @@ interface IProps {
   suggestions: OptionTypeBase[];
   value: string;
   handleChange: any;
-  url: string;
   label: string;
   placeholder?: string;
   loadSuggestions?: (inputValue: string) => Promise<IOptionTypeBase[]>;
@@ -120,7 +119,6 @@ class IntegrationReactSelect extends React.Component<IProps> {
             <AsyncSelect
               className="jp-EodagWidget-select"
               classNamePrefix="jp-EodagWidget-select"
-              cacheOptions
               defaultOptions={suggestions}
               loadOptions={loadSuggestions}
               components={listcomponents}
diff --git a/src/FormComponent.tsx b/src/FormComponent.tsx
index f954375..6117608 100644
--- a/src/FormComponent.tsx
+++ b/src/FormComponent.tsx
@@ -172,7 +172,6 @@ export const FormComponent: FC<IProps> = ({
             render={({ field: { onChange, value } }) => (
               <Autocomplete
                 label="Provider"
-                url="providers?product_type"
                 placeholder="Any"
                 suggestions={providers}
                 value={value}
@@ -193,7 +192,6 @@ export const FormComponent: FC<IProps> = ({
             render={({ field: { onChange, value } }) => (
               <Autocomplete
                 label="Product Type"
-                url="product-types?provider"
                 suggestions={productTypes}
                 placeholder="S2_..."
                 value={value}