@oneuptime/common 8.0.5580 → 8.0.5581

package/Server/Services/StatusPageSubscriberService.ts

@@ -16,7 +16,7 @@ import ProjectCallSMSConfigService from "./ProjectCallSMSConfigService";
 import ProjectService, { CurrentPlan } from "./ProjectService";
 import SmsService from "./SmsService";
 import StatusPageService from "./StatusPageService";
-import { FileRoute } from "../../ServiceRoute";
+import { StatusPageApiRoute } from "../../ServiceRoute";
 import Hostname from "../../Types/API/Hostname";
 import Protocol from "../../Types/API/Protocol";
 import URL from "../../Types/API/URL";
@@ -522,6 +522,8 @@ Stay informed about service availability! 🚀`;
 
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
     logger.debug(`HTTP Protocol: ${httpProtocol}`);
+    const statusPageIdString: string | null =
+      statusPage.id?.toString() || statusPage._id?.toString() || null;
 
     const confirmSubscriptionLink: string = this.getConfirmSubscriptionLink({
       statusPageUrl: statusPageURL,
@@ -547,12 +549,13 @@ Stay informed about service availability! 🚀`;
           templateType: EmailTemplateType.ConfirmStatusPageSubscription,
           vars: {
             statusPageName: statusPageName,
-            logoUrl: statusPage.logoFileId
-              ? new URL(httpProtocol, host)
-                  .addRoute(FileRoute)
-                  .addRoute("/image/" + statusPage.logoFileId)
-                  .toString()
-              : "",
+            logoUrl:
+              statusPage.logoFileId && statusPageIdString
+                ? new URL(httpProtocol, host)
+                    .addRoute(StatusPageApiRoute)
+                    .addRoute(`/logo/${statusPageIdString}`)
+                    .toString()
+                : "",
             statusPageUrl: statusPageURL,
             isPublicStatusPage: statusPage.isPublicStatusPage
               ? "true"
@@ -656,6 +659,8 @@ Stay informed about service availability! 🚀`;
 
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
     logger.debug(`HTTP Protocol: ${httpProtocol}`);
+    const statusPageIdString: string | null =
+      statusPage.id?.toString() || statusPage._id?.toString() || null;
 
     const unsubscribeLink: string = this.getUnsubscribeLink(
       URL.fromString(statusPageURL),
@@ -675,12 +680,13 @@ Stay informed about service availability! 🚀`;
           templateType: EmailTemplateType.SubscribedToStatusPage,
           vars: {
             statusPageName: statusPageName,
-            logoUrl: statusPage.logoFileId
-              ? new URL(httpProtocol, host)
-                  .addRoute(FileRoute)
-                  .addRoute("/image/" + statusPage.logoFileId)
-                  .toString()
-              : "",
+            logoUrl:
+              statusPage.logoFileId && statusPageIdString
+                ? new URL(httpProtocol, host)
+                    .addRoute(StatusPageApiRoute)
+                    .addRoute(`/logo/${statusPageIdString}`)
+                    .toString()
+                : "",
             statusPageUrl: statusPageURL,
             isPublicStatusPage: statusPage.isPublicStatusPage
               ? "true"

package/Server/Utils/FileAttachmentMarkdownUtil.ts

@@ -0,0 +1,98 @@
+import File from "../../Models/DatabaseModels/File";
+import { AppApiRoute } from "../../ServiceRoute";
+import Route from "../../Types/API/Route";
+import ObjectID from "../../Types/ObjectID";
+import FileService from "../Services/FileService";
+import QueryHelper from "../Types/Database/QueryHelper";
+import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
+
+export interface FileAttachmentMarkdownInput {
+  modelId: ObjectID;
+  attachmentIds: Array<ObjectID>;
+  attachmentApiPath: string;
+}
+
+export default class FileAttachmentMarkdownUtil {
+  public static async buildAttachmentMarkdown(
+    input: FileAttachmentMarkdownInput,
+  ): Promise<string> {
+    if (
+      !input.modelId ||
+      !input.attachmentIds ||
+      input.attachmentIds.length === 0
+    ) {
+      return "";
+    }
+
+    const uniqueIds: Array<string> = Array.from(
+      new Set(
+        input.attachmentIds
+          .map((id: ObjectID) => {
+            return id.toString();
+          })
+          .filter((value: string) => {
+            return Boolean(value);
+          }),
+      ),
+    );
+
+    if (uniqueIds.length === 0) {
+      return "";
+    }
+
+    const files: Array<File> = await FileService.findBy({
+      query: {
+        _id: QueryHelper.any(uniqueIds),
+      },
+      limit: LIMIT_PER_PROJECT,
+      skip: 0,
+      select: {
+        _id: true,
+        name: true,
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (!files.length) {
+      return "";
+    }
+
+    const fileById: Map<string, File> = new Map(
+      files
+        .filter((file: File) => {
+          return Boolean(file._id);
+        })
+        .map((file: File) => {
+          return [file._id!.toString(), file];
+        }),
+    );
+
+    const attachmentLines: Array<string> = [];
+
+    for (const id of input.attachmentIds) {
+      const key: string = id.toString();
+      const file: File | undefined = fileById.get(key);
+
+      if (!file) {
+        continue;
+      }
+
+      const fileName: string = file.name || "Attachment";
+
+      const route: Route = Route.fromString(AppApiRoute.toString())
+        .addRoute(input.attachmentApiPath)
+        .addRoute(`/${input.modelId.toString()}`)
+        .addRoute(`/${key}`);
+
+      attachmentLines.push(`- [${fileName}](${route.toString()})`);
+    }
+
+    if (!attachmentLines.length) {
+      return "";
+    }
+
+    return `\n\n**Attachments:**\n${attachmentLines.join("\n")}\n`;
+  }
+}

package/Server/Utils/Response.ts

@@ -42,6 +42,7 @@ export default class Response {
     res: ExpressResponse,
     path: string,
   ): void {
+    Response.setNoCacheHeaders(res);
     res.sendFile(path);
   }
 
@@ -56,6 +57,7 @@ export default class Response {
     const oneUptimeResponse: OneUptimeResponse = res as OneUptimeResponse;
 
     if (headers) {
+      Response.setNoCacheHeaders(oneUptimeResponse);
       for (const key in headers) {
         oneUptimeResponse.set(key, headers[key]?.toString() || "");
       }
@@ -322,4 +324,15 @@ export default class Response {
     oneUptimeResponse.writeHead(200, { "Content-Type": "text/javascript" });
     oneUptimeResponse.end(javascript);
   }
+
+  public static setNoCacheHeaders(res: ExpressResponse): void {
+    const oneUptimeResponse: OneUptimeResponse = res as OneUptimeResponse;
+
+    oneUptimeResponse.setHeader(
+      "Cache-Control",
+      "no-store, no-cache, must-revalidate",
+    );
+    oneUptimeResponse.setHeader("Pragma", "no-cache");
+    oneUptimeResponse.setHeader("Expires", "0");
+  }
 }

package/Types/File/MimeType.ts

@@ -6,6 +6,24 @@ enum MimeType {
   jpg = "image/jpeg",
   jpeg = "image/jpeg",
   svg = "image/svg+xml",
+  gif = "image/gif",
+  webp = "image/webp",
+  pdf = "application/pdf",
+  doc = "application/msword",
+  docx = "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  txt = "text/plain",
+  md = "text/markdown",
+  csv = "text/csv",
+  rtf = "application/rtf",
+  odt = "application/vnd.oasis.opendocument.text",
+  json = "application/json",
+  zip = "application/zip",
+  xls = "application/vnd.ms-excel",
+  xlsx = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ods = "application/vnd.oasis.opendocument.spreadsheet",
+  ppt = "application/vnd.ms-powerpoint",
+  pptx = "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  odp = "application/vnd.oasis.opendocument.presentation",
 
   // TODO add more mime types.
 }

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">