refactor: Make request options for fetch function optional

Author: oliverroick

src/hooks/useStacSearch.ts

@@ -8,7 +8,8 @@ import type {
   CollectionIdList,
   ApiError,
   SearchPayload,
-  LinkBody
+  LinkBody,
+  LoadingState
 } from '../types';
 
 type SearchResponse = {
@@ -17,8 +18,6 @@ type SearchResponse = {
   links: Link[]
 }
 
-type LoadingState = 'IDLE' | 'LOADING';
-
 type PaginationHandler = () => void;
 
 type StacSearchHook = {

src/stac-api/index.ts

@@ -2,9 +2,9 @@ import type { Bbox, SearchPayload, DateRange, ApiError, GenericObject } from '..
 
 type RequestPayload = SearchPayload;
 type FetchOptions = {
-  method: string,
-  payload: RequestPayload,
-  headers: GenericObject
+  method?: string,
+  payload?: RequestPayload,
+  headers?: GenericObject
 }
 
 class StacApi {
@@ -67,22 +67,16 @@ class StacApi {
     return Promise.reject(e);
   }
 
-  fetch(url: string, options: FetchOptions): Promise<Response> {
-    const { method, payload, headers } = options;
-    const { bbox, dateRange, ...restPayload } = payload;
+  fetch(url: string, options: Partial<FetchOptions> = {}): Promise<Response> {
+    const { method = 'GET', payload = {}, headers = {} } = options;
 
     return fetch(url, {
       method,
       headers: {
         'Content-Type': 'application/json',
         ...headers
       },
-      body: JSON.stringify({
-        ...restPayload,
-        bbox: this.fixBboxCoordinateOrder(bbox),
-        datetime: this.makeDatetimePayload(dateRange),
-        limit: 25
-      })
+      body: JSON.stringify(payload)
     }).then(async (response) => {
       if (response.ok) {
         return response;
@@ -93,7 +87,17 @@ class StacApi {
   }
 
   search(payload: SearchPayload, headers = {}): Promise<Response> {
-    return this.fetch(`${this.baseUrl}/search`, { method: 'POST', payload, headers });
+    const { bbox, dateRange, ...restPayload } = payload;
+    const requestPayload = {
+      ...restPayload,
+      bbox: this.fixBboxCoordinateOrder(bbox),
+      datetime: this.makeDatetimePayload(dateRange),
+      limit: 25
+    };
+    return this.fetch(
+      `${this.baseUrl}/search`,
+      { method: 'POST', payload: requestPayload, headers }
+    );
   }
 }
 

src/types.ts

@@ -57,3 +57,5 @@ export type ApiError = {
   status: number,
   statusText: string
 }
+
+export type LoadingState = 'IDLE' | 'LOADING';