@dvrd/dvr-controls 1.0.51 → 1.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [
@@ -30,7 +30,7 @@
     "react-router-dom": "6.15.0"
   },
   "dependencies": {
-    "@dvrd/idate": "^1.6.1",
+    "@dvrd/idate": "^1.8.1",
     "@fortawesome/fontawesome-svg-core": "6.3.0",
     "@fortawesome/free-brands-svg-icons": "6.3.0",
     "@fortawesome/free-regular-svg-icons": "6.3.0",

package/src/js/util/requestUtil.ts

@@ -19,7 +19,7 @@ export interface FetchOptions {
     data?: {};
     stringifyData?: boolean;
     headers?: OutgoingHttpHeaders;
-    callback?: Function;
+    callback?: (data: ResponseData, response: Response) => void;
     errorCallback?: (response: Response | string) => void;
     credentials?: string;
     responseParser?: ResponseHandler;
@@ -67,22 +67,23 @@ function bigIntParser(_: string, value: any) {
     return value;
 }
 
-export function sendFetch(config: FetchOptions, legacySupport: boolean = false): AbortController | null {
+export function sendFetch(config: FetchOptions): AbortController | null {
     const baseUrl = config.baseUrl || window.settings.platformUrl;
     if (!baseUrl) throw new Error('Base url is not set!');
 
-    config = _prepareConfig(config, legacySupport);
+    config = _prepareConfig(config);
     const {url, method, headers, data} = config;
     const options: { [index: string]: any } = {
         headers,
         method,
         body: config.stringifyData === false ? data : JSON.stringify(data, bigIntParser),
         cache: 'no-store',
+        credentials: config.credentials,
+        mode: 'cors',
     };
     const abortController = getAbortController();
     if (abortController) options.signal = abortController.signal;
 
-    options['mode'] = 'cors';
     fetch(baseUrl + url, options).then((response: Response) => {
         _handleResponse(response, config);
     }).catch((reason: any) => {
@@ -106,13 +107,13 @@ function _handleResponse(response: Response, config: FetchOptions) {
                 if (data.message === 'Invalid rights') {
                     showDialog('Je hebt niet genoeg rechten voor deze actie.');
                     data.handled = true;
-                    if (config.callback) config.callback(data);
+                    if (config.callback) config.callback(data, response);
                 } else if (config.callback) {
                     data.success = responseDataIsSuccess(data);
-                    config.callback(data);
+                    config.callback(data, response);
                 }
             });
-        } else config.callback(response);
+        } else config.callback({status: 'success'}, response);
     } else
         _onErrorResponse(response, config);
 }
@@ -121,10 +122,13 @@ function _onErrorResponse(response: Response, config: FetchOptions) {
     if (config.errorHandler) config.errorHandler(response, config);
     else if (config.errorCallback) config.errorCallback(response);
     else if (defaultErrorHandler) defaultErrorHandler(response, config);
-    else if (config.callback) config.callback({status: 'error', message: 'Er is iets misgegaan in het systeem.'});
+    else if (config.callback) config.callback({
+        status: 'error',
+        message: 'Er is iets misgegaan in het systeem.'
+    }, response);
 }
 
-function _prepareConfig(options: FetchOptions, legacySupport: boolean = true): FetchOptions {
+function _prepareConfig(options: FetchOptions): FetchOptions {
     const fetchOptions: FetchOptions = Object.assign({}, options);
     if (!fetchOptions.method) fetchOptions.method = FetchMethod.GET;
     if (!fetchOptions.callback) fetchOptions.callback = voidFunction;
@@ -135,13 +139,6 @@ function _prepareConfig(options: FetchOptions, legacySupport: boolean = true): F
         warn('Cannot send data with GET requests, data will be ignored.');
 
     if (fetchOptions.credentials === undefined) fetchOptions.credentials = 'same-origin';
-
-    if (legacySupport && fetchOptions.callback) {
-        const legacyCallback = fetchOptions.callback;
-        fetchOptions.callback = (data: ResponseData) => {
-            legacyCallback({data});
-        }
-    }
     return setAuthHeader(fetchOptions);
 }