Merge pull request #386 from TheTechCompany/staging

Staging
TheTechCompany · Sep 11, 2023 · 2787075 · 2787075
2 parents daf8f11 + 9f69150
commit 2787075
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -4,14 +4,9 @@
   "description": "",
   "main": "index.js",
   "private": true,
-  "workspaces": {
-    "packages": [
-      "packages/**/*"
-    ],
-    "nohoist": [
-      "packages/lambdas/**"
-    ]
-  },
+  "workspaces": [
+    "packages/**/*"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/TheTechCompany/HiveCommandClient.git"
@@ -59,4 +54,4 @@
     "@types/react": "17.0.2"
   },
   "packageManager": "[email protected]"
-}
+}
diff --git a/packages/app/hivecommand-frontend/src/views/function-editor/index.tsx b/packages/app/hivecommand-frontend/src/views/function-editor/index.tsx
@@ -34,6 +34,11 @@ export const FunctionEditor = () => {
                         id
                     }
                     
+                    children {
+                        id
+                        name
+                        label
+                    }
 
                     rank
                 }
@@ -66,8 +71,8 @@ export const FunctionEditor = () => {
     })
 
 
-
-const [ editingPage, setEditingPage ] = useState<any>(null);
+    
+    const [ editingPage, setEditingPage ] = useState<any>(null);
 
     const [ value, setValue ] = useState('');
 
@@ -76,6 +81,25 @@ const [ editingPage, setEditingPage ] = useState<any>(null);
     const [ nodes, setNodes, onNodesChange ] = useNodesState<any[]>([]);
     const [ edges, setEdges, onEdgesChange] = useEdgesState<any[]>([]);
 
+    useEffect(() => {
+        setNodes(editingPage?.children?.map((x, ix) => ({
+            id: x?.id, 
+            label: x?.name,
+            position: {
+                x: 50,
+                y: ix * 50
+            },
+            data: {
+                label: x?.name
+                // label: node.label,
+                // width: node.width,
+                // height: node.height
+            }
+        })))
+        setEdges(editingPage?.children?.map((x, ix) => ({id: x?.id, source: x?.id, target: editingPage?.children?.[ix + 1]?.id})))
+
+    }, [editingPage])
+
     useEffect(() => {
 
         const g = new dagre.graphlib.Graph()

diff --git a/packages/core-ui/command-electrical-editor/src/panes/pages.tsx b/packages/core-ui/command-electrical-editor/src/panes/pages.tsx
@@ -79,8 +79,8 @@ export const PagesPane = (props: any) => {
                         }}
                     />
                     <Box sx={{ display: 'flex', alignItems: 'center' }}>
-                        <Box sx={{ flex: 1 }}><Button onClick={props.onExport}>Export</Button></Box>
-                        <Box sx={{ flex: 1 }}>
+                        <Box sx={{ flex: 1 }}><Button size="small" variant='contained' onClick={props.onExport}>Export</Button></Box>
+                        <Box sx={{ flex: 1, display: 'flex', justifyContent: 'center' }}>
                             <Typography>Pages</Typography>
                         </Box>
                         <Box sx={{ flex: 1, display: 'flex', justifyContent: 'flex-end' }}>
@@ -89,7 +89,7 @@ export const PagesPane = (props: any) => {
                             </IconButton>
                         </Box>
                     </Box>
-                    <Divider />
+                    <Divider sx={{margin: '6px'}}/>
 
                     <List>
                         {pages?.slice()?.sort((a,b) => (a.rank || '').localeCompare(b.rank || ''))?.map((page) => (

diff --git a/packages/core/command-schematic-export/src/index.ts b/packages/core/command-schematic-export/src/index.ts
@@ -3,6 +3,7 @@ import path from 'path';
 import express from 'express';
 import { PDFDocument } from 'pdf-lib';
 import { writeFileSync } from 'fs';
+import chromium from 'chrome-aws-lambda';
 
 const html_index = require.resolve('@hive-command/export-page');
 
@@ -29,7 +30,11 @@ export const export_schematic = async (schematic: {pages: any[]}) => {
 
         if(typeof(address) != 'string'){
 
-                const browser = await puppeteer.launch({headless: false});
+                const browser = await puppeteer.launch({
+                    args: chromium.args,
+                    headless: chromium.headless,
+                    executablePath: await chromium.executablePath
+                });
 
                 const page = await browser.newPage();
 

diff --git a/packages/infrastructure/main/src/export-lambda/index.ts b/packages/infrastructure/main/src/export-lambda/index.ts
@@ -22,14 +22,14 @@ export const ExportLambda = () => {
 
     const lambda = archive.getFile({
         type: "zip",
-        sourceDir: path.join(__dirname, "/../../../lambdas/export-schematic/"),
+        sourceDir: path.join(__dirname, "/../../../../lambdas/export-schematic/"),
         outputPath: "lambda_function_payload.zip",
     });
 
     const fn = new Function(`hivecommand-export-schematic-fn`, {
         code: new pulumi.asset.FileArchive("lambda_function_payload.zip"),
         role: iamForLambda.arn,
-        handler: "index.test",
+        handler: "index.handler",
         runtime: "nodejs18.x"
     })