diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhookTableHeader.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/WebhookTableHeader.js
similarity index 100%
rename from packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhookTableHeader.js
rename to packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/WebhookTableHeader.js
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableRow.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/WebhooksTableRow.js
similarity index 81%
rename from packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableRow.js
rename to packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/WebhooksTableRow.js
index f17841730a..001856de88 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableRow.js
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/WebhooksTableRow.js
@@ -6,26 +6,26 @@ import Text from "@docspace/components/text";
import { ToggleButton } from "@docspace/components";
import SettingsIcon from "PUBLIC_DIR/images/settings.webhooks.react.svg?url";
import HistoryIcon from "PUBLIC_DIR/images/history.react.svg?url";
-import RetryIcon from "PUBLIC_DIR/images/refresh.react.svg?url";
import DeleteIcon from "PUBLIC_DIR/images/delete.react.svg?url";
-import WebhookDialog from "../WebhookDialog";
-import { DeleteWebhookDialog } from "../DeleteWebhookDialog";
-import { StatusBadge } from "../StatusBadge";
+import WebhookDialog from "../../WebhookDialog";
+import { DeleteWebhookDialog } from "../../DeleteWebhookDialog";
+import { StatusBadge } from "../../StatusBadge";
+
+import { useHistory } from "react-router-dom";
+
+export const WebhooksTableRow = ({ webhook, toggleEnabled, deleteWebhook, editWebhook }) => {
+ const history = useHistory();
-export const WebhooksTableRow = ({
- webhook,
- toggleEnabled,
- deleteWebhook,
- editWebhook,
- retryWebhookEvent,
-}) => {
const [isChecked, setIsChecked] = useState(webhook.isEnabled);
const [isSettingsOpened, setIsSettingsOpened] = useState(false);
const [isDeleteOpened, setIsDeleteOpened] = useState(false);
const closeSettings = () => setIsSettingsOpened(false);
const openSettings = () => setIsSettingsOpened(true);
+ const onDeleteOpen = () => setIsDeleteOpened(true);
const onDeleteClose = () => setIsDeleteOpened(false);
+ const redirectToHistory = () =>
+ history.push(`/portal-settings/developer/tools/webhooks/history/${webhook.id}`);
const handleWebhookUpdate = (webhookInfo) => editWebhook(webhook, webhookInfo);
const handleWebhookDelete = () => deleteWebhook(webhook);
@@ -45,14 +45,8 @@ export const WebhooksTableRow = ({
key: "Webhook history dropdownItem",
label: "Webhook history",
icon: HistoryIcon,
- onClick: () => console.log("webhooks history"),
+ onClick: redirectToHistory,
},
- // {
- // key: "Retry dropdownItem",
- // label: "Retry",
- // icon: RetryIcon,
- // onClick: () => retryWebhookEvent(webhook.id),
- // },
{
key: "Separator dropdownItem",
isSeparator: true,
@@ -61,7 +55,7 @@ export const WebhooksTableRow = ({
key: "Delete webhook dropdownItem",
label: "Delete webhook",
icon: DeleteIcon,
- onClick: () => setIsDeleteOpened(true),
+ onClick: onDeleteOpen,
},
];
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/index.js
new file mode 100644
index 0000000000..ee5123894f
--- /dev/null
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/WebhooksTableView/index.js
@@ -0,0 +1,44 @@
+import React, { useRef } from "react";
+
+import styled from "styled-components";
+
+import TableContainer from "@docspace/components/table-container/TableContainer";
+import TableBody from "@docspace/components/table-container/TableBody";
+
+import { WebhooksTableRow } from "./WebhooksTableRow";
+
+import { WebhookTableHeader } from "./WebhookTableHeader";
+
+const TableWrapper = styled(TableContainer)`
+ margin-top: 16px;
+`;
+
+const WebhooksTableView = (props) => {
+ const { webhooks, toggleEnabled, deleteWebhook, editWebhook, sectionWidth } = props;
+
+ const tableRef = useRef(null);
+
+ return (
+
+
+
+ {webhooks.map((webhook, index) => (
+
+ ))}
+
+
+ );
+};
+
+export default WebhooksTableView;
diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/index.js
index b2bf1ea35c..08044c7628 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/sub-components/WebhooksTable/index.js
@@ -1,50 +1,24 @@
-import React, { useRef } from "react";
-
-import styled from "styled-components";
-
-import TableContainer from "@docspace/components/table-container/TableContainer";
-import TableBody from "@docspace/components/table-container/TableBody";
-
-import { WebhooksTableRow } from "./WebhooksTableRow";
+import React from "react";
import { Consumer } from "@docspace/components/utils/context";
import { inject, observer } from "mobx-react";
-import { WebhookTableHeader } from "./WebhookTableHeader";
-
-const TableWrapper = styled(TableContainer)`
- margin-top: 16px;
-`;
+import WebhooksTableView from "./WebhooksTableView";
const WebhooksTable = (props) => {
- const { webhooks, toggleEnabled, deleteWebhook, editWebhook, retryWebhookEvent, viewAs } = props;
-
- const tableRef = useRef(null);
+ const { webhooks, toggleEnabled, deleteWebhook, editWebhook, viewAs } = props;
return (
{(context) =>
viewAs === "table" ? (
-
-
-
- {webhooks.map((webhook, index) => (
-
- ))}
-
-
+
) : (
<>>
)