Build commands, first run seeding, default flow on workspace create bug fix, subflow cascade delete, static and dynamic route updates, handle source/target feature, Info panel in top right corner for deleting edges/nodes

Author: baebranch

.vscode/tasks.json

@@ -4,19 +4,46 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Build Windows Executable",
+      "label": "Build App",
       "type": "shell",
-      "command": "pyinstaller",
+      "dependsOn": [
+        "Build React App",
+        "Build Python App"
+      ],
+      "dependsOrder": "sequence",
+      "command": "xcopy",
+      "args": [
+        "/E",
+        "/I",
+        "server\\gql",
+        "dist\\gql",
+        "/y",
+        "&&",
+        "copy",
+        "desktop\\splash.html",
+        "dist",
+        "/y",
+        "&&",
+        "mkdir",
+        "dist\\data", 
+      ],
+      "problemMatcher": []
+    },
+    {
+      "label": "Build Python App",
+      "type": "shell",
+      "command": ".venv\\Scripts\\activate.bat && pyinstaller",
       "args": [
         "--onefile",
         "--noconsole",
         "--icon=favicon.ico",
+        // "flow.py",
         "flow.pyw"
       ],
       "problemMatcher": []
     },
     {
-      "label": "Build React APP",
+      "label": "Build React App",
       "type": "shell",
       "command": "npm",
       "args": [

desktop/gui.py

@@ -1,7 +1,10 @@
+import os
 import time
 import webview
+import pickle as pk
 from threading import Thread
 
+from server.db import seed_types
 from server.server import run_app
 
 
@@ -10,13 +13,29 @@ def splash_close(window):
   server = Thread(target=run_app, daemon=True)
   server.start()
 
+  # Seed the database with node and edge types on first run
+  if (os.path.exists('settings.p')):
+    settings = pk.load(open('settings.p', 'rb'))
+
+    if not settings.get('seed_db', False):
+      seed_types.seed()
+      settings['seed_db'] = True
+      pk.dump(settings, open('settings.p', 'wb'))
+  
+  else:
+    seed_types.seed()
+    pk.dump({'seed_db': True}, open('settings.p', 'wb'))
+
   # Close splash screen
   time.sleep(7)
   window.destroy()
 
 
 # Create splash screen
-splash_screen = webview.create_window('Flow Control', html=(open('splash.html', 'r').read()), frameless=True, width=480, height=307)
+if os.path.exists('splash.html'):
+  splash_screen = webview.create_window('Flow Control', html=(open('splash.html', 'r').read()), frameless=True, width=480, height=307)
+else:
+  splash_screen = webview.create_window('Flow Control', html=(open('desktop\splash.html', 'r').read()), frameless=True, width=480, height=307)
 webview.start(splash_close, (splash_screen,), http_server=False)
 
 # Open main window 

desktop/splash.html

@@ -44,7 +44,7 @@ def createWorkspace(_, info, **kwargs):
   # Create the default main flow for the workspace
   flow = Flow(name='Main', workspace=workspace, description='The main flow for this workspace.', default=True)
   session.add(flow)
-  workspace.default = flow
+  workspace.default_flow_id = flow.id
   session.commit()
 
   # Return the new workspace
@@ -166,6 +166,11 @@ def updateNode(_, info, **kwargs):
 def deleteNode(_, info, **kwargs):
   node = session.query(Node).filter_by(nid=kwargs.get('nid')).first()
   session.delete(node)
+
+  if node.node_type.slug == 'subflow':
+    flow = session.query(Flow).filter_by(slug=loads(node.node)['data']['slug'], workspace_id=node.workspace_id).first()
+    session.delete(flow)
+  
   session.commit()
   return {'node': node}
 

server/resolvers.py

@@ -78,6 +78,9 @@
 mutation.set_field("deleteEdge", deleteEdge)
 
 
+# Web App initialization
+app = web.Application()
+
 # Build schema
 if os.path.exists('assets'):
   type_defs = gql(load_schema_from_path("gql/"))
@@ -127,27 +130,24 @@ async def graphql_api_options(_: web.Request) -> web.Response:
 #         headers={key: value for key, value in response.headers.items()},
 #       )
 
+if os.path.exists('assets'):
+  app.add_routes([web.static('/assets', './assets')])
+  routes.static('/assets', './assets')
+else:
+  app.add_routes([web.static('/assets', 'dist/assets')])
+  routes.static('/assets', 'dist/assets')
+
 # Server index.html file
-@routes.get('/')
+@routes.route('*', "/{tail:.*}")
 async def index(request: web.Request):
+  print('Received request')
   if os.path.exists('assets'):
     return web.FileResponse('index.html')
   else:
     return web.FileResponse('dist/index.html')
 
-# Web App initialization
-app = web.Application()
 app.add_routes(routes)
 
-if os.path.exists('assets'):
-  print('Using assets static path')
-  app.add_routes([web.static('/', './')])
-  routes.static('/', './')
-else:
-  print('Using dist static path')
-  app.add_routes([web.static('/', 'dist')])
-  routes.static('/', 'dist')
-
 def run_app():
   logging.basicConfig(level=logging.DEBUG)
   loop = asyncio.new_event_loop()

server/server.py

@@ -21,6 +21,8 @@ function CardNode({ data, selected }: { data: any, selected: any }) {
         </div>
         <Handle type="target" position={Position.Top} id="a" />
         <Handle type="source" position={Position.Bottom} id="b" />
+        <Handle type="source" position={Position.Top} id="c" />
+        <Handle type="target" position={Position.Bottom} id="d" />
       </div>
     </>
   );

src/custom/card.tsx

@@ -16,6 +16,8 @@ function Default({ data, selected }: { data: any, selected: any }) {
           {data.label}
         <Handle type="target" position={Position.Top} id="a" />
         <Handle type="source" position={Position.Bottom} id="b" />
+        <Handle type="source" position={Position.Top} id="c" />
+        <Handle type="target" position={Position.Bottom} id="d" />
       </div>
     </>
   );

src/custom/default.tsx

@@ -15,6 +15,7 @@ function Input({ data, selected }: { data: any, selected: any }) {
       <div className="source-node">
           {data.label}
         <Handle type="source" position={Position.Bottom} id="a" />
+        <Handle type="target" position={Position.Bottom} id="b" />
       </div>
     </>
   );

src/custom/input.tsx

@@ -15,6 +15,7 @@ function Output({ data, selected }: { data: any, selected: any }) {
       <div className="source-node">
           {data.label}
         <Handle type="target" position={Position.Top} id="a" />
+        <Handle type="source" position={Position.Top} id="b" />
       </div>
     </>
   );

src/custom/output.tsx

@@ -39,6 +39,8 @@ function SubFlowNode({ data, selected }: { data: any, selected: any }) {
         </div>
         <Handle type="target" position={Position.Top} id="a" />
         <Handle type="source" position={Position.Bottom} id="b" />
+        <Handle type="source" position={Position.Top} id="c" />
+        <Handle type="target" position={Position.Bottom} id="d" />
       </div>
     </>
   );