Merge pull request #25 from triggerdotdev/dev

matt-aitken · web-flow · commit ef149bd260a3 · 2023-01-27T18:05:48.000-08:00
Dev
diff --git a/apps/docs/integrations/apis/slack/actions/post-message.mdx b/apps/docs/integrations/apis/slack/actions/post-message.mdx
@@ -127,9 +127,12 @@ In this examples there are two workflows:
 1. Messages your team every minute (!) and asks them how they're doing.
 2. Receives the interaction from users. It adds reactions when the buttons are pressed and posts a message when a user selects from the dropdown menu.
 
+Please note, that to use `jsx-slack` you will need to add the `jsxImportSource` pragma to the top of your file. This is because `jsx-slack` is not a React library, but it uses the same syntax as React. Also, you might need to add `"jsx": "react-jsx"` to your `compilerOption` in `tsconfig.json`. The workflow file needs to be a `.jsx` or `.tsx` file (like when you use React).
+
 <CodeGroup>
 
-```typescript Blocks with interactivity
+```typescript workflow.tsx
+/** @jsxImportSource jsx-slack */
 import { slack } from "@trigger.dev/integrations";
 import JSXSlack, {
   Actions,
@@ -207,6 +210,7 @@ new Trigger({
               channelId: event.channel.id,
             });
           }
+          break;
         }
         case "status-help": {
           //the user needs help so add an 🆘 emoji as a reaction
@@ -217,6 +221,7 @@ new Trigger({
               channelId: event.channel.id,
             });
           }
+          break;
         }
         case "rating": {
           if (action.type != "static_select") {
@@ -244,4 +249,14 @@ new Trigger({
 }).listen();
 ```
 
+```json tsconfig.json
+{
+  //other options
+  "compilerOptions": {
+    "jsx": "react-jsx"
+    //other options
+  }
+}
+```
+
 </CodeGroup>
diff --git a/apps/webapp/app/routes/__app/orgs/$organizationSlug/__org/index.tsx b/apps/webapp/app/routes/__app/orgs/$organizationSlug/__org/index.tsx
@@ -184,15 +184,18 @@ function WorkflowList({
 }
 
 function lastRunDescription(lastRun: WorkflowListItem["lastRun"]) {
-  if (lastRun === undefined) {
+  if (lastRun === null || lastRun === undefined) {
     return "Never";
   }
+
   if (lastRun.status === "SUCCESS") {
     if (lastRun.finishedAt) {
       return formatDateTime(lastRun.finishedAt);
+    } else {
+      return "Unknown";
     }
-    throw new Error("lastRun.finishedAt is undefined");
   }
+
   return runStatusLabel(lastRun.status);
 }
 
diff --git a/examples/send-to-slack/src/index.tsx b/examples/send-to-slack/src/index.tsx
@@ -221,6 +221,7 @@ new Trigger({
               channelId: event.channel.id,
             });
           }
+          break;
         }
         case "status-help": {
           //the user needs help so add an 🆘 emoji as a reaction
@@ -231,6 +232,7 @@ new Trigger({
               channelId: event.channel.id,
             });
           }
+          break;
         }
         case "rating": {
           if (action.type != "static_select") {

Original file line number	Diff line number	Diff line change
`@@ -184,15 +184,18 @@ function WorkflowList({`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`function lastRunDescription(lastRun: WorkflowListItem["lastRun"]) {`
`187`		`- if (lastRun === undefined) {`
	`187`	`+ if (lastRun === null \|\| lastRun === undefined) {`
`188`	`188`	`return "Never";`
`189`	`189`	`}`
	`190`	`+`
`190`	`191`	`if (lastRun.status === "SUCCESS") {`
`191`	`192`	`if (lastRun.finishedAt) {`
`192`	`193`	`return formatDateTime(lastRun.finishedAt);`
	`194`	`+ } else {`
	`195`	`+ return "Unknown";`
`193`	`196`	`}`
`194`		`- throw new Error("lastRun.finishedAt is undefined");`
`195`	`197`	`}`
	`198`	`+`
`196`	`199`	`return runStatusLabel(lastRun.status);`
`197`	`200`	`}`
`198`	`201`
Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ new Trigger({`
`221`	`221`	`channelId: event.channel.id,`
`222`	`222`	`});`
`223`	`223`	`}`
	`224`	`+ break;`
`224`	`225`	`}`
`225`	`226`	`case "status-help": {`
`226`	`227`	`//the user needs help so add an 🆘 emoji as a reaction`
`@@ -231,6 +232,7 @@ new Trigger({`
`231`	`232`	`channelId: event.channel.id,`
`232`	`233`	`});`
`233`	`234`	`}`
	`235`	`+ break;`
`234`	`236`	`}`
`235`	`237`	`case "rating": {`
`236`	`238`	`if (action.type != "static_select") {`