@oneuptime/common 9.5.2 → 9.5.4

package/Server/Utils/Browser.ts

@@ -10,6 +10,7 @@ import ScreenSizeType from "../../Types/ScreenSizeType";
 import BrowserType from "../../Types/BrowserType";
 import logger from "./Logger";
 import CaptureSpan from "./Telemetry/CaptureSpan";
+import os from "os";
 
 export type Page = PlaywrightPage;
 export type Browser = PlaywrightBrowser;
@@ -138,19 +139,26 @@ export default class BrowserUtil {
     return { height: viewPortHeight, width: viewPortWidth };
   }
 
+  private static getPlaywrightBrowsersPath(): string {
+    return (
+      process.env["PLAYWRIGHT_BROWSERS_PATH"] ||
+      `${os.homedir()}/.cache/ms-playwright`
+    );
+  }
+
   @CaptureSpan()
   public static async getChromeExecutablePath(): Promise<string> {
-    const doesDirectoryExist: boolean = await LocalFile.doesDirectoryExist(
-      "/root/.cache/ms-playwright",
-    );
+    const browsersPath: string = this.getPlaywrightBrowsersPath();
+
+    const doesDirectoryExist: boolean =
+      await LocalFile.doesDirectoryExist(browsersPath);
     if (!doesDirectoryExist) {
       throw new BadDataException("Chrome executable path not found.");
     }
 
     // get list of files in the directory
-    const directories: string[] = await LocalFile.getListOfDirectories(
-      "/root/.cache/ms-playwright",
-    );
+    const directories: string[] =
+      await LocalFile.getListOfDirectories(browsersPath);
 
     if (directories.length === 0) {
       throw new BadDataException("Chrome executable path not found.");
@@ -167,10 +175,10 @@ export default class BrowserUtil {
     }
 
     const chromeExecutableCandidates: Array<string> = [
-      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome-linux/chrome`,
-      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome-linux64/chrome`,
-      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome64/chrome`,
-      `/root/.cache/ms-playwright/${chromeInstallationName}/chrome/chrome`,
+      `${browsersPath}/${chromeInstallationName}/chrome-linux/chrome`,
+      `${browsersPath}/${chromeInstallationName}/chrome-linux64/chrome`,
+      `${browsersPath}/${chromeInstallationName}/chrome64/chrome`,
+      `${browsersPath}/${chromeInstallationName}/chrome/chrome`,
     ];
 
     for (const executablePath of chromeExecutableCandidates) {
@@ -184,17 +192,17 @@ export default class BrowserUtil {
 
   @CaptureSpan()
   public static async getFirefoxExecutablePath(): Promise<string> {
-    const doesDirectoryExist: boolean = await LocalFile.doesDirectoryExist(
-      "/root/.cache/ms-playwright",
-    );
+    const browsersPath: string = this.getPlaywrightBrowsersPath();
+
+    const doesDirectoryExist: boolean =
+      await LocalFile.doesDirectoryExist(browsersPath);
     if (!doesDirectoryExist) {
       throw new BadDataException("Firefox executable path not found.");
     }
 
     // get list of files in the directory
-    const directories: string[] = await LocalFile.getListOfDirectories(
-      "/root/.cache/ms-playwright",
-    );
+    const directories: string[] =
+      await LocalFile.getListOfDirectories(browsersPath);
 
     if (directories.length === 0) {
       throw new BadDataException("Firefox executable path not found.");
@@ -211,10 +219,10 @@ export default class BrowserUtil {
     }
 
     const firefoxExecutableCandidates: Array<string> = [
-      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox/firefox`,
-      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox-linux64/firefox`,
-      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox64/firefox`,
-      `/root/.cache/ms-playwright/${firefoxInstallationName}/firefox-64/firefox`,
+      `${browsersPath}/${firefoxInstallationName}/firefox/firefox`,
+      `${browsersPath}/${firefoxInstallationName}/firefox-linux64/firefox`,
+      `${browsersPath}/${firefoxInstallationName}/firefox64/firefox`,
+      `${browsersPath}/${firefoxInstallationName}/firefox-64/firefox`,
     ];
 
     for (const executablePath of firefoxExecutableCandidates) {

package/Server/Utils/Monitor/MonitorAlert.ts

@@ -50,6 +50,7 @@ export default class MonitorAlert {
         createdCriteriaId: true,
         projectId: true,
         alertNumber: true,
+        alertNumberWithPrefix: true,
       },
       props: {
         isRoot: true,
@@ -81,6 +82,7 @@ export default class MonitorAlert {
             "Alert auto-resolved because autoresolve is enabled for this criteria.",
           relatedAlertId: openAlert.id?.toString(),
           relatedAlertNumber: openAlert.alertNumber,
+          relatedAlertNumberWithPrefix: openAlert.alertNumberWithPrefix,
           relatedCriteriaId: input.criteriaInstance?.data?.id,
           at: OneUptimeDate.getCurrentDate(),
         });
@@ -150,6 +152,8 @@ export default class MonitorAlert {
             relatedCriteriaId: input.criteriaInstance.data?.id,
             relatedAlertId: alreadyOpenAlert?.id?.toString(),
             relatedAlertNumber: alreadyOpenAlert?.alertNumber,
+            relatedAlertNumberWithPrefix:
+              alreadyOpenAlert?.alertNumberWithPrefix,
             at: OneUptimeDate.getCurrentDate(),
           });
           continue;
@@ -292,6 +296,7 @@ export default class MonitorAlert {
           relatedCriteriaId: input.criteriaInstance.data?.id,
           relatedAlertId: createdAlert.id?.toString(),
           relatedAlertNumber: createdAlert.alertNumber,
+          relatedAlertNumberWithPrefix: createdAlert.alertNumberWithPrefix,
           at: OneUptimeDate.getCurrentDate(),
         });
       }

package/Server/Utils/Monitor/MonitorIncident.ts

@@ -56,6 +56,7 @@ export default class MonitorIncident {
         createdIncidentTemplateId: true,
         projectId: true,
         incidentNumber: true,
+        incidentNumberWithPrefix: true,
       },
       props: {
         isRoot: true,
@@ -87,6 +88,8 @@ export default class MonitorIncident {
             "Incident auto-resolved because autoresolve is enabled for this criteria.",
           relatedIncidentId: openIncident.id?.toString(),
           relatedIncidentNumber: openIncident.incidentNumber,
+          relatedIncidentNumberWithPrefix:
+            openIncident.incidentNumberWithPrefix,
           relatedCriteriaId: input.criteriaInstance?.data?.id,
           at: OneUptimeDate.getCurrentDate(),
         });
@@ -161,6 +164,8 @@ export default class MonitorIncident {
             relatedCriteriaId: input.criteriaInstance.data?.id,
             relatedIncidentId: alreadyOpenIncident?.id?.toString(),
             relatedIncidentNumber: alreadyOpenIncident?.incidentNumber,
+            relatedIncidentNumberWithPrefix:
+              alreadyOpenIncident?.incidentNumberWithPrefix,
             at: OneUptimeDate.getCurrentDate(),
           });
           continue;
@@ -242,6 +247,12 @@ export default class MonitorIncident {
 
         incident.isCreatedAutomatically = true;
 
+        // Set status page visibility (defaults to true if not specified)
+        if (criteriaIncident.showIncidentOnStatusPage !== undefined) {
+          incident.isVisibleOnStatusPage =
+            criteriaIncident.showIncidentOnStatusPage;
+        }
+
         if (input.props.telemetryQuery) {
           incident.telemetryQuery = input.props.telemetryQuery;
         }
@@ -347,6 +358,8 @@ export default class MonitorIncident {
           relatedCriteriaId: input.criteriaInstance.data?.id,
           relatedIncidentId: createdIncident.id?.toString(),
           relatedIncidentNumber: createdIncident.incidentNumber,
+          relatedIncidentNumberWithPrefix:
+            createdIncident.incidentNumberWithPrefix,
           at: OneUptimeDate.getCurrentDate(),
         });
       }

package/Server/Utils/PushNotificationUtil.ts

@@ -20,14 +20,22 @@ export default class PushNotificationUtil {
     projectName: string;
     incidentViewLink: string;
     incidentNumber?: number;
+    incidentNumberWithPrefix?: string;
   }): PushNotificationMessage {
-    const { incidentTitle, projectName, incidentViewLink, incidentNumber } =
-      params;
-    const incidentIdentifier: string = incidentNumber
-      ? `#${incidentNumber} (${incidentTitle})`
+    const {
+      incidentTitle,
+      projectName,
+      incidentViewLink,
+      incidentNumber,
+      incidentNumberWithPrefix,
+    } = params;
+    const displayNumber: string =
+      incidentNumberWithPrefix || (incidentNumber ? `#${incidentNumber}` : "");
+    const incidentIdentifier: string = displayNumber
+      ? `${displayNumber} (${incidentTitle})`
       : incidentTitle;
     return PushNotificationUtil.applyDefaults({
-      title: `New Incident${incidentNumber ? ` #${incidentNumber}` : ""}: ${incidentTitle}`,
+      title: `New Incident${displayNumber ? ` ${displayNumber}` : ""}: ${incidentTitle}`,
       body: `A new incident has been created: ${incidentIdentifier} in ${projectName}. Click to view details.`,
       clickAction: incidentViewLink,
       url: incidentViewLink,
@@ -49,6 +57,7 @@ export default class PushNotificationUtil {
     previousState?: string;
     incidentViewLink: string;
     incidentNumber?: number;
+    incidentNumberWithPrefix?: string;
   }): PushNotificationMessage {
     const {
       incidentTitle,
@@ -57,15 +66,18 @@ export default class PushNotificationUtil {
       previousState,
       incidentViewLink,
       incidentNumber,
+      incidentNumberWithPrefix,
     } = params;
-    const incidentIdentifier: string = incidentNumber
-      ? `#${incidentNumber} (${incidentTitle})`
+    const displayNumber: string =
+      incidentNumberWithPrefix || (incidentNumber ? `#${incidentNumber}` : "");
+    const incidentIdentifier: string = displayNumber
+      ? `${displayNumber} (${incidentTitle})`
       : incidentTitle;
     const stateChangeText: string = previousState
       ? `Incident ${incidentIdentifier} state changed from ${previousState} to ${newState}`
       : `Incident ${incidentIdentifier} state changed to ${newState}`;
     return PushNotificationUtil.applyDefaults({
-      title: `Incident${incidentNumber ? ` #${incidentNumber}` : ""} Updated: ${incidentTitle}`,
+      title: `Incident${displayNumber ? ` ${displayNumber}` : ""} Updated: ${incidentTitle}`,
       body: `${stateChangeText} in ${projectName}. Click to view details.`,
       clickAction: incidentViewLink,
       url: incidentViewLink,
@@ -88,6 +100,7 @@ export default class PushNotificationUtil {
     isPrivateNote: boolean;
     incidentViewLink: string;
     incidentNumber?: number;
+    incidentNumberWithPrefix?: string;
   }): PushNotificationMessage {
     const {
       incidentTitle,
@@ -95,13 +108,16 @@ export default class PushNotificationUtil {
       isPrivateNote,
       incidentViewLink,
       incidentNumber,
+      incidentNumberWithPrefix,
     } = params;
     const noteType: string = isPrivateNote ? "Private" : "Public";
-    const incidentIdentifier: string = incidentNumber
-      ? `#${incidentNumber} (${incidentTitle})`
+    const displayNumber: string =
+      incidentNumberWithPrefix || (incidentNumber ? `#${incidentNumber}` : "");
+    const incidentIdentifier: string = displayNumber
+      ? `${displayNumber} (${incidentTitle})`
       : incidentTitle;
     return PushNotificationUtil.applyDefaults({
-      title: `${noteType} Note Added: Incident${incidentNumber ? ` #${incidentNumber}` : ""} - ${incidentTitle}`,
+      title: `${noteType} Note Added: Incident${displayNumber ? ` ${displayNumber}` : ""} - ${incidentTitle}`,
       body: `A ${noteType.toLowerCase()} note has been posted on incident ${incidentIdentifier} in ${projectName}. Click to view details.`,
       clickAction: incidentViewLink,
       url: incidentViewLink,
@@ -122,13 +138,22 @@ export default class PushNotificationUtil {
     projectName: string;
     alertViewLink: string;
     alertNumber?: number;
+    alertNumberWithPrefix?: string;
   }): PushNotificationMessage {
-    const { alertTitle, projectName, alertViewLink, alertNumber } = params;
-    const alertIdentifier: string = alertNumber
-      ? `#${alertNumber} (${alertTitle})`
+    const {
+      alertTitle,
+      projectName,
+      alertViewLink,
+      alertNumber,
+      alertNumberWithPrefix,
+    } = params;
+    const displayNumber: string =
+      alertNumberWithPrefix || (alertNumber ? `#${alertNumber}` : "");
+    const alertIdentifier: string = displayNumber
+      ? `${displayNumber} (${alertTitle})`
       : alertTitle;
     return PushNotificationUtil.applyDefaults({
-      title: `New Alert${alertNumber ? ` #${alertNumber}` : ""}: ${alertTitle}`,
+      title: `New Alert${displayNumber ? ` ${displayNumber}` : ""}: ${alertTitle}`,
       body: `A new alert has been created: ${alertIdentifier} in ${projectName}. Click to view details.`,
       clickAction: alertViewLink,
       url: alertViewLink,
@@ -148,18 +173,22 @@ export default class PushNotificationUtil {
     projectName: string;
     alertEpisodeViewLink: string;
     episodeNumber?: number;
+    episodeNumberWithPrefix?: string;
   }): PushNotificationMessage {
     const {
       alertEpisodeTitle,
       projectName,
       alertEpisodeViewLink,
       episodeNumber,
+      episodeNumberWithPrefix,
     } = params;
-    const episodeIdentifier: string = episodeNumber
-      ? `#${episodeNumber} (${alertEpisodeTitle})`
+    const displayNumber: string =
+      episodeNumberWithPrefix || (episodeNumber ? `#${episodeNumber}` : "");
+    const episodeIdentifier: string = displayNumber
+      ? `${displayNumber} (${alertEpisodeTitle})`
       : alertEpisodeTitle;
     return PushNotificationUtil.applyDefaults({
-      title: `New Alert Episode${episodeNumber ? ` #${episodeNumber}` : ""}: ${alertEpisodeTitle}`,
+      title: `New Alert Episode${displayNumber ? ` ${displayNumber}` : ""}: ${alertEpisodeTitle}`,
       body: `A new alert episode has been created: ${episodeIdentifier} in ${projectName}. Click to view details.`,
       clickAction: alertEpisodeViewLink,
       url: alertEpisodeViewLink,
@@ -179,18 +208,22 @@ export default class PushNotificationUtil {
     projectName: string;
     incidentEpisodeViewLink: string;
     episodeNumber?: number;
+    episodeNumberWithPrefix?: string;
   }): PushNotificationMessage {
     const {
       incidentEpisodeTitle,
       projectName,
       incidentEpisodeViewLink,
       episodeNumber,
+      episodeNumberWithPrefix,
     } = params;
-    const episodeIdentifier: string = episodeNumber
-      ? `#${episodeNumber} (${incidentEpisodeTitle})`
+    const displayNumber: string =
+      episodeNumberWithPrefix || (episodeNumber ? `#${episodeNumber}` : "");
+    const episodeIdentifier: string = displayNumber
+      ? `${displayNumber} (${incidentEpisodeTitle})`
       : incidentEpisodeTitle;
     return PushNotificationUtil.applyDefaults({
-      title: `New Incident Episode${episodeNumber ? ` #${episodeNumber}` : ""}: ${incidentEpisodeTitle}`,
+      title: `New Incident Episode${displayNumber ? ` ${displayNumber}` : ""}: ${incidentEpisodeTitle}`,
       body: `A new incident episode has been created: ${episodeIdentifier} in ${projectName}. Click to view details.`,
       clickAction: incidentEpisodeViewLink,
       url: incidentEpisodeViewLink,
@@ -246,14 +279,24 @@ export default class PushNotificationUtil {
     state: string;
     viewLink: string;
     scheduledMaintenanceNumber?: number;
+    scheduledMaintenanceNumberWithPrefix?: string;
   }): PushNotificationMessage {
-    const { title, projectName, state, viewLink, scheduledMaintenanceNumber } =
-      params;
-    const maintenanceIdentifier: string = scheduledMaintenanceNumber
-      ? `#${scheduledMaintenanceNumber} (${title})`
+    const {
+      title,
+      projectName,
+      state,
+      viewLink,
+      scheduledMaintenanceNumber,
+      scheduledMaintenanceNumberWithPrefix,
+    } = params;
+    const displayNumber: string =
+      scheduledMaintenanceNumberWithPrefix ||
+      (scheduledMaintenanceNumber ? `#${scheduledMaintenanceNumber}` : "");
+    const maintenanceIdentifier: string = displayNumber
+      ? `${displayNumber} (${title})`
       : title;
     return PushNotificationUtil.applyDefaults({
-      title: `Scheduled Maintenance${scheduledMaintenanceNumber ? ` #${scheduledMaintenanceNumber}` : ""} ${state}: ${title}`,
+      title: `Scheduled Maintenance${displayNumber ? ` ${displayNumber}` : ""} ${state}: ${title}`,
       body: `Scheduled maintenance ${maintenanceIdentifier} ${state.toLowerCase()} in ${projectName}. Click to view details.`,
       clickAction: viewLink,
       url: viewLink,

package/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts

@@ -2003,6 +2003,7 @@ Just type any of these commands to get the information you need!`;
         select: {
           _id: true,
           incidentNumber: true,
+          incidentNumberWithPrefix: true,
           title: true,
           description: true,
           currentIncidentState: {
@@ -2063,7 +2064,7 @@ If you need to report an incident or check historical incidents, please visit th
             incident.id!,
           );
 
-        message += `${severityIcon} **[Incident #${incident.incidentNumber}: ${incident.title}](${incidentUrl.toString()})**
+        message += `${severityIcon} **[Incident ${incident.incidentNumberWithPrefix || "#" + incident.incidentNumber}: ${incident.title}](${incidentUrl.toString()})**
 • **Severity:** ${severity}
 • **Status:** ${state}
 • **Declared:** ${declaredAtText}
@@ -2124,6 +2125,7 @@ If you need to report an incident or check historical incidents, please visit th
               name: true,
             },
             scheduledMaintenanceNumber: true,
+            scheduledMaintenanceNumberWithPrefix: true,
           },
           sort: {
             startsAt: SortOrder.Ascending,
@@ -2169,7 +2171,7 @@ Check back later for upcoming maintenance windows.`;
             event.id!,
           );
 
-        message += `🛠️ **[Scheduled Maintenance #${event.scheduledMaintenanceNumber}: ${event.title}](${eventUrl.toString()})**
+        message += `🛠️ **[Scheduled Maintenance ${event.scheduledMaintenanceNumberWithPrefix || "#" + event.scheduledMaintenanceNumber}: ${event.title}](${eventUrl.toString()})**
 • **Status:** ${state}
 • **Starts:** ${startTime}
 • **Ends:** ${endTime}
@@ -2229,6 +2231,7 @@ Check back later for upcoming maintenance windows.`;
               name: true,
             },
             scheduledMaintenanceNumber: true,
+            scheduledMaintenanceNumberWithPrefix: true,
           },
           sort: {
             startsAt: SortOrder.Descending,
@@ -2274,7 +2277,7 @@ All systems are currently operating normally.`;
             event.id!,
           );
 
-        message += `🔧 **[Scheduled Maintenance #${event.scheduledMaintenanceNumber}: ${event.title}](${eventUrl.toString()})**
+        message += `🔧 **[Scheduled Maintenance ${event.scheduledMaintenanceNumberWithPrefix || "#" + event.scheduledMaintenanceNumber}: ${event.title}](${eventUrl.toString()})**
 • **Status:** ${state}
 • **Started:** ${startTime}
 • **Expected End:** ${endTime}
@@ -2331,6 +2334,7 @@ All systems are currently operating normally.`;
         select: {
           _id: true,
           alertNumber: true,
+          alertNumberWithPrefix: true,
           title: true,
           description: true,
           currentAlertState: {
@@ -2387,7 +2391,7 @@ All monitoring checks are passing normally.`;
           alert.id!,
         );
 
-        message += `⚠️ **[Alert #${alert.alertNumber}: ${alert.title}](${alertUrl.toString()})**
+        message += `⚠️ **[Alert ${alert.alertNumberWithPrefix || "#" + alert.alertNumber}: ${alert.title}](${alertUrl.toString()})**
 • **Severity:** ${severity}
 • **Status:** ${state}
 • **Triggered:** ${createdAt}

package/Server/Utils/Workspace/Slack/Actions/Alert.ts

@@ -110,14 +110,17 @@ export default class SlackAlertActions {
         });
 
       if (isAlreadyAcknowledged) {
-        const alertNumber: number | null = await AlertService.getAlertNumber({
+        const alertNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await AlertService.getAlertNumber({
           alertId: alertId,
         });
 
         // send a message to the channel visible to user, that the alert has already been acknowledged.
         const markdwonPayload: WorkspacePayloadMarkdown = {
           _type: "WorkspacePayloadMarkdown",
-          text: `@${slackUsername}, unfortunately you cannot acknowledge the **[Alert ${alertNumber?.toString()}](${await AlertService.getAlertLinkInDashboard(slackRequest.projectId!, alertId)})**. It has already been acknowledged.`,
+          text: `@${slackUsername}, unfortunately you cannot acknowledge the **[Alert ${alertNumberResult.numberWithPrefix || "#" + alertNumberResult.number}](${await AlertService.getAlertLinkInDashboard(slackRequest.projectId!, alertId)})**. It has already been acknowledged.`,
         };
 
         await SlackUtil.sendDirectMessageToUser({
@@ -232,13 +235,16 @@ export default class SlackAlertActions {
       });
 
       if (isAlreadyResolved) {
-        const alertNumber: number | null = await AlertService.getAlertNumber({
+        const alertNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await AlertService.getAlertNumber({
           alertId: alertId,
         });
         // send a message to the channel visible to user, that the alert has already been Resolved.
         const markdwonPayload: WorkspacePayloadMarkdown = {
           _type: "WorkspacePayloadMarkdown",
-          text: `@${slackUsername}, unfortunately you cannot resolve the **[Alert ${alertNumber?.toString()}](${await AlertService.getAlertLinkInDashboard(slackRequest.projectId!, alertId)})**. It has already been resolved.`,
+          text: `@${slackUsername}, unfortunately you cannot resolve the **[Alert ${alertNumberResult.numberWithPrefix || "#" + alertNumberResult.number}](${await AlertService.getAlertLinkInDashboard(slackRequest.projectId!, alertId)})**. It has already been resolved.`,
         };
 
         await SlackUtil.sendDirectMessageToUser({
@@ -568,13 +574,16 @@ export default class SlackAlertActions {
       });
 
       if (isAlreadyResolved) {
-        const alertNumber: number | null = await AlertService.getAlertNumber({
+        const alertNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await AlertService.getAlertNumber({
           alertId: alertId,
         });
         // send a message to the channel visible to user, that the alert has already been Resolved.
         const markdwonPayload: WorkspacePayloadMarkdown = {
           _type: "WorkspacePayloadMarkdown",
-          text: `@${slackUsername}, unfortunately you cannot execute the on-call policy for **[Alert ${alertNumber?.toString()}](${await AlertService.getAlertLinkInDashboard(slackRequest.projectId!, alertId)})**. It has already been resolved.`,
+          text: `@${slackUsername}, unfortunately you cannot execute the on-call policy for **[Alert ${alertNumberResult.numberWithPrefix || "#" + alertNumberResult.number}](${await AlertService.getAlertLinkInDashboard(slackRequest.projectId!, alertId)})**. It has already been resolved.`,
         };
 
         await SlackUtil.sendDirectMessageToUser({
@@ -853,7 +862,10 @@ export default class SlackAlertActions {
     const alertId: ObjectID = workspaceLog.alertId;
 
     // Get the alert number for the confirmation message
-    const alertNumber: number | null = await AlertService.getAlertNumber({
+    const alertNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await AlertService.getAlertNumber({
       alertId: alertId,
     });
 
@@ -940,7 +952,7 @@ export default class SlackAlertActions {
         await AlertService.getAlertLinkInDashboard(projectId, alertId)
       ).toString();
 
-      const confirmationMessage: string = `✅ Message saved as *private note* to <${alertLink}|Alert #${alertNumber}>.`;
+      const confirmationMessage: string = `✅ Message saved as *private note* to <${alertLink}|Alert ${alertNumberResult.numberWithPrefix || "#" + alertNumberResult.number}>.`;
 
       await SlackUtil.sendMessageToThread({
         authToken: authToken,

package/Server/Utils/Workspace/Slack/Actions/Incident.ts

@@ -242,7 +242,7 @@ export default class SlackIncidentActions {
             messageBlocks: [
               {
                 _type: "WorkspacePayloadMarkdown",
-                text: `**Incident #${createdIncident.incidentNumber}** created successfully. [View Incident](${await IncidentService.getIncidentLinkInDashboard(
+                text: `**Incident ${createdIncident.incidentNumberWithPrefix || "#" + createdIncident.incidentNumber}** created successfully. [View Incident](${await IncidentService.getIncidentLinkInDashboard(
                   slackRequest.projectId!,
                   createdIncident.id!,
                 )})`,
@@ -563,15 +563,20 @@ export default class SlackIncidentActions {
         });
 
       if (isAlreadyAcknowledged) {
-        const incidentNumber: number | null =
-          await IncidentService.getIncidentNumber({
-            incidentId: incidentId,
-          });
+        const incidentNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await IncidentService.getIncidentNumber({
+          incidentId: incidentId,
+        });
+        const incidentNumberDisplay: string =
+          incidentNumberResult.numberWithPrefix ||
+          "#" + incidentNumberResult.number;
 
         // send a message to the channel visible to user, that the incident has already been acknowledged.
         const markdwonPayload: WorkspacePayloadMarkdown = {
           _type: "WorkspacePayloadMarkdown",
-          text: `@${slackUsername}, unfortunately you cannot acknowledge the **[Incident ${incidentNumber?.toString()}](${await IncidentService.getIncidentLinkInDashboard(slackRequest.projectId!, incidentId)})**. It has already been acknowledged.`,
+          text: `@${slackUsername}, unfortunately you cannot acknowledge the **[Incident ${incidentNumberDisplay}](${await IncidentService.getIncidentLinkInDashboard(slackRequest.projectId!, incidentId)})**. It has already been acknowledged.`,
         };
 
         await SlackUtil.sendDirectMessageToUser({
@@ -687,14 +692,19 @@ export default class SlackIncidentActions {
         });
 
       if (isAlreadyResolved) {
-        const incidentNumber: number | null =
-          await IncidentService.getIncidentNumber({
-            incidentId: incidentId,
-          });
+        const incidentNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await IncidentService.getIncidentNumber({
+          incidentId: incidentId,
+        });
+        const incidentNumberDisplay: string =
+          incidentNumberResult.numberWithPrefix ||
+          "#" + incidentNumberResult.number;
         // send a message to the channel visible to user, that the incident has already been Resolved.
         const markdwonPayload: WorkspacePayloadMarkdown = {
           _type: "WorkspacePayloadMarkdown",
-          text: `@${slackUsername}, unfortunately you cannot resolve the **[Incident ${incidentNumber?.toString()}](${await IncidentService.getIncidentLinkInDashboard(slackRequest.projectId!, incidentId)})**. It has already been resolved.`,
+          text: `@${slackUsername}, unfortunately you cannot resolve the **[Incident ${incidentNumberDisplay}](${await IncidentService.getIncidentLinkInDashboard(slackRequest.projectId!, incidentId)})**. It has already been resolved.`,
         };
 
         await SlackUtil.sendDirectMessageToUser({
@@ -1026,14 +1036,19 @@ export default class SlackIncidentActions {
         });
 
       if (isAlreadyResolved) {
-        const incidentNumber: number | null =
-          await IncidentService.getIncidentNumber({
-            incidentId: incidentId,
-          });
+        const incidentNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await IncidentService.getIncidentNumber({
+          incidentId: incidentId,
+        });
+        const incidentNumberDisplay: string =
+          incidentNumberResult.numberWithPrefix ||
+          "#" + incidentNumberResult.number;
         // send a message to the channel visible to user, that the incident has already been Resolved.
         const markdwonPayload: WorkspacePayloadMarkdown = {
           _type: "WorkspacePayloadMarkdown",
-          text: `@${slackUsername}, unfortunately you cannot execute the on-call policy for **[Incident ${incidentNumber?.toString()}](${await IncidentService.getIncidentLinkInDashboard(slackRequest.projectId!, incidentId)})**. It has already been resolved.`,
+          text: `@${slackUsername}, unfortunately you cannot execute the on-call policy for **[Incident ${incidentNumberDisplay}](${await IncidentService.getIncidentLinkInDashboard(slackRequest.projectId!, incidentId)})**. It has already been resolved.`,
         };
 
         await SlackUtil.sendDirectMessageToUser({
@@ -1369,10 +1384,15 @@ export default class SlackIncidentActions {
     const incidentId: ObjectID = workspaceLog.incidentId;
 
     // Get the incident number for the confirmation message
-    const incidentNumber: number | null =
-      await IncidentService.getIncidentNumber({
-        incidentId: incidentId,
-      });
+    const incidentNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await IncidentService.getIncidentNumber({
+      incidentId: incidentId,
+    });
+    const incidentNumberDisplay: string =
+      incidentNumberResult.numberWithPrefix ||
+      "#" + incidentNumberResult.number;
 
     // Get the user ID in OneUptime based on Slack user ID
     const userAuth: WorkspaceUserAuthToken | null =
@@ -1491,8 +1511,8 @@ export default class SlackIncidentActions {
 
       const confirmationMessage: string =
         noteType === "private"
-          ? `✅ Message saved as *private note* to <${incidentLink}|Incident #${incidentNumber}>.`
-          : `✅ Message saved as *public note* to <${incidentLink}|Incident #${incidentNumber}>. This note will be visible on the status page.`;
+          ? `✅ Message saved as *private note* to <${incidentLink}|Incident ${incidentNumberDisplay}>.`
+          : `✅ Message saved as *public note* to <${incidentLink}|Incident ${incidentNumberDisplay}>. This note will be visible on the status page.`;
 
       await SlackUtil.sendMessageToThread({
         authToken: authToken,