@reltio/components 1.4.1578 → 1.4.1580

package/esm/hooks/useAPI/useAPI.js

@@ -12,23 +12,23 @@ var __assign = (this && this.__assign) || function () {
 import { useCallback, useContext, useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import mdmModule, { ui } from '@reltio/mdm-module';
-import { CustomAction, CustomScriptPlatform, initializeWebWorker, isEmptyValue, RequestAction } from '@reltio/mdm-sdk';
-import { always, assocPath, both, concat, evolve, has, ifElse, omit, pathEq, pathOr, pipe, replace, startsWith, when } from 'ramda';
+import { CustomAction, CustomScriptPlatform, initializeWebWorker, isEmptyValue } from '@reltio/mdm-sdk';
+import { omit } from 'ramda';
 import { useWorkflowCheckPermission } from '../../components/workflow';
 import { useHtmlSanitizer } from '../useHtmlSanitizer';
 import { InterceptHandlersContext, SandboxAPIContext, SnackbarContext } from '../../contexts';
 import { processRequest } from './API';
-import { getWorkerURL, isNewUI, resetHtml, setUpQooxdooRequestInterceptor, setUpQooxdooResponseInterceptor, setUpRequestInterceptor, setUpResponseInterceptor } from './helpers';
+import { getWorkerURL, isValidCustomScript, resetHtml, getProcessedTask, setUpRequestInterceptor, setUpResponseInterceptor } from './helpers';
 export var useAPI = function (config) {
-    var _a, _b, _c, _d;
     if (config === void 0) { config = {}; }
-    var _e = useState(), html = _e[0], setHtml = _e[1];
-    var _f = useState([]), listenersToReset = _f[0], setListenersToReset = _f[1];
-    var _g = useState([]), popupListenersToReset = _g[0], setPopupListenersToReset = _g[1];
-    var _h = useState(true), visible = _h[0], setVisible = _h[1];
-    var _j = useState(), popup = _j[0], setPopup = _j[1];
-    var _k = useState(null), tooltip = _k[0], setTooltip = _k[1];
-    var _l = useState({}), customStyles = _l[0], setCustomStyles = _l[1];
+    var _a = config.action || {}, processApiRequest = _a.processApiRequest, processApiResponse = _a.processApiResponse, platform = _a.platform;
+    var _b = useState(), html = _b[0], setHtml = _b[1];
+    var _c = useState([]), listenersToReset = _c[0], setListenersToReset = _c[1];
+    var _d = useState([]), popupListenersToReset = _d[0], setPopupListenersToReset = _d[1];
+    var _e = useState(true), visible = _e[0], setVisible = _e[1];
+    var _f = useState(), popup = _f[0], setPopup = _f[1];
+    var _g = useState(null), tooltip = _g[0], setTooltip = _g[1];
+    var _h = useState({}), customStyles = _h[0], setCustomStyles = _h[1];
     var workerRef = useRef();
     var requestListeners = useRef({});
     var responseListeners = useRef({});
@@ -51,10 +51,8 @@ export var useAPI = function (config) {
     var entityUri = useSelector(mdmModule.selectors.getEntityUri);
     var isEditableMode = useSelector(mdmModule.selectors.getIsEditableMode);
     var environment = useSelector(mdmModule.selectors.getWorkflowEnvironmentUrl);
-    var _m = useSelector(mdmModule.selectors.getSearchProviderData) || {}, typeSearch = _m.type, search = _m.data;
+    var _j = useSelector(mdmModule.selectors.getSearchProviderData) || {}, typeSearch = _j.type, search = _j.data;
     var searchQuery = typeSearch === 'search' ? search === null || search === void 0 ? void 0 : search.query : null;
-    var isOldUI = !isNewUI(servicesPath);
-    var supportedInterceptHandlers = isOldUI ? qxApi.interceptors : interceptHandlers;
     var openSearch = function (search) { return dispatch(ui.actions.openSearch(search)); };
     var innerText = '';
     var popupText = '';
@@ -143,15 +141,8 @@ export var useAPI = function (config) {
                     break;
                 }
                 case CustomAction.REQUEST: {
-                    var processedApiPath = isOldUI ? reltioPath : apiPath;
-                    var isGlobalUrl = startsWith('/', pathOr('', ['params', 'url'], task)) &&
-                        !startsWith(apiPath, pathOr('', ['params', 'url'], task));
-                    var isApiAction = pathEq(['params', 'name'], RequestAction.API, task);
-                    var processedParams = pipe(evolve({
-                        url: ifElse(both(always(isGlobalUrl), always(isApiAction)), concat("".concat(processedApiPath, "/api/").concat(tenant)), replace(reltioPath, apiPath))
-                    }), when(has('url'), assocPath(['validationUrl'], task.params.url)))(task.params);
-                    var processedTask = __assign(__assign({}, task), { params: processedParams });
-                    processRequest(__assign({ name: processedTask.params.name, paramObject: processedTask, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, servicesPath: servicesPath, apiPath: reltioPath, tenant: tenant, workflowPath: workflowPath, entity: entity, entityUri: entityUri, environment: environment, query: searchQuery, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
+                    var processedTask = getProcessedTask(task, apiPath, reltioPath, tenant);
+                    processRequest(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, servicesPath: servicesPath, apiPath: reltioPath, tenant: tenant, workflowPath: workflowPath, entity: entity, entityUri: entityUri, environment: environment, query: searchQuery, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
                     break;
                 }
                 case CustomAction.RETURN_PROCESSED_API_RESPONSE: {
@@ -181,20 +172,18 @@ export var useAPI = function (config) {
         var _a;
         responseListeners.current = __assign(__assign({}, responseListeners.current), (_a = {}, _a[responseId] = { next: next }, _a));
     };
-    var qooxdooRequestInterceptor = setUpQooxdooRequestInterceptor({ workerRef: workerRef, setRequestListeners: setRequestListeners });
-    var qooxdooResponseInterceptor = setUpQooxdooResponseInterceptor({ workerRef: workerRef, setResponseListeners: setResponseListeners });
     var requestInterceptor = setUpRequestInterceptor({
         apiPath: apiPath,
         reltioPath: reltioPath,
         tenant: tenant,
-        processApiRequest: (_a = config === null || config === void 0 ? void 0 : config.action) === null || _a === void 0 ? void 0 : _a.processApiRequest,
+        processApiRequest: processApiRequest,
         workerRef: workerRef,
         setRequestListeners: setRequestListeners
     });
     var responseInterceptor = setUpResponseInterceptor({
         reltioPath: reltioPath,
         apiPath: apiPath,
-        processApiResponse: (_b = config === null || config === void 0 ? void 0 : config.action) === null || _b === void 0 ? void 0 : _b.processApiResponse,
+        processApiResponse: processApiResponse,
         workerRef: workerRef,
         setResponseListeners: setResponseListeners
     });
@@ -203,11 +192,10 @@ export var useAPI = function (config) {
         (_a = workerRef.current) === null || _a === void 0 ? void 0 : _a.postMessage({ action: 'event', type: type, data: data });
     };
     var pendingInterceptors = useRef(false);
-    var needDelayedRequestForInterceptors = !isOldUI &&
-        interceptHandlers &&
+    var needDelayedRequestForInterceptors = interceptHandlers &&
         !isEmptyValue(config.action) &&
-        config.action.platform !== CustomScriptPlatform.CLASSIC &&
-        (((_c = config === null || config === void 0 ? void 0 : config.action) === null || _c === void 0 ? void 0 : _c.processApiRequest) || ((_d = config === null || config === void 0 ? void 0 : config.action) === null || _d === void 0 ? void 0 : _d.processApiResponse));
+        platform !== CustomScriptPlatform.CLASSIC &&
+        (processApiRequest || processApiResponse);
     if (needDelayedRequestForInterceptors) {
         if (!pendingInterceptors.current && !workerRef.current) {
             interceptHandlers.startInterceptorInit();
@@ -215,7 +203,7 @@ export var useAPI = function (config) {
         }
     }
     useEffect(function () {
-        if (!isEmptyValue(config.action) && config.action.platform !== CustomScriptPlatform.CLASSIC) {
+        if (isValidCustomScript(config.action)) {
             workerRef.current = initializeWebWorker(workerUrl, process, config);
             if (pendingInterceptors.current) {
                 interceptHandlers.finishInterceptorInit();
@@ -244,30 +232,18 @@ export var useAPI = function (config) {
         postEventMessage('execute', null);
     }, [config]);
     useEffect(function () {
-        var _a, _b, _c, _d;
-        if (!isEmptyValue(supportedInterceptHandlers) &&
-            (((_a = config === null || config === void 0 ? void 0 : config.action) === null || _a === void 0 ? void 0 : _a.processApiRequest) || ((_b = config === null || config === void 0 ? void 0 : config.action) === null || _b === void 0 ? void 0 : _b.processApiResponse))) {
-            var addInternalRequestInterceptor = supportedInterceptHandlers.addInternalRequestInterceptor, addInternalResponseInterceptor = supportedInterceptHandlers.addInternalResponseInterceptor, removeInternalRequestInterceptor_1 = supportedInterceptHandlers.removeInternalRequestInterceptor, removeInternalResponseInterceptor_1 = supportedInterceptHandlers.removeInternalResponseInterceptor;
-            if (isOldUI) {
-                addInternalRequestInterceptor((_c = config === null || config === void 0 ? void 0 : config.action) === null || _c === void 0 ? void 0 : _c.processApiRequest, qooxdooRequestInterceptor);
-                addInternalResponseInterceptor((_d = config === null || config === void 0 ? void 0 : config.action) === null || _d === void 0 ? void 0 : _d.processApiResponse, qooxdooResponseInterceptor);
-                return function () {
-                    removeInternalRequestInterceptor_1(qooxdooRequestInterceptor);
-                    removeInternalResponseInterceptor_1(qooxdooResponseInterceptor);
-                };
-            }
-            else {
-                addInternalRequestInterceptor(requestInterceptor);
-                addInternalResponseInterceptor(responseInterceptor);
-                workerRef.current.onerror = function () {
-                    removeInternalRequestInterceptor_1(requestInterceptor);
-                    removeInternalResponseInterceptor_1(responseInterceptor);
-                };
-                return function () {
-                    removeInternalRequestInterceptor_1(requestInterceptor);
-                    removeInternalResponseInterceptor_1(responseInterceptor);
-                };
-            }
+        if (!isEmptyValue(interceptHandlers) && (processApiRequest || processApiResponse)) {
+            var addInternalRequestInterceptor = interceptHandlers.addInternalRequestInterceptor, addInternalResponseInterceptor = interceptHandlers.addInternalResponseInterceptor, removeInternalRequestInterceptor_1 = interceptHandlers.removeInternalRequestInterceptor, removeInternalResponseInterceptor_1 = interceptHandlers.removeInternalResponseInterceptor;
+            addInternalRequestInterceptor(requestInterceptor);
+            addInternalResponseInterceptor(responseInterceptor);
+            workerRef.current.onerror = function () {
+                removeInternalRequestInterceptor_1(requestInterceptor);
+                removeInternalResponseInterceptor_1(responseInterceptor);
+            };
+            return function () {
+                removeInternalRequestInterceptor_1(requestInterceptor);
+                removeInternalResponseInterceptor_1(responseInterceptor);
+            };
         }
     }, [config]);
     return { html: html, visible: visible, tooltip: tooltip, customStyles: customStyles, onClick: onClick, popup: popup };

package/esm/hooks/useCustomScripts.js

@@ -32,19 +32,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { useContext, useEffect, useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import mdmModule, { ui } from '@reltio/mdm-module';
-import { CustomAction, CustomScriptPlatform, initializeWebWorker, isEmptyValue, RequestAction } from '@reltio/mdm-sdk';
+import { CustomAction, initializeWebWorker, isEmptyValue } from '@reltio/mdm-sdk';
 import { nanoid } from 'nanoid';
-import { always, assocPath, both, concat, evolve, find, has, ifElse, map, omit, pathEq, pathOr, pick, pipe, prop, replace, startsWith, when } from 'ramda';
+import { omit } from 'ramda';
 import { useWorkflowCheckPermission } from '../components/workflow';
 import { InterceptHandlersContext, SandboxAPIContext, SnackbarContext } from '../contexts';
 import { getWorkerURL, processRequest } from './useAPI';
-import { isNewUI } from './useAPI/helpers';
-var isURLtoProcess = function (processApi, url) {
-    return (processApi || []).some(function (request) {
-        var regExp = new RegExp("^".concat(request, "$"));
-        return request.replace(/\/*$/, '') === url || (request && regExp.test(url));
-    });
-};
+import { isValidCustomScript, isURLtoProcess, getProcessedTask, getRequestFakeUrl, getResponseFakeUrl } from './useAPI/helpers';
 var getCustomViewConfig = function (config) {
     var processApiResponse = config.processApiResponse, processApiRequest = config.processApiRequest, permissions = config.permissions, files = config.files, otherProps = __rest(config, ["processApiResponse", "processApiRequest", "permissions", "files"]);
     return __assign({ action: { processApiResponse: processApiResponse, processApiRequest: processApiRequest, permissions: permissions, files: files } }, otherProps);
@@ -52,7 +46,7 @@ var getCustomViewConfig = function (config) {
 export var useCustomScripts = function (config) {
     var _a;
     var customScripts = config.reduce(function (acc, customScript) {
-        if (customScript.platform !== CustomScriptPlatform.CLASSIC) {
+        if (isValidCustomScript(customScript)) {
             return __spreadArray(__spreadArray([], acc, true), [__assign(__assign({}, customScript), { actionId: nanoid() })], false);
         }
         return acc;
@@ -92,16 +86,8 @@ export var useCustomScripts = function (config) {
                     break;
                 }
                 case CustomAction.REQUEST: {
-                    var isOldUI = !isNewUI(servicesPath);
-                    var processedApiPath = isOldUI ? reltioPath : apiPath;
-                    var isGlobalUrl = startsWith('/', pathOr('', ['params', 'url'], task)) &&
-                        !startsWith(apiPath, pathOr('', ['params', 'url'], task));
-                    var isApiAction = pathEq(['params', 'name'], RequestAction.API, task);
-                    var processedParams = pipe(evolve({
-                        url: ifElse(both(always(isGlobalUrl), always(isApiAction)), concat("".concat(processedApiPath, "/api/").concat(tenant)), replace(reltioPath, apiPath))
-                    }), when(has('url'), assocPath(['validationUrl'], task.params.url)))(task.params);
-                    var processedTask = __assign(__assign({}, task), { params: processedParams });
-                    processRequest(__assign({ name: processedTask.params.name, paramObject: processedTask, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, apiPath: reltioPath, servicesPath: servicesPath, tenant: tenant, workflowPath: workflowPath, entity: entity, entityUri: entityUri, environment: environment, query: typeSearch === 'search' ? search === null || search === void 0 ? void 0 : search.query : null, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
+                    var processedTask = getProcessedTask(task, apiPath, reltioPath, tenant);
+                    processRequest(__assign({ params: processedTask.params, permissions: config.action.permissions, worker: worker, metadata: metadata, config: config, user: user, apiPath: reltioPath, servicesPath: servicesPath, tenant: tenant, workflowPath: workflowPath, entity: entity, entityUri: entityUri, environment: environment, query: typeSearch === 'search' ? search === null || search === void 0 ? void 0 : search.query : null, openSearch: openSearch, workflowCheckPermission: workflowCheckPermission }, qxApi));
                     break;
                 }
                 case CustomAction.RETURN_PROCESSED_API_RESPONSE: {
@@ -140,14 +126,13 @@ export var useCustomScripts = function (config) {
     }, [config, metadata]);
     var customScriptRequestInterceptor = function (_a) {
         var _b;
-        var _c = _a.options, options = _c === void 0 ? {} : _c, url = _a.url, next = _a.next, resolve = _a.resolve;
-        var fakeURL = url.startsWith('/') && !url.startsWith(apiPath)
-            ? "".concat(reltioPath, "/api/").concat(tenant).concat(url)
-            : "".concat(reltioPath).concat(url.replace(apiPath, ''));
-        var actionId = pipe(map(pick(['actionId', 'processApiRequest'])), find(function (_a) {
+        var url = _a.url, next = _a.next, resolve = _a.resolve, options = _a.options;
+        var fakeURL = getRequestFakeUrl(url, apiPath, reltioPath, tenant);
+        var customScript = customScripts.find(function (_a) {
             var processApiRequest = _a.processApiRequest;
-            return isURLtoProcess(processApiRequest, fakeURL);
-        }), prop('actionId'))(customScripts);
+            return isURLtoProcess(fakeURL, processApiRequest);
+        });
+        var actionId = customScript === null || customScript === void 0 ? void 0 : customScript.actionId;
         if (actionId) {
             var requestId = nanoid();
             requestListeners.current = __assign(__assign({}, requestListeners.current), (_b = {}, _b[requestId] = { options: options, next: next, id: requestId, resolve: resolve }, _b));
@@ -156,7 +141,7 @@ export var useCustomScripts = function (config) {
                 id: requestId,
                 url: fakeURL,
                 method: options.method,
-                headers: __assign(__assign({}, options.headers), { origin: 'ui', requestId: requestId, actionId: actionId }),
+                headers: __assign(__assign({}, options.headers), { actionId: actionId }),
                 data: options.body || options.data
             });
         }
@@ -165,20 +150,26 @@ export var useCustomScripts = function (config) {
         }
     };
     var customScriptResponseInterceptor = function (_a) {
-        var _b;
         var url = _a.url, response = _a.response, next = _a.next, options = _a.options, abort = _a.abort;
-        if (((_b = options === null || options === void 0 ? void 0 : options.headers) === null || _b === void 0 ? void 0 : _b.origin) === 'ui') {
+        var fakeURL = getResponseFakeUrl(url, apiPath, reltioPath);
+        var customScript = customScripts.find(function (_a) {
+            var processApiResponse = _a.processApiResponse;
+            return isURLtoProcess(fakeURL, processApiResponse);
+        });
+        var actionId = customScript === null || customScript === void 0 ? void 0 : customScript.actionId;
+        if (actionId) {
+            var responseId_1 = nanoid();
             response
                 .json()
                 .then(function (data) {
                 var _a;
-                var _b, _c, _d;
-                responseListeners.current = __assign(__assign({}, responseListeners.current), (_a = {}, _a[options.headers.requestId] = { next: next }, _a));
-                workers.current[(_b = options.headers) === null || _b === void 0 ? void 0 : _b.actionId].postMessage({
-                    action: 'response',
-                    result: { data: data, status: response.status },
-                    id: options === null || options === void 0 ? void 0 : options.id,
-                    name: (_d = (_c = options === null || options === void 0 ? void 0 : options.task) === null || _c === void 0 ? void 0 : _c.params) === null || _d === void 0 ? void 0 : _d.name
+                responseListeners.current = __assign(__assign({}, responseListeners.current), (_a = {}, _a[responseId_1] = { next: next }, _a));
+                workers.current[actionId].postMessage({
+                    action: 'apiResponse',
+                    id: responseId_1,
+                    url: fakeURL,
+                    method: options.method,
+                    data: data
                 });
             })
                 .catch(function (error) {
@@ -186,33 +177,7 @@ export var useCustomScripts = function (config) {
             });
         }
         else {
-            var fakeURL_1 = "".concat(reltioPath).concat(url.replace(apiPath, ''));
-            var actionId_1 = pipe(map(pick(['actionId', 'processApiResponse'])), find(function (_a) {
-                var processApiResponse = _a.processApiResponse;
-                return isURLtoProcess(processApiResponse, fakeURL_1);
-            }), prop('actionId'))(customScripts);
-            if (actionId_1) {
-                var responseId_1 = nanoid();
-                response
-                    .json()
-                    .then(function (data) {
-                    var _a;
-                    responseListeners.current = __assign(__assign({}, responseListeners.current), (_a = {}, _a[responseId_1] = { next: next }, _a));
-                    workers.current[actionId_1].postMessage({
-                        action: 'apiResponse',
-                        id: responseId_1,
-                        url: fakeURL_1,
-                        method: options.method,
-                        data: data
-                    });
-                })
-                    .catch(function (error) {
-                    abort(error);
-                });
-            }
-            else {
-                next(response);
-            }
+            next(response);
         }
     };
     useEffect(function () {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.1578",
+  "version": "1.4.1580",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "dependencies": {
     "@date-io/moment": "^1.3.5",
     "@react-google-maps/api": "2.7.0",
-    "@reltio/mdm-module": "^1.4.1578",
-    "@reltio/mdm-sdk": "^1.4.1578",
+    "@reltio/mdm-module": "^1.4.1580",
+    "@reltio/mdm-sdk": "^1.4.1580",
     "classnames": "^2.2.5",
     "d3-cloud": "^1.2.5",
     "d3-geo": "^2.0.1",