Merge branch 'main' into jk/runit_2D_data_logic

looker-open-source · Oct 4, 2021 · dbbf919 · dbbf919
2 parents 6ccb3d8 + eb1731f
commit dbbf919
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/packages/run-it/src/utils/RunItSDK.ts b/packages/run-it/src/utils/RunItSDK.ts
@@ -39,7 +39,7 @@ import { RunItConfigKey } from '../components'
 const settings = {
   ...DefaultSettings(),
   base_url: 'https://self-signed.looker.com:19999',
-  agentTag: 'RunIt 0.5',
+  agentTag: 'RunIt 0.8',
 } as IApiSettings
 
 /**

diff --git a/packages/run-it/src/utils/requestUtils.spec.ts b/packages/run-it/src/utils/requestUtils.spec.ts
@@ -95,6 +95,26 @@ describe('requestUtils', () => {
       }),
     }
 
+    const noBody = {
+      result_format: 'json',
+      cache: true,
+      body: '{}',
+    }
+
+    test('empty json body is removed', () => {
+      const [pathParams, queryParams, body] = createRequestParams(
+        inputs,
+        noBody
+      )
+      expect(pathParams).toEqual({
+        result_format: noBody.result_format,
+      })
+      expect(queryParams).toEqual({
+        cache: noBody.cache,
+      })
+      expect(body).not.toBeDefined()
+    })
+
     test('it correctly identifies requestContent params location', () => {
       const [pathParams, queryParams, body] = createRequestParams(
         inputs,

diff --git a/packages/run-it/src/utils/requestUtils.ts b/packages/run-it/src/utils/requestUtils.ts
@@ -71,7 +71,15 @@ export const prepareInputs = (
     const name = input.name
     if (input.location === 'body') {
       try {
-        result[name] = JSON.parse(result[name])
+        const parsed = JSON.parse(result[name])
+        // Keys call works for both objects and arrays if there are any values
+        const keys = Object.keys(parsed)
+        if (keys.length > 0) {
+          result[name] = parsed
+        } else {
+          // Remove body arg
+          delete result[name]
+        }
       } catch (e) {
         /** Treat as x-www-form-urlencoded */
         result[name] = requestContent[name]