From 6d3c53be4196f0f81c9529ee2f00177f8c2effaa Mon Sep 17 00:00:00 2001
From: awtkns <32209255+awtkns@users.noreply.github.com>
Date: Wed, 19 Jul 2023 14:09:45 -0700
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=AB=20Manual=20trigger=20block?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/workflow/node-block-definitions.ts  | 16 +++++++++++++++-
 next/src/types/workflow.ts                       |  2 ++
 .../schemas/workflow/blocks/manual_trigger.py    | 10 ++++++++++
 .../web/api/workflow/blocks/web/__init__.py      |  3 +++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 platform/reworkd_platform/schemas/workflow/blocks/manual_trigger.py

diff --git a/next/src/services/workflow/node-block-definitions.ts b/next/src/services/workflow/node-block-definitions.ts
index 96adc779bb..c6b659967e 100644
--- a/next/src/services/workflow/node-block-definitions.ts
+++ b/next/src/services/workflow/node-block-definitions.ts
@@ -77,8 +77,22 @@ const IfBlockDefinition: NodeBlockDefinition = {
   output_fields: [],
 };
 
+const TriggerBlockDefinition: NodeBlockDefinition = {
+  name: "Manual Trigger",
+  type: "ManualTriggerBlock",
+  description: "Trigger a block manually",
+  image_url: "/tools/web.png",
+  input_fields: [],
+  output_fields: [],
+};
+
 export const getNodeBlockDefinitions = () => {
-  return [UrlStatusCheckBlockDefinition, SlackWebhookBlockDefinition, IfBlockDefinition];
+  return [
+    UrlStatusCheckBlockDefinition,
+    SlackWebhookBlockDefinition,
+    IfBlockDefinition,
+    TriggerBlockDefinition,
+  ];
 };
 
 export const getNodeBlockDefinitionFromNode = (node: Node<WorkflowNode>) => {
diff --git a/next/src/types/workflow.ts b/next/src/types/workflow.ts
index 66435522da..ca1b33b7b1 100644
--- a/next/src/types/workflow.ts
+++ b/next/src/types/workflow.ts
@@ -57,6 +57,8 @@ export const toReactFlowEdge = (edge: WorkflowEdge) =>
 
 export const getNodeType = (block: NodeBlock) => {
   switch (block.type) {
+    case "ManualTriggerBlock":
+      return "trigger";
     case "IfBlock":
       return "if";
     default:
diff --git a/platform/reworkd_platform/schemas/workflow/blocks/manual_trigger.py b/platform/reworkd_platform/schemas/workflow/blocks/manual_trigger.py
new file mode 100644
index 0000000000..2bec4ac8ef
--- /dev/null
+++ b/platform/reworkd_platform/schemas/workflow/blocks/manual_trigger.py
@@ -0,0 +1,10 @@
+from reworkd_platform.schemas.workflow.base import Block, BlockIOBase
+
+
+class ManualTriggerBlock(Block):
+    type = "ManualTriggerBlock"
+    description = "Outputs the status code of a GET request to a URL"
+    image_url = ""
+
+    async def run(self) -> BlockIOBase:
+        return BlockIOBase()
diff --git a/platform/reworkd_platform/web/api/workflow/blocks/web/__init__.py b/platform/reworkd_platform/web/api/workflow/blocks/web/__init__.py
index e8db3042e8..18331bb08a 100644
--- a/platform/reworkd_platform/web/api/workflow/blocks/web/__init__.py
+++ b/platform/reworkd_platform/web/api/workflow/blocks/web/__init__.py
@@ -1,9 +1,12 @@
 from reworkd_platform.schemas.workflow.base import Block
+from reworkd_platform.schemas.workflow.blocks.manual_trigger import ManualTriggerBlock
 from reworkd_platform.schemas.workflow.blocks.slack_webhook import SlackWebhook
 from reworkd_platform.schemas.workflow.blocks.status_check import UrlStatusCheckBlock
 
 
 def get_block_runner(block: Block) -> Block:
+    if block.type == "ManualTriggerBlock":
+        return ManualTriggerBlock(**block.dict())
     if block.type == "UrlStatusCheck":
         return UrlStatusCheckBlock(**block.dict())
     if block.type == "SlackWebhook":

From 30635c42373861b3a0a14909738ccee53f9c2bee Mon Sep 17 00:00:00 2001
From: awtkns <32209255+awtkns@users.noreply.github.com>
Date: Wed, 19 Jul 2023 15:06:40 -0700
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=AB=20Manual=20trigger=20block?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 next/src/components/PrimaryButton.tsx         | 11 +++++--
 .../components/workflow/nodes/TriggerNode.tsx | 24 +++++++++++---
 next/src/hooks/useWorkflow.ts                 | 23 ++++++++-----
 next/src/pages/workflow/[workflow].tsx        | 10 +-----
 ...agentInputStore.tsx => agentInputStore.ts} |  1 -
 next/src/stores/workflowStore.ts              | 33 +++++++++++++++++++
 next/src/types/workflow.ts                    |  1 +
 7 files changed, 77 insertions(+), 26 deletions(-)
 rename next/src/stores/{agentInputStore.tsx => agentInputStore.ts} (99%)
 create mode 100644 next/src/stores/workflowStore.ts

diff --git a/next/src/components/PrimaryButton.tsx b/next/src/components/PrimaryButton.tsx
index 69f43a075f..4357f4b35f 100644
--- a/next/src/components/PrimaryButton.tsx
+++ b/next/src/components/PrimaryButton.tsx
@@ -1,18 +1,23 @@
 import Button from "../ui/button";
 import type { ReactNode } from "react";
 import React from "react";
+import clsx from "clsx";
 
 type PrimaryButtonProps = {
+  className?: string;
   children: ReactNode | string;
   icon?: React.ReactNode;
-  onClick?: () => void;
+  onClick?: () => void | Promise<void>;
 };
 
-export default function PrimaryButton({ children, onClick, icon }: PrimaryButtonProps) {
+export default function PrimaryButton({ children, onClick, icon, className }: PrimaryButtonProps) {
   return (
     <Button
       onClick={onClick}
-      className="group rounded-full border border-black bg-white text-black transition duration-200 ease-in-out hover:hover:bg-neutral-200 focus-visible:bg-white/90 focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-white/30"
+      className={clsx(
+        "group rounded-full border border-black bg-white text-black transition duration-200 ease-in-out hover:hover:bg-neutral-200 focus-visible:bg-white/90 focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-white/30",
+        className
+      )}
     >
       {icon}
       {children}
diff --git a/next/src/components/workflow/nodes/TriggerNode.tsx b/next/src/components/workflow/nodes/TriggerNode.tsx
index 5d8a45b17c..7372f06688 100644
--- a/next/src/components/workflow/nodes/TriggerNode.tsx
+++ b/next/src/components/workflow/nodes/TriggerNode.tsx
@@ -3,8 +3,16 @@ import { type NodeProps, Position } from "reactflow";
 import type { WorkflowNode } from "../../../types/workflow";
 import { getNodeBlockDefinitions } from "../../../services/workflow/node-block-definitions";
 import AbstractNode from "./AbstractNode";
+import PrimaryButton from "../../PrimaryButton";
+import { useWorkflowStore } from "../../../stores/workflowStore";
+import WorkflowApi from "../../../services/workflow/workflowApi";
+import { useSession } from "next-auth/react";
 
 function TriggerNode({ data, selected }: NodeProps<WorkflowNode>) {
+  const { data: session } = useSession();
+  const workflow = useWorkflowStore().workflow;
+  const api = new WorkflowApi(session?.accessToken);
+
   const definition = getNodeBlockDefinitions().find((d) => d.type === data.block.type);
 
   return (
@@ -13,11 +21,17 @@ function TriggerNode({ data, selected }: NodeProps<WorkflowNode>) {
       status={data.status}
       handles={[{ position: Position.Bottom, type: "source" }]}
     >
-      <div className="flex items-center">
-        <div className="ml-2">
-          <div className="text-lg font-bold text-gray-100">{definition?.name}</div>
-          <div className="text-md text-sm font-thin">{definition?.description}</div>
-        </div>
+      <div className="flex flex-col">
+        <div className="text-lg font-bold text-gray-100">{definition?.name}</div>
+        <div className="text-md text-sm font-thin">{definition?.description}</div>
+        {workflow?.id && (
+          <PrimaryButton
+            onClick={async () => void (await api.execute(workflow?.id))}
+            className="mt-2 bg-orange-500 text-lg font-light"
+          >
+            <span className="text-xs">Execute</span>
+          </PrimaryButton>
+        )}
       </div>
     </AbstractNode>
   );
diff --git a/next/src/hooks/useWorkflow.ts b/next/src/hooks/useWorkflow.ts
index 64430b648a..72bfb5803b 100644
--- a/next/src/hooks/useWorkflow.ts
+++ b/next/src/hooks/useWorkflow.ts
@@ -1,5 +1,5 @@
 import type { Edge, Node } from "reactflow";
-import type { Dispatch, SetStateAction} from "react";
+import type { Dispatch, SetStateAction } from "react";
 import { useEffect, useState } from "react";
 import { nanoid } from "nanoid";
 import { useMutation, useQuery } from "@tanstack/react-query";
@@ -9,6 +9,7 @@ import WorkflowApi from "../services/workflow/workflowApi";
 import useSocket from "./useSocket";
 import { z } from "zod";
 import type { Session } from "next-auth";
+import { useWorkflowStore } from "../stores/workflowStore";
 
 const eventSchema = z.object({
   nodeId: z.string(),
@@ -49,9 +50,19 @@ export const useWorkflow = (workflowId: string, session: Session | null) => {
     async (data: Workflow) => await api.update(workflowId, data)
   );
 
-  const { data: workflow } = useQuery(
+  const workflowStore = useWorkflowStore();
+
+  useQuery(
     ["workflow", workflowId],
-    async () => await api.get(workflowId),
+    async () => {
+      const workflow = await api.get(workflowId);
+
+      workflowStore.setWorkflow(workflow);
+      setNodes(workflow?.nodes.map(toReactFlowNode) ?? []);
+      setEdges(workflow?.edges.map(toReactFlowEdge) ?? []);
+
+      return workflow;
+    },
     {
       enabled: !!workflowId && !!session?.accessToken,
     }
@@ -62,11 +73,6 @@ export const useWorkflow = (workflowId: string, session: Session | null) => {
   const [nodes, setNodes] = nodesModel;
   const [edges, setEdges] = edgesModel;
 
-  useEffect(() => {
-    setNodes(workflow?.nodes.map(toReactFlowNode) ?? []);
-    setEdges(workflow?.edges.map(toReactFlowEdge) ?? []);
-  }, [setNodes, setEdges, workflow]);
-
   useEffect(() => {
     const selectedNodes = nodes.filter((n) => n.selected);
     if (selectedNodes.length == 0) setSelectedNode(undefined);
@@ -121,6 +127,7 @@ export const useWorkflow = (workflowId: string, session: Session | null) => {
 
   const onSave = async () => {
     await updateWorkflow({
+      id: workflowId,
       nodes: nodes.map((n) => ({
         id: n.data.id,
         ref: n.data.ref,
diff --git a/next/src/pages/workflow/[workflow].tsx b/next/src/pages/workflow/[workflow].tsx
index 232a77dcc8..787b93f4b6 100644
--- a/next/src/pages/workflow/[workflow].tsx
+++ b/next/src/pages/workflow/[workflow].tsx
@@ -11,7 +11,7 @@ import nextI18NextConfig from "../../../next-i18next.config";
 import { getWorkflowSidebar } from "../../components/drawer/WorkflowSidebar";
 import { useAuth } from "../../hooks/useAuth";
 import PrimaryButton from "../../components/PrimaryButton";
-import { FaPlay, FaSave } from "react-icons/fa";
+import { FaSave } from "react-icons/fa";
 
 const WorkflowPage: NextPage = () => {
   const { session } = useAuth({ protectedRoute: true });
@@ -53,14 +53,6 @@ const WorkflowPage: NextPage = () => {
           >
             Save
           </PrimaryButton>
-          <PrimaryButton
-            icon={<FaPlay size="15" />}
-            onClick={() => {
-              executeWorkflow().catch(console.error);
-            }}
-          >
-            Execute
-          </PrimaryButton>
         </div>
       </div>
     </DashboardLayout>
diff --git a/next/src/stores/agentInputStore.tsx b/next/src/stores/agentInputStore.ts
similarity index 99%
rename from next/src/stores/agentInputStore.tsx
rename to next/src/stores/agentInputStore.ts
index 9a8c79103e..305e7d3f27 100644
--- a/next/src/stores/agentInputStore.tsx
+++ b/next/src/stores/agentInputStore.ts
@@ -32,7 +32,6 @@ const createAgentInputSlice: StateCreator<AgentInputSlice> = (set) => {
     },
   };
 };
-
 export const useAgentInputStore = createSelectors(
   create<AgentInputSlice>()((...a) => ({
     ...createAgentInputSlice(...a),
diff --git a/next/src/stores/workflowStore.ts b/next/src/stores/workflowStore.ts
new file mode 100644
index 0000000000..eda1180c4b
--- /dev/null
+++ b/next/src/stores/workflowStore.ts
@@ -0,0 +1,33 @@
+import { createSelectors } from "./helpers";
+import type { StateCreator } from "zustand";
+import { create } from "zustand";
+
+interface Workflow {
+  id: string;
+}
+
+interface WorkflowSlice {
+  workflow: Workflow | null;
+  setWorkflow: (workflow: Workflow) => void;
+}
+
+const initialState = {
+  workflow: null,
+};
+
+const createWorkflowSlice: StateCreator<WorkflowSlice> = (set, get) => {
+  return {
+    ...initialState,
+    setWorkflow: (workflow: Workflow) => {
+      set(() => ({
+        workflow,
+      }));
+    },
+  };
+};
+
+export const useWorkflowStore = createSelectors(
+  create<WorkflowSlice>()((...a) => ({
+    ...createWorkflowSlice(...a),
+  }))
+);
diff --git a/next/src/types/workflow.ts b/next/src/types/workflow.ts
index ca1b33b7b1..6e42b71093 100644
--- a/next/src/types/workflow.ts
+++ b/next/src/types/workflow.ts
@@ -27,6 +27,7 @@ const WorkflowEdgeSchema = z.object({
   status: z.enum(["running", "success", "failure"]).optional(),
 });
 export const WorkflowSchema = z.object({
+  id: z.string(),
   nodes: z.array(WorkflowNodeSchema),
   edges: z.array(WorkflowEdgeSchema),
 });