@bigbinary/neeto-webhooks-frontend 2.0.0 → 2.0.1

package/dist/index.js

@@ -1,8 +1,8 @@
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useRouteMatch, useHistory, useParams, Switch as Switch$1, Route } from 'react-router-dom';
 import { isNotPresent, isPresent, removeBy, isNotEmpty, removeById, findBy } from '@bigbinary/neeto-cist';
-import { DEFAULT_STALE_TIME, SINGULAR, DEFAULT_PAGE_SIZE, PLURAL } from '@bigbinary/neeto-commons-frontend/constants';
-import { buildUrl } from '@bigbinary/neeto-commons-frontend/utils';
+import { DEFAULT_STALE_TIME, SINGULAR, DEFAULT_PAGE_SIZE, DEFAULT_PAGE_INDEX, PLURAL } from '@bigbinary/neeto-commons-frontend/constants';
+import { useQueryParams, useMutationWithInvalidation, withT } from '@bigbinary/neeto-commons-frontend/react-utils';
 import Container from '@bigbinary/neeto-molecules/Container';
 import Header$2 from '@bigbinary/neeto-molecules/Header';
 import PageLoader from '@bigbinary/neeto-molecules/PageLoader';
@@ -21,9 +21,9 @@ import Typography from '@bigbinary/neetoui/Typography';
 import Tab from '@bigbinary/neetoui/Tab';
 import Tag from '@bigbinary/neetoui/Tag';
 import { t as t$1 } from 'i18next';
+import { buildUrl } from '@bigbinary/neeto-commons-frontend/utils';
 import { prop, pluck, assoc } from 'ramda';
 import Alert from '@bigbinary/neetoui/Alert';
-import { useMutationWithInvalidation, withT } from '@bigbinary/neeto-commons-frontend/react-utils';
 import Plus from '@bigbinary/neeto-icons/Plus';
 import HelpPopover from '@bigbinary/neeto-molecules/HelpPopover';
 import MoreDropdown from '@bigbinary/neeto-molecules/MoreDropdown';
@@ -74,46 +74,6 @@ function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
 
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-
-function _iterableToArrayLimit(r, l) {
-  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (null != t) {
-    var e,
-      n,
-      i,
-      u,
-      a = [],
-      f = !0,
-      o = !1;
-    try {
-      if (i = (t = t.call(r)).next, 0 === l) {
-        if (Object(t) !== t) return;
-        f = !1;
-      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-    } catch (r) {
-      o = !0, n = r;
-    } finally {
-      try {
-        if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return;
-      } finally {
-        if (o) throw n;
-      }
-    }
-    return a;
-  }
-}
-
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-
-function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
-
 function _typeof$1(o) {
   "@babel/helpers - typeof";
 
@@ -627,6 +587,46 @@ try {
 
 var _regeneratorRuntime = /*@__PURE__*/getDefaultExportFromCjs(regenerator);
 
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _iterableToArrayLimit(r, l) {
+  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
+    try {
+      if (i = (t = t.call(r)).next, 0 === l) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      o = !0, n = r;
+    } finally {
+      try {
+        if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return;
+      } finally {
+        if (o) throw n;
+      }
+    }
+    return a;
+  }
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+
 var DELIVERY_TAB = {
   response: "response",
   request: "request"
@@ -911,10 +911,6 @@ var buildColumns$1 = function buildColumns(_ref) {
 var Deliveries = function Deliveries(_ref) {
   var webhooksUrl = _ref.webhooksUrl,
     hostBreadcrumbs = _ref.breadcrumbs;
-  var _useState = useState(1),
-    _useState2 = _slicedToArray(_useState, 2),
-    pageNumber = _useState2[0],
-    setPageNumber = _useState2[1];
   var _useRouteMatch = useRouteMatch(),
     deliveriesUrl = _useRouteMatch.url;
   var history = useHistory();
@@ -923,10 +919,12 @@ var Deliveries = function Deliveries(_ref) {
   var _useParams = useParams(),
     webhookId = _useParams.webhookId,
     deliveryId = _useParams.deliveryId;
-  var deliveriesPath = getDeliveriesPath(webhooksUrl);
+  var _useQueryParams = useQueryParams(),
+    _useQueryParams$page = _useQueryParams.page,
+    page = _useQueryParams$page === void 0 ? DEFAULT_PAGE_INDEX : _useQueryParams$page;
   var deliveryDetailsPath = getDeliveryDetailsPath(deliveriesUrl);
   var _useFetchDeliveries = useFetchDeliveries(webhookId, {
-      page: pageNumber,
+      page: page,
       pageSize: DEFAULT_PAGE_SIZE
     }),
     isLoading = _useFetchDeliveries.isLoading,
@@ -947,11 +945,6 @@ var Deliveries = function Deliveries(_ref) {
     link: window.location.pathname,
     text: endpoint
   }]);
-  var handleClose = function handleClose() {
-    history.push(buildUrl(deliveriesPath, {
-      webhookId: webhookId
-    }));
-  };
   if (isLoading) return /*#__PURE__*/jsx(PageLoader, {});
   return /*#__PURE__*/jsxs(Container, {
     className: "w-full",
@@ -966,9 +959,8 @@ var Deliveries = function Deliveries(_ref) {
         columnData: buildColumns$1({
           deliveryDetailsPath: deliveryDetailsPath
         }),
-        currentPageNumber: pageNumber,
+        currentPageNumber: page,
         defaultPageSize: DEFAULT_PAGE_SIZE,
-        handlePageChange: setPageNumber,
         loading: isFetching,
         rowData: deliveries
       })
@@ -981,7 +973,9 @@ var Deliveries = function Deliveries(_ref) {
     }), /*#__PURE__*/jsx(Details, {
       deliveryId: deliveryId,
       webhookSid: webhookId,
-      onClose: handleClose
+      onClose: function onClose() {
+        return history.goBack();
+      }
     })]
   });
 };
@@ -1521,15 +1515,14 @@ var Webhooks = function Webhooks(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     isDeleteAlertOpen = _useState8[0],
     setIsDeleteAlertOpen = _useState8[1];
-  var _useState9 = useState(1),
-    _useState10 = _slicedToArray(_useState9, 2),
-    pageNumber = _useState10[0],
-    setPageNumber = _useState10[1];
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var _useQueryParams = useQueryParams(),
+    _useQueryParams$page = _useQueryParams.page,
+    page = _useQueryParams$page === void 0 ? DEFAULT_PAGE_INDEX : _useQueryParams$page;
   var _useFetchWebhooks = useFetchWebhooks({
       entityId: entityId,
-      page: pageNumber,
+      page: page,
       pageSize: DEFAULT_PAGE_SIZE
     }),
     isLoading = _useFetchWebhooks.isLoading,
@@ -1575,9 +1568,8 @@ var Webhooks = function Webhooks(_ref) {
       children: /*#__PURE__*/jsx(Table, {
         totalCount: totalCount,
         fixedHeight: true,
-        currentPageNumber: pageNumber,
+        currentPageNumber: page,
         defaultPageSize: DEFAULT_PAGE_SIZE,
-        handlePageChange: setPageNumber,
         loading: isFetching,
         rowData: webhooks,
         columnData: buildColumns({