npm - @oneuptime/common - Versions diffs - 9.5.3 → 9.5.4 - Mend

@oneuptime/common 9.5.3 → 9.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (149) hide show

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

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IncidentMemberService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentMemberService.ts"],"names":[],"mappings":"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~~cAAc~~,~~GAClB~~,MAAM,eAAe,CAAC,iBAAiB,CAAC;~~oBACtC~~,UAAU,EAAE,UAAU;iBACvB,CAAC,CAAC;~~gBAEL~~,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACtB,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;wBAC/C,UAAU,EAAE,UAAU;wBACtB,SAAS,EAAE,SAAS;wBACpB,qBAAqB,EAAE,qBAAqB,CAAC,qBAAqB;wBAClE,YAAY,EAAE,MAAM;wBACpB,kBAAkB,EAAE,gBAAgB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,QAAQ,EAAE,UAAU,QAAQ,qBAAqB,~~cAAc~~,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI;~~wBACzO~~,MAAM,EAAE,cAAc,IAAI,SAAS;wBACnC,qBAAqB,EAAE;4BACrB,yBAAyB,EAAE,IAAI;4BAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;yBAClC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGqB,AAAN,KAAK,CAAC,eAAe,CACnC,QAAyB,EACzB,WAAkB;QAElB,MAAM,UAAU,GAAyB,WAAW,CAAC,UAAU,CAAC;QAChE,MAAM,SAAS,GAAyB,WAAW,CAAC,SAAS,CAAC;QAC9D,MAAM,MAAM,GAAyB,WAAW,CAAC,MAAM,CAAC;QACxD,MAAM,cAAc,GAAyB,WAAW,CAAC,cAAc,CAAC;QACxE,MAAM,eAAe,GACnB,WAAW,CAAC,eAAe,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAEhE,IAAI,UAAU,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;YACtC,IAAI,QAAQ,GAAW,QAAQ,CAAC;YAChC,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAwB,MAAM,mBAAmB,CAAC,WAAW,CACrE;oBACE,EAAE,EAAE,cAAc;oBAClB,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;qBACX;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CACF,CAAC;gBACF,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACtB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,CAAC;YACH,CAAC;YAED,MAAM,~~cAAc~~,~~GAClB~~,MAAM,eAAe,CAAC,iBAAiB,CAAC;~~gBACtC~~,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;~~YAEL~~,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;oBAC/C,UAAU,EAAE,UAAU;oBACtB,SAAS,EAAE,SAAS;oBACpB,qBAAqB,EAAE,qBAAqB,CAAC,mBAAmB;oBAChE,YAAY,EAAE,OAAO;oBACrB,kBAAkB,EAAE,cAAc,MAAM,WAAW,CAAC,qBAAqB,CACvE;wBACE,MAAM,EAAE,MAAM;wBACd,SAAS,EAAE,SAAS;qBACrB,CACF,WAAW,QAAQ,mBAAmB,~~cAAc~~,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI;~~oBACpJ~~,MAAM,EAAE,eAAe,IAAI,SAAS;oBACpC,qBAAqB,EAAE;wBACrB,yBAAyB,EAAE,IAAI;wBAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;qBAClC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,oDAAoD;QACpD,MAAM,iBAAiB,GACrB,MAAM,gCAAgC,CAAC,2CAA2C,CAChF;YACE,SAAS,EAAE,SAAU;YACrB,eAAe,EAAE;gBACf,UAAU,EAAE,UAAU;aACvB;YACD,yBAAyB,EAAE,yBAAyB,CAAC,QAAQ;SAC9D,CACF,CAAC;QAEJ,gCAAgC,CAAC,2CAA2C,CAC1E;YACE,iBAAiB,EAAE,iBAAiB;YACpC,SAAS,EAAE,SAAU;YACrB,iBAAiB,EAAE,MAAM,eAAe,CAAC,8BAA8B,CACrE;gBACE,UAAU,EAAE,UAAW;aACxB,CACF;YACD,OAAO,EAAE,CAAC,MAAO,CAAC;SACnB,CACF,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACvB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;~~AA9N0B~~;IADxB,WAAW,EAAE;;;;6CAsCb;AAGwB;IADxB,WAAW,EAAE;;;;6CAyBb;AAGwB;IADxB,WAAW,EAAE;;6CAGU,KAAK;;~~8CAiE5B~~;AAGqB;IADrB,WAAW,EAAE;;6CAGC,KAAK;;~~8CAkFnB~~;AAEH,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"IncidentMemberService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentMemberService.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,4CAA4C,CAAC;AAC/D,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,WAAW,MAAM,eAAe,CAAC;AAIxC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AAClF,OAAO,yBAAyB,MAAM,mDAAmD,CAAC;AAE1F,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AAEtE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9B,MAAM,IAAI,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAClC,MAAM,IAAI,gBAAgB,CAAC,4BAA4B,CAAC,CAAC;QAC3D,CAAC;QAED,wEAAwE;QACxE,MAAM,cAAc,GAAiB,MAAM,IAAI,CAAC,SAAS,CAAC;YACxD,KAAK,EAAE;gBACL,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU;gBACpC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM;gBAC5B,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,cAAc;aAC7C;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;aACV;SACF,CAAC,CAAC;QAEH,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAI,gBAAgB,CACxB,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,aAAa,GAAY,MAAM,IAAI,CAAC,MAAM,CAAC;YAC/C,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE,IAAI;gBACZ,cAAc,EAAE,IAAI;aACrB;SACF,CAAC,CAAC;QAEH,OAAO;YACL,YAAY,EAAE;gBACZ,aAAa,EAAE,aAAa;aAC7B;YACD,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,QAAyB,EACzB,oBAAqC;;QAErC,MAAM,cAAc,GAClB,CAAA,MAAA,QAAQ,CAAC,QAAQ,CAAC,aAAa,0CAAE,EAAE,KAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAExE,MAAM,aAAa,GAAY,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC;QAEnE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,UAAU,GAAyB,IAAI,CAAC,UAAU,CAAC;YACzD,MAAM,SAAS,GAAyB,IAAI,CAAC,SAAS,CAAC;YACvD,MAAM,MAAM,GAAyB,IAAI,CAAC,MAAM,CAAC;YACjD,MAAM,cAAc,GAAyB,IAAI,CAAC,cAAc,CAAC;YAEjE,IAAI,UAAU,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAgB,MAAM,WAAW,CAAC,WAAW,CAAC;oBACtD,EAAE,EAAE,MAAM;oBACV,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,IAAI;qBACZ;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,IAAI,QAAQ,GAAW,QAAQ,CAAC;gBAChC,IAAI,cAAc,EAAE,CAAC;oBACnB,MAAM,IAAI,GACR,MAAM,mBAAmB,CAAC,WAAW,CAAC;wBACpC,EAAE,EAAE,cAAc;wBAClB,MAAM,EAAE;4BACN,IAAI,EAAE,IAAI;yBACX;wBACD,KAAK,EAAE;4BACL,MAAM,EAAE,IAAI;yBACb;qBACF,CAAC,CAAC;oBACL,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;wBACtB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;oBACvB,CAAC;gBACH,CAAC;gBAED,MAAM,oBAAoB,GAGtB,MAAM,eAAe,CAAC,iBAAiB,CAAC;oBAC1C,UAAU,EAAE,UAAU;iBACvB,CAAC,CAAC;gBACH,MAAM,qBAAqB,GACzB,oBAAoB,CAAC,gBAAgB;oBACrC,GAAG,GAAG,oBAAoB,CAAC,MAAM,CAAC;gBAEpC,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACtB,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;wBAC/C,UAAU,EAAE,UAAU;wBACtB,SAAS,EAAE,SAAS;wBACpB,qBAAqB,EAAE,qBAAqB,CAAC,qBAAqB;wBAClE,YAAY,EAAE,MAAM;wBACpB,kBAAkB,EAAE,gBAAgB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,QAAQ,EAAE,UAAU,QAAQ,qBAAqB,qBAAqB,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI;wBAChP,MAAM,EAAE,cAAc,IAAI,SAAS;wBACnC,qBAAqB,EAAE;4BACrB,yBAAyB,EAAE,IAAI;4BAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;yBAClC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGqB,AAAN,KAAK,CAAC,eAAe,CACnC,QAAyB,EACzB,WAAkB;QAElB,MAAM,UAAU,GAAyB,WAAW,CAAC,UAAU,CAAC;QAChE,MAAM,SAAS,GAAyB,WAAW,CAAC,SAAS,CAAC;QAC9D,MAAM,MAAM,GAAyB,WAAW,CAAC,MAAM,CAAC;QACxD,MAAM,cAAc,GAAyB,WAAW,CAAC,cAAc,CAAC;QACxE,MAAM,eAAe,GACnB,WAAW,CAAC,eAAe,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAEhE,IAAI,UAAU,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;YACtC,IAAI,QAAQ,GAAW,QAAQ,CAAC;YAChC,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,IAAI,GAAwB,MAAM,mBAAmB,CAAC,WAAW,CACrE;oBACE,EAAE,EAAE,cAAc;oBAClB,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;qBACX;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CACF,CAAC;gBACF,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACtB,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,CAAC;YACH,CAAC;YAED,MAAM,oBAAoB,GAGtB,MAAM,eAAe,CAAC,iBAAiB,CAAC;gBAC1C,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;YACH,MAAM,qBAAqB,GACzB,oBAAoB,CAAC,gBAAgB;gBACrC,GAAG,GAAG,oBAAoB,CAAC,MAAM,CAAC;YAEpC,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;oBAC/C,UAAU,EAAE,UAAU;oBACtB,SAAS,EAAE,SAAS;oBACpB,qBAAqB,EAAE,qBAAqB,CAAC,mBAAmB;oBAChE,YAAY,EAAE,OAAO;oBACrB,kBAAkB,EAAE,cAAc,MAAM,WAAW,CAAC,qBAAqB,CACvE;wBACE,MAAM,EAAE,MAAM;wBACd,SAAS,EAAE,SAAS;qBACrB,CACF,WAAW,QAAQ,mBAAmB,qBAAqB,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI;oBAC3J,MAAM,EAAE,eAAe,IAAI,SAAS;oBACpC,qBAAqB,EAAE;wBACrB,yBAAyB,EAAE,IAAI;wBAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;qBAClC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,oDAAoD;QACpD,MAAM,iBAAiB,GACrB,MAAM,gCAAgC,CAAC,2CAA2C,CAChF;YACE,SAAS,EAAE,SAAU;YACrB,eAAe,EAAE;gBACf,UAAU,EAAE,UAAU;aACvB;YACD,yBAAyB,EAAE,yBAAyB,CAAC,QAAQ;SAC9D,CACF,CAAC;QAEJ,gCAAgC,CAAC,2CAA2C,CAC1E;YACE,iBAAiB,EAAE,iBAAiB;YACpC,SAAS,EAAE,SAAU;YACrB,iBAAiB,EAAE,MAAM,eAAe,CAAC,8BAA8B,CACrE;gBACE,UAAU,EAAE,UAAW;aACxB,CACF;YACD,OAAO,EAAE,CAAC,MAAO,CAAC;SACnB,CACF,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACvB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;AAxO0B;IADxB,WAAW,EAAE;;;;6CAsCb;AAGwB;IADxB,WAAW,EAAE;;;;6CAyBb;AAGwB;IADxB,WAAW,EAAE;;6CAGU,KAAK;;8CAsE5B;AAGqB;IADrB,WAAW,EAAE;;6CAGC,KAAK;;8CAuFnB;AAEH,eAAe,IAAI,OAAO,EAAE,CAAC"}

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

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IncidentOwnerTeamService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentOwnerTeamService.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,+CAA+C,CAAC;AAClE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,WAAW,MAAM,eAAe,CAAC;AAGxC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AAClF,OAAO,yBAAyB,MAAM,mDAAmD,CAAC;AAE1F,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,aAAa,GAAY,MAAM,IAAI,CAAC,MAAM,CAAC;YAC/C,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,OAAO;YACL,YAAY,EAAE;gBACZ,aAAa,EAAE,aAAa;aAC7B;YACD,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,QAAyB,EACzB,oBAAqC;;QAErC,MAAM,cAAc,GAClB,CAAA,MAAA,QAAQ,CAAC,QAAQ,CAAC,aAAa,0CAAE,EAAE,KAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAExE,MAAM,aAAa,GAAY,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC;QAEnE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,UAAU,GAAyB,IAAI,CAAC,UAAU,CAAC;YACzD,MAAM,SAAS,GAAyB,IAAI,CAAC,SAAS,CAAC;YACvD,MAAM,MAAM,GAAyB,IAAI,CAAC,MAAM,CAAC;YAEjD,IAAI,UAAU,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAgB,MAAM,WAAW,CAAC,WAAW,CAAC;oBACtD,EAAE,EAAE,MAAM;oBACV,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;qBACX;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,MAAM,~~cAAc~~,~~GAClB~~,MAAM,eAAe,CAAC,iBAAiB,CAAC;~~oBACtC~~,UAAU,EAAE,UAAU;iBACvB,CAAC,CAAC;~~gBAEL~~,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACtB,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;wBAC/C,UAAU,EAAE,UAAU;wBACtB,SAAS,EAAE,SAAS;wBACpB,qBAAqB,EAAE,qBAAqB,CAAC,gBAAgB;wBAC7D,YAAY,EAAE,MAAM;wBACpB,kBAAkB,EAAE,iCAAiC,IAAI,CAAC,IAAI,yBAAyB,~~cAAc~~,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,iBAAiB;~~wBACjN~~,MAAM,EAAE,cAAc,IAAI,SAAS;wBACnC,qBAAqB,EAAE;4BACrB,yBAAyB,EAAE,IAAI;4BAC/B,YAAY,EAAE,cAAc,IAAI,SAAS;yBAC1C;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGqB,AAAN,KAAK,CAAC,eAAe,CACnC,QAAyB,EACzB,WAAkB;QAElB,qBAAqB;QAErB,MAAM,UAAU,GAAyB,WAAW,CAAC,UAAU,CAAC;QAChE,MAAM,SAAS,GAAyB,WAAW,CAAC,SAAS,CAAC;QAC9D,MAAM,MAAM,GAAyB,WAAW,CAAC,MAAM,CAAC;QACxD,MAAM,eAAe,GACnB,WAAW,CAAC,eAAe,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAEhE,IAAI,UAAU,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;YACtC,MAAM,IAAI,GAAgB,MAAM,WAAW,CAAC,WAAW,CAAC;gBACtD,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE;oBACN,IAAI,EAAE,IAAI;iBACX;gBACD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;YAEH,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtB,MAAM,~~cAAc~~,~~GAClB~~,MAAM,eAAe,CAAC,iBAAiB,CAAC;~~oBACtC~~,UAAU,EAAE,UAAU;iBACvB,CAAC,CAAC;~~gBAEL~~,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;oBAC/C,UAAU,EAAE,UAAU;oBACtB,SAAS,EAAE,SAAS;oBACpB,qBAAqB,EAAE,qBAAqB,CAAC,cAAc;oBAC3D,YAAY,EAAE,OAAO;oBACrB,kBAAkB,EAAE,+BAA+B,IAAI,CAAC,IAAI,uBAAuB,~~cAAc~~,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,iBAAiB;~~oBAC7M~~,MAAM,EAAE,eAAe,IAAI,SAAS;oBACpC,qBAAqB,EAAE;wBACrB,yBAAyB,EAAE,IAAI;wBAC/B,YAAY,EAAE,eAAe,IAAI,SAAS;qBAC3C;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,oDAAoD;QACpD,MAAM,iBAAiB,GACrB,MAAM,gCAAgC,CAAC,2CAA2C,CAChF;YACE,SAAS,EAAE,SAAU;YACrB,eAAe,EAAE;gBACf,UAAU,EAAE,UAAU;aACvB;YACD,yBAAyB,EAAE,yBAAyB,CAAC,QAAQ;SAC9D,CACF,CAAC;QAEJ,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEhC,gCAAgC,CAAC,2CAA2C,CAC1E;YACE,iBAAiB,EAAE,iBAAiB;YACpC,SAAS,EAAE,SAAU;YACrB,iBAAiB,EAAE,MAAM,eAAe,CAAC,8BAA8B,CACrE;gBACE,UAAU,EAAE,UAAW;aACxB,CACF;YACD,OAAO,EAAE,CAAC,MAAO,CAAC;SACnB,CACF,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACvB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;~~AAzJ0B~~;IADxB,WAAW,EAAE;;;;6CAwBb;AAGwB;IADxB,WAAW,EAAE;;6CAGU,KAAK;;~~8CA8C5B~~;AAGqB;IADrB,WAAW,EAAE;;6CAGC,KAAK;;~~8CAyEnB~~;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"IncidentOwnerTeamService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentOwnerTeamService.ts"],"names":[],"mappings":"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"}

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

@@ -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,

package/build/dist/Server/Services/IncidentOwnerUserService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IncidentOwnerUserService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentOwnerUserService.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,MAAM,+CAA+C,CAAC;AAClE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,WAAW,MAAM,eAAe,CAAC;AAGxC,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AAClF,OAAO,yBAAyB,MAAM,mDAAmD,CAAC;AAE1F,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,aAAa,GAAY,MAAM,IAAI,CAAC,MAAM,CAAC;YAC/C,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,OAAO;YACL,YAAY,EAAE;gBACZ,aAAa,EAAE,aAAa;aAC7B;YACD,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,QAAyB,EACzB,oBAAqC;;QAErC,MAAM,cAAc,GAClB,CAAA,MAAA,QAAQ,CAAC,QAAQ,CAAC,aAAa,0CAAE,EAAE,KAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAExE,MAAM,aAAa,GAAY,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC;QAEnE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,UAAU,GAAyB,IAAI,CAAC,UAAU,CAAC;YACzD,MAAM,SAAS,GAAyB,IAAI,CAAC,SAAS,CAAC;YACvD,MAAM,MAAM,GAAyB,IAAI,CAAC,MAAM,CAAC;YAEjD,IAAI,UAAU,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAgB,MAAM,WAAW,CAAC,WAAW,CAAC;oBACtD,EAAE,EAAE,MAAM;oBACV,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,IAAI;qBACZ;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CAAC;gBAEH,MAAM,~~cAAc~~,~~GAClB~~,MAAM,eAAe,CAAC,iBAAiB,CAAC;~~oBACtC~~,UAAU,EAAE,UAAU;iBACvB,CAAC,CAAC;~~gBAEL~~,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACtB,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;wBAC/C,UAAU,EAAE,UAAU;wBACtB,SAAS,EAAE,SAAS;wBACpB,qBAAqB,EAAE,qBAAqB,CAAC,gBAAgB;wBAC7D,YAAY,EAAE,MAAM;wBACpB,kBAAkB,EAAE,qBAAqB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,QAAQ,EAAE,wBAAwB,~~cAAc~~,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,iBAAiB;~~wBAC5O~~,MAAM,EAAE,cAAc,IAAI,SAAS;wBACnC,qBAAqB,EAAE;4BACrB,yBAAyB,EAAE,IAAI;4BAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;yBAClC;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAGqB,AAAN,KAAK,CAAC,eAAe,CACnC,QAAyB,EACzB,WAAkB;QAElB,qBAAqB;QAErB,MAAM,UAAU,GAAyB,WAAW,CAAC,UAAU,CAAC;QAChE,MAAM,SAAS,GAAyB,WAAW,CAAC,SAAS,CAAC;QAC9D,MAAM,MAAM,GAAyB,WAAW,CAAC,MAAM,CAAC;QACxD,MAAM,eAAe,GACnB,WAAW,CAAC,eAAe,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAEhE,IAAI,UAAU,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;YACtC,MAAM,~~cAAc~~,~~GAClB~~,MAAM,eAAe,CAAC,iBAAiB,CAAC;~~gBACtC~~,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;~~YAEL~~,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,mBAAmB,CAAC,sBAAsB,CAAC;oBAC/C,UAAU,EAAE,UAAU;oBACtB,SAAS,EAAE,SAAS;oBACpB,qBAAqB,EAAE,qBAAqB,CAAC,cAAc;oBAC3D,YAAY,EAAE,OAAO;oBACrB,kBAAkB,EAAE,mBAAmB,MAAM,WAAW,CAAC,qBAAqB,CAC5E;wBACE,MAAM,EAAE,MAAM;wBACd,SAAS,EAAE,SAAS;qBACrB,CACF,uBAAuB,~~cAAc~~,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,iBAAiB;~~oBAClJ~~,MAAM,EAAE,eAAe,IAAI,SAAS;oBACpC,qBAAqB,EAAE;wBACrB,yBAAyB,EAAE,IAAI;wBAC/B,YAAY,EAAE,MAAM,IAAI,SAAS;qBAClC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,oDAAoD;QACpD,MAAM,iBAAiB,GACrB,MAAM,gCAAgC,CAAC,2CAA2C,CAChF;YACE,SAAS,EAAE,SAAU;YACrB,eAAe,EAAE;gBACf,UAAU,EAAE,UAAU;aACvB;YACD,yBAAyB,EAAE,yBAAyB,CAAC,QAAQ;SAC9D,CACF,CAAC;QAEJ,gCAAgC,CAAC,2CAA2C,CAC1E;YACE,iBAAiB,EAAE,iBAAiB;YACpC,SAAS,EAAE,SAAU;YACrB,iBAAiB,EAAE,MAAM,eAAe,CAAC,8BAA8B,CACrE;gBACE,UAAU,EAAE,UAAW;aACxB,CACF;YACD,OAAO,EAAE,CAAC,MAAO,CAAC;SACnB,CACF,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACvB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;CACF;~~AAlJ0B~~;IADxB,WAAW,EAAE;;;;6CAwBb;AAGwB;IADxB,WAAW,EAAE;;6CAGU,KAAK;;~~8CA+C5B~~;AAGqB;IADrB,WAAW,EAAE;;6CAGC,KAAK;;~~8CAiEnB~~;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"IncidentOwnerUserService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentOwnerUserService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentPublicNoteService.js CHANGED Viewed

@@ -88,9 +88,11 @@ export class Service extends DatabaseService {
         const userId = createdItem.createdByUserId || ((_a = createdItem.createdByUser) === null || _a === void 0 ? void 0 : _a.id);
         const incidentId = createdItem.incidentId;
         const projectId = createdItem.projectId;
-        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-public-note/attachment");
         await IncidentFeedService.createIncidentFeedItem({
             incidentId: createdItem.incidentId,
@@ -98,7 +100,7 @@ export class Service extends DatabaseService {
             incidentFeedEventType: IncidentFeedEventType.PublicNote,
             displayColor: Indigo500,
             userId: userId || undefined,
-            feedInfoInMarkdown: `📄 posted **public note** for this [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) on status page:
+            feedInfoInMarkdown: `📄 posted **public note** for this [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) on status page:
 ${(createdItem.note || "") + attachmentsMarkdown}
           `,

package/build/dist/Server/Services/IncidentPublicNoteService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"IncidentPublicNoteService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentPublicNoteService.ts"],"names":[],"mappings":"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~~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,kCAAkC,CACnC,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,UAAU;YACvD,YAAY,EAAE,SAAS;YACvB,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,kBAAkB,EAAE,gDAAgD,~~cAAc~~,KAAK,CAAC,MAAM,eAAe,CAAC,0BAA0B,CAAC,SAAU,EAAE,UAAW,CAAC,CAAC,CAAC,QAAQ,EAAE;;~~EAEjL~~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~~AA7Oc~~;IADZ,WAAW,EAAE;;;;sCAoCb;AAGY;IADZ,WAAW,EAAE;;;;sDAmBb;AAGwB;IADxB,WAAW,EAAE;;;;6CA2Bb;AAGqB;IADrB,WAAW,EAAE;;6CAGC,KAAK;;~~8CAkCnB~~;AAGqB;IADrB,WAAW,EAAE;;6CAGK,KAAK;;8CAwDvB;AAsDH,eAAe,IAAI,OAAO,EAAE,CAAC"}
1	+ {"version":3,"file":"IncidentPublicNoteService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentPublicNoteService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentService.js CHANGED Viewed

@@ -40,7 +40,6 @@ import Metric, { MetricPointType, ServiceType, } from "../../Models/AnalyticsMod
 import OneUptimeDate from "../../Types/Date";
 import TelemetryUtil from "../Utils/Telemetry/Telemetry";
 import logger from "../Utils/Logger";
-import Semaphore from "../../Server/Infrastructure/Semaphore";
 import IncidentFeedService from "./IncidentFeedService";
 import IncidentSlaService from "./IncidentSlaService";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
@@ -51,6 +50,7 @@ import IncidentSeverityService from "./IncidentSeverityService";
 import IncidentWorkspaceMessages from "../Utils/Workspace/WorkspaceMessages/Incident";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import MetricType from "../../Models/DatabaseModels/MetricType";
+import ProjectService from "./ProjectService";
 import IncidentTemplateService from "./IncidentTemplateService";
 import LLMService from "../Utils/LLM/LLMService";
 import LlmProviderService from "./LlmProviderService";
@@ -230,29 +230,6 @@ export class Service extends DatabaseService {
         // store incident metric
         return incident;
     }
-    async getExistingIncidentNumberForProject(data) {
-        // get last incident number.
-        const lastIncident = await this.findOneBy({
-            query: {
-                projectId: data.projectId,
-            },
-            select: {
-                incidentNumber: true,
-            },
-            sort: {
-                createdAt: SortOrder.Descending,
-            },
-            props: {
-                isRoot: true,
-            },
-        });
-        if (!lastIncident) {
-            return 0;
-        }
-        return lastIncident.incidentNumber
-            ? Number(lastIncident.incidentNumber)
-            : 0;
-    }
     async onBeforeUpdate(updateBy) {
         /*
          * get monitors for this incident.
@@ -427,31 +404,12 @@ export class Service extends DatabaseService {
             }
             initialIncidentStateId = incidentState.id;
         }
-        let mutex = null;
-        try {
-            mutex = await Semaphore.lock({
-                key: projectId.toString(),
-                namespace: "IncidentService.incident-create",
-                lockTimeout: 15000,
-                acquireTimeout: 20000,
-            });
-            logger.debug("Mutex acquired - IncidentService.incident-create " +
-                projectId.toString() +
-                " at " +
-                OneUptimeDate.getCurrentDateAsFormattedString());
-        }
-        catch (err) {
-            logger.debug("Mutex acquire failed - IncidentService.incident-create " +
-                projectId.toString() +
-                " at " +
-                OneUptimeDate.getCurrentDateAsFormattedString());
-            logger.error(err);
-        }
-        const incidentNumberForThisIncident = (await this.getExistingIncidentNumberForProject({
-            projectId: projectId,
-        })) + 1;
+        const incidentCounterResult = await ProjectService.incrementAndGetIncidentCounter(projectId);
         createBy.data.currentIncidentStateId = initialIncidentStateId;
-        createBy.data.incidentNumber = incidentNumberForThisIncident;
+        createBy.data.incidentNumber = incidentCounterResult.counter;
+        createBy.data.incidentNumberWithPrefix = incidentCounterResult.prefix
+            ? `${incidentCounterResult.prefix}${incidentCounterResult.counter}`
+            : `#${incidentCounterResult.counter}`;
         if ((createBy.data.createdByUserId ||
             createBy.data.createdByUser ||
             createBy.props.userId) &&
@@ -485,9 +443,7 @@ export class Service extends DatabaseService {
         }
         return {
             createBy,
-            carryForward: {
-                mutex: mutex,
-            },
+            carryForward: null,
         };
     }
     async onCreateSuccess(onCreate, createdItem) {
@@ -504,6 +460,7 @@ export class Service extends DatabaseService {
             select: {
                 projectId: true,
                 incidentNumber: true,
+                incidentNumberWithPrefix: true,
                 title: true,
                 description: true,
                 incidentSeverity: {
@@ -535,8 +492,6 @@ export class Service extends DatabaseService {
         if (!incident) {
             throw new BadDataException("Incident not found");
         }
-        // Release mutex immediately
-        this.releaseMutexAsync(onCreate, createdItem.projectId);
         // Execute operations sequentially with error handling
         Promise.resolve()
             .then(async () => {
@@ -683,7 +638,9 @@ export class Service extends DatabaseService {
         var _a, _b, _c, _d;
         try {
             const createdByUserId = incident.createdByUserId || ((_a = incident.createdByUser) === null || _a === void 0 ? void 0 : _a.id);
-            let feedInfoInMarkdown = `#### 🚨 Incident ${(_b = incident.incidentNumber) === null || _b === void 0 ? void 0 : _b.toString()} Created:
+            const incidentNumberDisplay = incident.incidentNumberWithPrefix ||
+                "#" + ((_b = incident.incidentNumber) === null || _b === void 0 ? void 0 : _b.toString());
+            let feedInfoInMarkdown = `#### 🚨 Incident ${incidentNumberDisplay} Created:
 **${incident.title || "No title provided."}**:
@@ -799,8 +756,9 @@ ${incident.remediationNotes || "No remediation notes provided."}
                     return new ObjectID(monitor._id || "");
                 })) || [], createdItem.changeMonitorStatusToId, true, // notifyMonitorOwners
                 createdItem.rootCause ||
-                    "Status was changed because Incident #" +
-                        ((_b = createdItem.incidentNumber) === null || _b === void 0 ? void 0 : _b.toString()) +
+                    "Status was changed because Incident " +
+                        (createdItem.incidentNumberWithPrefix ||
+                            "#" + ((_b = createdItem.incidentNumber) === null || _b === void 0 ? void 0 : _b.toString())) +
                         " was created.", createdItem.createdStateLog, onCreate.createBy.props);
             }
         }
@@ -809,28 +767,6 @@ ${incident.remediationNotes || "No remediation notes provided."}
             throw error;
         }
     }
-    releaseMutexAsync(onCreate, projectId) {
-        // Release mutex in background without blocking
-        if (onCreate.carryForward && onCreate.carryForward.mutex) {
-            const mutex = onCreate.carryForward.mutex;
-            setImmediate(async () => {
-                try {
-                    await Semaphore.release(mutex);
-                    logger.debug("Mutex released - IncidentService.incident-create " +
-                        projectId.toString() +
-                        " at " +
-                        OneUptimeDate.getCurrentDateAsFormattedString());
-                }
-                catch (err) {
-                    logger.debug("Mutex release failed - IncidentService.incident-create " +
-                        projectId.toString() +
-                        " at " +
-                        OneUptimeDate.getCurrentDateAsFormattedString());
-                    logger.error(err);
-                }
-            });
-        }
-    }
     async disableActiveMonitoringIfManualIncident(incidentId) {
         const incident = await this.findOneById({
             id: incidentId,
@@ -1001,6 +937,7 @@ ${incident.remediationNotes || "No remediation notes provided."}
                     select: {
                         projectId: true,
                         incidentNumber: true,
+                        incidentNumberWithPrefix: true,
                     },
                     props: {
                         isRoot: true,
@@ -1008,7 +945,8 @@ ${incident.remediationNotes || "No remediation notes provided."}
                 });
                 const projectId = incident.projectId;
                 const incidentNumber = incident.incidentNumber;
-                const incidentLabel = `Incident ${incidentNumber}`;
+                const incidentNumberDisplay = incident.incidentNumberWithPrefix || "#" + incidentNumber;
+                const incidentLabel = `Incident ${incidentNumberDisplay}`;
                 const incidentLink = await this.getIncidentLinkInDashboard(projectId, incidentId);
                 const updatedIncidentData = ((_a = onUpdate.updateBy
                     .data) !== null && _a !== void 0 ? _a : {});
@@ -1245,8 +1183,8 @@ ${incidentSeverity.name}
                                 var _a;
                                 return new ObjectID(((_a = monitor._id) === null || _a === void 0 ? void 0 : _a.toString()) || "");
                             }), changeNewMonitorStatusTo, true, // notifyMonitorOwners
-                            "Status was changed because Incident #" +
-                                (incidentNumber === null || incidentNumber === void 0 ? void 0 : incidentNumber.toString()) +
+                            "Status was changed because Incident " +
+                                incidentNumberDisplay +
                                 " was updated.", undefined, onUpdate.updateBy.props);
                         }
                     }
@@ -1742,6 +1680,7 @@ ${incidentSeverity.name}
             id: data.incidentId,
             select: {
                 incidentNumber: true,
+                incidentNumberWithPrefix: true,
             },
             props: {
                 isRoot: true,
@@ -1750,7 +1689,10 @@ ${incidentSeverity.name}
         if (!incident) {
             throw new BadDataException("Incident not found.");
         }
-        return incident.incidentNumber ? Number(incident.incidentNumber) : null;
+        return {
+            number: incident.incidentNumber ? Number(incident.incidentNumber) : null,
+            numberWithPrefix: incident.incidentNumberWithPrefix || null,
+        };
     }
     /**
      * Ensures the currentIncidentStateId of the incident matches the latest timeline entry.
@@ -1876,12 +1818,6 @@ __decorate([
         ObjectID]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "acknowledgeIncident", null);
-__decorate([
-    CaptureSpan(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], Service.prototype, "getExistingIncidentNumberForProject", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
@@ -1924,12 +1860,6 @@ __decorate([
     __metadata("design:paramtypes", [Model, Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "handleMonitorStatusChangeAsync", null);
-__decorate([
-    CaptureSpan(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, ObjectID]),
-    __metadata("design:returntype", void 0)
-], Service.prototype, "releaseMutexAsync", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),