simplify request() function

ibericode · Oct 25, 2023 · c7b94ac · c7b94ac
1 parent 73946c4
commit c7b94ac
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 48 deletions.
diff --git a/assets/src/js/components/block-components.js b/assets/src/js/components/block-components.js
@@ -23,12 +23,10 @@ export function BlockComponent(root, apiEndpoint, rowView, onUpdate) {
 
   function fetch() {
     request(apiEndpoint, {
-      body: {
-        offset,
-        limit,
-        start_date: toISO8601(startDate),
-        end_date: toISO8601(endDate)
-      }
+      offset,
+      limit,
+      start_date: toISO8601(startDate),
+      end_date: toISO8601(endDate)
     }).then(items => {
       total = items.length
       root = patch(root, render(items))

diff --git a/assets/src/js/components/chart.js b/assets/src/js/components/chart.js
@@ -95,11 +95,9 @@ export default function(root, height) {
     dateFormatOptions = groupByMonth ? {month: 'short', year: 'numeric'} : undefined
 
     request('/stats', {
-      body: {
-        start_date: toISO8601(startDate),
-        end_date: toISO8601(endDate),
-        monthly: groupByMonth ? 1 : 0,
-      }
+      start_date: toISO8601(startDate),
+      end_date: toISO8601(endDate),
+      monthly: groupByMonth ? 1 : 0,
     }).then(data => {
       root = patch(root,  render(data))
     })

diff --git a/assets/src/js/components/totals.js b/assets/src/js/components/totals.js
@@ -28,20 +28,17 @@ export default function(root) {
    */
   function update(startDate, endDate) {
     request('/totals', {
-      body: {
-        start_date: toISO8601(startDate),
-        end_date: toISO8601(endDate)
-      }}).then(data => {
-        updateDom(root.children[0], data.visitors, data.visitors_change, data.visitors_change_rel)
-        updateDom(root.children[1], data.pageviews, data.pageviews_change, data.pageviews_change_rel)
+      start_date: toISO8601(startDate),
+      end_date: toISO8601(endDate)
+    }).then(data => {
+      updateDom(root.children[0], data.visitors, data.visitors_change, data.visitors_change_rel)
+      updateDom(root.children[1], data.pageviews, data.pageviews_change, data.pageviews_change_rel)
     })
   }
 
   function updateRealtime() {
     request('/realtime', {
-      body: {
-        since: '-1 hour'
-      }
+      since: '-1 hour'
     }).then(data => {
       root.children[2].children[1].textContent = formatLargeNumber(data)
     })

diff --git a/assets/src/js/util/api.js b/assets/src/js/util/api.js
@@ -2,41 +2,19 @@ const {nonce, root} = window.koko_analytics
 /**
  *
  * @param {string} path
- * @param {object} opts
+ * @param {object} params
  * @returns {Promise<any>}
  */
-export function request (path, opts = {}) {
-  Object.assign(opts, {
+export function request (path, params = {}) {
+  let url = root + 'koko-analytics/v1' + path  + '?' + (new URLSearchParams(params))
+
+  return fetch(url, {
     headers: {
       'X-WP-Nonce': nonce,
       Accepts: 'application/json'
     },
     credentials: 'same-origin'
-  })
-
-  let url = root + 'koko-analytics/v1' + path
-  if (opts.body) {
-    // allow passing "body" option for GET requests, convert it to query params
-    if (!opts.method || opts.method === 'GET') {
-      url += url.indexOf('?') > -1 ? '&' : '?'
-
-      for (const key in opts.body) {
-        url += encodeURIComponent(key) + '=' + encodeURIComponent(opts.body[key]) + '&'
-      }
-      url = url.slice(0, -1)
-      delete opts.body
-    }
-
-    if (opts.method === 'POST') {
-      opts.headers['Content-Type'] = 'application/json'
-
-      if (typeof opts.body !== 'string') {
-        opts.body = JSON.stringify(opts.body)
-      }
-    }
-  }
-
-  return fetch(url, opts).then(r => {
+  }).then(r => {
     // reject response when status is not ok-ish
     if (r.status >= 400) {
       console.error('Koko Analytics encountered an error trying to request data from the REST endpoints. Please check your PHP error logs for the error that occurred.')