run build

Author: taylordowns2000

lib/Adaptor.js

@@ -82,10 +82,10 @@ Object.defineProperty(exports, "http", {
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _languageCommon = require("@openfn/language-common");
-
 var _lodash = require("lodash");
 
+var _languageCommon = require("@openfn/language-common");
+
 var _Utils = require("./Utils");
 
 var _Client = require("./Client");
@@ -702,50 +702,32 @@ function patch(resourceType, path, data, options = {}, callback = false) {
  * @example <caption>a tracked entity instance</caption>
  * destroy('trackedEntityInstances', 'LcRd6Nyaq7T');
  */
-// TODO: @Elias, can this be implemented using the same pattern as update but without data?
 
 
-function destroy(resourceType, path, data, options = {}, callback = false) {
+function destroy(resourceType, path, data = null, options = {}, callback = false) {
   return state => {
-    var _options$operationNam, _options, _options$responseType, _options2, _queryParams, _queryParams2, _options$apiVersion, _options3, _CONTENT_TYPES$respon;
-
+    console.log('Preparing destroy operation...');
     resourceType = (0, _languageCommon.expandReferences)(resourceType)(state);
     path = (0, _languageCommon.expandReferences)(path)(state);
-    const body = (0, _languageCommon.expandReferences)(data)(state);
-    params = (0, _languageCommon.expandReferences)(params)(state);
+    data = (0, _languageCommon.expandReferences)(data)(state);
     options = (0, _languageCommon.expandReferences)(options)(state);
-    const operationName = (_options$operationNam = (_options = options) === null || _options === void 0 ? void 0 : _options.operationName) !== null && _options$operationNam !== void 0 ? _options$operationNam : 'delete';
     const {
-      username,
-      password,
-      hostUrl
-    } = state.configuration;
-    const responseType = (_options$responseType = (_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.responseType) !== null && _options$responseType !== void 0 ? _options$responseType : 'json';
-    let queryParams = params;
-    const filters = (_queryParams = queryParams) === null || _queryParams === void 0 ? void 0 : _queryParams.filters;
-    (_queryParams2 = queryParams) === null || _queryParams2 === void 0 ? true : delete _queryParams2.filters;
-    queryParams = new URLSearchParams(queryParams);
-    filters === null || filters === void 0 ? void 0 : filters.map(f => queryParams.append('filter', f));
-    const apiVersion = (_options$apiVersion = (_options3 = options) === null || _options3 === void 0 ? void 0 : _options3.apiVersion) !== null && _options$apiVersion !== void 0 ? _options$apiVersion : state.configuration.apiVersion;
-    const headers = {
-      Accept: (_CONTENT_TYPES$respon = _Utils.CONTENT_TYPES[responseType]) !== null && _CONTENT_TYPES$respon !== void 0 ? _CONTENT_TYPES$respon : 'application/json'
-    };
-    const url = (0, _Utils.buildUrl)('/' + resourceType + '/' + path, hostUrl, apiVersion);
-    return _axios.default.request({
-      method: 'DELETE',
-      url,
-      auth: {
-        username,
-        password
-      },
-      params: queryParams,
-      data: body,
-      headers
+      params,
+      requestConfig
+    } = options;
+    const {
+      configuration
+    } = state;
+    return (0, _Client.request)({
+      method: 'delete',
+      url: (0, _Utils.generateUrl)(configuration, options, resourceType, path),
+      params,
+      data,
+      ...requestConfig
     }).then(result => {
-      _Utils.Log.success(`${operationName} succeeded. DELETED ${resourceType}.\nSummary:\n${(0, _Utils.prettyJson)(result.data)}`);
+      _Utils.Log.success(`Deleted ${resourceType} at ${path}`);
 
-      if (callback) return callback((0, _languageCommon.composeNextState)(state, result.data));
-      return (0, _languageCommon.composeNextState)(state, result.data);
+      return (0, _Utils.handleResponse)(result, state, callback);
     });
   };
 }