feat: add isManualExecution flag to workflow execution and related co…

…mponents
OneUptime · Feb 26, 2025 · a18207b · a18207b
1 parent cf7c39d
commit a18207b
Show file tree

Hide file tree

Showing 15 changed files with 166 additions and 112 deletions.
diff --git a/Common/Server/Services/WorkspaceNotificationRuleService.ts b/Common/Server/Services/WorkspaceNotificationRuleService.ts
@@ -29,7 +29,10 @@ import WorkspaceUserAuthTokenService from "./WorkspaceUserAuthTokenService";
 import WorkspaceMessagePayload, {
   WorkspaceMessageBlock,
 } from "../../Types/Workspace/WorkspaceMessagePayload";
-import WorkspaceProjectAuthToken, { MiscData, SlackMiscData } from "../../Models/DatabaseModels/WorkspaceProjectAuthToken";
+import WorkspaceProjectAuthToken, {
+  MiscData,
+  SlackMiscData,
+} from "../../Models/DatabaseModels/WorkspaceProjectAuthToken";
 import WorkspaceProjectAuthTokenService from "./WorkspaceProjectAuthTokenService";
 import logger from "../Utils/Logger";
 
@@ -52,14 +55,16 @@ export class Service extends DatabaseService<Model> {
     const miscData: MiscData | undefined = data.projectAuthToken.miscData;
 
     if (!miscData) {
-       throw new BadDataException("Misc data not found in project auth token");
+      throw new BadDataException("Misc data not found in project auth token");
     }
 
-    if(data.workspaceType === WorkspaceType.Slack) {
-      const userId: string =  (miscData as SlackMiscData).botUserId;
+    if (data.workspaceType === WorkspaceType.Slack) {
+      const userId: string = (miscData as SlackMiscData).botUserId;
 
       if (!userId) {
-        throw new BadDataException("Bot user ID not found in project auth token");
+        throw new BadDataException(
+          "Bot user ID not found in project auth token",
+        );
       }
 
       return userId;
@@ -68,7 +73,6 @@ export class Service extends DatabaseService<Model> {
     throw new BadDataException("Workspace type not supported");
   }
 
-
   public async createInviteAndPostToChannelsBasedOnRules(data: {
     projectId: ObjectID;
     notificationRuleEventType: NotificationRuleEventType;

diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts
@@ -222,6 +222,7 @@ export default class OnTriggerBaseModel<
         returnValues: {
           data: requestData,
         },
+        isManualExecution: false,
       };
 
       promises.push(props.executeWorkflow(executeWorkflow));

diff --git a/Common/Server/Types/Workflow/Components/Schedule.ts b/Common/Server/Types/Workflow/Components/Schedule.ts
@@ -53,6 +53,7 @@ export default class WebhookTrigger extends TriggerCode {
       const executeWorkflow: ExecuteWorkflowType = {
         workflowId: new ObjectID(workflow._id!),
         returnValues: {},
+        isManualExecution: false,
       };
 
       if (
@@ -122,6 +123,7 @@ export default class WebhookTrigger extends TriggerCode {
     const executeWorkflow: ExecuteWorkflowType = {
       workflowId: new ObjectID(workflow._id!),
       returnValues: {},
+      isManualExecution: false,
     };
 
     if (

diff --git a/Common/Server/Types/Workflow/Components/Webhook.ts b/Common/Server/Types/Workflow/Components/Webhook.ts
@@ -89,6 +89,7 @@ export default class WebhookTrigger extends TriggerCode {
         "request-params": req.query,
         "request-body": req.body,
       },
+      isManualExecution: false,
     };
 
     await props.executeWorkflow(executeWorkflow);

diff --git a/Common/Server/Types/Workflow/TriggerCode.ts b/Common/Server/Types/Workflow/TriggerCode.ts
@@ -10,6 +10,8 @@ import { Port } from "Common/Types/Workflow/Component";
 export interface ExecuteWorkflowType {
   workflowId: ObjectID;
   returnValues: JSONObject;
+  // is this workflow triggered manually or not
+  isManualExecution: boolean;
 }
 
 export interface InitProps {

diff --git a/Common/Server/Types/Workflow/Workflow.ts b/Common/Server/Types/Workflow/Workflow.ts
@@ -6,4 +6,5 @@ export interface RunProps {
   workflowId: ObjectID;
   workflowLogId: ObjectID | null;
   timeout: number;
+  isManualExecution: boolean;
 }