Merge branch 'main' into getting-started-component

Author: elizabetdev

.changeset/angry-pugs-drive.md

@@ -0,0 +1,5 @@
+---
+"@hyperdx/app": patch
+---
+
+Improvements to Webhooks rendering (grouping, icons, etc)

.changeset/chilled-chairs-design.md

@@ -0,0 +1,5 @@
+---
+"@hyperdx/common-utils": minor
+---
+
+Add support for visualizing histogram counts

.gitignore

@@ -76,4 +76,7 @@ docker-compose.prod.yml
 .volumes
 
 # NX
-.nx/
+.nx/
+
+# webstorm
+.idea

packages/app/src/AlertsPage.tsx

@@ -37,6 +37,7 @@ import { ErrorBoundary } from '@/components/ErrorBoundary';
 import { PageHeader } from '@/components/PageHeader';
 
 import { isAlertSilenceExpired } from './utils/alerts';
+import { getWebhookChannelIcon } from './utils/webhookIcons';
 import api from './api';
 import { withAppNav } from './layout';
 import type { AlertsPageItem } from './types';
@@ -367,13 +368,11 @@ function AlertDetails({ alert }: { alert: AlertsPageItem }) {
   }, [alert]);
 
   const notificationMethod = React.useMemo(() => {
-    if (alert.channel.type === 'webhook') {
-      return (
-        <Group gap={2}>
-          Notify via <IconBrandSlack size={16} /> Webhook
-        </Group>
-      );
-    }
+    return (
+      <Group gap={5}>
+        Notify via {getWebhookChannelIcon(alert.channel.type)} Webhook
+      </Group>
+    );
   }, [alert]);
 
   const linkTitle = React.useMemo(() => {

packages/app/src/DBSearchPageAlertModal.tsx

@@ -48,6 +48,7 @@ import {
 import { AlertPreviewChart } from './components/AlertPreviewChart';
 import { AlertChannelForm } from './components/Alerts';
 import { SQLInlineEditorControlled } from './components/SQLInlineEditor';
+import { getWebhookChannelIcon } from './utils/webhookIcons';
 import api from './api';
 import { AlertWithCreatedBy, SearchConfig } from './types';
 import { optionsToSelectData } from './utils';
@@ -61,10 +62,6 @@ const SavedSearchAlertFormSchema = z
   })
   .passthrough();
 
-const CHANNEL_ICONS = {
-  webhook: <IconBrandSlack size={14} />,
-};
-
 const AlertForm = ({
   sourceId,
   where,
@@ -422,7 +419,7 @@ export const DBSearchPageAlertModal = ({
             {(savedSearch?.alerts || []).map((alert, index) => (
               <Tabs.Tab key={alert.id} value={`${index}`}>
                 <Group gap="xs">
-                  {CHANNEL_ICONS[alert.channel.type]} Alert {index + 1}
+                  {getWebhookChannelIcon(alert.channel.type)} Alert {index + 1}
                 </Group>
               </Tabs.Tab>
             ))}

packages/app/src/SVGIcons.tsx

@@ -31,6 +31,7 @@ import {
   Tooltip,
 } from '@mantine/core';
 import {
+  IconChartHistogram,
   IconChartLine,
   IconFilter,
   IconFilterEdit,
@@ -67,7 +68,6 @@ import {
   useServiceDashboardExpressions,
 } from '@/serviceDashboard';
 import { useSource, useSources } from '@/source';
-import { Histogram } from '@/SVGIcons';
 import { parseTimeQuery, useNewTimeQuery } from '@/timeQuery';
 
 import usePresetDashboardFilters from './hooks/usePresetDashboardFilters';
@@ -234,7 +234,7 @@ export function EndpointLatencyChart({
               title="Histogram"
               onClick={() => setLatencyChartType('histogram')}
             >
-              <Histogram width={12} color="currentColor" />
+              <IconChartHistogram size={14} />
             </Button>
           </Button.Group>
         </Box>

packages/app/src/ServicesDashboardPage.tsx

@@ -1,13 +1,9 @@
-import { Fragment, useCallback, useMemo, useState } from 'react';
+import { useCallback, useState } from 'react';
 import Head from 'next/head';
-import { HTTPError } from 'ky';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { SubmitHandler, useForm, useWatch } from 'react-hook-form';
 import { DEFAULT_METADATA_MAX_ROWS_TO_READ } from '@hyperdx/common-utils/dist/core/metadata';
-import {
-  TeamClickHouseSettings,
-  WebhookService,
-} from '@hyperdx/common-utils/dist/types';
+import { TeamClickHouseSettings } from '@hyperdx/common-utils/dist/types';
 import {
   Box,
   Button,
@@ -25,7 +21,6 @@ import {
   TextInput,
   Tooltip,
 } from '@mantine/core';
-import { useDisclosure } from '@mantine/hooks';
 import { notifications } from '@mantine/notifications';
 import {
   IconCheck,
@@ -42,13 +37,11 @@ import { IS_LOCAL_MODE } from '@/config';
 
 import { PageHeader } from './components/PageHeader';
 import TeamMembersSection from './components/TeamSettings/TeamMembersSection';
-import { WebhookForm } from './components/TeamSettings/WebhookForm';
+import WebhooksSection from './components/TeamSettings/WebhooksSection';
 import api from './api';
 import { useConnections } from './connection';
 import { DEFAULT_QUERY_TIMEOUT, DEFAULT_SEARCH_ROW_LIMIT } from './defaults';
 import { withAppNav } from './layout';
-import type { Webhook } from './types';
-import { useConfirm } from './useConfirm';
 
 function ConnectionsSection() {
   const { data: connections } = useConnections();
@@ -159,159 +152,15 @@ function SourcesSection() {
     </Box>
   );
 }
-
-function DeleteWebhookButton({
-  webhookId,
-  webhookName,
-  onSuccess,
-}: {
-  webhookId: string;
-  webhookName: string;
-  onSuccess: VoidFunction;
-}) {
-  const confirm = useConfirm();
-  const deleteWebhook = api.useDeleteWebhook();
-
-  const handleDelete = async () => {
-    if (
-      await confirm(
-        `Are you sure you want to delete ${webhookName} webhook?`,
-        'Delete',
-      )
-    ) {
-      try {
-        await deleteWebhook.mutateAsync({ id: webhookId });
-        notifications.show({
-          color: 'green',
-          message: 'Webhook deleted successfully',
-        });
-        onSuccess();
-      } catch (e) {
-        console.error(e);
-        const message =
-          (e instanceof HTTPError
-            ? (await e.response.json())?.message
-            : null) || 'Something went wrong. Please contact HyperDX team.';
-        notifications.show({
-          message,
-          color: 'red',
-          autoClose: 5000,
-        });
-      }
-    }
-  };
-
-  return (
-    <Button
-      color="red"
-      size="compact-xs"
-      variant="outline"
-      onClick={handleDelete}
-      loading={deleteWebhook.isPending}
-    >
-      Delete
-    </Button>
-  );
-}
-
 function IntegrationsSection() {
-  const { data: webhookData, refetch: refetchWebhooks } = api.useWebhooks([
-    WebhookService.Slack,
-    WebhookService.Generic,
-    WebhookService.IncidentIO,
-  ]);
-
-  const allWebhooks = useMemo<Webhook[]>(() => {
-    return Array.isArray(webhookData?.data) ? webhookData.data : [];
-  }, [webhookData]);
-
-  const [editedWebhookId, setEditedWebhookId] = useState<string | null>(null);
-  const [
-    isAddWebhookModalOpen,
-    { open: openWebhookModal, close: closeWebhookModal },
-  ] = useDisclosure();
-
   return (
     <Box id="integrations">
       <Text size="md">Integrations</Text>
       <Divider my="md" />
       <Card>
-        <Text mb="xs">Webhooks</Text>
-
-        <Stack>
-          {allWebhooks.map(webhook => (
-            <Fragment key={webhook._id}>
-              <Group justify="space-between" align="flex-start">
-                <Stack gap={0}>
-                  <Text size="sm">
-                    {webhook.name} ({webhook.service})
-                  </Text>
-                  <Text size="xs" opacity={0.7}>
-                    {webhook.url}
-                  </Text>
-                  {webhook.description && (
-                    <Text size="xxs" opacity={0.7}>
-                      {webhook.description}
-                    </Text>
-                  )}
-                </Stack>
-                <Group gap="xs">
-                  {editedWebhookId !== webhook._id && (
-                    <>
-                      <Button
-                        variant="subtle"
-                        onClick={() => setEditedWebhookId(webhook._id)}
-                        size="compact-xs"
-                        leftSection={<IconPencil size={14} />}
-                      >
-                        Edit
-                      </Button>
-                      <DeleteWebhookButton
-                        webhookId={webhook._id}
-                        webhookName={webhook.name}
-                        onSuccess={refetchWebhooks}
-                      />
-                    </>
-                  )}
-                  {editedWebhookId === webhook._id && (
-                    <Button
-                      variant="subtle"
-                      onClick={() => setEditedWebhookId(null)}
-                      size="compact-xs"
-                    >
-                      <IconX size={14} className="me-2" /> Cancel
-                    </Button>
-                  )}
-                </Group>
-              </Group>
-              {editedWebhookId === webhook._id && (
-                <WebhookForm
-                  webhook={webhook}
-                  onClose={() => setEditedWebhookId(null)}
-                  onSuccess={() => {
-                    setEditedWebhookId(null);
-                    refetchWebhooks();
-                  }}
-                />
-              )}
-              <Divider />
-            </Fragment>
-          ))}
+        <Stack gap="md">
+          <WebhooksSection />
         </Stack>
-
-        {!isAddWebhookModalOpen ? (
-          <Button variant="outline" onClick={openWebhookModal}>
-            Add Webhook
-          </Button>
-        ) : (
-          <WebhookForm
-            onClose={closeWebhookModal}
-            onSuccess={() => {
-              refetchWebhooks();
-              closeWebhookModal();
-            }}
-          />
-        )}
       </Card>
     </Box>
   );

packages/app/src/TeamPage.tsx

@@ -4,7 +4,11 @@ import { Controller, SubmitHandler, useForm, useWatch } from 'react-hook-form';
 import { ZodIssue } from 'zod';
 import { json, jsonParseLinter } from '@codemirror/lang-json';
 import { linter } from '@codemirror/lint';
-import { AlertState, WebhookService } from '@hyperdx/common-utils/dist/types';
+import {
+  AlertState,
+  WebhookApiData,
+  WebhookService,
+} from '@hyperdx/common-utils/dist/types';
 import { isValidSlackUrl } from '@hyperdx/common-utils/dist/validation';
 import {
   Alert,
@@ -23,7 +27,6 @@ import ReactCodeMirror, {
 } from '@uiw/react-codemirror';
 
 import api from '@/api';
-import { Webhook } from '@/types';
 import { isValidUrl } from '@/utils';
 
 const DEFAULT_GENERIC_WEBHOOK_BODY = [
@@ -47,7 +50,7 @@ const jsonLinterWithEmptyCheck = () => (editorView: EditorView) => {
 type WebhookForm = {
   name: string;
   url: string;
-  service: string;
+  service: WebhookService;
   description?: string;
   body?: string;
   headers?: string;
@@ -58,7 +61,7 @@ export function WebhookForm({
   onClose,
   onSuccess,
 }: {
-  webhook?: Webhook;
+  webhook?: WebhookApiData;
   onClose: VoidFunction;
   onSuccess: (webhookId?: string) => void;
 }) {
@@ -280,14 +283,12 @@ export function WebhookForm({
           label="Service Type"
           required
           value={service}
-          onChange={value => {
-            form.setValue('service', value);
-          }}
+          onChange={value => form.setValue('service', value as WebhookService)}
         >
           <Group mt="xs">
             <Radio value={WebhookService.Slack} label="Slack" />
+            <Radio value={WebhookService.IncidentIO} label="incident.io" />
             <Radio value={WebhookService.Generic} label="Generic" />
-            <Radio value={WebhookService.IncidentIO} label="Incident.io" />
           </Group>
         </Radio.Group>
         <TextInput
@@ -297,6 +298,7 @@ export function WebhookForm({
           error={form.formState.errors.name?.message}
           {...form.register('name', { required: true })}
         />
+
         <TextInput
           label="Webhook URL"
           placeholder={
@@ -318,6 +320,7 @@ export function WebhookForm({
                 : isValidUrl(value) || 'URL must be valid',
           })}
         />
+
         <TextInput
           label="Webhook Description (optional)"
           placeholder="To be used for dev alerts"