Merge pull request #135 from devtron-labs/rc-merge/v0.35.0

chore: merge rc-v0.35.0

Author: RohitRaj011

src/common/mustacheHelper.ts

@@ -159,6 +159,8 @@ export class MustacheHelper {
                 deploymentHistoryLink: deploymentHistoryLink,
                 deploymentWindowComment: event.payload.timeWindowComment ?? '',
                 deploymentWindowCommentStyle: event.payload.timeWindowComment ? 'block' : 'none',
+                triggeredWithoutApproval: event.isDeploymentDoneWithoutApproval ? 'Deployment triggered without approval' : '',
+                triggeredWithoutApprovalStyle: event.isDeploymentDoneWithoutApproval ? 'block' : 'none'
             }
         }
         else if (event.eventTypeId===EVENT_TYPE.Approval){

src/common/types.ts

@@ -136,6 +136,8 @@ export interface ParsedCDEvent {
     dockerImg: string;
     deploymentWindowComment?: string;
     deploymentWindowCommentStyle?: string;
+    triggeredWithoutApproval?: string;
+    triggeredWithoutApprovalStyle?: string;
 }
 export enum EVENT_TYPE {
     Trigger = 1,

src/notification/service/notificationService.ts

@@ -257,5 +257,6 @@ class Event {
     isProdEnv: boolean
     baseUrl?: string
     envIdsForCiPipeline?: number[]
+    isDeploymentDoneWithoutApproval?: boolean
 }
 export {NotificationService, Event}