@oneuptime/common 8.0.5579 → 8.0.5581

package/Types/Monitor/MonitorStepExceptionMonitor.ts

@@ -0,0 +1,94 @@
+import ExceptionInstance from "../../Models/AnalyticsModels/ExceptionInstance";
+import InBetween from "../BaseDatabase/InBetween";
+import Includes from "../BaseDatabase/Includes";
+import Query from "../BaseDatabase/Query";
+import Search from "../BaseDatabase/Search";
+import OneUptimeDate from "../Date";
+import { JSONObject } from "../JSON";
+import ObjectID from "../ObjectID";
+
+export default interface MonitorStepExceptionMonitor {
+  telemetryServiceIds: Array<ObjectID>;
+  exceptionTypes: Array<string>;
+  message: string;
+  includeResolved: boolean;
+  includeArchived: boolean;
+  lastXSecondsOfExceptions: number;
+}
+
+export class MonitorStepExceptionMonitorUtil {
+  public static toAnalyticsQuery(
+    monitorStepExceptionMonitor: MonitorStepExceptionMonitor,
+  ): Query<ExceptionInstance> {
+    const query: Query<ExceptionInstance> = {};
+
+    if (
+      monitorStepExceptionMonitor.telemetryServiceIds &&
+      monitorStepExceptionMonitor.telemetryServiceIds.length > 0
+    ) {
+      query.serviceId = new Includes(
+        monitorStepExceptionMonitor.telemetryServiceIds,
+      );
+    }
+
+    if (
+      monitorStepExceptionMonitor.exceptionTypes &&
+      monitorStepExceptionMonitor.exceptionTypes.length > 0
+    ) {
+      query.exceptionType = new Includes(
+        monitorStepExceptionMonitor.exceptionTypes,
+      );
+    }
+
+    if (monitorStepExceptionMonitor.message) {
+      query.message = new Search(monitorStepExceptionMonitor.message);
+    }
+
+    if (monitorStepExceptionMonitor.lastXSecondsOfExceptions) {
+      const endDate: Date = OneUptimeDate.getCurrentDate();
+      const startDate: Date = OneUptimeDate.addRemoveSeconds(
+        endDate,
+        monitorStepExceptionMonitor.lastXSecondsOfExceptions * -1,
+      );
+      query.time = new InBetween(startDate, endDate);
+    }
+
+    return query;
+  }
+
+  public static getDefault(): MonitorStepExceptionMonitor {
+    return {
+      telemetryServiceIds: [],
+      exceptionTypes: [],
+      message: "",
+      includeResolved: false,
+      includeArchived: false,
+      lastXSecondsOfExceptions: 60,
+    };
+  }
+
+  public static fromJSON(json: JSONObject): MonitorStepExceptionMonitor {
+    return {
+      telemetryServiceIds: ObjectID.fromJSONArray(
+        (json["telemetryServiceIds"] as Array<JSONObject>) || [],
+      ),
+      exceptionTypes: (json["exceptionTypes"] as Array<string>) || [],
+      message: (json["message"] as string) || "",
+      includeResolved: Boolean(json["includeResolved"]) || false,
+      includeArchived: Boolean(json["includeArchived"]) || false,
+      lastXSecondsOfExceptions:
+        (json["lastXSecondsOfExceptions"] as number | undefined) || 60,
+    };
+  }
+
+  public static toJSON(monitor: MonitorStepExceptionMonitor): JSONObject {
+    return {
+      telemetryServiceIds: ObjectID.toJSONArray(monitor.telemetryServiceIds),
+      exceptionTypes: monitor.exceptionTypes,
+      message: monitor.message,
+      includeResolved: monitor.includeResolved,
+      includeArchived: monitor.includeArchived,
+      lastXSecondsOfExceptions: monitor.lastXSecondsOfExceptions,
+    };
+  }
+}

package/Types/Monitor/MonitorType.ts

@@ -20,6 +20,7 @@ enum MonitorType {
   Logs = "Logs",
   Metrics = "Metrics",
   Traces = "Traces",
+  Exceptions = "Exceptions",
 }
 
 export default MonitorType;
@@ -35,7 +36,8 @@ export class MonitorTypeHelper {
     return (
       monitorType === MonitorType.Logs ||
       monitorType === MonitorType.Metrics ||
-      monitorType === MonitorType.Traces
+      monitorType === MonitorType.Traces ||
+      monitorType === MonitorType.Exceptions
     );
   }
 
@@ -123,6 +125,12 @@ export class MonitorTypeHelper {
         title: "Logs",
         description: "This monitor type lets you monitor logs from any source.",
       },
+      {
+        monitorType: MonitorType.Exceptions,
+        title: "Exceptions",
+        description:
+          "This monitor type lets you monitor exceptions and error groups from any source.",
+      },
       {
         monitorType: MonitorType.Traces,
         title: "Traces",
@@ -198,6 +206,7 @@ export class MonitorTypeHelper {
       MonitorType.Logs,
       MonitorType.Metrics,
       MonitorType.Traces,
+      MonitorType.Exceptions,
     ];
   }
 

package/Types/Telemetry/TelemetryQuery.ts

@@ -3,9 +3,10 @@ import Span from "../../Models/AnalyticsModels/Span";
 import Query from "../BaseDatabase/Query";
 import MetricViewData from "../Metrics/MetricViewData";
 import TelemetryType from "./TelemetryType";
+import ExceptionInstance from "../../Models/AnalyticsModels/ExceptionInstance";
 
 export interface TelemetryQuery {
   telemetryType: TelemetryType;
-  telemetryQuery: Query<Log> | Query<Span> | null;
+  telemetryQuery: Query<Log> | Query<Span> | Query<ExceptionInstance> | null;
   metricViewData: MetricViewData | null;
 }

package/Types/Telemetry/TelemetryType.ts

@@ -2,6 +2,7 @@ enum TelemetryType {
   Metric = "Metric",
   Trace = "Trace",
   Log = "Log",
+  Exception = "Exception",
 }
 
 export default TelemetryType;

package/UI/Components/AttachmentList/EventAttachmentList.tsx

@@ -0,0 +1,121 @@
+import React, { FunctionComponent, ReactElement } from "react";
+
+export interface EventAttachment {
+  name: string;
+  downloadUrl: string;
+}
+
+export interface EventAttachmentListProps {
+  attachments: Array<EventAttachment>;
+  title?: string;
+  variant?: "section" | "inline";
+  showHeader?: boolean;
+  showCount?: boolean;
+  className?: string;
+}
+
+function getAttachmentExtensionLabel(fileName?: string | null): string | null {
+  if (!fileName) {
+    return null;
+  }
+
+  const trimmedName: string = fileName.trim();
+  const lastDotIndex: number = trimmedName.lastIndexOf(".");
+
+  if (lastDotIndex === -1 || lastDotIndex === trimmedName.length - 1) {
+    return null;
+  }
+
+  return trimmedName.substring(lastDotIndex + 1).toUpperCase();
+}
+
+type AttachmentCardProps = {
+  attachment: EventAttachment;
+};
+
+const AttachmentCard: FunctionComponent<AttachmentCardProps> = (
+  props: AttachmentCardProps,
+): ReactElement => {
+  const { attachment } = props;
+  const extensionLabel: string | null = getAttachmentExtensionLabel(
+    attachment.name,
+  );
+
+  return (
+    <li>
+      <a
+        href={attachment.downloadUrl}
+        target="_blank"
+        rel="noopener noreferrer"
+        title={attachment.name}
+        className="group flex items-center justify-between gap-3 rounded-lg border border-gray-200 bg-white px-3 py-2 text-sm text-gray-900 transition hover:border-gray-300 hover:bg-gray-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-gray-200"
+      >
+        <span className="flex items-center gap-3 min-w-0">
+          <span className="flex flex-col min-w-0">
+            <span className="text-sm font-medium text-gray-900 truncate">
+              {attachment.name || "Attachment"}
+            </span>
+            {extensionLabel && (
+              <span className="text-[11px] font-semibold uppercase tracking-wide text-gray-400">
+                {extensionLabel}
+              </span>
+            )}
+          </span>
+        </span>
+
+        <span className="flex flex-shrink-0 items-center text-gray-500 text-xs font-semibold uppercase tracking-wide">
+          Download
+        </span>
+      </a>
+    </li>
+  );
+};
+
+const EventAttachmentList: FunctionComponent<EventAttachmentListProps> = (
+  props: EventAttachmentListProps,
+): ReactElement | null => {
+  const {
+    attachments,
+    title = "Attachments",
+    variant = "section",
+    showHeader = true,
+    showCount = true,
+    className = "",
+  } = props;
+
+  if (!attachments || attachments.length === 0) {
+    return null;
+  }
+
+  const attachmentsList: ReactElement = (
+    <ul className="space-y-2">
+      {attachments.map((attachment: EventAttachment, index: number) => {
+        return <AttachmentCard attachment={attachment} key={index} />;
+      })}
+    </ul>
+  );
+
+  if (variant === "inline") {
+    return <div className={className}>{attachmentsList}</div>;
+  }
+
+  return (
+    <div
+      className={`mt-4 rounded-2xl border border-gray-100 bg-gray-50/80 p-4 ${className}`.trim()}
+    >
+      {showHeader && (
+        <div className="flex items-center justify-between text-xs font-semibold uppercase tracking-wide text-gray-500">
+          <span>{title}</span>
+          {showCount && (
+            <span className="rounded-full bg-white px-2 py-0.5 text-[11px] font-semibold text-gray-600">
+              {attachments.length}
+            </span>
+          )}
+        </div>
+      )}
+      <div className="mt-3">{attachmentsList}</div>
+    </div>
+  );
+};
+
+export default EventAttachmentList;

package/UI/Components/EventItem/EventItem.tsx

@@ -2,6 +2,7 @@ import Icon from "../Icon/Icon";
 import Link from "../Link/Link";
 import MarkdownViewer from "../Markdown.tsx/LazyMarkdownViewer";
 import Pill from "../Pill/Pill";
+import EventAttachmentList from "../AttachmentList/EventAttachmentList";
 import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../../Types/API/Route";
 import URL from "../../../Types/API/URL";
@@ -16,6 +17,11 @@ export enum TimelineItemType {
   Note = "Note",
 }
 
+export interface TimelineAttachment {
+  name: string;
+  downloadUrl: string;
+}
+
 export interface TimelineItem {
   date: Date;
   note?: string;
@@ -23,6 +29,7 @@ export interface TimelineItem {
   state?: BaseModel;
   icon: IconProp;
   iconColor: Color;
+  attachments?: Array<TimelineAttachment>;
 }
 
 export interface EventItemLabel {
@@ -46,6 +53,7 @@ export interface ComponentProps {
   anotherStatusColor?: Color | undefined;
   eventSecondDescription: string;
   labels?: Array<EventItemLabel> | undefined;
+  eventAttachments?: Array<TimelineAttachment> | undefined;
 }
 
 const EventItem: FunctionComponent<ComponentProps> = (
@@ -102,6 +110,10 @@ const EventItem: FunctionComponent<ComponentProps> = (
           </div>
         )}
 
+        {props.eventAttachments && props.eventAttachments.length > 0 && (
+          <EventAttachmentList attachments={props.eventAttachments} />
+        )}
+
         {props.eventSecondDescription && (
           <div className="mt-3 text-gray-500 text-sm active-event-box-body-second-description">
             {props.eventSecondDescription}
@@ -278,6 +290,16 @@ const EventItem: FunctionComponent<ComponentProps> = (
                               <p>
                                 <MarkdownViewer text={item.note || ""} />
                               </p>
+                              {item.attachments &&
+                                item.attachments.length > 0 && (
+                                  <EventAttachmentList
+                                    attachments={item.attachments}
+                                    variant="inline"
+                                    showHeader={false}
+                                    showCount={false}
+                                    className="mt-3"
+                                  />
+                                )}
                             </div>
                           </div>
                         </div>

package/UI/Components/Feed/FeedItem.tsx

@@ -4,7 +4,7 @@ import { GetReactElementFunction } from "../../Types/FunctionTypes";
 import Image from "../Image/Image";
 import Route from "../../../Types/API/Route";
 import BlankProfilePic from "../../Images/users/blank-profile.svg";
-import FileUtil from "../../Utils/File";
+import UserUtil from "../../Utils/User";
 import ObjectID from "../../../Types/ObjectID";
 import OneUptimeDate from "../../../Types/Date";
 import Tooltip from "../Tooltip/Tooltip";
@@ -60,23 +60,16 @@ const FeedItem: FunctionComponent<ComponentProps> = (
   };
 
   const getUserIcon: GetReactElementFunction = (): ReactElement => {
+    const userImageRoute: Route = props.user?.id
+      ? UserUtil.getProfilePictureRoute(props.user.id as ObjectID)
+      : Route.fromString(`${BlankProfilePic}`);
+
     return (
       <div>
-        {!props.user?.profilePictureId && (
-          <Image
-            className="h-10 w-10 rounded-full"
-            imageUrl={Route.fromString(`${BlankProfilePic}`)}
-          />
-        )}
-
-        {props.user?.profilePictureId && (
-          <Image
-            className="flex size-10 items-center justify-center rounded-full bg-gray-400 ring-8 ring-white"
-            imageUrl={FileUtil.getFileRoute(
-              props.user!.profilePictureId as ObjectID,
-            )}
-          />
-        )}
+        <Image
+          className="flex size-10 items-center justify-center rounded-full bg-gray-400 ring-8 ring-white"
+          imageUrl={userImageRoute}
+        />
 
         {props.icon && (
           <span className="absolute -bottom-0.5 -right-1 rounded-tl bg-white px-0.5 py-px">