Skip to content

Commit

Permalink
Export in seperate pulumi channel
Browse files Browse the repository at this point in the history
  • Loading branch information
@balbatross
balbatross committed Sep 14, 2023
1 parent 333f0eb commit 5ce94c9
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 44 deletions.
16 changes: 6 additions & 10 deletions packages/app/hivecommand-backend/src/schema/schematics/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,13 @@ export default (prisma: PrismaClient) => {
})

const result = await lambda.send(invokeCommand)
// {
// FunctionName: process.env.EXPORT_LAMBDA || '',
// Payload: JSON.stringify({
// program: currentProgram
// })
// }).promise()

if(result.Payload)
return Buffer.from(result.Payload).toString('utf-8')
else

if(result.Payload){
let url = Buffer.from(result.Payload).toString('utf-8');
return url.substring(1, url.length -1);
}else{
throw new Error("No payload received");
}

},
createCommandSchematicPage: async (root: any, args: {schematic: string, input: any}, context: any) => {
Expand Down
35 changes: 15 additions & 20 deletions packages/app/hivecommand-frontend/src/views/schematic-editor/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,30 +105,25 @@ export const SchematicEditor = () => {

onExport={() => {

saveAs(
'https://hivecommand-schematic-export-bucket-6e95298.s3.ap-southeast-2.amazonaws.com/DfJFb4olASqMpXjgxdjl7?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=ASIAW3WJ3ZIPLC3BFO6W%2F20230913%2Fap-southeast-2%2Fs3%2Faws4_request&X-Amz-Date=20230913T214842Z&X-Amz-Expires=3600&X-Amz-Security-Token=IQoJb3JpZ2luX2VjEE4aDmFwLXNvdXRoZWFzdC0yIkgwRgIhANrolj9CwKlqgH7%2Ff2eo%2BkKm5GcQXPn2KpNSPLn6wn7%2BAiEAw9hUEgFaqrl9%2FR8iZVV6JDf19SiZxJy7q4oGLBNhDdcqqAMINxACGgw0NzE3OTYwMDk1MDIiDDp9S9eM1OVkUjyW%2FCqFA4%2FsXqGh5B98hg7PuV0AK4UeOSefcHV1UQsdl2uTKTCte0f0rKRKpODSTxmEuD%2BbJXfzKofq4ENwL4X4qdsJxYtlZcsTKsmYMtTE2z82Y6U0hLZi3CTZbtM%2FSpLTCkcEfUjxTEqZAqclGa3zFToByv1F5Km872nr06%2B8%2FydwIe6gM75kQJ1DiXq6SOKZh0V8XbvwAGLkmMEASiwc1pub3l3JyrG8RRYCJCDcnsPASmX9OGPegtkVuHlLlRJ8c55kcyeKqXsAKgdgc8gtOq6MCu%2B9q%2FWwXfenZEwfEuwwUmGxK1cEWt6J5UiIXy1cHvz2nfLYBiiJjkcDCSQRofRqD4VM5589Qjm2sSEUtmPU6WlR7mAlsyALDMDYlQb0t8963lkxOf366xSGbADWbO8DpsHsKNLmmyvJTIdicyiT4s7Jqk6akiQTTdXOd9FcUhD2Lv6j%2FvFXpMW%2BcHYG%2BG2AhYbSFOQYUlg%2BVp7M15UEabQcsNwNKtMRsBG%2BQXjoRRuAkaeoL0orMObZiKgGOpwB9q%2FKUkxPWmO1zQpqnIEnh9%2B%2Fv4w1%2BefqyInSHb4aF%2BOUXeMNFiWwhZP4jb7HBAHJlNSmDGz2%2BYykJ%2B5IeWPYmrvjjJKde4zb8M2oRMzlpcYQhqt%2BnTd0zzKNnt1gKRIAv98KgC%2BfhXletDmt6avDd7pAndSDIvqBg8Pevx8cu406%2Bhk7KXbSZrrupPwe33ce4Q31G0psNp%2Fs17lV&X-Amz-Signature=c44a819d860ed25809216a028d5a82364f4d27eb152d6b9be62820ba1b357584&X-Amz-SignedHeaders=host&x-id=GetObject',
`${schematic?.name}.pdf`
);

setExporting(true);
exportSchematic({variables: {id: schematic.id}}).then(async (response) => {

// var link = document.createElement('a');
// link.target = "_blank"
// link.href = 'https://hivecommand-schematic-export-bucket-6e95298.s3.ap-southeast-2.amazonaws.com/DfJFb4olASqMpXjgxdjl7?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=ASIAW3WJ3ZIPLC3BFO6W%2F20230913%2Fap-southeast-2%2Fs3%2Faws4_request&X-Amz-Date=20230913T214842Z&X-Amz-Expires=3600&X-Amz-Security-Token=IQoJb3JpZ2luX2VjEE4aDmFwLXNvdXRoZWFzdC0yIkgwRgIhANrolj9CwKlqgH7%2Ff2eo%2BkKm5GcQXPn2KpNSPLn6wn7%2BAiEAw9hUEgFaqrl9%2FR8iZVV6JDf19SiZxJy7q4oGLBNhDdcqqAMINxACGgw0NzE3OTYwMDk1MDIiDDp9S9eM1OVkUjyW%2FCqFA4%2FsXqGh5B98hg7PuV0AK4UeOSefcHV1UQsdl2uTKTCte0f0rKRKpODSTxmEuD%2BbJXfzKofq4ENwL4X4qdsJxYtlZcsTKsmYMtTE2z82Y6U0hLZi3CTZbtM%2FSpLTCkcEfUjxTEqZAqclGa3zFToByv1F5Km872nr06%2B8%2FydwIe6gM75kQJ1DiXq6SOKZh0V8XbvwAGLkmMEASiwc1pub3l3JyrG8RRYCJCDcnsPASmX9OGPegtkVuHlLlRJ8c55kcyeKqXsAKgdgc8gtOq6MCu%2B9q%2FWwXfenZEwfEuwwUmGxK1cEWt6J5UiIXy1cHvz2nfLYBiiJjkcDCSQRofRqD4VM5589Qjm2sSEUtmPU6WlR7mAlsyALDMDYlQb0t8963lkxOf366xSGbADWbO8DpsHsKNLmmyvJTIdicyiT4s7Jqk6akiQTTdXOd9FcUhD2Lv6j%2FvFXpMW%2BcHYG%2BG2AhYbSFOQYUlg%2BVp7M15UEabQcsNwNKtMRsBG%2BQXjoRRuAkaeoL0orMObZiKgGOpwB9q%2FKUkxPWmO1zQpqnIEnh9%2B%2Fv4w1%2BefqyInSHb4aF%2BOUXeMNFiWwhZP4jb7HBAHJlNSmDGz2%2BYykJ%2B5IeWPYmrvjjJKde4zb8M2oRMzlpcYQhqt%2BnTd0zzKNnt1gKRIAv98KgC%2BfhXletDmt6avDd7pAndSDIvqBg8Pevx8cu406%2Bhk7KXbSZrrupPwe33ce4Q31G0psNp%2Fs17lV&X-Amz-Signature=c44a819d860ed25809216a028d5a82364f4d27eb152d6b9be62820ba1b357584&X-Amz-SignedHeaders=host&x-id=GetObject'; //response.data?.exportCommandSchematic
// link.name = `${schematic?.name}.pdf`;

// link.click();
// link = null;

// setExporting(true);
// exportSchematic({variables: {id: schematic.id}}).then((response) => {
// setExporting(false);

// console.log(response.data)
console.log(response.data)

const resp = await fetch(response.data?.exportCommandSchematic);

const data = await resp.blob()
saveAs(
data,
`${schematic?.name}.pdf`
);

setExporting(false);

// }).catch((e) => {
// setExporting(false);
// })
}).catch((e) => {
setExporting(false);
})
}}
onUpdatePageOrder={(oldIx, newIx) => {

Expand Down
14 changes: 4 additions & 10 deletions packages/core-ui/command-electrical-editor/src/canvas/surface.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
import { Background, ConnectionMode, Controls, MiniMap, ReactFlow, SelectionMode, useEdgesState, useNodesState, useOnSelectionChange } from 'reactflow';
import { useEditorContext } from '../context';
import { BoxNode, CanvasNode, ElectricalSymbol, TextNode } from './node';
import { nodeTypes as _nodeTypes, edgeTypes as _edgeTypes } from '@hive-command/electrical-nodes';
import { WireEdge } from './edge';
import { isEqual } from 'lodash'

Expand All @@ -22,16 +23,9 @@ export const CanvasSurface = () => {
setEdges(pages?.find((a: any) => a.id == selectedPage)?.edges || [])
}, [selectedPage, pages])

const nodeTypes = useMemo(() => ({
electricalSymbol: ElectricalSymbol,
canvasNode: CanvasNode,
box: BoxNode,
text: TextNode,
}), [])

const edgeTypes = useMemo(() => ({
wire: WireEdge
}), [])
const nodeTypes = useMemo(() => _nodeTypes, [])

const edgeTypes = useMemo(() => _edgeTypes, [])

const nodeMap = (item: any) => {
return {
Expand Down
2 changes: 1 addition & 1 deletion packages/core-ui/command-electrical-editor/src/panes/pages.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const PagesPane = (props: any) => {
<Box sx={{ display: 'flex', alignItems: 'center' }}>
<Box sx={{ flex: 1 }}>
<Button size="small" disabled={props.exporting} variant='contained' onClick={props.onExport}>
{props.exporting ? <CircularProgress size={'small'} sx={{marginRight: '6px'}} /> : null} Export
{props.exporting ? <CircularProgress size={'20px'} sx={{marginRight: '6px'}} /> : null} Export
</Button>
</Box>
<Box sx={{ flex: 1, display: 'flex', justifyContent: 'center' }}>
Expand Down
7 changes: 5 additions & 2 deletions packages/core-ui/command-electrical-nodes/src/node.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { CanvasNode, ElectricalSymbol } from './nodes';
import { CanvasNode, ElectricalSymbol } from './nodes';

export const nodeTypes = {
electricalSymbol: ElectricalSymbol,
canvasNode: CanvasNode
canvasNode: CanvasNode,

box: BoxNode,
text: TextNode,
}

6 changes: 5 additions & 1 deletion packages/core-ui/command-schematic-viewer/src/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Box, Typography } from '@mui/material';
import { ReactFlow, ReactFlowProvider, Node, Edge } from 'reactflow';
import 'reactflow/dist/style.css';
import { ViewportLogger } from './viewport';
import { nodeTypes, edgeTypes, ElectricalNodesProvider } from '@hive-command/electrical-nodes'
import { nodeTypes as _nodeTypes, edgeTypes as _edgeTypes, ElectricalNodesProvider } from '@hive-command/electrical-nodes'

export interface SchematicViewerProps {
ratio: number,
Expand All @@ -15,6 +15,10 @@ export interface SchematicViewerProps {
export const SchematicViewer : React.FC<SchematicViewerProps> = (props) => {
console.log(props);
// width: 1080, height: 1080 * (props.ratio || 1.77),

const nodeTypes = useMemo(() => _nodeTypes, []);
const edgeTypes = useMemo(() => _edgeTypes, []);

return (
<Box sx={{flex: 1, display: 'flex'}}>
<ElectricalNodesProvider
Expand Down

0 comments on commit 5ce94c9

Please sign in to comment.