Template systemOptions

TheTechCompany · Apr 22, 2024 · 8576530 · 8576530
1 parent f54b7a2
commit 8576530
Show file tree

Hide file tree

Showing 22 changed files with 276 additions and 267 deletions.
diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml
@@ -171,14 +171,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build_server, build_gds, build_grs]
     env:
-      COMMAND_MONGO_URL: ${{ secrets.COMMAND_MONGO_URL }}
-      COMMAND_MONGO_DB: ${{ secrets.COMMAND_MONGO_DB }}
-      COMMAND_MONGO_USER: ${{ secrets.COMMAND_MONGO_USER }}
-      COMMAND_MONGO_PASS: ${{ secrets.COMMAND_MONGO_PASS }}
-      COMMAND_MONGO_AUTH_DB: ${{ secrets.COMMAND_MONGO_AUTH_DB }}
-      RABBIT_URL: ${{ secrets.RABBIT_URL }}
-      TIMESERIES_HOST: ${{ secrets.TIMESERIES_HOST }}
-      TIMESERIES_PASSWORD: ${{ secrets.TIMESERIES_PASSWORD }}
       JWT_SECRET: ${{ secrets.JWT_SECRET }}
     steps:
       - name: checkout

diff --git a/.github/workflows/supporting-infra.yml b/.github/workflows/supporting-infra.yml
@@ -66,14 +66,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ build_mqtt_auth_server ]
     env:
-      COMMAND_MONGO_URL: ${{ secrets.COMMAND_MONGO_URL }}
-      COMMAND_MONGO_DB: ${{ secrets.COMMAND_MONGO_DB }}
-      COMMAND_MONGO_USER: ${{ secrets.COMMAND_MONGO_USER }}
-      COMMAND_MONGO_PASS: ${{ secrets.COMMAND_MONGO_PASS }}
-      COMMAND_MONGO_AUTH_DB: ${{ secrets.COMMAND_MONGO_AUTH_DB }}
-      RABBIT_URL: ${{ secrets.RABBIT_URL }}
-      TIMESERIES_HOST: ${{ secrets.TIMESERIES_HOST }}
-      TIMESERIES_PASSWORD: ${{ secrets.TIMESERIES_PASSWORD }}
       JWT_SECRET: ${{ secrets.JWT_SECRET }}
     steps:
       - name: checkout

diff --git a/packages/app/hivecommand-backend/src/schema/program/alarms/defaults.ts b/packages/app/hivecommand-backend/src/schema/program/alarms/defaults.ts
@@ -0,0 +1,7 @@
+export const defaultAlarm = `export const handler = async (lastState: Tags, currentState: Tags, types: Types) => {
+
+}`;
+
+export const defaultAlarmPathway = `export const sendNotification = async (message: string) => {
+
+}`;
diff --git a/packages/app/hivecommand-backend/src/schema/program/alarms/index.ts b/packages/app/hivecommand-backend/src/schema/program/alarms/index.ts
@@ -4,6 +4,7 @@ import { isStringType } from "../types/util";
 import { LexoRank } from "lexorank";
 import { JsxEmit, ModuleKind, ScriptTarget, transpile } from 'typescript';
 import { Project } from 'ts-morph'
+import { defaultAlarm, defaultAlarmPathway } from "./defaults";
 
 const canCompile = (tsCode: string) => {
 
@@ -145,7 +146,7 @@ export default (prisma: PrismaClient) => {
                     data: {
                         id: nanoid(),
                         title: args.input.title,
-                        script: args.input.script,
+                        script: args.input.script || defaultAlarm,
                         rank,
                         program: { 
                             connect: { 
@@ -204,7 +205,7 @@ export default (prisma: PrismaClient) => {
                         id: nanoid(),
                         name: args.input.name,
                         scope: args.input.scope,
-                        script: args.input.script,
+                        script: args.input.script || defaultAlarmPathway,
                         program: {
                             connect: {id: args.program}
                         }

diff --git a/packages/app/hivecommand-backend/src/schema/program/templates/index.ts b/packages/app/hivecommand-backend/src/schema/program/templates/index.ts
@@ -20,6 +20,8 @@ export default (prisma: PrismaClient) => {
             updateCommandTemplateEdge(template: ID!, id: ID!, input: CommandTemplateEdgeInput!): CommandTemplateEdge
             deleteCommandTemplateEdge(template: ID!, id: ID!): CommandTemplateEdge
 
+            updateCommandTemplateSystemEdge(template: ID!, key: String, script: String): Boolean
+
         }
 
         input CommandTemplateEdgeInput {
@@ -48,6 +50,8 @@ export default (prisma: PrismaClient) => {
 
             inputs: [CommandTemplateIO]
             outputs: [CommandTemplateIO]
+
+            systemOptions: JSON
         }
 
         type CommandDataTransformer {
@@ -238,6 +242,26 @@ export default (prisma: PrismaClient) => {
                     }
                 })
             },
+            updateCommandTemplateSystemEdge: async (root: any, args: any) => {
+                const dataTemplate = await prisma.canvasDataTemplate.findFirst({
+                    where: {
+                        id: args.template
+                    }
+                });
+
+                await prisma.canvasDataTemplate.update({
+                    where: {
+                        id: args.template
+                    },
+                    data: {
+                        systemOptions: {
+                            ...dataTemplate?.systemOptions as any,
+                            [args.key]: args.script
+                        }
+                    }
+                })
+                return true;
+            },
             createCommandTemplateIO: async (root: any, args: any, context: any) => {
                 const { direction } = args.input;
 

diff --git a/...ommand-db/prisma/migrations/20240422023036_add_data_template_system_options/migration.sql b/...ommand-db/prisma/migrations/20240422023036_add_data_template_system_options/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "CanvasDataTemplate" ADD COLUMN     "systemOptions" JSONB;
diff --git a/packages/app/hivecommand-db/prisma/schema.prisma b/packages/app/hivecommand-db/prisma/schema.prisma
@@ -603,6 +603,8 @@ model CanvasDataTemplate {
 
   edges CanvasDataTemplateEdge[] @relation(name: "transformsAlongEdge")
 
+  systemOptions Json?
+
   transforms CanvasDataTransformer[] @relation(name: "transformsCanvasData")
 
   program   Program @relation(name: "hasTemplates", fields: [programId], references: [id], onDelete: Cascade)

diff --git a/packages/app/hivecommand-frontend/src/pages/device-control/utils/program.ts b/packages/app/hivecommand-frontend/src/pages/device-control/utils/program.ts
@@ -158,6 +158,8 @@ import { useEffect } from "react";
                                             }
                                             script
                                         }
+
+                                        systemOptions
                                     }
 
                                     options

diff --git a/packages/app/hivecommand-frontend/src/views/Editor/index.tsx b/packages/app/hivecommand-frontend/src/views/Editor/index.tsx
@@ -137,6 +137,8 @@ export const EditorPage: React.FC<EditorProps> = (props) => {
                     id
                     name
 
+                    systemOptions
+
                     inputs {
                         id
                         name