[core] add parseMethod

.gitignore

@@ -4,6 +4,7 @@
 .eslintrc.js
 .idea
 .npm
+.npmrc
 .prettierignore
 .yarnclean
 

package.json

@@ -5,13 +5,12 @@
   "private": true,
   "scripts": {
     "build": "lerna run build",
-    "jest": "lerna run test",
     "lint": "lerna run lint",
     "lint:fix": "lerna run lint:fix",
     "prerelease": "yarn run build",
-    "prepare-release": "git checkout master && git pull --rebase origin master && yarn run test",
+    "prepare-release": "git checkout master && git pull --rebase origin master && lerna bootstrap && yarn run lint && yarn run test",
     "release": "yarn run prepare-release && lerna publish && lerna run gh-pages",
-    "test": "lerna bootstrap && yarn run lint && yarn run jest"
+    "test": "lerna run test"
   },
   "repository": "https://github.com/apache-superset/superset-ui.git",
   "keywords": [

packages/superset-ui-core/package.json

@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/apache-superset/superset-ui#readme",
   "devDependencies": {
-    "@data-ui/build-config": "^0.0.12",
+    "@data-ui/build-config": "^0.0.14",
     "fetch-mock": "^6.5.2",
     "node-fetch": "^2.2.0"
   },

packages/superset-ui-core/src/SupersetClient.js

@@ -75,14 +75,15 @@ class SupersetClient {
     );
   }
 
-  get({ host, url, endpoint, mode, credentials, headers, body, timeout, signal }) {
+  get({ body, credentials, headers, host, endpoint, mode, parseMethod, signal, timeout, url }) {
     return this.ensureAuth().then(() =>
       callApi({
         body,
         credentials: credentials || this.credentials,
         headers: { ...this.headers, ...headers },
         method: 'GET',
         mode: mode || this.mode,
+        parseMethod,
         signal,
         timeout: timeout || this.timeout,
         url: url || this.getUrl({ endpoint, host: host || this.host }),
@@ -91,23 +92,25 @@ class SupersetClient {
   }
 
   post({
+    credentials,
+    headers,
     host,
     endpoint,
-    url,
     mode,
-    credentials,
-    headers,
+    parseMethod,
     postPayload,
-    timeout,
     signal,
     stringify,
+    timeout,
+    url,
   }) {
     return this.ensureAuth().then(() =>
       callApi({
         credentials: credentials || this.credentials,
         headers: { ...this.headers, ...headers },
         method: 'POST',
         mode: mode || this.mode,
+        parseMethod,
         postPayload,
         signal,
         stringify,

packages/superset-ui-core/src/callApi/callApi.js

@@ -15,7 +15,6 @@ export default function callApi({
   postPayload,
   stringify = true,
   redirect = 'follow', // manual, follow, error
-  timeoutId,
   signal, // used for aborting
 }) {
   let request = {

packages/superset-ui-core/src/callApi/callApiAndParseWithTimeout.js

@@ -2,13 +2,13 @@ import callApi from './callApi';
 import rejectAfterTimeout from './rejectAfterTimeout';
 import parseResponse from './parseResponse';
 
-export default function callApiAndParseWithTimeout({ timeout, ...rest }) {
+export default function callApiAndParseWithTimeout({ timeout, parseMethod, ...rest }) {
   const apiPromise = callApi(rest);
 
   const racedPromise =
     typeof timeout === 'number' && timeout > 0
       ? Promise.race([rejectAfterTimeout(timeout), apiPromise])
       : apiPromise;
 
-  return parseResponse(racedPromise);
+  return parseResponse(racedPromise, parseMethod);
 }

packages/superset-ui-core/src/callApi/parseResponse.js

@@ -1,26 +1,25 @@
-export default function parseResponse(apiPromise) {
-  return apiPromise.then(apiResponse =>
-    // first try to parse as json, and fall back to text (e.g., in the case of HTML stacktrace)
-    // cannot fall back to .text() without cloning the response because body is single-use
-    apiResponse
-      .clone()
-      .json()
-      .catch(() => /* jsonParseError */ apiResponse.text().then(textPayload => ({ textPayload })))
-      .then(maybeJson => ({
-        json: maybeJson.textPayload ? undefined : maybeJson,
-        response: apiResponse,
-        text: maybeJson.textPayload,
-      }))
-      .then(({ response, json, text }) => {
-        if (!response.ok) {
-          return Promise.reject({
-            error: response.error || (json && json.error) || text || 'An error occurred',
-            status: response.status,
-            statusText: response.statusText,
-          });
-        }
+const PARSERS = {
+  json: response => response.json().then(json => ({ json, response })),
+  text: response => response.text().then(text => ({ response, text })),
+};
 
-        return typeof text === 'undefined' ? { json, response } : { response, text };
-      }),
-  );
+export default function parseResponse(apiPromise, parseMethod = 'json') {
+  if (parseMethod === null) return apiPromise;
+
+  const responseParser = PARSERS[parseMethod] || PARSERS.json;
+
+  return apiPromise
+    .then(response => {
+      if (!response.ok) {
+        return Promise.reject({
+          error: response.error || 'An error occurred',
+          response,
+          status: response.status,
+          statusText: response.statusText,
+        });
+      }
+
+      return response;
+    })
+    .then(responseParser);
 }