minor changes

Author: Ubuntu

packages/gui/assets/tailwind.css

@@ -7,6 +7,8 @@
     'Noto Color Emoji';
     --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New',
     monospace;
+    --color-red-500: oklch(63.7% 0.237 25.331);
+    --color-green-200: oklch(92.5% 0.084 155.995);
     --color-green-500: oklch(72.3% 0.219 149.579);
     --spacing: 0.25rem;
     --radius-lg: 0.5rem;
@@ -163,15 +165,28 @@
   .my-5 {
     margin-block: calc(var(--spacing) * 5);
   }
+  .table {
+    display: table;
+  }
+  .border-collapse {
+    border-collapse: collapse;
+  }
   .transform {
     transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
   }
   .cursor-pointer {
     cursor: pointer;
   }
+  .resize {
+    resize: both;
+  }
   .rounded-lg {
     border-radius: var(--radius-lg);
   }
+  .border {
+    border-style: var(--tw-border-style);
+    border-width: 1px;
+  }
   .bg-green-500 {
     background-color: var(--color-green-500);
   }
@@ -181,6 +196,13 @@
   .py-1 {
     padding-block: calc(var(--spacing) * 1);
   }
+  .underline {
+    text-decoration-line: underline;
+  }
+  .outline {
+    outline-style: var(--tw-outline-style);
+    outline-width: 1px;
+  }
 }
 @property --tw-rotate-x {
   syntax: "*";
@@ -202,6 +224,16 @@
   syntax: "*";
   inherits: false;
 }
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+@property --tw-outline-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
 @layer properties {
   @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
     *, ::before, ::after, ::backdrop {
@@ -210,6 +242,8 @@
       --tw-rotate-z: initial;
       --tw-skew-x: initial;
       --tw-skew-y: initial;
+      --tw-border-style: solid;
+      --tw-outline-style: solid;
     }
   }
 }

packages/gui/src/graph.rs

@@ -1,7 +1,6 @@
-use std::{collections::HashMap, path::Path};
-
-use commonwl::{StringOrDocument, load_doc, prelude::*};
+use commonwl::{StringOrDocument, load_doc, load_workflow, prelude::*};
 use petgraph::{graph::NodeIndex, prelude::StableDiGraph};
+use std::{collections::HashMap, path::Path};
 
 #[derive(Debug, Clone)]
 pub enum Node {
@@ -19,14 +18,26 @@ pub struct Edge {
 
 type WorkflowGraph = StableDiGraph<Node, Edge>;
 
+pub fn load_workflow_graph(path: impl AsRef<Path>) -> anyhow::Result<WorkflowGraph> {
+    let workflow = load_workflow(path.as_ref()).map_err(|e| anyhow::anyhow!("{e}"))?;
+    let wgb = WorkflowGraphBuilder::from_workflow(&workflow, path)?;
+    Ok(wgb.graph)
+}
+
 #[derive(Default)]
-pub struct WorkflowGraphBuilder {
+struct WorkflowGraphBuilder {
     pub graph: WorkflowGraph,
     node_map: HashMap<String, NodeIndex>,
 }
 
 impl WorkflowGraphBuilder {
-    pub fn from_workflow(&mut self, workflow: &Workflow, path: impl AsRef<Path>) -> anyhow::Result<()> {
+    fn from_workflow(workflow: &Workflow, path: impl AsRef<Path>) -> anyhow::Result<Self> {
+        let mut builder = Self::default();
+        builder.load_workflow(workflow, path)?;
+        Ok(builder)
+    }
+
+    fn load_workflow(&mut self, workflow: &Workflow, path: impl AsRef<Path>) -> anyhow::Result<()> {
         for input in &workflow.inputs {
             let node_id = self.graph.add_node(Node::Input(input.clone()));
             self.node_map.insert(input.id.clone(), node_id);

packages/gui/src/main.rs

@@ -1,6 +1,5 @@
-use commonwl::load_workflow;
 use dioxus::prelude::*;
-use gui::graph::{Edge, Node, WorkflowGraphBuilder};
+use gui::graph::{Edge, Node, load_workflow_graph};
 use petgraph::prelude::StableDiGraph;
 
 #[derive(Default, Clone)]
@@ -44,12 +43,9 @@ pub fn Load_Btn() -> Element {
         button {
             class: "rounded-lg bg-green-500 px-3 py-1 my-5 cursor-pointer",
             onclick: move |_| {
-                let path = "testdata/hello_world/workflows/main/main.cwl";
-                let workflow = load_workflow(path).unwrap();
-                let mut wgb = WorkflowGraphBuilder::default();
-                wgb.from_workflow(&workflow, path).unwrap();
-                let graph = wgb.graph;
+                let graph = load_workflow_graph("testdata/hello_world/workflows/main/main.cwl")?;
                 use_app_state().write().graph = graph;
+                Ok(())
             },
             "Load CWL"
         }