aefis-core-ui 2.2.2-rc4 → 2.3.0-rc1

package/dist/index.modern.js

@@ -42,7 +42,7 @@ import { AnimatePresence, motion } from 'framer-motion';
 import CircularProgress$1 from '@mui/material/CircularProgress';
 import { useQuery, useInfiniteQuery, useQueryClient, useMutation, QueryClient, QueryClientProvider } from 'react-query';
 import axios from 'axios';
-import _ from 'lodash';
+import _, { merge } from 'lodash';
 import qs from 'query-string';
 import SortIcon from '@mui/icons-material/Sort';
 import { useSnackbar, SnackbarProvider } from 'notistack';
@@ -6881,12 +6881,9 @@ const sanitizedEval = (code, context, options) => {
   }
 };
 
+// TODO: move this to a state
 let token = "";
-const apiClient = axios.create({
-  validateStatus: false
-  //baseURL: process.env.NODE_ENV === "development" ? "" : "/ui"
-});
-
+const apiClient = axios.create({});
 const parseQueryParam = url => {
   const hashIndex = url.indexOf("#");
   const noHashExists = hashIndex === -1;
@@ -6933,44 +6930,11 @@ apiClient.interceptors.request.use(config => {
     for (const key in queryParams) {
       queryParams[key] = objectParse(queryParams[key]);
     }
-    config.params = _.merge(queryParams, config.params);
+    config.params = merge(queryParams, config.params);
     config.url = urlOrigin;
   }
   return config;
 });
-const getLoggerErrorMessage = error => {
-  if (error.response) {
-    var _error$response, _error$request, _error$response2, _error$response2$conf, _error$response2$conf2;
-    const status = (_error$response = error.response) == null ? void 0 : _error$response.status;
-    const URL = (_error$request = error.request) == null ? void 0 : _error$request.responseURL;
-    const method = (_error$response2 = error.response) == null ? void 0 : (_error$response2$conf = _error$response2.config) == null ? void 0 : (_error$response2$conf2 = _error$response2$conf.method) == null ? void 0 : _error$response2$conf2.toUpperCase();
-    const message = `RequestError: [${method}] ${status} ${URL}`;
-    return message;
-  } else if (error.request) {
-    return "RequestError: No Response";
-  } else {
-    return `RequestError: ${error.message.toString()}`;
-  }
-};
-
-// Error is formatted to react query and reporting is handled by react-query
-// This prevent re-tried queries to trigger logger request
-const loggerForwardError = promise => (...args) => {
-  return promise(...args).catch(error => {
-    if (window.logger) {
-      var _error$response3, _error$response3$conf, _window$logger;
-      const message = getLoggerErrorMessage(error);
-      const requestBody = ((_error$response3 = error.response) == null ? void 0 : (_error$response3$conf = _error$response3.config) == null ? void 0 : _error$response3$conf.data) || null;
-      (_window$logger = window.logger) == null ? void 0 : _window$logger.logELKEvent == null ? void 0 : _window$logger.logELKEvent({
-        name: message,
-        data: requestBody
-      });
-      throw message;
-    } else {
-      throw error;
-    }
-  });
-};
 function download(url) {
   apiClient.request({
     url: url,
@@ -6991,33 +6955,32 @@ function download(url) {
     link.remove();
   });
 }
-function get() {
-  let args = [...arguments];
-  if (args[0].includes("http://gateway") || args[0].includes("https://gateway")) {
-    args[1]["headers"] = {
-      Authorization: "Bearer " + token
-    };
-  }
-  return apiClient.get(...args);
+function get(endPoint, config = {}) {
+  const isGateway = endPoint.includes("http://gateway") || endPoint.includes("https://gateway");
+  return apiClient.get(endPoint, _extends({}, config, {
+    headers: _extends({}, config.headers, isGateway && {
+      Authorization: `Bearer ${token}`
+    })
+  }));
 }
-function post() {
-  return apiClient.post(...arguments);
+function post(...args) {
+  return apiClient.post(...args);
 }
-function put() {
-  return apiClient.put(...arguments);
+function put(...args) {
+  return apiClient.put(...args);
 }
-function destroy() {
-  return apiClient.destroy(...arguments);
+function destroy(...args) {
+  return apiClient.delete(...args);
 }
 async function setUserToken(t) {
   token = t;
 }
 var http = {
-  get: loggerForwardError(get),
-  post: loggerForwardError(post),
-  put: loggerForwardError(put),
-  download: loggerForwardError(download),
-  delete: loggerForwardError(destroy),
+  get,
+  post,
+  put,
+  download,
+  delete: destroy,
   setUserToken
 };
 
@@ -7199,6 +7162,23 @@ let dataSourceConfiguration = {
   }
 };
 
+// TODO: move this function to logger
+const getLoggerErrorMessage = error => {
+  if (!error.isAxiosError) return (error == null ? void 0 : error.toString()) || "Undefined error";
+  if (error.response) {
+    var _error$response, _error$request, _error$response2, _error$response2$conf, _error$response2$conf2;
+    const status = (_error$response = error.response) == null ? void 0 : _error$response.status;
+    const URL = (_error$request = error.request) == null ? void 0 : _error$request.responseURL;
+    const method = (_error$response2 = error.response) == null ? void 0 : (_error$response2$conf = _error$response2.config) == null ? void 0 : (_error$response2$conf2 = _error$response2$conf.method) == null ? void 0 : _error$response2$conf2.toUpperCase();
+    const message = `RequestError: [${method}] ${status} ${URL}`;
+    return message;
+  } else if (error.request) {
+    return "RequestError: No Response";
+  } else {
+    return `RequestError: ${error.message.toString()}`;
+  }
+};
+
 /**
  * wraps function and reports (fire request) to Logger
  * @param {function} onError
@@ -7207,11 +7187,29 @@ let dataSourceConfiguration = {
 const logger = onError => (error, ...rest) => {
   var _window$logger;
   onError == null ? void 0 : onError(error, ...rest);
-  const event = {
-    name: (error == null ? void 0 : error.toString()) || "Undefined error"
-  };
-  (_window$logger = window.logger) == null ? void 0 : _window$logger.sendLog == null ? void 0 : _window$logger.sendLog(event);
+  (_window$logger = window.logger) == null ? void 0 : _window$logger.sendLog({
+    name: getLoggerErrorMessage(error),
+    data: error
+  });
 };
+
+/**
+ * Promisify fetch, this is required for useQuery to handle error properly.
+ * @param {Promise} fetch
+ * @returns Promise
+ */
+const promisifyRequest = fetch => (...args) => new Promise(async (resolve, reject) => {
+  try {
+    const res = await fetch(...args);
+    resolve(res);
+  } catch (error) {
+    var _window$logger2;
+    reject(error);
+    (_window$logger2 = window.logger) == null ? void 0 : _window$logger2.logEvent({
+      name: getLoggerErrorMessage(error)
+    });
+  }
+});
 const getGenericBusinessObjectAction = source => {
   var typeAction = source.split("_");
   return typeAction.length === 2 ? `businessObject_${typeAction[1]}` : source;
@@ -7367,7 +7365,7 @@ const useDataSourceQuery = (dataSource, parameters, options, templateContext) =>
     return runQuery(dataSource, parameters, templateContext);
   };
   const fetchStrategy = configuration && typeof configuration.endPoint === "function" ? configuration.endPoint : fetch;
-  return useQuery([dataSource, parameters], fetchStrategy, _extends({}, (configuration == null ? void 0 : configuration.options) || {}, options, {
+  return useQuery([dataSource, parameters], promisifyRequest(fetchStrategy), _extends({}, (configuration == null ? void 0 : configuration.options) || {}, options, {
     onError: logger(options == null ? void 0 : options.onError)
   }));
 };
@@ -7390,12 +7388,11 @@ const useDataSourceInfiniteQuery = (dataSource, parameters, initialParameters, o
   const configuration = getConfiguration(dataSource);
   const fetch = ({
     pageParam: _pageParam = initialParameters
-  }) => {
-    return runQuery(dataSource, _extends({}, parameters, _pageParam));
-  };
+  }) => runQuery(dataSource, _extends({}, parameters, _pageParam));
   const fetchStrategy = configuration && typeof configuration.endPoint === "function" ? configuration.endPoint : fetch;
-  return useInfiniteQuery([dataSource, parameters], fetchStrategy, _extends({}, configuration ? configuration.options : {}, options, {
-    onError: logger(options == null ? void 0 : options.onError)
+  return useInfiniteQuery([dataSource, parameters], promisifyRequest(fetchStrategy), _extends({}, configuration ? configuration.options : {}, options, {
+    onError: logger(options == null ? void 0 : options.onError),
+    retry: false
   }));
 };
 
@@ -7414,7 +7411,6 @@ const useDataSourceMutation = (dataSource, baseParameters, options, invalidateQu
   var _mutationOptions;
   const queryClient = useQueryClient();
   const configuration = getConfiguration(dataSource);
-  getEndpoint(dataSource, configuration);
   const invalidateFunction = () => {
     if (invalidateQueries) {
       for (let q of invalidateQueries) {
@@ -7441,11 +7437,11 @@ const useDataSourceMutation = (dataSource, baseParameters, options, invalidateQu
     };
   }
   function requestCall(requestBody) {
-    const request = axios[httpMethodType];
+    const request = http[httpMethodType];
     const endPoint = getEndpoint(dataSource, configuration); //?
     if (httpMethodType === "get" || httpMethodType === "delete") {
       // INFO (Caveat!): requestBody is used as query param in case of
-      // httpMethodType is get or delete
+      // httpMethodType is GET or DELETE
       const params = _extends({}, baseParameters, requestBody);
       return request(endPoint, {
         params
@@ -7453,7 +7449,7 @@ const useDataSourceMutation = (dataSource, baseParameters, options, invalidateQu
     }
     return request(endPoint, requestBody);
   }
-  return useMutation(requestCall, _extends({}, mutationOptions, {
+  return useMutation(promisifyRequest(requestCall), _extends({}, mutationOptions, {
     onError: logger((_mutationOptions = mutationOptions) == null ? void 0 : _mutationOptions.onError)
   }));
 };
@@ -10750,7 +10746,7 @@ const RichDataTable = /*#__PURE__*/forwardRef(function RichDatatable(props, ref)
       exportOptions: props.exportOptions,
       actions: props.actions && props.actions.length > 0 || props.addAction ? updateActions(props.actions, handleDrawerOpen, enableTableRowAction, selectedRowCount, Add) : undefined,
       onFilterClick: isFilterPanelEnabled ? handleFilterClick : undefined,
-      hasFilters: filterPanelState.filterCount > 0 || filterPanelState.sortCount > 0 || filterPanelState.searchText,
+      hasFilters: filterPanelState.filterCount > 0 || filterPanelState.sortCount > 0 || !!filterPanelState.searchText,
       disableFilterButton: isFetching
     }, props.titleAndActionHeaderProps)), /*#__PURE__*/jsx(DataTable, _extends({}, props, {
       tableRef: DataTableRef,
@@ -17290,6 +17286,9 @@ const Upload = props => {
     type: (message == null ? void 0 : message.type) || "info",
     canDismiss: (message == null ? void 0 : message.canDismiss) || true
   };
+  const {
+    error
+  } = useNotify();
   const filePondProps = {
     acceptedFileTypes: acceptedFileTypes ? acceptedFileTypes : isImage ? ["image/*"] : null,
     files,
@@ -17301,7 +17300,16 @@ const Upload = props => {
         headers: {
           Methods: "POST"
         },
-        onload: handleUploadResponse
+        onload: handleUploadResponse,
+        onerror: e => {
+          var _window$logger;
+          const message = `The image could not be uploaded.`;
+          error(message);
+          (_window$logger = window.logger) == null ? void 0 : _window$logger.sendLog({
+            name: message,
+            data: e
+          });
+        }
       },
       load: handleLoad,
       revert: handleDelete