respond to pr feedback

packages/server/src/automations/triggers.ts

@@ -1,7 +1,7 @@
 import emitter from "../events/index"
 import { getAutomationParams, isDevAppID } from "../db/utils"
 import { coerce } from "../utilities/rowProcessor"
-import { definitions } from "../../../shared-core/src/automations/triggers"
+import { automations } from "@budibase/shared-core"
 // need this to call directly, so we can get a response
 import { automationQueue } from "./bullboard"
 import { checkTestFlag } from "../utilities/redis"
@@ -26,7 +26,7 @@ import {
 import { executeInThread } from "../threads/automation"
 import { dataFilters, sdk } from "@budibase/shared-core"
 
-export const TRIGGER_DEFINITIONS = definitions
+export const TRIGGER_DEFINITIONS = automations.triggers.definitions
 const JOB_OPTS = {
   removeOnComplete: true,
   removeOnFail: true,
@@ -273,8 +273,8 @@ async function checkTriggerFilters(
   }
 
   if (
-    trigger.stepId === definitions.ROW_UPDATED.stepId ||
+    trigger.stepId === automations.triggers.definitions.ROW_UPDATED.stepId ||
-    trigger.stepId === definitions.ROW_SAVED.stepId
+    trigger.stepId === automations.triggers.definitions.ROW_SAVED.stepId
   ) {
     const newRow = await automationUtils.cleanUpRow(tableId, event.row)
     return rowPassesFilters(newRow, filters)

packages/server/src/automations/utils.ts

@@ -1,5 +1,5 @@
 import { Thread, ThreadType } from "../threads"
-import { definitions } from "../../../shared-core/src/automations/triggers"
+import { automations } from "@budibase/shared-core"
 import { automationQueue } from "./bullboard"
 import { updateEntityMetadata } from "../utilities"
 import { context, db as dbCore, utils } from "@budibase/backend-core"
@@ -19,7 +19,7 @@ import { automationsEnabled } from "../features"
 import { helpers, REBOOT_CRON } from "@budibase/shared-core"
 import tracer from "dd-trace"
 
-const CRON_STEP_ID = definitions.CRON.stepId
+const CRON_STEP_ID = automations.triggers.definitions.CRON.stepId
 let Runner: Thread
 if (automationsEnabled()) {
   Runner = new Thread(ThreadType.AUTOMATION)
@@ -255,7 +255,10 @@ export async function cleanupAutomations(appId: any) {
  * @return if it is recurring (cron).
  */
 export function isRecurring(automation: Automation) {
-  return automation.definition.trigger.stepId === definitions.CRON.stepId
+  return (
+    automation.definition.trigger.stepId ===
+    automations.triggers.definitions.CRON.stepId
+  )
 }
 
 export function isErrorInOutput(output: {

packages/server/src/sdk/app/automations/crud.ts

@@ -13,7 +13,7 @@ import {
   HTTPError,
   db as dbCore,
 } from "@budibase/backend-core"
-import { definitions } from "../../../../../shared-core/src/automations/triggers"
+import { automations as sharedAutomations } from "@budibase/shared-core"
 import automations from "."
 
 export interface PersistedAutomation extends Automation {
@@ -202,7 +202,7 @@ export async function remove(automationId: string, rev: string) {
  * written to DB (this does not write to DB as it would be wasteful to repeat).
  */
 async function checkForWebhooks({ oldAuto, newAuto }: any) {
-  const WH_STEP_ID = definitions.WEBHOOK.stepId
+  const WH_STEP_ID = sharedAutomations.triggers.definitions.WEBHOOK.stepId
 
   const appId = context.getAppId()
   if (!appId) {

packages/server/src/sdk/app/rowActions/crud.ts

@@ -9,7 +9,7 @@ import {
 } from "@budibase/types"
 import { generateRowActionsID } from "../../../db/utils"
 import automations from "../automations"
-import { definitions as TRIGGER_DEFINITIONS } from "../../../../../shared-core/src/automations/triggers"
+import { automations as sharedAutomations } from "@budibase/shared-core"
 import * as triggers from "../../../automations/triggers"
 import sdk from "../.."
 
@@ -59,7 +59,7 @@ export async function create(tableId: string, rowAction: { name: string }) {
     definition: {
       trigger: {
         id: "trigger",
-        ...TRIGGER_DEFINITIONS.ROW_ACTION,
+        ...sharedAutomations.triggers.definitions.ROW_ACTION,
         stepId: AutomationTriggerStepId.ROW_ACTION,
         inputs: {
           tableId,

packages/server/tsconfig.json

@@ -4,18 +4,6 @@
     "require": ["tsconfig-paths/register"],
     "swc": true
   },
-  "include": [
+  "include": ["src/**/*", "specs", "__mocks__"],
-    "src/**/*",
-    "specs",
-    "__mocks__",
-    "../shared-core/src/automations/triggers/app.ts",
-    "../shared-core/src/automations/triggers/cron.ts",
-    "../shared-core/src/automations/triggers/index.ts",
-    "../shared-core/src/automations/triggers/rowAction.ts",
-    "../shared-core/src/automations/triggers/rowDeleted.ts",
-    "../shared-core/src/automations/triggers/rowSaved.ts",
-    "../shared-core/src/automations/triggers/rowUpdated.ts",
-    "../shared-core/src/automations/triggers/webhook.ts"
-  ],
   "exclude": ["node_modules", "dist"]
 }