diff --git a/client/src/components/inputs/Dialog.tsx b/client/src/components/inputs/Dialog.tsx index 58d86cd42..caeaf4a2c 100644 --- a/client/src/components/inputs/Dialog.tsx +++ b/client/src/components/inputs/Dialog.tsx @@ -14,6 +14,7 @@ export const DialogInput = ({ onCancel, confirmColor = "accent", cancelColor = "error", + loading = false, }: { open: boolean; title?: string; @@ -22,6 +23,7 @@ export const DialogInput = ({ onCancel?(item: any): any; confirmColor?: "error" | "accent"; cancelColor?: "error" | "accent"; + loading?: boolean; }) => { return ( @@ -30,10 +32,20 @@ export const DialogInput = ({ {content} - - diff --git a/client/src/pages/infrastructure/InfraMonitors.tsx b/client/src/pages/infrastructure/InfraMonitors.tsx index c59b0131e..aa522dd4c 100644 --- a/client/src/pages/infrastructure/InfraMonitors.tsx +++ b/client/src/pages/infrastructure/InfraMonitors.tsx @@ -31,7 +31,7 @@ const PageSpeedMonitorsPage = () => { const [sortOrder, setSortOrder] = useState<"asc" | "desc">("desc"); const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); - const { deleteFn } = useDelete(); + const { deleteFn, loading: isDeleting } = useDelete(); const requestParams = [ "embedChecks=true", "type=infrastructure", @@ -111,6 +111,7 @@ const PageSpeedMonitorsPage = () => { content={t("deleteDialogDescription")} onConfirm={handleConfirm} onCancel={handleCancel} + loading={isDeleting} /> ); diff --git a/client/src/pages/pagespeed/PageSpeedMonitors.tsx b/client/src/pages/pagespeed/PageSpeedMonitors.tsx index 4224ab4ba..f63242d7a 100644 --- a/client/src/pages/pagespeed/PageSpeedMonitors.tsx +++ b/client/src/pages/pagespeed/PageSpeedMonitors.tsx @@ -31,7 +31,7 @@ const PageSpeedMonitorsPage = () => { const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc"); const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); - const { deleteFn } = useDelete(); + const { deleteFn, loading: isDeleting } = useDelete(); const requestParams = [ "embedChecks=true", "type=pagespeed", @@ -111,6 +111,7 @@ const PageSpeedMonitorsPage = () => { content={t("deleteDialogDescription")} onConfirm={handleConfirm} onCancel={handleCancel} + loading={isDeleting} /> ); diff --git a/client/src/pages/uptime/UptimeMonitors.tsx b/client/src/pages/uptime/UptimeMonitors.tsx index 9250639d9..93eaf106a 100644 --- a/client/src/pages/uptime/UptimeMonitors.tsx +++ b/client/src/pages/uptime/UptimeMonitors.tsx @@ -38,19 +38,10 @@ const UptimeMonitors = () => { const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc"); const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); - const [selectedTypes, setSelectedTypes] = useState([ - "http", - "https", - "ping", - ]); - const [selectedStatuses, setSelectedStatuses] = useState([ - "up", - "down", - "paused", - "initializing", - ]); + const [selectedTypes, setSelectedTypes] = useState([]); + const [selectedStatuses, setSelectedStatuses] = useState([]); - const { deleteFn } = useDelete(); + const { deleteFn, loading: isDeleting } = useDelete(); const typeFilter = selectedTypes.length > 0 ? selectedTypes : UptimeMonitorTypes; @@ -160,6 +151,7 @@ const UptimeMonitors = () => { content={t("deleteDialogDescription")} onConfirm={handleConfirm} onCancel={handleCancel} + loading={isDeleting} /> );