@bigbinary/neeto-webhooks-frontend 2.2.4 → 2.2.6

package/dist/cjs/NeetoWebhooks.js

@@ -5,9 +5,9 @@ var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var neetoCist = require('@bigbinary/neeto-cist');
 var constants = require('@bigbinary/neeto-commons-frontend/constants');
 var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
+var utils = require('@bigbinary/neeto-commons-frontend/utils');
 var Container = require('@bigbinary/neeto-molecules/Container');
 var Header$2 = require('@bigbinary/neeto-molecules/Header');
-var HelpPopover = require('@bigbinary/neeto-molecules/HelpPopover');
 var TableWrapper = require('@bigbinary/neeto-molecules/TableWrapper');
 var NoData = require('@bigbinary/neetoui/NoData');
 var Spinner = require('@bigbinary/neetoui/Spinner');
@@ -30,10 +30,10 @@ var Typography = require('@bigbinary/neetoui/Typography');
 var Tab = require('@bigbinary/neetoui/Tab');
 var Tag = require('@bigbinary/neetoui/Tag');
 var i18next = require('i18next');
-var utils = require('@bigbinary/neeto-commons-frontend/utils');
 var ramda = require('ramda');
 var Alert = require('@bigbinary/neetoui/Alert');
 var Plus = require('@bigbinary/neeto-icons/Plus');
+var HelpPopover = require('@bigbinary/neeto-molecules/HelpPopover');
 var MoreDropdown = require('@bigbinary/neeto-molecules/MoreDropdown');
 var Input = require('@bigbinary/neetoui/formik/Input');
 var Form = require('@bigbinary/neetoui/formik/Form');
@@ -79,13 +79,13 @@ var queryClient = new reactQuery.QueryClient({
   }
 });
 
-function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var withReactQuery = function withReactQuery(Component) {
   var QueryWrapper = function QueryWrapper(props) {
     return /*#__PURE__*/jsxRuntime.jsxs(reactQuery.QueryClientProvider, {
       client: queryClient,
-      children: [/*#__PURE__*/jsxRuntime.jsx(Component, _objectSpread$2({}, props)), /*#__PURE__*/jsxRuntime.jsx(reactQueryDevtools.ReactQueryDevtools, {
+      children: [/*#__PURE__*/jsxRuntime.jsx(Component, _objectSpread$3({}, props)), /*#__PURE__*/jsxRuntime.jsx(reactQueryDevtools.ReactQueryDevtools, {
         initialIsOpen: false,
         position: "bottom"
       })]
@@ -380,7 +380,8 @@ var Details = function Details(_ref) {
 };
 
 var buildColumns$1 = function buildColumns(_ref) {
-  var deliveryDetailsPath = _ref.deliveryDetailsPath;
+  var deliveryDetailsPath = _ref.deliveryDetailsPath,
+    page = _ref.page;
   return [{
     title: i18next.t("neetoWebhooks.delivery.deliveryId"),
     key: "identifier",
@@ -392,7 +393,8 @@ var buildColumns$1 = function buildColumns(_ref) {
         children: [/*#__PURE__*/jsxRuntime.jsx(Button, {
           style: "link",
           to: utils.buildUrl(deliveryDetailsPath, {
-            deliveryId: delivery.sid
+            deliveryId: delivery.sid,
+            page: page
           }),
           weight: "semibold",
           children: delivery.identifier
@@ -459,6 +461,7 @@ var Deliveries = function Deliveries(_ref) {
   var _useQueryParams = reactUtils.useQueryParams(),
     _useQueryParams$page = _useQueryParams.page,
     page = _useQueryParams$page === void 0 ? constants.DEFAULT_PAGE_INDEX : _useQueryParams$page;
+  var deliveriesPath = getDeliveriesPath(webhooksUrl);
   var deliveryDetailsPath = getDeliveryDetailsPath(deliveriesUrl);
   var _useFetchDeliveries = useFetchDeliveries(webhookId, {
       page: page,
@@ -492,23 +495,22 @@ var Deliveries = function Deliveries(_ref) {
     className: "w-full",
     children: [/*#__PURE__*/jsxRuntime.jsx(Header$2, {
       breadcrumbs: breadcrumbs,
-      title: /*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: "flex items-center gap-x-2",
-        children: [t("neetoWebhooks.delivery.title"), /*#__PURE__*/jsxRuntime.jsx(HelpPopover, {
-          description: t("neetoWebhooks.delivery.helpDescription"),
-          helpLinkProps: {
-            href: HELP_LINK_URLS.deliveries
-          },
-          title: t("neetoWebhooks.delivery.title")
-        })]
-      })
+      title: t("neetoWebhooks.delivery.title"),
+      titleHelpPopoverProps: {
+        title: t("neetoWebhooks.delivery.title"),
+        description: t("neetoWebhooks.delivery.helpDescription"),
+        helpLinkProps: {
+          href: HELP_LINK_URLS.deliveries
+        }
+      }
     }), neetoCist.isNotEmpty(deliveries) ? /*#__PURE__*/jsxRuntime.jsx(TableWrapper, {
       hasPagination: totalCount > constants.DEFAULT_PAGE_SIZE,
       children: /*#__PURE__*/jsxRuntime.jsx(Table, {
         totalCount: totalCount,
         fixedHeight: true,
         columnData: buildColumns$1({
-          deliveryDetailsPath: deliveryDetailsPath
+          deliveryDetailsPath: deliveryDetailsPath,
+          page: page
         }),
         currentPageNumber: page,
         defaultPageSize: constants.DEFAULT_PAGE_SIZE,
@@ -525,7 +527,10 @@ var Deliveries = function Deliveries(_ref) {
       deliveryId: deliveryId,
       webhookSid: webhookId,
       onClose: function onClose() {
-        return history.goBack();
+        return history.replace(utils.buildUrl(deliveriesPath, {
+          webhookId: webhookId,
+          page: page
+        }));
       }
     })]
   });
@@ -576,7 +581,7 @@ var useCreateWebhook = function useCreateWebhook(options) {
     keysToInvalidate: [[QUERY_KEYS.WEBHOOK_LIST]],
     onSuccess: function onSuccess() {
       var _options$onSuccess;
-      options === null || options === void 0 ? void 0 : (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call(options);
+      options === null || options === void 0 || (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 || _options$onSuccess.call(options);
     }
   });
 };
@@ -599,7 +604,7 @@ var useUpdateWebhook = function useUpdateWebhook(id, options) {
     keysToInvalidate: [[QUERY_KEYS.WEBHOOK_LIST], [QUERY_KEYS.WEBHOOK_DETAILS, id], [QUERY_KEYS.DELIVERY_LIST, id]],
     onSuccess: function onSuccess() {
       var _options$onSuccess2;
-      options === null || options === void 0 ? void 0 : (_options$onSuccess2 = options.onSuccess) === null || _options$onSuccess2 === void 0 ? void 0 : _options$onSuccess2.call(options);
+      options === null || options === void 0 || (_options$onSuccess2 = options.onSuccess) === null || _options$onSuccess2 === void 0 || _options$onSuccess2.call(options);
     }
   });
 };
@@ -608,7 +613,7 @@ var useDestroyWebhook = function useDestroyWebhook(options) {
     keysToInvalidate: [[QUERY_KEYS.WEBHOOK_LIST]],
     onSuccess: function onSuccess() {
       var _options$onSuccess3;
-      options === null || options === void 0 ? void 0 : (_options$onSuccess3 = options.onSuccess) === null || _options$onSuccess3 === void 0 ? void 0 : _options$onSuccess3.call(options);
+      options === null || options === void 0 || (_options$onSuccess3 = options.onSuccess) === null || _options$onSuccess3 === void 0 || _options$onSuccess3.call(options);
     }
   });
 };
@@ -698,8 +703,8 @@ var MENU_ITEMS = {
   DELETE: "delete"
 };
 
-function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$2(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var getMenuItems = function getMenuItems(_ref) {
   var onEdit = _ref.onEdit,
     onDelete = _ref.onDelete;
@@ -733,7 +738,7 @@ var buildPayload = function buildPayload(_ref2) {
       identifier: identifier
     };
   });
-  if (!isEditing) return _objectSpread$1(_objectSpread$1({}, values), {}, {
+  if (!isEditing) return _objectSpread$2(_objectSpread$2({}, values), {}, {
     eventsAttributes: events
   });
   var deletable = ((_initialValues$events = initialValues.events) !== null && _initialValues$events !== void 0 ? _initialValues$events : []).filter(function (_ref4) {
@@ -748,7 +753,7 @@ var buildPayload = function buildPayload(_ref2) {
       identifier: identifier
     }, initialValues.events);
   });
-  return _objectSpread$1(_objectSpread$1({}, values), {}, {
+  return _objectSpread$2(_objectSpread$2({}, values), {}, {
     eventsAttributes: [].concat(_toConsumableArray(creatable), _toConsumableArray(deletable))
   });
 };
@@ -813,8 +818,8 @@ var generateRandomSecret = function generateRandomSecret() {
   return v4().replace(/-/g, "");
 };
 
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var AddWebhookPane = function AddWebhookPane(_ref) {
   var editingWebhookId = _ref.editingWebhookId,
     entityId = _ref.entityId,
@@ -832,7 +837,7 @@ var AddWebhookPane = function AddWebhookPane(_ref) {
   var _useCreateWebhook = useCreateWebhook({
       onSuccess: function onSuccess() {
         onClose();
-        onCreate === null || onCreate === void 0 ? void 0 : onCreate();
+        onCreate === null || onCreate === void 0 || onCreate();
       }
     }),
     createWebhook = _useCreateWebhook.mutate;
@@ -865,7 +870,7 @@ var AddWebhookPane = function AddWebhookPane(_ref) {
       id: editingWebhookId,
       payload: payload,
       entityId: entityId
-    }) : createWebhook(_objectSpread(_objectSpread({}, payload), {}, {
+    }) : createWebhook(_objectSpread$1(_objectSpread$1({}, payload), {}, {
       entityId: entityId,
       entityType: entityType
     }));
@@ -1016,10 +1021,13 @@ var AddWebhookPane = function AddWebhookPane(_ref) {
   });
 };
 
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Header = reactUtils.withT(function (_ref) {
   var t = _ref.t,
     breadcrumbs = _ref.breadcrumbs,
     title = _ref.title,
+    titleHelpPopoverProps = _ref.titleHelpPopoverProps,
     setIsAddWebhookPaneOpen = _ref.setIsAddWebhookPaneOpen,
     headerSize = _ref.headerSize,
     webhooks = _ref.webhooks;
@@ -1027,6 +1035,7 @@ var Header = reactUtils.withT(function (_ref) {
     children: [/*#__PURE__*/jsxRuntime.jsx(Header$2, {
       breadcrumbs: breadcrumbs,
       size: headerSize,
+      title: title || t("neetoWebhooks.webhook.title"),
       actionBlock: /*#__PURE__*/jsxRuntime.jsx(Button, {
         "data-cy": "add-new-webhook-button",
         label: t("neetoWebhooks.webhook.add"),
@@ -1034,16 +1043,13 @@ var Header = reactUtils.withT(function (_ref) {
           return setIsAddWebhookPaneOpen(true);
         }
       }),
-      title: title || /*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: "flex items-center gap-x-2",
-        children: [t("neetoWebhooks.webhook.title"), /*#__PURE__*/jsxRuntime.jsx(HelpPopover, {
-          description: t("neetoWebhooks.webhook.helpDescription"),
-          helpLinkProps: {
-            href: HELP_LINK_URLS.webhook
-          },
-          title: t("neetoWebhooks.webhook.title")
-        })]
-      })
+      titleHelpPopoverProps: _objectSpread({
+        description: t("neetoWebhooks.webhook.helpDescription"),
+        helpLinkProps: {
+          href: HELP_LINK_URLS.webhook
+        },
+        title: t("neetoWebhooks.webhook.title")
+      }, titleHelpPopoverProps)
     }), neetoCist.isNotEmpty(webhooks) && /*#__PURE__*/jsxRuntime.jsx(SubHeader, {
       leftActionBlock: /*#__PURE__*/jsxRuntime.jsx(Typography, {
         component: "h4",
@@ -1062,6 +1068,7 @@ var Webhooks = function Webhooks(_ref) {
     entityType = _ref.entityType,
     breadcrumbs = _ref.breadcrumbs,
     title = _ref.title,
+    titleHelpPopoverProps = _ref.titleHelpPopoverProps,
     entityId = _ref.entityId,
     onCreate = _ref.onCreate,
     onDelete = _ref.onDelete,
@@ -1105,7 +1112,7 @@ var Webhooks = function Webhooks(_ref) {
   var _useDestroyWebhook = useDestroyWebhook({
       onSuccess: function onSuccess() {
         setIsDeleteAlertOpen(false);
-        onDelete === null || onDelete === void 0 ? void 0 : onDelete();
+        onDelete === null || onDelete === void 0 || onDelete();
       }
     }),
     isDeleting = _useDestroyWebhook.isPending,
@@ -1135,6 +1142,7 @@ var Webhooks = function Webhooks(_ref) {
       headerSize: headerSize,
       setIsAddWebhookPaneOpen: setIsAddWebhookPaneOpen,
       title: title,
+      titleHelpPopoverProps: titleHelpPopoverProps,
       webhooks: webhooks
     }), neetoCist.isNotEmpty(webhooks) ? /*#__PURE__*/jsxRuntime.jsx(TableWrapper, {
       hasPagination: totalCount > constants.DEFAULT_PAGE_SIZE,
@@ -1211,6 +1219,7 @@ var NeetoWebhooks = function NeetoWebhooks(_ref) {
     _ref$breadcrumbs = _ref.breadcrumbs,
     breadcrumbs = _ref$breadcrumbs === void 0 ? [] : _ref$breadcrumbs,
     title = _ref.title,
+    titleHelpPopoverProps = _ref.titleHelpPopoverProps,
     onCreate = _ref.onCreate,
     onDelete = _ref.onDelete,
     headerSize = _ref.headerSize,
@@ -1234,7 +1243,8 @@ var NeetoWebhooks = function NeetoWebhooks(_ref) {
           headerSize: headerSize,
           onCreate: onCreate,
           onDelete: onDelete,
-          title: title
+          title: title,
+          titleHelpPopoverProps: titleHelpPopoverProps
         });
       }
     }), /*#__PURE__*/jsxRuntime.jsx(reactRouterDom.Route, {