@oneuptime/common 9.5.2 → 9.5.4

package/build/dist/Server/Services/IncidentEpisodeService.js

@@ -34,9 +34,10 @@ import IncidentEpisodeOwnerTeam from "../../Models/DatabaseModels/IncidentEpisod
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import WorkspaceType from "../../Types/Workspace/WorkspaceType";
 import IncidentService from "./IncidentService";
-import Semaphore from "../Infrastructure/Semaphore";
 import OnCallDutyPolicyService from "./OnCallDutyPolicyService";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
+import IncidentGroupingRuleService from "./IncidentGroupingRuleService";
+import ProjectService from "./ProjectService";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -44,96 +45,62 @@ export class Service extends DatabaseService {
             this.hardDeleteItemsOlderThanInDays("createdAt", 3 * 365); // 3 years
         }
     }
-    async getExistingEpisodeNumberForProject(data) {
-        const lastEpisode = await this.findOneBy({
+    async onBeforeCreate(createBy) {
+        var _a;
+        if (!createBy.props.tenantId && !createBy.props.isRoot) {
+            throw new BadDataException("ProjectId required to create incident episode.");
+        }
+        const projectId = createBy.props.tenantId || createBy.data.projectId;
+        // Get the created state for episodes
+        const incidentState = await IncidentStateService.findOneBy({
             query: {
-                projectId: data.projectId,
+                projectId: projectId,
+                isCreatedState: true,
             },
             select: {
-                episodeNumber: true,
-            },
-            sort: {
-                episodeNumber: SortOrder.Descending,
+                _id: true,
             },
             props: {
                 isRoot: true,
             },
         });
-        if (!lastEpisode) {
-            return 0;
-        }
-        return lastEpisode.episodeNumber ? Number(lastEpisode.episodeNumber) : 0;
-    }
-    async onBeforeCreate(createBy) {
-        if (!createBy.props.tenantId && !createBy.props.isRoot) {
-            throw new BadDataException("ProjectId required to create incident episode.");
-        }
-        const projectId = createBy.props.tenantId || createBy.data.projectId;
-        let mutex = null;
-        try {
-            // Acquire mutex to prevent race conditions when generating episode numbers
-            try {
-                mutex = await Semaphore.lock({
-                    key: projectId.toString(),
-                    namespace: "IncidentEpisode.create",
-                });
-            }
-            catch (err) {
-                logger.error(err);
-            }
-            // Get the created state for episodes
-            const incidentState = await IncidentStateService.findOneBy({
-                query: {
-                    projectId: projectId,
-                    isCreatedState: true,
-                },
+        if (!incidentState || !incidentState.id) {
+            throw new BadDataException("Created incident state not found for this project. Please add created incident state from settings.");
+        }
+        createBy.data.currentIncidentStateId = incidentState.id;
+        // Auto-generate episode number
+        const episodeCounterResult = await ProjectService.incrementAndGetIncidentEpisodeCounter(projectId);
+        createBy.data.episodeNumber = episodeCounterResult.counter;
+        createBy.data.episodeNumberWithPrefix = episodeCounterResult.prefix
+            ? `${episodeCounterResult.prefix}${episodeCounterResult.counter}`
+            : `#${episodeCounterResult.counter}`;
+        // Set initial lastIncidentAddedAt
+        if (!createBy.data.lastIncidentAddedAt) {
+            createBy.data.lastIncidentAddedAt = OneUptimeDate.getCurrentDate();
+        }
+        // Set declaredAt if not provided
+        if (!createBy.data.declaredAt) {
+            createBy.data.declaredAt = OneUptimeDate.getCurrentDate();
+        }
+        // Copy showEpisodeOnStatusPage from grouping rule if available
+        if (createBy.data.incidentGroupingRuleId) {
+            const groupingRule = await IncidentGroupingRuleService.findOneById({
+                id: createBy.data.incidentGroupingRuleId,
                 select: {
-                    _id: true,
+                    showEpisodeOnStatusPage: true,
                 },
                 props: {
                     isRoot: true,
                 },
             });
-            if (!incidentState || !incidentState.id) {
-                throw new BadDataException("Created incident state not found for this project. Please add created incident state from settings.");
-            }
-            createBy.data.currentIncidentStateId = incidentState.id;
-            // Auto-generate episode number
-            const episodeNumberForThisEpisode = (await this.getExistingEpisodeNumberForProject({
-                projectId: projectId,
-            })) + 1;
-            createBy.data.episodeNumber = episodeNumberForThisEpisode;
-            // Set initial lastIncidentAddedAt
-            if (!createBy.data.lastIncidentAddedAt) {
-                createBy.data.lastIncidentAddedAt = OneUptimeDate.getCurrentDate();
+            if (groupingRule) {
+                createBy.data.isVisibleOnStatusPage =
+                    (_a = groupingRule.showEpisodeOnStatusPage) !== null && _a !== void 0 ? _a : true;
             }
-            return { createBy, carryForward: { mutex } };
-        }
-        catch (error) {
-            // Release the mutex if it was acquired and an error occurred
-            if (mutex) {
-                try {
-                    await Semaphore.release(mutex);
-                }
-                catch (err) {
-                    logger.error(err);
-                }
-            }
-            throw error;
         }
+        return { createBy, carryForward: null };
     }
-    async onCreateSuccess(onCreate, createdItem) {
-        var _a;
-        // Release the mutex acquired in onBeforeCreate
-        const mutex = ((_a = onCreate.carryForward) === null || _a === void 0 ? void 0 : _a.mutex) || null;
-        if (mutex) {
-            try {
-                await Semaphore.release(mutex);
-            }
-            catch (err) {
-                logger.error(err);
-            }
-        }
+    async onCreateSuccess(_onCreate, createdItem) {
         if (!createdItem.projectId) {
             throw new BadDataException("projectId is required");
         }
@@ -189,7 +156,7 @@ export class Service extends DatabaseService {
         if (!episode.id || !episode.projectId) {
             return;
         }
-        let feedInfoInMarkdown = `#### Episode ${(_a = episode.episodeNumber) === null || _a === void 0 ? void 0 : _a.toString()} Created
+        let feedInfoInMarkdown = `#### Episode ${episode.episodeNumberWithPrefix || "#" + ((_a = episode.episodeNumber) === null || _a === void 0 ? void 0 : _a.toString())} Created
 
 **${episode.title || "No title provided."}**
 
@@ -793,6 +760,7 @@ export class Service extends DatabaseService {
             id: data.episodeId,
             select: {
                 episodeNumber: true,
+                episodeNumberWithPrefix: true,
             },
             props: {
                 isRoot: true,
@@ -801,15 +769,12 @@ export class Service extends DatabaseService {
         if (!episode) {
             throw new BadDataException("Episode not found.");
         }
-        return episode.episodeNumber ? Number(episode.episodeNumber) : null;
+        return {
+            number: episode.episodeNumber ? Number(episode.episodeNumber) : null,
+            numberWithPrefix: episode.episodeNumberWithPrefix || null,
+        };
     }
 }
-__decorate([
-    CaptureSpan(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], Service.prototype, "getExistingEpisodeNumberForProject", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Services/IncidentEpisodeService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncidentEpisodeService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentEpisodeService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IncidentEpisodeService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentEpisodeService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentEpisodeStateTimelineService.js

@@ -302,19 +302,20 @@ export class Service extends DatabaseService {
             id: createdItem.incidentEpisodeId,
             select: {
                 episodeNumber: true,
+                episodeNumberWithPrefix: true,
             },
             props: {
                 isRoot: true,
             },
         });
-        const episodeNumber = (episode === null || episode === void 0 ? void 0 : episode.episodeNumber) || 0;
+        const episodeDisplayNumber = (episode === null || episode === void 0 ? void 0 : episode.episodeNumberWithPrefix) || "#" + ((episode === null || episode === void 0 ? void 0 : episode.episodeNumber) || 0);
         await IncidentEpisodeFeedService.createIncidentEpisodeFeedItem({
             incidentEpisodeId: createdItem.incidentEpisodeId,
             projectId: createdItem.projectId,
             incidentEpisodeFeedEventType: IncidentEpisodeFeedEventType.EpisodeStateChanged,
             displayColor: incidentState === null || incidentState === void 0 ? void 0 : incidentState.color,
             feedInfoInMarkdown: stateEmoji +
-                ` Changed **Episode ${episodeNumber} State** to **` +
+                ` Changed **Episode ${episodeDisplayNumber} State** to **` +
                 stateName +
                 "**",
             moreInformationInMarkdown: createdItem.rootCause

package/build/dist/Server/Services/IncidentEpisodeStateTimelineService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncidentEpisodeStateTimelineService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentEpisodeStateTimelineService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IncidentEpisodeStateTimelineService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentEpisodeStateTimelineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentInternalNoteService.js

@@ -64,9 +64,11 @@ export class Service extends DatabaseService {
         var _a;
         const userId = createdItem.createdByUserId || ((_a = createdItem.createdByUser) === null || _a === void 0 ? void 0 : _a.id);
         const incidentId = createdItem.incidentId;
-        const incidentNumber = await IncidentService.getIncidentNumber({
+        const incidentNumberResult = await IncidentService.getIncidentNumber({
             incidentId: incidentId,
         });
+        const incidentNumberDisplay = incidentNumberResult.numberWithPrefix ||
+            "#" + incidentNumberResult.number;
         const attachmentsMarkdown = await this.getAttachmentsMarkdown(createdItem.id, "/incident-internal-note/attachment");
         await IncidentFeedService.createIncidentFeedItem({
             incidentId: createdItem.incidentId,
@@ -74,7 +76,7 @@ export class Service extends DatabaseService {
             incidentFeedEventType: IncidentFeedEventType.PrivateNote,
             displayColor: Blue500,
             userId: userId || undefined,
-            feedInfoInMarkdown: `📄 posted **private note** for this [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(createdItem.projectId, incidentId)).toString()}):
+            feedInfoInMarkdown: `📄 posted **private note** for this [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(createdItem.projectId, incidentId)).toString()}):
 
 ${(createdItem.note || "") + attachmentsMarkdown}
           `,

package/build/dist/Server/Services/IncidentInternalNoteService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncidentInternalNoteService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentInternalNoteService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,kDAAkD,CAAC;AAErE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,IAAI,MAAM,kCAAkC,CAAC;AACpD,OAAO,0BAA0B,MAAM,qCAAqC,CAAC;AAE7E,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGY,AAAN,KAAK,CAAC,OAAO,CAAC,IAOpB;QACC,MAAM,YAAY,GAAU,IAAI,KAAK,EAAE,CAAC;QACxC,YAAY,CAAC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3C,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1C,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACxC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClC,YAAY,CAAC,wBAAwB,GAAG,IAAI,CAAC,wBAAwB,CAAC;QACxE,CAAC;QAED,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChE,YAAY,CAAC,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACnD,CAAC,MAAgB,EAAE,EAAE;gBACnB,MAAM,IAAI,GAAS,IAAI,IAAI,EAAE,CAAC;gBAC9B,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC;gBACjB,OAAO,IAAI,CAAC;YACd,CAAC,CACF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAGY,AAAN,KAAK,CAAC,uBAAuB,CAAC,IAGpC;QACC,MAAM,YAAY,GAAiB,MAAM,IAAI,CAAC,SAAS,CAAC;YACtD,KAAK,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;aACxD;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;aACV;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,OAAO,YAAY,KAAK,IAAI,CAAC;IAC/B,CAAC;IAGqB,AAAN,KAAK,CAAC,eAAe,CACnC,SAA0B,EAC1B,WAAkB;;QAElB,MAAM,MAAM,GACV,WAAW,CAAC,eAAe,KAAI,MAAA,WAAW,CAAC,aAAa,0CAAE,EAAE,CAAA,CAAC;QAE/D,MAAM,UAAU,GAAa,WAAW,CAAC,UAAW,CAAC;QAErD,MAAM,cAAc,GAClB,MAAM,eAAe,CAAC,iBAAiB,CAAC;YACtC,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;QAEL,MAAM,mBAAmB,GAAW,MAAM,IAAI,CAAC,sBAAsB,CACnE,WAAW,CAAC,EAAG,EACf,oCAAoC,CACrC,CAAC;QAEF,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;YAC/C,UAAU,EAAE,WAAW,CAAC,UAAW;YACnC,SAAS,EAAE,WAAW,CAAC,SAAU;YACjC,qBAAqB,EAAE,qBAAqB,CAAC,WAAW;YACxD,YAAY,EAAE,OAAO;YACrB,MAAM,EAAE,MAAM,IAAI,SAAS;YAE3B,kBAAkB,EAAE,iDAAiD,cAAc,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,WAAW,CAAC,SAAU,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE;;EAE7L,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,mBAAmB;WACrC;YACL,qBAAqB,EAAE;gBACrB,yBAAyB,EAAE,IAAI;gBAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;aAClC;SACF,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;IAGqB,AAAN,KAAK,CAAC,eAAe,CACnC,QAAyB,EACzB,eAAgC;QAEhC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAChC,MAAM,YAAY,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;gBACnD,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;gBAC9B,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;gBACD,MAAM,EAAE;oBACN,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE;wBACR,SAAS,EAAE,IAAI;wBACf,cAAc,EAAE,IAAI;qBACrB;oBACD,SAAS,EAAE,IAAI;oBACf,IAAI,EAAE,IAAI;oBACV,eAAe,EAAE,IAAI;oBACrB,aAAa,EAAE;wBACb,GAAG,EAAE,IAAI;qBACV;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GACV,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;YAEjC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;gBACvC,MAAM,QAAQ,GAAa,WAAW,CAAC,QAAS,CAAC;gBAEjD,MAAM,mBAAmB,GAAW,MAAM,IAAI,CAAC,sBAAsB,CACnE,WAAW,CAAC,EAAG,EACf,oCAAoC,CACrC,CAAC;gBAEF,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;oBAC/C,UAAU,EAAE,WAAW,CAAC,UAAW;oBACnC,SAAS,EAAE,WAAW,CAAC,SAAU;oBACjC,qBAAqB,EAAE,qBAAqB,CAAC,WAAW;oBACxD,YAAY,EAAE,OAAO;oBACrB,MAAM,EAAE,MAAM,IAAI,SAAS;oBAE3B,kBAAkB,EAAE,kDAAkD,QAAQ,CAAC,cAAc,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,QAAQ,CAAC,SAAU,EAAE,QAAQ,CAAC,EAAG,CAAC,CAAC,CAAC,QAAQ,EAAE;;EAE1M,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,mBAAmB;WACrC;oBACD,qBAAqB,EAAE;wBACrB,yBAAyB,EAAE,IAAI;wBAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;qBAClC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,OAAiB,EACjB,iBAAyB;QAEzB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,mBAAmB,GAAiB,MAAM,IAAI,CAAC,WAAW,CAAC;YAC/D,EAAE,EAAE,OAAO;YACX,MAAM,EAAE;gBACN,WAAW,EAAE;oBACX,GAAG,EAAE,IAAI;iBACV;aACF;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;YAC7D,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,aAAa,GAAoB,mBAAmB,CAAC,WAAW;aACnE,GAAG,CAAC,CAAC,IAAU,EAAE,EAAE;YAClB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACZ,OAAO,IAAI,CAAC,EAAE,CAAC;YACjB,CAAC;YAED,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACb,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,EAAmB,EAAkB,EAAE;YAC9C,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,MAAM,0BAA0B,CAAC,uBAAuB,CAAC;YAC9D,OAAO;YACP,aAAa;YACb,iBAAiB;SAClB,CAAC,CAAC;IACL,CAAC;CACF;AA/Mc;IADZ,WAAW,EAAE;;;;sCAmCb;AAGY;IADZ,WAAW,EAAE;;;;sDAmBb;AAGqB;IADrB,WAAW,EAAE;;6CAGC,KAAK;;8CAmCnB;AAGqB;IADrB,WAAW,EAAE;;6CAGK,KAAK;;8CAuDvB;AAsDH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"IncidentInternalNoteService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentInternalNoteService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentMemberService.js

@@ -110,16 +110,18 @@ export class Service extends DatabaseService {
                         roleName = role.name;
                     }
                 }
-                const incidentNumber = await IncidentService.getIncidentNumber({
+                const incidentNumberResult = await IncidentService.getIncidentNumber({
                     incidentId: incidentId,
                 });
+                const incidentNumberDisplay = incidentNumberResult.numberWithPrefix ||
+                    "#" + incidentNumberResult.number;
                 if (user && user.name) {
                     await IncidentFeedService.createIncidentFeedItem({
                         incidentId: incidentId,
                         projectId: projectId,
                         incidentFeedEventType: IncidentFeedEventType.IncidentMemberRemoved,
                         displayColor: Red500,
-                        feedInfoInMarkdown: `👤 Removed **${user.name.toString()}** (${(_b = user.email) === null || _b === void 0 ? void 0 : _b.toString()}) as **${roleName}** from [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}).`,
+                        feedInfoInMarkdown: `👤 Removed **${user.name.toString()}** (${(_b = user.email) === null || _b === void 0 ? void 0 : _b.toString()}) as **${roleName}** from [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}).`,
                         userId: deleteByUserId || undefined,
                         workspaceNotification: {
                             sendWorkspaceNotification: true,
@@ -153,9 +155,11 @@ export class Service extends DatabaseService {
                     roleName = role.name;
                 }
             }
-            const incidentNumber = await IncidentService.getIncidentNumber({
+            const incidentNumberResult = await IncidentService.getIncidentNumber({
                 incidentId: incidentId,
             });
+            const incidentNumberDisplay = incidentNumberResult.numberWithPrefix ||
+                "#" + incidentNumberResult.number;
             if (userId) {
                 await IncidentFeedService.createIncidentFeedItem({
                     incidentId: incidentId,
@@ -165,7 +169,7 @@ export class Service extends DatabaseService {
                     feedInfoInMarkdown: `👤 Added **${await UserService.getUserMarkdownString({
                         userId: userId,
                         projectId: projectId,
-                    })}** as **${roleName}** to [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}).`,
+                    })}** as **${roleName}** to [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}).`,
                     userId: createdByUserId || undefined,
                     workspaceNotification: {
                         sendWorkspaceNotification: true,

package/build/dist/Server/Services/IncidentMemberService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncidentMemberService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentMemberService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IncidentMemberService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentMemberService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentOwnerTeamService.js

@@ -61,16 +61,18 @@ export class Service extends DatabaseService {
                         isRoot: true,
                     },
                 });
-                const incidentNumber = await IncidentService.getIncidentNumber({
+                const incidentNumberResult = await IncidentService.getIncidentNumber({
                     incidentId: incidentId,
                 });
+                const incidentNumberDisplay = incidentNumberResult.numberWithPrefix ||
+                    "#" + incidentNumberResult.number;
                 if (team && team.name) {
                     await IncidentFeedService.createIncidentFeedItem({
                         incidentId: incidentId,
                         projectId: projectId,
                         incidentFeedEventType: IncidentFeedEventType.OwnerTeamRemoved,
                         displayColor: Red500,
-                        feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Removed team **${team.name}** from the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
+                        feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Removed team **${team.name}** from the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
                         userId: deleteByUserId || undefined,
                         workspaceNotification: {
                             sendWorkspaceNotification: true,
@@ -99,15 +101,17 @@ export class Service extends DatabaseService {
                 },
             });
             if (team && team.name) {
-                const incidentNumber = await IncidentService.getIncidentNumber({
+                const incidentNumberResult = await IncidentService.getIncidentNumber({
                     incidentId: incidentId,
                 });
+                const incidentNumberDisplay = incidentNumberResult.numberWithPrefix ||
+                    "#" + incidentNumberResult.number;
                 await IncidentFeedService.createIncidentFeedItem({
                     incidentId: incidentId,
                     projectId: projectId,
                     incidentFeedEventType: IncidentFeedEventType.OwnerTeamAdded,
                     displayColor: Gray500,
-                    feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Added team **${team.name}** to the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
+                    feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Added team **${team.name}** to the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
                     userId: createdByUserId || undefined,
                     workspaceNotification: {
                         sendWorkspaceNotification: true,

package/build/dist/Server/Services/IncidentOwnerTeamService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncidentOwnerTeamService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentOwnerTeamService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IncidentOwnerTeamService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentOwnerTeamService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentOwnerUserService.js

@@ -62,16 +62,18 @@ export class Service extends DatabaseService {
                         isRoot: true,
                     },
                 });
-                const incidentNumber = await IncidentService.getIncidentNumber({
+                const incidentNumberResult = await IncidentService.getIncidentNumber({
                     incidentId: incidentId,
                 });
+                const incidentNumberDisplay = incidentNumberResult.numberWithPrefix ||
+                    "#" + incidentNumberResult.number;
                 if (user && user.name) {
                     await IncidentFeedService.createIncidentFeedItem({
                         incidentId: incidentId,
                         projectId: projectId,
                         incidentFeedEventType: IncidentFeedEventType.OwnerUserRemoved,
                         displayColor: Red500,
-                        feedInfoInMarkdown: `👨🏻‍💻 Removed **${user.name.toString()}** (${(_b = user.email) === null || _b === void 0 ? void 0 : _b.toString()}) from the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
+                        feedInfoInMarkdown: `👨🏻‍💻 Removed **${user.name.toString()}** (${(_b = user.email) === null || _b === void 0 ? void 0 : _b.toString()}) from the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
                         userId: deleteByUserId || undefined,
                         workspaceNotification: {
                             sendWorkspaceNotification: true,
@@ -90,9 +92,11 @@ export class Service extends DatabaseService {
         const userId = createdItem.userId;
         const createdByUserId = createdItem.createdByUserId || onCreate.createBy.props.userId;
         if (incidentId && userId && projectId) {
-            const incidentNumber = await IncidentService.getIncidentNumber({
+            const incidentNumberResult = await IncidentService.getIncidentNumber({
                 incidentId: incidentId,
             });
+            const incidentNumberDisplay = incidentNumberResult.numberWithPrefix ||
+                "#" + incidentNumberResult.number;
             if (userId) {
                 await IncidentFeedService.createIncidentFeedItem({
                     incidentId: incidentId,
@@ -102,7 +106,7 @@ export class Service extends DatabaseService {
                     feedInfoInMarkdown: `👨🏻‍💻 Added **${await UserService.getUserMarkdownString({
                         userId: userId,
                         projectId: projectId,
-                    })}** to the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
+                    })}** to the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) as the owner.`,
                     userId: createdByUserId || undefined,
                     workspaceNotification: {
                         sendWorkspaceNotification: true,